From nobody Thu Oct 9 16:40:43 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0B0D2DE1F6 for ; Tue, 17 Jun 2025 14:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; cv=none; b=CpzfkxwvPu+/nCcAcwxNp1WV4oh5mWxDyteuOP0gaIpvY50ent8mnoM7sUpLF4NaWrsTu6HusCY+4xWUnirRUSfLXJONIGSvz+qyQHBrMsxHD/lxAUA4d7xNM96MaDLltEJ4KWEtB1tp+Oa+CtX8D4kXoCQIraqIrdt8AmWbhiY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; c=relaxed/simple; bh=UAPmwt3iH+Cs9isdHcsBzKLNaOICZcEJlQI9RpiBp8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VdczaSBY1HRTPu0TuTMzTHVOliR5NBOF4uR29EQweTOhygaqgU+7qH/FptMdwfOu4b0y0dcJSpjd0n9d9JfNXjM7+8JjPpykaXMFDgFasnUhq+1lCIOV+3s+eVQOsXk2TO+FQKK7PWBv3suM3iGImA+PexTBsKfubc+6ZIaN4Rk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=m62iDcO9; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="m62iDcO9" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-553cf020383so526082e87.2 for ; Tue, 17 Jun 2025 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171355; x=1750776155; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zlCjqI7FmvJseGiDys0Kb0VXecdhOxVjhLPyLYz33Ng=; b=m62iDcO945c6qcvtEjrr3OlbcuEGOBafiUm4NZopLRsRu/LZyzNLa2U7Zn6emsI3Qf SU48jV/MFbeGVDqmHAqut2oCzJ1lQVIvBOmP71fEVEkpCkWTpqG5HlMx3x5RjjBrjAqu ie1/kp8kGDgA74qkF8cpwvN+7dL/rGBtcHmMw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171355; x=1750776155; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zlCjqI7FmvJseGiDys0Kb0VXecdhOxVjhLPyLYz33Ng=; b=M0J0pSCyxsXtcUwxXQf7/75YYDzBLfJSE6p4jo2eMUIvBG0W7AjKI4+xbIBpj4ZI/Y 1b8n4rrb/Uc2m93BzI9RespiPjXwzKYaEcVyeHAx+SatTB60nHyM7F5OqIkTc8x1Oh8w BjhkOEfjXuykYb7d/Z1w8uKmhVVxxutBgEGZLgc58oAofEKozkoNpWkjldaXCUrzwxpI JeiL5onvJWQ9s43JgabrfzVI03mt/1UcbxQNbKKkXWDLnF1jU40RXUQ8h/bYT7kMvME+ 9ky7YiK32Sn62kiEty0aO1rOcb+V1oHr2XbaV4hmfbQ9dMF05phiS/zBZrl+I+F4q10j Xixw== X-Forwarded-Encrypted: i=1; AJvYcCUR535H6TIYaOeJqxyDje1txJK2vsLWmDOT9H+NCvY+iz5mhF8SSW6APVYd9hGFO0nJaCm8k9owlrf2RGY=@vger.kernel.org X-Gm-Message-State: AOJu0YxTWxF4V4nLpTOhZrQG4YEVKbB64KxwOZRksWkca71WML5rM5Mb GS24tNGHTSBVve3AOBhCo1N4ChFXOhyJ4BdnKZSyc7E8WV7Pn7TISZH3fT3gl8lBHVaHvtt+6u1 sOfI= X-Gm-Gg: ASbGncv3XrDQN9VDO2sDpGXmTHQvRE/6f9jVbb7jQzyeIOulAjc/ST5gXpdHdrvSO4u SwRgen4ydE/9ZP8VX1XkN21wABDofyWnV9PVujDXpHjR6zrAUKCnQ3+aXJTRHjwwXSzCh5ZmSR1 CtuxEQGeJx07Ah1ctPOi03ulmSSz4DRT1y9Je+5O4wbtdNJpJ4U2F/JM2sW5yrP56vxLv5JLEkU vwE1G98eQXMFHCb3sC3XWEODpVujzCgYukPS4iIIMhg5cv3NuyCtAopRexaoI5WVcQcnzkJv3nv 0NwPQy+UbVJKRDowe5FQ7BO0MZpzKasqD61qhiSdivipLmgXKAiIxPF1neCnNHOSG+6qG80kpQV FikcehhMwOknrEC0Ktl/dtogdbS7/zQfPzlVh1EynrA== X-Google-Smtp-Source: AGHT+IFOa0lT9/wH7oPTGOZ5fZxCbtx/o8fZq1vWuxTWtxH1WDR/Km9QErrD0MqUbFwdVLk0JHfBOg== X-Received: by 2002:a05:6512:3b91:b0:553:2ef3:f73f with SMTP id 2adb3069b0e04-553b6e77063mr3653743e87.3.1750171354517; Tue, 17 Jun 2025 07:42:34 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:34 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:25 +0000 Subject: [PATCH v7 4/5] media: uvcvideo: Introduce V4L2_META_FMT_UVC_MSXU_1_5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-4-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The UVC driver provides two metadata types V4L2_META_FMT_UVC, and V4L2_META_FMT_D4XX. The only difference between the two of them is that V4L2_META_FMT_UVC only copies PTS, SCR, size and flags, and V4L2_META_FMT_D4XX copies the whole metadata section. Now we only enable V4L2_META_FMT_D4XX for the Intel D4xx family of devices, but it is useful to have the whole metadata payload for any device where vendors include other metadata, such as the one described by Microsoft: https://learn.microsoft.com/en-us/windows-hardware/drivers/stream/mf-captur= e-metadata This patch introduces a new format V4L2_META_FMT_UVC_MSXU_1_5, that is identical to V4L2_META_FMT_D4XX. Let the user enable this format with a quirk for now. This way they can test if their devices provide useful metadata without rebuilding the kernel. They can later contribute patches to auto-quirk their devices. We will also work in methods to auto-detect devices compatible with this new metadata format. Suggested-by: Hans de Goede Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- .../userspace-api/media/v4l/meta-formats.rst | 1 + .../media/v4l/metafmt-uvc-msxu-1-5.rst | 23 ++++++++++++++++++= ++++ MAINTAINERS | 1 + drivers/media/usb/uvc/uvc_metadata.c | 20 +++++++++++++++++-- drivers/media/usb/uvc/uvcvideo.h | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 7 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Docum= entation/userspace-api/media/v4l/meta-formats.rst index bb6876cfc271e1a0543eee4209d6251e1a6a73cc..0de80328c36bf148051a19abe9e= 5241234ddfe5c 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -20,6 +20,7 @@ These formats are used for the :ref:`metadata` interface = only. metafmt-pisp-fe metafmt-rkisp1 metafmt-uvc + metafmt-uvc-msxu-1-5 metafmt-vivid metafmt-vsp1-hgo metafmt-vsp1-hgt diff --git a/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst= b/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst new file mode 100644 index 0000000000000000000000000000000000000000..dd1c3076df243d770a13e7f6d07= c3296a269e16a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst @@ -0,0 +1,23 @@ +.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later + +.. _v4l2-meta-fmt-uvc-msxu-1-5: + +*********************************** +V4L2_META_FMT_UVC_MSXU_1_5 ('UVCM') +*********************************** + +Microsoft(R)'s UVC Payload Metadata. + + +Description +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +V4L2_META_FMT_UVC_MSXU_1_5 buffers follow the metadata buffer layout of +V4L2_META_FMT_UVC with the only difference that it includes all the UVC +metadata in the `buffer[]` field, not just the first 2-12 bytes. + +The metadata format follows the specification from Microsoft(R) [1]. + +.. _1: + +[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/stream/uvc-e= xtensions-1-5 diff --git a/MAINTAINERS b/MAINTAINERS index e8f3dc93a56921924f57e7d5a03ea2fa182a4448..87101630e528297c57b22ffc2fe= 553e3864d25cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25816,6 +25816,7 @@ S: Maintained W: http://www.ideasonboard.org/uvc/ T: git git://linuxtv.org/media.git F: Documentation/userspace-api/media/drivers/uvcvideo.rst +F: Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst F: Documentation/userspace-api/media/v4l/metafmt-uvc.rst F: drivers/media/common/uvc.c F: drivers/media/usb/uvc/ diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index bc84e849174397f41d1e20bf890a876eeb5a9c67..b09f81d907d64f7d7a3b0dc52de= 319879b7e68be 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -190,13 +190,29 @@ int uvc_meta_init(struct uvc_device *dev) static const u32 uvch_only[] =3D {V4L2_META_FMT_UVC, 0}; static const u32 d4xx_format[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_D4XX, 0}; + static const u32 all_formats[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_D4XX, + V4L2_META_FMT_UVC_MSXU_1_5, 0}; + static const u32 ms_format[] =3D {V4L2_META_FMT_UVC, + V4L2_META_FMT_UVC_MSXU_1_5, 0}; + bool support_msxu; + + support_msxu =3D dev->quirks & UVC_QUIRK_MSXU_META; =20 switch (dev->info->meta_format) { + case V4L2_META_FMT_UVC_MSXU_1_5: + dev->meta_formats =3D ms_format; + break; case V4L2_META_FMT_D4XX: - dev->meta_formats =3D d4xx_format; + if (support_msxu) + dev->meta_formats =3D all_formats; + else + dev->meta_formats =3D d4xx_format; break; case 0: - dev->meta_formats =3D uvch_only; + if (support_msxu) + dev->meta_formats =3D ms_format; + else + dev->meta_formats =3D uvch_only; break; default: dev_err(&dev->udev->dev, "Unknown metadata format 0x%x\n", diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 502f1d5608637cd28ce6f01aee31c4f5df160081..3578ce72fb6a1153ae79c244ec1= 0093e8efdd739 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -77,6 +77,7 @@ #define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 #define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 #define UVC_QUIRK_MJPEG_NO_EOF 0x00020000 +#define UVC_QUIRK_MSXU_META 0x00040000 =20 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core= /v4l2-ioctl.c index 650dc1956f73d2f1943b56c42140c7b8d757259f..ba508f7fb577021497009ab23a7= be5add23fd08c 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1459,6 +1459,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_VSP1_HGO: descr =3D "R-Car VSP1 1-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr =3D "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr =3D "UVC Payload Header Metadata"; break; + case V4L2_META_FMT_UVC_MSXU_1_5: descr =3D "UVC MSXU Metadata"; break; case V4L2_META_FMT_D4XX: descr =3D "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr =3D "Vivid Metadata"; break; case V4L2_META_FMT_RK_ISP1_PARAMS: descr =3D "Rockchip ISP1 3A Parameters= "; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 9e3b366d5fc79d8a04c6f0752858fc23363db65c..75f2096b2d4fed5e0235ea4732d= 35044ff77a98b 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -861,6 +861,7 @@ struct v4l2_pix_format { #define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car= VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC P= ayload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX = Payload Header metadata */ +#define V4L2_META_FMT_UVC_MSXU_1_5 v4l2_fourcc('U', 'V', 'C', 'M') /* UVC= MSXU metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Met= adata */ =20 /* Vendor specific - used for RK_ISP1 camera sub-system */ --=20 2.50.0.rc2.692.g299adb8693-goog