From: Ricardo Ribalda <ribalda@chromium.org>
To: Nicolas Dufresne <nicolas@ndufresne.ca>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v3 1/3] media: v4l2-dev.c: Add Meta: to the name of metadata devices
Date: Mon, 17 Jan 2022 19:26:56 +0100 [thread overview]
Message-ID: <20220117182658.468993-2-ribalda@chromium.org> (raw)
In-Reply-To: <20220117182658.468993-1-ribalda@chromium.org>
Devices with Metadata output (like uvc), create two video devices, one
for the data itself and another one for the metadata.
Add a "Meta: " to the beginning of the device name, as suggested by Mauro,
to avoid having multiple devices with the same name.
Fixes v4l2-compliance:
Media Controller ioctls:
fail: v4l2-test-media.cpp(205): v2_entity_names_set.find(key) != v2_entity_names_set.end()
test MEDIA_IOC_G_TOPOLOGY: FAIL
fail: v4l2-test-media.cpp(394): num_data_links != num_links
test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL
Suggested-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/v4l2-core/v4l2-dev.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index d03ace324db0..98be80010702 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -901,6 +901,15 @@ int __video_register_device(struct video_device *vdev,
if (WARN_ON(type != VFL_TYPE_SUBDEV && !vdev->device_caps))
return -EINVAL;
+ /* Add Meta: to metadata device names */
+ if (vdev->device_caps &
+ (V4L2_CAP_META_CAPTURE | V4L2_CAP_META_OUTPUT)) {
+ char aux[sizeof(vdev->name)];
+
+ snprintf(aux, sizeof(aux), "Meta: %s", vdev->name);
+ strscpy(vdev->name, aux, sizeof(aux));
+ }
+
/* v4l2_fh support */
spin_lock_init(&vdev->fh_lock);
INIT_LIST_HEAD(&vdev->fh_list);
--
2.34.1.703.g22d0c6ccf7-goog
next prev parent reply other threads:[~2022-01-17 18:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 18:26 [PATCH v3 0/3] Add Meta: to Metadata devices Ricardo Ribalda
2022-01-17 18:26 ` Ricardo Ribalda [this message]
2022-01-17 18:26 ` [PATCH v3 2/3] media: Documentation/driver-api: Document device name Ricardo Ribalda
2022-01-17 18:26 ` [PATCH v3 3/3] media: uvcvideo: Add a unique suffix to camera names Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220117182658.468993-2-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=nicolas@ndufresne.ca \
--cc=sergey.senozhatsky@gmail.com \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®