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

Update to Chromium version 123.0.6312.0 (#1262506)

Browse Source 
- MacOS ARM64 Official builds are currently failing due to
  https://issues.chromium.org/issues/326898585
This commit is contained in:
Marshall Greenblatt
2024-02-22 13:36:15 -05:00
parent 2c5dd120c7
commit d4cf19db29
100 changed files with 837 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libcef/browser/media_access_query.cc
View File

@@ -131,18 +131,24 @@ class CefMediaAccessQuery {
blink::MediaStreamDevices audio_devices;
blink::MediaStreamDevices video_devices;
if (device_audio_requested()) {
if (device_audio_requested() &&
!request_.requested_audio_device_ids.empty() &&
!request_.requested_audio_device_ids.front().empty()) {
// Pick the desired device or fall back to the first available of the
// given type.
CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice(
request_.requested_audio_device_id, true, false, &audio_devices);
request_.requested_audio_device_ids.front(), true, false,
&audio_devices);
}
if (device_video_requested()) {
if (device_video_requested() &&
!request_.requested_video_device_ids.empty() &&
!request_.requested_video_device_ids.front().empty()) {
// Pick the desired device or fall back to the first available of the
// given type.
CefMediaCaptureDevicesDispatcher::GetInstance()->GetRequestedDevice(
request_.requested_video_device_id, false, true, &video_devices);
request_.requested_video_device_ids.front(), false, true,
&video_devices);
}
if (desktop_audio_requested()) {
@@ -152,13 +158,14 @@ class CefMediaAccessQuery {
if (desktop_video_requested()) {
content::DesktopMediaID media_id;
if (request_.requested_video_device_id.empty()) {
if (!request_.requested_video_device_ids.empty() &&
!request_.requested_video_device_ids.front().empty()) {
media_id = content::DesktopMediaID::Parse(
request_.requested_video_device_ids.front());
} else {
media_id =
content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
-1 /* webrtc::kFullDesktopScreenId */);
} else {
media_id =
content::DesktopMediaID::Parse(request_.requested_video_device_id);
}
video_devices.emplace_back(request_.video_type, media_id.ToString(),
"Screen");