admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a null decoder for h264 when not supported, instead of crashing.

Browse Source 
BUG=
NOTRY=true

Review-Url: https://codereview.webrtc.org/2091923002
Cr-Commit-Position: refs/heads/master@{#13311}
This commit is contained in:
noahric 2016-06-28 06:39:43 -07:00 committed by Commit bot
parent 31b2ec4e0d
commit 0dacbf5f62
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/video/video_decoder.cc
View File

@ -20,7 +20,15 @@ namespace webrtc {
VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) {
switch (codec_type) {
case kH264:
RTC_DCHECK(H264Decoder::IsSupported());
if (!H264Decoder::IsSupported()) {
// This could happen in a software-fallback for a codec type only
// supported externally (e.g. H.264 on iOS or Android) or in current
// usage in WebRtcVideoEngine2 if the external decoder fails to be
// created.
LOG(LS_ERROR) << "Unable to create an H.264 decoder fallback. "
<< "Decoding of this stream will be broken.";
return new NullVideoDecoder();
}
return H264Decoder::Create();
case kVp8:
return VP8Decoder::Create();