Chromium Code Reviews| Index: media/base/audio_renderer_mixer_input.h |
| diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h |
| index 50f54bdd436f24a3fb54df0597cf7074a3578b59..76466ce809f7d985c2d468776db8aebecc7bc497 100644 |
| --- a/media/base/audio_renderer_mixer_input.h |
| +++ b/media/base/audio_renderer_mixer_input.h |
| @@ -11,6 +11,7 @@ |
| #include "base/macros.h" |
| #include "media/base/audio_converter.h" |
| #include "media/base/audio_renderer_sink.h" |
| +#include "media/base/output_device.h" |
| #include "url/origin.h" |
| namespace media { |
| @@ -32,8 +33,13 @@ class MEDIA_EXPORT AudioRendererMixerInput |
| const url::Origin& security_origin)> |
| RemoveMixerCB; |
| + typedef base::Callback<AudioParameters(const std::string& device_id, |
| + const url::Origin& security_origin)> |
| + GetHWParamsCB; |
|
Henrik Grunell
2016/02/11 12:01:26
Name it "GetHardwareParamsCallback".
o1ka
2016/02/11 17:18:23
Done.
|
| + |
| AudioRendererMixerInput(const GetMixerCB& get_mixer_cb, |
| const RemoveMixerCB& remove_mixer_cb, |
| + const GetHWParamsCB& get_hw_params_cb, |
| const std::string& device_id, |
| const url::Origin& security_origin); |
| @@ -63,7 +69,7 @@ class MEDIA_EXPORT AudioRendererMixerInput |
| private: |
| friend class AudioRendererMixerInputTest; |
| - bool initialized_; |
| + bool started_; |
| bool playing_; |
| double volume_; |
| @@ -76,6 +82,10 @@ class MEDIA_EXPORT AudioRendererMixerInput |
| const GetMixerCB get_mixer_cb_; |
| const RemoveMixerCB remove_mixer_cb_; |
| + // Callbacks provided during construction which allows AudioRendererMixerInput |
| + // to access hardware output parameters when it is detached from the mixer. |
| + const GetHWParamsCB get_hw_params_cb_; |
|
Henrik Grunell
2016/02/11 12:01:26
Same here, spell out the abbreviations in the memb
o1ka
2016/02/11 17:18:23
Done.
|
| + |
| // AudioParameters received during Initialize(). |
| AudioParameters params_; |