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

Unified Diff: content/browser/renderer_host/media/audio_input_renderer_host.cc

Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 2 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
Index: content/browser/renderer_host/media/audio_input_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc
index 9008596c5df5cf2f13da5cc7ad79c7e3c2fb35c0..2894239d10b555e126024bd3158de1b265708459 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -427,7 +427,7 @@ void AudioInputRendererHost::DoCreateStream(
// If we have successfully created the SyncWriter then assign it to the
// entry and construct an AudioInputController.
entry->writer.reset(writer.release());
- if (WebContentsMediaCaptureId::IsWebContentsDeviceId(device_id)) {
+ if (WebContentsMediaCaptureId::Parse(device_id, nullptr)) {
// For MEDIA_DESKTOP_AUDIO_CAPTURE, the source is selected from picker
// window, we do not mute the source audio.
// For MEDIA_TAB_AUDIO_CAPTURE, the probable use case is Cast, we mute
@@ -438,7 +438,7 @@ void AudioInputRendererHost::DoCreateStream(
audio_manager_->GetTaskRunner(), this,
WebContentsAudioInputStream::Create(
device_id, audio_params, audio_manager_->GetWorkerTaskRunner(),
- audio_mirroring_manager_, type == MEDIA_DESKTOP_AUDIO_CAPTURE),
+ audio_mirroring_manager_),
entry->writer.get(), user_input_monitor_);
// Only count for captures from desktop media picker dialog.
if (entry->controller.get() && type == MEDIA_DESKTOP_AUDIO_CAPTURE)

Powered by Google App Engine
This is Rietveld 408576698