Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1213)

Unified Diff: media/base/android/media_drm_bridge.h

Issue 2790783002: [Clank] Add JNI interface for media persistent license storage (Closed)
Patch Set: Fix lint Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3f37a685a022cac83f214d41889b1194b2d4c920..261b46256fea3f23d85a748cd110c300e1d1384b 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -18,7 +18,9 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/sequenced_task_runner_helpers.h"
+#include "media/base/android/android_util.h"
#include "media/base/android/media_drm_bridge_cdm_context.h"
+#include "media/base/android/media_drm_storage_bridge.h"
#include "media/base/cdm_promise.h"
#include "media/base/cdm_promise_adapter.h"
#include "media/base/content_decryption_module.h"
@@ -266,9 +268,6 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
// Get the security level of the media.
SecurityLevel GetSecurityLevel();
- // A helper method to create a JavaObjectPtr.
- JavaObjectPtr CreateJavaObjectPtr(jobject object);
-
// A helper method that is called when MediaCrypto is ready.
void NotifyMediaCryptoReady(JavaObjectPtr j_media_crypto);
@@ -285,6 +284,9 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
// UUID of the key system.
std::vector<uint8_t> scheme_uuid_;
+ // Persistent storage for session ID map.
+ MediaDrmStorageBridge storage_;
+
// Java MediaDrm instance.
base::android::ScopedJavaGlobalRef<jobject> j_media_drm_;
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaDrmStorageBridge.java ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698