mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: make bus_info compliant

Browse source 
It needs to start with something accepted by the compiance test.
This commit is contained in:
Wim Taymans 2022-11-03 17:35:48 +01:00
parent 2c4b574b8f
commit 9aff5dfc8f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pipewire-v4l2/src/pipewire-v4l2.c
View file

@ -831,7 +831,12 @@ static int vidioc_querycap(struct file *file, struct v4l2_capability *arg)
{ {
int res = 0; int res = 0;
const char *str = NULL; const char *str = NULL;
struct pw_node_info *info = file->node ? file->node->info : NULL; struct pw_node_info *info;
if (file->node == NULL)
return -EIO;
info = file->node->info;
if (info != NULL && info->props != NULL) { if (info != NULL && info->props != NULL) {
str = spa_dict_lookup(info->props, PW_KEY_NODE_DESCRIPTION); str = spa_dict_lookup(info->props, PW_KEY_NODE_DESCRIPTION);
@ -841,7 +846,8 @@ static int vidioc_querycap(struct file *file, struct v4l2_capability *arg)
spa_scnprintf((char*)arg->driver, sizeof(arg->driver), "%s", DEFAULT_DRIVER); spa_scnprintf((char*)arg->driver, sizeof(arg->driver), "%s", DEFAULT_DRIVER);
spa_scnprintf((char*)arg->card, sizeof(arg->card), "%s", str); spa_scnprintf((char*)arg->card, sizeof(arg->card), "%s", str);
spa_scnprintf((char*)arg->bus_info, sizeof(arg->bus_info), "%s:%d", DEFAULT_BUS_INFO, 1); spa_scnprintf((char*)arg->bus_info, sizeof(arg->bus_info), "platform:%s-%d",
DEFAULT_BUS_INFO, file->node->id);
arg->version = KERNEL_VERSION(5, 2, 0); arg->version = KERNEL_VERSION(5, 2, 0);
arg->device_caps = V4L2_CAP_VIDEO_CAPTURE arg->device_caps = V4L2_CAP_VIDEO_CAPTURE