Index: content/renderer/media/rtc_video_decoder.cc |
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc |
index 0b5ccda45dbeb2c5b7fe5d73459c4adf0827731c..ff35d3049e1b6d183c99c221f43371fbccb9da4d 100644 |
--- a/content/renderer/media/rtc_video_decoder.cc |
+++ b/content/renderer/media/rtc_video_decoder.cc |
@@ -116,6 +116,9 @@ scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create( |
case webrtc::kVideoCodecVP8: |
profile = media::VP8PROFILE_MAIN; |
break; |
+ case webrtc::kVideoCodecH264: |
+ profile = media::H264PROFILE_MAIN; |
+ break; |
default: |
DVLOG(2) << "Video codec not supported:" << type; |
return decoder.Pass(); |
@@ -142,8 +145,10 @@ scoped_ptr<RTCVideoDecoder> RTCVideoDecoder::Create( |
int32_t RTCVideoDecoder::InitDecode(const webrtc::VideoCodec* codecSettings, |
int32_t /*numberOfCores*/) { |
DVLOG(2) << "InitDecode"; |
- DCHECK_EQ(codecSettings->codecType, webrtc::kVideoCodecVP8); |
- if (codecSettings->codecSpecific.VP8.feedbackModeOn) { |
+ DCHECK(codecSettings->codecType == webrtc::kVideoCodecVP8 || |
Pawel Osciak
2014/08/10 00:30:29
We should verify against the type passed to Create
hshi1
2014/08/12 01:06:55
Done (requires passing |type| to ctor of RTCVD).
|
+ codecSettings->codecType == webrtc::kVideoCodecH264); |
+ if (codecSettings->codecType == webrtc::kVideoCodecVP8 && |
+ codecSettings->codecSpecific.VP8.feedbackModeOn) { |
LOG(ERROR) << "Feedback mode not supported"; |
return RecordInitDecodeUMA(WEBRTC_VIDEO_CODEC_ERROR); |
} |