New media/base/decode_capabilities.h|cc

content/renderer/media/render_media_client.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 "content/renderer/media/render_media_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time/default_tick_clock.h"
 #include "content/public/common/content_client.h"
@@ skipping 75 matching lines @@
 #else
   is_update_needed_ = false;
 #endif
 }
 
 void RenderMediaClient::RecordRapporURL(const std::string& metric,
                                         const GURL& url) {
   GetContentClient()->renderer()->RecordRapporURL(metric, url);
 }
 
-bool IsColorSpaceSupported(const media::VideoColorSpace& color_space) {

[hubbe, 2017/03/23 18:14:30]

I'm confused, where did this code go?

[chcunningham, 2017/03/23 19:20:53]

Its now in media/base/decode_capabiliites.cc.

The idea is that these color/decode capabilities are really default capabilities
for media/.  media/ should be in the business of describing those capabilities
(rather than doing it here in content/).

Embedders of content who wish to *customize* media capabilities should describe
their additions/subtractions in their specific MediaClient implementation. 

This design is discussed a bit more between me and xhwang in this CL
https://codereview.chromium.org/2712983004/

[hubbe, 2017/03/23 19:33:00]

I don't see that in this CL though.
I expected a LARGE RED BLOCK to be matched by a LARGE GREEN BLOCK elsewhere...

 

[chcunningham, 2017/03/23 19:37:47]

Unless I've messed it up, you should find all of this IsColorSpaceSupported
here, but you will have to "expand all" to see it. Its not a large green block
becuase git is detecting decode_capabilities as a rename of render_media_client
- which is probably what we want anyway.

https://codereview.chromium.org/2758873003/diff/1/media/base/decode_capabilit...

[hubbe, 2017/03/23 19:42:42]

Ah, super confusing.

-  bool color_management =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableHDR) ||
-      base::FeatureList::IsEnabled(media::kVideoColorManagement);
-  switch (color_space.primaries) {
-    case media::VideoColorSpace::PrimaryID::EBU_3213_E:
-    case media::VideoColorSpace::PrimaryID::INVALID:
-      return false;
-
-    // Transfers supported without color management.
-    case media::VideoColorSpace::PrimaryID::BT709:
-    case media::VideoColorSpace::PrimaryID::UNSPECIFIED:
-    case media::VideoColorSpace::PrimaryID::BT470M:
-    case media::VideoColorSpace::PrimaryID::BT470BG:
-    case media::VideoColorSpace::PrimaryID::SMPTE170M:
-      break;
-
-    // Supported with color management.
-    case media::VideoColorSpace::PrimaryID::SMPTE240M:
-    case media::VideoColorSpace::PrimaryID::FILM:
-    case media::VideoColorSpace::PrimaryID::BT2020:
-    case media::VideoColorSpace::PrimaryID::SMPTEST428_1:
-    case media::VideoColorSpace::PrimaryID::SMPTEST431_2:
-    case media::VideoColorSpace::PrimaryID::SMPTEST432_1:
-      if (!color_management)
-        return false;
-      break;
-  }
-
-  switch (color_space.transfer) {
-    // Transfers supported without color management.
-    case media::VideoColorSpace::TransferID::UNSPECIFIED:
-    case media::VideoColorSpace::TransferID::GAMMA22:
-    case media::VideoColorSpace::TransferID::BT709:
-    case media::VideoColorSpace::TransferID::SMPTE170M:
-    case media::VideoColorSpace::TransferID::BT2020_10:
-    case media::VideoColorSpace::TransferID::BT2020_12:
-    case media::VideoColorSpace::TransferID::IEC61966_2_1:
-      break;
-
-    // Supported with color management.
-    case media::VideoColorSpace::TransferID::GAMMA28:
-    case media::VideoColorSpace::TransferID::SMPTE240M:
-    case media::VideoColorSpace::TransferID::LINEAR:
-    case media::VideoColorSpace::TransferID::LOG:
-    case media::VideoColorSpace::TransferID::LOG_SQRT:
-    case media::VideoColorSpace::TransferID::BT1361_ECG:
-    case media::VideoColorSpace::TransferID::SMPTEST2084:
-    case media::VideoColorSpace::TransferID::IEC61966_2_4:
-    case media::VideoColorSpace::TransferID::SMPTEST428_1:
-    case media::VideoColorSpace::TransferID::ARIB_STD_B67:
-      if (!color_management)
-        return false;
-      break;
-
-    // Never supported.
-    case media::VideoColorSpace::TransferID::INVALID:
-      return false;
-  }
-
-  switch (color_space.matrix) {
-    // Supported without color management.
-    case media::VideoColorSpace::MatrixID::BT709:
-    case media::VideoColorSpace::MatrixID::UNSPECIFIED:
-    case media::VideoColorSpace::MatrixID::BT470BG:
-    case media::VideoColorSpace::MatrixID::SMPTE170M:
-    case media::VideoColorSpace::MatrixID::BT2020_NCL:
-      break;
-
-    // Supported with color management.
-    case media::VideoColorSpace::MatrixID::RGB:
-    case media::VideoColorSpace::MatrixID::FCC:
-    case media::VideoColorSpace::MatrixID::SMPTE240M:
-    case media::VideoColorSpace::MatrixID::YCOCG:
-    case media::VideoColorSpace::MatrixID::YDZDX:
-    case media::VideoColorSpace::MatrixID::BT2020_CL:
-      if (!color_management)
-        return false;
-      break;
-
-    // Never supported.
-    case media::VideoColorSpace::MatrixID::INVALID:
-      return false;
-  }
-
-  if (color_space.range == gfx::ColorSpace::RangeID::INVALID)
-    return false;
-
-  return true;
-}
-
 bool RenderMediaClient::IsSupportedVideoConfig(
     const media::VideoConfig& config) {
-  // TODO(chcunningham): Query decoders for codec profile support.
-  switch (config.codec) {
-    case media::kCodecVP9:
-      // Color management required for HDR to not look terrible.
-      return IsColorSpaceSupported(config.color_space);
-
-    case media::kCodecH264:
-    case media::kCodecVP8:
-    case media::kCodecTheora:
-      return true;
-
-    case media::kUnknownVideoCodec:
-    case media::kCodecVC1:
-    case media::kCodecMPEG2:
-    case media::kCodecMPEG4:
-    case media::kCodecHEVC:
-    case media::kCodecDolbyVision:
-      return false;
-  }
-
-  NOTREACHED();
-  return false;
+  // Render media client does not customize decoder support. Defer to media/.
+  return ::media::IsSupportedVideoConfig(config);
 }
 
 void RenderMediaClient::SetTickClockForTesting(
     std::unique_ptr<base::TickClock> tick_clock) {
   tick_clock_.swap(tick_clock);
 }
 
 // static
 RenderMediaClient* RenderMediaClient::GetInstance() {
   static RenderMediaClient* client = new RenderMediaClient();
   return client;
 }
 
 }  // namespace content