diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 20:18:33 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 20:18:33 +0000 |
| commit | 2975fa5391dfd5c57def10929408d814c4acaf6d (patch) | |
| tree | 32e17ca77ac82b2adf3e36b23f3f7b7918b6b509 /media/ffmpeg | |
| parent | ef03e1ded45fe5dff2b3a783b1be554b5064dfea (diff) | |
| download | chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.zip chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.tar.gz chromium_src-2975fa5391dfd5c57def10929408d814c4acaf6d.tar.bz2 | |
Reland r101418: Fix aspect ratio and clarify video frame dimensions
Fixes shared build errors for windows and linux.
BUG=18941,94861
TEST=shared builds compile
TBR=acolwell
Review URL: http://codereview.chromium.org/7932005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101808 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 65ab9bb..e0e40f3 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -187,11 +187,11 @@ bool GetStreamByteCountOverRange(AVStream* stream, return true; } -int GetSurfaceHeight(AVStream* stream) { +int GetNaturalHeight(AVStream* stream) { return stream->codec->height; } -int GetSurfaceWidth(AVStream* stream) { +int GetNaturalWidth(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 dec47df..6f04e07 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 width and height of the video surface using the video's +// Calculates the natural width and height of the video using the video's // encoded dimensions and sample_aspect_ratio. -int GetSurfaceHeight(AVStream* stream); -int GetSurfaceWidth(AVStream* stream); +int GetNaturalHeight(AVStream* stream); +int GetNaturalWidth(AVStream* stream); // Closes & destroys all AVStreams in the context and then closes & // destroys the AVFormatContext. |