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 61006a9520b751d79a63b2ca94eb050582558387..8849be19f423e82b7eca41a4854d81b0aac1daf3 100644 |
--- a/chromecast/common/media/cma_param_traits.cc |
+++ b/chromecast/common/media/cma_param_traits.cc |
@@ -79,7 +79,6 @@ |
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()); |
@@ -100,22 +99,21 @@ |
media::VideoCodec codec; |
media::VideoCodecProfile profile; |
media::VideoFrame::Format format; |
- media::VideoFrame::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, &color_space) || |
- !ReadParam(m, iter, &coded_size) || !ReadParam(m, iter, &visible_rect) || |
+ !ReadParam(m, iter, &format) || !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, color_space, |
+ *r = media::VideoDecoderConfig(codec, profile, format, |
coded_size, visible_rect, natural_size, |
extra_data_ptr, extra_data.size(), |
is_encrypted); |