From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 2E4E0271443 for ; Mon, 7 Jul 2025 18:34:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751913248; cv=none; b=UFIWOMvA2fm9vz/iTsS6hIpFUDhU8uhpUEj1ziIogjg4Qdphyr1rt2Hh6Aezeu3J8IY1nJg8aQR7Zez3nzrgBzvFnN/4HqocpgxeVcIRsL3D1ahfP6UzlJziyc8KFNjFVaCY1ZVQWZPuCtixqG7SaD6yy86rnIXNauLPU6eQKa4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751913248; c=relaxed/simple; bh=XTTO2GlL2rwzrs5D9X0KqylT3melKL3EVpcGuIGiKrk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=usspkSKpXnBs8Y6rJEoKjitpfN+nTZpbjkiOvUFXwYwuJcdJGqn2L/VWTMAKthLZ8d11tJCOZpNfuvu3F6RIVaLtTtpk8fgmA0p3wTjFCJ4O1MGADJAkaetukhsV/eopo+fMzjI+sO7RnMpEQorFNwLfa5QDvKcFV5kpcuPw4og= 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=IeB6u0k7; arc=none smtp.client-ip=209.85.167.44 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="IeB6u0k7" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-553be4d2fbfso3858529e87.0 for ; Mon, 07 Jul 2025 11:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1751913244; x=1752518044; 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=Yz8301aMK4jTXSvQ1f1sAIMmy3TqXQCCdC9cQDPE4Kk=; b=IeB6u0k75k35RiwALC9LWWkINXmi4IoU2zYGjIzljxwz2c5Nr3unq968YLkS7cRQ80 XKJvINPXZAo+ks/DFk+rLEb/7nzuPFUP+Z5uCU5Fb6FmEIiWicNoMau4OS9sx1TENUhz THj21WgzYznrMH4FDjumEYlwyfNI2n1FGs8o4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751913244; x=1752518044; 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=Yz8301aMK4jTXSvQ1f1sAIMmy3TqXQCCdC9cQDPE4Kk=; b=xKHgUhSW+vVF4WkqXpd7QXyFzr22OZJjCibysTcS2Q4xuskVWi9j+0ZJOXpmye3iV5 ZLioS3rkptFeuZx3dWEFMGVaYU0sVx0+WK6usIUIcBMIOouYNz5Dip+EdQFDA+WVh/nL PmGCyVVOkniC2zOcz98YwTejyoos9xGruky3gZ8HmmotQApPJHOWql6Z1JdFdtBZD41D snCOScrwb8jVAABXueon6MBXmyVjuLrsC0g49cTUMU3lQI/xquzd1lxMRC/Rz3Iltvt+ AP17x2TtLEf2q7aRmFA1Q3kUG1voT0oOwo6PPVRX2fjKPVGth2US1/vpn5/UsfLwkFMO Lixw== X-Forwarded-Encrypted: i=1; AJvYcCUs2J8RZjKbOKa77xwQe68Sni82pxiL/Bk11zPc1k6wJjryTmk9ddZhHT5YbUrizoHorYxKmo6ErTk=@vger.kernel.org X-Gm-Message-State: AOJu0YwEhfmZmVO782UY8GuClyCdNEK5VMf+NlKqOT17WMWjl2KJ/9ie 2Z16t/MMYsWedlOWMP4PwpUixcHp2ktEQy+Na8WRfpE8/wjRVhdNCdDtvdlnN0LVIA== X-Gm-Gg: ASbGnctfx1COFFVLbINO+HTdpcD7tYfERY9Plv8oPfL9GS7Kyedfolq3servoNrPMfz +jB2IgM9ZJPlY5mDW/IWa0+K662WrGyRXVr2+dHgpaOHMdui2H89hxK2Gt7UQlMYHhNDBvxOGVo bqRqtSUqG19ts/g7otnvBbTF21b56EHoHtbx6yvZzCYkfWIMyCkwtWkCMK8KZV622eNfis1Pi2e IyhYo373FUEmyfBzTrL8AJVXqE/vUn40IJiEJHosnt7E/ucoP7l1zwAys/gA2U6GVwIETnwE6Ol pklihCdfyFglUV6XaEiMe4Z5YfEfkksdhyCUD6KT/MnXbEcClh5TOfY/F5fzGCMOxCuC5mKIkWP LZ6LhPLYim4JKW8pdjK+X7o/GTJWb1uOBVVx++khSmA== X-Google-Smtp-Source: AGHT+IGfWfOKT1mPFOAlQpBieTmRp9vWA29ON5ogRlHpx2VgDwJFdP5LHFEKMr/R8mVBYkECy0syNg== X-Received: by 2002:a05:6512:3081:b0:556:2764:d20b with SMTP id 2adb3069b0e04-557a19df4ebmr4253285e87.19.1751913243937; Mon, 07 Jul 2025 11:34:03 -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-556383d31a6sm1417630e87.61.2025.07.07.11.34.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jul 2025 11:34:03 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 07 Jul 2025 18:34:03 +0000 Subject: [PATCH v8 3/5] media: uvcvideo: Introduce dev->meta_formats Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250707-uvc-meta-v8-3-ed17f8b1218b@chromium.org> References: <20250707-uvc-meta-v8-0-ed17f8b1218b@chromium.org> In-Reply-To: <20250707-uvc-meta-v8-0-ed17f8b1218b@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 Right now, there driver supports devices with one or two metadata formats. Prepare it to support more than two metadata formats. This is achieved with the introduction of a new field `meta_formats`, that contains the array of metadata formats supported by the device, in the order expected by userspace. Suggested-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 2 ++ drivers/media/usb/uvc/uvc_metadata.c | 38 +++++++++++++++++++++++++++++------- drivers/media/usb/uvc/uvcvideo.h | 6 ++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 62eb45435d8bec5c955720ecb46fb8936871e6cc..56ea20eeb7b9d5d92f3d837c15bdf11d536e9f2d 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2315,6 +2315,8 @@ static int uvc_probe(struct usb_interface *intf, goto error; } + uvc_meta_init(dev); + if (dev->quirks & UVC_QUIRK_NO_RESET_RESUME) udev->quirks &= ~USB_QUIRK_RESET_RESUME; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c index 82de7781f5b6b70c5ba16bcba9e0741231231904..4bcbc22f47e67c52baf6e133f240131ff3d32a03 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -64,14 +64,20 @@ static int uvc_meta_v4l2_try_format(struct file *file, void *fh, struct uvc_device *dev = stream->dev; struct v4l2_meta_format *fmt = &format->fmt.meta; u32 fmeta = fmt->dataformat; + u32 i; if (format->type != vfh->vdev->queue->type) return -EINVAL; + for (i = 0; (fmeta != dev->meta_formats[i]) && dev->meta_formats[i]; + i++) + ; + if (!dev->meta_formats[i]) + fmeta = V4L2_META_FMT_UVC; + memset(fmt, 0, sizeof(*fmt)); - fmt->dataformat = fmeta == dev->info->meta_format - ? fmeta : V4L2_META_FMT_UVC; + fmt->dataformat = fmeta; fmt->buffersize = UVC_METADATA_BUF_SIZE; return 0; @@ -112,17 +118,21 @@ static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, struct v4l2_fh *vfh = file->private_data; struct uvc_streaming *stream = video_get_drvdata(vfh->vdev); struct uvc_device *dev = stream->dev; - u32 index = fdesc->index; + u32 i; + + if (fdesc->type != vfh->vdev->queue->type) + return -EINVAL; - if (fdesc->type != vfh->vdev->queue->type || - index > 1U || (index && !dev->info->meta_format)) + for (i = 0; (i < fdesc->index) && dev->meta_formats[i]; i++) + ; + if (!dev->meta_formats[i]) return -EINVAL; memset(fdesc, 0, sizeof(*fdesc)); fdesc->type = vfh->vdev->queue->type; - fdesc->index = index; - fdesc->pixelformat = index ? dev->info->meta_format : V4L2_META_FMT_UVC; + fdesc->index = i; + fdesc->pixelformat = dev->meta_formats[i]; return 0; } @@ -174,3 +184,17 @@ int uvc_meta_register(struct uvc_streaming *stream) V4L2_BUF_TYPE_META_CAPTURE, &uvc_meta_fops, &uvc_meta_ioctl_ops); } + +void uvc_meta_init(struct uvc_device *dev) +{ + unsigned int i = 0; + + dev->meta_formats[i++] = V4L2_META_FMT_UVC; + + if (dev->info->meta_format && + !WARN_ON(dev->info->meta_format == V4L2_META_FMT_UVC)) + dev->meta_formats[i++] = dev->info->meta_format; + + /* IMPORTANT: for new meta-formats update UVC_MAX_META_DATA_FORMATS. */ + dev->meta_formats[i++] = 0; +} diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 11d6e3c2ebdfbabd7bbe5722f88ff85f406d9bb6..b3c094c6591e7a71fc00e1096bcf493a83f330ad 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -572,6 +572,8 @@ struct uvc_status { }; } __packed; +#define UVC_MAX_META_DATA_FORMATS 3 + struct uvc_device { struct usb_device *udev; struct usb_interface *intf; @@ -582,6 +584,9 @@ struct uvc_device { const struct uvc_device_info *info; + /* Zero-ended list of meta formats */ + u32 meta_formats[UVC_MAX_META_DATA_FORMATS + 1]; + atomic_t nmappings; /* Video control interface */ @@ -751,6 +756,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, void uvc_video_clock_update(struct uvc_streaming *stream, struct vb2_v4l2_buffer *vbuf, struct uvc_buffer *buf); +void uvc_meta_init(struct uvc_device *dev); int uvc_meta_register(struct uvc_streaming *stream); int uvc_register_video_device(struct uvc_device *dev, -- 2.50.0.727.gbf7dc18ff4-goog