Reland: Change the video color space default.

chromecast/common/media/cma_param_traits.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/common/media/cma_param_traits.h"
 
 #include <vector>
 
 #include "chromecast/common/media/cma_param_traits_macros.h"
 #include "content/public/common/common_param_traits.h"
@@ skipping 60 matching lines @@
 void ParamTraits<media::AudioDecoderConfig>::Log(
     const media::AudioDecoderConfig& p, std::string* l) {
   l->append(base::StringPrintf("<AudioDecoderConfig>"));
 }
 
 void ParamTraits<media::VideoDecoderConfig>::Write(
     Message* m, const media::VideoDecoderConfig& p) {
   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());
   WriteParam(m, p.is_encrypted());
   std::vector<uint8> extra_data;
   if (p.extra_data_size() > 0) {
     extra_data =
         std::vector<uint8>(p.extra_data(),
                            p.extra_data() + p.extra_data_size());
   }
   WriteParam(m, extra_data);
 }
 
 bool ParamTraits<media::VideoDecoderConfig>::Read(
     const Message* m,
     base::PickleIterator* iter,
     media::VideoDecoderConfig* r) {
   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);
   return true;
 }
 
 void ParamTraits<media::VideoDecoderConfig>::Log(
     const media::VideoDecoderConfig& p, std::string* l) {
   l->append(base::StringPrintf("<VideoDecoderConfig>"));
 }
 
 }  // namespace IPC