* [PATCH] usb: gadget: g_webcam: Send color matching descriptor per frame
@ 2022-12-16 16:05 Daniel Scally
2022-12-18 15:55 ` Laurent Pinchart
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Scally @ 2022-12-16 16:05 UTC (permalink / raw)
To: linux-usb; +Cc: laurent.pinchart, balbi, gregkh, kieran.bingham, Daniel Scally
Currently the color matching descriptor is only sent across the wire
a single time, following the descriptors for each format and frame.
According to the UVC 1.5 Specification 3.9.2.6 ("Color Matching
Descriptors"):
"Only one instance is allowed for a given format and if present,
the Color Matching descriptor shall be placed following the Video
and Still Image Frame descriptors for that format".
Add another reference to the color matching descriptor after the
yuyv frames so that it's correctly transmitted for that format
too.
Fixes: a9914127e834 ("USB gadget: Webcam device")
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
---
drivers/usb/gadget/legacy/webcam.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index 53e38f87472b..c06dd1af7a0c 100644
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -293,6 +293,7 @@ static const struct uvc_descriptor_header * const uvc_fs_streaming_cls[] = {
(const struct uvc_descriptor_header *) &uvc_format_yuv,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
+ (const struct uvc_descriptor_header *) &uvc_color_matching,
(const struct uvc_descriptor_header *) &uvc_format_mjpg,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
@@ -305,6 +306,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
(const struct uvc_descriptor_header *) &uvc_format_yuv,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
+ (const struct uvc_descriptor_header *) &uvc_color_matching,
(const struct uvc_descriptor_header *) &uvc_format_mjpg,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
@@ -317,6 +319,7 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = {
(const struct uvc_descriptor_header *) &uvc_format_yuv,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
+ (const struct uvc_descriptor_header *) &uvc_color_matching,
(const struct uvc_descriptor_header *) &uvc_format_mjpg,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] usb: gadget: g_webcam: Send color matching descriptor per frame
2022-12-16 16:05 [PATCH] usb: gadget: g_webcam: Send color matching descriptor per frame Daniel Scally
@ 2022-12-18 15:55 ` Laurent Pinchart
2022-12-19 10:31 ` Kieran Bingham
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Pinchart @ 2022-12-18 15:55 UTC (permalink / raw)
To: Daniel Scally; +Cc: linux-usb, balbi, gregkh, kieran.bingham
Hi Dan,
Thank you for the patch.
On Fri, Dec 16, 2022 at 04:05:28PM +0000, Daniel Scally wrote:
> Currently the color matching descriptor is only sent across the wire
> a single time, following the descriptors for each format and frame.
> According to the UVC 1.5 Specification 3.9.2.6 ("Color Matching
> Descriptors"):
>
> "Only one instance is allowed for a given format and if present,
> the Color Matching descriptor shall be placed following the Video
> and Still Image Frame descriptors for that format".
>
> Add another reference to the color matching descriptor after the
> yuyv frames so that it's correctly transmitted for that format
> too.
>
> Fixes: a9914127e834 ("USB gadget: Webcam device")
> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/usb/gadget/legacy/webcam.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
> index 53e38f87472b..c06dd1af7a0c 100644
> --- a/drivers/usb/gadget/legacy/webcam.c
> +++ b/drivers/usb/gadget/legacy/webcam.c
> @@ -293,6 +293,7 @@ static const struct uvc_descriptor_header * const uvc_fs_streaming_cls[] = {
> (const struct uvc_descriptor_header *) &uvc_format_yuv,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> + (const struct uvc_descriptor_header *) &uvc_color_matching,
> (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
> @@ -305,6 +306,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
> (const struct uvc_descriptor_header *) &uvc_format_yuv,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> + (const struct uvc_descriptor_header *) &uvc_color_matching,
> (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
> @@ -317,6 +319,7 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = {
> (const struct uvc_descriptor_header *) &uvc_format_yuv,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> + (const struct uvc_descriptor_header *) &uvc_color_matching,
> (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] usb: gadget: g_webcam: Send color matching descriptor per frame
2022-12-18 15:55 ` Laurent Pinchart
@ 2022-12-19 10:31 ` Kieran Bingham
0 siblings, 0 replies; 3+ messages in thread
From: Kieran Bingham @ 2022-12-19 10:31 UTC (permalink / raw)
To: Daniel Scally, Laurent Pinchart; +Cc: linux-usb, balbi, gregkh
Quoting Laurent Pinchart (2022-12-18 15:55:44)
> Hi Dan,
>
> Thank you for the patch.
>
> On Fri, Dec 16, 2022 at 04:05:28PM +0000, Daniel Scally wrote:
> > Currently the color matching descriptor is only sent across the wire
> > a single time, following the descriptors for each format and frame.
> > According to the UVC 1.5 Specification 3.9.2.6 ("Color Matching
> > Descriptors"):
> >
> > "Only one instance is allowed for a given format and if present,
> > the Color Matching descriptor shall be placed following the Video
> > and Still Image Frame descriptors for that format".
> >
> > Add another reference to the color matching descriptor after the
> > yuyv frames so that it's correctly transmitted for that format
> > too.
> >
> > Fixes: a9914127e834 ("USB gadget: Webcam device")
> > Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
>
Oh - wow this was easier than I anticipated.
Likewise:
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> > ---
> > drivers/usb/gadget/legacy/webcam.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
> > index 53e38f87472b..c06dd1af7a0c 100644
> > --- a/drivers/usb/gadget/legacy/webcam.c
> > +++ b/drivers/usb/gadget/legacy/webcam.c
> > @@ -293,6 +293,7 @@ static const struct uvc_descriptor_header * const uvc_fs_streaming_cls[] = {
> > (const struct uvc_descriptor_header *) &uvc_format_yuv,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> > + (const struct uvc_descriptor_header *) &uvc_color_matching,
> > (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
> > @@ -305,6 +306,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
> > (const struct uvc_descriptor_header *) &uvc_format_yuv,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> > + (const struct uvc_descriptor_header *) &uvc_color_matching,
> > (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
> > @@ -317,6 +319,7 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = {
> > (const struct uvc_descriptor_header *) &uvc_format_yuv,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,
> > + (const struct uvc_descriptor_header *) &uvc_color_matching,
> > (const struct uvc_descriptor_header *) &uvc_format_mjpg,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,
> > (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
>
> --
> Regards,
>
> Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-19 10:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-16 16:05 [PATCH] usb: gadget: g_webcam: Send color matching descriptor per frame Daniel Scally
2022-12-18 15:55 ` Laurent Pinchart
2022-12-19 10:31 ` Kieran Bingham
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.