Encrypted Media: Support Audio Decrypt-Only.

media/filters/audio_renderer_impl.h

Index: media/filters/audio_renderer_impl.h
diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h
index 1d716be84d36f00dadfc811ff597309dc814df95..bb10f5600b35e02d6c9ba1c43a591da78c311356 100644
--- a/media/filters/audio_renderer_impl.h
+++ b/media/filters/audio_renderer_impl.h
@@ -29,31 +29,36 @@
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/buffers.h"
+#include "media/base/decryptor.h"
 #include "media/filters/audio_renderer_algorithm.h"
 
 namespace media {
 
+class AudioDecoderFactory;
 class AudioSplicer;
+class DecryptingDemuxerStream;
 
 class MEDIA_EXPORT AudioRendererImpl
     : public AudioRenderer,
-      NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback) {
+      NON_EXPORTED_BASE(public AudioRendererSink::RenderCallback) {
  public:
   // Methods called on Render thread ------------------------------------------
   // An AudioRendererSink is used as the destination for the rendered audio.
-  explicit AudioRendererImpl(media::AudioRendererSink* sink);
+  explicit AudioRendererImpl(AudioRendererSink* sink);
 
   // Methods called on pipeline thread ----------------------------------------
   // AudioRenderer implementation.
-  virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
-                          const AudioDecoderList& decoders,
-                          const PipelineStatusCB& init_cb,
-                          const StatisticsCB& statistics_cb,
-                          const base::Closure& underflow_cb,
-                          const TimeCB& time_cb,
-                          const base::Closure& ended_cb,
-                          const base::Closure& disabled_cb,
-                          const PipelineStatusCB& error_cb) OVERRIDE;
+  virtual void Initialize(
+      const scoped_refptr<DemuxerStream>& stream,
+      const AudioDecoderList& decoders,
+      const RequestDecryptorNotificationCB& request_decryptor_notification_cb,
+      const PipelineStatusCB& init_cb,
+      const StatisticsCB& statistics_cb,
+      const base::Closure& underflow_cb,
+      const TimeCB& time_cb,
+      const base::Closure& ended_cb,
+      const base::Closure& disabled_cb,
+      const PipelineStatusCB& error_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
@@ -146,12 +151,13 @@ class MEDIA_EXPORT AudioRendererImpl
   // Called when |decoder_| initialization completes.
   // |demuxer_stream| & |decoders| are used if initialization failed and
   // InitializeNextDecoder() needs to be called again.
-  void OnDecoderInitDone(const scoped_refptr<DemuxerStream>& demuxer_stream,
-                         scoped_ptr<AudioDecoderList> decoders,
-                         PipelineStatus status);
+  void OnDecoderInitDone(
+      const scoped_refptr<AudioDecoder>& audio_decoder,
+      const scoped_refptr<DecryptingDemuxerStream>& decrypting_demuxer_stream);
 
-  // Audio decoder.
+  scoped_ptr<AudioDecoderFactory> factory_;

[ddorwin, 2012/12/11 05:13:34]

decoder_factory_

[xhwang, 2012/12/11 19:43:04]

Will do.

[xhwang, 2012/12/12 23:43:28]

Done.

   scoped_refptr<AudioDecoder> decoder_;
+  scoped_refptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;

[ddorwin, 2012/12/11 05:13:34]

Maybe explain when this is populated/valid.

[xhwang, 2012/12/11 19:43:04]

Will add comment.

[xhwang, 2012/12/12 23:43:28]

Done.

 
   scoped_ptr<AudioSplicer> splicer_;