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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.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: content/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index a3ca23926826d8df32370f319ff0b3309dfe1617..7fb28e91920f574d3b1ff3add3a9a02523a233b8 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -80,6 +80,8 @@ AudioOutputDeviceInfo GetDefaultDeviceInfoOnDeviceThread(
AudioOutputDeviceInfo default_device_info = {
media::AudioDeviceDescription::kDefaultDeviceId,
media::AudioDeviceDescription::GetDefaultDeviceName(),
+ audio_manager->GetGroupIDOutput(
+ media::AudioDeviceDescription::kDefaultDeviceId),
audio_manager->GetDefaultOutputStreamParameters()};
return default_device_info;
@@ -856,7 +858,7 @@ void AudioRendererHost::TranslateDeviceID(
}
DCHECK(!device_id.empty()); // Default device must always be found
AudioOutputDeviceInfo device_info = {
- std::string(), std::string(),
+ std::string(), std::string(), std::string(),
media::AudioParameters::UnavailableDeviceParams()};
callback.Run(false, device_info);
}

Powered by Google App Engine
This is Rietveld 408576698