修改传递的player弱引用

Change-Id: I0596759efd090575083f9b85fb841a354bbe54e8
tencentyun · Nov 23, 2023 · 310a4cc · 310a4cc
1 parent 93059eb
commit 310a4cc
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...deo-link-android/src/main/java/com/tencent/iot/video/link/util/audio/AudioRecordUtil.java b/...deo-link-android/src/main/java/com/tencent/iot/video/link/util/audio/AudioRecordUtil.java
@@ -24,6 +24,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -73,7 +74,7 @@ public class AudioRecordUtil implements EncoderListener, FLVListener {
 
     private static final int SAVE_PCM_DATA = 1;
 
-    private IjkMediaPlayer player;
+    private WeakReference<IjkMediaPlayer> player;
     private LinkedBlockingDeque<Byte> playPcmData = new LinkedBlockingDeque<>();  // 内存队列，用于缓存获取到的播放器音频pcm
 
     private class MyHandler extends Handler {
@@ -230,7 +231,7 @@ public void setMode(VoiceChangerMode mode) {
     }
 
     public void setPlayer(IjkMediaPlayer player) {
-        this.player = player;
+        this.player = new WeakReference<>(player);
     }
 
     /**
@@ -387,7 +388,7 @@ public void run() {
                 if (AudioRecord.ERROR_INVALID_OPERATION != read) {
                     //获取到的pcm数据就是buffer了
                     if (buffer != null && pcmEncoder != null) {
-                        if (player != null && player.isPlaying()) {
+                        if (player != null && player.get().isPlaying()) {
                             byte [] playerPcmBytes = onReadPlayerPlayPcm(buffer.length);
                             byte[] aecPcmBytes = GvoiceJNIBridge.cancellation(buffer, playerPcmBytes);
                             if (isRecord) {
@@ -460,9 +461,9 @@ private class WriteThread extends Thread {
         @Override
         public void run() {
             while (recorderState) {
-                if (player != null && player.isPlaying()) {
+                if (player != null && player.get().isPlaying()) {
                     byte[] data = new byte[204800];
-                    int len = player._getPcmData(data);
+                    int len = player.get()._getPcmData(data);
                     if (len > 0) {
                         byte[] playerBytes = new byte[len];
                         System.arraycopy(data, 0, playerBytes, 0, len);