OLD | NEW |
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" | 10 #include "chromecast/media/base/media_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 ::media::ScopedBrowserCdmPtr CastBrowserCdmFactory::CreateBrowserCdm( | 18 ::media::ScopedBrowserCdmPtr 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 scoped_ptr<ProvisionFetcher> /* provision_fetcher */, |
21 const ::media::SessionMessageCB& session_message_cb, | 22 const ::media::SessionMessageCB& session_message_cb, |
22 const ::media::SessionClosedCB& session_closed_cb, | 23 const ::media::SessionClosedCB& session_closed_cb, |
23 const ::media::LegacySessionErrorCB& legacy_session_error_cb, | 24 const ::media::LegacySessionErrorCB& legacy_session_error_cb, |
24 const ::media::SessionKeysChangeCB& session_keys_change_cb, | 25 const ::media::SessionKeysChangeCB& session_keys_change_cb, |
25 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) { | 26 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) { |
26 DCHECK(!use_hw_secure_codecs) | 27 DCHECK(!use_hw_secure_codecs) |
27 << "Chromecast does not use |use_hw_secure_codecs|"; | 28 << "Chromecast does not use |use_hw_secure_codecs|"; |
28 | 29 |
29 CastKeySystem key_system(GetKeySystemByName(key_system_name)); | 30 CastKeySystem key_system(GetKeySystemByName(key_system_name)); |
30 | 31 |
(...skipping 22 matching lines...) Expand all Loading... |
53 return ::media::ScopedBrowserCdmPtr(); | 54 return ::media::ScopedBrowserCdmPtr(); |
54 } | 55 } |
55 | 56 |
56 scoped_ptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm( | 57 scoped_ptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm( |
57 const CastKeySystem& key_system) { | 58 const CastKeySystem& key_system) { |
58 return scoped_ptr<BrowserCdmCast>(); | 59 return scoped_ptr<BrowserCdmCast>(); |
59 } | 60 } |
60 | 61 |
61 } // namespace media | 62 } // namespace media |
62 } // namespace chromecast | 63 } // namespace chromecast |
OLD | NEW |