(Continued)

OpenIPC · Jun 19, 2024 · 09e765e · 09e765e
1 parent 06ac514
commit 09e765e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/src/hal/hisi/v3_hal.c b/src/hal/hisi/v3_hal.c
@@ -83,8 +83,8 @@ int v3_audio_init(void)
         config.intf = V3_AUD_INTF_I2S_SLAVE;
         config.stereoOn = 0;
         config.expandOn = 0;
-        config.frmNum = 40;
-        config.packNumPerFrm = 640;
+        config.frmNum = 0;
+        config.packNumPerFrm = config.rate / 16;
         config.chnNum = 1;
         config.syncRxClkOn = 0;
         if (ret = v3_aud.fnSetDeviceConfig(_v3_aud_dev, &config))
@@ -105,11 +105,10 @@ void *v3_audio_thread(void)
 
     v3_aud_frm frame;
     v3_aud_efrm echoFrame;
+    memset(&frame, 0, sizeof(frame));
+    memset(&echoFrame, 0, sizeof(echoFrame));
 
     while (keepRunning) {
-        memset(&frame, 0, sizeof(frame));
-        memset(&echoFrame, 0, sizeof(echoFrame));
-
         if (ret = v3_aud.fnGetFrame(_v3_aud_dev, _v3_aud_chn, 
             &frame, &echoFrame, 100)) {
             fprintf(stderr, "[v3_aud] Getting the frame failed "

diff --git a/src/hal/hisi/v4_hal.c b/src/hal/hisi/v4_hal.c
@@ -84,8 +84,8 @@ int v4_audio_init(void)
         config.intf = V4_AUD_INTF_I2S_SLAVE;
         config.stereoOn = 0;
         config.expandOn = 0;
-        config.frmNum = 40;
-        config.packNumPerFrm = 640;
+        config.frmNum = 0;
+        config.packNumPerFrm = config.rate / 16;
         config.chnNum = 1;
         config.syncRxClkOn = 0;
         if (ret = v4_aud.fnSetDeviceConfig(_v4_aud_dev, &config))
@@ -106,11 +106,10 @@ void *v4_audio_thread(void)
 
     v4_aud_frm frame;
     v4_aud_efrm echoFrame;
+    memset(&frame, 0, sizeof(frame));
+    memset(&echoFrame, 0, sizeof(echoFrame));
 
     while (keepRunning) {
-        memset(&frame, 0, sizeof(frame));
-        memset(&echoFrame, 0, sizeof(echoFrame));
-
         if (ret = v4_aud.fnGetFrame(_v4_aud_dev, _v4_aud_chn, 
             &frame, &echoFrame, 100)) {
             fprintf(stderr, "[v4_aud] Getting the frame failed "

diff --git a/src/hal/star/i6_hal.c b/src/hal/star/i6_hal.c
@@ -83,14 +83,14 @@ int i6_audio_init(void)
         config.bit24On = 0;
         config.intf = I6_AUD_INTF_I2S_SLAVE;
         config.sound = I6_AUD_SND_MONO;
-        config.frmNum = 40;
-        config.packNumPerFrm = 640;
-        config.codecChnNum = 1;
+        config.frmNum = 0;
+        config.packNumPerFrm = config.rate / 16;
+        config.codecChnNum = 0;
         config.chnNum = 1;
         config.i2s.leftJustOn = 0;
         config.i2s.clock = I6_AUD_CLK_OFF;
         config.i2s.syncRxClkOn = 1;
-        config.i2s.tdmSlotNum = 1;
+        config.i2s.tdmSlotNum = 0;
         config.i2s.bit24On = 0;
         if (ret = i6_aud.fnSetDeviceConfig(_i6_aud_dev, &config))
             return ret;
@@ -110,11 +110,10 @@ void *i6_audio_thread(void)
 
     i6_aud_frm frame;
     i6_aud_efrm echoFrame;
+    memset(&frame, 0, sizeof(frame));
+    memset(&echoFrame, 0, sizeof(echoFrame));
 
     while (keepRunning) {
-        memset(&frame, 0, sizeof(frame));
-        memset(&echoFrame, 0, sizeof(echoFrame));
-
         if (ret = i6_aud.fnGetFrame(_i6_aud_dev, _i6_aud_chn, 
             &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6_aud] Getting the frame failed "

diff --git a/src/hal/star/i6c_hal.c b/src/hal/star/i6c_hal.c
@@ -98,7 +98,7 @@ int i6c_audio_init(void)
         config.rate = 48000;
         config.clock = I6C_AUD_CLK_OFF;
         config.syncRxClkOn = 1;
-        config.tdmSlotNum = 1;
+        config.tdmSlotNum = 0;
         if (ret = i6c_aud.fnSetI2SConfig(input[0], &config))
             return ret;
         if (ret = i6c_aud.fnAttachToDevice(_i6c_aud_dev, input, 1))
@@ -121,11 +121,10 @@ void *i6c_audio_thread(void)
     int ret;
 
     i6c_aud_frm frame, echoFrame;
+    memset(&frame, 0, sizeof(frame));
+    memset(&echoFrame, 0, sizeof(echoFrame));
 
     while (keepRunning) {
-        memset(&frame, 0, sizeof(frame));
-        memset(&echoFrame, 0, sizeof(echoFrame));
-
         if (ret = i6c_aud.fnGetFrame(_i6c_aud_dev, _i6c_aud_chn, 
             &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6c_aud] Getting the frame failed "

diff --git a/src/hal/star/i6f_hal.c b/src/hal/star/i6f_hal.c
@@ -86,14 +86,14 @@ int i6f_audio_init(void)
         config.bit = I6F_AUD_BIT_16;
         config.intf = I6F_AUD_INTF_I2S_SLAVE;
         config.sound = I6F_AUD_SND_MONO;
-        config.frmNum = 40;
-        config.packNumPerFrm = 640;
-        config.codecChnNum = 1;
+        config.frmNum = 0;
+        config.packNumPerFrm = config.rate / 16;
+        config.codecChnNum = 0;
         config.chnNum = 1;
         config.i2s.clock = I6F_AUD_CLK_OFF;
         config.i2s.leftJustOn = 0;
         config.i2s.syncRxClkOn = 1;
-        config.i2s.tdmSlotNum = 1;
+        config.i2s.tdmSlotNum = 0;
         config.i2s.bit = I6F_AUD_BIT_32;
         if (ret = i6f_aud.fnSetDeviceConfig(_i6f_aud_dev, &config))
             return ret;
@@ -113,11 +113,10 @@ void *i6f_audio_thread(void)
 
     i6f_aud_frm frame;
     i6f_aud_efrm echoFrame;
+    memset(&frame, 0, sizeof(frame));
+    memset(&echoFrame, 0, sizeof(echoFrame));
 
     while (keepRunning) {
-        memset(&frame, 0, sizeof(frame));
-        memset(&echoFrame, 0, sizeof(echoFrame));
-
         if (ret = i6f_aud.fnGetFrame(_i6f_aud_dev, _i6f_aud_chn, 
             &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6f_aud] Getting the frame failed "