Generalize Pepper CDM API decrypt and decode.

ppapi/api/private/pp_content_decryptor.idl

Index: ppapi/api/private/pp_content_decryptor.idl
diff --git a/ppapi/api/private/pp_content_decryptor.idl b/ppapi/api/private/pp_content_decryptor.idl
index 248b7356b2d29946e6c7b48f062ae3064d0d44f1..621ff687b93f021424bb0ef2145185086b7b329f 100644
--- a/ppapi/api/private/pp_content_decryptor.idl
+++ b/ppapi/api/private/pp_content_decryptor.idl
@@ -114,6 +114,39 @@ struct PP_EncryptedBlockInfo {
 };
 
 /**
+ * <code>PP_StreamType</code> contains stream type constants.
+ */
+[assert_size(4)]
+enum PP_StreamType {
+  PP_STREAMTYPE_UNKNOWN = 0,
+  PP_STREAMTYPE_AUDIO = 1,
+  PP_STREAMTYPE_VIDEO = 2
+};
+
+/**
+ * <code>PP_EncryptedMediaInfo</code> contains the information required to
+ * decrypt and decode media data.
+ */
+[assert_size(248)]
+struct PP_EncryptedMediaInfo {
+  /**
+   * Media type of the encrypted data.
+   */
+  PP_StreamType media_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.
+   */
+  uint32_t padding;
+
+  /**
+   * Information required to decrypt the media.
+   */
+   PP_EncryptedBlockInfo encryption_info;
+};
+
+/**
  * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
  */
 [assert_size(4)]
@@ -134,40 +167,6 @@ enum PP_VideoCodec {
 };
 
 /**
- * <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.
- */
-[assert_size(256)]
-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.
-   */
-  PP_EncryptedBlockInfo encryption_info;
-};
-
-/**
  * The <code>PP_DecryptResult</code> enum contains decryption and decoding
  * result constants.
  */
@@ -196,8 +195,7 @@ struct PP_DecryptedBlockInfo {
 
   /**
    * 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.

[Ami GONE FROM CHROMIUM, 2012/10/10 18:06:45]

you dropped the comment that clarifies the contents of the field are unused.
(also above in the other version of this comment)

[Tom Finegan, 2012/10/10 20:02:51]

Fixed.

    */
   uint32_t padding;