diff options
Diffstat (limited to 'src/core/media_capture_devices_dispatcher.h')
| -rw-r--r-- | src/core/media_capture_devices_dispatcher.h | 77 |
1 files changed, 17 insertions, 60 deletions
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h index d2633cb83..2b6bb98d8 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h @@ -1,59 +1,18 @@ -/**************************************************************************** -** -** Copyright (c) 2012 The Chromium Authors. All rights reserved. -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef MEDIA_CAPTURE_DEVICES_DISPATCHER_H #define MEDIA_CAPTURE_DEVICES_DISPATCHER_H -#include <deque> -#include <list> -#include <map> - #include "web_contents_adapter_client.h" -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/containers/flat_map.h" #include "base/memory/singleton.h" -#include "base/observer_list.h" #include "chrome/browser/tab_contents/web_contents_collection.h" #include "content/public/browser/media_observer.h" -#include "content/public/browser/web_contents_delegate.h" +#include "content/public/browser/media_stream_request.h" namespace QtWebEngineCore { @@ -65,13 +24,14 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver, public: static MediaCaptureDevicesDispatcher *GetInstance(); - void processMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); + void processMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, + content::MediaResponseCallback, content::DesktopMediaID); // Called back from our WebContentsAdapter to grant the requested permission. void handleMediaAccessPermissionResponse(content::WebContents *, const QUrl &securityOrigin, WebContentsAdapterClient::MediaRequestFlags); private: - void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, blink::MediaStreamDevices *); + void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, blink::mojom::StreamDevicesSet &devices); // Overridden from content::MediaObserver: void OnAudioCaptureDevicesChanged() override {} @@ -92,20 +52,17 @@ private: friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>; - typedef base::RepeatingCallback<void(const blink::MediaStreamDevices &devices, - blink::mojom::MediaStreamRequestResult result, - std::unique_ptr<content::MediaStreamUI> ui)> - RepeatingMediaResponseCallback; - struct PendingAccessRequest { - PendingAccessRequest(const content::MediaStreamRequest &request, const RepeatingMediaResponseCallback &callback); + PendingAccessRequest(const content::MediaStreamRequest &request, + content::MediaResponseCallback callback, content::DesktopMediaID id); ~PendingAccessRequest(); content::MediaStreamRequest request; - RepeatingMediaResponseCallback callback; + content::MediaResponseCallback callback; + content::DesktopMediaID mediaId; }; - typedef base::circular_deque<PendingAccessRequest> RequestsQueue; - typedef std::map<content::WebContents *, RequestsQueue> RequestsQueues; + typedef base::circular_deque<std::unique_ptr<PendingAccessRequest>> RequestsQueue; + typedef base::flat_map<content::WebContents *, RequestsQueue> RequestsQueues; MediaCaptureDevicesDispatcher(); virtual ~MediaCaptureDevicesDispatcher(); @@ -114,8 +71,10 @@ private: void WebContentsDestroyed(content::WebContents *webContents) override; // Helpers for ProcessMediaAccessRequest(). + void handleRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); - void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, content::MediaResponseCallback); + void enqueueMediaAccessRequest(content::WebContents *, const content::MediaStreamRequest &, + content::MediaResponseCallback, content::DesktopMediaID); void ProcessQueuedAccessRequest(content::WebContents *); // Called by the MediaObserver() functions, executed on UI thread. @@ -127,8 +86,6 @@ private: WebContentsCollection m_webContentsCollection; bool m_loopbackAudioSupported = false; - - DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher); }; } // namespace QtWebEngineCore |