content/browser/renderer_host/media/media_stream_manager.cc - 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/browser/renderer_host/media/media_stream_manager.cc

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/renderer_host/media/audio_renderer_host.cc ('k') | content/browser/renderer_host/media/media_stream_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_manager.cc

diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc

index c63084f0b19a647fd7dffeafc831c60c404035ce..b060938443261bc87516cd7ee1d755b7b69a9a58 100644

--- a/content/browser/renderer_host/media/media_stream_manager.cc

+++ b/content/browser/renderer_host/media/media_stream_manager.cc

@@ -48,7 +48,8 @@

#include "content/public/common/content_switches.h"

#include "content/public/common/media_stream_request.h"

#include "crypto/hmac.h"

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

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

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

#include "media/base/audio_parameters.h"

#include "media/base/channel_layout.h"

#include "media/base/media_switches.h"

@@ -2128,8 +2129,8 @@ std::string MediaStreamManager::GetHMACForMediaDeviceID(

const std::string& raw_unique_id) {

DCHECK(security_origin.is_valid());

DCHECK(!raw_unique_id.empty());

- if (raw_unique_id == media::AudioManagerBase::kDefaultDeviceId ||

- raw_unique_id == media::AudioManagerBase::kCommunicationsDeviceId) {

+ if (raw_unique_id == media::AudioDeviceDescription::kDefaultDeviceId ||

+ raw_unique_id == media::AudioDeviceDescription::kCommunicationsDeviceId) {

return raw_unique_id;

}