audio: wait for audioRenderT to clear before running audioPlayerT

Author: redchenjs

main/inc/core/os.h

@@ -31,7 +31,7 @@ typedef enum user_event_group_bits {
     AUDIO_INPUT_RUN_BIT   = BIT10,
     AUDIO_INPUT_FFT_BIT   = BIT11,
 
-    AUDIO_RENDER_RUN_BIT  = BIT12,
+    AUDIO_RENDER_CLR_BIT  = BIT12,
 
     AUDIO_PLAYER_RUN_BIT  = BIT13,
     AUDIO_PLAYER_IDLE_BIT = BIT14,

main/src/user/audio_player.c

@@ -66,7 +66,6 @@ static void audio_player_task(void *pvParameters)
         struct mad_synth  *synth  = malloc(sizeof(struct mad_synth));
 
         if ((stream == NULL) || (frame == NULL) || (synth == NULL)) {
-            xEventGroupSetBits(user_event_group, AUDIO_RENDER_RUN_BIT);
             xEventGroupSetBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
             xEventGroupClearBits(user_event_group, AUDIO_PLAYER_RUN_BIT);
 
@@ -113,7 +112,6 @@ static void audio_player_task(void *pvParameters)
         if (playback_pending) {
             playback_pending = 0;
         } else {
-            xEventGroupSetBits(user_event_group, AUDIO_RENDER_RUN_BIT);
             xEventGroupSetBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
             xEventGroupClearBits(user_event_group, AUDIO_PLAYER_RUN_BIT);
         }
@@ -136,13 +134,19 @@ void audio_player_play_file(uint8_t idx)
         return;
     }
     if (uxBits & AUDIO_PLAYER_RUN_BIT) {
-        // Previous playback is still not complete
+        // previous playback is still not complete
         playback_pending = 1;
     } else {
-        xEventGroupClearBits(user_event_group, AUDIO_RENDER_RUN_BIT);
         xEventGroupClearBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
         xEventGroupSetBits(user_event_group, AUDIO_PLAYER_RUN_BIT);
     }
+    xEventGroupWaitBits(
+        user_event_group,
+        AUDIO_RENDER_CLR_BIT,
+        pdFALSE,
+        pdFALSE,
+        portMAX_DELAY
+    );
 #endif
 }
 

main/src/user/audio_render.c

@@ -40,7 +40,7 @@ void render_sample_block(short *sample_buff_ch0, short *sample_buff_ch1, int num
     }
 
     size_t bytes_written = 0;
-    for (int i = 0; i < num_samples; i++) {
+    for (int i=0; i<num_samples; i++) {
         /* low - high / low - high */
         const char samp32[4] = {ptr_l[0], ptr_l[1], ptr_r[0], ptr_r[1]}; // ESP32 CPU is little-endian
 
@@ -82,7 +82,7 @@ static void audio_buffer_reset(void)
 
 static void audio_render_task(void *pvParameter)
 {
-    bool clear = true;
+    bool clear = false;
     bool start = false;
     uint16_t count = 0;
     EventBits_t uxBits = 0;
@@ -94,18 +94,13 @@ static void audio_render_task(void *pvParameter)
         uint32_t size = 0;
         uint32_t remain = 0;
 
-        xEventGroupWaitBits(
-            user_event_group,
-            AUDIO_RENDER_RUN_BIT,
-            pdFALSE,
-            pdFALSE,
-            portMAX_DELAY
-        );
-
-        if (!clear) {
+        uxBits = xEventGroupGetBits(user_event_group);
+        if (!clear && !(uxBits & AUDIO_RENDER_CLR_BIT)) {
             audio_buffer_reset();
 
             clear = true;
+
+            xEventGroupSetBits(user_event_group, AUDIO_RENDER_CLR_BIT);
         }
 
         if (start) {
@@ -143,6 +138,8 @@ static void audio_render_task(void *pvParameter)
         } else {
             if (xRingbufferGetCurFreeSize(audio_buff) < 512) {
                 start = true;
+
+                xEventGroupClearBits(user_event_group, AUDIO_RENDER_CLR_BIT);
             } else {
                 vTaskDelay(1 / portTICK_RATE_MS);
             }
@@ -213,8 +210,6 @@ static void audio_render_task(void *pvParameter)
 
 void audio_render_init(void)
 {
-    xEventGroupSetBits(user_event_group, AUDIO_RENDER_RUN_BIT);
-
     memset(&buff_struct, 0x00, sizeof(StaticRingbuffer_t));
     audio_buff = xRingbufferCreateStatic(sizeof(buff_data), RINGBUF_TYPE_BYTEBUF, buff_data, &buff_struct);