Chromium Code Reviews| Index: media/base/video_decoder_config.h |
| diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h |
| index 2c6bd45fc793f3c8940fdf3d16028db797e1a0bc..20da096d92a48f689efcb42b405a4bb70c92e812 100644 |
| --- a/media/base/video_decoder_config.h |
| +++ b/media/base/video_decoder_config.h |
| @@ -7,6 +7,7 @@ |
| #include "base/basictypes.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "libavutil/pixfmt.h" |
|
scherkus (not reviewing)
2011/09/28 17:32:17
in order to prevent FFmpeg types leaking into the
shadi1
2011/09/29 18:31:03
Done.
|
| #include "media/base/media_export.h" |
| #include "ui/gfx/rect.h" |
| #include "ui/gfx/size.h" |
| @@ -30,7 +31,9 @@ enum VideoCodec { |
| class MEDIA_EXPORT VideoDecoderConfig { |
| public: |
| - VideoDecoderConfig(VideoCodec codec, const gfx::Size& coded_size, |
| + VideoDecoderConfig(VideoCodec codec, |
| + PixelFormat pix_fmt, |
| + const gfx::Size& coded_size, |
| const gfx::Rect& visible_rect, |
| const gfx::Size& natural_size, |
| int frame_rate_numerator, int frame_rate_denominator, |
| @@ -38,6 +41,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
| ~VideoDecoderConfig(); |
| VideoCodec codec() const; |
| + PixelFormat pix_fmt() const; |
| gfx::Size coded_size() const; |
| gfx::Rect visible_rect() const; |
| gfx::Size natural_size() const; |
| @@ -49,6 +53,9 @@ class MEDIA_EXPORT VideoDecoderConfig { |
| private: |
| VideoCodec codec_; |
| + // Pixel format, used to determine U & V buffer sizes. |
| + PixelFormat pix_fmt_; |
| + |
| // Width and height of video frame immediately post-decode. Not all pixels |
| // in this region are valid. |
| gfx::Size coded_size_; |