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

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

Issue 1072403009: Use std::vector<uint8_t> instead of uint8*/int for MediaKeys interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PPAPI_DECRYPTOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 const media::SessionMessageCB& session_message_cb, 43 const media::SessionMessageCB& session_message_cb,
44 const media::SessionClosedCB& session_closed_cb, 44 const media::SessionClosedCB& session_closed_cb,
45 const media::LegacySessionErrorCB& legacy_session_error_cb, 45 const media::LegacySessionErrorCB& legacy_session_error_cb,
46 const media::SessionKeysChangeCB& session_keys_change_cb, 46 const media::SessionKeysChangeCB& session_keys_change_cb,
47 const media::SessionExpirationUpdateCB& session_expiration_update_cb); 47 const media::SessionExpirationUpdateCB& session_expiration_update_cb);
48 48
49 ~PpapiDecryptor() override; 49 ~PpapiDecryptor() override;
50 50
51 // media::MediaKeys implementation. 51 // media::MediaKeys implementation.
52 void SetServerCertificate( 52 void SetServerCertificate(
53 const uint8* certificate_data, 53 const std::vector<uint8>& certificate,
xhwang 2015/04/21 04:47:11 use uint8_t
jrummell 2015/04/21 22:59:36 Done.
54 int certificate_data_length,
55 scoped_ptr<media::SimpleCdmPromise> promise) override; 54 scoped_ptr<media::SimpleCdmPromise> promise) override;
56 void CreateSessionAndGenerateRequest( 55 void CreateSessionAndGenerateRequest(
57 SessionType session_type, 56 SessionType session_type,
58 media::EmeInitDataType init_data_type, 57 media::EmeInitDataType init_data_type,
59 const uint8* init_data, 58 const std::vector<uint8>& init_data,
60 int init_data_length,
61 scoped_ptr<media::NewSessionCdmPromise> promise) override; 59 scoped_ptr<media::NewSessionCdmPromise> promise) override;
62 void LoadSession(SessionType session_type, 60 void LoadSession(SessionType session_type,
63 const std::string& session_id, 61 const std::string& session_id,
64 scoped_ptr<media::NewSessionCdmPromise> promise) override; 62 scoped_ptr<media::NewSessionCdmPromise> promise) override;
65 void UpdateSession(const std::string& session_id, 63 void UpdateSession(const std::string& session_id,
66 const uint8* response, 64 const std::vector<uint8>& response,
67 int response_length,
68 scoped_ptr<media::SimpleCdmPromise> promise) override; 65 scoped_ptr<media::SimpleCdmPromise> promise) override;
69 void CloseSession(const std::string& session_id, 66 void CloseSession(const std::string& session_id,
70 scoped_ptr<media::SimpleCdmPromise> promise) override; 67 scoped_ptr<media::SimpleCdmPromise> promise) override;
71 void RemoveSession(const std::string& session_id, 68 void RemoveSession(const std::string& session_id,
72 scoped_ptr<media::SimpleCdmPromise> promise) override; 69 scoped_ptr<media::SimpleCdmPromise> promise) override;
73 CdmContext* GetCdmContext() override; 70 CdmContext* GetCdmContext() override;
74 71
75 // media::CdmContext implementation. 72 // media::CdmContext implementation.
76 Decryptor* GetDecryptor() override; 73 Decryptor* GetDecryptor() override;
77 int GetCdmId() const override; 74 int GetCdmId() const override;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 152
156 // NOTE: Weak pointers must be invalidated before all other member variables. 153 // NOTE: Weak pointers must be invalidated before all other member variables.
157 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 154 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
158 155
159 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 156 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
160 }; 157 };
161 158
162 } // namespace content 159 } // namespace content
163 160
164 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 161 #endif // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | media/base/media_keys.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698