Encrypted Media: Enforcing the CDM to decode audio into S16 integers.

media/filters/decrypting_audio_decoder.h

Index: media/filters/decrypting_audio_decoder.h
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h
index 7890d222a0fd03a4b745ea0651e6ee5c315ebda4..ebd53373d861d4a600ac42e42dbd7e423ad155db 100644
--- a/media/filters/decrypting_audio_decoder.h
+++ b/media/filters/decrypting_audio_decoder.h
@@ -26,6 +26,13 @@ class Decryptor;
 // that no locks are required for thread safety.
 class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
  public:
+  // We do not currently have a way to let the Decrytptor choose the output

[DaleCurtis, 2013/01/10 01:24:35]

s/Decrytptor/Decryptor/

[xhwang, 2013/01/10 18:17:23]

Done.

+  // audio sample format and notify us its choice. Therefore, we require all

[DaleCurtis, 2013/01/10 01:24:35]

s/its/of its/

[xhwang, 2013/01/10 18:17:23]

Done.

+  // Decryptor implementations to decode audio into a fixed integer sample
+  // format with kSupportedBitsPerChannel.

[DaleCurtis, 2013/01/10 01:24:35]

s/with/designated by/

[xhwang, 2013/01/10 18:17:23]

Done.

+  // TODO(xhwang): Remove this restriction after http://crbug.com/169105 fixed.
+  static const int kSupportedBitsPerChannel;
+
   DecryptingAudioDecoder(
       const scoped_refptr<base::MessageLoopProxy>& message_loop,
       const SetDecryptorReadyCB& set_decryptor_ready_cb);
@@ -102,6 +109,10 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
   // Resets decoder and calls |reset_cb_|.
   void DoReset();
 
+  // Sets audio configs from |demuxer_stream_| and resets
+  // |output_timestamp_base_| and |total_samples_decoded_|.
+  void SetDecoderConfig();
+
   // Sets timestamp and duration for |queued_audio_frames_| to make sure the
   // renderer always receives continuous frames without gaps and overlaps.
   void EnqueueFrames(const Decryptor::AudioBuffers& frames);