Generalize Pepper CDM API decrypt and decode.

ppapi/api/private/pp_content_decryptor.idl

 /* 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.
  */
 
 /**
  * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
  * that can be used to associate the decrypted block with a decrypt request
  * and/or an input block.
  */
@@ skipping 116 matching lines @@
 /**
  * <code>PP_VideoCodec</code> contains video codec type constants.
  */
 [assert_size(4)]
 enum PP_VideoCodec {
   PP_VIDEOCODEC_UNKNOWN = 0,
   PP_VIDEOCODEC_VP8 = 1
 };
 
 /**
- * <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.
  */
 [assert_size(4)]
 enum PP_DecryptResult {
   /** 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,
   /** An unexpected error happened during decoding. */
   PP_DECRYPTRESULT_DECODE_ERROR = 3
 };
 
 /**
  * <code>PP_DecryptedBlockInfo</code> struct contains the decryption result and
  * tracking info associated with the decrypted block.
  */
 [assert_size(24)]
 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. This
+   * value should never be used.
    */
   uint32_t padding;
 
   /**
    * Information needed by the client to track the block to be decrypted.
    */
   PP_DecryptTrackingInfo tracking_info;
 };
 
 /**
@@ skipping 105 matching lines @@
 };
 
 /**
  * <code>PP_DecryptorStreamType</code> contains stream type constants.
  */
 [assert_size(4)]
 enum PP_DecryptorStreamType {
   PP_DECRYPTORSTREAMTYPE_AUDIO = 0,
   PP_DECRYPTORSTREAMTYPE_VIDEO = 1
 };