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

Unified Diff: media/audio/audio_manager_base.cc

Issue 2273653002: Add groupid for media devices. Group audio devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add unit test. Created 4 years, 4 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..62eab76751c977af2291f12a79bb4da7f355fca9 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -345,6 +345,26 @@ std::string AudioManagerBase::GetAssociatedOutputDeviceID(
return "";
}
+std::string AudioManagerBase::GetGroupIDOutput(std::string output_id) {
Guido Urdaneta 2016/08/29 13:59:47 ditto
+ if (output_id == AudioDeviceDescription::kDefaultDeviceId) {
+ std::string real_id = GetDefaultOutputDeviceID();
+ if (!real_id.empty()) {
+ return real_id;
+ }
+ }
+ return output_id;
+}
+
+std::string AudioManagerBase::GetGroupIDInput(std::string input_id) {
Guido Urdaneta 2016/08/29 13:59:47 ditto
+ std::string output_id = GetAssociatedOutputDeviceID(input_id);
+ if (output_id.empty()) {
+ // Some characters are added to avoid accidentally
+ // giving the input the same group id as an output.
+ return input_id + "input";
+ }
+ return GetGroupIDOutput(output_id);
+}
+
std::string AudioManagerBase::GetDefaultOutputDeviceID() {
return "";
}

Powered by Google App Engine
This is Rietveld 408576698