Enable vp09 codec string in WebM by default

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 <map>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 75 matching lines @@
 static bool ParseVp9CodecID(const std::string& mime_type_lower_case,
                             const std::string& codec_id,
                             VideoCodecProfile* out_profile,
                             uint8_t* out_level,
                             VideoColorSpace* out_color_space) {
   if (mime_type_lower_case == "video/mp4") {
     // Only new style is allowed for mp4.
     return ParseNewStyleVp9CodecID(codec_id, out_profile, out_level,
                                    out_color_space);
   } else if (mime_type_lower_case == "video/webm") {
-    if (HasNewVp9CodecStringSupport() &&
-        ParseNewStyleVp9CodecID(codec_id, out_profile, out_level,
+    if (ParseNewStyleVp9CodecID(codec_id, out_profile, out_level,
                                 out_color_space)) {
       return true;
     }
 
     return ParseLegacyVp9CodecID(codec_id, out_profile, out_level);
   }
   return false;
 }
 
 static bool IsValidH264Level(uint8_t level_idc) {
@@ skipping 758 matching lines @@
 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
       case H264PROFILE_HIGH10PROFILE:
         // FFmpeg is not generally used for encrypted videos, so we do not
         // know whether 10-bit is supported.
         ambiguous_platform_support = is_encrypted;
         break;
 #endif
       default:
         ambiguous_platform_support = true;
     }
-  } else if (codec == MimeUtil::VP9 && video_profile != VP9PROFILE_PROFILE0) {
-    // We don't know if the underlying platform supports these profiles. Need
-    // to add platform level querying to get supported profiles.
-    // https://crbug.com/604566
+  } else if (codec == MimeUtil::VP9 && video_profile != VP9PROFILE_PROFILE0 &&
+             is_encrypted) {
+    // LibVPX is not generally used for encrypted videos, so we do not know
+    // whether higher profiles are supported.
+    // TODO(chcunningham/xhwang): Add details to indicate which key system will
+    // be used and check support by querying the matching KeySystemProperties.
     ambiguous_platform_support = true;
   }
 
   AudioCodec audio_codec = MimeUtilToAudioCodec(codec);
   if (audio_codec != kUnknownAudioCodec) {
     AudioConfig audio_config = {audio_codec};
 
     // If MediaClient is provided use it to check for decoder support.
     MediaClient* media_client = GetMediaClient();
     if (media_client && !media_client->IsSupportedAudioConfig(audio_config))
@@ skipping 77 matching lines @@
   if (mime_type == "audio/flac") {
     *default_codec = MimeUtil::FLAC;
     return true;
   }
 
   return false;
 }
 
 }  // namespace internal
 }  // namespace media