fix(uvc): Fix UVC driver re-installation

UVC uninstall function was using a static variable to track driver state,
which caused issues when re-installing the driver. This commit changes
the implementation to use driver_state EventGroupBits instead

Author: tore-espressif

host/class/uvc/usb_host_uvc/CHANGELOG.md

@@ -3,6 +3,7 @@
 - Added `uvc_host_stream_format_get()` function that returns current stream's format
 - Added `uvc_host_buf_info_get()` function for esp_video binding
 - Added option to request default FPS by setting FPS = 0
+- Fixed UVC driver re-installation
 
 ## 2.2.0
 

host/class/uvc/usb_host_uvc/host_test/main/opening/test_opening.cpp

@@ -67,6 +67,13 @@ SCENARIO("UVC driver install/uninstall")
         }
 
         REQUIRE(ESP_OK == test_uvc_host_uninstall());
+
+        AND_WHEN("UVC driver is installed again") {
+            THEN("Installation succeeds") {
+                REQUIRE(ESP_OK == test_uvc_host_install(&uvc_driver_config));
+                REQUIRE(ESP_OK == test_uvc_host_uninstall());
+            }
+        }
     }
 }
 

host/class/uvc/usb_host_uvc/host_test/main/parsing/test_parsing_helpers.hpp

@@ -7,7 +7,7 @@
 #pragma once
 
 /**
- * @brief Define MJPEG formats with FPS 30-5
+ * @brief Define MJPEG formats with FPS 30-5 and 0 (default)
  */
 #define FORMAT_MJPEG_30_5(x, y)      \
     {x, y, 30, UVC_VS_FORMAT_MJPEG}, \
@@ -19,7 +19,7 @@
     {x, y, 0, UVC_VS_FORMAT_MJPEG}
 
 /**
- * @brief Define MJPEG formats with FPS 30-15
+ * @brief Define MJPEG formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_MJPEG_30_25_15(x, y)  \
     {x, y, 30, UVC_VS_FORMAT_MJPEG}, \
@@ -28,7 +28,7 @@
     {x, y, 0, UVC_VS_FORMAT_MJPEG}
 
 /**
- * @brief Define MJPEG formats with FPS 30-15
+ * @brief Define MJPEG formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_MJPEG_30_20_15(x, y)  \
     {x, y, 30, UVC_VS_FORMAT_MJPEG}, \
@@ -37,7 +37,7 @@
     {x, y, 0, UVC_VS_FORMAT_MJPEG}
 
 /**
- * @brief Define YUY2 formats with FPS 30-5
+ * @brief Define YUY2 formats with FPS 30-5 and 0 (default)
  */
 #define FORMAT_UNCOMPRESSED_30_5(x, y) \
     {x, y, 30, UVC_VS_FORMAT_YUY2},    \
@@ -49,7 +49,7 @@
     {x, y, 0, UVC_VS_FORMAT_YUY2}
 
 /**
- * @brief Define YUY2 formats with FPS 30-15
+ * @brief Define YUY2 formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_UNCOMPRESSED_30_25_15(x, y) \
     {x, y, 30, UVC_VS_FORMAT_YUY2},        \
@@ -58,7 +58,7 @@
     {x, y, 0, UVC_VS_FORMAT_YUY2}
 
 /**
- * @brief Define YUY2 formats with FPS 30-15
+ * @brief Define YUY2 formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_UNCOMPRESSED_30_20_15(x, y) \
     {x, y, 30, UVC_VS_FORMAT_YUY2},        \
@@ -67,7 +67,7 @@
     {x, y, 0, UVC_VS_FORMAT_YUY2}
 
 /**
- * @brief Define YUY2 formats with FPS 20-5
+ * @brief Define YUY2 formats with FPS 20-5 and 0 (default)
  */
 #define FORMAT_UNCOMPRESSED_20_5(x, y) \
     {x, y, 20, UVC_VS_FORMAT_YUY2},    \
@@ -77,7 +77,7 @@
     {x, y, 0, UVC_VS_FORMAT_YUY2}
 
 /**
- * @brief Define h264 formats with FPS 30-15
+ * @brief Define h264 formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_H264_30_25_15(x, y)  \
     {x, y, 30, UVC_VS_FORMAT_H264}, \
@@ -86,7 +86,7 @@
     {x, y, 0, UVC_VS_FORMAT_H264}
 
 /**
- * @brief Define h264 formats with FPS 30-15
+ * @brief Define h264 formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_H264_30_20_15(x, y)  \
     {x, y, 30, UVC_VS_FORMAT_H264}, \
@@ -95,7 +95,7 @@
     {x, y, 0, UVC_VS_FORMAT_H264}
 
 /**
- * @brief Define h265 formats with FPS 30-15
+ * @brief Define h265 formats with FPS 30-15 and 0 (default)
  */
 #define FORMAT_H265_30_20_15(x, y)  \
     {x, y, 30, UVC_VS_FORMAT_H265}, \

host/class/uvc/usb_host_uvc/include/esp_private/uvc_esp_video.h

@@ -14,7 +14,7 @@ extern "C" {
 
 /**
  * This API provides access to advanced UVC features.
- * It is intended for use with esp_vide component.
+ * It is intended for use with esp_video component.
  */
 
 typedef struct {

host/class/uvc/usb_host_uvc/test_app/CMakeLists.txt

@@ -0,0 +1,9 @@
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+set(COMPONENTS main)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(test_app_usb_host_uvc)

host/class/uvc/usb_host_uvc/test_app/README.md

@@ -0,0 +1,13 @@
+| Supported Targets | ESP32-S2 | ESP32-S3 | ESP32-P4 |
+| ----------------- | -------- | -------- | -------- |
+
+# USB: UVC Class test application
+
+## UVC driver
+
+Target tests for USB Host UVC driver.
+
+### Hardware Required
+
+A USB camera and USB enabled ESP SoC is needed. Connect the camera to USB host port on ESP.
+Format negotiation results are tested against values from Logitech C270 camera. These constants must be modified if different camera is used.

host/class/uvc/usb_host_uvc/test_app/main/CMakeLists.txt

@@ -0,0 +1,7 @@
+idf_component_register(SRC_DIRS .
+                       INCLUDE_DIRS .
+                       REQUIRES unity
+                       WHOLE_ARCHIVE)
+
+# So we have access to private_include:
+target_include_directories(${COMPONENT_LIB} PRIVATE "../../")

host/class/uvc/usb_host_uvc/test_app/main/idf_component.yml

@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  # Needed as DUT
+  espressif/usb_host_uvc:
+    version: "*"
+    override_path: "../../../usb_host_uvc"

host/class/uvc/usb_host_uvc/test_app/main/test_app_main.c

@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "unity.h"
+#include "unity_test_runner.h"
+#include "unity_test_utils_memory.h"
+
+void setUp(void)
+{
+    unity_utils_record_free_mem();
+}
+
+void tearDown(void)
+{
+    unity_utils_evaluate_leaks();
+}
+
+void app_main(void)
+{
+    /*
+      ____ _______   _____________     __                   __
+     |    |   \   \ /   /\_   ___ \  _/  |_  ____   _______/  |_
+     |    |   /\   Y   / /    \  \/  \   __\/ __ \ /  ___/\   __\
+     |    |  /  \     /  \     \____  |  | \  ___/ \___ \  |  |
+     |______/    \___/    \______  /  |__|  \___  >____  > |__|
+                                 \/             \/     \/
+    */
+    printf(" ____ _______   _____________     __                   __   \r\n");
+    printf("|    |   \\   \\ /   /\\_   ___ \\  _/  |_  ____   _______/  |_ \r\n");
+    printf("|    |   /\\   Y   / /    \\  \\/  \\   __\\/ __ \\ /  ___/\\   __\\\r\n");
+    printf("|    |  /  \\     /  \\     \\____  |  | \\  ___/ \\___ \\  |  |  \r\n");
+    printf("|______/    \\___/    \\______  /  |__|  \\___  >____  > |__|  \r\n");
+    printf("                            \\/             \\/     \\/  \r\n");
+
+    unity_utils_setup_heap_record(80);
+    unity_utils_set_leak_level(530);
+    unity_run_menu();
+}