音频采集--adts头部自适应channel config

Change-Id: I2175b3208a949e67557642387bafd24d044aa977

Author: archurtan

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

@@ -8,8 +8,8 @@
 
 
 public class AudioRecordUtil implements EncoderListener {
-    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 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 volatile boolean recorderState = true; //录制状态
     private byte[] buffer;
     private AudioRecord audioRecord;
@@ -21,11 +21,12 @@ public class AudioRecordUtil implements EncoderListener {
     private int sampleRate; //音频采样率
     private int channel;
     private int bitDepth;
+    private int channelCount; //声道数
 
     public AudioRecordUtil(Context ctx, String id, int sampleRate) {
         context = ctx;
         deviceId = id;
-        init(sampleRate, channelConfig, audioFormat);
+        init(sampleRate, DEFAULT_CHANNEL_CONFIG, DEFAULT_AUDIO_FORMAT);
     }
     public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int bitDepth) {
         context = ctx;
@@ -38,6 +39,11 @@ private void init(int sampleRate, int channel, int bitDepth) {
         this.sampleRate = sampleRate;
         this.channel = channel;
         this.bitDepth = bitDepth;
+        if (channel == AudioFormat.CHANNEL_IN_MONO) {
+            this.channelCount = 1;
+        } else if (channel == AudioFormat.CHANNEL_IN_STEREO) {
+            this.channelCount = 2;
+        }
     }
 
     /**
@@ -53,7 +59,7 @@ public void start() {
     private void reset() {
         buffer = new byte[recordMinBufferSize];
         audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRate, channel, bitDepth, recordMinBufferSize);
-        pcmEncoder = new PCMEncoder(sampleRate, this, PCMEncoder.AAC_FORMAT);
+        pcmEncoder = new PCMEncoder(sampleRate, channelCount, this, PCMEncoder.AAC_FORMAT);
         flvPacker = new FLVPacker();
     }
 

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

@@ -15,8 +15,6 @@ public class PCMEncoder {
     private static final int KEY_BIT_RATE = 96000;
     //读取数据的最大字节数
     private static final int KEY_MAX_INPUT_SIZE = 1024 * 1024;
-    //声道数
-    private static final int CHANNEL_COUNT = 2;
     public static final int AAC_FORMAT = 0;
     public static final int G711_FORMAT = 1;
     private MediaCodec mediaCodec;
@@ -26,6 +24,8 @@ public class PCMEncoder {
     private EncoderListener encoderListener;
     private int encodeType = 0;
     private int sampleRate = 0;
+    //声道数
+    private int channelCount = 0;
 
     // 采样频率对照表
     private static Map<Integer, Integer> samplingFrequencyIndexMap = new HashMap<>();
@@ -45,10 +45,11 @@ public class PCMEncoder {
         samplingFrequencyIndexMap.put(8000, 11);
     }
 
-    public PCMEncoder(int sampleRate, EncoderListener encoderListener, int encodeFormat) {
+    public PCMEncoder(int sampleRate, int channelCount, EncoderListener encoderListener, int encodeFormat) {
         this.encoderListener = encoderListener;
         this.encodeType = encodeFormat;
         this.sampleRate = sampleRate;
+        this.channelCount = channelCount;
         init();
     }
 
@@ -59,7 +60,7 @@ private void init() {
         try {
             //参数对应-> mime type、采样率、声道数
             MediaFormat encodeFormat = MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC,
-                    sampleRate, CHANNEL_COUNT);
+                    sampleRate, channelCount);
             //比特率
             encodeFormat.setInteger(MediaFormat.KEY_BIT_RATE, KEY_BIT_RATE);
             encodeFormat.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
@@ -130,7 +131,7 @@ public void encodeData(byte[] data) {
      */
     private void addADTStoPacket(byte[] packet, int packetLen) {
         int profile = 2;  // AAC LC
-        int chanCfg = 2;  // CPE
+        int chanCfg = channelCount;
         int freqIdx = samplingFrequencyIndexMap.get(sampleRate);
         // filled in ADTS data
         packet[0] = (byte) 0xFF;