EME on Android: Improve accuracy of Key System availability.

media/base/key_systems.cc

 // Copyright 2013 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/key_systems.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "media/base/key_system_info.h"
+#include "media/base/media.h"
 #include "media/base/media_client.h"
 #include "media/cdm/key_system_names.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
 namespace media {
 
 const char kClearKeyKeySystem[] = "org.w3.clearkey";
 
 // These names are used by UMA. Do not change them!
 const char kClearKeyKeySystemNameForUMA[] = "ClearKey";
@@ skipping 374 matching lines @@
 #endif
     if (!can_block) {
       DCHECK(info.distinctive_identifier_support ==
              EmeFeatureSupport::ALWAYS_ENABLED);
       DCHECK(info.persistent_state_support ==
              EmeFeatureSupport::ALWAYS_ENABLED);
     }
 
     DCHECK_EQ(key_system_map_.count(info.key_system), 0u)
         << "Key system '" << info.key_system << "' already registered";
+
+#if defined(OS_ANDROID)
+    // Ensure that the renderer can access the decoders necessary to use the
+    // key system.
+    if (!info.use_aes_decryptor && !ArePlatformDecodersAvailable()) {
+      DLOG(WARNING) << info.key_system << " not registered";
+      continue;
+    }
+#endif  // defined(OS_ANDROID)
+
     key_system_map_[info.key_system] = info;
   }
 }
 
 // Adds the MIME type with the codec mask after verifying the validity.
 // Only this function should modify |mime_type_to_codec_mask_map_|.
 void KeySystemsImpl::RegisterMimeType(const std::string& mime_type,
                                       EmeCodec codecs_mask) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!mime_type_to_codec_mask_map_.count(mime_type));
@@ skipping 352 matching lines @@
                                uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
 }
 
 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type,
                                        uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask);
 }
 
 }  // namespace media