bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix assertion when only video or audio capture is selected (issue #1802)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-05-09 16:17:54 -04:00
parent 157f526d07
commit bff6dd684c
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/browser_host_impl.cc
View File

@ -2286,17 +2286,20 @@ void CefBrowserHostImpl::RequestMediaAccessPermission(
case content::MEDIA_ENUMERATE_DEVICES: case content::MEDIA_ENUMERATE_DEVICES:
// Pick the desired device or fall back to the first available of the // Pick the desired device or fall back to the first available of the
// given type. // given type.
if (microphone_requested) {
CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice( CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice(
request.requested_audio_device_id, request.requested_audio_device_id,
microphone_requested, true,
false, false,
&devices); &devices);
}
if (webcam_requested) {
CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice( CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice(
request.requested_video_device_id, request.requested_video_device_id,
false, false,
webcam_requested, true,
&devices); &devices);
}
break; break;
} }
} }