Skip to content

Commit

Permalink
修改AEC调用方式
Browse files Browse the repository at this point in the history 
Change-Id: I55b630fc1ff8b8d3c2242077f9d89823de32bb89
  • Loading branch information
@SundoggyNew
SundoggyNew committed Jan 10, 2024
1 parent fe757ee commit ede6deb
Show file tree
Hide file tree
Showing 6 changed files with 175 additions and 73 deletions.
5 changes: 1 addition & 4 deletions sdk/video-link-android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ dependencies {
// changing = true
// }
// api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.23'
api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.41-SNAPSHOT'
api 'com.tencent.iot.thirdparty.android:ijkplayer-java:2.0.11'
api 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:2.0.11'
api 'com.tencent.iot.thirdparty.android:ijkplayer-arm64:2.0.11'
api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.43-SNAPSHOT'
api 'com.tencent.iot.thirdparty.android:media-server:1.0.5'
api 'io.github.sundoggynew:iot-soundtouch:1.0.0'
api 'io.github.sundoggynew:iot-voice-changer:1.0.0'
Expand Down
200 changes: 145 additions & 55 deletions ...deo-link-android/src/main/java/com/tencent/iot/video/link/util/audio/AudioRecordUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import android.media.audiofx.AcousticEchoCanceler;
import android.media.audiofx.AutomaticGainControl;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
Expand All @@ -17,6 +19,7 @@
import com.tencent.iot.thirdparty.flv.FLVPacker;
import com.tencent.xnet.XP2P;

import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;

Expand All @@ -26,25 +29,29 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.atomic.AtomicInteger;

import com.iot.gvoice.interfaces.GvoiceJNIBridge;

import tv.danmaku.ijk.media.player.IjkMediaPlayer;


public class AudioRecordUtil implements EncoderListener, FLVListener {
public class AudioRecordUtil implements EncoderListener, FLVListener, Handler.Callback {
private static final int DEFAULT_CHANNEL_CONFIG = AudioFormat.CHANNEL_IN_STEREO; //设置音频的录制的声道CHANNEL_IN_STEREO为双声道，CHANNEL_CONFIGURATION_MONO为单声道
private static final int DEFAULT_AUDIO_FORMAT = AudioFormat.ENCODING_PCM_16BIT; //音频数据格式:PCM 16位每个样本。保证设备支持。PCM 8位每个样本。不一定能得到设备支持。
private static final String TAG = AudioRecordUtil.class.getName();;
private static final String TAG = AudioRecordUtil.class.getName();
private static final int MSG_START = 1;
private static final int MSG_STOP = 2;
private static final int MSG_ENCODE = 3;
private static final int MSG_RELEASE = 4;
private final HandlerThread readThread;
private final ReadHandler mReadHandler;
private volatile boolean recorderState = true; //录制状态
private byte[] buffer;
private AudioRecord audioRecord;
private AcousticEchoCanceler canceler;
private AutomaticGainControl control;
private volatile AcousticEchoCanceler canceler;
private volatile AutomaticGainControl control;
private volatile PCMEncoder pcmEncoder;
private volatile FLVPacker flvPacker;
private Context context;
Expand Down Expand Up @@ -73,8 +80,27 @@ public class AudioRecordUtil implements EncoderListener, FLVListener {

private static final int SAVE_PCM_DATA = 1;

private IjkMediaPlayer player;
private LinkedBlockingDeque<Byte> playPcmData = new LinkedBlockingDeque<>(); // 内存队列，用于缓存获取到的播放器音频pcm
private AudioRecordUtilListener audioRecordUtilListener = null;

@Override
public boolean handleMessage(@NotNull Message msg) {
switch (msg.what) {
case MSG_START:
startInternal();
break;
case MSG_STOP:
stopInternal();
break;
case MSG_ENCODE:
// renderInternal((TRTCCloudDef.TRTCVideoFrame) msg.obj);
break;
case MSG_RELEASE:
releaseInternal();
break;
}
return false;
}

private class MyHandler extends Handler {

Expand Down Expand Up @@ -114,24 +140,36 @@ public AudioRecordUtil(Context ctx, String id, int sampleRate) {
context = ctx;
deviceId = id;
init(sampleRate, DEFAULT_CHANNEL_CONFIG, DEFAULT_AUDIO_FORMAT);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}
public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth) {
context = ctx;
deviceId = id;
init(sampleRate, channel, bitDepth);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}
public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth, int pitch) {
context = ctx;
deviceId = id;
this.pitch = pitch;
init(sampleRate, channel, bitDepth);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}
public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth, boolean enableAEC, boolean enableAGC) {
context = ctx;
deviceId = id;
this.enableAEC = enableAEC;
this.enableAGC = enableAGC;
init(sampleRate, channel, bitDepth);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}
public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth, int pitch, boolean enableAEC, boolean enableAGC) {
context = ctx;
Expand All @@ -140,6 +178,21 @@ public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int
this.enableAEC = enableAEC;
this.enableAGC = enableAGC;
init(sampleRate, channel, bitDepth);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}
public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth, int pitch, AudioRecordUtilListener audioRecordUtilListener) {
context = ctx;
deviceId = id;
this.pitch = pitch;
this.enableAEC = false;
this.enableAGC = false;
this.audioRecordUtilListener = audioRecordUtilListener;
init(sampleRate, channel, bitDepth);
readThread = new HandlerThread(TAG);
readThread.start();
mReadHandler = new ReadHandler(readThread.getLooper(), this);
}

private void init(int sampleRate, int channel, int bitDepth) {
Expand Down Expand Up @@ -229,14 +282,15 @@ public void setMode(VoiceChangerMode mode) {
}
}

public void setPlayer(IjkMediaPlayer player) {
this.player = player;
}

/**
* 开始录制
*/
public void start() {
Log.i(TAG, "start");
mReadHandler.obtainMessage(MSG_START).sendToTarget();
}

private void startInternal() {
if (isRecord) {
fos1 = createFiles("near");
fos2 = createFiles("far");
Expand All @@ -256,9 +310,12 @@ public void start() {
VoiceChangerJNIBridge.setMode(this.mode.getValue());
}
recorderState = true;
Log.e(TAG, "turn recorderState : " + recorderState);
audioRecord.startRecording();
new RecordThread().start();
new WriteThread().start();
if (audioRecordUtilListener != null) {
new WriteThread().start();
}
}

private void reset() {
Expand All @@ -283,43 +340,57 @@ private void reset() {
* 停止录制
*/
public void stop() {
recorderState = false;
if (audioRecord != null) {
audioRecord.stop();
}

executor.shutdown();
audioRecord = null;
pcmEncoder = null;
if (flvPacker != null) {
flvPacker.release();
flvPacker = null;
}
if (canceler != null) {
canceler.setEnabled(false);
canceler.release();
canceler = null;
}
if (control != null) {
control.setEnabled(false);
control.release();
control = null;
}
Log.i(TAG, "stop");
mReadHandler.obtainMessage(MSG_STOP).sendToTarget();
}

if (!VoiceChangerJNIBridge.isAvailable()) {
if (st != null) {
st.finish();
st.clearBuffer(0);
st = null;
private void stopInternal() {
recorderState = false;
Log.e(TAG, "turn recorderState : " + recorderState);
mReadHandler.postDelayed(new Runnable() {
@Override
public void run() {
Log.e(TAG, "mReadHandler.postDelayed 200 turn recorderState : " + recorderState);
if (audioRecord != null) {
audioRecord.stop();
}
executor.shutdown();
audioRecord = null;
pcmEncoder = null;
if (flvPacker != null) {
flvPacker.release();
flvPacker = null;
}
if (canceler != null) {
canceler.setEnabled(false);
canceler.release();
canceler = null;
}
if (control != null) {
control.setEnabled(false);
control.release();
control = null;
}
if (!VoiceChangerJNIBridge.isAvailable()) {
if (st != null) {
st.finish();
st.clearBuffer(0);
st = null;
}
} else {
VoiceChangerJNIBridge.destory();
}
// GvoiceJNIBridge.destory();
}
} else {
VoiceChangerJNIBridge.destory();
}

GvoiceJNIBridge.destory();
}, 200);
}

public void release() {
Log.i(TAG, "release");
mReadHandler.obtainMessage(MSG_STOP).sendToTarget();
}

private void releaseInternal() {
audioRecord.release();
}

Expand All @@ -336,7 +407,7 @@ public void encodeG711(byte[] data) { }
@Override
public void onFLV(byte[] data) {
if (recorderState) {
Log.d(TAG, "===== XP2P.dataSend dataLen:" + data.length);
// Log.d(TAG, "===== XP2P.dataSend dataLen:" + data.length);
XP2P.dataSend(deviceId, data, data.length);

if (executor.isShutdown()) return;
Expand Down Expand Up @@ -373,7 +444,7 @@ private class RecordThread extends Thread {
public void run() {
while (recorderState) {
int read = audioRecord.read(buffer, 0, buffer.length);
Log.e(TAG, "audioRecord.read: "+read + "， buffer.length： " + buffer.length);
Log.e(TAG, "audioRecord.read: "+read + "， buffer.length： " + buffer.length + ", recorderState: " + recorderState);
if (!VoiceChangerJNIBridge.isAvailable()) {
if (pitch != 0 && st != null) {
st.putBytes(buffer);
Expand All @@ -387,7 +458,7 @@ public void run() {
if (AudioRecord.ERROR_INVALID_OPERATION != read) {
//获取到的pcm数据就是buffer了
if (buffer != null && pcmEncoder != null) {
if (player != null && player.isPlaying()) {
if (audioRecordUtilListener != null) {
byte [] playerPcmBytes = onReadPlayerPlayPcm(buffer.length);
byte[] aecPcmBytes = GvoiceJNIBridge.cancellation(buffer, playerPcmBytes);
if (isRecord) {
Expand Down Expand Up @@ -460,14 +531,12 @@ private class WriteThread extends Thread {
@Override
public void run() {
while (recorderState) {
if (player != null && player.isPlaying()) {
byte[] data = new byte[204800];
int len = player._getPcmData(data);
if (len > 0) {
byte[] playerBytes = new byte[len];
System.arraycopy(data, 0, playerBytes, 0, len);
if (audioRecordUtilListener != null) {
byte[] data = audioRecordUtilListener.onReadPlayerPcmByte();
if (data != null && data.length > 0) {
Log.e(TAG, "data.length： " + data.length + " , recorderState : " + recorderState);
List<Byte> tmpList = new ArrayList<>();
for (byte b : playerBytes) {
for (byte b : data) {
tmpList.add(b);
}
playPcmData.addAll(tmpList);
Expand All @@ -476,4 +545,25 @@ public void run() {
}
}
}

public static class ReadHandler extends Handler {

public ReadHandler(Looper looper, Callback callback) {
super(looper, callback);
}

public void runAndWaitDone(final Runnable runnable) {
final CountDownLatch countDownLatch = new CountDownLatch(1);
post(() -> {
runnable.run();
countDownLatch.countDown();
});

try {
countDownLatch.await();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}
5 changes: 5 additions & 0 deletions ...-android/src/main/java/com/tencent/iot/video/link/util/audio/AudioRecordUtilListener.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.tencent.iot.video.link.util.audio;

public interface AudioRecordUtilListener {
byte[] onReadPlayerPcmByte();
}
5 changes: 0 additions & 5 deletions ...id/src/main/java/com/tencent/iot/video/link/util/audio/OnReadAECProcessedPcmListener.java
View file

This file was deleted.

6 changes: 3 additions & 3 deletions sdkdemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ dependencies {

// implementation 'com.tencent.iot.thirdparty.android:ijkplayer-java:1.0.7'
// implementation 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:1.0.7'
api 'com.tencent.iot.thirdparty.android:ijkplayer-java:2.0.11'
api 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:2.0.11'
api 'com.tencent.iot.thirdparty.android:ijkplayer-arm64:2.0.11'
api 'com.tencent.iot.thirdparty.android:ijkplayer-java:2.0.12-SNAPSHOT'
api 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:2.0.12-SNAPSHOT'
api 'com.tencent.iot.thirdparty.android:ijkplayer-arm64:2.0.12-SNAPSHOT'

implementation 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7-mpp-dev-11'
Expand Down
Loading

0 comments on commit ede6deb

Please sign in to comment.