Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_drm_bridge.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 
   typedef base::Callback<void(bool)> ResetCredentialsCB;
 
   ~MediaDrmBridge() override;
 
   // Checks whether MediaDRM is available.
   // All other static methods check IsAvailable() internally. There's no need
   // to check IsAvailable() explicitly before calling them.
   static bool IsAvailable();
 
+  // Checks whether we can create the DRM for key system and security level.
+  static bool CanCreate(const std::string& key_system,
+                        SecurityLevel widevine_security_level);
+
   // Checks whether |key_system| is supported.
   static bool IsKeySystemSupported(const std::string& key_system);
 
   // Returns the list of the platform-supported key system names that
   // are not handled by Chrome explicitly.
   static std::vector<std::string> GetPlatformKeySystemNames();
 
   // Checks whether |key_system| is supported with |container_mime_type|.
   // |container_mime_type| must not be empty.
   static bool IsKeySystemSupportedWithType(
       const std::string& key_system,
       const std::string& container_mime_type);
 
   static bool RegisterMediaDrmBridge(JNIEnv* env);
 
   // Returns a MediaDrmBridge instance if |key_system| is supported, or a NULL
   // pointer otherwise.
   // TODO(xhwang): Is it okay not to update session expiration info?
-  static scoped_ptr<MediaDrmBridge> Create(
+  static scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> 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);
 
   // Returns a MediaDrmBridge instance if |key_system| is supported, or a NULL
   // otherwise. No session callbacks are provided. This is used when we need to
   // use MediaDrmBridge without creating any sessions.
-  static scoped_ptr<MediaDrmBridge> CreateWithoutSessionSupport(
-      const std::string& key_system);
+  static scoped_ptr<MediaDrmBridge, BrowserCdmDeleter>
+  CreateWithoutSessionSupport(const std::string& key_system);
 
   // Returns true if |security_level| is successfully set, or false otherwise.
   // Call this function right after Create() and before any other calls.
   // Note:
   // - If this function is not called, the default security level of the device
   //   will be used.
   // - It's recommended to call this function only once on a MediaDrmBridge
   //   object. Calling this function multiples times may cause errors.
   bool SetSecurityLevel(SecurityLevel security_level);
 
@@ skipping 105 matching lines @@
                  const SessionClosedCB& session_closed_cb,
                  const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb);
 
   static bool IsSecureDecoderRequired(SecurityLevel security_level);
 
   // Get the security level of the media.
   SecurityLevel GetSecurityLevel();
 
+  void InternalPromiseResolved(uint32_t promise_id);
+  void InternalPromiseResolvedWithSession(uint32_t promise_id,
+                                          const std::string& session_id);
+  void InternalPromiseRejected(uint32_t promise_id,
+                               const std::string& error_message);
+  void InternalSessionKeysChanged(const std::string& session_id,
+                                  bool has_additional_usable_key,
+                                  CdmKeysInfo cdm_keys_info);
+
+  void InternalKeysAdded(bool has_additional_usable_key);
+
   // UUID of the key system.
   std::vector<uint8> scheme_uuid_;
 
   // Java MediaDrm instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_drm_;
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
   LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
   base::Closure media_crypto_ready_cb_;
 
   ResetCredentialsCB reset_credentials_cb_;
 
   PlayerTrackerImpl player_tracker_;
 
   CdmPromiseAdapter cdm_promise_adapter_;
 
+  // Callbacks for posting Java notifications to Media thread
+  typedef base::Callback<void(uint32_t)> PromiseCallback;
+  typedef base::Callback<void(uint32_t, const std::string&)> PromiseWSCallback;
+  typedef base::Callback<void(bool)> KeysAddedCallback;
+
+  PromiseCallback internal_promise_resolved_cb_;
+  PromiseWSCallback internal_promise_resolved_with_session_cb_;
+  PromiseWSCallback internal_promise_rejected_cb_;
+  SessionKeysChangeCB internal_session_keys_changed_cb_;
+
+  KeysAddedCallback internal_keys_added_cb_;
+
+  bool run_on_media_thread_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_