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

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

Issue 1814263002: [chromecast] Start deprecating MediaMessageLoop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: fixed weak_ptr deref issue 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 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/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "chromecast/media/base/media_message_loop.h"
11 #include "chromecast/media/cdm/browser_cdm_cast.h" 10 #include "chromecast/media/cdm/browser_cdm_cast.h"
12 #include "media/base/bind_to_current_loop.h" 11 #include "media/base/bind_to_current_loop.h"
13 #include "media/base/cdm_config.h" 12 #include "media/base/cdm_config.h"
14 #include "media/base/cdm_key_information.h" 13 #include "media/base/cdm_key_information.h"
15 14
16 namespace chromecast { 15 namespace chromecast {
17 namespace media { 16 namespace media {
18 17
18 CastBrowserCdmFactory::CastBrowserCdmFactory(
19 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
20 : task_runner_(task_runner) {
21 DCHECK(task_runner_);
22 }
23 CastBrowserCdmFactory::~CastBrowserCdmFactory() {}
24
19 void CastBrowserCdmFactory::Create( 25 void CastBrowserCdmFactory::Create(
20 const std::string& key_system, 26 const std::string& key_system,
21 const GURL& security_origin, 27 const GURL& security_origin,
22 const ::media::CdmConfig& cdm_config, 28 const ::media::CdmConfig& cdm_config,
23 const ::media::SessionMessageCB& session_message_cb, 29 const ::media::SessionMessageCB& session_message_cb,
24 const ::media::SessionClosedCB& session_closed_cb, 30 const ::media::SessionClosedCB& session_closed_cb,
25 const ::media::LegacySessionErrorCB& legacy_session_error_cb, 31 const ::media::LegacySessionErrorCB& legacy_session_error_cb,
26 const ::media::SessionKeysChangeCB& session_keys_change_cb, 32 const ::media::SessionKeysChangeCB& session_keys_change_cb,
27 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb, 33 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb,
28 const ::media::CdmCreatedCB& cdm_created_cb) { 34 const ::media::CdmCreatedCB& cdm_created_cb) {
(...skipping 12 matching lines...) Expand all
41 } else { 47 } else {
42 browser_cdm = CreatePlatformBrowserCdm(cast_key_system); 48 browser_cdm = CreatePlatformBrowserCdm(cast_key_system);
43 } 49 }
44 50
45 if (!browser_cdm) { 51 if (!browser_cdm) {
46 LOG(INFO) << "No matching key system found: " << cast_key_system; 52 LOG(INFO) << "No matching key system found: " << cast_key_system;
47 bound_cdm_created_cb.Run(nullptr, "No matching key system found."); 53 bound_cdm_created_cb.Run(nullptr, "No matching key system found.");
48 return; 54 return;
49 } 55 }
50 56
51 MediaMessageLoop::GetTaskRunner()->PostTask( 57 task_runner_->PostTask(
52 FROM_HERE, 58 FROM_HERE,
53 base::Bind(&BrowserCdmCast::Initialize, 59 base::Bind(&BrowserCdmCast::Initialize,
54 base::Unretained(browser_cdm.get()), 60 base::Unretained(browser_cdm.get()),
55 ::media::BindToCurrentLoop(session_message_cb), 61 ::media::BindToCurrentLoop(session_message_cb),
56 ::media::BindToCurrentLoop(session_closed_cb), 62 ::media::BindToCurrentLoop(session_closed_cb),
57 ::media::BindToCurrentLoop(legacy_session_error_cb), 63 ::media::BindToCurrentLoop(legacy_session_error_cb),
58 ::media::BindToCurrentLoop(session_keys_change_cb), 64 ::media::BindToCurrentLoop(session_keys_change_cb),
59 ::media::BindToCurrentLoop(session_expiration_update_cb))); 65 ::media::BindToCurrentLoop(session_expiration_update_cb)));
60 66
61 bound_cdm_created_cb.Run( 67 bound_cdm_created_cb.Run(new BrowserCdmCastUi(browser_cdm, task_runner_), "");
62 new BrowserCdmCastUi(browser_cdm, MediaMessageLoop::GetTaskRunner()), "");
63 } 68 }
64 69
65 scoped_refptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm( 70 scoped_refptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm(
66 const CastKeySystem& cast_key_system) { 71 const CastKeySystem& cast_key_system) {
67 return nullptr; 72 return nullptr;
68 } 73 }
69 74
70 } // namespace media 75 } // namespace media
71 } // namespace chromecast 76 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698