测试消除功能

Author: neilyhe

sdk/video-link-android/build.gradle

@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-//    api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+    api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'com.google.code.gson:gson:2.8.9'
     testImplementation 'junit:junit:4.+'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

sdk/video-link-android/libs/AECLib4-debug.aar

@@ -15,6 +15,7 @@
 
 import com.iot.soundtouch.interfaces.SoundTouch;
 import com.iot.voice.changer.VoiceChangerJNIBridge;
+import com.neil.hy.aeclib4.AecLibJNIBridge;
 import com.tencent.iot.thirdparty.flv.FLVListener;
 import com.tencent.iot.thirdparty.flv.FLVPacker;
 import com.tencent.xnet.XP2P;
@@ -34,7 +35,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
 
-import com.iot.gvoice.interfaces.GvoiceJNIBridge;
+//import com.iot.gvoice.interfaces.GvoiceJNIBridge;
 
 
 public class AudioRecordUtil implements EncoderListener, FLVListener, Handler.Callback {
@@ -213,7 +214,9 @@ private void init(int sampleRate, int channel, int bitDepth) {
         recordMinBufferSize = (sampleRate * this.channelCount * this.encodeBit / 8) / 1000 * 20; //20ms数据长度
         Log.e(TAG, "20ms recordMinBufferSize is: " + recordMinBufferSize);
         Log.e(TAG, "AudioRecordUtil init Pitch is: " + pitch);
-        GvoiceJNIBridge.init(context);
+//        GvoiceJNIBridge.init(context);
+        AecLibJNIBridge.getInstance().initAecm(sampleRate);
+        AecLibJNIBridge.getInstance().setConfigAecm(3,40);
     }
 
     private boolean isEnable8kEncode = false;
@@ -476,7 +479,8 @@ public void run() {
                     if (buffer != null && pcmEncoder != null) {
                         byte [] playerPcmBytes = onReadPlayerPlayPcm(buffer.length);
                         if (playerPcmBytes != null && playerPcmBytes.length > 0) {
-                            byte[] aecPcmBytes = GvoiceJNIBridge.cancellation(buffer, playerPcmBytes);
+                            byte[] aecPcmBytes = AecLibJNIBridge.getInstance().cancellation(playerPcmBytes, buffer);
+                            Log.e(TAG, "aecPcmBytes  aecPcmBytes.length： " + aecPcmBytes.length);
                             if (isRecord) {
                                 writePcmBytesToFile(buffer, playerPcmBytes, aecPcmBytes);
                             }

sdk/video-link-android/src/main/java/com/tencent/iot/video/link/util/audio/AudioRecordUtil.java

@@ -274,7 +274,7 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
                     //        audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, -6) //        //变调可以传入pitch参数 //        audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, 0, this)
 
                 }
-                //        audioRecordUtil.recordSpeakFlv(true)
+                audioRecordUtil?.recordSpeakFlv(true)
                 if (isChecked && checkPermissions(permissions)) {
                     if (!speakAble(true)) radioTalk.isChecked = false
                 } else if (isChecked && !checkPermissions(permissions)) {
@@ -454,7 +454,7 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "probesize", 50 * 1024)
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "packet-buffering", 0)
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "start-on-prepared", 1)
-            player.setOption(IjkMediaPlayer.OPT_CATEGORY_CODEC, "threads", 1)
+            player.setOption(IjkMediaPlayer.OPT_CATEGORY_CODEC, "threads", 2)
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "sync-av-start", 0)
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec", 1)
             player.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec-auto-rotate", 1)
@@ -464,6 +464,7 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
                 1
             )
             player.setFrameSpeed(1.5f)
+            player.setMaxPacketNum(10001)
             while (!::surface.isInitialized) {
                 delay(50)
                 L.e("delay for waiting surface.")
@@ -777,8 +778,8 @@ class VideoPreviewActivity : VideoPreviewBaseActivity<ActivityVideoPreviewBindin
     }
 
     override fun onInfoAudioPcmData(mp: IMediaPlayer?, arrPcm: ByteArray?, length: Int) {
-//        if (audioRecordUtil != null && length > 0 && speakAble) {
-//            audioRecordUtil?.setPlayerPcmData(arrPcm);
-//        }
+        if (audioRecordUtil != null && length > 0 && speakAble) {
+            audioRecordUtil?.setPlayerPcmData(arrPcm);
+        }
     }
 }

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt

@@ -471,8 +471,7 @@ class VideoTestActivity : VideoBaseActivity<ActivityVideoTestBinding>(), XP2PCal
             player.setOption(
                 IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec-handle-resolution-change", 1
             )
-            player.setFrameSpeed(1.5f)
-            player.setMaxPacketNum(2)
+            player.setMaxPacketNum(10001)
             while (!::surface.isInitialized) {
                 delay(50)
                 L.e("delay for waiting surface.")