Reland: Change the video color space default.

media/mojo/services/media_type_converters.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 "media/mojo/services/media_type_converters.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffering_state.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
@@ skipping 124 matching lines @@
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV16, VIDEO_FORMAT_YV16);
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV12A, VIDEO_FORMAT_YV12A);
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV24, VIDEO_FORMAT_YV24);
 #if defined(OS_MACOSX)
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_NV12, VIDEO_FORMAT_NV12);
 #endif
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_ARGB, VIDEO_FORMAT_ARGB);
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_XRGB, VIDEO_FORMAT_XRGB);
 ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_MAX, VIDEO_FORMAT_FORMAT_MAX);
 
+// ColorSpace.
+ASSERT_ENUM_EQ_RAW(ColorSpace,
+                   COLOR_SPACE_UNSPECIFIED,
+                   COLOR_SPACE_UNSPECIFIED);
+ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_JPEG, COLOR_SPACE_JPEG);
+ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_HD_REC709, COLOR_SPACE_HD_REC709);
+ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_SD_REC601, COLOR_SPACE_SD_REC601);
+ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_MAX, COLOR_SPACE_MAX);
+
 // VideoCodec
 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, Theora);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP8);
 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP9);
 ASSERT_ENUM_EQ_RAW(VideoCodec, kVideoCodecMax, VIDEO_CODEC_Max);
@@ skipping 263 matching lines @@
 }
 
 // static
 VideoDecoderConfigPtr
 TypeConverter<VideoDecoderConfigPtr, media::VideoDecoderConfig>::Convert(
     const media::VideoDecoderConfig& input) {
   VideoDecoderConfigPtr config(VideoDecoderConfig::New());
   config->codec = static_cast<VideoCodec>(input.codec());
   config->profile = static_cast<VideoCodecProfile>(input.profile());
   config->format = static_cast<VideoFormat>(input.format());
+  config->color_space = static_cast<ColorSpace>(input.color_space());
   config->coded_size = Size::From(input.coded_size());
   config->visible_rect = Rect::From(input.visible_rect());
   config->natural_size = Size::From(input.natural_size());
   if (input.extra_data()) {
     std::vector<uint8_t> data(input.extra_data(),
                               input.extra_data() + input.extra_data_size());
     config->extra_data.Swap(&data);
   }
   config->is_encrypted = input.is_encrypted();
   return config.Pass();
 }
 
 // static
 media::VideoDecoderConfig
 TypeConverter<media::VideoDecoderConfig, VideoDecoderConfigPtr>::Convert(
     const VideoDecoderConfigPtr& input) {
   media::VideoDecoderConfig config;
   config.Initialize(
       static_cast<media::VideoCodec>(input->codec),
       static_cast<media::VideoCodecProfile>(input->profile),
       static_cast<media::VideoPixelFormat>(input->format),
-      media::COLOR_SPACE_UNSPECIFIED, input->coded_size.To<gfx::Size>(),
-      input->visible_rect.To<gfx::Rect>(), input->natural_size.To<gfx::Size>(),
+      static_cast<media::ColorSpace>(input->color_space),
+      input->coded_size.To<gfx::Size>(), input->visible_rect.To<gfx::Rect>(),
+      input->natural_size.To<gfx::Size>(),
       input->extra_data.size() ? &input->extra_data.front() : NULL,
       input->extra_data.size(), input->is_encrypted, false);
   return config;
 }
 
 // static
 CdmKeyInformationPtr
 TypeConverter<CdmKeyInformationPtr, media::CdmKeyInformation>::Convert(
     const media::CdmKeyInformation& input) {
   CdmKeyInformationPtr info(CdmKeyInformation::New());
@@ skipping 30 matching lines @@
 media::CdmConfig TypeConverter<media::CdmConfig, CdmConfigPtr>::Convert(
     const CdmConfigPtr& input) {
   media::CdmConfig config;
   config.allow_distinctive_identifier = input->allow_distinctive_identifier;
   config.allow_persistent_state = input->allow_persistent_state;
   config.use_hw_secure_codecs = input->use_hw_secure_codecs;
   return config;
 }
 
 }  // namespace mojo