| Index: media/base/video_decoder_config.cc
|
| diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
|
| index fd57933ce79c07dc5c6c4198ce1f11739d87fd0e..8825e2d615dad96440497fed74f27c236d9c365e 100644
|
| --- a/media/base/video_decoder_config.cc
|
| +++ b/media/base/video_decoder_config.cc
|
| @@ -19,14 +19,13 @@
|
| VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
|
| VideoCodecProfile profile,
|
| VideoFrame::Format format,
|
| - VideoFrame::ColorSpace color_space,
|
| const gfx::Size& coded_size,
|
| const gfx::Rect& visible_rect,
|
| const gfx::Size& natural_size,
|
| const uint8* extra_data,
|
| size_t extra_data_size,
|
| bool is_encrypted) {
|
| - Initialize(codec, profile, format, color_space,
|
| + Initialize(codec, profile, format, VideoFrame::COLOR_SPACE_UNSPECIFIED,
|
| coded_size, visible_rect, natural_size, extra_data,
|
| extra_data_size, is_encrypted, true);
|
| }
|
| @@ -88,7 +87,6 @@
|
| codec_ = codec;
|
| profile_ = profile;
|
| format_ = format;
|
| - color_space_ = color_space;
|
| coded_size_ = coded_size;
|
| visible_rect_ = visible_rect;
|
| natural_size_ = natural_size;
|
| @@ -159,10 +157,42 @@
|
| return "";
|
| }
|
|
|
| +VideoCodec VideoDecoderConfig::codec() const {
|
| + return codec_;
|
| +}
|
| +
|
| +VideoCodecProfile VideoDecoderConfig::profile() const {
|
| + return profile_;
|
| +}
|
| +
|
| +VideoFrame::Format VideoDecoderConfig::format() const {
|
| + return format_;
|
| +}
|
| +
|
| +gfx::Size VideoDecoderConfig::coded_size() const {
|
| + return coded_size_;
|
| +}
|
| +
|
| +gfx::Rect VideoDecoderConfig::visible_rect() const {
|
| + return visible_rect_;
|
| +}
|
| +
|
| +gfx::Size VideoDecoderConfig::natural_size() const {
|
| + return natural_size_;
|
| +}
|
| +
|
| const uint8* VideoDecoderConfig::extra_data() const {
|
| if (extra_data_.empty())
|
| return NULL;
|
| return &extra_data_[0];
|
| }
|
|
|
| +size_t VideoDecoderConfig::extra_data_size() const {
|
| + return extra_data_.size();
|
| +}
|
| +
|
| +bool VideoDecoderConfig::is_encrypted() const {
|
| + return is_encrypted_;
|
| +}
|
| +
|
| } // namespace media
|
|
|