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..b5375c933e5a5fc3fb66a66f02a85c9766624df4 100644 |
--- a/media/base/audio_renderer_mixer_input.cc |
+++ b/media/base/audio_renderer_mixer_input.cc |
@@ -15,7 +15,6 @@ namespace media { |
AudioRendererMixerInput::AudioRendererMixerInput( |
const GetMixerCB& get_mixer_cb, |
const RemoveMixerCB& remove_mixer_cb, |
- const GetHardwareParamsCB& get_hardware_params_cb, |
const std::string& device_id, |
const url::Origin& security_origin) |
: started_(false), |
@@ -23,7 +22,6 @@ 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), |
device_id_(device_id), |
security_origin_(security_origin), |
mixer_(nullptr), |
@@ -110,14 +108,14 @@ bool AudioRendererMixerInput::SetVolume(double volume) { |
return true; |
} |
-OutputDevice* AudioRendererMixerInput::GetOutputDevice() { |
- return this; |
+OutputDeviceInfo AudioRendererMixerInput::GetOutputDeviceInfo() { |
+ return mixer_ ? mixer_->GetOutputDeviceInfo() : OutputDeviceInfo(); |
} |
void AudioRendererMixerInput::SwitchOutputDevice( |
const std::string& device_id, |
const url::Origin& security_origin, |
- const SwitchOutputDeviceCB& callback) { |
+ const OutputDeviceStatusCB& callback) { |
if (!mixer_) { |
if (pending_switch_callback_.is_null()) { |
pending_switch_callback_ = callback; |
@@ -158,22 +156,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 |