Support encrypted audio stream in demuxer.

media/base/audio_decoder_config.h

Index: media/base/audio_decoder_config.h
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 5ab06c5e83544f48a3d752cbc77b9518a5e9655b..e9c7684967a996639e1a21770143f82f6adf9b15 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h
@@ -51,7 +51,8 @@ class MEDIA_EXPORT AudioDecoderConfig {
   // |extra_data|, otherwise the memory is copied.
   AudioDecoderConfig(AudioCodec codec, int bits_per_channel,
                      ChannelLayout channel_layout, int samples_per_second,
-                     const uint8* extra_data, size_t extra_data_size);
+                     const uint8* extra_data, size_t extra_data_size,
+                     bool is_encrypted);
 
   ~AudioDecoderConfig();
 
@@ -59,6 +60,7 @@ class MEDIA_EXPORT AudioDecoderConfig {
   void Initialize(AudioCodec codec, int bits_per_channel,
                   ChannelLayout channel_layout, int samples_per_second,
                   const uint8* extra_data, size_t extra_data_size,
+                  bool is_encrypted,
                   bool record_stats);
 
   // Deep copies |audio_config|.
@@ -82,6 +84,11 @@ class MEDIA_EXPORT AudioDecoderConfig {
   uint8* extra_data() const;
   size_t extra_data_size() const;
 
+  // Whether the audio stream is potentially encrypted.
+  // Note that in a potentially encrypted video stream, individual buffers

[acolwell GONE FROM CHROMIUM, 2012/10/11 01:11:24]

s/video/audio/

[xhwang, 2012/10/11 16:36:10]

Done.

+  // can be encrypted or not encrypted.
+  bool is_encrypted() const;
+
  private:
   AudioCodec codec_;
   int bits_per_channel_;
@@ -91,6 +98,8 @@ class MEDIA_EXPORT AudioDecoderConfig {
   scoped_array<uint8> extra_data_;
   size_t extra_data_size_;
 
+  bool is_encrypted_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderConfig);
 };