fix(device_uvc): fix incorrect stridx in uvc descriptors

Author: YanKE01

components/usb/usb_device_uvc/CHANGELOG.md

@@ -1,4 +1,9 @@
 # ChangeLog
+
+## v1.1.3 2025-7-21
+
+* Fix incorrect `_stridx` in UVC descriptors when using dual cameras. 
+
 ## v1.1.2 2024-10-25
 
 * Add test-apps

components/usb/usb_device_uvc/README.md

@@ -8,7 +8,10 @@ Features:
 
 1. Support video stream through the UVC Stream interface
 2. Support both isochronous and bulk mode
-2. Support multiple resolutions and frame rates
+3. Support multiple resolutions and frame rates
+4. Support trans two cam's picture
+
+> Note: If `UVC_SUPPORT_TWO_CAM` is enabled in `Kconfig` and multiple camera switches are required, please set both `UVC_CAM1_XFER_MODE` and `UVC_CAM2_XFER_MODE` to Isochronous mode.
 
 ### Add component to your project
 

components/usb/usb_device_uvc/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.2"
+version: "1.1.3"
 targets:
   - esp32s2
   - esp32s3

components/usb/usb_device_uvc/tusb/usb_descriptors.c

@@ -204,43 +204,43 @@ uint8_t const desc_fs_configuration[] = {
 #if CFG_TUD_CAM2_VIDEO_STREAMING_BULK
 #if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
 #if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG_BULK(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264_BULK(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #else
 #if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG_BULK(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                             UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                             CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264_BULK(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                            UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                            CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                               UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                               CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #endif // CONFIG_UVC_CAM2_MULTI_FRAMESIZE
 #else
 #if CONFIG_UVC_CAM2_MULTI_FRAMESIZE
 #if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_MJPEG(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MULTI_H264(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN, CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #endif
 #else
 #if CONFIG_FORMAT_MJPEG_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_MJPEG(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                        UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                        CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #elif CONFIG_FORMAT_H264_CAM2
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264(4, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_H264(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                       UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                       CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #else
-    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR(4, ITF_NUM_VIDEO_CONTROL, EPNUM_CAM2_VIDEO_IN,
+    TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR(5, ITF_NUM_VIDEO_CONTROL_2, EPNUM_CAM2_VIDEO_IN,
                                          UVC_CAM2_FRAME_WIDTH, UVC_CAM2_FRAME_HEIGHT, UVC_CAM2_FRAME_RATE,
                                          CFG_TUD_CAM2_VIDEO_STREAMING_EP_BUFSIZE),
 #endif