imporove reconnection

Author: USAMAWIZARD

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java

@@ -277,17 +277,17 @@ public void createReconnectorRunnables() {
                                 && pc.iceConnectionState() != PeerConnection.IceConnectionState.COMPLETED)) {
 
 
-                    if (peerInfo.mode.equals(Mode.PUBLISH)) {
-                        if (pc != null) {
-                            pc.close();
-                            /*
-                            This is a FIX of a reconnection bug.
-                            If dispose is used instead of close, in one of consequent reconnection attempts segmentation fault occurs.
-                            pc.dispose();
-                            */
-                        }
+                    if (pc != null) {
+                        pc.close();
+                        /*
+                        This is a FIX of a reconnection bug.
+                        If dispose is used instead of close, in one of consequent reconnection attempts segmentation fault occurs.
+                        pc.dispose();
+                        */
+                    }
 
-                        config.webRTCListener.onReconnectionAttempt(peerInfo.id,peerInfo.mode);
+                    config.webRTCListener.onReconnectionAttempt(peerInfo.id,peerInfo.mode);
+                    if (peerInfo.mode.equals(Mode.PUBLISH)) {
 
                         Log.d(TAG, "Reconnect attempt for publish");
                         wsHandler.stop(peerInfo.id);
@@ -316,20 +316,19 @@ public void createReconnectorRunnables() {
                                 && pc.iceConnectionState() != PeerConnection.IceConnectionState.CONNECTED
                                 && pc.iceConnectionState() != PeerConnection.IceConnectionState.COMPLETED)) {
 
-                    if (peerInfo.mode.equals(Mode.PLAY)) {
-
-                        releaseRemoteRenderers();
 
-                        if (pc != null) {
-                            pc.close();
-                            /*
-                            This is a FIX of a reconnection bug.
-                            If dispose is used instead of close, in one of consequent reconnection attempts segmentation fault occurs.
-                            pc.dispose();
-                            */
-                        }
+                    releaseRemoteRenderers();
+                    if (pc != null) {
+                        pc.close();
+                        /*
+                        This is a FIX of a reconnection bug.
+                        If dispose is used instead of close, in one of consequent reconnection attempts segmentation fault occurs.
+                        pc.dispose();
+                        */
+                    }
 
-                        config.webRTCListener.onReconnectionAttempt(peerInfo.id,peerInfo.mode);
+                    config.webRTCListener.onReconnectionAttempt(peerInfo.id,peerInfo.mode);
+                    if (peerInfo.mode.equals(Mode.PLAY)) {
                         Log.d(TAG, "Reconnect attempt for play");
 
                         play(peerInfo.id,
@@ -348,6 +347,10 @@ public void createReconnectorRunnables() {
             if(released || streamStoppedByUser){
                 return;
             }
+            if(wsHandler.pingPongExecutor == null){
+                wsHandler.startPingPongTimer();
+            }
+
             peerReconnectionHandler.postDelayed(peerReconnectorRunnable, PEER_RECONNECTION_RETRY_DELAY_MS);
 
             for (PeerInfo peerInfo : peers.values()) {
@@ -674,7 +677,7 @@ public void onCreateSuccess(final SessionDescription desc) {
                 PeerConnection pc = peerInfo.peerConnection;
                 if (pc != null) {
                     Log.d(TAG, "Set local SDP from " + desc.type);
-                pc.setLocalDescription(this, newDesc);
+                    pc.setLocalDescription(this, newDesc);
                 }
             });
         }
@@ -1379,11 +1382,6 @@ public void rePublishPlay() {
                     publishReconnectionHandler.postDelayed(publishReconnectorRunnable, PEER_RECONNECTION_DELAY_MS);
                     Log.d(TAG, "------------------------------------- Publish Reconnection --------------------------------------");
                 }
-                if (!isPlayConnected() && !playReconnectionInProgress) {
-                    playReconnectionInProgress = true;
-                    playReconnectionHandler.postDelayed(playReconnectorRunnable, PEER_RECONNECTION_DELAY_MS);
-                    Log.d(TAG, "------------------------------------- Play Reconnection --------------------------------------");
-                }
             } else {
                 Log.i(TAG, "Peer was connected before. Will try to republish/replay in " + PEER_RECONNECTION_DELAY_MS + " ms.");
                 publishReconnectionInProgress = true;
@@ -1490,6 +1488,12 @@ public void onConnected(String streamId) {
         Log.i(TAG, "Connected for streamId:" + streamId);
 
         if(isConference() && config.reconnectionEnabled){
+            if (!isPlayConnected() && !playReconnectionInProgress) {
+                playReconnectionInProgress = true;
+                playReconnectionHandler.postDelayed(playReconnectorRunnable, PEER_RECONNECTION_DELAY_MS);
+                Log.d(TAG, "------------------------------------- Play Reconnection --------------------------------------");
+            }
+
             if(isPublishConnected()){
                 Log.i(TAG,"Publish reconnected");
                 publishReconnectionHandler.removeCallbacksAndMessages(null);

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketHandler.java

@@ -69,19 +69,19 @@ public WebSocketHandler(AntMediaSignallingEvents signallingListener, Handler han
     }
 
     public WebSocket connectWebSocket(String wsServerUrl){
-        synchronized (this) {
-            if (isWsOpen) {
-                disconnect(true);
-            }
-            Request request = new Request.Builder().url(wsServerUrl).build();
-            return client.newWebSocket(request, this);
+        if (isWsOpen) {
+            disconnect(true);
         }
+        Request request = new Request.Builder().url(wsServerUrl).build();
+        return client.newWebSocket(request, this);
     }
     public void connect(final String wsUrl) {
-        if(wsUrl == null || wsUrl.isBlank())
-            return;
-        wsServerUrl = wsUrl;
-        ws = connectWebSocket(wsServerUrl);
+        synchronized (this) {
+            if (wsUrl == null || wsUrl.isBlank())
+                return;
+            wsServerUrl = wsUrl;
+            ws = connectWebSocket(wsServerUrl);
+        }
     }
 
     public void sendTextMessage(String message) {
@@ -136,11 +136,11 @@ public void onOpen(@NonNull WebSocket webSocket, @NonNull Response response) {
     @Override
     public void onClosed(@NonNull WebSocket webSocket, int code, @NonNull String reason) {
         synchronized (this) {
+            isWsOpen = false;
             stopPingPongTimer();
             handler.post(() -> {
                 Log.d(TAG, "WebSocket connection closed.");
                 signallingListener.onWebSocketDisconnected();
-                isWsOpen = false;
                 synchronized (closeEventLock) {
                     closeEvent = true;
                     closeEventLock.notify();

webrtc-android-framework/src/main/java/org/webrtc/audio/WebRtcAudioTrack.java

@@ -538,10 +538,12 @@ public static void setSpeakerMute(boolean mute) {
 
   // Releases the native AudioTrack resources.
   private void releaseAudioResources() {
-    Logging.d(TAG, "releaseAudioResources");
-    if (audioTrack != null) {
-      audioTrack.release();
-      audioTrack = null;
+    synchronized (this) {
+      Logging.d(TAG, "releaseAudioResources");
+      if (audioTrack != null) {
+        audioTrack.release();
+        audioTrack = null;
+      }
     }
   }