Переглянути джерело

Merge pull request #905 from nextcloud/fix-frozen-video-when-screen-is-shared

[v8.0.x] Fix frozen video when screen is shared
Biswajit Das 4 роки тому
батько
коміт
518d1ea62e

+ 4 - 2
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java

@@ -109,11 +109,13 @@ public class MagicPeerConnectionWrapper {
                 magicDataChannel.registerObserver(new MagicDataChannelObserver());
                 if (isMCUPublisher) {
                     peerConnection.createOffer(magicSdpObserver, sdpConstraints);
-                } else if (hasMCU) {
+                } else if (hasMCU && this.videoStreamType.equals("video")) {
+                    // If the connection type is "screen" the client sharing the screen will send an
+                    // offer; offers should be requested only for videos.
                     HashMap<String, String> hashMap = new HashMap<>();
                     hashMap.put("sessionId", sessionId);
                     EventBus.getDefault().post(new WebSocketCommunicationEvent("peerReadyForRequestingOffer", hashMap));
-                } else if (hasInitiated) {
+                } else if (!hasMCU && hasInitiated) {
                     peerConnection.createOffer(magicSdpObserver, sdpConstraints);
 
                 }