Index: webrtc/video/video_decoder.cc |
diff --git a/webrtc/video/video_decoder.cc b/webrtc/video/video_decoder.cc |
index 9dde1aeb1ef5f7b2205f7f1a346e78941015ebd4..949f6afe81a2c955381e71db95ad1b443ae3f860 100644 |
--- a/webrtc/video/video_decoder.cc |
+++ b/webrtc/video/video_decoder.cc |
@@ -11,6 +11,7 @@ |
#include "webrtc/video_decoder.h" |
#include "webrtc/base/checks.h" |
+#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" |
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" |
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" |
#include "webrtc/system_wrappers/interface/logging.h" |
@@ -18,6 +19,9 @@ |
namespace webrtc { |
VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { |
switch (codec_type) { |
+ case kH264: |
+ DCHECK(IsH264CodecSupported()); |
pbos-webrtc
2015/06/25 20:20:14
H264Encoder::IsSupported()
|
+ return H264Decoder::Create(); |
case kVp8: |
return VP8Decoder::Create(); |
case kVp9: |
@@ -32,6 +36,8 @@ VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { |
VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) { |
switch (codec_type) { |
+ case kVideoCodecH264: |
pbos-webrtc
2015/06/25 20:20:14
No DCHECK here?
tkchin_webrtc
2015/06/25 21:37:49
Why? It doesn't make sense to me that enum convers
pbos-webrtc
2015/06/26 05:28:31
My bad, didn't pay attention here. :)
|
+ return VideoDecoder::kH264; |
case kVideoCodecVP8: |
return VideoDecoder::kVp8; |
case kVideoCodecVP9: |