audio: more optimization

Author: redchenjs

main/src/user/audio_player.c

@@ -13,11 +13,14 @@
 #include "driver/i2s.h"
 
 #include "mad.h"
+
 #include "frame.h"
 #include "synth.h"
 #include "stream.h"
 
 #include "core/os.h"
+#include "chip/i2s.h"
+
 #include "user/audio_player.h"
 
 #define TAG "audio_player"
@@ -49,6 +52,22 @@ static const char *mp3_file_ptr[][2] = {
 static bool playback_pending = false;
 static mp3_file_t mp3_file = MP3_FILE_IDX_MAX;
 
+/* render callback for the libmad synth */
+void render_sample_block(short *sample_ch0, short *sample_ch1, unsigned int sample_rate, unsigned int nch, unsigned int ns)
+{
+    if (nch == 1) {
+        sample_ch1 = sample_ch0;
+    }
+
+    i2s_output_set_sample_rate(sample_rate);
+
+    size_t bytes_written = 0;
+    for (int i = 0; i < ns; i++) {
+        i2s_write(CONFIG_AUDIO_OUTPUT_I2S_NUM, sample_ch0++, sizeof(short), &bytes_written, portMAX_DELAY);
+        i2s_write(CONFIG_AUDIO_OUTPUT_I2S_NUM, sample_ch1++, sizeof(short), &bytes_written, portMAX_DELAY);
+    }
+}
+
 static void audio_player_task(void *pvParameters)
 {
     ESP_LOGI(TAG, "started.");
@@ -149,5 +168,5 @@ void audio_player_init(void)
         xEventGroupSetBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
     }
 
-    xTaskCreatePinnedToCore(audio_player_task, "audioPlayerT", 8448, NULL, configMAX_PRIORITIES - 3, NULL, 0);
+    xTaskCreatePinnedToCore(audio_player_task, "audioPlayerT", 8448, NULL, configMAX_PRIORITIES - 2, NULL, 0);
 }

main/src/user/audio_render.c

@@ -5,8 +5,6 @@
  *      Author: Jack Chen <redchenjs@live.com>
  */
 
-#include <string.h>
-
 #include "esp_log.h"
 
 #include "freertos/FreeRTOS.h"
@@ -28,22 +26,6 @@ RingbufHandle_t audio_buff = NULL;
 static uint8_t buff_data[10 * 1024] = {0};
 static StaticRingbuffer_t buff_struct = {0};
 
-/* render callback for the libmad synth */
-void render_sample_block(short *sample_ch0, short *sample_ch1, unsigned int sample_rate, unsigned int nch, unsigned int ns)
-{
-    if (nch == 1) {
-        sample_ch1 = sample_ch0;
-    }
-
-    i2s_output_set_sample_rate(sample_rate);
-
-    size_t bytes_written = 0;
-    for (int i = 0; i < ns; i++) {
-        i2s_write(CONFIG_AUDIO_OUTPUT_I2S_NUM, sample_ch0++, sizeof(short), &bytes_written, portMAX_DELAY);
-        i2s_write(CONFIG_AUDIO_OUTPUT_I2S_NUM, sample_ch1++, sizeof(short), &bytes_written, portMAX_DELAY);
-    }
-}
-
 static void audio_render_task(void *pvParameter)
 {
     uint16_t delay = 0;
@@ -80,7 +62,7 @@ static void audio_render_task(void *pvParameter)
 
                 data = (uint8_t *)xRingbufferReceiveUpTo(audio_buff, &size, portMAX_DELAY, remain);
             } else {
-                if (++delay < 16) {
+                if (++delay <= 256000 / a2d_sample_rate) {
                     vTaskDelay(1 / portTICK_RATE_MS);
                 } else {
                     delay = 0;
@@ -93,7 +75,7 @@ static void audio_render_task(void *pvParameter)
                 continue;
             }
         } else {
-            if (xRingbufferGetCurFreeSize(audio_buff) > FFT_BLOCK_SIZE) {
+            if (xRingbufferGetCurFreeSize(audio_buff) >= FFT_BLOCK_SIZE) {
                 vTaskDelay(1 / portTICK_RATE_MS);
             } else {
                 start = true;
@@ -146,7 +128,6 @@ static void audio_render_task(void *pvParameter)
 
 void audio_render_init(void)
 {
-    memset(&buff_struct, 0x00, sizeof(StaticRingbuffer_t));
     audio_buff = xRingbufferCreateStatic(sizeof(buff_data), RINGBUF_TYPE_BYTEBUF, buff_data, &buff_struct);
 
     xTaskCreatePinnedToCore(audio_render_task, "audioRenderT", 1920, NULL, configMAX_PRIORITIES - 3, NULL, 0);

main/src/user/bt_av.c

@@ -66,11 +66,6 @@ void bt_app_a2d_cb(esp_a2d_cb_event_t event, esp_a2d_cb_param_t *param)
 
 void bt_app_a2d_data_cb(const uint8_t *data, uint32_t len)
 {
-    EventBits_t uxBits = xEventGroupGetBits(user_event_group);
-    if (uxBits & AUDIO_PLAYER_RUN_BIT) {
-        return;
-    }
-
     if (audio_buff) {
         uint32_t pkt = 0, remain = 0;