disconnect WebRTC clients on pause()

RosettaDrone · Aug 29, 2024 · cd7a3bc · cd7a3bc
1 parent f490767
commit cd7a3bc
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 17 deletions.
diff --git a/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java b/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java
@@ -376,6 +376,7 @@ protected void onResume() {
         */
 
         resumeVideo();
+        pluginManager.resume();
     }
 
     void resumeVideo() {
@@ -429,6 +430,7 @@ void resumeVideo() {
     protected void onPause() {
         Log.e(TAG, "onPause()");
         super.onPause();
+        pluginManager.pause();
     }
 
     @Override

diff --git a/app/src/main/java/sq/rogue/rosettadrone/Plugin.java b/app/src/main/java/sq/rogue/rosettadrone/Plugin.java
@@ -3,13 +3,16 @@
 public class Plugin {
     protected PluginManager pluginManager;
 
-    protected void init(PluginManager pluginManager) {
+    public void init(PluginManager pluginManager) {
         this.pluginManager = pluginManager;
     }
 
     protected void start() {
     }
 
+    protected void pause() {}
+    protected void resume() {}
+
     /**
      * Video mode, resolution or codec changed.
      */
@@ -34,7 +37,7 @@ public String getPrefString(String pref, String defPref) {
         return pluginManager.mainActivity.sharedPreferences.getString(pref, defPref);
     }
 
-    public Boolean getPrefBoolean(String pref, Boolean defPref) {
+    public boolean getPrefBoolean(String pref, boolean defPref) {
         return pluginManager.mainActivity.sharedPreferences.getBoolean(pref, defPref);
     }
 

diff --git a/app/src/main/java/sq/rogue/rosettadrone/PluginManager.java b/app/src/main/java/sq/rogue/rosettadrone/PluginManager.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 public class PluginManager {
-    private final String TAG = DroneModel.class.getSimpleName();
+    private final String TAG = PluginManager.class.getSimpleName();
 
     public MainActivity mainActivity;
 
@@ -57,6 +57,10 @@ public void stop() {
         }
     }
 
+    public void pause() { for (Plugin plugin : plugins) { plugin.pause(); } }
+
+    public void resume() { for (Plugin plugin : plugins) { plugin.resume(); } }
+
     public void onVideoChange() {
         for (Plugin plugin : plugins) {
             plugin.onVideoChange();

diff --git a/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/DJIStreamer.java b/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/DJIStreamer.java
@@ -69,4 +69,14 @@ private void setupSocketEvent(String stunServer){
             }
         });
     }
+
+    public void closeVideoStream() {
+        Log.i(TAG, "closeVideoStream()");
+        ongoingConnections.keySet().forEach(socketID -> {
+            WebRTCClient client = getClient(socketID);
+            client.stopCapture();
+            client.close();
+            removeClient(socketID);
+        });
+    }
 }
diff --git a/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/DJIVideoCapturer.java b/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/DJIVideoCapturer.java
@@ -148,6 +148,10 @@ public void startCapture(int width, int height, int framerate) {
 
     @Override
     public void stopCapture() throws InterruptedException {
+        codecManager.enabledYuvData(false);
+        codecManager.setYuvDataCallback(null);
+        codecManager.destroyCodec();
+        codecManager = null;
     }
 
     @Override

diff --git a/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/WebRTCClient.java b/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/WebRTCClient.java
@@ -93,7 +93,7 @@ public void handleWebRTCMessage(JSONObject message){
             }
         }
         catch (JSONException e) {
-            Log.d(TAG, "JSONException: " + e.getMessage());
+            Log.e(TAG, "JSONException: " + e.getMessage());
         }
     }
 
@@ -148,6 +148,42 @@ private void startStreamingVideo() {
         peerConnection.addStream(mediaStream);
     }
 
+    public void stopCapture() {
+        // Stop video capture if it is active
+        try {
+            if (videoCapturer != null) {
+                videoCapturer.stopCapture();
+            }
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Error stopping video capture: " + e.getMessage());
+        } finally {
+            // Dispose of video capturer to free its resources
+            if (videoCapturer != null) {
+                videoCapturer.dispose();
+                Log.d(TAG, "Video capturer disposed.");
+            }
+            Log.d(TAG, "WebRTC client resources clean complete.");
+        }
+    }
+
+    public void close() {
+        // Close the peer connection if it exists
+        if (peerConnection != null) {
+            peerConnection.close();
+            peerConnection.dispose();
+            Log.d(TAG, "PeerConnection disposed.");
+        }
+
+        // Optionally dispose of the PeerConnectionFactory if this is the last WebRTCClient instance
+        if (factory != null) {
+            factory.dispose();
+            factory = null;
+            Log.d(TAG, "PeerConnectionFactory disposed.");
+        }
+
+        Log.d(TAG, "WebRTC client close complete.");
+    }
+
     private PeerConnection createPeerConnection(String stunServer) {
         ArrayList<PeerConnection.IceServer> iceServers = new ArrayList<>();
         PeerConnection.IceServer stun =  PeerConnection.IceServer.builder(stunServer).createIceServer();

diff --git a/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/WebRTCMediaOptions.java b/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTC/WebRTCMediaOptions.java
@@ -1,7 +1,7 @@
 package sq.rogue.rosettadrone.plugins.WebRTC;
 
 public class WebRTCMediaOptions {
-    public static String MEDIA_STREAM_ID = "Phantom4Pro";
+    public String MEDIA_STREAM_ID = "Phantom4Pro";
     String VIDEO_SOURCE_ID = "Phantom4Prov0";
     int VIDEO_RESOLUTION_WIDTH = 320;
     int VIDEO_RESOLUTION_HEIGHT = 240;

diff --git a/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTCStreaming.java b/app/src/main/java/sq/rogue/rosettadrone/plugins/WebRTCStreaming.java
@@ -16,8 +16,11 @@ public class WebRTCStreaming extends Plugin {
     private DJIStreamer djiStreamer;
     private Socket mSocket;
     private static final boolean TEST = false; // Send a testing stream
+    private String stunServer;
 
     public void initWebSocket() {
+        Log.d(TAG, "initWebSocket");
+        stunServer = getPrefString("pref_webrtc_stun_server", "stun:stun.l.google.com:19302");
         // init websocket
         mSocket = SocketBuilder
                 .with(getPrefString("pref_webrtc_signaling_server", "ws://192.168.1.220:8090"))
@@ -60,24 +63,33 @@ public void initStreaming() {
                 pluginManager.mainActivity.logMessageDJI(msg);
                 pluginManager.mainActivity.finish();
             }
-            else {
+            else if (djiStreamer == null) {
                 djiStreamer = new DJIStreamer(pluginManager.mainActivity,
-                        pluginManager.mainActivity.mModel.m_model,
-                        getPrefString("pref_webrtc_stun_server", "stun:stun.l.google.com:19302"));
+                        pluginManager.mainActivity.mModel.m_model, stunServer);
             }
         }
     }
 
     public void start() {
-        pluginManager.mainActivity.useCustomDecoder = false; // Messes up the buffer received by onYuvDataReceived()
-        pluginManager.mainActivity.useOutputSurface = false; // Avoid crash when clicking on minimap
-
         if (getPrefBoolean("pref_enable_webrtc", false)) {
+            pluginManager.mainActivity.useCustomDecoder = false; // Messes up the buffer received by onYuvDataReceived()
+            pluginManager.mainActivity.useOutputSurface = false; // Avoid crash when clicking on minimap
             initWebSocket();
+        }
+    }
+
+    public void resume() {
+        if (getPrefBoolean("pref_enable_webrtc", false)) {
             initStreaming();
         }
     }
 
+    public void pause() {
+        if (getPrefBoolean("pref_enable_webrtc", false) && djiStreamer != null) {
+            djiStreamer.closeVideoStream();
+        }
+    }
+
     public void onVideoChange() {
         // TODO: stop/start connections?
         Log.d(TAG, "onVideoChange");
@@ -87,11 +99,10 @@ public void stop() {
         if(TEST || RDApplication.isTestMode) {
             // TODO: stop fake video stream;
         } else {
-            // TODO: stop DJIStreamer clients?;
+            pause();
         }
 
-        // TODO: properly close client connections.
-        if (pluginManager.mainActivity.sharedPreferences.getBoolean("pref_enable_webrtc", false))
+        if (getPrefBoolean("pref_enable_webrtc", false) && mSocket != null)
             mSocket.terminate();
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -144,9 +144,9 @@
 
     <!-- WebRTC -->
     <string name="webrtc_settings">WebRTC Video</string>
-    <string name="pref_enable_webrtc">Enable WebRTC vide streaming</string>
-    <string name="pref_webrtc_signaling_address">WebRTC Signaling server address</string>
-    <string name="pref_webrtc_stun_address">WebRTC STUN server address</string>
+    <string name="pref_enable_webrtc">Enable WebRTC video streaming</string>
+    <string name="pref_webrtc_signaling_address">Signaling server address</string>
+    <string name="pref_webrtc_stun_address">STUN server address</string>
 
     <!-- Communication Channels -->
     <string name="dji">DJI</string>