audio: playback optimization

Author: redchenjs

main/res/snd/snd2.mp3

@@ -43,15 +43,15 @@ static void os_pwr_task_handle(void *pvParameters)
             if (reset_wait_bits) {
                 ESP_LOGW(OS_PWR_TAG, "waiting for unfinished jobs....");
 
-                vTaskDelay(500 / portTICK_RATE_MS);
-
                 xEventGroupWaitBits(
                     user_event_group,
                     reset_wait_bits,
                     pdFALSE,
                     pdTRUE,
                     portMAX_DELAY
                 );
+
+                vTaskDelay(50 / portTICK_RATE_MS);
             }
 
             ESP_LOGW(OS_PWR_TAG, "reset now");
@@ -60,15 +60,15 @@ static void os_pwr_task_handle(void *pvParameters)
             if (sleep_wait_bits) {
                 ESP_LOGW(OS_PWR_TAG, "waiting for unfinished jobs....");
 
-                vTaskDelay(500 / portTICK_RATE_MS);
-
                 xEventGroupWaitBits(
                     user_event_group,
                     sleep_wait_bits,
                     pdFALSE,
                     pdTRUE,
                     portMAX_DELAY
                 );
+
+                vTaskDelay(50 / portTICK_RATE_MS);
             }
 
 #ifdef CONFIG_ENABLE_SLEEP_KEY

main/res/snd/snd3.mp3

@@ -79,5 +79,5 @@ void ain_init(void)
 
     ain_set_mode(ain_mode);
 
-    xTaskCreatePinnedToCore(ain_task, "ainT", 1280, NULL, configMAX_PRIORITIES - 3, NULL, 0);
+    xTaskCreatePinnedToCore(ain_task, "ainT", 1536, NULL, configMAX_PRIORITIES - 3, NULL, 0);
 }

main/src/core/os.c

@@ -81,12 +81,11 @@ static void audio_player_task(void *pvParameters)
             portMAX_DELAY
         );
 
-        // allocate structs needed for mp3 decoding
         struct mad_stream *stream = malloc(sizeof(struct mad_stream));
         struct mad_frame  *frame  = malloc(sizeof(struct mad_frame));
         struct mad_synth  *synth  = malloc(sizeof(struct mad_synth));
 
-        if ((stream == NULL) || (frame == NULL) || (synth == NULL)) {
+        if (!stream || !frame || !synth) {
             xEventGroupSetBits(user_event_group, AUDIO_PLAYER_IDLE_BIT);
             xEventGroupClearBits(user_event_group, AUDIO_PLAYER_RUN_BIT);
 
@@ -101,7 +100,6 @@ static void audio_player_task(void *pvParameters)
             continue;
         }
 
-        // initialize mp3 parts
         mad_stream_init(stream);
         mad_frame_init(frame);
         mad_synth_init(synth);

main/src/user/ain.c

@@ -28,6 +28,8 @@ void sleep_key_handle(void)
 {
     key_set_scan_mode(KEY_SCAN_MODE_IDX_OFF);
 
+    esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
+
 #ifdef CONFIG_ENABLE_VFX
     vfx_config_t *vfx = vfx_get_conf();
     vfx->mode = VFX_MODE_IDX_OFF;
@@ -36,18 +38,19 @@ void sleep_key_handle(void)
         vTaskDelay(500 / portTICK_RATE_MS);
     #endif
 #endif
+
 #ifndef CONFIG_AUDIO_INPUT_NONE
     ain_set_mode(AIN_MODE_IDX_OFF);
 #endif
+
 #ifdef CONFIG_ENABLE_AUDIO_PROMPT
     audio_player_play_file(MP3_FILE_IDX_SLEEP);
 #endif
 
-    esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
-
     if (!(xEventGroupGetBits(user_event_group) & BT_A2DP_IDLE_BIT)) {
         esp_a2d_sink_disconnect(a2d_remote_bda);
     }
+
 #ifdef CONFIG_ENABLE_BLE_CONTROL_IF
     if (!(xEventGroupGetBits(user_event_group) & BLE_GATTS_IDLE_BIT)) {
         esp_ble_gatts_close(gatts_profile_tbl[PROFILE_IDX_OTA].gatts_if,

main/src/user/audio_player.c

@@ -24,6 +24,7 @@
 #include "user/ain.h"
 #include "user/bt_av.h"
 #include "user/ble_gatts.h"
+#include "user/audio_player.h"
 
 #define OTA_TAG "ota"
 
@@ -137,7 +138,7 @@ static void ota_write_task(void *pvParameter)
 
             data_err = true;
 
-            ota_send_response(RSP_IDX_FAIL);
+            ota_send_response(RSP_IDX_ERROR);
 
             goto write_fail;
         }
@@ -151,7 +152,7 @@ static void ota_write_task(void *pvParameter)
 
                 data_err = true;
 
-                ota_send_response(RSP_IDX_FAIL);
+                ota_send_response(RSP_IDX_ERROR);
 
                 goto write_fail;
             }
@@ -162,7 +163,7 @@ static void ota_write_task(void *pvParameter)
 
                 data_err = true;
 
-                ota_send_response(RSP_IDX_FAIL);
+                ota_send_response(RSP_IDX_ERROR);
 
                 goto write_fail;
             }
@@ -208,10 +209,10 @@ void ota_exec(const char *data, uint32_t len)
                 ESP_LOGI(OTA_TAG, "GET command: "CMD_FMT_UPD, data_length);
 
                 EventBits_t uxBits = xEventGroupGetBits(user_event_group);
-                if (data_length == 0) {
-                    ota_send_response(RSP_IDX_ERROR);
-                } else if (!(uxBits & BT_A2DP_IDLE_BIT) || (uxBits & BLE_GATTS_LOCK_BIT)) {
+                if (!(uxBits & BT_A2DP_IDLE_BIT) || (uxBits & BLE_GATTS_LOCK_BIT)) {
                     ota_send_response(RSP_IDX_FAIL);
+                } else if (data_length == 0) {
+                    ota_send_response(RSP_IDX_ERROR);
                 } else {
                     if (!update_handle) {
                         esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
@@ -282,6 +283,8 @@ void ota_exec(const char *data, uint32_t len)
 
                 xEventGroupSetBits(user_event_group, BLE_GATTS_LOCK_BIT);
 
+                esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
+
                 if (!update_handle) {
 #ifdef CONFIG_ENABLE_SLEEP_KEY
                     key_set_scan_mode(KEY_SCAN_MODE_IDX_OFF);
@@ -295,7 +298,9 @@ void ota_exec(const char *data, uint32_t len)
 #endif
                 }
 
-                esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
+#if defined(CONFIG_ENABLE_AUDIO_PROMPT) && defined(CONFIG_ENABLE_SLEEP_KEY)
+                audio_player_play_file(MP3_FILE_IDX_SLEEP);
+#endif
 
                 if (!(xEventGroupGetBits(user_event_group) & BT_A2DP_IDLE_BIT)) {
                     esp_a2d_sink_disconnect(a2d_remote_bda);