Merge branch 'fix/usb_audio_player' into 'master'

fix(usb_audio_player): fix esp32p4 stream suspend bug

Closes AEG-1589 and AEG-1942

See merge request ae_group/esp-iot-solution!1097

Author: leeebo

examples/usb/host/usb_audio_player/main/idf_component.yml

@@ -1,4 +1,5 @@
 dependencies:
   chmorgan/esp-audio-player: "1.0.*"
   idf: ">=5.0" # The version of the ESP-IDF that esp-audio-player requires
-  usb_host_uac: "1.0.*"
+  usb_host_uac:
+    version: "1.2.*"

examples/usb/host/usb_audio_player/main/usb_audio_player_main.c

@@ -25,8 +25,15 @@ static const char *TAG = "usb_audio_player";
 #define MP3_FILE_NAME           "/new_epic.mp3"
 #define BIT1_SPK_START          (0x01 << 0)
 #define DEFAULT_VOLUME          45
+#define DEFAULT_UAC_FREQ        48000
+#define DEFAULT_UAC_BITS        16
+#define DEFAULT_UAC_CH          2
+
 static QueueHandle_t s_event_queue = NULL;
 static uac_host_device_handle_t s_spk_dev_handle = NULL;
+static uint32_t s_spk_curr_freq = DEFAULT_UAC_FREQ;
+static uint8_t s_spk_curr_bits = DEFAULT_UAC_BITS;
+static uint8_t s_spk_curr_ch = DEFAULT_UAC_CH;
 static FILE *s_fp = NULL;
 static void uac_device_callback(uac_host_device_handle_t uac_device_handle, const uac_host_device_event_t event, void *arg);
 /**
@@ -69,9 +76,16 @@ static esp_err_t _audio_player_mute_fn(AUDIO_PLAYER_MUTE_SETTING setting)
     if (s_spk_dev_handle == NULL) {
         return ESP_ERR_INVALID_STATE;
     }
-    ESP_LOGI(TAG, "mute setting: %s", setting == 0 ? "mute" : "unmute");
-
-    return uac_host_device_set_mute(s_spk_dev_handle, (setting == 0 ? true : false));
+    ESP_LOGI(TAG, "mute setting: %s", setting == AUDIO_PLAYER_MUTE ? "mute" : "unmute");
+    // some uac devices may not support mute, so we not check the return value
+    if (setting == AUDIO_PLAYER_UNMUTE) {
+        uac_host_device_set_volume(s_spk_dev_handle, DEFAULT_VOLUME);
+        uac_host_device_set_mute(s_spk_dev_handle, false);
+    } else {
+        uac_host_device_set_volume(s_spk_dev_handle, 0);
+        uac_host_device_set_mute(s_spk_dev_handle, true);
+    }
+    return ESP_OK;
 }
 
 static esp_err_t _audio_player_write_fn(void *audio_buffer, size_t len, size_t *bytes_written, uint32_t timeout_ms)
@@ -92,13 +106,19 @@ static esp_err_t _audio_player_std_clock(uint32_t rate, uint32_t bits_cfg, i2s_s
     if (s_spk_dev_handle == NULL) {
         return ESP_ERR_INVALID_STATE;
     }
+    if (rate == s_spk_curr_freq && bits_cfg == s_spk_curr_bits && ch == s_spk_curr_ch) {
+        return ESP_OK;
+    }
     ESP_LOGI(TAG, "Re-config: speaker rate %"PRIu32", bits %"PRIu32", mode %s", rate, bits_cfg, ch == 1 ? "MONO" : (ch == 2 ? "STEREO" : "INVALID"));
     ESP_ERROR_CHECK(uac_host_device_stop(s_spk_dev_handle));
     const uac_host_stream_config_t stm_config = {
         .channels = ch,
         .bit_resolution = bits_cfg,
         .sample_freq = rate,
     };
+    s_spk_curr_freq = rate;
+    s_spk_curr_bits = bits_cfg;
+    s_spk_curr_ch = ch;
     return uac_host_device_start(s_spk_dev_handle, &stm_config);
 }
 
@@ -128,7 +148,6 @@ static void _audio_player_callback(audio_player_cb_ctx_t *ctx)
             break;
         }
         ESP_ERROR_CHECK(uac_host_device_resume(s_spk_dev_handle));
-        uac_host_device_set_volume(s_spk_dev_handle, DEFAULT_VOLUME);
         break;
     case AUDIO_PLAYER_CALLBACK_EVENT_PAUSE:
         ESP_LOGI(TAG, "AUDIO_PLAYER_REQUEST_PAUSE");
@@ -243,10 +262,11 @@ static void uac_lib_task(void *arg)
                     ESP_ERROR_CHECK(uac_host_get_device_info(uac_device_handle, &dev_info));
                     ESP_LOGI(TAG, "UAC Device connected: SPK");
                     uac_host_printf_device_param(uac_device_handle);
+                    // Start usb speaker with the default configuration
                     const uac_host_stream_config_t stm_config = {
-                        .channels = 2,
-                        .bit_resolution = 16,
-                        .sample_freq = 48000,
+                        .channels = s_spk_curr_ch,
+                        .bit_resolution = s_spk_curr_bits,
+                        .sample_freq = s_spk_curr_freq,
                     };
                     ESP_ERROR_CHECK(uac_host_device_start(uac_device_handle, &stm_config));
                     s_spk_dev_handle = uac_device_handle;
@@ -271,6 +291,9 @@ static void uac_lib_task(void *arg)
                 uac_host_device_event_t event = evt_queue.device_evt.event;
                 switch (event) {
                 case UAC_HOST_DRIVER_EVENT_DISCONNECTED:
+                    s_spk_curr_bits = DEFAULT_UAC_BITS;
+                    s_spk_curr_freq = DEFAULT_UAC_FREQ;
+                    s_spk_curr_ch = DEFAULT_UAC_CH;
                     ESP_LOGI(TAG, "UAC Device disconnected");
                     break;
                 case UAC_HOST_DEVICE_EVENT_RX_DONE: