Plumb support for audio sample formats.

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 122 matching lines @@
  * <code>PP_DecryptedFrameFormat</code> contains video frame formats.
  */
 [assert_size(4)]
 enum PP_DecryptedFrameFormat {
   PP_DECRYPTEDFRAMEFORMAT_UNKNOWN = 0,
   PP_DECRYPTEDFRAMEFORMAT_YV12 = 1,
   PP_DECRYPTEDFRAMEFORMAT_I420 = 2
 };
 
 /**
+ * <code>PP_DecryptedSampleFormat</code> contains audio sample formats.
+ */
+[assert_size(4)]
+enum PP_DecryptedSampleFormat {
+  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
+};
+
+/**
  * 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,
   /** The input was accepted by the decoder but no frame(s) can be produced. */
@@ skipping 75 matching lines @@
    */
   int32_t height;
 
   /**
    * Information needed by the client to track the decrypted frame.
    */
   PP_DecryptTrackingInfo tracking_info;
 };
 
 /**
+ * <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.
+ */
+[assert_size(32)]

[DaleCurtis, 2013/10/11 01:30:53]

Not sure where the extra 4 bytes comes from, it counts out to 28 by my hand
calculation... maybe padding?

[xhwang, 2013/10/11 22:45:16]

see l.126. you may want to have a 

uint32_t padding;

explicitly to avoid surprise.

[dmichael (off chromium), 2013/10/11 23:00:35]

PP_DecryptTrackingInfo has an int64_t, so it gets 8-byte aligned. I suspect
there's 4 bytes of padding between |data_size| 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;

[DaleCurtis, 2013/10/11 01:30:53]

Is this necessary? The size is already attached to the PP_Resource.  I just
followed what PP_DecryptedFrameInfo is doing...

[xhwang, 2013/10/11 22:45:16]

You mean PP_DecryptedBufferInfo? See the comment on l.186.

+
+  /**
+   * Information needed by the client to track the decrypted samples.
+   */
+  PP_DecryptTrackingInfo tracking_info;
+};
+
+/**
  * <code>PP_AudioCodec</code> contains audio codec type constants.
  */
 [assert_size(4)]
 enum PP_AudioCodec {
   PP_AUDIOCODEC_UNKNOWN = 0,
   PP_AUDIOCODEC_VORBIS = 1,
   PP_AUDIOCODEC_AAC = 2
 };
 
 /**
@@ skipping 106 matching lines @@
 };
 
 /**
  * <code>PP_DecryptorStreamType</code> contains stream type constants.
  */
 [assert_size(4)]
 enum PP_DecryptorStreamType {
   PP_DECRYPTORSTREAMTYPE_AUDIO = 0,
   PP_DECRYPTORSTREAMTYPE_VIDEO = 1
 };