From nobody Sun Sep 22 06:30:58 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC51AC433FE for ; Tue, 29 Mar 2022 07:14:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233315AbiC2HQO (ORCPT ); Tue, 29 Mar 2022 03:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231810AbiC2HQK (ORCPT ); Tue, 29 Mar 2022 03:16:10 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1331643D; Tue, 29 Mar 2022 00:14:26 -0700 (PDT) X-UUID: bab05eca53e8443eb46a1ca4b387a162-20220329 X-UUID: bab05eca53e8443eb46a1ca4b387a162-20220329 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 106659811; Tue, 29 Mar 2022 15:14:18 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 29 Mar 2022 15:14:17 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 29 Mar 2022 15:14:17 +0800 From: James_Lin To: CC: Laurent Pinchart , "Mauro Carvalho Chehab" , Matthias Brugger , "Hans Verkuil" , Ezequiel Garcia , Arnd Bergmann , "Ricardo Ribalda" , Sergey Senozhatsky , Ming Qian , Sakari Ailus , , , , , , James_Lin Subject: [PATCH] Signed-off-by: James_Lin Date: Tue, 29 Mar 2022 15:14:07 +0800 Message-ID: <20220329071407.17703-1-Ping-lei.Lin@mediatek.com> X-Mailer: git-send-email 2.18.0 Description: Add H265, cause some camera use it instead of hevc Signed-off-by: James_Lin MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index dda0f0aa78b8..ebb807c33e57 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -154,6 +154,11 @@ static struct uvc_format_desc uvc_fmts[] =3D { .guid =3D UVC_GUID_FORMAT_H264, .fcc =3D V4L2_PIX_FMT_H264, }, + { + .name =3D "H.265", + .guid =3D UVC_GUID_FORMAT_H265, + .fcc =3D V4L2_PIX_FMT_H265, + }, { .name =3D "Greyscale 8 L/R (Y8I)", .guid =3D UVC_GUID_FORMAT_Y8I, diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 143230b3275b..41f4d8c33f2a 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -139,6 +139,9 @@ #define UVC_GUID_FORMAT_H264 \ { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_H265 \ + { 'H', '2', '6', '5', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} #define UVC_GUID_FORMAT_Y8I \ { 'Y', '8', 'I', ' ', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core= /v4l2-ioctl.c index 96e307fe3aab..aeaeb29307a4 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1402,6 +1402,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_JPEG: descr =3D "JFIF JPEG"; break; case V4L2_PIX_FMT_DV: descr =3D "1394"; break; case V4L2_PIX_FMT_MPEG: descr =3D "MPEG-1/2/4"; break; + case V4L2_PIX_FMT_H265: descr =3D "H.265"; break; case V4L2_PIX_FMT_H264: descr =3D "H.264"; break; case V4L2_PIX_FMT_H264_NO_SC: descr =3D "H.264 (No Start Codes)"; break; case V4L2_PIX_FMT_H264_MVC: descr =3D "H.264 MVC"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 3768a0a80830..636e4236bfb8 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -691,6 +691,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_JPEG v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG= */ #define V4L2_PIX_FMT_DV v4l2_fourcc('d', 'v', 's', 'd') /* 1394 = */ #define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/= 4 Multiplexed */ +#define V4L2_PIX_FMT_H265 v4l2_fourcc('H', '2', '6', '5') /* H265 with= start codes */ #define V4L2_PIX_FMT_H264 v4l2_fourcc('H', '2', '6', '4') /* H264 with= start codes */ #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 wi= thout start codes */ #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC = */ --=20 2.18.0