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

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

Issue 12102004: Renderer side audio device change wip... Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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 20afcb83fd1944b61a709b983fde5da70b9b9a0e..5f8507c3d1bcfbd074a19a5e25b8b2ab46a126b8 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.h
+++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -13,6 +13,7 @@
#include "media/audio/audio_parameters.h"
namespace media {
+class AudioHardwareConfig;
class AudioRendererMixer;
class AudioRendererMixerInput;
class AudioRendererSink;
@@ -36,7 +37,7 @@ namespace content {
class CONTENT_EXPORT AudioRendererMixerManager {
public:
// Construct an instance using the given audio hardware configuration.
- AudioRendererMixerManager(int hardware_sample_rate, int hardware_buffer_size);
+ AudioRendererMixerManager(media::AudioHardwareConfig* hardware_config);
~AudioRendererMixerManager();
// Creates an AudioRendererMixerInput with the proper callbacks necessary to
@@ -60,7 +61,10 @@ class CONTENT_EXPORT AudioRendererMixerManager {
media::AudioRendererMixer* mixer;
int ref_count;
};
- typedef std::map<MixerKey, AudioRendererMixerReference> AudioRendererMixerMap;
+ // typedef std::map<MixerKey, AudioRendererMixerReference> AudioRendererMixerMap;
+ typedef std::pair<media::AudioParameters, media::AudioParameters> IOParamsKey;
+ typedef std::map<IOParamsKey, AudioRendererMixerReference>
+ AudioRendererMixerMap;
// Overrides the AudioRendererSink implementation for unit testing.
void SetAudioRendererSinkForTesting(media::AudioRendererSink* sink);
@@ -74,7 +78,8 @@ class CONTENT_EXPORT AudioRendererMixerManager {
// by AudioRendererMixerManager. Every AudioRendererMixer owner must call
// this method when it's done with a mixer.
void RemoveMixer(int source_render_view_id,
- const media::AudioParameters& params);
+ media::AudioRendererMixer* mixer
+ /*const media::AudioParameters& params*/);
// Active mixers.
AudioRendererMixerMap mixers_;
@@ -82,8 +87,7 @@ class CONTENT_EXPORT AudioRendererMixerManager {
// Audio hardware configuration. Used to construct output AudioParameters for
// each AudioRendererMixer instance.
- int hardware_sample_rate_;
- int hardware_buffer_size_;
+ media::AudioHardwareConfig* hardware_config_;
media::AudioRendererSink* sink_for_testing_;
« no previous file with comments | « content/renderer/media/audio_message_filter.cc ('k') | content/renderer/media/audio_renderer_mixer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698