media/audio/win/audio_low_latency_output_win.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: media/audio/win/audio_low_latency_output_win.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 | « media/audio/win/audio_low_latency_input_win_unittest.cc ('k') | media/audio/win/audio_low_latency_output_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/win/audio_low_latency_output_win.cc

diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc

index 87b79d0e4904fb7f60b8a25a6b80638721542897..9fa035d80ba6aec06859dfcea5c2f04202e0e1cd 100644

--- a/media/audio/win/audio_low_latency_output_win.cc

+++ b/media/audio/win/audio_low_latency_output_win.cc

@@ -13,6 +13,7 @@

#include "base/strings/utf_string_conversions.h"

#include "base/trace_event/trace_event.h"

#include "base/win/scoped_propvariant.h"

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

#include "media/audio/win/audio_manager_win.h"

#include "media/audio/win/avrt_wrapper_win.h"

#include "media/audio/win/core_audio_util_win.h"

@@ -76,8 +77,8 @@ WASAPIAudioOutputStream::WASAPIAudioOutputStream(AudioManagerWin* manager,

// The empty string is used to indicate a default device and the

// |device_role_| member controls whether that's the default or default

// communications device.

- DCHECK_NE(device_id_, AudioManagerBase::kDefaultDeviceId);

- DCHECK_NE(device_id_, AudioManagerBase::kCommunicationsDeviceId);

+ DCHECK_NE(device_id_, AudioDeviceDescription::kDefaultDeviceId);

+ DCHECK_NE(device_id_, AudioDeviceDescription::kCommunicationsDeviceId);

DVLOG(1) << "WASAPIAudioOutputStream::WASAPIAudioOutputStream()";

DVLOG_IF(1, share_mode_ == AUDCLNT_SHAREMODE_EXCLUSIVE)