content/browser/renderer_host/media/video_capture_manager.cc - Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing

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: content/browser/renderer_host/media/video_capture_manager.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

« no previous file with comments | « content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc ('k') | content/browser/webrtc/webrtc_getusermedia_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_manager.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc

index 28040d8ca096862e0ffb0fd262499dd58e371186..2e55d0d15461c20eba89d6609f28d93886feb538 100644

--- a/content/browser/renderer_host/media/video_capture_manager.cc

+++ b/content/browser/renderer_host/media/video_capture_manager.cc

@@ -593,7 +593,7 @@ VideoCaptureManager::DoStartTabCaptureOnDeviceThread(

DCHECK(IsOnDeviceThread());

std::unique_ptr<VideoCaptureDevice> video_capture_device;

- video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id));

+ video_capture_device = WebContentsVideoCaptureDevice::Create(id);

if (!video_capture_device) {

device_client->OnError(FROM_HERE, "Could not create capture device");

@@ -621,7 +621,7 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(

}

if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {

- video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id));

+ video_capture_device = WebContentsVideoCaptureDevice::Create(id);

IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED);

if (desktop_id.audio_share) {

IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED_WITH_AUDIO);