| Index: media/base/video_decoder_config.h
|
| diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h
|
| index e5b59a9c392bb6c40711f9237bc19f9d7273ac4f..2154b9a4875e87d1a9d3b2358f9c573add93727e 100644
|
| --- a/media/base/video_decoder_config.h
|
| +++ b/media/base/video_decoder_config.h
|
| @@ -78,6 +78,7 @@ class MEDIA_EXPORT VideoDecoderConfig {
|
| VideoDecoderConfig(VideoCodec codec,
|
| VideoCodecProfile profile,
|
| VideoPixelFormat format,
|
| + ColorSpace color_space,
|
| const gfx::Size& coded_size,
|
| const gfx::Rect& visible_rect,
|
| const gfx::Size& natural_size,
|
| @@ -114,38 +115,44 @@ class MEDIA_EXPORT VideoDecoderConfig {
|
|
|
| std::string GetHumanReadableCodecName() const;
|
|
|
| - VideoCodec codec() const;
|
| - VideoCodecProfile profile() const;
|
| + VideoCodec codec() const { return codec_; }
|
| + VideoCodecProfile profile() const { return profile_; }
|
|
|
| // Video format used to determine YUV buffer sizes.
|
| - VideoPixelFormat format() const;
|
| + VideoPixelFormat format() const { return format_; }
|
| +
|
| + // The default color space of the decoded frames. Decoders should output
|
| + // frames tagged with this color space unless they find a different value in
|
| + // the bitstream.
|
| + ColorSpace color_space() const { return color_space_; }
|
|
|
| // Width and height of video frame immediately post-decode. Not all pixels
|
| // in this region are valid.
|
| - gfx::Size coded_size() const;
|
| + gfx::Size coded_size() const { return coded_size_; }
|
|
|
| // Region of |coded_size_| that is visible.
|
| - gfx::Rect visible_rect() const;
|
| + gfx::Rect visible_rect() const { return visible_rect_; }
|
|
|
| // Final visible width and height of a video frame with aspect ratio taken
|
| // into account.
|
| - gfx::Size natural_size() const;
|
| + gfx::Size natural_size() const { return natural_size_; }
|
|
|
| // Optional byte data required to initialize video decoders, such as H.264
|
| // AAVC data.
|
| const uint8* extra_data() const;
|
| - size_t extra_data_size() const;
|
| + size_t extra_data_size() const { return extra_data_.size(); }
|
|
|
| // Whether the video stream is potentially encrypted.
|
| // Note that in a potentially encrypted video stream, individual buffers
|
| // can be encrypted or not encrypted.
|
| - bool is_encrypted() const;
|
| + bool is_encrypted() const { return is_encrypted_; }
|
|
|
| private:
|
| VideoCodec codec_;
|
| VideoCodecProfile profile_;
|
|
|
| VideoPixelFormat format_;
|
| + ColorSpace color_space_;
|
|
|
| gfx::Size coded_size_;
|
| gfx::Rect visible_rect_;
|
|
|