Index: media/base/android/media_drm_bridge.h |
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h |
index f6a951f607749a10049441595a7753b374509c4d..ac3d0c8ee9e2756c6a739f4ed7371d4a8c5e0ce3 100644 |
--- a/media/base/android/media_drm_bridge.h |
+++ b/media/base/android/media_drm_bridge.h |
@@ -12,6 +12,7 @@ |
#include "base/android/scoped_java_ref.h" |
#include "base/callback.h" |
#include "base/memory/scoped_ptr.h" |
+#include "base/memory/weak_ptr.h" |
#include "media/base/browser_cdm.h" |
#include "media/base/cdm_promise_adapter.h" |
#include "media/base/media_export.h" |
@@ -34,10 +35,21 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
SECURITY_LEVEL_3 = 3, |
}; |
+ typedef scoped_ptr<base::android::ScopedJavaGlobalRef<jobject>> JavaObjectPtr; |
+ |
typedef base::Callback<void(bool)> ResetCredentialsCB; |
+ // Notification called when MediaCrypto object is ready. |
+ // Parameters: |
+ // |media_crypto| - global reference to MediaCrypto object |
+ // |needs_protected_surface| - true if protected surface is required. |
+ typedef base::Callback<void(JavaObjectPtr media_crypto, |
+ bool needs_protected_surface)> MediaCryptoReadyCB; |
xhwang
2015/09/29 17:28:24
nit: the new trend is to use "using" instead of "t
Tima Vaisburd
2015/09/29 19:55:44
Done.
|
+ |
~MediaDrmBridge() override; |
+ void DeleteOnCorrectThread() override; |
+ |
// Checks whether MediaDRM is available. |
// All other static methods check IsAvailable() internally. There's no need |
// to check IsAvailable() explicitly before calling them. |
@@ -61,7 +73,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
// 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, |
const SessionMessageCB& session_message_cb, |
const SessionClosedCB& session_closed_cb, |
@@ -72,8 +84,8 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
// 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. |
@@ -116,9 +128,9 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
// Sets callback which will be called when MediaCrypto is ready. |
// If |closure| is null, previously set callback will be cleared. |
- void SetMediaCryptoReadyCB(const base::Closure& closure); |
+ void SetMediaCryptoReadyCB(const MediaCryptoReadyCB& closure); |
xhwang
2015/09/29 17:28:23
nit: give |closure| a proper name, then also updat
Tima Vaisburd
2015/09/29 19:55:44
Done.
|
- // Called after a MediaCrypto object is created. |
+ // Called by Java after a MediaCrypto object is created. |
void OnMediaCryptoReady(JNIEnv* env, jobject j_media_drm); |
// Callbacks to resolve the promise for |promise_id|. |
@@ -186,6 +198,9 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
// video playback. |
bool IsProtectedSurfaceRequired(); |
+ // We use this pointer when we post SetMediaCryptoReadyCB onto UI thread. |
+ base::WeakPtr<MediaDrmBridge> WeakPtrForUIThread(); |
+ |
private: |
MediaDrmBridge(const std::vector<uint8>& scheme_uuid, |
const SessionMessageCB& session_message_cb, |
@@ -199,6 +214,13 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
// Get the security level of the media. |
SecurityLevel GetSecurityLevel(); |
+ // A helper method that calls a |player_tracker_| method on correct thread. |
+ void NotifyNewKeyOnCorrectThread(); |
+ |
+ // A helper method that posts or runs |media_crypto_ready_cb_|. |
+ void PostMediaCryptoReadyOnCorrectThread(const MediaCryptoReadyCB& cb, |
+ bool always_post_on_ui_thread); |
+ |
// UUID of the key system. |
std::vector<uint8> scheme_uuid_; |
@@ -212,7 +234,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
SessionKeysChangeCB session_keys_change_cb_; |
SessionExpirationUpdateCB session_expiration_update_cb_; |
- base::Closure media_crypto_ready_cb_; |
+ MediaCryptoReadyCB media_crypto_ready_cb_; |
ResetCredentialsCB reset_credentials_cb_; |
@@ -220,6 +242,16 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { |
CdmPromiseAdapter cdm_promise_adapter_; |
+ // Object for posting tasks on UI thread. |
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; |
+ |
+ // This flag is set when we use media thread for certain callbacks. |
+ bool use_media_thread_; |
xhwang
2015/09/29 17:28:24
nit: const
Tima Vaisburd
2015/09/29 19:55:44
Done.
|
+ |
+ // NOTE: Weak pointers must be invalidated before all other member variables. |
+ base::WeakPtrFactory<MediaDrmBridge> media_weak_factory_; |
+ base::WeakPtrFactory<MediaDrmBridge> ui_weak_factory_; |
xhwang
2015/09/29 17:28:23
note to my self: how to ensure thread safety?
xhwang
2015/09/29 17:28:55
oops, please ignore this one :)
|
+ |
DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); |
}; |