增加保存aac数据

Author: neilyhe

app/src/main/java/com/example/ivdemo/TweCallActivity.kt

@@ -201,7 +201,7 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
                 val activeDeviceInfo = VideoNativeInterface.getInstance().voipActiveDeviceInfoV2
                 if (activeDeviceInfo == null || activeDeviceInfo.expireTime < System.currentTimeMillis()/1000) {
                     val activateRes = VideoNativeInterface.getInstance()
-                        .activateVoipLicenseV2(VoipActivateType.VOIP_ACT_TEST)
+                        .activateVoipLicenseV2(VoipActivateType.VOIP_ACT_IPC)
                     if (activateRes == 0) {
                         showToast("检查设备过期，激活结果成功，resCode:$activateRes")
                     } else {

app/src/main/java/com/tencent/iotvideo/link/CameraRecorder.java

@@ -60,9 +60,14 @@ public class CameraRecorder implements Camera.PreviewCallback, OnEncodeListener
     // for test only
     private boolean isSaveRecord = false;
 
-    private FileOutputStream fos;
+    private FileOutputStream h264Fos;
+
+    private FileOutputStream aacFos;
+
     private String speakH264FilePath = "/sdcard/video.h264";
 
+    private String speakAacFilePath = "/sdcard/audio.aac";
+
     private Activity context;
 
     private TextureView previewView;
@@ -236,6 +241,7 @@ public void onAudioEncoded(byte[] datas, long pts, long seq) {
                 int ret = VideoNativeInterface.getInstance().sendAvtAudioData(datas, pts, seq, visitor, channel, res_type);
                 if (ret != 0) Log.e(TAG, "sendAudioData to visitor " + visitor + " failed: " + ret);
             }
+            saveAac(datas);
         }
     }
 
@@ -293,21 +299,22 @@ private void stopBitRateAdapter() {
     }
 
     /**
-     * 保存h264数据
+     * 保存音视频数据
      *
      * @param isSaveRecord
      */
     public void isSaveRecord(boolean isSaveRecord) {
         this.isSaveRecord = isSaveRecord;
         recordSpeakH264(isSaveRecord);
+        recordSpeakAac(isSaveRecord);
     }
 
     public void recordSpeakH264(boolean isRecord) {
         if (isRecord) {
             if (!TextUtils.isEmpty(speakH264FilePath)) {
                 try {
                     File file = UtilsKt.getFile(speakH264FilePath);
-                    fos = new FileOutputStream(file);
+                    h264Fos = new FileOutputStream(file);
                 } catch (Exception e) {
                     e.printStackTrace();
                     Log.e(TAG, speakH264FilePath + "临时缓存文件未找到");
@@ -316,14 +323,44 @@ public void recordSpeakH264(boolean isRecord) {
         }
     }
 
+    public void recordSpeakAac(boolean isRecord) {
+        if (isRecord) {
+            if (!TextUtils.isEmpty(speakAacFilePath)) {
+                try {
+                    File file = UtilsKt.getFile(speakAacFilePath);
+                    aacFos = new FileOutputStream(file);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e(TAG, speakAacFilePath + "临时缓存文件未找到");
+                }
+            }
+        }
+    }
+
     public void saveH264(byte[] datas) {
         if (isSaveRecord) {
             if (executor.isShutdown()) return;
             executor.submit(() -> {
-                if (fos != null) {
+                if (h264Fos != null) {
+                    try {
+                        h264Fos.write(datas);
+                        h264Fos.flush();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+    }
+
+    public void saveAac(byte[] datas) {
+        if (isSaveRecord) {
+            if (executor.isShutdown()) return;
+            executor.submit(() -> {
+                if (aacFos != null) {
                     try {
-                        fos.write(datas);
-                        fos.flush();
+                        aacFos.write(datas);
+                        aacFos.flush();
                     } catch (IOException e) {
                         e.printStackTrace();
                     }