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

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

Issue 1427183002: Move MediaDrmBridge provision communication to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: For on-demand provisioning the fetcher is created in content/ and depends on the renderer. Created 5 years, 1 month 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: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index 7294ef40c4d78752c14987e4b71c9edc56024b3f..04e983567d1b4bcf4e5251c1a483860ed7c7b7e1 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -25,6 +25,7 @@
#include "media/base/limits.h"
#if defined(OS_ANDROID)
+#include "content/public/browser/android/cdm_provision_fetcher.h"
#include "content/public/common/renderer_preferences.h"
#endif
@@ -539,11 +540,22 @@ void BrowserCdmManager::AddCdm(int render_frame_id,
DCHECK(task_runner_->RunsTasksOnCurrentThread());
DCHECK(!GetCdm(render_frame_id, cdm_id));
+ scoped_ptr<media::ProvisionFetcher> provision_fetcher;
+
+#if defined(OS_ANDROID)
+ net::URLRequestContextGetter* context =
+ RenderProcessHost::FromID(render_process_id_)
+ ->GetBrowserContext()
+ ->GetRequestContext();
+ DCHECK(context);
+ provision_fetcher = CDMProvisionFetcher::CreateWithURLContext(context);
xhwang 2015/11/06 23:08:18 Can you just create a URLProvisionFetch directly h
Tima Vaisburd 2015/11/11 03:03:34 Done.
+#endif
+
scoped_ptr<SimplePromise> promise(new SimplePromise(
weak_ptr_factory_.GetWeakPtr(), render_frame_id, cdm_id, promise_id));
ScopedBrowserCdmPtr cdm(media::CreateBrowserCdm(
- key_system, use_hw_secure_codecs,
+ key_system, use_hw_secure_codecs, provision_fetcher.Pass(),
Tima Vaisburd 2015/11/05 02:24:07 I pass |provision_fetcher| here as a parameter, an
Tima Vaisburd 2015/11/05 02:28:54 An alternative could be adding another factory met
xhwang 2015/11/06 23:08:19 See comments above. ProvisionFetcher is only used
Tima Vaisburd 2015/11/11 03:03:34 Done.
xhwang 2015/11/11 09:53:21 MediaClients are consumed by media/, which has no
Tima Vaisburd 2015/11/11 23:26:35 MediaClient is not used for the provisioning purpo
BROWSER_CDM_MANAGER_CB(OnSessionMessage),
BROWSER_CDM_MANAGER_CB(OnSessionClosed),
BROWSER_CDM_MANAGER_CB(OnLegacySessionError),

Powered by Google App Engine
This is Rietveld 408576698