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

Side by Side Diff: media/cdm/ppapi/cdm_adapter.h

Issue 26592003: Switch CdmWrapper to use uint32_t for size types per style guide. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase over audio. Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type, 72 virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
73 uint32_t request_id) OVERRIDE; 73 uint32_t request_id) OVERRIDE;
74 virtual void ResetDecoder(PP_DecryptorStreamType decoder_type, 74 virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
75 uint32_t request_id) OVERRIDE; 75 uint32_t request_id) OVERRIDE;
76 virtual void DecryptAndDecode( 76 virtual void DecryptAndDecode(
77 PP_DecryptorStreamType decoder_type, 77 PP_DecryptorStreamType decoder_type,
78 pp::Buffer_Dev encrypted_buffer, 78 pp::Buffer_Dev encrypted_buffer,
79 const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; 79 const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
80 80
81 // cdm::Host implementation. 81 // cdm::Host implementation.
82 virtual cdm::Buffer* Allocate(int32_t capacity) OVERRIDE; 82 virtual cdm::Buffer* Allocate(uint32_t capacity) OVERRIDE;
83 virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE; 83 virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE;
84 virtual double GetCurrentWallTimeInSeconds() OVERRIDE; 84 virtual double GetCurrentWallTimeInSeconds() OVERRIDE;
85 virtual void SendKeyMessage( 85 virtual void SendKeyMessage(
86 const char* session_id, int32_t session_id_length, 86 const char* session_id, uint32_t session_id_length,
87 const char* message, int32_t message_length, 87 const char* message, uint32_t message_length,
88 const char* default_url, int32_t default_url_length) OVERRIDE; 88 const char* default_url, uint32_t default_url_length) OVERRIDE;
89 virtual void SendKeyError(const char* session_id, 89 virtual void SendKeyError(const char* session_id,
90 int32_t session_id_length, 90 uint32_t session_id_length,
91 cdm::MediaKeyError error_code, 91 cdm::MediaKeyError error_code,
92 uint32_t system_code) OVERRIDE; 92 uint32_t system_code) OVERRIDE;
93 virtual void GetPrivateData(int32_t* instance, 93 virtual void GetPrivateData(int32_t* instance,
94 GetPrivateInterface* get_interface) OVERRIDE; 94 GetPrivateInterface* get_interface) OVERRIDE;
95 95
96 // cdm::Host_2 implementation. 96 // cdm::Host_2 implementation.
97 virtual void SendPlatformChallenge( 97 virtual void SendPlatformChallenge(
98 const char* service_id, int32_t service_id_length, 98 const char* service_id, uint32_t service_id_length,
99 const char* challenge, int32_t challenge_length) OVERRIDE; 99 const char* challenge, uint32_t challenge_length) OVERRIDE;
100 virtual void EnableOutputProtection( 100 virtual void EnableOutputProtection(
101 uint32_t desired_protection_mask) OVERRIDE; 101 uint32_t desired_protection_mask) OVERRIDE;
102 virtual void QueryOutputProtectionStatus() OVERRIDE; 102 virtual void QueryOutputProtectionStatus() OVERRIDE;
103 virtual void OnDeferredInitializationDone(
104 cdm::StreamType stream_type,
105 cdm::Status decoder_status) OVERRIDE;
103 106
104 private: 107 private:
105 struct SessionInfo { 108 struct SessionInfo {
106 SessionInfo(const std::string& key_system_in, 109 SessionInfo(const std::string& key_system_in,
107 const std::string& session_id_in) 110 const std::string& session_id_in)
108 : key_system(key_system_in), 111 : key_system(key_system_in),
109 session_id(session_id_in) {} 112 session_id(session_id_in) {}
110 const std::string key_system; 113 const std::string key_system;
111 const std::string session_id; 114 const std::string session_id;
112 }; 115 };
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 pp::CompletionCallbackFactory<CdmAdapter> callback_factory_; 199 pp::CompletionCallbackFactory<CdmAdapter> callback_factory_;
197 linked_ptr<CdmWrapper> cdm_; 200 linked_ptr<CdmWrapper> cdm_;
198 std::string key_system_; 201 std::string key_system_;
199 202
200 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 203 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
201 }; 204 };
202 205
203 } // namespace media 206 } // namespace media
204 207
205 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 208 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698