diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 00:20:20 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 00:20:20 +0000 |
| commit | e4d9491934ef4bb70aeac5c92cbe76e0399e7367 (patch) | |
| tree | 743748d7cc4708e501fb09cfe1e7805b1f1e3dce /media/ffmpeg | |
| parent | a1d41ed5a126c9426f986930fb420e0c9c3f7faa (diff) | |
| download | chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.zip chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.tar.gz chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.tar.bz2 | |
Revert 101418 - Fix aspect ratio and clarify video frame dimensions
BUG=18941,94861
TEST=video-aspect-ratio.html
Review URL: http://codereview.chromium.org/7864009
TBR=vrk@google.com
Review URL: http://codereview.chromium.org/7919006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 4 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index e0e40f3..65ab9bb 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -187,11 +187,11 @@ bool GetStreamByteCountOverRange(AVStream* stream, return true; } -int GetNaturalHeight(AVStream* stream) { +int GetSurfaceHeight(AVStream* stream) { return stream->codec->height; } -int GetNaturalWidth(AVStream* stream) { +int GetSurfaceWidth(AVStream* stream) { double aspect_ratio; if (stream->sample_aspect_ratio.num) diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 6f04e07..dec47df 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -105,10 +105,10 @@ MEDIA_EXPORT bool GetStreamByteCountOverRange(AVStream* stream, base::TimeDelta* range_start, base::TimeDelta* range_end); -// Calculates the natural width and height of the video using the video's +// Calculates the width and height of the video surface using the video's // encoded dimensions and sample_aspect_ratio. -int GetNaturalHeight(AVStream* stream); -int GetNaturalWidth(AVStream* stream); +int GetSurfaceHeight(AVStream* stream); +int GetSurfaceWidth(AVStream* stream); // Closes & destroys all AVStreams in the context and then closes & // destroys the AVFormatContext. |