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

Unified Diff: content/renderer/media/rtc_video_decoder.cc

Issue 457733002: Support for H264 HW offload for webRTC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Replace quick-n-dirty parser with existing H264 parser. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « no previous file | content/renderer/media/rtc_video_encoder.cc » ('j') | content/renderer/media/rtc_video_encoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698