补充修改变调commit

Change-Id: I20f39ba57be8cafe5dfc72308fcbe61366ef7ddc

Author: SundoggyNew

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

@@ -36,7 +36,7 @@ public class AudioRecordUtil implements EncoderListener, FLVListener {
     private int channel;
     private int bitDepth;
     private int channelCount; //声道数
-    private int pitch; //变调【-12~12】
+    private int pitch = 0; //变调【-12~12】
 
     private boolean isRecord = false;
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -60,10 +60,6 @@ public AudioRecordUtil(Context ctx, String id, int sampleRate, int channel, int
         deviceId = id;
         this.pitch = pitch;
         init(sampleRate, channel, bitDepth);
-
-        if (st == null) {
-            st = new SoundTouch(0,channelCount,sampleRate,bitDepth,1.0f, pitch);
-        }
     }
 
     private void init(int sampleRate, int channel, int bitDepth) {
@@ -105,6 +101,9 @@ public void recordSpeakFlv(boolean isRecord) {
      */
     public void start() {
         reset();
+        if (st == null) {
+            st = new SoundTouch(0,channelCount,sampleRate,bitDepth,1.0f, pitch);
+        }
         recorderState = true;
         audioRecord.startRecording();
         new RecordThread().start();
@@ -173,7 +172,7 @@ private class RecordThread extends Thread {
         public void run() {
             while (recorderState) {
                 int read = audioRecord.read(buffer, 0, buffer.length);
-                if (st != null) {
+                if (pitch != 0 && st != null) {
                     st.putBytes(buffer);
                     int bytesReceived = st.getBytes(buffer);
                 }

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

@@ -137,9 +137,9 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface
             presenter.getEventsData(Date())
             tv_event_status.visibility = View.VISIBLE
             tv_event_status.setText(R.string.loading)
-            audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000)
+//            audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000)
 //            //变调可以传入pitch参数
-//            audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, -6)
+            audioRecordUtil = AudioRecordUtil(this, "${it.productId}/${presenter.getDeviceName()}", 16000, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, -6)
             audioRecordUtil.recordSpeakFlv(true)
         }