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 "media/base/android/browser_cdm_factory_android.h" | 5 #include "media/base/android/browser_cdm_factory_android.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "media/base/android/media_drm_bridge.h" | 10 #include "media/base/android/media_drm_bridge.h" |
| 11 #include "media/base/android/media_drm_proxy.h" |
11 #include "media/base/media_switches.h" | 12 #include "media/base/media_switches.h" |
12 #include "third_party/widevine/cdm/widevine_cdm_common.h" | 13 #include "third_party/widevine/cdm/widevine_cdm_common.h" |
13 | 14 |
14 namespace media { | 15 namespace media { |
15 | 16 |
16 scoped_ptr<BrowserCdm> BrowserCdmFactoryAndroid::CreateBrowserCdm( | 17 BrowserCdmPtr BrowserCdmFactoryAndroid::CreateBrowserCdm( |
17 const std::string& key_system, | 18 const std::string& key_system, |
18 bool use_hw_secure_codecs, | 19 bool use_hw_secure_codecs, |
19 const SessionMessageCB& session_message_cb, | 20 const SessionMessageCB& session_message_cb, |
20 const SessionClosedCB& session_closed_cb, | 21 const SessionClosedCB& session_closed_cb, |
21 const LegacySessionErrorCB& legacy_session_error_cb, | 22 const LegacySessionErrorCB& legacy_session_error_cb, |
22 const SessionKeysChangeCB& session_keys_change_cb, | 23 const SessionKeysChangeCB& session_keys_change_cb, |
23 const SessionExpirationUpdateCB& session_expiration_update_cb) { | 24 const SessionExpirationUpdateCB& session_expiration_update_cb) { |
24 if (!MediaDrmBridge::IsKeySystemSupported(key_system)) { | 25 if (!MediaDrmBridge::IsKeySystemSupported(key_system)) { |
25 NOTREACHED() << "Unsupported key system: " << key_system; | 26 NOTREACHED() << "Unsupported key system: " << key_system; |
26 return scoped_ptr<BrowserCdm>(); | 27 return BrowserCdmPtr(); |
27 } | 28 } |
28 | 29 |
29 scoped_ptr<MediaDrmBridge> cdm( | 30 MediaDrmBridge::SecurityLevel security_level = |
30 MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb, | 31 MediaDrmBridge::SECURITY_LEVEL_NONE; |
31 legacy_session_error_cb, session_keys_change_cb, | 32 |
32 session_expiration_update_cb)); | 33 if (key_system == kWidevineKeySystem) { |
33 if (!cdm) { | 34 security_level = use_hw_secure_codecs ? MediaDrmBridge::SECURITY_LEVEL_1 |
34 NOTREACHED() << "MediaDrmBridge cannot be created for " << key_system; | 35 : MediaDrmBridge::SECURITY_LEVEL_3; |
35 return scoped_ptr<BrowserCdm>(); | 36 } else if (!use_hw_secure_codecs) { |
| 37 // Assume other key systems require hardware-secure codecs and thus do not |
| 38 // support full compositing. |
| 39 NOTREACHED() |
| 40 << key_system |
| 41 << " may require use_video_overlay_for_embedded_encrypted_video"; |
| 42 return scoped_ptr<BrowserCdm, BrowserCdmDeleter>(); |
36 } | 43 } |
37 | 44 |
38 if (key_system == kWidevineKeySystem) { | 45 BrowserCdmPtr cdm; |
39 MediaDrmBridge::SecurityLevel security_level = | 46 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
40 use_hw_secure_codecs ? MediaDrmBridge::SECURITY_LEVEL_1 | 47 switches::kEnableMediaThreadForMediaPlayback)) { |
41 : MediaDrmBridge::SECURITY_LEVEL_3; | 48 cdm = BrowserCdmPtr(MediaDrmProxy::Create( |
42 if (!cdm->SetSecurityLevel(security_level)) { | 49 key_system, security_level, session_message_cb, session_closed_cb, |
43 DVLOG(1) << "failed to set security level " << security_level; | 50 legacy_session_error_cb, session_keys_change_cb, |
44 return scoped_ptr<BrowserCdm>(); | 51 session_expiration_update_cb)); |
45 } | 52 |
| 53 if (!cdm) |
| 54 NOTREACHED() << "MediaDrmProxy cannot be created for " << key_system; |
46 } else { | 55 } else { |
47 // Assume other key systems require hardware-secure codecs and thus do not | 56 cdm = BrowserCdmPtr(MediaDrmBridge::Create( |
48 // support full compositing. | 57 key_system, security_level, session_message_cb, session_closed_cb, |
49 if (!use_hw_secure_codecs) { | 58 legacy_session_error_cb, session_keys_change_cb, |
50 NOTREACHED() | 59 session_expiration_update_cb)); |
51 << key_system | 60 if (!cdm) |
52 << " may require use_video_overlay_for_embedded_encrypted_video"; | 61 NOTREACHED() << "MediaDrmBridge cannot be created for " << key_system; |
53 return scoped_ptr<BrowserCdm>(); | |
54 } | |
55 } | 62 } |
56 | 63 |
57 return cdm.Pass(); | 64 return cdm.Pass(); |
58 } | 65 } |
59 | 66 |
60 } // namespace media | 67 } // namespace media |
OLD | NEW |