From 1c86926435ea8e0ccb8e9d791c6b8caede242cb9 Mon Sep 17 00:00:00 2001 From: Ren Jianing Date: Wed, 8 Jul 2020 17:12:01 +0800 Subject: [PATCH] usb: gadget: uvc: support h265 format Signed-off-by: Ren Jianing Change-Id: Ifbe15ef632a5b58e45a04228537e7f653761e233 --- drivers/usb/gadget/function/uvc_v4l2.c | 1 + include/uapi/linux/videodev2.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index 099f79b65e86..93e1333bc98e 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -60,6 +60,7 @@ static struct uvc_format uvc_formats[] = { { 16, V4L2_PIX_FMT_YUYV }, { 0, V4L2_PIX_FMT_MJPEG }, { 0, V4L2_PIX_FMT_H264 }, + { 0, V4L2_PIX_FMT_H265 }, }; static int diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index dbc18149e37a..4acbbaa74242 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -650,6 +650,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 without start codes */ #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */