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

Unified Diff: content/browser/media/capture/web_contents_audio_input_stream.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/media/capture/web_contents_audio_input_stream.cc
diff --git a/content/browser/media/capture/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc
index 4a58cc34c090837a49ec652fc2e30ab040bb0a4d..348af609ed0ce2f46b648fed24496a9108b8131e 100644
--- a/content/browser/media/capture/web_contents_audio_input_stream.cc
+++ b/content/browser/media/capture/web_contents_audio_input_stream.cc
@@ -349,22 +349,19 @@ WebContentsAudioInputStream* WebContentsAudioInputStream::Create(
const std::string& device_id,
const media::AudioParameters& params,
const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
- AudioMirroringManager* audio_mirroring_manager,
- bool is_duplication) {
- int render_process_id;
- int main_render_frame_id;
- if (!WebContentsMediaCaptureId::ExtractTabCaptureTarget(
- device_id, &render_process_id, &main_render_frame_id)) {
+ AudioMirroringManager* audio_mirroring_manager) {
+ WebContentsMediaCaptureId media_id;
+ if (!WebContentsMediaCaptureId::Parse(device_id, &media_id)) {
return NULL;
}
return new WebContentsAudioInputStream(
- render_process_id, main_render_frame_id, audio_mirroring_manager,
- new WebContentsTracker(false),
+ media_id.render_process_id, media_id.main_render_frame_id,
+ audio_mirroring_manager, new WebContentsTracker(false),
new media::VirtualAudioInputStream(
params, worker_task_runner,
media::VirtualAudioInputStream::AfterCloseCallback()),
- is_duplication);
+ !media_id.disable_local_echo);
}
WebContentsAudioInputStream::WebContentsAudioInputStream(

Powered by Google App Engine
This is Rietveld 408576698