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

Side by Side Diff: content/renderer/media/crypto/proxy_media_keys.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. 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 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 namespace content { 23 namespace content {
24 24
25 class RendererCdmManager; 25 class RendererCdmManager;
26 26
27 // A MediaKeys proxy that wraps the EME part of RendererCdmManager. 27 // A MediaKeys proxy that wraps the EME part of RendererCdmManager.
28 class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext { 28 class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
29 public: 29 public:
30 static void Create( 30 static void Create(
31 const std::string& key_system, 31 const std::string& key_system,
32 const GURL& security_origin, 32 const GURL& security_origin,
33 bool use_hw_secure_codecs,
33 RendererCdmManager* manager, 34 RendererCdmManager* manager,
34 const media::SessionMessageCB& session_message_cb, 35 const media::SessionMessageCB& session_message_cb,
35 const media::SessionClosedCB& session_closed_cb, 36 const media::SessionClosedCB& session_closed_cb,
36 const media::LegacySessionErrorCB& legacy_session_error_cb, 37 const media::LegacySessionErrorCB& legacy_session_error_cb,
37 const media::SessionKeysChangeCB& session_keys_change_cb, 38 const media::SessionKeysChangeCB& session_keys_change_cb,
38 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 39 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
39 const media::CdmCreatedCB& cdm_created_cb); 40 const media::CdmCreatedCB& cdm_created_cb);
40 41
41 ~ProxyMediaKeys() override; 42 ~ProxyMediaKeys() override;
42 43
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ProxyMediaKeys( 94 ProxyMediaKeys(
94 RendererCdmManager* manager, 95 RendererCdmManager* manager,
95 const media::SessionMessageCB& session_message_cb, 96 const media::SessionMessageCB& session_message_cb,
96 const media::SessionClosedCB& session_closed_cb, 97 const media::SessionClosedCB& session_closed_cb,
97 const media::LegacySessionErrorCB& legacy_session_error_cb, 98 const media::LegacySessionErrorCB& legacy_session_error_cb,
98 const media::SessionKeysChangeCB& session_keys_change_cb, 99 const media::SessionKeysChangeCB& session_keys_change_cb,
99 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 100 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
100 101
101 void InitializeCdm(const std::string& key_system, 102 void InitializeCdm(const std::string& key_system,
102 const GURL& security_origin, 103 const GURL& security_origin,
104 bool use_hw_secure_codecs,
103 scoped_ptr<media::SimpleCdmPromise> promise); 105 scoped_ptr<media::SimpleCdmPromise> promise);
104 106
105 RendererCdmManager* manager_; 107 RendererCdmManager* manager_;
106 int cdm_id_; 108 int cdm_id_;
107 109
108 media::SessionMessageCB session_message_cb_; 110 media::SessionMessageCB session_message_cb_;
109 media::SessionClosedCB session_closed_cb_; 111 media::SessionClosedCB session_closed_cb_;
110 media::LegacySessionErrorCB legacy_session_error_cb_; 112 media::LegacySessionErrorCB legacy_session_error_cb_;
111 media::SessionKeysChangeCB session_keys_change_cb_; 113 media::SessionKeysChangeCB session_keys_change_cb_;
112 media::SessionExpirationUpdateCB session_expiration_update_cb_; 114 media::SessionExpirationUpdateCB session_expiration_update_cb_;
113 115
114 media::CdmPromiseAdapter cdm_promise_adapter_; 116 media::CdmPromiseAdapter cdm_promise_adapter_;
115 117
116 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 118 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
117 }; 119 };
118 120
119 } // namespace content 121 } // namespace content
120 122
121 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_ 123 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698