diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-05 09:03:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-07 15:08:55 +0200 |
| commit | cc232eb6586b3db5b7ed61287e39319990417476 (patch) | |
| tree | 5b92cd09dff11df655ab51c72819cd37d0fe3f5d /src/core | |
| parent | 9b86c62e2abec8ad9f96ab608b68b2b76a3503b9 (diff) | |
Detect the combination of audio and video from getDisplayMedia API
We were missing the combined test after Chromium introduced the new
enums.
Fixes: QTBUG-85890
Change-Id: Id7bb7f05635c64c271e12a12f2409eedc22a9605
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/media_capture_devices_dispatcher.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp index 2293c424a..693cfa2e3 100644 --- a/src/core/media_capture_devices_dispatcher.cpp +++ b/src/core/media_capture_devices_dispatcher.cpp @@ -173,6 +173,10 @@ WebContentsAdapterClient::MediaRequestFlags mediaRequestFlagsForRequest(const co request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) return {WebContentsAdapterClient::MediaDesktopAudioCapture, WebContentsAdapterClient::MediaDesktopVideoCapture}; + if (request.audio_type == MediaStreamType::DISPLAY_AUDIO_CAPTURE && + request.video_type == MediaStreamType::DISPLAY_VIDEO_CAPTURE) + return {WebContentsAdapterClient::MediaDesktopAudioCapture, WebContentsAdapterClient::MediaDesktopVideoCapture}; + if (request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE || request.video_type == MediaStreamType::DISPLAY_VIDEO_CAPTURE) return {WebContentsAdapterClient::MediaDesktopVideoCapture}; |