Make CanPlayType return "probably" for HI10P h264 videos.

media/base/mime_util_internal.cc

Index: media/base/mime_util_internal.cc
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
index e9b38f1191801c55e0e7d4e7092cfaf7a1c92140..1a2937ecebc3f260cbc42129c0369b032dc4bc6a 100644
--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
@@ -283,7 +283,7 @@ SupportsType MimeUtil::AreSupportedCodecs(
   for (size_t i = 0; i < codecs.size(); ++i) {
     bool is_ambiguous = true;
     Codec codec = INVALID_CODEC;
-    if (!StringToCodec(codecs[i], &codec, &is_ambiguous))
+    if (!StringToCodec(codecs[i], &codec, &is_ambiguous, is_encrypted))
       return IsNotSupported;
 
     if (!IsCodecSupported(codec, mime_type_lower_case, is_encrypted) ||
@@ -324,7 +324,7 @@ void MimeUtil::InitializeMimeTypeMaps() {
     for (size_t j = 0; j < mime_type_codecs.size(); ++j) {
       Codec codec = INVALID_CODEC;
       bool is_ambiguous = true;
-      CHECK(StringToCodec(mime_type_codecs[j], &codec, &is_ambiguous));
+      CHECK(StringToCodec(mime_type_codecs[j], &codec, &is_ambiguous, false));
       DCHECK(!is_ambiguous);
       codecs.insert(codec);
     }
@@ -533,7 +533,8 @@ bool MimeUtil::IsCodecSupportedOnPlatform(
 
 bool MimeUtil::StringToCodec(const std::string& codec_id,
                              Codec* codec,
-                             bool* is_ambiguous) const {
+                             bool* is_ambiguous,
+                             bool is_encrypted) const {
   StringToCodecMappings::const_iterator itr =
       string_to_codec_map_.find(codec_id);
   if (itr != string_to_codec_map_.end()) {
@@ -556,10 +557,26 @@ bool MimeUtil::StringToCodec(const std::string& codec_id,
   uint8_t level_idc = 0;
   if (ParseAVCCodecId(codec_id, &profile, &level_idc)) {
     *codec = MimeUtil::H264;
-    *is_ambiguous =
-        (profile != H264PROFILE_BASELINE && profile != H264PROFILE_MAIN &&
-         profile != H264PROFILE_HIGH) ||
-        !IsValidH264Level(level_idc);
+    switch (profile) {
+      case H264PROFILE_BASELINE:
+      case H264PROFILE_MAIN:
+      case H264PROFILE_HIGH:
+#if !defined(OS_ANDROID)

[ddorwin, 2016/03/31 05:58:44]

This means that Chromecast (and other platforms that don't use FFmpeg) will
claim to support Hi10. We need to be more selective and potentially limit it to
FFmpeg H.264 decoder-using platforms.

The tests probably need to be conditioned similarly.

[hubbe, 2016/03/31 21:53:48]

Hmm, after reading a bunch of config files, I *think*, I have the right
condition, but it's not easy to be sure.

+      // HIGH10PROFILE is supported through fallback to
+      // ffmpeg decoder, which is not available on android.
+      case H264PROFILE_HIGH10PROFILE:
+        if (is_encrypted) {

[ddorwin, 2016/03/31 05:44:05]

All of the above profiles fall through to here. This should make
chrome/browser/media/encrypted_media_supported_types_browsertest.cc fail.

[hubbe, 2016/03/31 21:53:48]

Oops, fixed.

+          // Currently we do not support EME on 10-bit videos.

[ddorwin, 2016/03/31 05:44:05]

Should we return false instead?

[hubbe, 2016/03/31 21:53:48]

We don't do that for any of the other profiles we don't support, why do it here?

+          *is_ambiguous = true;
+          break;
+        }
+#endif
+
+        *is_ambiguous = !IsValidH264Level(level_idc);
+        break;
+      default:
+        *is_ambiguous = true;
+    }
     return true;
   }