diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 00:49:07 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 00:49:07 +0000 |
| commit | 3360355599b28cc4874db9b51ce5a2146d779aa6 (patch) | |
| tree | 86b40540df09e85972036773b6dbedd61e5c25f7 /media/ffmpeg/ffmpeg_common.h | |
| parent | f28dd7b26f0ec615bb56ab393429466757f4c93f (diff) | |
| download | chromium_src-3360355599b28cc4874db9b51ce5a2146d779aa6.zip chromium_src-3360355599b28cc4874db9b51ce5a2146d779aa6.tar.gz chromium_src-3360355599b28cc4874db9b51ce5a2146d779aa6.tar.bz2 | |
Clean up VideoDecoderConfig and replace VideoCodecInfo with a bool.
Similar to AudioDecoderConfig that was introduced in r102183, add Initialize() and IsValidConfig() to VideoDecoderConfig and update documentation. This helps pave the way to remove DemuxerStream::GetAVStream().
Since natural_size isn't used by neither VideoDecoderConfig nor VideoDecodeEngines, remove it from both and replace VideoCodecInfo with a bool.
Review URL: http://codereview.chromium.org/8084021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_common.h')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 9248e18..cc15e58 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -15,6 +15,7 @@ #include "media/base/channel_layout.h" #include "media/base/media_export.h" #include "media/video/video_decode_engine.h" +#include "ui/gfx/size.h" // Include FFmpeg header files. extern "C" { @@ -87,8 +88,7 @@ base::TimeDelta GetFrameDuration(AVStream* stream); // Calculates the natural width and height of the video using the video's // encoded dimensions and sample_aspect_ratio. -int GetNaturalHeight(AVStream* stream); -int GetNaturalWidth(AVStream* stream); +gfx::Size GetNaturalSize(AVStream* stream); // Closes & destroys all AVStreams in the context and then closes & // destroys the AVFormatContext. |