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

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

Issue 2060963002: Unmute Tab Audio For Desktop Share By Default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove old TODO Created 4 years, 6 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/media/capture/web_contents_audio_input_stream.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2698f7e2fd488a2c2a47d15b28ddb13b1958b7b1..1cc59fe11e05c3474f64b9566fddce23a97ac611 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc
@@ -436,16 +436,18 @@ void AudioInputRendererHost::DoCreateStream(
// entry and construct an AudioInputController.
entry->writer.reset(writer.release());
if (WebContentsMediaCaptureId::IsWebContentsDeviceId(device_id)) {
+ // 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
+ // the source audio.
+ // TODO(qiangchen): Analyze audio constraints to make a duplicating or
+ // diverting decision. It would give web developer more flexibility.
entry->controller = media::AudioInputController::CreateForStream(
- audio_manager_->GetTaskRunner(),
- this,
+ audio_manager_->GetTaskRunner(), this,
WebContentsAudioInputStream::Create(
- device_id,
- audio_params,
- audio_manager_->GetWorkerTaskRunner(),
- audio_mirroring_manager_),
- entry->writer.get(),
- user_input_monitor_);
+ device_id, audio_params, audio_manager_->GetWorkerTaskRunner(),
+ audio_mirroring_manager_, type == MEDIA_DESKTOP_AUDIO_CAPTURE),
+ entry->writer.get(), user_input_monitor_);
// Only count for captures from desktop media picker dialog.
if (entry->controller.get() && type == MEDIA_DESKTOP_AUDIO_CAPTURE)
IncrementDesktopCaptureCounter(TAB_AUDIO_CAPTURER_CREATED);
« no previous file with comments | « content/browser/media/capture/web_contents_audio_input_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698