New media/base/decode_capabilities.h|cc

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 692 matching lines @@
       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
     ambiguous_platform_support = true;
   }
 
-  if (GetMediaClient() && video_codec != kUnknownVideoCodec &&
-      !GetMediaClient()->IsSupportedVideoConfig(
-          {video_codec, video_profile, video_level, color_space})) {
-    return IsNotSupported;
+  if (video_codec != kUnknownVideoCodec) {
+    VideoConfig video_config = {video_codec, video_profile, video_level,
+                                color_space};
+
+    // If MediaClient is provided use it to check for decoder support.
+    MediaClient* media_client = GetMediaClient();
+    if (media_client && !media_client->IsSupportedVideoConfig(video_config))
+      return IsNotSupported;
+
+    // When no MediaClient is provided, assume default decoders are available
+    // as described by media::IsSupportedVideoConfig().
+    if (!media_client && !IsSupportedVideoConfig(video_config))
+      return IsNotSupported;
   }
 
 #if defined(OS_ANDROID)
   // TODO(chcunningham): Delete this. Android platform support should be
-  // handled by (android specific) MediaClient.
+  // handled by (android specific) media::IsSupportedVideoConfig() above.
   if (!IsCodecSupportedOnAndroid(codec, mime_type_lower_case, is_encrypted,
                                  platform_info_)) {
     return IsNotSupported;
   }
 #endif
 
   return ambiguous_platform_support ? MayBeSupported : IsSupported;
 }
 
 bool MimeUtil::IsCodecProprietary(Codec codec) const {
@@ skipping 46 matching lines @@
 SupportsType MimeUtil::IsDefaultCodecSupported(const std::string& mime_type,
                                                bool is_encrypted) const {
   Codec default_codec = Codec::INVALID_CODEC;
   if (!GetDefaultCodec(mime_type, &default_codec))
     return IsNotSupported;
   return IsSimpleCodecSupported(mime_type, default_codec, is_encrypted);
 }
 
 }  // namespace internal
 }  // namespace media