use VideoColorSpace in decoder configuration

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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 580 matching lines @@
   // 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 || vpx_image->cs == VPX_CS_SMPTE_170)
     color_space = COLOR_SPACE_SD_REC601;
   (*video_frame)
       ->metadata()
       ->SetInteger(VideoFrameMetadata::COLOR_SPACE, color_space);
 
-  if (config_.color_space_info() != gfx::ColorSpace()) {
+  if (config_.color_space_info() != VideoColorSpace()) {
     // config_.color_space_info() comes from the color tag which is
     // more expressive than the bitstream, so prefer it over the
     // bitstream data below.
-    (*video_frame)->set_color_space(config_.color_space_info());
+    (*video_frame)
+        ->set_color_space(config_.color_space_info().ToGfxColorSpace());
   } else {
     gfx::ColorSpace::PrimaryID primaries = gfx::ColorSpace::PrimaryID::INVALID;
     gfx::ColorSpace::TransferID transfer = gfx::ColorSpace::TransferID::INVALID;
     gfx::ColorSpace::MatrixID matrix = gfx::ColorSpace::MatrixID::INVALID;
     gfx::ColorSpace::RangeID range = vpx_image->range == VPX_CR_FULL_RANGE
                                          ? gfx::ColorSpace::RangeID::FULL
                                          : gfx::ColorSpace::RangeID::LIMITED;
 
     switch (vpx_image->cs) {
       case VPX_CS_BT_601:
@@ skipping 229 matching lines @@
       (*video_frame)->visible_data(VideoFrame::kUPlane),
       (*video_frame)->stride(VideoFrame::kUPlane),
       (*video_frame)->visible_data(VideoFrame::kVPlane),
       (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
       coded_size.height());
 
   return true;
 }
 
 }  // namespace media