Index: media/base/audio_renderer_mixer_input.cc |
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc |
index 5743700f04b0a62c1c3c6eaf0f2d0bfa54aef0f5..818bc81a22cdf32053cf449b607683a116a31fa7 100644 |
--- a/media/base/audio_renderer_mixer_input.cc |
+++ b/media/base/audio_renderer_mixer_input.cc |
@@ -15,7 +15,7 @@ namespace media { |
AudioRendererMixerInput::AudioRendererMixerInput( |
const GetMixerCB& get_mixer_cb, |
const RemoveMixerCB& remove_mixer_cb, |
- const GetHardwareParamsCB& get_hardware_params_cb, |
+ const GetOutputDeviceCB& get_output_device_cb, |
const std::string& device_id, |
const url::Origin& security_origin) |
: started_(false), |
@@ -23,7 +23,7 @@ AudioRendererMixerInput::AudioRendererMixerInput( |
volume_(1.0f), |
get_mixer_cb_(get_mixer_cb), |
remove_mixer_cb_(remove_mixer_cb), |
- get_hardware_params_cb_(get_hardware_params_cb), |
+ get_output_device_cb_(get_output_device_cb), |
device_id_(device_id), |
security_origin_(security_origin), |
mixer_(nullptr), |
@@ -111,7 +111,8 @@ bool AudioRendererMixerInput::SetVolume(double volume) { |
} |
OutputDevice* AudioRendererMixerInput::GetOutputDevice() { |
- return this; |
+ return mixer_ ? mixer_->GetOutputDevice() |
+ : get_output_device_cb_.Run(device_id_, security_origin_); |
Guido Urdaneta
2016/03/17 17:38:24
Shouldn't this one return nullptr when there is no
o1ka
2016/03/18 10:45:40
Of cause we need to make sure it does not leak ;)
|
} |
void AudioRendererMixerInput::SwitchOutputDevice( |
@@ -158,22 +159,6 @@ void AudioRendererMixerInput::SwitchOutputDevice( |
callback.Run(OUTPUT_DEVICE_STATUS_OK); |
} |
-AudioParameters AudioRendererMixerInput::GetOutputParameters() { |
- if (mixer_) |
- return mixer_->GetOutputDevice()->GetOutputParameters(); |
- return get_hardware_params_cb_.Run(device_id_, security_origin_); |
-} |
- |
-OutputDeviceStatus AudioRendererMixerInput::GetDeviceStatus() { |
- if (mixer_) |
- return mixer_->GetOutputDevice()->GetDeviceStatus(); |
- |
- if (started_) |
- return OUTPUT_DEVICE_STATUS_ERROR_INTERNAL; |
- |
- return OUTPUT_DEVICE_STATUS_OK; |
-} |
- |
double AudioRendererMixerInput::ProvideInput(AudioBus* audio_bus, |
base::TimeDelta buffer_delay) { |
// TODO(chcunningham): Delete this conversion and change ProvideInput to more |