Hi Christoph,
(Philipp, there's a question for you at the end)
On Thursday, 16 August 2018 15:48:15 EEST Christoph Fritz wrote:
> > On Wednesday, 21 February 2018 23:24:36 EEST Laurent Pinchart wrote:
> >> On Wednesday, 21 February 2018 22:42:45 EET Christoph Fritz wrote:
> >>>>> drivers/media/usb/uvc/uvc_driver.c | 16 ++++++++++++++++
> >>>>> drivers/media/usb/uvc/uvcvideo.h | 1 +
> >>>>> 2 files changed, 17 insertions(+)
> >>>>>
> >>>>> diff --git a/drivers/media/usb/uvc/uvc_driver.c
> >>>>> b/drivers/media/usb/uvc/uvc_driver.c index cde43b6..8bfa40b 100644
> >>>>> --- a/drivers/media/usb/uvc/uvc_driver.c
> >>>>> +++ b/drivers/media/usb/uvc/uvc_driver.c
> >>>>> @@ -406,6 +406,13 @@ static int uvc_parse_format(struct uvc_device
> >>>>> *dev,
> >>>>> width_multiplier = 2;
> >>>>> }
> >>>>> }
> >>>>> + if (dev->quirks & UVC_QUIRK_FORCE_GBRG) {
> >>>>> + if (format->fcc == V4L2_PIX_FMT_SGRBG8) {
> >>>>> + strlcpy(format->name, "GBRG Bayer (GBRG)",
> >>>>> + sizeof(format->name));
> >>>>> + format->fcc = V4L2_PIX_FMT_SGBRG8;
> >>>>> + }
> >>>>> + }
> >>>>>
> >>>>> if (buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED) {
> >>>>> ftype = UVC_VS_FRAME_UNCOMPRESSED;
> >>>>> @@ -2631,6 +2638,15 @@ static struct usb_device_id uvc_ids[] = {
> >>>>> .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
> >>>>> .bInterfaceSubClass = 1,
> >>>>> .bInterfaceProtocol = 0 },
> >>>>> + /* PHYTEC CAM 004H cameras */
> >>>>> + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
> >>>>> + | USB_DEVICE_ID_MATCH_INT_INFO,
> >>>>> + .idVendor = 0x199e,
> >>>>> + .idProduct = 0x8302,
> >>>>> + .bInterfaceClass = USB_CLASS_VIDEO,
> >>>>> + .bInterfaceSubClass = 1,
> >>>>> + .bInterfaceProtocol = 0,
> >>>>> + .driver_info = UVC_QUIRK_FORCE_GBRG },
> >>>>> /* Bodelin ProScopeHR */
> >>>>> { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
> >>>>> | USB_DEVICE_ID_MATCH_DEV_HI
> >>>>> diff --git a/drivers/media/usb/uvc/uvcvideo.h
> >>>>> b/drivers/media/usb/uvc/uvcvideo.h index 7e4d3ee..ad51002 100644
> >>>>> --- a/drivers/media/usb/uvc/uvcvideo.h
> >>>>> +++ b/drivers/media/usb/uvc/uvcvideo.h
> >>>>> @@ -164,6 +164,7 @@
> >>>>> #define UVC_QUIRK_RESTRICT_FRAME_RATE 0x00000200
> >>>>> #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400
> >>>>> #define UVC_QUIRK_FORCE_Y8 0x00000800
> >>>>> +#define UVC_QUIRK_FORCE_GBRG 0x00001000
> >>>>
> >>>> I don't think we should add a quirk flag for every format that needs
> >>>> to be forced. Instead, now that we have a new way to store per-device
> >>>> parameters since commit 3bc85817d798 ("media: uvcvideo: Add
> >>>> extensible device information"), how about making use of it and adding
> >>>> a field to the uvc_device_info structure to store the forced format ?
>
> you mean something like:
>
> struct uvc_device_info {
> u32 quirks;
> + u32 forced_color_format;
> u32 meta_format;
> };
>
> and
>
> +static const struct uvc_device_info uvc_forced_color_sgbrg8 = {
> + .forced_color_format = V4L2_PIX_FMT_SGBRG8,
> +};
>
> and
>
> @@ -2817,7 +2820,7 @@ static const struct usb_device_id uvc_ids[] = {
> .bInterfaceClass = USB_CLASS_VENDOR_SPEC,
> .bInterfaceSubClass = 1,
> .bInterfaceProtocol = 0,
> - .driver_info = (kernel_ulong_t)&uvc_quirk_force_y8 },
> + .driver_info = (kernel_ulong_t)&uvc_forced_color_y8 },
>
> ?
With an additional
static const struct uvc_device_info uvc_forced_color_y8 = {
.forced_color_format = V4L2_PIX_FMT_GREY,
};
> If yes:
>
> - there would be a need for forced_color_format in struct uvc_device
Why so ?
> - module-parameter quirk would not test force color format any more
> - the actual force/quirk changes not only format->fcc:
>
> if (dev->forced_color_format == V4L2_PIX_FMT_SGBRG8) {
The test should be if (dev->forced_color_format) to cover both the Y8 and
SGBRG8 cases.
> strlcpy(format->name, "Greyscale 8-bit (Y8 )",
> sizeof(format->name));
You can get the name from the uvc_fmts entry corresponding to dev-
>forced_color_format.
> format->fcc = dev->forced_color_format;
> format->bpp = 8;
> width_multiplier = 2;
bpp and multiplier are more annoying. bpp is a property of the format, which
we could add to the uvc_fmts array.
I believe the multiplier could be computed by device bpp / bpp from uvc_fmts.
That would work at least for the Oculus VR Positional Tracker DK2, but I don't
have the Oculus VR Rift Sensor descriptors to check that. Philipp, if you
still have access to the device, could you send that to me ?
> }
>
> Is this the way you want me to go?
--
Regards,
Laurent Pinchart
