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

Side by Side Diff: chromecast/browser/media/cast_browser_cdm_factory.cc

Issue 1142513004: Chromecast: MessageLoopProxy cleanup --> SingleThreadTaskRunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 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 "chromecast/browser/media/cast_browser_cdm_factory.h" 5 #include "chromecast/browser/media/cast_browser_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/message_loop/message_loop_proxy.h" 9 #include "base/single_thread_task_runner.h"
10 #include "chromecast/browser/media/cma_message_loop.h" 10 #include "chromecast/browser/media/cma_message_loop.h"
11 #include "chromecast/media/cdm/browser_cdm_cast.h" 11 #include "chromecast/media/cdm/browser_cdm_cast.h"
12 #include "media/base/bind_to_current_loop.h" 12 #include "media/base/bind_to_current_loop.h"
13 #include "media/base/cdm_key_information.h" 13 #include "media/base/cdm_key_information.h"
14 14
15 namespace chromecast { 15 namespace chromecast {
16 namespace media { 16 namespace media {
17 17
18 scoped_ptr<::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm( 18 scoped_ptr<::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm(
19 const std::string& key_system_name, 19 const std::string& key_system_name,
20 bool use_hw_secure_codecs, 20 bool use_hw_secure_codecs,
21 const ::media::SessionMessageCB& session_message_cb, 21 const ::media::SessionMessageCB& session_message_cb,
22 const ::media::SessionClosedCB& session_closed_cb, 22 const ::media::SessionClosedCB& session_closed_cb,
23 const ::media::LegacySessionErrorCB& legacy_session_error_cb, 23 const ::media::LegacySessionErrorCB& legacy_session_error_cb,
24 const ::media::SessionKeysChangeCB& session_keys_change_cb, 24 const ::media::SessionKeysChangeCB& session_keys_change_cb,
25 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) { 25 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
26 DCHECK(!use_hw_secure_codecs) 26 DCHECK(!use_hw_secure_codecs)
27 << "Chromecast does not use |use_hw_secure_codecs|"; 27 << "Chromecast does not use |use_hw_secure_codecs|";
28 28
29 CastKeySystem key_system(GetKeySystemByName(key_system_name)); 29 CastKeySystem key_system(GetKeySystemByName(key_system_name));
30 30
31 scoped_ptr<chromecast::media::BrowserCdmCast> browser_cdm; 31 scoped_ptr<chromecast::media::BrowserCdmCast> browser_cdm;
32 if (key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) { 32 if (key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) {
33 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957 33 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957
34 } else { 34 } else {
35 browser_cdm = CreatePlatformBrowserCdm(key_system); 35 browser_cdm = CreatePlatformBrowserCdm(key_system);
36 } 36 }
37 37
38 if (browser_cdm) { 38 if (browser_cdm) {
39 CmaMessageLoop::GetMessageLoopProxy()->PostTask( 39 CmaMessageLoop::GetTaskRunner()->PostTask(
40 FROM_HERE, 40 FROM_HERE,
41 base::Bind(&BrowserCdmCast::Initialize, 41 base::Bind(&BrowserCdmCast::Initialize,
42 base::Unretained(browser_cdm.get()), 42 base::Unretained(browser_cdm.get()),
43 ::media::BindToCurrentLoop(session_message_cb), 43 ::media::BindToCurrentLoop(session_message_cb),
44 ::media::BindToCurrentLoop(session_closed_cb), 44 ::media::BindToCurrentLoop(session_closed_cb),
45 ::media::BindToCurrentLoop(legacy_session_error_cb), 45 ::media::BindToCurrentLoop(legacy_session_error_cb),
46 ::media::BindToCurrentLoop(session_keys_change_cb), 46 ::media::BindToCurrentLoop(session_keys_change_cb),
47 ::media::BindToCurrentLoop(session_expiration_update_cb))); 47 ::media::BindToCurrentLoop(session_expiration_update_cb)));
48 return make_scoped_ptr( 48 return make_scoped_ptr(new BrowserCdmCastUi(
49 new BrowserCdmCastUi(browser_cdm.Pass(), 49 browser_cdm.Pass(), CmaMessageLoop::GetTaskRunner()));
50 CmaMessageLoop::GetMessageLoopProxy()));
51 } 50 }
52 51
53 LOG(INFO) << "No matching key system found."; 52 LOG(INFO) << "No matching key system found.";
54 return scoped_ptr< ::media::BrowserCdm>(); 53 return scoped_ptr< ::media::BrowserCdm>();
55 } 54 }
56 55
57 } // namespace media 56 } // namespace media
58 } // namespace chromecast 57 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/cast_browser_main_parts.cc ('k') | chromecast/browser/media/cma_message_filter_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698