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

Side by Side Diff: chromecast/media/cdm/cast_cdm_factory.cc

Issue 2586353002: [Chromecast][Clean-Up] Remove CastCdmProxy. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « chromecast/media/cdm/BUILD.gn ('k') | chromecast/media/cdm/cast_cdm_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromecast/media/cdm/cast_cdm_factory.h" 5 #include "chromecast/media/cdm/cast_cdm_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "chromecast/media/cdm/cast_cdm.h" 10 #include "chromecast/media/cdm/cast_cdm.h"
11 #include "media/base/bind_to_current_loop.h" 11 #include "media/base/bind_to_current_loop.h"
12 #include "media/base/cdm_config.h" 12 #include "media/base/cdm_config.h"
13 #include "media/base/cdm_key_information.h" 13 #include "media/base/cdm_key_information.h"
14 14
15 #if !defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
16 #include "chromecast/media/cdm/cast_cdm_proxy.h"
17 #endif // !defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
18
19 namespace chromecast { 15 namespace chromecast {
20 namespace media { 16 namespace media {
21 17
22 CastCdmFactory::CastCdmFactory( 18 CastCdmFactory::CastCdmFactory(
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 19 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
24 MediaResourceTracker* media_resource_tracker) 20 MediaResourceTracker* media_resource_tracker)
25 : media_resource_tracker_(media_resource_tracker), 21 : media_resource_tracker_(media_resource_tracker),
26 task_runner_(task_runner) { 22 task_runner_(task_runner) {
27 DCHECK(media_resource_tracker_); 23 DCHECK(media_resource_tracker_);
28 DCHECK(task_runner_); 24 DCHECK(task_runner_);
(...skipping 30 matching lines...) Expand all
59 return; 55 return;
60 } 56 }
61 57
62 task_runner_->PostTask( 58 task_runner_->PostTask(
63 FROM_HERE, 59 FROM_HERE,
64 base::Bind(&CastCdm::Initialize, base::Unretained(cast_cdm.get()), 60 base::Bind(&CastCdm::Initialize, base::Unretained(cast_cdm.get()),
65 ::media::BindToCurrentLoop(session_message_cb), 61 ::media::BindToCurrentLoop(session_message_cb),
66 ::media::BindToCurrentLoop(session_closed_cb), 62 ::media::BindToCurrentLoop(session_closed_cb),
67 ::media::BindToCurrentLoop(session_keys_change_cb), 63 ::media::BindToCurrentLoop(session_keys_change_cb),
68 ::media::BindToCurrentLoop(session_expiration_update_cb))); 64 ::media::BindToCurrentLoop(session_expiration_update_cb)));
69
70 // When using Mojo media, we do not need to proxy calls to the CMA thread. All
71 // calls are made on that thread already.
72 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
73 bound_cdm_created_cb.Run(cast_cdm, ""); 65 bound_cdm_created_cb.Run(cast_cdm, "");
74 #else
75 bound_cdm_created_cb.Run(new CastCdmProxy(cast_cdm, task_runner_), "");
76 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
77 } 66 }
78 67
79 scoped_refptr<CastCdm> CastCdmFactory::CreatePlatformBrowserCdm( 68 scoped_refptr<CastCdm> CastCdmFactory::CreatePlatformBrowserCdm(
80 const CastKeySystem& cast_key_system, 69 const CastKeySystem& cast_key_system,
81 const GURL& security_origin, 70 const GURL& security_origin,
82 const ::media::CdmConfig& cdm_config) { 71 const ::media::CdmConfig& cdm_config) {
83 return nullptr; 72 return nullptr;
84 } 73 }
85 74
86 } // namespace media 75 } // namespace media
87 } // namespace chromecast 76 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cdm/BUILD.gn ('k') | chromecast/media/cdm/cast_cdm_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698