diff options
| author | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 06:11:11 +0000 |
|---|---|---|
| committer | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 06:11:11 +0000 |
| commit | 8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb (patch) | |
| tree | 9a6d2704abb023429859df32847f1f8ecbc16ef0 /media/ffmpeg | |
| parent | d8ef715b6145fb3bd9cc70fd051c71b84bb7715b (diff) | |
| download | chromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.zip chromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.tar.gz chromium_src-8dd02cb229fc0736e9b354ac1cdfa27c5e77d6fb.tar.bz2 | |
Reland r97895: Use surface_width/height instead of coded_width/coded_height for VideoFrame size
The media_unittests needed to be adjusted to reflect the change made in
the dimensions used to create VideoFrames in FFmpegVideoDecodeEngine.
BUG=91506
TEST=media_unittests
Review URL: http://codereview.chromium.org/7714016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index d03715e..65ab9bb 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -188,7 +188,7 @@ bool GetStreamByteCountOverRange(AVStream* stream, } int GetSurfaceHeight(AVStream* stream) { - return stream->codec->coded_height; + return stream->codec->height; } int GetSurfaceWidth(AVStream* stream) { @@ -201,7 +201,7 @@ int GetSurfaceWidth(AVStream* stream) { else aspect_ratio = 1.0; - int width = floor(stream->codec->coded_width * aspect_ratio + 0.5); + int width = floor(stream->codec->width * aspect_ratio + 0.5); // An even width makes things easier for YV12 and appears to be the behavior // expected by WebKit layout tests. |