Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: webrtc/video/video_decoder.cc

Issue 2091923002: Create a null decoder for h264 when not supported, instead of crashing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/video_decoder.h" 11 #include "webrtc/video_decoder.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/logging.h" 14 #include "webrtc/base/logging.h"
15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { 20 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) {
21 switch (codec_type) { 21 switch (codec_type) {
22 case kH264: 22 case kH264:
23 if (!H264Decoder::IsSupported()) {
24 // This could happen in a software-fallback for a codec type only
25 // supported externally (e.g. H.264 on iOS or Android) or in current
26 // usage in WebRtcVideoEngine2 if the external decoder fails to be
27 // created.
28 LOG(LS_ERROR) << "Unable to create a software H.264 decoder. "
29 << "Decoding of this stream will be broken.";
30 return new NullVideoDecoder();
31 }
23 RTC_DCHECK(H264Decoder::IsSupported()); 32 RTC_DCHECK(H264Decoder::IsSupported());
pbos-webrtc 2016/06/26 19:15:59 Remove this DCHECK.
noahric 2016/06/27 23:15:02 Done. Also changed the log line slightly, since it
24 return H264Decoder::Create(); 33 return H264Decoder::Create();
25 case kVp8: 34 case kVp8:
26 return VP8Decoder::Create(); 35 return VP8Decoder::Create();
27 case kVp9: 36 case kVp9:
28 RTC_DCHECK(VP9Decoder::IsSupported()); 37 RTC_DCHECK(VP9Decoder::IsSupported());
29 return VP9Decoder::Create(); 38 return VP9Decoder::Create();
30 case kUnsupportedCodec: 39 case kUnsupportedCodec:
31 LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec."; 40 LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
32 return new NullVideoDecoder(); 41 return new NullVideoDecoder();
33 } 42 }
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 176
168 int32_t NullVideoDecoder::Release() { 177 int32_t NullVideoDecoder::Release() {
169 return WEBRTC_VIDEO_CODEC_OK; 178 return WEBRTC_VIDEO_CODEC_OK;
170 } 179 }
171 180
172 const char* NullVideoDecoder::ImplementationName() const { 181 const char* NullVideoDecoder::ImplementationName() const {
173 return "NullVideoDecoder"; 182 return "NullVideoDecoder";
174 } 183 }
175 184
176 } // namespace webrtc 185 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698