Make CanPlayType("vp9.2") return true

media/base/mime_util_internal.cc

 // Copyright 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/base/mime_util_internal.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 138 matching lines @@
           (level_idc >= 30 && level_idc <= 32) ||
           (level_idc >= 40 && level_idc <= 42) ||
           (level_idc >= 50 && level_idc <= 51));
 }
 
 // Handle parsing of vp9 codec IDs.
 static bool ParseVp9CodecID(const std::string& mime_type_lower_case,
                             const std::string& codec_id,
                             VideoCodecProfile* profile) {
   if (mime_type_lower_case == "video/webm") {
     if (codec_id == "vp9" || codec_id == "vp9.0") {

[ddorwin, 2016/10/04 00:43:13]

This CL does not do what the description says. "vp9.2" would only be supported
in WebM (MP4 starts with "vp09"), but that is not allowed here.

Also, there is an open question of how to specify other profiles (and additional
information, as supported for MP4 below) in WebM.

       // Profile is not included in the codec string. Assuming profile 0 to be
       // backward compatible.
       *profile = VP9PROFILE_PROFILE0;
       return true;
     }
     // TODO(kqyang): Should we support new codec string in WebM?
     return false;
   } else if (mime_type_lower_case == "audio/webm") {
     return false;
   }
@@ skipping 541 matching lines @@
   }
 
   if (ParseVp9CodecID(mime_type_lower_case, codec_id, out_profile)) {
     *codec = MimeUtil::VP9;
     *out_level = 1;
     switch (*out_profile) {
       case VP9PROFILE_PROFILE0:
         // Profile 0 should always be supported if VP9 is supported.
         *is_ambiguous = false;
         break;
+#if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_ANDROID)

[ddorwin, 2016/10/04 00:43:13]

Will we not fall back to libvpx on Android if the platform decoder does not
support profile 2?

[ddorwin, 2016/10/04 00:43:13]

You might mention that this is because libvpx supports it in the comment below.

+      // Profile 1 & 2 are always supported on X86, at least for

[ddorwin, 2016/10/04 00:43:13]

Please update the browser tests.

+      // unencrypted videos.
+      case VP9PROFILE_PROFILE1:

[ddorwin, 2016/10/04 00:43:13]

The description does not cover this.

+      case VP9PROFILE_PROFILE2:
+        if (is_encrypted)
+          *is_ambiguous = true;
+#endif

[ddorwin, 2016/10/04 00:43:13]

break;

       default:
         // We don't know if the underlying platform supports these profiles.
         // Need to add platform level querying to get supported profiles
         // (crbug/604566).
         *is_ambiguous = true;
     }
     return true;
   }
 
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
@@ skipping 68 matching lines @@
     const std::string& mime_type_lower_case,
     bool is_encrypted) const {
   Codec default_codec = Codec::INVALID_CODEC;
   if (!GetDefaultCodecLowerCase(mime_type_lower_case, &default_codec))
     return false;
   return IsCodecSupported(default_codec, mime_type_lower_case, is_encrypted);
 }
 
 }  // namespace internal
 }  // namespace media