Merge branch 'contrib/github_pr_512' into 'master'

leeebo · leeebo · commit cc665f36458e · 2025-07-25T14:55:23.000+08:00
Fix usb_mic_task overrun by enforcing MIC_INTERVAL_MS pacing (GitHub PR)

Closes AEGHB-1078

See merge request ae_group/esp-iot-solution!1325
diff --git a/components/usb/usb_device_uac/usb_device_uac.c b/components/usb/usb_device_uac/usb_device_uac.c
@@ -456,10 +456,12 @@ static void usb_spk_task(void *pvParam)
 #if CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX
 static void usb_mic_task(void *pvParam)
 {
+    TickType_t xLastWakeTime = xTaskGetTickCount();
     while (1) {
         if (s_uac_device->mic_active == false) {
             // clear the notification
             ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+            xLastWakeTime = xTaskGetTickCount();
             continue;
         }
         // clear the notification
@@ -479,6 +481,8 @@ static void usb_mic_task(void *pvParam)
             s_uac_device->mic_data_size = bytes_read;
             UAC_EXIT_CRITICAL();
         }
+
+        vTaskDelayUntil(&xLastWakeTime, pdMS_TO_TICKS(MIC_INTERVAL_MS));
     }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -456,10 +456,12 @@ static void usb_spk_task(void *pvParam)`
`456`	`456`	`#if CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX`
`457`	`457`	`static void usb_mic_task(void *pvParam)`
`458`	`458`	`{`
	`459`	`+ TickType_t xLastWakeTime = xTaskGetTickCount();`
`459`	`460`	`while (1) {`
`460`	`461`	`if (s_uac_device->mic_active == false) {`
`461`	`462`	`// clear the notification`
`462`	`463`	`ulTaskNotifyTake(pdTRUE, portMAX_DELAY);`
	`464`	`+ xLastWakeTime = xTaskGetTickCount();`
`463`	`465`	`continue;`
`464`	`466`	`}`
`465`	`467`	`// clear the notification`
`@@ -479,6 +481,8 @@ static void usb_mic_task(void *pvParam)`
`479`	`481`	`s_uac_device->mic_data_size = bytes_read;`
`480`	`482`	`UAC_EXIT_CRITICAL();`
`481`	`483`	`}`
	`484`	`+`
	`485`	`+ vTaskDelayUntil(&xLastWakeTime, pdMS_TO_TICKS(MIC_INTERVAL_MS));`
`482`	`486`	`}`
`483`	`487`	`}`
`484`	`488`	`#endif`