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

Unified Diff: media/audio/audio_manager_base.cc

Issue 2313663002: Reland of Add groupid for media devices. Group audio devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improve AudioManager comment. Created 4 years, 3 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
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index bfca277e7312dcf4bfafbe188d953659876009a8..7d3c946ab179221bd42e7525e0ecf3cc77b5c8b3 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -345,6 +345,28 @@ std::string AudioManagerBase::GetAssociatedOutputDeviceID(
return "";
}
+std::string AudioManagerBase::GetGroupIDOutput(
+ const std::string& output_device_id) {
+ if (output_device_id == AudioDeviceDescription::kDefaultDeviceId) {
+ std::string real_device_id = GetDefaultOutputDeviceID();
+ if (!real_device_id.empty()) {
+ return real_device_id;
+ }
+ }
+ return output_device_id;
+}
+
+std::string AudioManagerBase::GetGroupIDInput(
+ const std::string& input_device_id) {
+ std::string output_device_id = GetAssociatedOutputDeviceID(input_device_id);
+ if (output_device_id.empty()) {
+ // Some characters are added to avoid accidentally
+ // giving the input the same group id as an output.
+ return input_device_id + "input";
+ }
+ return GetGroupIDOutput(output_device_id);
+}
+
std::string AudioManagerBase::GetDefaultOutputDeviceID() {
return "";
}

Powered by Google App Engine
This is Rietveld 408576698