Merge branch 'master' into dl/merge_master

livekit · Jun 24, 2024 · 670c0ee · 670c0ee
2 parents 24e9ab1 + cde6b51
commit 670c0ee
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java b/android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java
@@ -102,6 +102,9 @@ public WebRTCModule(ReactApplicationContext reactContext) {
                            .setVideoDecoderFactory(decoderFactory)
                            .createPeerConnectionFactory();
 
+        // PeerConnectionFactory now owns the adm native pointer, and we don't need it anymore.
+        adm.release();
+
         // Saving the encoder and decoder factories to get codec info later when needed.
         mVideoEncoderFactory = encoderFactory;
         mVideoDecoderFactory = decoderFactory;
@@ -116,14 +119,6 @@ public String getName() {
         return "WebRTCModule";
     }
 
-    @Override
-    public void onCatalystInstanceDestroy() {
-        if (mAudioDeviceModule != null) {
-            mAudioDeviceModule.release();
-        }
-        super.onCatalystInstanceDestroy();
-    }
-
     private PeerConnection getPeerConnection(int id) {
         PeerConnectionObserver pco = mPeerConnectionObservers.get(id);
         return (pco == null) ? null : pco.getPeerConnection();