Generalize Pepper CDM API decrypt and decode.

ppapi/c/private/pp_content_decryptor.h

Index: ppapi/c/private/pp_content_decryptor.h
diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h
index 8467e9f90f8899a3550ca4f2c70f4ca1656f9f4d..44dfae627cfd70b88c69c6a105ebde8f191257f5 100644
--- a/ppapi/c/private/pp_content_decryptor.h
+++ b/ppapi/c/private/pp_content_decryptor.h
@@ -3,7 +3,7 @@
  * 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 12:56:17 2012. */
 
 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
@@ -147,52 +147,8 @@ typedef enum {
   PP_VIDEOCODEC_VP8 = 1
 } PP_VideoCodec;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodec, 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.
- */
-struct PP_EncryptedVideoFrameInfo {
-  /**
-   * The decoded video frame format.
-   */
-  PP_DecryptedFrameFormat format;
-  /**
-   * The video frame codec type.
-   */
-  PP_VideoCodec codec;
-  /**
-   * Video frame width in pixels.
-   */
-  int32_t width;
-  /**
-   * Video frame height in pixels.
-   */
-  int32_t height;
-  /**
-   * Information required to decrypt the frame.
-   */
-  struct PP_EncryptedBlockInfo encryption_info;
-};
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_EncryptedVideoFrameInfo, 256);
-/**
- * @}
- */
 
 /**
- * @addtogroup Enums
- * @{
- */
-/**
  * The <code>PP_DecryptResult</code> enum contains decryption and decoding
  * result constants.
  */
@@ -226,8 +182,8 @@ struct PP_DecryptedBlockInfo {
   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. This
+   * value should never be used.
    */
   uint32_t padding;
   /**
@@ -302,5 +258,21 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedFrameInfo, 56);
  * @}
  */
 
+/**
+ * @addtogroup Enums
+ * @{
+ */
+/**
+ * <code>PP_StreamType</code> contains stream type constants.
+ */
+typedef enum {
+  PP_STREAMTYPE_AUDIO = 0,
+  PP_STREAMTYPE_VIDEO = 1
+} PP_StreamType;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_StreamType, 4);
+/**
+ * @}
+ */
+
 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */