diff options
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. |