Merge branch 'fix/usb_extern_lcd_example_uac' into 'master'

fix(usb_extern_lcd): Optimize audio output

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

Author: leeebo

examples/usb/device/usb_extend_screen/main/Kconfig.projbuild

@@ -73,14 +73,14 @@ menu "Example Configuration"
 
     config USB_TASK_PRIORITY
         int "USB Task Priority"
-        default 5
+        default 6
         range 1 15
         help
             TinyUSB main task priority
 
     config VENDOR_TASK_PRIORITY
         int "Vendor Task Priority"
-        default 10
+        default 5
         range 1 15
         help
             Task to receive JPG data from PC

examples/usb/device/usb_extend_screen/main/app_uac.c

@@ -57,8 +57,12 @@ esp_err_t app_uac_init(void)
         .set_mute_cb = uac_device_set_mute_cb,
         .set_volume_cb = uac_device_set_volume_cb,
         .cb_ctx = NULL,
+#if CONFIG_UAC_SPEAKER_CHANNEL_NUM > 0
         .spk_itf_num = ITF_NUM_AUDIO_STREAMING_SPK,
+#endif
+#if CONFIG_UAC_MIC_CHANNEL_NUM > 0
         .mic_itf_num = ITF_NUM_AUDIO_STREAMING_MIC,
+#endif
     };
 
     uac_device_init(&config);

examples/usb/device/usb_extend_screen/main/app_vendor.c

@@ -121,6 +121,8 @@ void tud_vendor_rx_cb(uint8_t itf, uint8_t const* buffer, uint16_t bufsize)
                         skip_frame = true;
                         buffer_skip(&skip_frame_info, read_res - sizeof(udisp_frame_header_t));
                         ESP_LOGE(TAG, "Get frame is null");
+                        // Feed the task dog
+                        vTaskDelay(1 / portTICK_PERIOD_MS);
                     }
                     break;
                 }
@@ -146,6 +148,6 @@ void tud_vendor_rx_cb(uint8_t itf, uint8_t const* buffer, uint16_t bufsize)
 
 esp_err_t app_vendor_init(void)
 {
-    xTaskCreatePinnedToCore(transfer_task, "transfer_task", 4096, NULL, CONFIG_VENDOR_TASK_PRIORITY, NULL, 0);
+    xTaskCreatePinnedToCore(transfer_task, "transfer_task", 4096, NULL, CONFIG_VENDOR_TASK_PRIORITY, NULL, 1);
     return ESP_OK;
 }

examples/usb/device/usb_extend_screen/main/tusb/usb_descriptors.c

@@ -94,6 +94,16 @@ uint8_t const * tud_hid_descriptor_report_cb(uint8_t instance)
 }
 #endif
 
+enum {
+    STR_INDEX_VENDOR = 4,
+#if CFG_TUD_HID
+    STR_INDEX_HID,
+#endif
+#if CFG_TUD_AUDIO
+    STR_INDEX_AUDIO,
+#endif
+};
+
 //--------------------------------------------------------------------+
 // Configuration Descriptor
 //--------------------------------------------------------------------+
@@ -107,14 +117,14 @@ uint8_t const desc_fs_configuration[] = {
     TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0, 100),
     // Interface number, string index, EP Out & IN address, EP size
 #if CFG_TUD_VENDOR
-    TUD_VENDOR_DESCRIPTOR(ITF_NUM_VENDOR, 4, EPNUM_VENDOR, 0x80 | EPNUM_VENDOR, CFG_TUD_VENDOR_EPSIZE),
+    TUD_VENDOR_DESCRIPTOR(ITF_NUM_VENDOR, STR_INDEX_VENDOR, EPNUM_VENDOR, 0x80 | EPNUM_VENDOR, CFG_TUD_VENDOR_EPSIZE),
 #endif
 #if CFG_TUD_HID
     // Interface number, string index, protocol, report descriptor len, EP In address, size & polling interval
-    TUD_HID_DESCRIPTOR(ITF_NUM_HID, 5, HID_ITF_PROTOCOL_NONE, sizeof(desc_hid_report), (0x80 | EPNUM_HID_DATA), CFG_TUD_HID_EP_BUFSIZE, 10),
+    TUD_HID_DESCRIPTOR(ITF_NUM_HID, STR_INDEX_HID, HID_ITF_PROTOCOL_NONE, sizeof(desc_hid_report), (0x80 | EPNUM_HID_DATA), CFG_TUD_HID_EP_BUFSIZE, 10),
 #endif
 #if CFG_TUD_AUDIO
-    TUD_AUDIO_DESCRIPTOR(ITF_NUM_AUDIO_CONTROL, 6, EPNUM_AUDIO_OUT, (0x80 | EPNUM_AUDIO_IN), (0x80 | EPNUM_AUDIO_FB)),
+    TUD_AUDIO_DESCRIPTOR(ITF_NUM_AUDIO_CONTROL, STR_INDEX_AUDIO, EPNUM_AUDIO_OUT, (0x80 | EPNUM_AUDIO_IN), (0x80 | EPNUM_AUDIO_FB)),
 #endif
 };
 

examples/usb/device/usb_extend_screen/main/tusb/usb_descriptors.h

@@ -26,6 +26,7 @@
 
 #pragma once
 #include "tusb.h"
+#include "sdkconfig.h"
 
 enum {
     REPORT_ID_TOUCH = 1,
@@ -40,8 +41,12 @@ enum {
 #endif
 #if CFG_TUD_AUDIO
     ITF_NUM_AUDIO_CONTROL,
+#if CONFIG_UAC_SPEAKER_CHANNEL_NUM > 0
     ITF_NUM_AUDIO_STREAMING_SPK,
+#endif
+#if CONFIG_UAC_MIC_CHANNEL_NUM > 0
     ITF_NUM_AUDIO_STREAMING_MIC,
+#endif
 #endif
     ITF_NUM_TOTAL,
 };

examples/usb/device/usb_extend_screen/sdkconfig.defaults

@@ -7,3 +7,6 @@ CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
 CONFIG_FREERTOS_HZ=1000
 CONFIG_USB_DEVICE_UAC_AS_PART=y
+
+CONFIG_UAC_SPK_TASK_PRIORITY=6
+CONFIG_UAC_MIC_TASK_PRIORITY=6

examples/usb/device/usb_extend_screen/sdkconfig.defaults.esp32s3

@@ -2,6 +2,7 @@
 # Compiler options
 #
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
 
 #
 # ESP PSRAM