Merge pull request #371 from adafruit/enhance-uvc

Enhance uvc

Author: hathach

examples/Video/video_capture/usb_descriptors.h

@@ -10,20 +10,100 @@
 *********************************************************************/
 
 #include "Adafruit_TinyUSB.h"
-#include "usb_descriptors.h"
 
 //--------------------------------------------------------------------+
-//
+// Video descriptors
 //--------------------------------------------------------------------+
+
+/* Time stamp base clock. It is a deprecated parameter. */
 #define FRAME_WIDTH   128
 #define FRAME_HEIGHT  96
 #define FRAME_RATE    30
 
-uint8_t const desc_video[] = {
-  TUD_VIDEO_CAPTURE_DESCRIPTOR_UNCOMPR_BULK(0, 0x80, FRAME_WIDTH, FRAME_HEIGHT, FRAME_RATE, 64)
+/* video capture path
+ *
+ * | Camera Terminal (0x01) | ----> | Output Terminal (0x02 Streaming) |
+ * */
+#define TERMID_CAMERA 0x01
+#define TERMID_OUTPUT 0x02
+
+tusb_desc_video_control_camera_terminal_t const desc_camera_terminal = {
+    .bLength = sizeof(tusb_desc_video_control_camera_terminal_t),
+    .bDescriptorType = TUSB_DESC_CS_INTERFACE,
+    .bDescriptorSubType = VIDEO_CS_ITF_VC_INPUT_TERMINAL,
+
+    .bTerminalID = TERMID_CAMERA,
+    .wTerminalType = VIDEO_ITT_CAMERA,
+    .bAssocTerminal = 0,
+    .iTerminal = 0,
+    .wObjectiveFocalLengthMin = 0,
+    .wObjectiveFocalLengthMax = 0,
+    .wOcularFocalLength = 0,
+    .bControlSize = 3,
+    .bmControls = { 0, 0, 0 }
+};
+
+tusb_desc_video_control_output_terminal_t const desc_output_terminal = {
+    .bLength = sizeof(tusb_desc_video_control_output_terminal_t),
+    .bDescriptorType = TUSB_DESC_CS_INTERFACE,
+    .bDescriptorSubType = VIDEO_CS_ITF_VC_OUTPUT_TERMINAL,
+
+    .bTerminalID = TERMID_OUTPUT,
+    .wTerminalType = VIDEO_TT_STREAMING,
+    .bAssocTerminal = 0,
+    .bSourceID = TERMID_CAMERA,
+    .iTerminal = 0
 };
 
-Adafruit_USBD_Video usb_video(desc_video, sizeof(desc_video));
+tusb_desc_video_format_uncompressed_t const desc_format = {
+    .bLength = sizeof(tusb_desc_video_format_uncompressed_t),
+    .bDescriptorType = TUSB_DESC_CS_INTERFACE,
+    .bDescriptorSubType = VIDEO_CS_ITF_VS_FORMAT_UNCOMPRESSED,
+    .bFormatIndex = 1, // 1-based index
+    .bNumFrameDescriptors = 1,
+    .guidFormat = { TUD_VIDEO_GUID_YUY2 },
+    .bBitsPerPixel = 16,
+    .bDefaultFrameIndex = 1,
+    .bAspectRatioX = 0,
+    .bAspectRatioY = 0,
+    .bmInterlaceFlags = 0,
+    .bCopyProtect = 0
+};
+
+tusb_desc_video_frame_uncompressed_continuous_t desc_frame = {
+    .bLength = sizeof(tusb_desc_video_frame_uncompressed_continuous_t),
+    .bDescriptorType = TUSB_DESC_CS_INTERFACE,
+    .bDescriptorSubType = VIDEO_CS_ITF_VS_FRAME_UNCOMPRESSED,
+    .bFrameIndex = 1, // 1-based index
+    .bmCapabilities = 0,
+    .wWidth = FRAME_WIDTH,
+    .wHeight = FRAME_HEIGHT,
+    .dwMinBitRate = FRAME_WIDTH * FRAME_HEIGHT * 16 * 1,
+    .dwMaxBitRate = FRAME_WIDTH * FRAME_HEIGHT * 16 * FRAME_RATE,
+    .dwMaxVideoFrameBufferSize = FRAME_WIDTH * FRAME_HEIGHT * 16 / 8,
+    .dwDefaultFrameInterval = 10000000 / FRAME_RATE,
+    .bFrameIntervalType = 0, // continuous
+    .dwFrameInterval = {
+        10000000 / FRAME_RATE, // min
+        10000000, // max
+        10000000 / FRAME_RATE // step
+    }
+};
+
+tusb_desc_video_streaming_color_matching_t desc_color = {
+    .bLength = sizeof(tusb_desc_video_streaming_color_matching_t),
+    .bDescriptorType = TUSB_DESC_CS_INTERFACE,
+    .bDescriptorSubType = VIDEO_CS_ITF_VS_COLORFORMAT,
+
+    .bColorPrimaries = VIDEO_COLOR_PRIMARIES_BT709,
+    .bTransferCharacteristics = VIDEO_COLOR_XFER_CH_BT709,
+    .bMatrixCoefficients = VIDEO_COLOR_COEF_SMPTE170M
+};
+
+//--------------------------------------------------------------------+
+// Video and frame buffer
+//--------------------------------------------------------------------+
+Adafruit_USBD_Video usb_video;
 
 // YUY2 frame buffer
 static uint8_t frame_buffer[FRAME_WIDTH * FRAME_HEIGHT * 16 / 8];
@@ -41,6 +121,13 @@ static void fill_color_bar(uint8_t* buffer, unsigned start_position);
 
 void setup() {
   Serial.begin(115200);
+
+  usb_video.addTerminal(&desc_camera_terminal);
+  usb_video.addTerminal(&desc_output_terminal);
+  usb_video.addFormat(&desc_format);
+  usb_video.addFrame(&desc_frame);
+  usb_video.addColorMatching(&desc_color);
+
   usb_video.begin();
 }
 
@@ -53,6 +140,7 @@ void loop() {
 
   if (!already_sent) {
     already_sent = 1;
+    tx_busy = 1;
     start_ms = millis();
     fill_color_bar(frame_buffer, frame_num);
     tud_video_n_frame_xfer(0, 0, (void*) frame_buffer, FRAME_WIDTH * FRAME_HEIGHT * 16 / 8);
@@ -62,6 +150,7 @@ void loop() {
   if (cur - start_ms < interval_ms) return; // not enough time
   if (tx_busy) return;
   start_ms += interval_ms;
+  tx_busy = 1;
 
   fill_color_bar(frame_buffer, frame_num);
   tud_video_n_frame_xfer(0, 0, (void*) frame_buffer, FRAME_WIDTH * FRAME_HEIGHT * 16 / 8);