Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: media/filters/audio_renderer_impl.h

Issue 11492003: Encrypted Media: Support Audio Decrypt-Only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..d12bd3c60eef361039c373d98b052912b8482cde 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,9 +151,12 @@ 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);
+
+ scoped_ptr<AudioDecoderFactory> factory_;
+ scoped_refptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
// Audio decoder.
scoped_refptr<AudioDecoder> decoder_;

Powered by Google App Engine
This is Rietveld 408576698