| 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..153ad38fef1cb22c7604b31a080f73e937d6fac5 100644
|
| --- a/media/base/video_decoder_config.h
|
| +++ b/media/base/video_decoder_config.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "media/base/media_export.h"
|
| +#include "media/base/video_frame.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,
|
| + VideoFrame::Format video_format,
|
| + 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;
|
| + VideoFrame::Format video_format() 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_;
|
|
|
| + // Video format, used to determine U & V buffer sizes.
|
| + VideoFrame::Format video_format_;
|
| +
|
| // Width and height of video frame immediately post-decode. Not all pixels
|
| // in this region are valid.
|
| gfx::Size coded_size_;
|
|
|