| Index: chromecast/common/media/cma_param_traits.cc
|
| diff --git a/chromecast/common/media/cma_param_traits.cc b/chromecast/common/media/cma_param_traits.cc
|
| index d4590407b9ab1e2cc82e584de77cbacf8500ec09..ab0f62a32b0517e7edaa532252fb14d134c50c11 100644
|
| --- a/chromecast/common/media/cma_param_traits.cc
|
| +++ b/chromecast/common/media/cma_param_traits.cc
|
| @@ -78,6 +78,7 @@ void ParamTraits<media::VideoDecoderConfig>::Write(
|
| WriteParam(m, p.codec());
|
| WriteParam(m, p.profile());
|
| WriteParam(m, p.format());
|
| + WriteParam(m, p.color_space());
|
| WriteParam(m, p.coded_size());
|
| WriteParam(m, p.visible_rect());
|
| WriteParam(m, p.natural_size());
|
| @@ -98,21 +99,22 @@ bool ParamTraits<media::VideoDecoderConfig>::Read(
|
| media::VideoCodec codec;
|
| media::VideoCodecProfile profile;
|
| media::VideoPixelFormat format;
|
| + media::ColorSpace color_space;
|
| gfx::Size coded_size;
|
| gfx::Rect visible_rect;
|
| gfx::Size natural_size;
|
| bool is_encrypted;
|
| std::vector<uint8> extra_data;
|
| if (!ReadParam(m, iter, &codec) || !ReadParam(m, iter, &profile) ||
|
| - !ReadParam(m, iter, &format) || !ReadParam(m, iter, &coded_size) ||
|
| - !ReadParam(m, iter, &visible_rect) ||
|
| + !ReadParam(m, iter, &format) || !ReadParam(m, iter, &color_space) ||
|
| + !ReadParam(m, iter, &coded_size) || !ReadParam(m, iter, &visible_rect) ||
|
| !ReadParam(m, iter, &natural_size) ||
|
| !ReadParam(m, iter, &is_encrypted) || !ReadParam(m, iter, &extra_data))
|
| return false;
|
| const uint8* extra_data_ptr = nullptr;
|
| if (!extra_data.empty())
|
| extra_data_ptr = &extra_data[0];
|
| - *r = media::VideoDecoderConfig(codec, profile, format,
|
| + *r = media::VideoDecoderConfig(codec, profile, format, color_space,
|
| coded_size, visible_rect, natural_size,
|
| extra_data_ptr, extra_data.size(),
|
| is_encrypted);
|
|
|