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

Side by Side 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: AndroidCdmFactory use a fetcher factory instead of a fetcher; addressed more comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/cdm/browser_cdm_manager.h" 5 #include "content/browser/media/cdm/browser_cdm_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/task_runner.h" 13 #include "base/task_runner.h"
14 #include "content/public/browser/browser_context.h" 14 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
17 #include "content/public/browser/permission_manager.h" 17 #include "content/public/browser/permission_manager.h"
18 #include "content/public/browser/permission_type.h" 18 #include "content/public/browser/permission_type.h"
19 #include "content/public/browser/render_frame_host.h" 19 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
21 #include "content/public/browser/render_process_host_observer.h" 21 #include "content/public/browser/render_process_host_observer.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "media/base/cdm_config.h" 23 #include "media/base/cdm_config.h"
24 #include "media/base/cdm_factory.h" 24 #include "media/base/cdm_factory.h"
25 #include "media/base/cdm_promise.h" 25 #include "media/base/cdm_promise.h"
26 #include "media/base/limits.h" 26 #include "media/base/limits.h"
27 27
28 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
29 #include "content/browser/media/android/url_provision_fetcher.h"
29 #include "content/public/common/renderer_preferences.h" 30 #include "content/public/common/renderer_preferences.h"
30 #include "media/base/android/android_cdm_factory.h" 31 #include "media/base/android/android_cdm_factory.h"
31 #endif 32 #endif
32 33
33 namespace content { 34 namespace content {
34 35
35 using media::MediaKeys; 36 using media::MediaKeys;
36 37
37 namespace { 38 namespace {
38 39
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 Send(new CdmMsg_RejectPromise(render_frame_id, cdm_id, promise_id, exception, 272 Send(new CdmMsg_RejectPromise(render_frame_id, cdm_id, promise_id, exception,
272 system_code, error_message)); 273 system_code, error_message));
273 } 274 }
274 275
275 media::CdmFactory* BrowserCdmManager::GetCdmFactory() { 276 media::CdmFactory* BrowserCdmManager::GetCdmFactory() {
276 if (!cdm_factory_) { 277 if (!cdm_factory_) {
277 // Create a new CdmFactory. 278 // Create a new CdmFactory.
278 cdm_factory_ = GetContentClient()->browser()->CreateCdmFactory(); 279 cdm_factory_ = GetContentClient()->browser()->CreateCdmFactory();
279 280
280 #if defined(OS_ANDROID) 281 #if defined(OS_ANDROID)
281 if (!cdm_factory_) 282 if (!cdm_factory_) {
282 cdm_factory_.reset(new media::AndroidCdmFactory()); 283 // Create ProvisionFetcherFactory based on the render process context.
284 net::URLRequestContextGetter* context =
285 RenderProcessHost::FromID(render_process_id_)
286 ->GetBrowserContext()
287 ->GetRequestContext();
288 DCHECK(context);
289
290 scoped_ptr<media::ProvisionFetcherFactory> fetcher_factory;
291 fetcher_factory.reset(new URLProvisionFetcherFactory(context));
292
293 cdm_factory_.reset(new media::AndroidCdmFactory(fetcher_factory.Pass()));
294 }
283 #endif 295 #endif
284 } 296 }
285 297
286 return cdm_factory_.get(); 298 return cdm_factory_.get();
287 } 299 }
288 300
289 void BrowserCdmManager::OnSessionMessage(int render_frame_id, 301 void BrowserCdmManager::OnSessionMessage(int render_frame_id,
290 int cdm_id, 302 int cdm_id,
291 const std::string& session_id, 303 const std::string& session_id,
292 MediaKeys::MessageType message_type, 304 MediaKeys::MessageType message_type,
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 scoped_refptr<MediaKeys> cdm = GetCdm(render_frame_id, cdm_id); 721 scoped_refptr<MediaKeys> cdm = GetCdm(render_frame_id, cdm_id);
710 if (!cdm) { 722 if (!cdm) {
711 promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found."); 723 promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
712 return; 724 return;
713 } 725 }
714 726
715 cdm->LoadSession(session_type, session_id, promise.Pass()); 727 cdm->LoadSession(session_type, session_id, promise.Pass());
716 } 728 }
717 729
718 } // namespace content 730 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698