Skip to content

Commit

Permalink
音频采集工具类暴露采样率设置接口
Browse files Browse the repository at this point in the history 
Change-Id: If88136cd04af5df53cd5b767bdd3575fa11eb0c1
(cherry picked from commit 89899f5)
  • Loading branch information
archurtan committed Oct 28, 2021
1 parent c6f91cc commit 2dafb5a
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 22 deletions.
22 changes: 9 additions & 13 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 @@ -8,30 +8,24 @@


public class AudioRecordUtil implements EncoderListener {

//设置音频采样率，44100是目前的标准，但是某些设备仍然支持22050，16000，11025
private int sampleRateInHz = 16000;
//设置音频的录制的声道CHANNEL_IN_STEREO为双声道，CHANNEL_CONFIGURATION_MONO为单声道
private int channelConfig = AudioFormat.CHANNEL_IN_STEREO;
//音频数据格式:PCM 16位每个样本。保证设备支持。PCM 8位每个样本。不一定能得到设备支持。
private int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
//录制状态
private volatile boolean recorderState = true;
private int channelConfig = AudioFormat.CHANNEL_IN_STEREO; //设置音频的录制的声道CHANNEL_IN_STEREO为双声道，CHANNEL_CONFIGURATION_MONO为单声道
private int audioFormat = AudioFormat.ENCODING_PCM_16BIT; //音频数据格式:PCM 16位每个样本。保证设备支持。PCM 8位每个样本。不一定能得到设备支持。
private volatile boolean recorderState = true; //录制状态
private byte[] buffer;
private AudioRecord audioRecord;
private volatile PCMEncoder pcmEncoder;
private volatile FLVPacker flvPacker;
private Context context;
private String deviceId; //"productId/deviceName"
private int recordMinBufferSize;
private int sampleRate;
private int sampleRate; //音频采样率
private int channel;
private int bitDepth;

public AudioRecordUtil(Context ctx, String id) {
public AudioRecordUtil(Context ctx, String id, int sampleRate) {
context = ctx;
deviceId = id;
init(sampleRateInHz, channelConfig, audioFormat);
init(sampleRate, channelConfig, audioFormat);
}
public AudioRecordUtil(Context ctx, int sampleRate, int channel, int bitDepth) {
context = ctx;
Expand All @@ -58,7 +52,7 @@ public void start() {
private void reset() {
buffer = new byte[recordMinBufferSize];
audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, channel, bitDepth, recordMinBufferSize);
pcmEncoder = new PCMEncoder(sampleRateInHz, this, PCMEncoder.AAC_FORMAT);
pcmEncoder = new PCMEncoder(sampleRate, this, PCMEncoder.AAC_FORMAT);
flvPacker = new FLVPacker();
}

Expand All @@ -69,6 +63,8 @@ public void stop() {
recorderState = false;
audioRecord.stop();
audioRecord = null;
pcmEncoder = null;
flvPacker = null;
}

public void release() {
Expand Down
5 changes: 2 additions & 3 deletions sdk/video-link-android/src/main/java/com/tencent/iot/video/link/util/audio/FLVPacker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
public class FLVPacker {

private long pts = 0;
private long sudioPts = 0;
private volatile boolean isHead = false;

public synchronized byte[] getFLV(byte[] data) {
Expand All @@ -32,13 +31,13 @@ public synchronized byte[] aacToFlv(byte[] date) {
baos.write(0x08);
// 长度
baos.write(integerTo3Bytes(data.length + 2));
if (sudioPts == 0) {
if (pts == 0) {
// 时间戳
baos.write(0x00);
baos.write(0x00);
baos.write(0x00);
baos.write(0x00);
sudioPts = System.currentTimeMillis();
pts = System.currentTimeMillis();
} else {
byte[] b = integerTo4Bytes((int) (System.currentTimeMillis() - pts));
baos.write(b[1]);
Expand Down
30 changes: 25 additions & 5 deletions sdk/video-link-android/src/main/java/com/tencent/iot/video/link/util/audio/PCMEncoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;


public class PCMEncoder {
Expand All @@ -23,19 +25,37 @@ public class PCMEncoder {
private MediaCodec.BufferInfo encodeBufferInfo;
private EncoderListener encoderListener;
private int encodeType = 0;
private int sampleRate = 0;

// 采样频率对照表
private static Map<Integer, Integer> samplingFrequencyIndexMap = new HashMap<>();

static {
samplingFrequencyIndexMap.put(96000, 0);
samplingFrequencyIndexMap.put(88200, 1);
samplingFrequencyIndexMap.put(64000, 2);
samplingFrequencyIndexMap.put(48000, 3);
samplingFrequencyIndexMap.put(44100, 4);
samplingFrequencyIndexMap.put(32000, 5);
samplingFrequencyIndexMap.put(24000, 6);
samplingFrequencyIndexMap.put(22050, 7);
samplingFrequencyIndexMap.put(16000, 8);
samplingFrequencyIndexMap.put(12000, 9);
samplingFrequencyIndexMap.put(11025, 10);
samplingFrequencyIndexMap.put(8000, 11);
}

public PCMEncoder(int sampleRate, EncoderListener encoderListener, int encodeFormat) {
this.encoderListener = encoderListener;
this.encodeType = encodeFormat;
init(sampleRate);
this.sampleRate = sampleRate;
init();
}

/**
* 初始化AAC编码器
*
* @param sampleRate 采样率
*/
private void init(int sampleRate) {
private void init() {
try {
//参数对应-> mime type、采样率、声道数
MediaFormat encodeFormat = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC,
Expand Down Expand Up @@ -110,8 +130,8 @@ public void encodeData(byte[] data) {
*/
private void addADTStoPacket(byte[] packet, int packetLen) {
int profile = 2; // AAC LC
int freqIdx = 8; // 44.1KHz
int chanCfg = 2; // CPE
int freqIdx = samplingFrequencyIndexMap.get(sampleRate);
// filled in ADTS data
packet[0] = (byte) 0xFF;
packet[1] = (byte) 0xF9;
Expand Down
2 changes: 1 addition & 1 deletion ...mo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface
tv_event_status.setText(R.string.loading)
XP2P.setQcloudApiCred(it.accessId, it.accessToken)
XP2P.setCallback(this)
audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}")
audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000)
}

startPlayer()
Expand Down

0 comments on commit 2dafb5a

Please sign in to comment.