content/renderer/media/audio_renderer_mixer_manager.h - Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

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/renderer/media/audio_renderer_mixer_manager.h

Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another rebase Created 4 years, 8 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/speech/speech_recognizer_impl_unittest.cc ('k') | content/renderer/media/audio_renderer_mixer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/audio_renderer_mixer_manager.h

diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h

index c96fb393af65356e3ddf90ce8dfe67dde75162fa..20a1aa59eaf3db3d8e65c0ef805dfe98c16e5e9e 100644

--- a/content/renderer/media/audio_renderer_mixer_manager.h

+++ b/content/renderer/media/audio_renderer_mixer_manager.h

@@ -12,7 +12,7 @@

#include "base/macros.h"

#include "base/synchronization/lock.h"

#include "content/common/content_export.h"

-#include "media/audio/audio_manager_base.h"

+#include "media/audio/audio_device_description.h"

#include "media/base/audio_parameters.h"

#include "media/base/output_device_info.h"

#include "url/origin.h"

@@ -106,8 +106,8 @@ class CONTENT_EXPORT AudioRendererMixerManager {

if (a.params.channel_layout() != b.params.channel_layout())

return a.params.channel_layout() < b.params.channel_layout();

- if (media::AudioManagerBase::IsDefaultDeviceId(a.device_id) &&

- media::AudioManagerBase::IsDefaultDeviceId(b.device_id)) {

+ if (media::AudioDeviceDescription::IsDefaultDevice(a.device_id) &&

+ media::AudioDeviceDescription::IsDefaultDevice(b.device_id)) {

// Both device IDs represent the same default device => do not compare

// them; the default device is always authorized => ignoring security

// origin.