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

Side by Side Diff: ppapi/api/private/pp_content_decryptor.idl

Issue 1412323002: ppapi: Support up to 32 subsamples in PP_EncryptedBlockInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed changes in thunk 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
« no previous file with comments | « no previous file | ppapi/api/private/ppp_content_decryptor_private.idl » ('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 /** 6 /**
7 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information 7 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
8 * that can be used to associate the decrypted block with a decrypt request 8 * that can be used to associate the decrypted block with a decrypt request
9 * and/or an input block. 9 * and/or an input block.
10 */ 10 */
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 /** 74 /**
75 * Size in bytes of encrypted data in a subsample entry. 75 * Size in bytes of encrypted data in a subsample entry.
76 */ 76 */
77 uint32_t cipher_bytes; 77 uint32_t cipher_bytes;
78 }; 78 };
79 79
80 /** 80 /**
81 * The <code>PP_EncryptedBlockInfo</code> struct contains all the information 81 * The <code>PP_EncryptedBlockInfo</code> struct contains all the information
82 * needed to decrypt an encrypted block. 82 * needed to decrypt an encrypted block.
83 */ 83 */
84 [assert_size(240)] 84 [assert_size(368)]
85 struct PP_EncryptedBlockInfo { 85 struct PP_EncryptedBlockInfo {
86 /** 86 /**
87 * Information needed by the client to track the block to be decrypted. 87 * Information needed by the client to track the block to be decrypted.
88 */ 88 */
89 PP_DecryptTrackingInfo tracking_info; 89 PP_DecryptTrackingInfo tracking_info;
90 90
91 /** 91 /**
92 * Size in bytes of data to be decrypted (data_offset included). 92 * Size in bytes of data to be decrypted (data_offset included).
93 */ 93 */
94 uint32_t data_size; 94 uint32_t data_size;
(...skipping 11 matching lines...) Expand all
106 uint32_t key_id_size; 106 uint32_t key_id_size;
107 107
108 /** 108 /**
109 * Initialization vector of the block to be decrypted. 109 * Initialization vector of the block to be decrypted.
110 */ 110 */
111 uint8_t[16] iv; 111 uint8_t[16] iv;
112 uint32_t iv_size; 112 uint32_t iv_size;
113 113
114 /** 114 /**
115 * Subsample information of the block to be decrypted. 115 * Subsample information of the block to be decrypted.
116 *
117 * TODO(xhwang): We need to have a fixed size of |subsamples| here. Choose 32
bbudge 2015/10/20 19:33:39 It's not clear what the TODO is here.
xhwang 2015/10/20 19:52:38 Agreed. Remove TODO here and above.
118 * because it is sufficient for almost all real life scenarios. Note that in
119 * theory the number of subsamples could be larger than 32. If that happens,
120 * playback will fail.
116 */ 121 */
117 PP_DecryptSubsampleDescription[16] subsamples; 122 PP_DecryptSubsampleDescription[32] subsamples;
118 uint32_t num_subsamples; 123 uint32_t num_subsamples;
119 }; 124 };
120 125
121 /** 126 /**
122 * <code>PP_DecryptedFrameFormat</code> contains video frame formats. 127 * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
123 */ 128 */
124 [assert_size(4)] 129 [assert_size(4)]
125 enum PP_DecryptedFrameFormat { 130 enum PP_DecryptedFrameFormat {
126 PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0, 131 PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0,
127 PP_DECRYPTEDFRAMEFORMAT_YV12 = 1, 132 PP_DECRYPTEDFRAMEFORMAT_YV12 = 1,
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 /** 478 /**
474 * Status of this key. 479 * Status of this key.
475 */ 480 */
476 PP_CdmKeyStatus key_status; 481 PP_CdmKeyStatus key_status;
477 482
478 /** 483 /**
479 * Optional error code for keys that are not usable. 484 * Optional error code for keys that are not usable.
480 */ 485 */
481 uint32_t system_code; 486 uint32_t system_code;
482 }; 487 };
OLDNEW
« no previous file with comments | « no previous file | ppapi/api/private/ppp_content_decryptor_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698