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

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

Issue 1970343002: Make sure WebRTC works without libvpx VP9 support. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: sort headers Created 4 years, 7 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 | « webrtc/video/full_stack.cc ('k') | webrtc/video/video_encoder.cc » ('j') | 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 RTC_DCHECK(H264Decoder::IsSupported()); 23 RTC_DCHECK(H264Decoder::IsSupported());
24 return H264Decoder::Create(); 24 return H264Decoder::Create();
25 case kVp8: 25 case kVp8:
26 return VP8Decoder::Create(); 26 return VP8Decoder::Create();
27 case kVp9: 27 case kVp9:
28 RTC_DCHECK(VP9Decoder::IsSupported());
28 return VP9Decoder::Create(); 29 return VP9Decoder::Create();
29 case kUnsupportedCodec: 30 case kUnsupportedCodec:
30 LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec."; 31 LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
31 return new NullVideoDecoder(); 32 return new NullVideoDecoder();
32 } 33 }
33 RTC_NOTREACHED(); 34 RTC_NOTREACHED();
34 return nullptr; 35 return nullptr;
35 } 36 }
36 37
37 VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) { 38 VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 167
167 int32_t NullVideoDecoder::Release() { 168 int32_t NullVideoDecoder::Release() {
168 return WEBRTC_VIDEO_CODEC_OK; 169 return WEBRTC_VIDEO_CODEC_OK;
169 } 170 }
170 171
171 const char* NullVideoDecoder::ImplementationName() const { 172 const char* NullVideoDecoder::ImplementationName() const {
172 return "NullVideoDecoder"; 173 return "NullVideoDecoder";
173 } 174 }
174 175
175 } // namespace webrtc 176 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/full_stack.cc ('k') | webrtc/video/video_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698