diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 00:20:34 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 00:20:34 +0000 |
| commit | c5aee829d059e260b518a2229fdfed6359ec8f46 (patch) | |
| tree | 2bc24bcb8ff9777680ee94d7c7b25432cf19369e /media/ffmpeg | |
| parent | c6051eb0778c0167a05edbd0851110458b0d8b85 (diff) | |
| download | chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.zip chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.tar.gz chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.tar.bz2 | |
Remove VideoDecoderConfig::aspect_ratio_xxx methods.
BUG=122913
Review URL: https://chromiumcodereview.appspot.com/10830110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 1a4e418..740459f 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -5,6 +5,7 @@ #include "media/ffmpeg/ffmpeg_common.h" #include "base/logging.h" +#include "media/base/video_util.h" namespace media { @@ -250,12 +251,12 @@ void AVStreamToVideoDecoderConfig( VideoCodec codec = CodecIDToVideoCodec(stream->codec->codec_id); VideoCodecProfile profile = (codec == kCodecVP8) ? VP8PROFILE_MAIN : ProfileIDToVideoCodecProfile(stream->codec->profile); + gfx::Size natural_size = GetNaturalSize( + visible_rect.size(), aspect_ratio.num, aspect_ratio.den); config->Initialize(codec, profile, PixelFormatToVideoFormat(stream->codec->pix_fmt), - coded_size, visible_rect, - aspect_ratio.num, - aspect_ratio.den, + coded_size, visible_rect, natural_size, stream->codec->extradata, stream->codec->extradata_size, true); |