ppapi: Support up to 32 subsamples in PP_EncryptedBlockInfo.

ppapi/c/private/pp_content_decryptor.h

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-/* From private/pp_content_decryptor.idl modified Wed Sep 16 16:45:25 2015. */
+/* From private/pp_content_decryptor.idl modified Tue Oct 20 12:50:15 2015. */
 
 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
 
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
 
 /**
  * @file
  * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
@@ skipping 81 matching lines @@
    * Information needed by the client to track the block to be decrypted.
    */
   struct PP_DecryptTrackingInfo tracking_info;
   /**
    * Size in bytes of data to be decrypted (data_offset included).
    */
   uint32_t data_size;
   /**
    * Key ID of the block to be decrypted.
    *
-   * TODO(xhwang): For WebM the key ID can be as large as 2048 bytes in theory.
-   * But it's not used in current implementations. If we really need to support
-   * it, we should move key ID out as a separate parameter, e.g.
-   * as a <code>PP_Var</code>, or make the whole
-   * <code>PP_EncryptedBlockInfo</code> as a <code>PP_Resource</code>.
+   * For WebM the key ID can be as large as 2048 bytes in theory. But it's not
+   * used in current implementations. If we really need to support it, we should
+   * move key ID out as a separate parameter, e.g. as a <code>PP_Var</code>, or
+   * make the whole <code>PP_EncryptedBlockInfo</code> as a
+   * <code>PP_Resource</code>.
    */
   uint8_t key_id[64];
   uint32_t key_id_size;
   /**
    * Initialization vector of the block to be decrypted.
    */
   uint8_t iv[16];
   uint32_t iv_size;
   /**
    * Subsample information of the block to be decrypted.
+   *
+   * We need to have a fixed size of |subsamples| here. Choose 32 because it is
+   * sufficient for almost all real life scenarios. Note that in theory the
+   * number of subsamples could be larger than 32. If that happens, playback
+   * will fail.
    */
-  struct PP_DecryptSubsampleDescription subsamples[16];
+  struct PP_DecryptSubsampleDescription subsamples[32];
   uint32_t num_subsamples;
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 240);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 368);
 /**
  * @}
  */
 
 /**
  * @addtogroup Enums
  * @{
  */
 /**
  * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
@@ skipping 396 matching lines @@
    */
   uint32_t system_code;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */