Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_drm_bridge.cc

 // Copyright (c) 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/android/media_drm_bridge.h"
 
 #include <algorithm>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "jni/MediaDrmBridge_jni.h"
 #include "media/base/android/media_client_android.h"
+#include "media/base/android/media_codec_player.h"  // for GetMediaTaskRunner()
 #include "media/base/android/media_drm_bridge_delegate.h"
 #include "media/base/cdm_key_information.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
+#define RUN_CB_ON_MEDIA_THREAD(cb, ...)                              \
+  do {                                                               \
+    if (run_on_media_thread_ &&                                      \
+        !GetMediaTaskRunner()->BelongsToCurrentThread()) {           \
+      GetMediaTaskRunner()->PostTask(FROM_HERE,                      \
+                                     base::Bind(cb, ##__VA_ARGS__)); \
+    } else {                                                         \
+      cb.Run(__VA_ARGS__);                                           \
+    }                                                                \
+  } while (0)
+
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaLocalRef;
 
 namespace media {
 
 namespace {
 
@@ skipping 180 matching lines @@
   int32 os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
   if (os_major_version == 4 && os_minor_version == 4 && os_bugfix_version == 0)
     return false;
 
   return true;
 }
 
+// static
+bool MediaDrmBridge::CanCreate(const std::string& key_system,
+                               SecurityLevel widevine_security_level) {
+  if (!IsAvailable()) {
+    DVLOG(1) << __FUNCTION__ << ": DRM is not available";
+    return false;
+  }
+
+  UUID scheme_uuid = g_key_system_manager.Get().GetUUID(key_system);
+  if (scheme_uuid.empty()) {
+    DVLOG(1) << __FUNCTION__ << ": key system " << key_system
+             << " not supported";
+    return false;
+  }
+
+  if (key_system == kWidevineKeySystem &&
+      widevine_security_level != SECURITY_LEVEL_NONE &&
+      !std::equal(scheme_uuid.begin(), scheme_uuid.end(), kWidevineUuid)) {
+    NOTREACHED() << "Widevine security level " << widevine_security_level
+                 << "used with another key system";
+    return false;
+  }
+  return true;
+}
+
 // TODO(ddorwin): This is specific to Widevine. http://crbug.com/459400
 // static
 bool MediaDrmBridge::IsSecureDecoderRequired(SecurityLevel security_level) {
   DCHECK(IsAvailable());
   return SECURITY_LEVEL_1 == security_level;
 }
 
 // static
 std::vector<std::string> MediaDrmBridge::GetPlatformKeySystemNames() {
   return g_key_system_manager.Get().GetPlatformKeySystemNames();
 }
 
 // static
 bool MediaDrmBridge::IsKeySystemSupported(const std::string& key_system) {
   DCHECK(!key_system.empty());
   return IsKeySystemSupportedWithTypeImpl(key_system, "");
 }
 
 // static
 bool MediaDrmBridge::IsKeySystemSupportedWithType(
     const std::string& key_system,
     const std::string& container_mime_type) {
   DCHECK(!key_system.empty() && !container_mime_type.empty());
   return IsKeySystemSupportedWithTypeImpl(key_system, container_mime_type);
 }
 
+// static
 bool MediaDrmBridge::RegisterMediaDrmBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 MediaDrmBridge::MediaDrmBridge(
     const std::vector<uint8>& scheme_uuid,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
     const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb)
     : scheme_uuid_(scheme_uuid),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
       legacy_session_error_cb_(legacy_session_error_cb),
       session_keys_change_cb_(session_keys_change_cb),
-      session_expiration_update_cb_(session_expiration_update_cb) {
+      session_expiration_update_cb_(session_expiration_update_cb),
+      run_on_media_thread_(false),
+      weak_factory_(this) {
+  DVLOG(1) << "MediaDrmBridge::MediaDrmBridge";
+
+  // When this flag is set we need to repost the notifications about
+  // crypto became ready and a key had been added to the Media thread.
+  run_on_media_thread_ = GetMediaTaskRunner()->BelongsToCurrentThread();
+
+  // Create internal callbacks to repost Java new key notification and
+  // promise related notifications to the media thread.
+
+  base::WeakPtr<MediaDrmBridge> weak_this = weak_factory_.GetWeakPtr();
+
+  internal_keys_added_cb_ =
+      base::Bind(&MediaDrmBridge::InternalKeysAdded, weak_this);
+  internal_promise_resolved_cb_ =
+      base::Bind(&MediaDrmBridge::InternalPromiseResolved, weak_this);
+  internal_promise_resolved_with_session_cb_ = base::Bind(
+      &MediaDrmBridge::InternalPromiseResolvedWithSession, weak_this);
+  internal_promise_rejected_cb_ =
+      base::Bind(&MediaDrmBridge::InternalPromiseRejected, weak_this);
+
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
 
   ScopedJavaLocalRef<jbyteArray> j_scheme_uuid =
       base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size());
   j_media_drm_.Reset(Java_MediaDrmBridge_create(
       env, j_scheme_uuid.obj(), reinterpret_cast<intptr_t>(this)));
 }
 
 MediaDrmBridge::~MediaDrmBridge() {
   JNIEnv* env = AttachCurrentThread();
   player_tracker_.NotifyCdmUnset();
   if (!j_media_drm_.is_null())
     Java_MediaDrmBridge_destroy(env, j_media_drm_.obj());
 }
 
 // static
-scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
+scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> MediaDrmBridge::Create(
     const std::string& key_system,
+    SecurityLevel widevine_security_level,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
     const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb) {
-  scoped_ptr<MediaDrmBridge> media_drm_bridge;
+  scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> media_drm_bridge;
   if (!IsAvailable())
     return media_drm_bridge.Pass();
 
   UUID scheme_uuid = g_key_system_manager.Get().GetUUID(key_system);
   if (scheme_uuid.empty())
     return media_drm_bridge.Pass();
 
   media_drm_bridge.reset(
       new MediaDrmBridge(scheme_uuid, session_message_cb, session_closed_cb,
                          legacy_session_error_cb, session_keys_change_cb,
                          session_expiration_update_cb));
 
   if (media_drm_bridge->j_media_drm_.is_null())
     media_drm_bridge.reset();
 
+  if (key_system == kWidevineKeySystem &&

[ddorwin, 2015/09/16 20:42:21]

We shouldn't need the WV check here again.

+      widevine_security_level != SECURITY_LEVEL_NONE &&
+      !media_drm_bridge->SetSecurityLevel(widevine_security_level)) {
+    DVLOG(1) << __FUNCTION__ << ": failed to set security level "
+             << widevine_security_level;
+    media_drm_bridge.reset();
+  }
+
   return media_drm_bridge.Pass();
 }
 
 // static
-scoped_ptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport(
-    const std::string& key_system) {
-  return MediaDrmBridge::Create(
-      key_system, SessionMessageCB(), SessionClosedCB(), LegacySessionErrorCB(),
-      SessionKeysChangeCB(), SessionExpirationUpdateCB());
+scoped_ptr<MediaDrmBridge, BrowserCdmDeleter>
+MediaDrmBridge::CreateWithoutSessionSupport(const std::string& key_system) {
+  return MediaDrmBridge::Create(key_system, SECURITY_LEVEL_NONE,
+                                SessionMessageCB(), SessionClosedCB(),
+                                LegacySessionErrorCB(), SessionKeysChangeCB(),
+                                SessionExpirationUpdateCB());
 }
 
 bool MediaDrmBridge::SetSecurityLevel(SecurityLevel security_level) {
   if (security_level != SECURITY_LEVEL_NONE &&
       !std::equal(scheme_uuid_.begin(), scheme_uuid_.end(), kWidevineUuid)) {
     NOTREACHED() << "Widevine security level " << security_level
                  << "used with another key system";
     return false;
   }
 
@@ skipping 85 matching lines @@
     const std::string& session_id,
     scoped_ptr<media::NewSessionCdmPromise> promise) {
   NOTIMPLEMENTED() << "EME persistent sessions not yet supported on Android.";
   promise->reject(NOT_SUPPORTED_ERROR, 0, "LoadSession() is not supported.");
 }
 
 void MediaDrmBridge::UpdateSession(
     const std::string& session_id,
     const std::vector<uint8_t>& response,
     scoped_ptr<media::SimpleCdmPromise> promise) {
-  DVLOG(1) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__ << " session_id:" << session_id;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> j_response = base::android::ToJavaByteArray(
       env, vector_as_array(&response), response.size());
   ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
       env, reinterpret_cast<const uint8_t*>(session_id.data()),
       session_id.size());
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   Java_MediaDrmBridge_updateSession(env, j_media_drm_.obj(), j_session_id.obj(),
                                     j_response.obj(), promise_id);
 }
 
 void MediaDrmBridge::CloseSession(const std::string& session_id,
                                   scoped_ptr<media::SimpleCdmPromise> promise) {
   DVLOG(1) << __FUNCTION__;
+
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
       env, reinterpret_cast<const uint8_t*>(session_id.data()),
       session_id.size());
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
   Java_MediaDrmBridge_closeSession(env, j_media_drm_.obj(), j_session_id.obj(),
                                    promise_id);
 }
 
 void MediaDrmBridge::RemoveSession(
@@ skipping 11 matching lines @@
 int MediaDrmBridge::RegisterPlayer(const base::Closure& new_key_cb,
                                    const base::Closure& cdm_unset_cb) {
   return player_tracker_.RegisterPlayer(new_key_cb, cdm_unset_cb);
 }
 
 void MediaDrmBridge::UnregisterPlayer(int registration_id) {
   player_tracker_.UnregisterPlayer(registration_id);
 }
 
 void MediaDrmBridge::SetMediaCryptoReadyCB(const base::Closure& closure) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
+
   if (closure.is_null()) {
     media_crypto_ready_cb_.Reset();
     return;
   }
 
   DCHECK(media_crypto_ready_cb_.is_null());
 
   if (!GetMediaCrypto().is_null()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
     return;
   }
 
   media_crypto_ready_cb_ = closure;
 }
 
-void MediaDrmBridge::OnMediaCryptoReady(JNIEnv* env, jobject) {
+void MediaDrmBridge::OnMediaCryptoReady(JNIEnv* env, jobject j_media_drm) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
+
   DCHECK(!GetMediaCrypto().is_null());
-  if (!media_crypto_ready_cb_.is_null())
-    base::ResetAndReturn(&media_crypto_ready_cb_).Run();
+
+  if (media_crypto_ready_cb_.is_null())
+    return;
+
+  RUN_CB_ON_MEDIA_THREAD(base::ResetAndReturn(&media_crypto_ready_cb_));
 }
 
 void MediaDrmBridge::OnPromiseResolved(JNIEnv* env,
                                        jobject j_media_drm,
                                        jint j_promise_id) {
-  cdm_promise_adapter_.ResolvePromise(j_promise_id);
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
+  RUN_CB_ON_MEDIA_THREAD(internal_promise_resolved_cb_, j_promise_id);
+}
+
+void MediaDrmBridge::InternalPromiseResolved(uint32_t promise_id) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << ": promise_id:" << promise_id;
+  cdm_promise_adapter_.ResolvePromise(promise_id);
 }
 
 void MediaDrmBridge::OnPromiseResolvedWithSession(JNIEnv* env,
                                                   jobject j_media_drm,
                                                   jint j_promise_id,
                                                   jbyteArray j_session_id) {
-  cdm_promise_adapter_.ResolvePromise(j_promise_id,
-                                      GetSessionId(env, j_session_id));
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
+  RUN_CB_ON_MEDIA_THREAD(internal_promise_resolved_with_session_cb_,
+                         j_promise_id, GetSessionId(env, j_session_id));
+}
+
+void MediaDrmBridge::InternalPromiseResolvedWithSession(
+    uint32_t promise_id,
+    const std::string& session_id) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << ": promise_id:" << promise_id << " session_id:" << session_id;
+  cdm_promise_adapter_.ResolvePromise(promise_id, session_id);
 }
 
 void MediaDrmBridge::OnPromiseRejected(JNIEnv* env,
                                        jobject j_media_drm,
                                        jint j_promise_id,
                                        jstring j_error_message) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
   std::string error_message = ConvertJavaStringToUTF8(env, j_error_message);
-  cdm_promise_adapter_.RejectPromise(j_promise_id, MediaKeys::UNKNOWN_ERROR, 0,
+  RUN_CB_ON_MEDIA_THREAD(internal_promise_rejected_cb_, j_promise_id,
+                         error_message);
+}
+
+void MediaDrmBridge::InternalPromiseRejected(uint32_t promise_id,
+                                             const std::string& error_message) {
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << ": promise_id:" << promise_id << " error:" << error_message;
+  cdm_promise_adapter_.RejectPromise(promise_id, MediaKeys::UNKNOWN_ERROR, 0,
                                      error_message);
 }
 
 void MediaDrmBridge::OnSessionMessage(JNIEnv* env,
                                       jobject j_media_drm,
                                       jbyteArray j_session_id,
                                       jint j_message_type,
                                       jbyteArray j_message,
                                       jstring j_legacy_destination_url) {
   std::vector<uint8> message;
   JavaByteArrayToByteVector(env, j_message, &message);
   GURL legacy_destination_url =
       GURL(ConvertJavaStringToUTF8(env, j_legacy_destination_url));
   MediaKeys::MessageType message_type =
       GetMessageType(static_cast<RequestType>(j_message_type));
 
-  session_message_cb_.Run(GetSessionId(env, j_session_id), message_type,
-                          message, legacy_destination_url);
+  std::string session_id = GetSessionId(env, j_session_id);
+
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << " session_id:" << session_id;
+
+  // We need to preserve the order of messages. If the promise-related
+  // callbacks are posted to the Media thread, we have to do the same with
+  // all callbacks. See the comment in media_drm_proxy.h.
+  RUN_CB_ON_MEDIA_THREAD(session_message_cb_, session_id, message_type, message,
+                         legacy_destination_url);
 }
 
 void MediaDrmBridge::OnSessionClosed(JNIEnv* env,
                                      jobject j_media_drm,
                                      jbyteArray j_session_id) {
-  session_closed_cb_.Run(GetSessionId(env, j_session_id));
+  std::string session_id = GetSessionId(env, j_session_id);
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << " session_id:" << session_id;
+
+  RUN_CB_ON_MEDIA_THREAD(session_closed_cb_, session_id);

[ddorwin, 2015/09/16 20:42:21]

Should it be up to the caller to ensure this? At what layer is the contract
about threads? Unless it's being used to ensure synchronization (is it?), it
probably makes sense to move this up the stack. WDYT?

Would using something like
https://code.google.com/p/chromium/codesearch#chromium/src/media/blink/webmed...
when the CBs are created be better?

 }
 
 void MediaDrmBridge::OnSessionKeysChange(JNIEnv* env,
                                          jobject j_media_drm,
                                          jbyteArray j_session_id,
                                          jobjectArray j_keys_info,
                                          bool has_additional_usable_key) {
-  if (has_additional_usable_key)
-    player_tracker_.NotifyNewKey();
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__;
 
   CdmKeysInfo cdm_keys_info;
 
   size_t size = env->GetArrayLength(j_keys_info);
   DCHECK_GT(size, 0u);
 
   for (size_t i = 0; i < size; ++i) {
     ScopedJavaLocalRef<jobject> j_key_status(
         env, env->GetObjectArrayElement(j_keys_info, i));
 
@@ skipping 13 matching lines @@
              << key_status;
 
     // TODO(xhwang): Update CdmKeyInformation to take key_id and status in the
     // constructor.
     scoped_ptr<CdmKeyInformation> cdm_key_information(new CdmKeyInformation());
     cdm_key_information->key_id = key_id;
     cdm_key_information->status = key_status;
     cdm_keys_info.push_back(cdm_key_information.release());
   }
 
-  session_keys_change_cb_.Run(GetSessionId(env, j_session_id),
-                              has_additional_usable_key, cdm_keys_info.Pass());
+  RUN_CB_ON_MEDIA_THREAD(internal_keys_added_cb_, has_additional_usable_key);
+
+  std::string session_id = GetSessionId(env, j_session_id);
+
+  if (run_on_media_thread_ && !GetMediaTaskRunner()->BelongsToCurrentThread()) {
+    GetMediaTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(session_keys_change_cb_, session_id,
+                   has_additional_usable_key, base::Passed(&cdm_keys_info)));
+  } else {
+    session_keys_change_cb_.Run(session_id, has_additional_usable_key,
+                                cdm_keys_info.Pass());
+  }
+}
+
+void MediaDrmBridge::InternalKeysAdded(bool has_additional_usable_key) {
+  if (has_additional_usable_key)
+    player_tracker_.NotifyNewKey();
 }
 
 // According to MeidaDrm documentation [1], zero |expiry_time_ms| means the keys
 // will never expire. This will be translated into a NULL base::Time() [2],
 // which will then be mapped to a zero Java time [3]. The zero Java time is
 // passed to Blink which will then be translated to NaN [4], which is what the
 // spec uses to indicate that the license will never expire [5].
 // [1] http://developer.android.com/reference/android/media/MediaDrm.OnExpirationUpdateListener.html
 // [2] See base::Time::FromDoubleT()
 // [3] See base::Time::ToJavaTime()
 // [4] See MediaKeySession::expirationChanged()
 // [5] https://github.com/w3c/encrypted-media/issues/58
 void MediaDrmBridge::OnSessionExpirationUpdate(JNIEnv* env,
                                                jobject j_media_drm,
                                                jbyteArray j_session_id,
                                                jlong expiry_time_ms) {
-  DVLOG(2) << __FUNCTION__ << ": " << expiry_time_ms << " ms";
-  session_expiration_update_cb_.Run(
-      GetSessionId(env, j_session_id),
-      base::Time::FromDoubleT(expiry_time_ms / 1000.0));
+  std::string session_id = GetSessionId(env, j_session_id);
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__
+           << ": session_id:" << session_id << " expiration:" << expiry_time_ms
+           << " ms";
+
+  RUN_CB_ON_MEDIA_THREAD(session_expiration_update_cb_, session_id,
+                         base::Time::FromDoubleT(expiry_time_ms / 1000.0));
 }
 
 void MediaDrmBridge::OnLegacySessionError(JNIEnv* env,
                                           jobject j_media_drm,
                                           jbyteArray j_session_id,
                                           jstring j_error_message) {
+  std::string session_id = GetSessionId(env, j_session_id);
   std::string error_message = ConvertJavaStringToUTF8(env, j_error_message);
-  legacy_session_error_cb_.Run(GetSessionId(env, j_session_id),
-                               MediaKeys::UNKNOWN_ERROR, 0, error_message);
+
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__ << " session_id:" << session_id
+           << " error:" << error_message;
+
+  RUN_CB_ON_MEDIA_THREAD(legacy_session_error_cb_, session_id,
+                         MediaKeys::UNKNOWN_ERROR, 0, error_message);
 }
 
 ScopedJavaLocalRef<jobject> MediaDrmBridge::GetMediaCrypto() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaDrmBridge_getMediaCrypto(env, j_media_drm_.obj());
 }
 
 MediaDrmBridge::SecurityLevel MediaDrmBridge::GetSecurityLevel() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_security_level =
@@ skipping 15 matching lines @@
 void MediaDrmBridge::ResetDeviceCredentials(
     const ResetCredentialsCB& callback) {
   DCHECK(reset_credentials_cb_.is_null());
   reset_credentials_cb_ = callback;
   JNIEnv* env = AttachCurrentThread();
   Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
 }
 
 void MediaDrmBridge::OnResetDeviceCredentialsCompleted(
     JNIEnv* env, jobject, bool success) {
-  base::ResetAndReturn(&reset_credentials_cb_).Run(success);
+  DVLOG(1) << "MediaDrmBridge::" << __FUNCTION__ << ": success:" << success;
+
+  RUN_CB_ON_MEDIA_THREAD(base::ResetAndReturn(&reset_credentials_cb_), success);
 }
 
 }  // namespace media