WebM support for new multipart VP9 string.

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/logging.h"
 #include "base/time/default_tick_clock.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ skipping 71 matching lines @@
 #else
   is_update_needed_ = false;
 #endif
 }
 
 void RenderMediaClient::RecordRapporURL(const std::string& metric,
                                         const GURL& url) {
   GetContentClient()->renderer()->RecordRapporURL(metric, url);
 }
 
-bool RenderMediaClient::IsSupportedVideoConfig(media::VideoCodec codec,
-                                               media::VideoCodecProfile profile,
-                                               int level) {
+bool IsHdrColorManagementEnabled() {

[hubbe, 2017/03/02 23:37:11]

Remove this function for now.

[chcunningham, 2017/03/07 02:27:56]

Done.

+  // TODO(hubbe): Wire this up.
+  return false;
+}
+
+bool IsSdrTransferFunction(gfx::ColorSpace::TransferID eotf) {

[hubbe, 2017/03/02 23:37:11]

Make this IsTransferFunctionSupported().

[chcunningham, 2017/03/07 02:27:56]

Done.

+  switch (eotf) {
+    case gfx::ColorSpace::TransferID::GAMMA22:
+    case gfx::ColorSpace::TransferID::BT709:
+    case gfx::ColorSpace::TransferID::SMPTE170M:
+    case gfx::ColorSpace::TransferID::BT2020_10:
+    case gfx::ColorSpace::TransferID::BT2020_12:
+    case gfx::ColorSpace::TransferID::IEC61966_2_1:
+      return true;
+    default:
+      return false;
+  }
+}
+
+bool RenderMediaClient::IsSupportedVideoConfig(
+    media::VideoCodec codec,
+    media::VideoCodecProfile profile,
+    int level,
+    gfx::ColorSpace::TransferID eotf) {
+  // TODO(chcunningham): Query decoders for codec profile support.
   switch (codec) {
+    case media::kCodecVP9:
+      // Color management required for HDR to not look terrible.
+      return IsSdrTransferFunction(eotf) || IsHdrColorManagementEnabled();

[servolk, 2017/03/02 18:56:36]

VP9 profile 0 is SDR, profile 2 is HDR. I believe we want to always return true
for profile 0 and do this check only for profile 2.

[chcunningham, 2017/03/02 23:13:08]

My understanding from hubbe is that profile 2 doesn't have to be HDR, it can
instead just be "wide gamut". This is what motivated the change from PS1 which
just checked profile. IIUC, eotf is the most direct check for "is HDR". Agree
that we could skip this check for earlier profiles, but this check should also
work (they won't use HDR eotf) and its probably simpler logic to go this route. 

[hubbe, 2017/03/02 23:37:11]

Just call IsTransferFunctionSupported() here.

[hubbe, 2017/03/02 23:37:11]

Profile 2 is just more bits per channel, and has nothing to do with HDR, or even
wide gamut.

Profile 2 is however a requirement for HDR.

+
     case media::kCodecH264:
     case media::kCodecVP8:
-    case media::kCodecVP9:
     case media::kCodecTheora:
       return true;
 
     case media::kUnknownVideoCodec:
     case media::kCodecVC1:
     case media::kCodecMPEG2:
     case media::kCodecMPEG4:
     case media::kCodecHEVC:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 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