e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
234 lines
9 KiB
C++
234 lines
9 KiB
C++
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#include "shell/browser/media/media_stream_devices_controller.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/desktop_media_id.h"
|
|
#include "content/public/browser/media_stream_request.h"
|
|
#include "shell/browser/media/media_capture_devices_dispatcher.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
bool HasAnyAvailableDevice() {
|
|
const blink::MediaStreamDevices& audio_devices =
|
|
MediaCaptureDevicesDispatcher::GetInstance()->GetAudioCaptureDevices();
|
|
const blink::MediaStreamDevices& video_devices =
|
|
MediaCaptureDevicesDispatcher::GetInstance()->GetVideoCaptureDevices();
|
|
|
|
return !audio_devices.empty() || !video_devices.empty();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
MediaStreamDevicesController::MediaStreamDevicesController(
|
|
const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback)
|
|
: request_(request),
|
|
callback_(std::move(callback)),
|
|
// For MEDIA_OPEN_DEVICE requests (Pepper) we always request both webcam
|
|
// and microphone to avoid popping two infobars.
|
|
microphone_requested_(
|
|
request.audio_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE ||
|
|
request.request_type == blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
|
|
webcam_requested_(
|
|
request.video_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE ||
|
|
request.request_type == blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY) {}
|
|
|
|
MediaStreamDevicesController::~MediaStreamDevicesController() {
|
|
if (!callback_.is_null()) {
|
|
std::move(callback_).Run(
|
|
blink::mojom::StreamDevicesSet(),
|
|
blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN,
|
|
std::unique_ptr<content::MediaStreamUI>());
|
|
}
|
|
}
|
|
|
|
bool MediaStreamDevicesController::TakeAction() {
|
|
// Do special handling of desktop screen cast.
|
|
if (request_.audio_type ==
|
|
blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE ||
|
|
request_.video_type ==
|
|
blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE ||
|
|
request_.audio_type ==
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE ||
|
|
request_.video_type ==
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
|
|
HandleUserMediaRequest();
|
|
return true;
|
|
}
|
|
|
|
// Deny the request if there is no device attached to the OS.
|
|
if (!HasAnyAvailableDevice()) {
|
|
Deny(blink::mojom::MediaStreamRequestResult::NO_HARDWARE);
|
|
return true;
|
|
}
|
|
|
|
Accept();
|
|
return true;
|
|
}
|
|
|
|
void MediaStreamDevicesController::Accept() {
|
|
// Get the default devices for the request.
|
|
blink::mojom::StreamDevicesSetPtr stream_devices_set =
|
|
blink::mojom::StreamDevicesSet::New();
|
|
stream_devices_set->stream_devices.emplace_back(
|
|
blink::mojom::StreamDevices::New());
|
|
blink::mojom::StreamDevices& stream_devices =
|
|
*stream_devices_set->stream_devices[0];
|
|
|
|
if (microphone_requested_ || webcam_requested_) {
|
|
switch (request_.request_type) {
|
|
case blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY: {
|
|
const blink::MediaStreamDevice* device = nullptr;
|
|
// For open device request pick the desired device or fall back to the
|
|
// first available of the given type.
|
|
if (request_.audio_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
device =
|
|
MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetRequestedAudioDevice(request_.requested_audio_device_id);
|
|
// TODO(wjia): Confirm this is the intended behavior.
|
|
if (!device) {
|
|
device = MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetFirstAvailableAudioDevice();
|
|
}
|
|
if (device)
|
|
stream_devices.audio_device = *device;
|
|
} else if (request_.video_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
|
|
// Pepper API opens only one device at a time.
|
|
device =
|
|
MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetRequestedVideoDevice(request_.requested_video_device_id);
|
|
// TODO(wjia): Confirm this is the intended behavior.
|
|
if (!device) {
|
|
device = MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetFirstAvailableVideoDevice();
|
|
}
|
|
if (device)
|
|
stream_devices.video_device = *device;
|
|
}
|
|
break;
|
|
}
|
|
case blink::MEDIA_GENERATE_STREAM: {
|
|
bool needs_audio_device = microphone_requested_;
|
|
bool needs_video_device = webcam_requested_;
|
|
|
|
// Get the exact audio or video device if an id is specified.
|
|
if (!request_.requested_audio_device_id.empty()) {
|
|
const blink::MediaStreamDevice* audio_device =
|
|
MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetRequestedAudioDevice(request_.requested_audio_device_id);
|
|
if (audio_device) {
|
|
stream_devices.audio_device = *audio_device;
|
|
needs_audio_device = false;
|
|
}
|
|
}
|
|
if (!request_.requested_video_device_id.empty()) {
|
|
const blink::MediaStreamDevice* video_device =
|
|
MediaCaptureDevicesDispatcher::GetInstance()
|
|
->GetRequestedVideoDevice(request_.requested_video_device_id);
|
|
if (video_device) {
|
|
stream_devices.video_device = *video_device;
|
|
needs_video_device = false;
|
|
}
|
|
}
|
|
|
|
// If either or both audio and video devices were requested but not
|
|
// specified by id, get the default devices.
|
|
if (needs_audio_device || needs_video_device) {
|
|
MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
|
|
needs_audio_device, needs_video_device, stream_devices);
|
|
}
|
|
break;
|
|
}
|
|
case blink::MEDIA_DEVICE_ACCESS: {
|
|
// Get the default devices for the request.
|
|
MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
|
|
microphone_requested_, webcam_requested_, stream_devices);
|
|
break;
|
|
}
|
|
case blink::MEDIA_DEVICE_UPDATE: {
|
|
NOTREACHED();
|
|
break;
|
|
}
|
|
case blink::MEDIA_GET_OPEN_DEVICE: {
|
|
// Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do
|
|
// not need to get permissions for blink::mojom::StreamDevices as those
|
|
// are controlled by the original context.
|
|
NOTREACHED();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
std::move(callback_).Run(*stream_devices_set,
|
|
blink::mojom::MediaStreamRequestResult::OK,
|
|
std::unique_ptr<content::MediaStreamUI>());
|
|
}
|
|
|
|
void MediaStreamDevicesController::Deny(
|
|
blink::mojom::MediaStreamRequestResult result) {
|
|
std::move(callback_).Run(blink::mojom::StreamDevicesSet(), result,
|
|
std::unique_ptr<content::MediaStreamUI>());
|
|
}
|
|
|
|
void MediaStreamDevicesController::HandleUserMediaRequest() {
|
|
blink::mojom::StreamDevicesSetPtr stream_devices_set =
|
|
blink::mojom::StreamDevicesSet::New();
|
|
stream_devices_set->stream_devices.emplace_back(
|
|
blink::mojom::StreamDevices::New());
|
|
blink::mojom::StreamDevices& devices = *stream_devices_set->stream_devices[0];
|
|
|
|
if (request_.audio_type ==
|
|
blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
|
|
devices.audio_device = blink::MediaStreamDevice(
|
|
blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE, "", "");
|
|
}
|
|
if (request_.video_type ==
|
|
blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
|
|
devices.video_device = blink::MediaStreamDevice(
|
|
blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE, "", "");
|
|
}
|
|
if (request_.audio_type ==
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE) {
|
|
devices.audio_device = blink::MediaStreamDevice(
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE, "loopback",
|
|
"System Audio");
|
|
}
|
|
if (request_.video_type ==
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
|
|
content::DesktopMediaID screen_id;
|
|
// If the device id wasn't specified then this is a screen capture request
|
|
// (i.e. chooseDesktopMedia() API wasn't used to generate device id).
|
|
if (request_.requested_video_device_id.empty()) {
|
|
screen_id = content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
|
|
-1 /* kFullDesktopScreenId */);
|
|
} else {
|
|
screen_id =
|
|
content::DesktopMediaID::Parse(request_.requested_video_device_id);
|
|
}
|
|
|
|
devices.video_device = blink::MediaStreamDevice(
|
|
blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE,
|
|
screen_id.ToString(), "Screen");
|
|
}
|
|
|
|
bool empty =
|
|
!devices.audio_device.has_value() && !devices.video_device.has_value();
|
|
std::move(callback_).Run(
|
|
*stream_devices_set,
|
|
empty ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
|
|
: blink::mojom::MediaStreamRequestResult::OK,
|
|
std::unique_ptr<content::MediaStreamUI>());
|
|
}
|
|
|
|
} // namespace electron
|