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

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

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/message_loop/message_loop_proxy.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_secure_surface, 20 bool use_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_secure_surface) << "Chromecast does not use |use_secure_surface|"; 26 DCHECK(!use_secure_codecs) << "Chromecast does not use |use_secure_codecs|";
ddorwin 2015/05/13 06:03:20 I don't know what it would take to make this happe
gunsch 2015/05/13 06:52:37 That would typically be more accurate, though not
27 27
28 CastKeySystem key_system(GetKeySystemByName(key_system_name)); 28 CastKeySystem key_system(GetKeySystemByName(key_system_name));
29 29
30 scoped_ptr<chromecast::media::BrowserCdmCast> browser_cdm; 30 scoped_ptr<chromecast::media::BrowserCdmCast> browser_cdm;
31 if (key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) { 31 if (key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) {
32 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957 32 // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957
33 } else { 33 } else {
34 browser_cdm = CreatePlatformBrowserCdm(key_system); 34 browser_cdm = CreatePlatformBrowserCdm(key_system);
35 } 35 }
36 36
(...skipping 11 matching lines...) Expand all
48 new BrowserCdmCastUi(browser_cdm.Pass(), 48 new BrowserCdmCastUi(browser_cdm.Pass(),
49 CmaMessageLoop::GetMessageLoopProxy())); 49 CmaMessageLoop::GetMessageLoopProxy()));
50 } 50 }
51 51
52 LOG(INFO) << "No matching key system found."; 52 LOG(INFO) << "No matching key system found.";
53 return scoped_ptr< ::media::BrowserCdm>(); 53 return scoped_ptr< ::media::BrowserCdm>();
54 } 54 }
55 55
56 } // namespace media 56 } // namespace media
57 } // namespace chromecast 57 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698