Message ID | 20201102035027.1365490-2-jesse.sung@canonical.com |
---|---|
State | New |
Headers | show |
Series | uvcvideo: add mapping for HEVC payloads | expand |
On 02.11.20 04:50, Wen-chien Jesse Sung wrote: > From: Dmitry Buzdyk <dima.buzdyk@gmail.com> > > BugLink: https://launchpad.net/bugs/1895803 > > Add HEVC GUID and assotiate with HEVC pixel format so that frame > based format descriptors recognized by the UVC video driver. > > Signed-off-by: Dmitry Buzdyk <dima.buzdyk@gmail.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > (cherry picked from commit 40b222b56ea81aa636a4aa7a84939786369e726b) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 5 +++++ > drivers/media/usb/uvc/uvcvideo.h | 4 ++++ > 2 files changed, 9 insertions(+) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 99883550375e9..00198d327f9e6 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -214,6 +214,11 @@ static struct uvc_format_desc uvc_fmts[] = { > .guid = UVC_GUID_FORMAT_CNF4, > .fcc = V4L2_PIX_FMT_CNF4, > }, > + { > + .name = "HEVC", > + .guid = UVC_GUID_FORMAT_HEVC, > + .fcc = V4L2_PIX_FMT_HEVC, > + }, > }; > > /* ------------------------------------------------------------------------ > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 24e3d8c647e77..6141465b747f3 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -165,6 +165,10 @@ > {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > > +#define UVC_GUID_FORMAT_HEVC \ > + { 'H', 'E', 'V', 'C', 0x00, 0x00, 0x10, 0x00, \ > + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > + > > /* ------------------------------------------------------------------------ > * Driver specific constants. >
Applied to groovy/master-next Thanks, Ian On 2020-11-02 11:50:27 , Wen-chien Jesse Sung wrote: > From: Dmitry Buzdyk <dima.buzdyk@gmail.com> > > BugLink: https://launchpad.net/bugs/1895803 > > Add HEVC GUID and assotiate with HEVC pixel format so that frame > based format descriptors recognized by the UVC video driver. > > Signed-off-by: Dmitry Buzdyk <dima.buzdyk@gmail.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > (cherry picked from commit 40b222b56ea81aa636a4aa7a84939786369e726b) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 5 +++++ > drivers/media/usb/uvc/uvcvideo.h | 4 ++++ > 2 files changed, 9 insertions(+) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 99883550375e9..00198d327f9e6 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -214,6 +214,11 @@ static struct uvc_format_desc uvc_fmts[] = { > .guid = UVC_GUID_FORMAT_CNF4, > .fcc = V4L2_PIX_FMT_CNF4, > }, > + { > + .name = "HEVC", > + .guid = UVC_GUID_FORMAT_HEVC, > + .fcc = V4L2_PIX_FMT_HEVC, > + }, > }; > > /* ------------------------------------------------------------------------ > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 24e3d8c647e77..6141465b747f3 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -165,6 +165,10 @@ > {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > > +#define UVC_GUID_FORMAT_HEVC \ > + { 'H', 'E', 'V', 'C', 0x00, 0x00, 0x10, 0x00, \ > + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > + > > /* ------------------------------------------------------------------------ > * Driver specific constants. > -- > 2.27.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Applied to Focal/master-next Thanks Ian On 2020-11-02 11:50:27 , Wen-chien Jesse Sung wrote: > From: Dmitry Buzdyk <dima.buzdyk@gmail.com> > > BugLink: https://launchpad.net/bugs/1895803 > > Add HEVC GUID and assotiate with HEVC pixel format so that frame > based format descriptors recognized by the UVC video driver. > > Signed-off-by: Dmitry Buzdyk <dima.buzdyk@gmail.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > (cherry picked from commit 40b222b56ea81aa636a4aa7a84939786369e726b) > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 5 +++++ > drivers/media/usb/uvc/uvcvideo.h | 4 ++++ > 2 files changed, 9 insertions(+) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 99883550375e9..00198d327f9e6 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -214,6 +214,11 @@ static struct uvc_format_desc uvc_fmts[] = { > .guid = UVC_GUID_FORMAT_CNF4, > .fcc = V4L2_PIX_FMT_CNF4, > }, > + { > + .name = "HEVC", > + .guid = UVC_GUID_FORMAT_HEVC, > + .fcc = V4L2_PIX_FMT_HEVC, > + }, > }; > > /* ------------------------------------------------------------------------ > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 24e3d8c647e77..6141465b747f3 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -165,6 +165,10 @@ > {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ > 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > > +#define UVC_GUID_FORMAT_HEVC \ > + { 'H', 'E', 'V', 'C', 0x00, 0x00, 0x10, 0x00, \ > + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} > + > > /* ------------------------------------------------------------------------ > * Driver specific constants. > -- > 2.27.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 99883550375e9..00198d327f9e6 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -214,6 +214,11 @@ static struct uvc_format_desc uvc_fmts[] = { .guid = UVC_GUID_FORMAT_CNF4, .fcc = V4L2_PIX_FMT_CNF4, }, + { + .name = "HEVC", + .guid = UVC_GUID_FORMAT_HEVC, + .fcc = V4L2_PIX_FMT_HEVC, + }, }; /* ------------------------------------------------------------------------ diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 24e3d8c647e77..6141465b747f3 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -165,6 +165,10 @@ {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_HEVC \ + { 'H', 'E', 'V', 'C', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} + /* ------------------------------------------------------------------------ * Driver specific constants.