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

Side by Side Diff: ppapi/proxy/ppb_instance_proxy.h

Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments with the exception of renaming Deinit Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/ppapi_messages.h ('k') | ppapi/proxy/ppb_instance_proxy.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ 5 #ifndef PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
6 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ 6 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ppapi/c/pp_instance.h" 10 #include "ppapi/c/pp_instance.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 PP_Var key_system, 134 PP_Var key_system,
135 PP_Var session_id, 135 PP_Var session_id,
136 int32_t media_error, 136 int32_t media_error,
137 int32_t system_code) OVERRIDE; 137 int32_t system_code) OVERRIDE;
138 virtual void DeliverBlock(PP_Instance instance, 138 virtual void DeliverBlock(PP_Instance instance,
139 PP_Resource decrypted_block, 139 PP_Resource decrypted_block,
140 const PP_DecryptedBlockInfo* block_info) OVERRIDE; 140 const PP_DecryptedBlockInfo* block_info) OVERRIDE;
141 virtual void DecoderInitialized(PP_Instance instance, 141 virtual void DecoderInitialized(PP_Instance instance,
142 PP_Bool success, 142 PP_Bool success,
143 uint32_t request_id) OVERRIDE; 143 uint32_t request_id) OVERRIDE;
144 virtual void DecoderDeinitializeDone(PP_Instance instance,
145 PP_DecryptorStreamType decoder_type,
146 uint32_t request_id) OVERRIDE;
147 virtual void DecoderResetDone(PP_Instance instance,
148 PP_DecryptorStreamType decoder_type,
149 uint32_t request_id) OVERRIDE;
144 virtual void DeliverFrame(PP_Instance instance, 150 virtual void DeliverFrame(PP_Instance instance,
145 PP_Resource decrypted_frame, 151 PP_Resource decrypted_frame,
146 const PP_DecryptedFrameInfo* frame_info) OVERRIDE; 152 const PP_DecryptedFrameInfo* frame_info) OVERRIDE;
147 virtual void DeliverSamples(PP_Instance instance, 153 virtual void DeliverSamples(PP_Instance instance,
148 PP_Resource decrypted_samples, 154 PP_Resource decrypted_samples,
149 const PP_DecryptedBlockInfo* block_info) OVERRIDE; 155 const PP_DecryptedBlockInfo* block_info) OVERRIDE;
150 #endif // !defined(OS_NACL) 156 #endif // !defined(OS_NACL)
151 157
152 static const ApiID kApiID = API_ID_PPB_INSTANCE; 158 static const ApiID kApiID = API_ID_PPB_INSTANCE;
153 159
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 PP_Resource message, 236 PP_Resource message,
231 SerializedVarReceiveInput default_url); 237 SerializedVarReceiveInput default_url);
232 virtual void OnHostMsgKeyError(PP_Instance instance, 238 virtual void OnHostMsgKeyError(PP_Instance instance,
233 SerializedVarReceiveInput key_system, 239 SerializedVarReceiveInput key_system,
234 SerializedVarReceiveInput session_id, 240 SerializedVarReceiveInput session_id,
235 int32_t media_error, 241 int32_t media_error,
236 int32_t system_code); 242 int32_t system_code);
237 virtual void OnHostMsgDecoderInitialized(PP_Instance instance, 243 virtual void OnHostMsgDecoderInitialized(PP_Instance instance,
238 PP_Bool success, 244 PP_Bool success,
239 uint32_t request_id); 245 uint32_t request_id);
246 virtual void OnHostMsgDecoderDeinitializeDone(
247 PP_Instance instance,
248 PP_DecryptorStreamType decoder_type,
249 uint32_t request_id);
250 virtual void OnHostMsgDecoderResetDone(PP_Instance instance,
251 PP_DecryptorStreamType decoder_type,
252 uint32_t request_id);
240 virtual void OnHostMsgDeliverBlock(PP_Instance instance, 253 virtual void OnHostMsgDeliverBlock(PP_Instance instance,
241 PP_Resource decrypted_block, 254 PP_Resource decrypted_block,
242 const std::string& serialized_block_info); 255 const std::string& serialized_block_info);
243 virtual void OnHostMsgDeliverFrame(PP_Instance instance, 256 virtual void OnHostMsgDeliverFrame(PP_Instance instance,
244 PP_Resource decrypted_frame, 257 PP_Resource decrypted_frame,
245 const std::string& serialized_block_info); 258 const std::string& serialized_block_info);
246 virtual void OnHostMsgDeliverSamples( 259 virtual void OnHostMsgDeliverSamples(
247 PP_Instance instance, 260 PP_Instance instance,
248 PP_Resource decrypted_samples, 261 PP_Resource decrypted_samples,
249 const std::string& serialized_block_info); 262 const std::string& serialized_block_info);
250 #endif // !defined(OS_NACL) 263 #endif // !defined(OS_NACL)
251 264
252 // Host -> Plugin message handlers. 265 // Host -> Plugin message handlers.
253 void OnPluginMsgMouseLockComplete(PP_Instance instance, int32_t result); 266 void OnPluginMsgMouseLockComplete(PP_Instance instance, int32_t result);
254 267
255 void MouseLockCompleteInHost(int32_t result, PP_Instance instance); 268 void MouseLockCompleteInHost(int32_t result, PP_Instance instance);
256 269
257 // Other helpers. 270 // Other helpers.
258 void CancelAnyPendingRequestSurroundingText(PP_Instance instance); 271 void CancelAnyPendingRequestSurroundingText(PP_Instance instance);
259 272
260 ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_; 273 ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_;
261 }; 274 };
262 275
263 } // namespace proxy 276 } // namespace proxy
264 } // namespace ppapi 277 } // namespace ppapi
265 278
266 #endif // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ 279 #endif // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/ppapi_messages.h ('k') | ppapi/proxy/ppb_instance_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698