Reland: Change the video color space default.

media/filters/vpx_video_decoder.cc

 // Copyright (c) 2012 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/filters/vpx_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 444 matching lines @@
                                      const struct vpx_image* vpx_image_alpha,
                                      scoped_refptr<VideoFrame>* video_frame) {
   CHECK(vpx_image);
   CHECK(vpx_image->fmt == VPX_IMG_FMT_I420 ||
         vpx_image->fmt == VPX_IMG_FMT_YV12 ||
         vpx_image->fmt == VPX_IMG_FMT_I444);
 
   VideoPixelFormat codec_format = PIXEL_FORMAT_YV12;
   int uv_rows = (vpx_image->d_h + 1) / 2;
 
-  ColorSpace color_space = COLOR_SPACE_UNSPECIFIED;
   if (vpx_image->fmt == VPX_IMG_FMT_I444) {
     CHECK(!vpx_codec_alpha_);
     codec_format = PIXEL_FORMAT_YV24;
     uv_rows = vpx_image->d_h;
   } else if (vpx_codec_alpha_) {
     codec_format = PIXEL_FORMAT_YV12A;
   }
+
+  // Default to the color space from the config, but if the bistream specifies
+  // one, prefer that instead.
+  ColorSpace color_space = config_.color_space();
   if (vpx_image->cs == VPX_CS_BT_709)
     color_space = COLOR_SPACE_HD_REC709;
+  else if (vpx_image->cs == VPX_CS_BT_601)
+    color_space = COLOR_SPACE_SD_REC601;
 
   // The mixed |w|/|d_h| in |coded_size| is intentional. Setting the correct
   // coded width is necessary to allow coalesced memory access, which may avoid
   // frame copies. Setting the correct coded height however does not have any
   // benefit, and only risk copying too much data.
   const gfx::Size coded_size(vpx_image->w, vpx_image->d_h);
   const gfx::Size visible_size(vpx_image->d_w, vpx_image->d_h);
 
   if (!vpx_codec_alpha_ && memory_pool_.get()) {
     *video_frame = VideoFrame::WrapExternalYuvData(
@@ skipping 41 matching lines @@
         vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
     return;
   }
   CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
              vpx_image_alpha->stride[VPX_PLANE_Y],
              vpx_image_alpha->d_h,
              video_frame->get());
 }
 
 }  // namespace media