Message ID | 20240916191405.27373-2-dg@cowlark.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [1/2] Add support for the D3DFMT_R5G6B5 pixmap type. | expand |
Hi David Could you take a look at the errors reported by the CI? https://patchwork.linuxtv.org/project/linux-media/patch/20240916191405.27373-2-dg@cowlark.com/ A small nit: is that I think the lsusb output belongs to your second patch... Thanks! On Mon, 16 Sept 2024 at 21:19, David Given <dg@cowlark.com> wrote: > > This media format is used by the NXP Semiconductors 1fc9:009b chipset, > used by the Kaiweets KTI-W02 infrared camera. > > lsusb for the device reports: > > Bus 003 Device 011: ID 1fc9:009b NXP Semiconductors IR VIDEO > Device Descriptor: > bLength 18 > bDescriptorType 1 > bcdUSB 2.00 > bDeviceClass 239 Miscellaneous Device > bDeviceSubClass 2 [unknown] > bDeviceProtocol 1 Interface Association > bMaxPacketSize0 64 > idVendor 0x1fc9 NXP Semiconductors > idProduct 0x009b IR VIDEO > bcdDevice 1.01 > iManufacturer 1 Guide sensmart > iProduct 2 IR VIDEO > iSerial 0 > bNumConfigurations 1 > Configuration Descriptor: > bLength 9 > bDescriptorType 2 > wTotalLength 0x00c2 > bNumInterfaces 2 > bConfigurationValue 1 > iConfiguration 0 > bmAttributes 0xc0 > Self Powered > MaxPower 100mA > Interface Association: > bLength 8 > bDescriptorType 11 > bFirstInterface 0 > bInterfaceCount 2 > bFunctionClass 14 Video > bFunctionSubClass 3 Video Interface Collection > bFunctionProtocol 0 > iFunction 3 IR Camera > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 0 > bAlternateSetting 0 > bNumEndpoints 1 > bInterfaceClass 14 Video > bInterfaceSubClass 1 Video Control > bInterfaceProtocol 0 > iInterface 0 > VideoControl Interface Descriptor: > bLength 13 > bDescriptorType 36 > bDescriptorSubtype 1 (HEADER) > bcdUVC 1.00 > wTotalLength 0x0033 > dwClockFrequency 6.000000MHz > bInCollection 1 > baInterfaceNr( 0) 1 > VideoControl Interface Descriptor: > bLength 18 > bDescriptorType 36 > bDescriptorSubtype 2 (INPUT_TERMINAL) > bTerminalID 1 > wTerminalType 0x0201 Camera Sensor > bAssocTerminal 0 > iTerminal 0 > wObjectiveFocalLengthMin 0 > wObjectiveFocalLengthMax 0 > wOcularFocalLength 0 > bControlSize 3 > bmControls 0x00000000 > VideoControl Interface Descriptor: > bLength 9 > bDescriptorType 36 > bDescriptorSubtype 3 (OUTPUT_TERMINAL) > bTerminalID 2 > wTerminalType 0x0101 USB Streaming > bAssocTerminal 0 > bSourceID 1 > iTerminal 0 > VideoControl Interface Descriptor: > bLength 11 > bDescriptorType 36 > bDescriptorSubtype 5 (PROCESSING_UNIT) > Warning: Descriptor too short > bUnitID 3 > bSourceID 1 > wMaxMultiplier 0 > bControlSize 2 > bmControls 0x00000000 > iProcessing 0 > bmVideoStandards 0x62 > NTSC - 525/60 > PAL - 525/60 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x81 EP 1 IN > bmAttributes 3 > Transfer Type Interrupt > Synch Type None > Usage Type Data > wMaxPacketSize 0x0008 1x 8 bytes > bInterval 1 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 1 > bAlternateSetting 0 > bNumEndpoints 0 > bInterfaceClass 14 Video > bInterfaceSubClass 2 Video Streaming > bInterfaceProtocol 0 > iInterface 0 > VideoStreaming Interface Descriptor: > bLength 14 > bDescriptorType 36 > bDescriptorSubtype 1 (INPUT_HEADER) > bNumFormats 1 > wTotalLength 0x0055 > bEndpointAddress 0x82 EP 2 IN > bmInfo 0 > bTerminalLink 2 > bStillCaptureMethod 2 > bTriggerSupport 0 > bTriggerUsage 0 > bControlSize 1 > bmaControls( 0) 0 > VideoStreaming Interface Descriptor: > bLength 27 > bDescriptorType 36 > bDescriptorSubtype 4 (FORMAT_UNCOMPRESSED) > bFormatIndex 1 > bNumFrameDescriptors 1 > guidFormat {e436eb7b-524f-11ce-9f53-0020af0ba770} > bBitsPerPixel 16 > bDefaultFrameIndex 1 > bAspectRatioX 0 > bAspectRatioY 0 > bmInterlaceFlags 0x00 > Interlaced stream or variable: No > Fields per frame: 2 fields > Field 1 first: No > Field pattern: Field 1 only > bCopyProtect 0 > VideoStreaming Interface Descriptor: > bLength 34 > bDescriptorType 36 > bDescriptorSubtype 5 (FRAME_UNCOMPRESSED) > bFrameIndex 1 > bmCapabilities 0x00 > Still image unsupported > wWidth 240 > wHeight 322 > dwMinBitRate 12364800 > dwMaxBitRate 30912000 > dwMaxVideoFrameBufferSize 154560 > dwDefaultFrameInterval 400000 > bFrameIntervalType 2 > dwFrameInterval( 0) 400000 > dwFrameInterval( 1) 1000000 > VideoStreaming Interface Descriptor: > bLength 10 > bDescriptorType 36 > bDescriptorSubtype 3 (STILL_IMAGE_FRAME) > bEndpointAddress 0x00 EP 0 OUT > bNumImageSizePatterns 1 > wWidth( 0) 240 > wHeight( 0) 322 > bNumCompressionPatterns 0 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 1 > bAlternateSetting 1 > bNumEndpoints 1 > bInterfaceClass 14 Video > bInterfaceSubClass 2 Video Streaming > bInterfaceProtocol 0 > iInterface 0 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x82 EP 2 IN > bmAttributes 5 > Transfer Type Isochronous > Synch Type Asynchronous > Usage Type Data > wMaxPacketSize 0x0400 1x 1024 bytes > bInterval 1 > Device Status: 0x0001 > Self Powered > > --- > drivers/media/common/uvc.c | 4 ++++ > include/linux/usb/uvc.h | 3 +++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/media/common/uvc.c b/drivers/media/common/uvc.c > index c54c2268f..c12d58932 100644 > --- a/drivers/media/common/uvc.c > +++ b/drivers/media/common/uvc.c > @@ -96,6 +96,10 @@ static const struct uvc_format_desc uvc_fmts[] = { > .guid = UVC_GUID_FORMAT_RGBP, > .fcc = V4L2_PIX_FMT_RGB565, > }, > + { > + .guid = UVC_GUID_FORMAT_D3DFMT_R5G6B5, > + .fcc = V4L2_PIX_FMT_RGB565, > + }, > { > .guid = UVC_GUID_FORMAT_BGR3, > .fcc = V4L2_PIX_FMT_BGR24, > diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h > index 88d96095b..01c3b2f45 100644 > --- a/include/linux/usb/uvc.h > +++ b/include/linux/usb/uvc.h > @@ -140,6 +140,9 @@ > #define UVC_GUID_FORMAT_D3DFMT_L8 \ > {0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \ > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > +#define UVC_GUID_FORMAT_D3DFMT_R5G6B5 \ > + {0x7b, 0xeb, 0x36, 0xe4, 0x4f, 0x52, 0xce, 0x11, \ > + 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70} > #define UVC_GUID_FORMAT_KSMEDIA_L8_IR \ > {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > -- > 2.45.2 > >
Done, I hope. On Tue, 17 Sept 2024 at 08:46, Ricardo Ribalda <ribalda@chromium.org> wrote: > > Hi David > > Could you take a look at the errors reported by the CI? > > https://patchwork.linuxtv.org/project/linux-media/patch/20240916191405.27373-2-dg@cowlark.com/ > > A small nit: is that I think the lsusb output belongs to your second patch... > > Thanks! > > On Mon, 16 Sept 2024 at 21:19, David Given <dg@cowlark.com> wrote: > > > > This media format is used by the NXP Semiconductors 1fc9:009b chipset, > > used by the Kaiweets KTI-W02 infrared camera. > > > > lsusb for the device reports: > > > > Bus 003 Device 011: ID 1fc9:009b NXP Semiconductors IR VIDEO > > Device Descriptor: > > bLength 18 > > bDescriptorType 1 > > bcdUSB 2.00 > > bDeviceClass 239 Miscellaneous Device > > bDeviceSubClass 2 [unknown] > > bDeviceProtocol 1 Interface Association > > bMaxPacketSize0 64 > > idVendor 0x1fc9 NXP Semiconductors > > idProduct 0x009b IR VIDEO > > bcdDevice 1.01 > > iManufacturer 1 Guide sensmart > > iProduct 2 IR VIDEO > > iSerial 0 > > bNumConfigurations 1 > > Configuration Descriptor: > > bLength 9 > > bDescriptorType 2 > > wTotalLength 0x00c2 > > bNumInterfaces 2 > > bConfigurationValue 1 > > iConfiguration 0 > > bmAttributes 0xc0 > > Self Powered > > MaxPower 100mA > > Interface Association: > > bLength 8 > > bDescriptorType 11 > > bFirstInterface 0 > > bInterfaceCount 2 > > bFunctionClass 14 Video > > bFunctionSubClass 3 Video Interface Collection > > bFunctionProtocol 0 > > iFunction 3 IR Camera > > Interface Descriptor: > > bLength 9 > > bDescriptorType 4 > > bInterfaceNumber 0 > > bAlternateSetting 0 > > bNumEndpoints 1 > > bInterfaceClass 14 Video > > bInterfaceSubClass 1 Video Control > > bInterfaceProtocol 0 > > iInterface 0 > > VideoControl Interface Descriptor: > > bLength 13 > > bDescriptorType 36 > > bDescriptorSubtype 1 (HEADER) > > bcdUVC 1.00 > > wTotalLength 0x0033 > > dwClockFrequency 6.000000MHz > > bInCollection 1 > > baInterfaceNr( 0) 1 > > VideoControl Interface Descriptor: > > bLength 18 > > bDescriptorType 36 > > bDescriptorSubtype 2 (INPUT_TERMINAL) > > bTerminalID 1 > > wTerminalType 0x0201 Camera Sensor > > bAssocTerminal 0 > > iTerminal 0 > > wObjectiveFocalLengthMin 0 > > wObjectiveFocalLengthMax 0 > > wOcularFocalLength 0 > > bControlSize 3 > > bmControls 0x00000000 > > VideoControl Interface Descriptor: > > bLength 9 > > bDescriptorType 36 > > bDescriptorSubtype 3 (OUTPUT_TERMINAL) > > bTerminalID 2 > > wTerminalType 0x0101 USB Streaming > > bAssocTerminal 0 > > bSourceID 1 > > iTerminal 0 > > VideoControl Interface Descriptor: > > bLength 11 > > bDescriptorType 36 > > bDescriptorSubtype 5 (PROCESSING_UNIT) > > Warning: Descriptor too short > > bUnitID 3 > > bSourceID 1 > > wMaxMultiplier 0 > > bControlSize 2 > > bmControls 0x00000000 > > iProcessing 0 > > bmVideoStandards 0x62 > > NTSC - 525/60 > > PAL - 525/60 > > Endpoint Descriptor: > > bLength 7 > > bDescriptorType 5 > > bEndpointAddress 0x81 EP 1 IN > > bmAttributes 3 > > Transfer Type Interrupt > > Synch Type None > > Usage Type Data > > wMaxPacketSize 0x0008 1x 8 bytes > > bInterval 1 > > Interface Descriptor: > > bLength 9 > > bDescriptorType 4 > > bInterfaceNumber 1 > > bAlternateSetting 0 > > bNumEndpoints 0 > > bInterfaceClass 14 Video > > bInterfaceSubClass 2 Video Streaming > > bInterfaceProtocol 0 > > iInterface 0 > > VideoStreaming Interface Descriptor: > > bLength 14 > > bDescriptorType 36 > > bDescriptorSubtype 1 (INPUT_HEADER) > > bNumFormats 1 > > wTotalLength 0x0055 > > bEndpointAddress 0x82 EP 2 IN > > bmInfo 0 > > bTerminalLink 2 > > bStillCaptureMethod 2 > > bTriggerSupport 0 > > bTriggerUsage 0 > > bControlSize 1 > > bmaControls( 0) 0 > > VideoStreaming Interface Descriptor: > > bLength 27 > > bDescriptorType 36 > > bDescriptorSubtype 4 (FORMAT_UNCOMPRESSED) > > bFormatIndex 1 > > bNumFrameDescriptors 1 > > guidFormat {e436eb7b-524f-11ce-9f53-0020af0ba770} > > bBitsPerPixel 16 > > bDefaultFrameIndex 1 > > bAspectRatioX 0 > > bAspectRatioY 0 > > bmInterlaceFlags 0x00 > > Interlaced stream or variable: No > > Fields per frame: 2 fields > > Field 1 first: No > > Field pattern: Field 1 only > > bCopyProtect 0 > > VideoStreaming Interface Descriptor: > > bLength 34 > > bDescriptorType 36 > > bDescriptorSubtype 5 (FRAME_UNCOMPRESSED) > > bFrameIndex 1 > > bmCapabilities 0x00 > > Still image unsupported > > wWidth 240 > > wHeight 322 > > dwMinBitRate 12364800 > > dwMaxBitRate 30912000 > > dwMaxVideoFrameBufferSize 154560 > > dwDefaultFrameInterval 400000 > > bFrameIntervalType 2 > > dwFrameInterval( 0) 400000 > > dwFrameInterval( 1) 1000000 > > VideoStreaming Interface Descriptor: > > bLength 10 > > bDescriptorType 36 > > bDescriptorSubtype 3 (STILL_IMAGE_FRAME) > > bEndpointAddress 0x00 EP 0 OUT > > bNumImageSizePatterns 1 > > wWidth( 0) 240 > > wHeight( 0) 322 > > bNumCompressionPatterns 0 > > Interface Descriptor: > > bLength 9 > > bDescriptorType 4 > > bInterfaceNumber 1 > > bAlternateSetting 1 > > bNumEndpoints 1 > > bInterfaceClass 14 Video > > bInterfaceSubClass 2 Video Streaming > > bInterfaceProtocol 0 > > iInterface 0 > > Endpoint Descriptor: > > bLength 7 > > bDescriptorType 5 > > bEndpointAddress 0x82 EP 2 IN > > bmAttributes 5 > > Transfer Type Isochronous > > Synch Type Asynchronous > > Usage Type Data > > wMaxPacketSize 0x0400 1x 1024 bytes > > bInterval 1 > > Device Status: 0x0001 > > Self Powered > > > > --- > > drivers/media/common/uvc.c | 4 ++++ > > include/linux/usb/uvc.h | 3 +++ > > 2 files changed, 7 insertions(+) > > > > diff --git a/drivers/media/common/uvc.c b/drivers/media/common/uvc.c > > index c54c2268f..c12d58932 100644 > > --- a/drivers/media/common/uvc.c > > +++ b/drivers/media/common/uvc.c > > @@ -96,6 +96,10 @@ static const struct uvc_format_desc uvc_fmts[] = { > > .guid = UVC_GUID_FORMAT_RGBP, > > .fcc = V4L2_PIX_FMT_RGB565, > > }, > > + { > > + .guid = UVC_GUID_FORMAT_D3DFMT_R5G6B5, > > + .fcc = V4L2_PIX_FMT_RGB565, > > + }, > > { > > .guid = UVC_GUID_FORMAT_BGR3, > > .fcc = V4L2_PIX_FMT_BGR24, > > diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h > > index 88d96095b..01c3b2f45 100644 > > --- a/include/linux/usb/uvc.h > > +++ b/include/linux/usb/uvc.h > > @@ -140,6 +140,9 @@ > > #define UVC_GUID_FORMAT_D3DFMT_L8 \ > > {0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \ > > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > > +#define UVC_GUID_FORMAT_D3DFMT_R5G6B5 \ > > + {0x7b, 0xeb, 0x36, 0xe4, 0x4f, 0x52, 0xce, 0x11, \ > > + 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70} > > #define UVC_GUID_FORMAT_KSMEDIA_L8_IR \ > > {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ > > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > > -- > > 2.45.2 > > > > > > > -- > Ricardo Ribalda
diff --git a/drivers/media/common/uvc.c b/drivers/media/common/uvc.c index c54c2268f..c12d58932 100644 --- a/drivers/media/common/uvc.c +++ b/drivers/media/common/uvc.c @@ -96,6 +96,10 @@ static const struct uvc_format_desc uvc_fmts[] = { .guid = UVC_GUID_FORMAT_RGBP, .fcc = V4L2_PIX_FMT_RGB565, }, + { + .guid = UVC_GUID_FORMAT_D3DFMT_R5G6B5, + .fcc = V4L2_PIX_FMT_RGB565, + }, { .guid = UVC_GUID_FORMAT_BGR3, .fcc = V4L2_PIX_FMT_BGR24, diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h index 88d96095b..01c3b2f45 100644 --- a/include/linux/usb/uvc.h +++ b/include/linux/usb/uvc.h @@ -140,6 +140,9 @@ #define UVC_GUID_FORMAT_D3DFMT_L8 \ {0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_D3DFMT_R5G6B5 \ + {0x7b, 0xeb, 0x36, 0xe4, 0x4f, 0x52, 0xce, 0x11, \ + 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70} #define UVC_GUID_FORMAT_KSMEDIA_L8_IR \ {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}