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

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

Issue 1412323002: ppapi: Support up to 32 subsamples in PP_EncryptedBlockInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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/pp_content_decryptor.idl modified Wed Sep 16 16:45:25 2015. */ 6 /* From private/pp_content_decryptor.idl modified Mon Oct 19 13:00:24 2015. */
7 7
8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
10 10
11 #include "ppapi/c/pp_macros.h" 11 #include "ppapi/c/pp_macros.h"
12 #include "ppapi/c/pp_stdint.h" 12 #include "ppapi/c/pp_stdint.h"
13 13
14 /** 14 /**
15 * @file 15 * @file
16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information 16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 */ 113 */
114 uint8_t key_id[64]; 114 uint8_t key_id[64];
115 uint32_t key_id_size; 115 uint32_t key_id_size;
116 /** 116 /**
117 * Initialization vector of the block to be decrypted. 117 * Initialization vector of the block to be decrypted.
118 */ 118 */
119 uint8_t iv[16]; 119 uint8_t iv[16];
120 uint32_t iv_size; 120 uint32_t iv_size;
121 /** 121 /**
122 * Subsample information of the block to be decrypted. 122 * Subsample information of the block to be decrypted.
123 *
124 * TODO(xhwang): We need to have a fixed size of |subsamples| here. Choose 32
125 * because it is sufficient for almost all real life scenarios. Note that in
126 * theory the number of subsamples could be larger than 32. If that happens,
127 * playback will fail.
123 */ 128 */
124 struct PP_DecryptSubsampleDescription subsamples[16]; 129 struct PP_DecryptSubsampleDescription subsamples[32];
125 uint32_t num_subsamples; 130 uint32_t num_subsamples;
126 }; 131 };
127 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 240); 132 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 368);
128 /** 133 /**
129 * @} 134 * @}
130 */ 135 */
131 136
132 /** 137 /**
133 * @addtogroup Enums 138 * @addtogroup Enums
134 * @{ 139 * @{
135 */ 140 */
136 /** 141 /**
137 * <code>PP_DecryptedFrameFormat</code> contains video frame formats. 142 * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 */ 539 */
535 uint32_t system_code; 540 uint32_t system_code;
536 }; 541 };
537 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); 542 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
538 /** 543 /**
539 * @} 544 * @}
540 */ 545 */
541 546
542 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ 547 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */
543 548
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698