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

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

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 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_CDM_PROXY_MEDIA_KEYS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_
6 #define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ 6 #define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 18 matching lines...) Expand all
29 // A MediaKeys proxy that wraps the EME part of RendererCdmManager. 29 // A MediaKeys proxy that wraps the EME part of RendererCdmManager.
30 class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext { 30 class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
31 public: 31 public:
32 static void Create( 32 static void Create(
33 const std::string& key_system, 33 const std::string& key_system,
34 const GURL& security_origin, 34 const GURL& security_origin,
35 bool use_hw_secure_codecs, 35 bool use_hw_secure_codecs,
36 RendererCdmManager* manager, 36 RendererCdmManager* manager,
37 const media::SessionMessageCB& session_message_cb, 37 const media::SessionMessageCB& session_message_cb,
38 const media::SessionClosedCB& session_closed_cb, 38 const media::SessionClosedCB& session_closed_cb,
39 const media::LegacySessionErrorCB& legacy_session_error_cb,
40 const media::SessionKeysChangeCB& session_keys_change_cb, 39 const media::SessionKeysChangeCB& session_keys_change_cb,
41 const media::SessionExpirationUpdateCB& session_expiration_update_cb, 40 const media::SessionExpirationUpdateCB& session_expiration_update_cb,
42 const media::CdmCreatedCB& cdm_created_cb); 41 const media::CdmCreatedCB& cdm_created_cb);
43 42
44 // MediaKeys implementation. 43 // MediaKeys implementation.
45 void SetServerCertificate( 44 void SetServerCertificate(
46 const std::vector<uint8_t>& certificate, 45 const std::vector<uint8_t>& certificate,
47 std::unique_ptr<media::SimpleCdmPromise> promise) override; 46 std::unique_ptr<media::SimpleCdmPromise> promise) override;
48 void CreateSessionAndGenerateRequest( 47 void CreateSessionAndGenerateRequest(
49 SessionType session_type, 48 SessionType session_type,
(...skipping 13 matching lines...) Expand all
63 std::unique_ptr<media::SimpleCdmPromise> promise) override; 62 std::unique_ptr<media::SimpleCdmPromise> promise) override;
64 media::CdmContext* GetCdmContext() override; 63 media::CdmContext* GetCdmContext() override;
65 64
66 // media::CdmContext implementation. 65 // media::CdmContext implementation.
67 media::Decryptor* GetDecryptor() override; 66 media::Decryptor* GetDecryptor() override;
68 int GetCdmId() const override; 67 int GetCdmId() const override;
69 68
70 // Callbacks. 69 // Callbacks.
71 void OnSessionMessage(const std::string& session_id, 70 void OnSessionMessage(const std::string& session_id,
72 media::MediaKeys::MessageType message_type, 71 media::MediaKeys::MessageType message_type,
73 const std::vector<uint8_t>& message, 72 const std::vector<uint8_t>& message);
74 const GURL& legacy_destination_url);
75 void OnSessionClosed(const std::string& session_id); 73 void OnSessionClosed(const std::string& session_id);
76 void OnLegacySessionError(const std::string& session_id,
77 media::MediaKeys::Exception exception,
78 uint32_t system_code,
79 const std::string& error_message);
80 void OnSessionKeysChange(const std::string& session_id, 74 void OnSessionKeysChange(const std::string& session_id,
81 bool has_additional_usable_key, 75 bool has_additional_usable_key,
82 media::CdmKeysInfo keys_info); 76 media::CdmKeysInfo keys_info);
83 void OnSessionExpirationUpdate(const std::string& session_id, 77 void OnSessionExpirationUpdate(const std::string& session_id,
84 const base::Time& new_expiry_time); 78 const base::Time& new_expiry_time);
85 79
86 void OnPromiseResolved(uint32_t promise_id); 80 void OnPromiseResolved(uint32_t promise_id);
87 void OnPromiseResolvedWithSession(uint32_t promise_id, 81 void OnPromiseResolvedWithSession(uint32_t promise_id,
88 const std::string& session_id); 82 const std::string& session_id);
89 void OnPromiseRejected(uint32_t promise_id, 83 void OnPromiseRejected(uint32_t promise_id,
90 media::MediaKeys::Exception exception, 84 media::MediaKeys::Exception exception,
91 uint32_t system_code, 85 uint32_t system_code,
92 const std::string& error_message); 86 const std::string& error_message);
93 87
94 private: 88 private:
95 ProxyMediaKeys( 89 ProxyMediaKeys(
96 RendererCdmManager* manager, 90 RendererCdmManager* manager,
97 const media::SessionMessageCB& session_message_cb, 91 const media::SessionMessageCB& session_message_cb,
98 const media::SessionClosedCB& session_closed_cb, 92 const media::SessionClosedCB& session_closed_cb,
99 const media::LegacySessionErrorCB& legacy_session_error_cb,
100 const media::SessionKeysChangeCB& session_keys_change_cb, 93 const media::SessionKeysChangeCB& session_keys_change_cb,
101 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 94 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
102 95
103 ~ProxyMediaKeys() override; 96 ~ProxyMediaKeys() override;
104 97
105 void InitializeCdm(const std::string& key_system, 98 void InitializeCdm(const std::string& key_system,
106 const GURL& security_origin, 99 const GURL& security_origin,
107 bool use_hw_secure_codecs, 100 bool use_hw_secure_codecs,
108 std::unique_ptr<media::SimpleCdmPromise> promise); 101 std::unique_ptr<media::SimpleCdmPromise> promise);
109 102
110 RendererCdmManager* manager_; 103 RendererCdmManager* manager_;
111 int cdm_id_; 104 int cdm_id_;
112 105
113 media::SessionMessageCB session_message_cb_; 106 media::SessionMessageCB session_message_cb_;
114 media::SessionClosedCB session_closed_cb_; 107 media::SessionClosedCB session_closed_cb_;
115 media::LegacySessionErrorCB legacy_session_error_cb_;
116 media::SessionKeysChangeCB session_keys_change_cb_; 108 media::SessionKeysChangeCB session_keys_change_cb_;
117 media::SessionExpirationUpdateCB session_expiration_update_cb_; 109 media::SessionExpirationUpdateCB session_expiration_update_cb_;
118 110
119 media::CdmPromiseAdapter cdm_promise_adapter_; 111 media::CdmPromiseAdapter cdm_promise_adapter_;
120 112
121 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys); 113 DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
122 }; 114 };
123 115
124 } // namespace content 116 } // namespace content
125 117
126 #endif // CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ 118 #endif // CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698