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

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

Issue 1187573004: iOS HW H264 support. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Move unittest file. Created 5 years, 5 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
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/modules/video_coding/codecs/h264/include/h264.h"
14 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
15 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 16 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
16 #include "webrtc/system_wrappers/interface/logging.h" 17 #include "webrtc/system_wrappers/interface/logging.h"
17 18
18 namespace webrtc { 19 namespace webrtc {
19 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { 20 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) {
20 switch (codec_type) { 21 switch (codec_type) {
22 case kH264:
23 DCHECK(H264Decoder::IsSupported());
24 return H264Decoder::Create();
21 case kVp8: 25 case kVp8:
22 return VP8Decoder::Create(); 26 return VP8Decoder::Create();
23 case kVp9: 27 case kVp9:
24 return VP9Decoder::Create(); 28 return VP9Decoder::Create();
25 case kUnsupportedCodec: 29 case kUnsupportedCodec:
26 RTC_NOTREACHED(); 30 RTC_NOTREACHED();
27 return nullptr; 31 return nullptr;
28 } 32 }
29 RTC_NOTREACHED(); 33 RTC_NOTREACHED();
30 return nullptr; 34 return nullptr;
31 } 35 }
32 36
33 VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) { 37 VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) {
34 switch (codec_type) { 38 switch (codec_type) {
39 case kVideoCodecH264:
40 return VideoDecoder::kH264;
35 case kVideoCodecVP8: 41 case kVideoCodecVP8:
36 return VideoDecoder::kVp8; 42 return VideoDecoder::kVp8;
37 case kVideoCodecVP9: 43 case kVideoCodecVP9:
38 return VideoDecoder::kVp9; 44 return VideoDecoder::kVp9;
39 default: 45 default:
40 return VideoDecoder::kUnsupportedCodec; 46 return VideoDecoder::kUnsupportedCodec;
41 } 47 }
42 } 48 }
43 49
44 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper( 50 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return decoder_->Release(); 125 return decoder_->Release();
120 } 126 }
121 127
122 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() { 128 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() {
123 if (fallback_decoder_) 129 if (fallback_decoder_)
124 fallback_decoder_->Reset(); 130 fallback_decoder_->Reset();
125 return decoder_->Reset(); 131 return decoder_->Reset();
126 } 132 }
127 133
128 } // namespace webrtc 134 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698