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

Side by Side Diff: ppapi/c/private/ppb_content_decryptor_private.h

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 9 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/c/pp_macros.h ('k') | ppapi/cpp/private/content_decryptor_private.h » ('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 5
6 /* From private/ppb_content_decryptor_private.idl, 6 /* From private/ppb_content_decryptor_private.idl,
7 * modified Wed Jan 8 16:02:43 2014. 7 * modified Wed Feb 26 16:37:47 2014.
8 */ 8 */
9 9
10 #ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_ 10 #ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_
11 #define PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_ 11 #define PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_
12 12
13 #include "ppapi/c/pp_bool.h" 13 #include "ppapi/c/pp_bool.h"
14 #include "ppapi/c/pp_instance.h" 14 #include "ppapi/c/pp_instance.h"
15 #include "ppapi/c/pp_macros.h" 15 #include "ppapi/c/pp_macros.h"
16 #include "ppapi/c/pp_resource.h" 16 #include "ppapi/c/pp_resource.h"
17 #include "ppapi/c/pp_stdint.h" 17 #include "ppapi/c/pp_stdint.h"
18 #include "ppapi/c/pp_var.h" 18 #include "ppapi/c/pp_var.h"
19 #include "ppapi/c/private/pp_content_decryptor.h" 19 #include "ppapi/c/private/pp_content_decryptor.h"
20 20
21 #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_10 \ 21 #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_11 \
22 "PPB_ContentDecryptor_Private;0.10" 22 "PPB_ContentDecryptor_Private;0.11"
23 #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE \ 23 #define PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
24 PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_10 24 PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_11
25 25
26 /** 26 /**
27 * @file 27 * @file
28 * This file defines the <code>PPB_ContentDecryptor_Private</code> 28 * This file defines the <code>PPB_ContentDecryptor_Private</code>
29 * interface. Note: This is a special interface, only to be used for Content 29 * interface. Note: This is a special interface, only to be used for Content
30 * Decryption Modules, not normal plugins. 30 * Decryption Modules, not normal plugins.
31 */ 31 */
32 32
33 33
34 /** 34 /**
35 * @addtogroup Interfaces 35 * @addtogroup Interfaces
36 * @{ 36 * @{
37 */ 37 */
38 /** 38 /**
39 * <code>PPB_ContentDecryptor_Private</code> structure contains the function 39 * <code>PPB_ContentDecryptor_Private</code> structure contains the function
40 * pointers the browser must implement to support plugins implementing the 40 * pointers the browser must implement to support plugins implementing the
41 * <code>PPP_ContentDecryptor_Private</code> interface. This interface provides 41 * <code>PPP_ContentDecryptor_Private</code> interface. This interface provides
42 * browser side support for the Content Decryption Module (CDM) for Encrypted 42 * browser side support for the Content Decryption Module (CDM) for Encrypted
43 * Media Extensions: http://www.w3.org/TR/encrypted-media/ 43 * Media Extensions: http://www.w3.org/TR/encrypted-media/
44 */ 44 */
45 struct PPB_ContentDecryptor_Private_0_10 { 45 struct PPB_ContentDecryptor_Private_0_11 {
46 /** 46 /**
47 * A session has been created by the CDM. 47 * A session has been created by the CDM.
48 * 48 *
49 * @param[in] session_id Identifies the session for which the CDM 49 * @param[in] session_id Identifies the session for which the CDM
50 * created a session. 50 * created a session.
51 * 51 *
52 * @param[in] web_session_id A <code>PP_Var</code> of type 52 * @param[in] web_session_id A <code>PP_Var</code> of type
53 * <code>PP_VARTYPE_STRING</code> containing the string for the 53 * <code>PP_VARTYPE_STRING</code> containing the string for the
54 * MediaKeySession's sessionId attribute. 54 * MediaKeySession's sessionId attribute.
55 * 55 *
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 * @param[in] session_id Identifies the session for which the error 116 * @param[in] session_id Identifies the session for which the error
117 * is intended. 117 * is intended.
118 * 118 *
119 * @param[in] media_error A MediaKeyError. 119 * @param[in] media_error A MediaKeyError.
120 * 120 *
121 * @param[in] system_error A system error code. 121 * @param[in] system_error A system error code.
122 */ 122 */
123 void (*SessionError)(PP_Instance instance, 123 void (*SessionError)(PP_Instance instance,
124 uint32_t session_id, 124 uint32_t session_id,
125 int32_t media_error, 125 int32_t media_error,
126 int32_t system_code); 126 uint32_t system_code);
127 /** 127 /**
128 * Called after the <code>Decrypt()</code> method on the 128 * Called after the <code>Decrypt()</code> method on the
129 * <code>PPP_ContentDecryptor_Private</code> interface completes to 129 * <code>PPP_ContentDecryptor_Private</code> interface completes to
130 * deliver decrypted_block to the browser for decoding and rendering. 130 * deliver decrypted_block to the browser for decoding and rendering.
131 * 131 *
132 * The plugin must not hold a reference to the encrypted buffer resource 132 * The plugin must not hold a reference to the encrypted buffer resource
133 * provided to <code>Decrypt()</code> when it calls this method. The browser 133 * provided to <code>Decrypt()</code> when it calls this method. The browser
134 * will reuse the buffer in a subsequent <code>Decrypt()</code> call. 134 * will reuse the buffer in a subsequent <code>Decrypt()</code> call.
135 * 135 *
136 * @param[in] decrypted_block A <code>PP_Resource</code> corresponding to a 136 * @param[in] decrypted_block A <code>PP_Resource</code> corresponding to a
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 * @param[in] decrypted_sample_info A <code>PP_DecryptedSampleInfo</code> that 246 * @param[in] decrypted_sample_info A <code>PP_DecryptedSampleInfo</code> that
247 * contains the tracking info and result code associated with the decrypted 247 * contains the tracking info and result code associated with the decrypted
248 * samples. 248 * samples.
249 */ 249 */
250 void (*DeliverSamples)( 250 void (*DeliverSamples)(
251 PP_Instance instance, 251 PP_Instance instance,
252 PP_Resource audio_frames, 252 PP_Resource audio_frames,
253 const struct PP_DecryptedSampleInfo* decrypted_sample_info); 253 const struct PP_DecryptedSampleInfo* decrypted_sample_info);
254 }; 254 };
255 255
256 typedef struct PPB_ContentDecryptor_Private_0_10 PPB_ContentDecryptor_Private; 256 typedef struct PPB_ContentDecryptor_Private_0_11 PPB_ContentDecryptor_Private;
257 /** 257 /**
258 * @} 258 * @}
259 */ 259 */
260 260
261 #endif /* PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_ */ 261 #endif /* PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_ */
262 262
OLDNEW
« no previous file with comments | « ppapi/c/pp_macros.h ('k') | ppapi/cpp/private/content_decryptor_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698