Generalize Pepper CDM API decrypt and decode.

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 Oct  3 16:16:49 2012. */
+/* From private/pp_content_decryptor.idl modified Wed Oct 10 01:11:02 2012. */
 
 #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 105 matching lines @@
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedBlockInfo, 240);
 /**
  * @}
  */
 
 /**
  * @addtogroup Enums
  * @{
  */
 /**
- * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
+ * <code>PP_StreamType</code> contains stream type constants.
  */
 typedef enum {
-  PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0,
-  PP_DECRYPTEDFRAMEFORMAT_EMPTY = 1,
-  PP_DECRYPTEDFRAMEFORMAT_YV12 = 2,
-  PP_DECRYPTEDFRAMEFORMAT_I420 = 3
-} PP_DecryptedFrameFormat;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptedFrameFormat, 4);
-
-/**
- * <code>PP_VideoCodec</code> contains video codec type constants.
- */
-typedef enum {
-  PP_VIDEOCODEC_UNKNOWN = 0,
-  PP_VIDEOCODEC_VP8 = 1
-} PP_VideoCodec;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4);
+  PP_STREAMTYPE_UNKNOWN = 0,
+  PP_STREAMTYPE_AUDIO = 1,
+  PP_STREAMTYPE_VIDEO = 2
+} PP_StreamType;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_StreamType, 4);
 /**
  * @}
  */
 
 /**
  * @addtogroup Structs
  * @{
  */
 /**
- * <code>PP_EncryptedVideoFrameInfo</code> contains the information required
- * to decrypt and decode a video frame.
- * TODO(tomfinegan): Revisit necessity of including format information in this
- * struct once we decide how to implement video decoder initialization.
+ * <code>PP_EncryptedMediaInfo</code> contains the information required to
+ * decrypt and decode media data.
  */
-struct PP_EncryptedVideoFrameInfo {
+struct PP_EncryptedMediaInfo {
   /**
-   * The decoded video frame format.
+   * Media type of the encrypted data.
    */
-  PP_DecryptedFrameFormat format;
+  PP_StreamType media_type;
   /**
-   * The video frame codec type.
+   * 4-byte padding to make the size of <code>PP_EncryptedMediaInfo</code>
+   * a multiple of 8 bytes, and ensure consistent size on all targets.
    */
-  PP_VideoCodec codec;
+  uint32_t padding;
   /**
-   * Video frame width in pixels.
-   */
-  int32_t width;
-  /**
-   * Video frame height in pixels.
-   */
-  int32_t height;
-  /**
-   * Information required to decrypt the frame.
+   * Information required to decrypt the media.
    */
   struct PP_EncryptedBlockInfo encryption_info;
 };
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedVideoFrameInfo, 256);
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedMediaInfo, 248);
 /**
  * @}
  */
 
 /**
  * @addtogroup Enums
  * @{
  */
 /**
+ * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
+ */
+typedef enum {
+  PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0,
+  PP_DECRYPTEDFRAMEFORMAT_EMPTY = 1,
+  PP_DECRYPTEDFRAMEFORMAT_YV12 = 2,
+  PP_DECRYPTEDFRAMEFORMAT_I420 = 3
+} PP_DecryptedFrameFormat;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptedFrameFormat, 4);
+
+/**
+ * <code>PP_VideoCodec</code> contains video codec type constants.
+ */
+typedef enum {
+  PP_VIDEOCODEC_UNKNOWN = 0,
+  PP_VIDEOCODEC_VP8 = 1
+} PP_VideoCodec;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 4);
+
+/**
  * The <code>PP_DecryptResult</code> enum contains decryption and decoding
  * result constants.
  */
 typedef enum {
   /** The decryption (and/or decoding) operation finished successfully. */
   PP_DECRYPTRESULT_SUCCESS = 0,
   /** The decryptor did not have the necessary decryption key. */
   PP_DECRYPTRESULT_DECRYPT_NOKEY = 1,
   /** An unexpected error happened during decryption. */
   PP_DECRYPTRESULT_DECRYPT_ERROR = 2,
@@ skipping 13 matching lines @@
  * <code>PP_DecryptedBlockInfo</code> struct contains the decryption result and
  * tracking info associated with the decrypted block.
  */
 struct PP_DecryptedBlockInfo {
   /**
    * Result of the decryption (and/or decoding) operation.
    */
   PP_DecryptResult result;
   /**
    * 4-byte padding to make the size of <code>PP_DecryptedBlockInfo</code>
-   * a multiple of 8 bytes and make sure |tracking_info| starts on an 8-byte
-   * boundary. The value of this field should not be used.
+   * a multiple of 8 bytes, and ensure consistent size on all targets.
    */
   uint32_t padding;
   /**
    * Information needed by the client to track the block to be decrypted.
    */
   struct PP_DecryptTrackingInfo tracking_info;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedBlockInfo, 24);
 /**
  * @}
@@ skipping 56 matching lines @@
    */
   struct PP_DecryptTrackingInfo tracking_info;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedFrameInfo, 56);
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */