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

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

Issue 861153004: Chromecast buildfix: updates BrowserCdmFactory for new API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 namespace chromecast { 7 namespace chromecast {
8 namespace media { 8 namespace media {
9 9
10 scoped_ptr< ::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm( 10 scoped_ptr< ::media::BrowserCdm> CastBrowserCdmFactory::CreateBrowserCdm(
11 const std::string& key_system_name, 11 const std::string& key_system_name,
12 const ::media::BrowserCdm::SessionCreatedCB& session_created_cb, 12 const ::media::SessionMessageCB& session_message_cb,
13 const ::media::BrowserCdm::SessionMessageCB& session_message_cb, 13 const ::media::SessionClosedCB& session_closed_cb,
14 const ::media::BrowserCdm::SessionReadyCB& session_ready_cb, 14 const ::media::SessionErrorCB& session_error_cb,
15 const ::media::BrowserCdm::SessionClosedCB& session_closed_cb, 15 const ::media::SessionKeysChangeCB& session_keys_change_cb,
16 const ::media::BrowserCdm::SessionErrorCB& session_error_cb) { 16 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
17 CastKeySystem key_system(GetKeySystemByName(key_system_name)); 17 CastKeySystem key_system(GetKeySystemByName(key_system_name));
18 18
19 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957 19 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957
20 20
21 scoped_ptr< ::media::BrowserCdm> platform_cdm( 21 scoped_ptr< ::media::BrowserCdm> platform_cdm(
22 CreatePlatformBrowserCdm(key_system, 22 CreatePlatformBrowserCdm(key_system,
23 session_created_cb,
24 session_message_cb, 23 session_message_cb,
25 session_ready_cb,
26 session_closed_cb, 24 session_closed_cb,
27 session_error_cb)); 25 session_error_cb,
26 session_keys_change_cb,
27 session_expiration_update_cb));
28 if (platform_cdm) { 28 if (platform_cdm) {
29 return platform_cdm.Pass(); 29 return platform_cdm.Pass();
30 } 30 }
31 31
32 LOG(INFO) << "No matching key system found."; 32 LOG(INFO) << "No matching key system found.";
33 return scoped_ptr< ::media::BrowserCdm>(); 33 return scoped_ptr< ::media::BrowserCdm>();
34 } 34 }
35 35
36 } // namespace media 36 } // namespace media
37 } // namespace chromecast 37 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/media/cast_browser_cdm_factory.h ('k') | chromecast/browser/media/cast_browser_cdm_factory_simple.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698