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

Unified Diff: media/base/audio_renderer_mixer.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
« no previous file with comments | « media/base/audio_hardware_config.h ('k') | media/base/audio_renderer_mixer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_renderer_mixer.h
diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h
index c25e1d813623b600a4a5dd537e131834c5d3f434..d7c903ec5594ab2e8e4dc425e85f5480e420602c 100644
--- a/media/base/audio_renderer_mixer.h
+++ b/media/base/audio_renderer_mixer.h
@@ -30,6 +30,9 @@ class MEDIA_EXPORT AudioRendererMixer
void AddMixerInput(const scoped_refptr<AudioRendererMixerInput>& input);
void RemoveMixerInput(const scoped_refptr<AudioRendererMixerInput>& input);
+ const AudioParameters& input_params() { return input_params_; }
+ const AudioParameters& output_params() { return output_params_; }
+
void set_pause_delay_for_testing(base::TimeDelta delay) {
pause_delay_ = delay;
}
@@ -39,6 +42,7 @@ class MEDIA_EXPORT AudioRendererMixer
virtual int Render(AudioBus* audio_bus,
int audio_delay_milliseconds) OVERRIDE;
virtual void OnRenderError() OVERRIDE;
+ virtual void OnDeviceChange() OVERRIDE;
// Output sink for this mixer.
scoped_refptr<AudioRendererSink> audio_sink_;
@@ -59,6 +63,9 @@ class MEDIA_EXPORT AudioRendererMixer
base::Time last_play_time_;
bool playing_;
+ AudioParameters input_params_;
+ AudioParameters output_params_;
+
DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
};
« no previous file with comments | « media/base/audio_hardware_config.h ('k') | media/base/audio_renderer_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698