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

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

Issue 1808983002: media: Add MediaDrmBridgeCdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 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.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index a5975f3662f0aef3552040e326c8ccf2de0a37bb..2b1a83ffd9bc2890e65e04e6520e7861ac546c35 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -465,6 +465,12 @@ void MediaDrmBridge::RemoveSession(
promise->reject(NOT_SUPPORTED_ERROR, 0, "RemoveSession() is not supported.");
}
+CdmContext* MediaDrmBridge::GetCdmContext() {
+ DVLOG(2) << __FUNCTION__;
+
+ return &media_drm_bridge_cdm_context_;
+}
+
void MediaDrmBridge::DeleteOnCorrectThread() const {
DVLOG(1) << __FUNCTION__;
@@ -761,6 +767,7 @@ MediaDrmBridge::MediaDrmBridge(
session_keys_change_cb_(session_keys_change_cb),
session_expiration_update_cb_(session_expiration_update_cb),
task_runner_(base::ThreadTaskRunnerHandle::Get()),
+ media_drm_bridge_cdm_context_(this),
weak_factory_(this) {
DVLOG(1) << __FUNCTION__;

Powered by Google App Engine
This is Rietveld 408576698