You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/05/05 16:57:26 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2346]
getDisplayMedia reside in normal place for chromium-based edge (#76)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new e7bb4b9 [OPENMEETINGS-2346] getDisplayMedia reside in normal place for chromium-based edge (#76)
e7bb4b9 is described below
commit e7bb4b9604e54f096a7db931d8317af72259fcc8
Author: CkNoSFeRaTU <ma...@gmail.com>
AuthorDate: Tue May 5 19:57:17 2020 +0300
[OPENMEETINGS-2346] getDisplayMedia reside in normal place for chromium-based edge (#76)
---
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index e0ccb33..f28e487 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -32,7 +32,11 @@ var Video = (function() {
cnts = {
video: true
};
- promise = navigator.getDisplayMedia(cnts);
+ if (b.major > 80) {
+ promise = navigator.mediaDevices.getDisplayMedia(cnts);
+ } else {
+ promise = navigator.getDisplayMedia(cnts);
+ }
} else if (b.name === 'Firefox') {
// https://mozilla.github.io/webrtc-landing/gum_test.html
cnts = Sharer.baseConstraints(sd);