zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when setting duplicate receive codecs.

Browse Source 
Instead of crashing, log a warning.

Bug: chromium:810173
Change-Id: I7e43889fdab429fcb231657f5770b0ff26f34a8f
Reviewed-on: https://webrtc-review.googlesource.com/59020
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22322}
This commit is contained in:
Anders Carlsson
2018-03-05 10:26:03 +01:00
committed by Commit Bot
parent 69d2dc94d3
commit 7dbb701076
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/engine/webrtcvideoengine.cc
View File

@ -2211,6 +2211,13 @@ void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureCodecs(
recv_codec.codec.params); recv_codec.codec.params);
std::unique_ptr<webrtc::VideoDecoder> new_decoder; std::unique_ptr<webrtc::VideoDecoder> new_decoder;
if (allocated_decoders_.count(video_format) > 0) {
RTC_LOG(LS_WARNING)
<< "VideoReceiveStream configured with duplicate codecs: "
<< video_format.name;
continue;
}
auto it = old_decoders->find(video_format); auto it = old_decoders->find(video_format);
if (it != old_decoders->end()) { if (it != old_decoders->end()) {
new_decoder = std::move(it->second); new_decoder = std::move(it->second);