Index: media/audio/pulse/audio_manager_pulse.cc |
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc |
index 398826ae1c360a03dcaebfcfea59e8be8e592adb..bb99067aa855eecf60b35e816a9b0751c30babea 100644 |
--- a/media/audio/pulse/audio_manager_pulse.cc |
+++ b/media/audio/pulse/audio_manager_pulse.cc |
@@ -174,6 +174,32 @@ AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream( |
return MakeInputStream(params, device_id); |
} |
+std::string AudioManagerPulse::GetDefaultOutputDeviceID() { |
+ return pulse::GetRealDefaultDeviceId(input_mainloop_, input_context_, |
+ pulse::RequestType::OUTPUT); |
+} |
+ |
+std::string AudioManagerPulse::GetAssociatedOutputDeviceID( |
+ const std::string& input_device_id) { |
+ DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(input_mainloop_); |
+ DCHECK(input_context_); |
+ const std::string& input = |
tommi (sloooow) - chröme
2016/08/29 13:02:25
if GetRealDefaultDeviceId doesn't return a referen
Max Morin
2016/08/29 14:04:22
Done.
|
+ (input_device_id == AudioDeviceDescription::kDefaultDeviceId) |
+ ? pulse::GetRealDefaultDeviceId(input_mainloop_, input_context_, |
+ pulse::RequestType::INPUT) |
+ : input_device_id; |
+ |
+ std::string input_bus = |
+ pulse::GetBusOfInput(input_mainloop_, input_context_, input); |
+ if (input_bus.empty()) { |
tommi (sloooow) - chröme
2016/08/29 13:02:25
no {}
Max Morin
2016/08/29 14:04:22
Done.
|
+ return ""; |
+ } |
+ std::string s = pulse::GetOutputCorrespondingTo(input_mainloop_, |
tommi (sloooow) - chröme
2016/08/29 13:02:25
nit: return pulse::GetOutputCorrespondingTo(...);
Max Morin
2016/08/29 14:04:22
Done.
|
+ input_context_, input_bus); |
+ return s; |
+} |
+ |
AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters( |
const std::string& output_device_id, |
const AudioParameters& input_params) { |