Merge branch 'fix/skip_eof_check_for_some_usb_camera' into 'master'

feat(usb_stream): make header EOF check can be disable

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

Author: lijunru-hub

components/usb/usb_stream/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.5.0 - 2024-12-10
+
+### Improvements:
+
+* Make header EOF(1 << 1) check can be disabled by `CONFIG_UVC_CHECK_HEADER_EOF`. Because some non-standard cameras set this bit in the header of every frame.
+
 ## v1.4.0 - 2024-05-21
 
 ### Improvements:

components/usb/usb_stream/Kconfig

@@ -81,11 +81,17 @@ menu "USB Stream"
         config UVC_CHECK_HEADER_EOH
             bool "Check EOH bit in payload header"
             default n
+        config UVC_CHECK_HEADER_EOF
+            bool "Check EOF bit in payload header"
+            default y
+            help
+                "If EOF(1 << 1) is set in the header, it means the current image frame has been completely received."
         config UVC_CHECK_BULK_JPEG_HEADER
             bool "Check JPEG (ff d8) header in bulk payload"
             default y
         config UVC_DROP_NO_EOF_FRAME
             bool "Drop no EOF image frames"
+            depends on UVC_CHECK_HEADER_EOF
             default n
         config UVC_DROP_OVERFLOW_FRAME
             bool "Drop overflow image frames"

components/usb/usb_stream/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.4.0"
+version: "1.5.0"
 targets:
   - esp32s2
   - esp32s3

components/usb/usb_stream/usb_stream.c

@@ -2114,13 +2114,15 @@ IRAM_ATTR static void _uvc_process_payload(_uvc_stream_handle_t *strmh, size_t r
         strmh->reassembling = 0;
     }
 
+#if CONFIG_UVC_CHECK_HEADER_EOF
     if (header_info & (1 << 1)) {
         /* The EOF bit is set, so publish the complete frame */
         if (strmh->got_bytes != 0) {
             _uvc_swap_buffers(strmh);
         }
         strmh->reassembling = 0;
     }
+#endif
 }
 
 /**

examples/usb/host/usb_camera_lcd_display/main/main.c

@@ -461,7 +461,6 @@ static void _stream_state_changed_cb(usb_stream_state_t event, void *arg)
 
 void app_main(void)
 {
-    esp_log_level_set("*", ESP_LOG_INFO);
     /* Initialize NVS */
     esp_err_t ret = nvs_flash_init();
     if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {

examples/usb/otg/usb_host_device_mode_manual_switch/main/usb_device_cdc.c

@@ -18,7 +18,6 @@ static const char *TAG = "tusb_cdc_acm";
 static usb_phy_handle_t phy_hdl =  NULL;
 static TaskHandle_t uvc_task_hdl = NULL;
 static TaskHandle_t cdc_task_hdl = NULL;
-static EventGroupHandle_t usb_cdc_device;
 
 //****************************************************TinyUSB callbacks*/
 // CDC-ACM
@@ -83,8 +82,6 @@ esp_err_t device_cdc_init(void)
         return ESP_FAIL;
     }
 
-    usb_cdc_device = xEventGroupCreate();
-
     xTaskCreate(tusb_device_task, "tusb_device_task", 4096, NULL, 5, &uvc_task_hdl);
     xTaskCreate(cdc_task, "cdc_task", 4096, NULL, 5, &cdc_task_hdl);
     ESP_LOGI(TAG, "USB Device CDC Init");