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

Unified Diff: content/renderer/media/audio_renderer_mixer_manager.h

Issue 11359196: Associate audio streams with their source/destination RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased; and numerous clean-ups. Created 8 years, 1 month 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: content/renderer/media/audio_renderer_mixer_manager.h
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h
index dba3ba82df7aa691f13ed034ce3e2f21eba102f6..0462aa76fef9f3ab2643ad1db5786317a2a8f7d8 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.h
+++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -10,6 +10,7 @@
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
+#include "media/base/audio_renderer_sink.h"
namespace media {
class AudioRendererMixer;
@@ -35,7 +36,7 @@ class CONTENT_EXPORT AudioRendererMixerManager {
public:
// Construct an instance using the given audio hardware configuration.
AudioRendererMixerManager(int hardware_sample_rate, int hardware_buffer_size);
- ~AudioRendererMixerManager();
+ virtual ~AudioRendererMixerManager();
scherkus (not reviewing) 2012/11/27 22:55:26 sadness. why not add a SetAudioRendererSinkForTes
miu 2012/11/28 07:26:20 Done.
// Creates an AudioRendererMixerInput with the proper callbacks necessary to
// retrieve an AudioRendererMixer instance from AudioRendererMixerManager.
@@ -45,6 +46,10 @@ class CONTENT_EXPORT AudioRendererMixerManager {
private:
friend class AudioRendererMixerManagerTest;
+ // Returns a new instance connected to the underlying audio implementation.
+ // This method is overridden for unit testing.
+ virtual media::AudioRendererSink* CreateAudioRendererSink();
+
// Returns a mixer instance based on AudioParameters; an existing one if one
// with the provided AudioParameters exists or a new one if not.
media::AudioRendererMixer* GetMixer(const media::AudioParameters& params);

Powered by Google App Engine
This is Rietveld 408576698