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

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 12045060: Add wrapper class to media for support of VP9 video, and add a command line flag to enable the supp… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add EoS DCHECK in VpxVideoDecoder::Decode(). Created 7 years, 11 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
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/filters/vpx_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 8b81e0141610b8430981d422e4381a553a208268..2ae0b1b804631d5906cedc2d52f1bdd747682f33 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -147,6 +147,8 @@ VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
return kCodecMPEG4;
case CODEC_ID_VP8:
return kCodecVP8;
+ case AV_CODEC_ID_VP9:
+ return kCodecVP9;
default:
DVLOG(1) << "Unknown video CodecID: " << codec_id;
}
@@ -163,6 +165,8 @@ static CodecID VideoCodecToCodecID(VideoCodec video_codec) {
return CODEC_ID_MPEG4;
case kCodecVP8:
return CODEC_ID_VP8;
+ case kCodecVP9:
+ return AV_CODEC_ID_VP9;
default:
DVLOG(1) << "Unknown VideoCodec: " << video_codec;
}
@@ -335,13 +339,28 @@ void AVStreamToVideoDecoderConfig(
aspect_ratio = stream->codec->sample_aspect_ratio;
VideoCodec codec = CodecIDToVideoCodec(stream->codec->codec_id);
- VideoCodecProfile profile = (codec == kCodecVP8) ? VP8PROFILE_MAIN :
- ProfileIDToVideoCodecProfile(stream->codec->profile);
+
+ VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
+ if (codec == kCodecVP8)
+ profile = VP8PROFILE_MAIN;
+ else if (codec == kCodecVP9)
+ profile = VP9PROFILE_MAIN;
+ else
+ profile = ProfileIDToVideoCodecProfile(stream->codec->profile);
+
gfx::Size natural_size = GetNaturalSize(
visible_rect.size(), aspect_ratio.num, aspect_ratio.den);
+
+ VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt);
+ if (codec == kCodecVP9) {
+ // TODO(tomfinegan): libavcodec doesn't know about VP9.
+ format = VideoFrame::YV12;
+ coded_size = natural_size;
+ }
+
config->Initialize(codec,
profile,
- PixelFormatToVideoFormat(stream->codec->pix_fmt),
+ format,
coded_size, visible_rect, natural_size,
stream->codec->extradata, stream->codec->extradata_size,
false, // Not encrypted.
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/filters/vpx_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698