Plumb support for audio sample formats.

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 Tue Dec  4 16:42:46 2012. */
+/* From private/pp_content_decryptor.idl modified Mon Oct 21 18:38:44 2013. */
 
 #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 129 matching lines @@
  * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
  */
 typedef enum {
   PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0,
   PP_DECRYPTEDFRAMEFORMAT_YV12 = 1,
   PP_DECRYPTEDFRAMEFORMAT_I420 = 2
 } PP_DecryptedFrameFormat;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptedFrameFormat, 4);
 
 /**
+ * <code>PP_DecryptedSampleFormat</code> contains audio sample formats.
+ */
+typedef enum {
+  PP_DECRYPTEDSAMPLEFORMAT_UNKNOWN = 0,
+  PP_DECRYPTEDSAMPLEFORMAT_U8 = 1,
+  PP_DECRYPTEDSAMPLEFORMAT_S16 = 2,
+  PP_DECRYPTEDSAMPLEFORMAT_S32 = 3,
+  PP_DECRYPTEDSAMPLEFORMAT_F32 = 4,
+  PP_DECRYPTEDSAMPLEFORMAT_PLANAR_S16 = 5,
+  PP_DECRYPTEDSAMPLEFORMAT_PLANAR_F32 = 6
+} PP_DecryptedSampleFormat;
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptedSampleFormat, 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,
   /** The input was accepted by the decoder but no frame(s) can be produced. */
   PP_DECRYPTRESULT_NEEDMOREDATA = 2,
@@ skipping 86 matching lines @@
   /**
    * Height of the video frame, in pixels.
    */
   int32_t height;
   /**
    * Information needed by the client to track the decrypted frame.
    */
   struct PP_DecryptTrackingInfo tracking_info;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedFrameInfo, 56);
+
+/**
+ * <code>PP_DecryptedSampleInfo</code> contains the result of the
+ * decrypt and decode operation on the associated samples, information required
+ * to access the sample data in buffer, and tracking info.
+ */
+struct PP_DecryptedSampleInfo {
+  /**
+   * Result of the decrypt and decode operation.
+   */
+  PP_DecryptResult result;
+  /**
+   * Format of the decrypted samples.
+   */
+  PP_DecryptedSampleFormat format;
+  /**
+   * Size in bytes of decrypted samples.
+   */
+  uint32_t data_size;
+  /**
+   * 4-byte padding to make the size of <code>PP_DecryptedSampleInfo</code>
+   * a multiple of 8 bytes. The value of this field should not be used.
+   */
+  uint32_t padding;
+  /**
+   * Information needed by the client to track the decrypted samples.
+   */
+  struct PP_DecryptTrackingInfo tracking_info;
+};
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_DecryptedSampleInfo, 32);
 /**
  * @}
  */
 
 /**
  * @addtogroup Enums
  * @{
  */
 /**
  * <code>PP_AudioCodec</code> contains audio codec type constants.
@@ skipping 140 matching lines @@
   PP_DECRYPTORSTREAMTYPE_AUDIO = 0,
   PP_DECRYPTORSTREAMTYPE_VIDEO = 1
 } PP_DecryptorStreamType;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptorStreamType, 4);
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */