| OLD | NEW |
| 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 Fri Aug 24 16:06:47 2012. */ | 6 /* From private/pp_content_decryptor.idl modified Mon Sep 17 09:50:39 2012. */ |
| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 * <code>PP_EncryptedBlockInfo</code> as a <code>PP_Resource</code>. | 107 * <code>PP_EncryptedBlockInfo</code> as a <code>PP_Resource</code>. |
| 108 */ | 108 */ |
| 109 uint8_t key_id[64]; | 109 uint8_t key_id[64]; |
| 110 uint32_t key_id_size; | 110 uint32_t key_id_size; |
| 111 /** | 111 /** |
| 112 * Initialization vector of the block to be decrypted. | 112 * Initialization vector of the block to be decrypted. |
| 113 */ | 113 */ |
| 114 uint8_t iv[16]; | 114 uint8_t iv[16]; |
| 115 uint32_t iv_size; | 115 uint32_t iv_size; |
| 116 /** | 116 /** |
| 117 * Checksum of the block to be decrypted. | |
| 118 */ | |
| 119 uint8_t checksum[12]; | |
| 120 uint32_t checksum_size; | |
| 121 /** | |
| 122 * Subsample information of the block to be decrypted. | 117 * Subsample information of the block to be decrypted. |
| 123 */ | 118 */ |
| 124 struct PP_DecryptSubsampleDescription subsamples[16]; | 119 struct PP_DecryptSubsampleDescription subsamples[16]; |
| 125 uint32_t num_subsamples; | 120 uint32_t num_subsamples; |
| 126 }; | 121 }; |
| 127 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 256); | 122 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 240); |
| 128 /** | 123 /** |
| 129 * @} | 124 * @} |
| 130 */ | 125 */ |
| 131 | 126 |
| 132 /** | 127 /** |
| 133 * @addtogroup Enums | 128 * @addtogroup Enums |
| 134 * @{ | 129 * @{ |
| 135 */ | 130 */ |
| 136 /** | 131 /** |
| 137 * The <code>PP_DecryptResult</code> enum contains decryption and decoding | 132 * The <code>PP_DecryptResult</code> enum contains decryption and decoding |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 */ | 170 */ |
| 176 uint32_t padding; | 171 uint32_t padding; |
| 177 }; | 172 }; |
| 178 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedBlockInfo, 24); | 173 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedBlockInfo, 24); |
| 179 /** | 174 /** |
| 180 * @} | 175 * @} |
| 181 */ | 176 */ |
| 182 | 177 |
| 183 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ | 178 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ |
| 184 | 179 |
| OLD | NEW |