Assign color spaces to video frames.

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 567 matching lines @@
   // 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 || vpx_image->cs == VPX_CS_SMPTE_170)
     color_space = COLOR_SPACE_SD_REC601;
   (*video_frame)
       ->metadata()
       ->SetInteger(VideoFrameMetadata::COLOR_SPACE, color_space);
+
+  gfx::ColorSpace::PrimaryID primaries =
+      gfx::ColorSpace::PrimaryID::UNSPECIFIED;
+  gfx::ColorSpace::TransferID transfer =
+      gfx::ColorSpace::TransferID::UNSPECIFIED;
+  gfx::ColorSpace::MatrixID matrix = gfx::ColorSpace::MatrixID::UNSPECIFIED;
+  gfx::ColorSpace::RangeID range = vpx_image->range == VPX_CR_FULL_RANGE
+                                       ? gfx::ColorSpace::RangeID::FULL
+                                       : gfx::ColorSpace::RangeID::LIMITED;
+
+  switch (vpx_image->cs) {

[DaleCurtis, 2016/08/16 18:58:03]

Worth caching?

[hubbe, 2016/08/16 19:24:57]

No, gfx::ColorSpace is super-lightweight unless you use custom transfer
functions or primaries (which are not even supported yet.)

+    case VPX_CS_BT_601:
+    case VPX_CS_SMPTE_170:
+      primaries = gfx::ColorSpace::PrimaryID::SMPTE170M;
+      transfer = gfx::ColorSpace::TransferID::SMPTE170M;
+      matrix = gfx::ColorSpace::MatrixID::SMPTE170M;
+      break;
+    case VPX_CS_SMPTE_240:
+      primaries = gfx::ColorSpace::PrimaryID::SMPTE240M;
+      transfer = gfx::ColorSpace::TransferID::SMPTE240M;
+      matrix = gfx::ColorSpace::MatrixID::SMPTE240M;
+      break;
+    case VPX_CS_BT_709:
+      primaries = gfx::ColorSpace::PrimaryID::BT709;
+      transfer = gfx::ColorSpace::TransferID::BT709;
+      matrix = gfx::ColorSpace::MatrixID::BT709;
+      break;
+    case VPX_CS_BT_2020:
+      primaries = gfx::ColorSpace::PrimaryID::BT2020;
+      if (vpx_image->bit_depth >= 12) {
+        transfer = gfx::ColorSpace::TransferID::BT2020_12;
+      } else if (vpx_image->bit_depth >= 10) {
+        transfer = gfx::ColorSpace::TransferID::BT2020_10;
+      } else {
+        transfer = gfx::ColorSpace::TransferID::BT709;
+      }
+      matrix = gfx::ColorSpace::MatrixID::BT2020_NCL;  // is this right?
+      break;
+    case VPX_CS_SRGB:
+      primaries = gfx::ColorSpace::PrimaryID::BT709;
+      transfer = gfx::ColorSpace::TransferID::IEC61966_2_1;
+      matrix = gfx::ColorSpace::MatrixID::BT709;
+      break;
+
+    default:
+      break;
+  }
+
+  if (primaries != gfx::ColorSpace::PrimaryID::UNSPECIFIED) {
+    (*video_frame)
+        ->set_color_space(gfx::ColorSpace(primaries, transfer, matrix, range));
+  }
+
   return true;
 }
 
 VpxVideoDecoder::AlphaDecodeStatus VpxVideoDecoder::DecodeAlphaPlane(
     const struct vpx_image* vpx_image,
     const struct vpx_image** vpx_image_alpha,
     const scoped_refptr<DecoderBuffer>& buffer) {
   if (!vpx_codec_alpha_ || buffer->side_data_size() < 8) {
     return kAlphaPlaneProcessed;
   }
@@ skipping 133 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