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

Unified Diff: media/audio/win/audio_low_latency_input_win.cc

Issue 2144333002: MuteSource Audio During Full Screen Cast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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.h ('k') | media/audio/win/core_audio_util_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_low_latency_input_win.cc
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc
index 949d681945f058919e25758b9509bfb3aaa295b9..4e416a8a426ffca5a637227998d53e838d785ade 100644
--- a/media/audio/win/audio_low_latency_input_win.cc
+++ b/media/audio/win/audio_low_latency_input_win.cc
@@ -35,7 +35,8 @@ WASAPIAudioInputStream::WASAPIAudioInputStream(AudioManagerWin* manager,
perf_count_to_100ns_units_(0.0),
ms_to_frame_count_(0.0),
sink_(NULL),
- audio_bus_(media::AudioBus::Create(params)) {
+ audio_bus_(media::AudioBus::Create(params)),
+ mute_done_(false) {
DCHECK(manager_);
// Load the Avrt DLL if not already loaded. Required to support MMCSS.
@@ -135,6 +136,20 @@ void WASAPIAudioInputStream::Start(AudioInputCallback* callback) {
if (started_)
return;
+ if (device_id_ == AudioDeviceDescription::kLoopbackWithMuteDeviceId &&
+ system_audio_volume_) {
+ BOOL muted = false;
+ system_audio_volume_->GetMute(&muted);
+
+ // If the system audio is muted at the time of capturing, then no need to
+ // mute it again, and later we do not unmute system audio when stopping
+ // capturing.
+ if (!muted) {
+ system_audio_volume_->SetMute(true, NULL);
+ mute_done_ = true;
+ }
+ }
+
DCHECK(!sink_);
sink_ = callback;
@@ -165,6 +180,17 @@ void WASAPIAudioInputStream::Stop() {
if (!started_)
return;
+ // We have muted system audio for capturing, so we need to unmute it when
+ // capturing stops.
+ if (device_id_ == AudioDeviceDescription::kLoopbackWithMuteDeviceId &&
+ mute_done_) {
+ DCHECK(system_audio_volume_);
+ if (system_audio_volume_) {
+ system_audio_volume_->SetMute(false, NULL);
+ mute_done_ = false;
+ }
+ }
+
// Stops periodic AGC microphone measurements.
StopAgc();
@@ -471,6 +497,13 @@ HRESULT WASAPIAudioInputStream::SetCaptureDevice() {
} else if (device_id_ == AudioDeviceDescription::kCommunicationsDeviceId) {
hr = enumerator->GetDefaultAudioEndpoint(eCapture, eCommunications,
endpoint_device_.Receive());
+ } else if (device_id_ == AudioDeviceDescription::kLoopbackWithMuteDeviceId) {
+ // Capture the default playback stream.
+ hr = enumerator->GetDefaultAudioEndpoint(eRender, eConsole,
+ endpoint_device_.Receive());
+
+ endpoint_device_->Activate(__uuidof(IAudioEndpointVolume), CLSCTX_ALL, NULL,
+ system_audio_volume_.ReceiveVoid());
} else if (device_id_ == AudioDeviceDescription::kLoopbackInputDeviceId) {
// Capture the default playback stream.
hr = enumerator->GetDefaultAudioEndpoint(eRender, eConsole,
@@ -572,7 +605,8 @@ HRESULT WASAPIAudioInputStream::InitializeAudioEngine() {
// Use event-driven mode only fo regular input devices. For loopback the
// EVENTCALLBACK flag is specified when intializing
// |audio_render_client_for_loopback_|.
- if (device_id_ == AudioDeviceDescription::kLoopbackInputDeviceId) {
+ if (device_id_ == AudioDeviceDescription::kLoopbackInputDeviceId ||
+ device_id_ == AudioDeviceDescription::kLoopbackWithMuteDeviceId) {
flags = AUDCLNT_STREAMFLAGS_LOOPBACK | AUDCLNT_STREAMFLAGS_NOPERSIST;
} else {
flags = AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST;
@@ -646,7 +680,8 @@ HRESULT WASAPIAudioInputStream::InitializeAudioEngine() {
// samples from the capture endpoint buffer.
//
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd316551(v=vs.85).aspx
- if (device_id_ == AudioDeviceDescription::kLoopbackInputDeviceId) {
+ if (device_id_ == AudioDeviceDescription::kLoopbackInputDeviceId ||
+ device_id_ == AudioDeviceDescription::kLoopbackWithMuteDeviceId) {
hr = endpoint_device_->Activate(
__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
audio_render_client_for_loopback_.ReceiveVoid());
« no previous file with comments | « media/audio/win/audio_low_latency_input_win.h ('k') | media/audio/win/core_audio_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698