content/browser/renderer_host/media/audio_renderer_host.cc - Issue 2313663002: Reland of Add groupid for media devices. Group audio devices.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix. 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

« no previous file with comments | « content/browser/renderer_host/media/audio_output_device_enumerator.cc ('k') | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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);

}