fix #260 - Some cameras seem to appear black on the left and right

igniterealtime · Feb 28, 2021 · 82589a1 · 82589a1
1 parent ca30761
commit 82589a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/pade/changelog.html b/pade/changelog.html
@@ -56,6 +56,7 @@ <h1>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/252">Issue #252 - Add custom confetti settings to Admin console</a></li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/253">Issue #253 - Add support for the Badging API</a></li>
     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/256">Issue #256 - Some date-time languages are missing</a></li>
+    <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/260">Issue #260 - Some cameras seem to appear black on the left and right</a></li>
  </ul>
 
 <p><b>1.3.1</b> -- <i>January 31, 2021</i></p>

diff --git a/web/src/main/webapp/custom_ofmeet.js b/web/src/main/webapp/custom_ofmeet.js
@@ -525,19 +525,14 @@ var ofmeet = (function(of)
         }
 
         if (interfaceConfig.OFMEET_RECORD_CONFERENCE && !config.webinar) {
-            navigator.mediaDevices.getUserMedia({ audio: true, video: true }).then(function (stream) {
-                recordingVideoTrack[APP.conference.getMyUserId()] = stream;
-                recordingAudioTrack[APP.conference.getMyUserId()] = stream;
+			createRecordButton();
+			createPhotoButton();
+			createDesktopButton();
 
-                createRecordButton();
-                createPhotoButton();
-                createDesktopButton();
-
-                if (APP.conference.getMyUserId()) {
-                    showClock();
-                    clockTrack.joins = (new Date()).getTime();
-                }
-            });
+			if (APP.conference.getMyUserId()) {
+				showClock();
+				clockTrack.joins = (new Date()).getTime();
+            }
         }
 
         if (interfaceConfig.OFMEET_TAG_CONFERENCE && !config.webinar) {
@@ -601,7 +596,7 @@ var ofmeet = (function(of)
                     evt.stopPropagation();
 
                     if (!of.recording) {
-                        startMeetingRecorder();
+                        startRecorder(startMeetingRecorder);
                     } else {
                         stopRecorder();
                     }
@@ -662,7 +657,7 @@ var ofmeet = (function(of)
                     evt.stopPropagation();
 
                     if (!of.recording) {
-                        startDesktopRecorder();
+                        startRecorder(startDesktopRecorder);
                     } else {
                         stopRecorder();
                     }
@@ -1827,6 +1822,15 @@ var ofmeet = (function(of)
         createAnchor(htmlFile, blob);
     }
 
+    function startRecorder(recorder)
+    {
+		navigator.mediaDevices.getUserMedia({ audio: true, video: true }).then(function (stream) {
+			recordingVideoTrack[APP.conference.getMyUserId()] = stream;
+			recordingAudioTrack[APP.conference.getMyUserId()] = stream;
+			recorder();
+		});		
+	}
+
     function startMeetingRecorder()
     {
         console.debug("ofmeet.js startMeetingRecorder");