| Message ID | 1453133860-21571-14-git-send-email-j.anaszewski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jacek, Jacek Anaszewski wrote: > Ioctls executed on complex media devices need special handling. > For instance some ioctls need to be targeted for specific sub-devices, > depending on the media device configuration. The APIs being introduced > address such requirements. > > Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > utils/media-ctl/Makefile.am | 2 +- > utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ > utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ > 3 files changed, 453 insertions(+), 1 deletion(-) > create mode 100644 utils/media-ctl/libv4l2media_ioctl.c > create mode 100644 utils/media-ctl/libv4l2media_ioctl.h > > diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > index 3e883e0..7f18624 100644 > --- a/utils/media-ctl/Makefile.am > +++ b/utils/media-ctl/Makefile.am > @@ -1,6 +1,6 @@ > noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la > > -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h > libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > > diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c > new file mode 100644 > index 0000000..b186121 > --- /dev/null > +++ b/utils/media-ctl/libv4l2media_ioctl.c > @@ -0,0 +1,404 @@ > +/* > + * Copyright (c) 2015 Samsung Electronics Co., Ltd. > + * http://www.samsung.com > + * > + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU Lesser General Public License as published by > + * the Free Software Foundation; either version 2.1 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + */ > + > +#include <errno.h> > +#include <stdlib.h> > +#include <sys/syscall.h> > +#include <unistd.h> > + > +#include <linux/videodev2.h> > + > +#include "libv4l2media_ioctl.h" > +#include "mediactl-priv.h" > +#include "mediactl.h" > +#include "v4l2subdev.h" > + > +#define VIDIOC_CTRL(type) \ > + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ > + "VIDIOC_G_CTRL") > + > +#define VIDIOC_EXT_CTRL(type) \ > + ((type) == VIDIOC_S_EXT_CTRLS ? \ > + "VIDIOC_S_EXT_CTRLS" : \ > + ((type) == VIDIOC_G_EXT_CTRLS ? \ > + "VIDIOC_G_EXT_CTRLS" : \ > + "VIDIOC_TRY_EXT_CTRLS")) > + > +#define SYS_IOCTL(fd, cmd, arg) \ > + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) > + > + > +int media_ioctl_ctrl(struct media_device *media, int request, unsigned int request > + struct v4l2_control *arg) I wonder if it'd make sense to always use v4l2_ext_control instead. You can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. As this is a user space library, I'd probably add a function to handle S/G/TRY control each. Have you considered binding the control to a video node rather than a media device? We have many sensors on current media devices already, and e.g. exposure time control can be found in multiple sub-devices. > +{ > + struct media_entity *entity = media->pipeline; > + struct v4l2_control ctrl = *arg; > + struct v4l2_queryctrl queryctrl; > + bool ctrl_found = 0; > + int ret; > + > + /* > + * The control has to be reset to the default value > + * on all of the pipeline entities, prior setting a new > + * value. This is required in cases when the control config > + * is changed between subsequent calls to VIDIOC_S_CTRL, > + * to avoid the situation when a control is set on more > + * than one sub-device. > + */ > + if (request == VIDIOC_S_CTRL) { > + while (entity) { > + queryctrl.id = ctrl.id; > + > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, > + &queryctrl); > + if (ret < 0) { > + entity = entity->next; > + continue; > + } > + > + ctrl_found = true; > + > + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) > + break; > + > + ctrl.value = queryctrl.default_value; > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_CTRL, &ctrl); > + if (ret < 0) > + return -EINVAL; > + > + entity = entity->next; > + } > + > + ctrl.value = arg->value; > + } > + > + if (!ctrl_found) { > + ret = -EINVAL; > + goto exit; > + } > + > + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl.id); > + > + if (entity) { > + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); > + } else { > + /* Walk the pipeline until the request succeeds */ > + entity = media->pipeline; > + > + ret = -ENOENT; > + > + while (entity) { > + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); > + if (!ret) > + break; > + > + entity = entity->next; > + } > + } > + > +exit: > + *arg = ctrl; > + > + media_dbg(media, "%s [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", > + VIDIOC_CTRL(request), ctrl.id, ret ? NULL : queryctrl.name, > + entity ? entity->info.name : NULL, ret); > + > + return ret; > +} > + > +static int media_ioctl_single_ext_ctrl(struct media_device *media, > + int request, struct v4l2_ext_controls *arg) > +{ > + struct media_entity *entity = media->pipeline; > + struct v4l2_ext_controls ctrls = *arg; > + struct v4l2_ext_control *ctrl; > + struct v4l2_query_ext_ctrl queryctrl; > + bool ctrl_found = 0; > + int ret = -EINVAL; > + > + ctrl = &ctrls.controls[0]; > + > + /* > + * The control has to be reset to the default value > + * on all of the pipeline entities, prior setting a new > + * value. This is required in cases when the control config > + * is changed between subsequent calls to VIDIOC_S_EXT_CTRLS, > + * to avoid the situation when a control is set on more > + * than one sub-device. > + */ > + if (request == VIDIOC_S_EXT_CTRLS) { > + while (entity) { > + queryctrl.id = ctrl->id; > + > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, > + &queryctrl); > + if (ret < 0) { > + entity = entity->next; > + continue; > + } > + > + ctrl_found = true; > + > + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) > + break; > + > + ctrl->value64 = queryctrl.default_value; > + > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_EXT_CTRLS, > + &ctrls); > + if (ret < 0) > + return -EINVAL; > + > + entity = entity->next; > + } > + > + ctrl->value64 = arg->controls[0].value64; > + } > + > + if (!ctrl_found) { > + ret = -EINVAL; > + goto exit; > + } > + > + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl->id); > + > + if (entity) { > + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); > + } else { > + /* Walk the pipeline until the request succeeds */ > + entity = media->pipeline; > + > + while (entity) { > + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); > + if (!ret) > + break; > + > + entity = entity->next; > + } > + } > + > +exit: > + *arg = ctrls; > + > + media_dbg(media, "%s [id: 0x%8.8x, entity: %s] (%d)\n", > + VIDIOC_EXT_CTRL(request), ctrl->id, > + entity ? entity->info.name : NULL, ret); > + > + return ret; > +} > + > +int media_ioctl_ext_ctrl(struct media_device *media, int request, > + struct v4l2_ext_controls *arg) > +{ > + struct v4l2_ext_controls out_ctrls = *arg, ctrls = *arg; > + int ret = -EINVAL, i; > + > + ctrls.count = 1; > + > + /* > + * Split cluster to individual ioctl calls for each control > + * from the array, to make possible redirection of every > + * single control to different sub-device, according to the > + * configuration settings. > + */ > + for (i = 0; i < arg->count; ++i) { > + ctrls.controls = &arg->controls[i]; > + > + ret = media_ioctl_single_ext_ctrl(media, request, &ctrls); > + out_ctrls.controls[i] = ctrls.controls[i]; > + if (ret < 0) { > + if (ctrls.error_idx == 1) > + out_ctrls.error_idx = ctrls.count; > + else > + out_ctrls.error_idx = i; > + break; > + } > + } > + > + *arg = out_ctrls; > + return ret; > +} > + > +int sort_ctrls(const void * a, const void * b) > +{ > + const struct media_entity_to_cid *ctrl_a = a, *ctrl_b = b; > + > + return ctrl_a->queryctrl.id - ctrl_b->queryctrl.id; > +} > + > +int media_ioctl_queryctrl(struct media_device *media, > + struct v4l2_queryctrl *arg) > +{ > + struct media_entity *entity = media->pipeline, *target_entity; > + struct v4l2_queryctrl queryctrl = *arg; > + int ret = -EINVAL, num_ctrls = 0; > + struct media_entity_to_cid *ctrls_found; > + > + /* > + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to > + * be found is the one with the next lowest id among all entities > + * in the pipeline. > + */ > + if (queryctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { > + ctrls_found = malloc(sizeof(*ctrls_found)); > + > + while (entity) { > + queryctrl = *arg; > + > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, > + &queryctrl); > + if (!ret) { > + ctrls_found = realloc(ctrls_found, > + sizeof(*ctrls_found) * (num_ctrls + 1)); > + ctrls_found[num_ctrls].queryctrl = queryctrl; > + ctrls_found[num_ctrls].entity = entity; > + ++num_ctrls; > + } > + > + entity = entity->next; > + } > + > + if (num_ctrls == 0) { > + ret = -EINVAL; > + entity = NULL; > + goto done; > + } > + > + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); > + > + queryctrl = ctrls_found[0].queryctrl; > + target_entity = ctrls_found[0].entity; > + > + free(ctrls_found); > + } > + > + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, queryctrl.id); > + if (entity) > + target_entity = entity; > + > + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, > + &queryctrl); > + > +done: > + media_dbg(media, > + "VIDIOC_QUERYCTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", > + ret ? arg->id : queryctrl.id, ret ? NULL : queryctrl.name, > + target_entity ? target_entity->info.name : NULL, ret); > + > + *arg = queryctrl; > + > + return ret; > +} > + > +int media_ioctl_query_ext_ctrl(struct media_device *media, > + struct v4l2_query_ext_ctrl *arg) > +{ > + struct media_entity *entity = media->pipeline, *target_entity; > + struct v4l2_query_ext_ctrl query_ext_ctrl = *arg; > + int ret = -EINVAL, num_ctrls = 0; > + struct media_entity_to_cid *ctrls_found; > + > + /* > + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to > + * be found is the one with the next lowest id among all entities > + * in the pipeline. > + */ > + if (query_ext_ctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { > + ctrls_found = malloc(sizeof(*ctrls_found)); > + > + while (entity) { > + query_ext_ctrl = *arg; > + > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, > + &query_ext_ctrl.id); > + if (!ret) { > + ctrls_found = realloc(ctrls_found, > + sizeof(*ctrls_found) * (num_ctrls + 1)); > + ctrls_found[num_ctrls].query_ext_ctrl = > + query_ext_ctrl; > + ctrls_found[num_ctrls].entity = entity; > + ++num_ctrls; > + } > + > + entity = entity->next; > + } > + > + if (num_ctrls == 0) { > + ret = -EINVAL; > + entity = NULL; > + goto done; > + } > + > + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); > + > + query_ext_ctrl = ctrls_found[0].query_ext_ctrl; > + target_entity = ctrls_found[0].entity; > + > + free(ctrls_found); > + } > + > + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, query_ext_ctrl.id); > + if (entity) > + target_entity = entity; > + > + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, > + &query_ext_ctrl); > + > +done: > + media_dbg(media, > + "VIDIOC_QUERY_EXT_CTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", > + ret ? arg->id : query_ext_ctrl.id, > + ret ? NULL : query_ext_ctrl.name, > + target_entity ? target_entity->info.name : NULL, ret); > + > + *arg = query_ext_ctrl; > + > + return ret; > +} > + > +int media_ioctl_querymenu(struct media_device *media, > + struct v4l2_querymenu *arg) > +{ > + struct media_entity *entity = media->pipeline; > + struct v4l2_querymenu querymenu = *arg; > + int ret = -EINVAL; > + > + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, querymenu.id); > + if (entity) { > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); > + goto exit; > + } > + > + entity = media->pipeline; > + > + while (entity) { > + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); > + if (!ret) > + break; > + > + entity = entity->next; > + } > + > +exit: > + *arg = querymenu; > + > + media_dbg(media, "VIDIOC_QUERYMENU [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", > + querymenu.id, ret ? NULL : querymenu.name, > + entity ? entity->info.name : NULL, ret); > + > + return ret; > +} > diff --git a/utils/media-ctl/libv4l2media_ioctl.h b/utils/media-ctl/libv4l2media_ioctl.h > new file mode 100644 > index 0000000..5501895 > --- /dev/null > +++ b/utils/media-ctl/libv4l2media_ioctl.h > @@ -0,0 +1,48 @@ > +/* > + * Copyright (c) 2015 Samsung Electronics Co., Ltd. > + * http://www.samsung.com > + * > + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU Lesser General Public License as published by > + * the Free Software Foundation; either version 2.1 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + */ > + > +#ifndef __LIBV4L2MEDIA_IOCTL_H > +#define __LIBV4L2MEDIA_IOCTL_H > + > +#include <linux/videodev2.h> > + > +struct media_device; > + > +struct media_entity_to_cid { > + struct media_entity *entity; > + union { > + struct v4l2_queryctrl queryctrl; > + struct v4l2_query_ext_ctrl query_ext_ctrl; > + }; > +}; > + > +int media_ioctl_ctrl(struct media_device *media, int request, > + struct v4l2_control *arg); > + > +int media_ioctl_ext_ctrl(struct media_device *media, int request, > + struct v4l2_ext_controls *arg); > + > +int media_ioctl_queryctrl(struct media_device *media, > + struct v4l2_queryctrl *arg); > + > +int media_ioctl_query_ext_ctrl(struct media_device *media, > + struct v4l2_query_ext_ctrl *arg); > + > +int media_ioctl_querymenu(struct media_device *media, > + struct v4l2_querymenu *arg); > + > +#endif /* __LIBV4L2MEDIA_IOCTL_H */ >
Hi Sakari, Thanks for the review. On 02/15/2016 01:41 PM, Sakari Ailus wrote: > Hi Jacek, > > Jacek Anaszewski wrote: >> Ioctls executed on complex media devices need special handling. >> For instance some ioctls need to be targeted for specific sub-devices, >> depending on the media device configuration. The APIs being introduced >> address such requirements. >> >> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> utils/media-ctl/Makefile.am | 2 +- >> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ >> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ >> 3 files changed, 453 insertions(+), 1 deletion(-) >> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c >> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h >> >> diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am >> index 3e883e0..7f18624 100644 >> --- a/utils/media-ctl/Makefile.am >> +++ b/utils/media-ctl/Makefile.am >> @@ -1,6 +1,6 @@ >> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la >> >> -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h >> +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h >> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) >> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) >> >> diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c >> new file mode 100644 >> index 0000000..b186121 >> --- /dev/null >> +++ b/utils/media-ctl/libv4l2media_ioctl.c >> @@ -0,0 +1,404 @@ >> +/* >> + * Copyright (c) 2015 Samsung Electronics Co., Ltd. >> + * http://www.samsung.com >> + * >> + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU Lesser General Public License as published by >> + * the Free Software Foundation; either version 2.1 of the License, or >> + * (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * Lesser General Public License for more details. >> + */ >> + >> +#include <errno.h> >> +#include <stdlib.h> >> +#include <sys/syscall.h> >> +#include <unistd.h> >> + >> +#include <linux/videodev2.h> >> + >> +#include "libv4l2media_ioctl.h" >> +#include "mediactl-priv.h" >> +#include "mediactl.h" >> +#include "v4l2subdev.h" >> + >> +#define VIDIOC_CTRL(type) \ >> + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ >> + "VIDIOC_G_CTRL") >> + >> +#define VIDIOC_EXT_CTRL(type) \ >> + ((type) == VIDIOC_S_EXT_CTRLS ? \ >> + "VIDIOC_S_EXT_CTRLS" : \ >> + ((type) == VIDIOC_G_EXT_CTRLS ? \ >> + "VIDIOC_G_EXT_CTRLS" : \ >> + "VIDIOC_TRY_EXT_CTRLS")) >> + >> +#define SYS_IOCTL(fd, cmd, arg) \ >> + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) >> + >> + >> +int media_ioctl_ctrl(struct media_device *media, int request, > > unsigned int request OK. > >> + struct v4l2_control *arg) > > I wonder if it'd make sense to always use v4l2_ext_control instead. You > can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. For ext ctrls there is media_ioctl_ext_ctrl(). > As this is a user space library, I'd probably add a function to handle > S/G/TRY control each. There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. > Have you considered binding the control to a video node rather than a > media device? We have many sensors on current media devices already, and > e.g. exposure time control can be found in multiple sub-devices. Doesn't v4l2-ctrl-redir config entry address that? >> +{ >> + struct media_entity *entity = media->pipeline; >> + struct v4l2_control ctrl = *arg; >> + struct v4l2_queryctrl queryctrl; >> + bool ctrl_found = 0; >> + int ret; >> + >> + /* >> + * The control has to be reset to the default value >> + * on all of the pipeline entities, prior setting a new >> + * value. This is required in cases when the control config >> + * is changed between subsequent calls to VIDIOC_S_CTRL, >> + * to avoid the situation when a control is set on more >> + * than one sub-device. >> + */ >> + if (request == VIDIOC_S_CTRL) { >> + while (entity) { >> + queryctrl.id = ctrl.id; >> + >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, >> + &queryctrl); >> + if (ret < 0) { >> + entity = entity->next; >> + continue; >> + } >> + >> + ctrl_found = true; >> + >> + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) >> + break; >> + >> + ctrl.value = queryctrl.default_value; >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_CTRL, &ctrl); >> + if (ret < 0) >> + return -EINVAL; >> + >> + entity = entity->next; >> + } >> + >> + ctrl.value = arg->value; >> + } >> + >> + if (!ctrl_found) { >> + ret = -EINVAL; >> + goto exit; >> + } >> + >> + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl.id); >> + >> + if (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); >> + } else { >> + /* Walk the pipeline until the request succeeds */ >> + entity = media->pipeline; >> + >> + ret = -ENOENT; >> + >> + while (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); >> + if (!ret) >> + break; >> + >> + entity = entity->next; >> + } >> + } >> + >> +exit: >> + *arg = ctrl; >> + >> + media_dbg(media, "%s [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", >> + VIDIOC_CTRL(request), ctrl.id, ret ? NULL : queryctrl.name, >> + entity ? entity->info.name : NULL, ret); >> + >> + return ret; >> +} >> + >> +static int media_ioctl_single_ext_ctrl(struct media_device *media, >> + int request, struct v4l2_ext_controls *arg) >> +{ >> + struct media_entity *entity = media->pipeline; >> + struct v4l2_ext_controls ctrls = *arg; >> + struct v4l2_ext_control *ctrl; >> + struct v4l2_query_ext_ctrl queryctrl; >> + bool ctrl_found = 0; >> + int ret = -EINVAL; >> + >> + ctrl = &ctrls.controls[0]; >> + >> + /* >> + * The control has to be reset to the default value >> + * on all of the pipeline entities, prior setting a new >> + * value. This is required in cases when the control config >> + * is changed between subsequent calls to VIDIOC_S_EXT_CTRLS, >> + * to avoid the situation when a control is set on more >> + * than one sub-device. >> + */ >> + if (request == VIDIOC_S_EXT_CTRLS) { >> + while (entity) { >> + queryctrl.id = ctrl->id; >> + >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, >> + &queryctrl); >> + if (ret < 0) { >> + entity = entity->next; >> + continue; >> + } >> + >> + ctrl_found = true; >> + >> + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) >> + break; >> + >> + ctrl->value64 = queryctrl.default_value; >> + >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_EXT_CTRLS, >> + &ctrls); >> + if (ret < 0) >> + return -EINVAL; >> + >> + entity = entity->next; >> + } >> + >> + ctrl->value64 = arg->controls[0].value64; >> + } >> + >> + if (!ctrl_found) { >> + ret = -EINVAL; >> + goto exit; >> + } >> + >> + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl->id); >> + >> + if (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); >> + } else { >> + /* Walk the pipeline until the request succeeds */ >> + entity = media->pipeline; >> + >> + while (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); >> + if (!ret) >> + break; >> + >> + entity = entity->next; >> + } >> + } >> + >> +exit: >> + *arg = ctrls; >> + >> + media_dbg(media, "%s [id: 0x%8.8x, entity: %s] (%d)\n", >> + VIDIOC_EXT_CTRL(request), ctrl->id, >> + entity ? entity->info.name : NULL, ret); >> + >> + return ret; >> +} >> + >> +int media_ioctl_ext_ctrl(struct media_device *media, int request, >> + struct v4l2_ext_controls *arg) >> +{ >> + struct v4l2_ext_controls out_ctrls = *arg, ctrls = *arg; >> + int ret = -EINVAL, i; >> + >> + ctrls.count = 1; >> + >> + /* >> + * Split cluster to individual ioctl calls for each control >> + * from the array, to make possible redirection of every >> + * single control to different sub-device, according to the >> + * configuration settings. >> + */ >> + for (i = 0; i < arg->count; ++i) { >> + ctrls.controls = &arg->controls[i]; >> + >> + ret = media_ioctl_single_ext_ctrl(media, request, &ctrls); >> + out_ctrls.controls[i] = ctrls.controls[i]; >> + if (ret < 0) { >> + if (ctrls.error_idx == 1) >> + out_ctrls.error_idx = ctrls.count; >> + else >> + out_ctrls.error_idx = i; >> + break; >> + } >> + } >> + >> + *arg = out_ctrls; >> + return ret; >> +} >> + >> +int sort_ctrls(const void * a, const void * b) >> +{ >> + const struct media_entity_to_cid *ctrl_a = a, *ctrl_b = b; >> + >> + return ctrl_a->queryctrl.id - ctrl_b->queryctrl.id; >> +} >> + >> +int media_ioctl_queryctrl(struct media_device *media, >> + struct v4l2_queryctrl *arg) >> +{ >> + struct media_entity *entity = media->pipeline, *target_entity; >> + struct v4l2_queryctrl queryctrl = *arg; >> + int ret = -EINVAL, num_ctrls = 0; >> + struct media_entity_to_cid *ctrls_found; >> + >> + /* >> + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to >> + * be found is the one with the next lowest id among all entities >> + * in the pipeline. >> + */ >> + if (queryctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { >> + ctrls_found = malloc(sizeof(*ctrls_found)); >> + >> + while (entity) { >> + queryctrl = *arg; >> + >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, >> + &queryctrl); >> + if (!ret) { >> + ctrls_found = realloc(ctrls_found, >> + sizeof(*ctrls_found) * (num_ctrls + 1)); >> + ctrls_found[num_ctrls].queryctrl = queryctrl; >> + ctrls_found[num_ctrls].entity = entity; >> + ++num_ctrls; >> + } >> + >> + entity = entity->next; >> + } >> + >> + if (num_ctrls == 0) { >> + ret = -EINVAL; >> + entity = NULL; >> + goto done; >> + } >> + >> + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); >> + >> + queryctrl = ctrls_found[0].queryctrl; >> + target_entity = ctrls_found[0].entity; >> + >> + free(ctrls_found); >> + } >> + >> + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, queryctrl.id); >> + if (entity) >> + target_entity = entity; >> + >> + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, >> + &queryctrl); >> + >> +done: >> + media_dbg(media, >> + "VIDIOC_QUERYCTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", >> + ret ? arg->id : queryctrl.id, ret ? NULL : queryctrl.name, >> + target_entity ? target_entity->info.name : NULL, ret); >> + >> + *arg = queryctrl; >> + >> + return ret; >> +} >> + >> +int media_ioctl_query_ext_ctrl(struct media_device *media, >> + struct v4l2_query_ext_ctrl *arg) >> +{ >> + struct media_entity *entity = media->pipeline, *target_entity; >> + struct v4l2_query_ext_ctrl query_ext_ctrl = *arg; >> + int ret = -EINVAL, num_ctrls = 0; >> + struct media_entity_to_cid *ctrls_found; >> + >> + /* >> + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to >> + * be found is the one with the next lowest id among all entities >> + * in the pipeline. >> + */ >> + if (query_ext_ctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { >> + ctrls_found = malloc(sizeof(*ctrls_found)); >> + >> + while (entity) { >> + query_ext_ctrl = *arg; >> + >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, >> + &query_ext_ctrl.id); >> + if (!ret) { >> + ctrls_found = realloc(ctrls_found, >> + sizeof(*ctrls_found) * (num_ctrls + 1)); >> + ctrls_found[num_ctrls].query_ext_ctrl = >> + query_ext_ctrl; >> + ctrls_found[num_ctrls].entity = entity; >> + ++num_ctrls; >> + } >> + >> + entity = entity->next; >> + } >> + >> + if (num_ctrls == 0) { >> + ret = -EINVAL; >> + entity = NULL; >> + goto done; >> + } >> + >> + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); >> + >> + query_ext_ctrl = ctrls_found[0].query_ext_ctrl; >> + target_entity = ctrls_found[0].entity; >> + >> + free(ctrls_found); >> + } >> + >> + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, query_ext_ctrl.id); >> + if (entity) >> + target_entity = entity; >> + >> + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, >> + &query_ext_ctrl); >> + >> +done: >> + media_dbg(media, >> + "VIDIOC_QUERY_EXT_CTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", >> + ret ? arg->id : query_ext_ctrl.id, >> + ret ? NULL : query_ext_ctrl.name, >> + target_entity ? target_entity->info.name : NULL, ret); >> + >> + *arg = query_ext_ctrl; >> + >> + return ret; >> +} >> + >> +int media_ioctl_querymenu(struct media_device *media, >> + struct v4l2_querymenu *arg) >> +{ >> + struct media_entity *entity = media->pipeline; >> + struct v4l2_querymenu querymenu = *arg; >> + int ret = -EINVAL; >> + >> + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, querymenu.id); >> + if (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); >> + goto exit; >> + } >> + >> + entity = media->pipeline; >> + >> + while (entity) { >> + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); >> + if (!ret) >> + break; >> + >> + entity = entity->next; >> + } >> + >> +exit: >> + *arg = querymenu; >> + >> + media_dbg(media, "VIDIOC_QUERYMENU [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", >> + querymenu.id, ret ? NULL : querymenu.name, >> + entity ? entity->info.name : NULL, ret); >> + >> + return ret; >> +} >> diff --git a/utils/media-ctl/libv4l2media_ioctl.h b/utils/media-ctl/libv4l2media_ioctl.h >> new file mode 100644 >> index 0000000..5501895 >> --- /dev/null >> +++ b/utils/media-ctl/libv4l2media_ioctl.h >> @@ -0,0 +1,48 @@ >> +/* >> + * Copyright (c) 2015 Samsung Electronics Co., Ltd. >> + * http://www.samsung.com >> + * >> + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU Lesser General Public License as published by >> + * the Free Software Foundation; either version 2.1 of the License, or >> + * (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * Lesser General Public License for more details. >> + */ >> + >> +#ifndef __LIBV4L2MEDIA_IOCTL_H >> +#define __LIBV4L2MEDIA_IOCTL_H >> + >> +#include <linux/videodev2.h> >> + >> +struct media_device; >> + >> +struct media_entity_to_cid { >> + struct media_entity *entity; >> + union { >> + struct v4l2_queryctrl queryctrl; >> + struct v4l2_query_ext_ctrl query_ext_ctrl; >> + }; >> +}; >> + >> +int media_ioctl_ctrl(struct media_device *media, int request, >> + struct v4l2_control *arg); >> + >> +int media_ioctl_ext_ctrl(struct media_device *media, int request, >> + struct v4l2_ext_controls *arg); >> + >> +int media_ioctl_queryctrl(struct media_device *media, >> + struct v4l2_queryctrl *arg); >> + >> +int media_ioctl_query_ext_ctrl(struct media_device *media, >> + struct v4l2_query_ext_ctrl *arg); >> + >> +int media_ioctl_querymenu(struct media_device *media, >> + struct v4l2_querymenu *arg); >> + >> +#endif /* __LIBV4L2MEDIA_IOCTL_H */ >> > >
Hi Jacek, On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: > Hi Sakari, > > Thanks for the review. > > On 02/15/2016 01:41 PM, Sakari Ailus wrote: > >Hi Jacek, > > > >Jacek Anaszewski wrote: > >>Ioctls executed on complex media devices need special handling. > >>For instance some ioctls need to be targeted for specific sub-devices, > >>depending on the media device configuration. The APIs being introduced > >>address such requirements. > >> > >>Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > >>Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > >>--- > >> utils/media-ctl/Makefile.am | 2 +- > >> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ > >> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ > >> 3 files changed, 453 insertions(+), 1 deletion(-) > >> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c > >> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h > >> > >>diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > >>index 3e883e0..7f18624 100644 > >>--- a/utils/media-ctl/Makefile.am > >>+++ b/utils/media-ctl/Makefile.am > >>@@ -1,6 +1,6 @@ > >> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la > >> > >>-libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > >>+libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h > >> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > >> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > >> > >>diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c > >>new file mode 100644 > >>index 0000000..b186121 > >>--- /dev/null > >>+++ b/utils/media-ctl/libv4l2media_ioctl.c > >>@@ -0,0 +1,404 @@ > >>+/* > >>+ * Copyright (c) 2015 Samsung Electronics Co., Ltd. > >>+ * http://www.samsung.com > >>+ * > >>+ * Author: Jacek Anaszewski <j.anaszewski@samsung.com> > >>+ * > >>+ * This program is free software; you can redistribute it and/or modify > >>+ * it under the terms of the GNU Lesser General Public License as published by > >>+ * the Free Software Foundation; either version 2.1 of the License, or > >>+ * (at your option) any later version. > >>+ * > >>+ * This program is distributed in the hope that it will be useful, > >>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > >>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > >>+ * Lesser General Public License for more details. > >>+ */ > >>+ > >>+#include <errno.h> > >>+#include <stdlib.h> > >>+#include <sys/syscall.h> > >>+#include <unistd.h> > >>+ > >>+#include <linux/videodev2.h> > >>+ > >>+#include "libv4l2media_ioctl.h" > >>+#include "mediactl-priv.h" > >>+#include "mediactl.h" > >>+#include "v4l2subdev.h" > >>+ > >>+#define VIDIOC_CTRL(type) \ > >>+ ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ > >>+ "VIDIOC_G_CTRL") > >>+ > >>+#define VIDIOC_EXT_CTRL(type) \ > >>+ ((type) == VIDIOC_S_EXT_CTRLS ? \ > >>+ "VIDIOC_S_EXT_CTRLS" : \ > >>+ ((type) == VIDIOC_G_EXT_CTRLS ? \ > >>+ "VIDIOC_G_EXT_CTRLS" : \ > >>+ "VIDIOC_TRY_EXT_CTRLS")) > >>+ > >>+#define SYS_IOCTL(fd, cmd, arg) \ > >>+ syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) > >>+ > >>+ > >>+int media_ioctl_ctrl(struct media_device *media, int request, > > > >unsigned int request > > OK. > > > > >>+ struct v4l2_control *arg) > > > >I wonder if it'd make sense to always use v4l2_ext_control instead. You > >can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. > > This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. > For ext ctrls there is media_ioctl_ext_ctrl(). Is there any reason not to use extended control always? In other words, do we have a driver that does support Media controller but does not support extended controls? > >As this is a user space library, I'd probably add a function to handle > >S/G/TRY control each. > > There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, > VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. > > >Have you considered binding the control to a video node rather than a > >media device? We have many sensors on current media devices already, and > >e.g. exposure time control can be found in multiple sub-devices. > > Doesn't v4l2-ctrl-redir config entry address that? How does it work if you have, say, two video nodes where you can capture images from a different sensor? I.e. your media graph could look like this: sensor0 -> CSI-2 0 -> video0 sensor1 -> CSI-2 1 -> video1
Hi Sakari, On 02/18/2016 01:09 PM, Sakari Ailus wrote: > Hi Jacek, > > On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: >> Hi Sakari, >> >> Thanks for the review. >> >> On 02/15/2016 01:41 PM, Sakari Ailus wrote: >>> Hi Jacek, >>> >>> Jacek Anaszewski wrote: >>>> Ioctls executed on complex media devices need special handling. >>>> For instance some ioctls need to be targeted for specific sub-devices, >>>> depending on the media device configuration. The APIs being introduced >>>> address such requirements. >>>> >>>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >>>> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >>>> --- >>>> utils/media-ctl/Makefile.am | 2 +- >>>> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ >>>> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ >>>> 3 files changed, 453 insertions(+), 1 deletion(-) >>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c >>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h >>>> >>>> diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am >>>> index 3e883e0..7f18624 100644 >>>> --- a/utils/media-ctl/Makefile.am >>>> +++ b/utils/media-ctl/Makefile.am >>>> @@ -1,6 +1,6 @@ >>>> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la >>>> >>>> -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h >>>> +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h >>>> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) >>>> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) >>>> >>>> diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c >>>> new file mode 100644 >>>> index 0000000..b186121 >>>> --- /dev/null >>>> +++ b/utils/media-ctl/libv4l2media_ioctl.c >>>> @@ -0,0 +1,404 @@ >>>> +/* >>>> + * Copyright (c) 2015 Samsung Electronics Co., Ltd. >>>> + * http://www.samsung.com >>>> + * >>>> + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> >>>> + * >>>> + * This program is free software; you can redistribute it and/or modify >>>> + * it under the terms of the GNU Lesser General Public License as published by >>>> + * the Free Software Foundation; either version 2.1 of the License, or >>>> + * (at your option) any later version. >>>> + * >>>> + * This program is distributed in the hope that it will be useful, >>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>>> + * Lesser General Public License for more details. >>>> + */ >>>> + >>>> +#include <errno.h> >>>> +#include <stdlib.h> >>>> +#include <sys/syscall.h> >>>> +#include <unistd.h> >>>> + >>>> +#include <linux/videodev2.h> >>>> + >>>> +#include "libv4l2media_ioctl.h" >>>> +#include "mediactl-priv.h" >>>> +#include "mediactl.h" >>>> +#include "v4l2subdev.h" >>>> + >>>> +#define VIDIOC_CTRL(type) \ >>>> + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ >>>> + "VIDIOC_G_CTRL") >>>> + >>>> +#define VIDIOC_EXT_CTRL(type) \ >>>> + ((type) == VIDIOC_S_EXT_CTRLS ? \ >>>> + "VIDIOC_S_EXT_CTRLS" : \ >>>> + ((type) == VIDIOC_G_EXT_CTRLS ? \ >>>> + "VIDIOC_G_EXT_CTRLS" : \ >>>> + "VIDIOC_TRY_EXT_CTRLS")) >>>> + >>>> +#define SYS_IOCTL(fd, cmd, arg) \ >>>> + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) >>>> + >>>> + >>>> +int media_ioctl_ctrl(struct media_device *media, int request, >>> >>> unsigned int request >> >> OK. >> >>> >>>> + struct v4l2_control *arg) >>> >>> I wonder if it'd make sense to always use v4l2_ext_control instead. You >>> can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. >> >> This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. >> For ext ctrls there is media_ioctl_ext_ctrl(). > > Is there any reason not to use extended control always? > > In other words, do we have a driver that does support Media controller but > does not support extended controls? Shouldn't we support non-extended controls for backward compatibility reasons? I am not aware of the policy in this matter. >>> As this is a user space library, I'd probably add a function to handle >>> S/G/TRY control each. >> >> There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, >> VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. >> >>> Have you considered binding the control to a video node rather than a >>> media device? We have many sensors on current media devices already, and >>> e.g. exposure time control can be found in multiple sub-devices. >> >> Doesn't v4l2-ctrl-redir config entry address that? > > How does it work if you have, say, two video nodes where you can capture > images from a different sensor? I.e. your media graph could look like this: > > sensor0 -> CSI-2 0 -> video0 > > sensor1 -> CSI-2 1 -> video1 Exemplary config settings for this case: v4l2-ctrl-redir 0x0098091f -> "sensor0" v4l2-ctrl-redir 0x0098091f -> "sensor1" In media_ioctl_ctrl the v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl.id) is called which walks through the pipeline and checks if there has been a v4l2 control redirection defined for given entity. If no redirection is defined then the control is set on the first entity in the pipeline that supports it. Effectively, for this arrangement no redirection would be required if the control is to be set on sensors. It would be required if we wanted to bind the control to the videoN entity. Now I am wondering if I should change the entry name to v4l2-ctrl-binding, or maybe someone has better idea? BTW, are there some unique identifiers added to the entity names if more than one entity of a name is to be registered? E.g. what would happen if I had two S5C73M3 sensors in a media device? I assumed that entity names are unique.
Hi Jacek, On Thu, Feb 18, 2016 at 02:14:40PM +0100, Jacek Anaszewski wrote: > Hi Sakari, > > On 02/18/2016 01:09 PM, Sakari Ailus wrote: > >Hi Jacek, > > > >On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: > >>Hi Sakari, > >> > >>Thanks for the review. > >> > >>On 02/15/2016 01:41 PM, Sakari Ailus wrote: > >>>Hi Jacek, > >>> > >>>Jacek Anaszewski wrote: > >>>>Ioctls executed on complex media devices need special handling. > >>>>For instance some ioctls need to be targeted for specific sub-devices, > >>>>depending on the media device configuration. The APIs being introduced > >>>>address such requirements. > >>>> > >>>>Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > >>>>Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > >>>>--- > >>>> utils/media-ctl/Makefile.am | 2 +- > >>>> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ > >>>> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ > >>>> 3 files changed, 453 insertions(+), 1 deletion(-) > >>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c > >>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h > >>>> > >>>>diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > >>>>index 3e883e0..7f18624 100644 > >>>>--- a/utils/media-ctl/Makefile.am > >>>>+++ b/utils/media-ctl/Makefile.am > >>>>@@ -1,6 +1,6 @@ > >>>> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la > >>>> > >>>>-libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > >>>>+libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h > >>>> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > >>>> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > >>>> > >>>>diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c > >>>>new file mode 100644 > >>>>index 0000000..b186121 > >>>>--- /dev/null > >>>>+++ b/utils/media-ctl/libv4l2media_ioctl.c > >>>>@@ -0,0 +1,404 @@ > >>>>+/* > >>>>+ * Copyright (c) 2015 Samsung Electronics Co., Ltd. > >>>>+ * http://www.samsung.com > >>>>+ * > >>>>+ * Author: Jacek Anaszewski <j.anaszewski@samsung.com> > >>>>+ * > >>>>+ * This program is free software; you can redistribute it and/or modify > >>>>+ * it under the terms of the GNU Lesser General Public License as published by > >>>>+ * the Free Software Foundation; either version 2.1 of the License, or > >>>>+ * (at your option) any later version. > >>>>+ * > >>>>+ * This program is distributed in the hope that it will be useful, > >>>>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > >>>>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > >>>>+ * Lesser General Public License for more details. > >>>>+ */ > >>>>+ > >>>>+#include <errno.h> > >>>>+#include <stdlib.h> > >>>>+#include <sys/syscall.h> > >>>>+#include <unistd.h> > >>>>+ > >>>>+#include <linux/videodev2.h> > >>>>+ > >>>>+#include "libv4l2media_ioctl.h" > >>>>+#include "mediactl-priv.h" > >>>>+#include "mediactl.h" > >>>>+#include "v4l2subdev.h" > >>>>+ > >>>>+#define VIDIOC_CTRL(type) \ > >>>>+ ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ > >>>>+ "VIDIOC_G_CTRL") > >>>>+ > >>>>+#define VIDIOC_EXT_CTRL(type) \ > >>>>+ ((type) == VIDIOC_S_EXT_CTRLS ? \ > >>>>+ "VIDIOC_S_EXT_CTRLS" : \ > >>>>+ ((type) == VIDIOC_G_EXT_CTRLS ? \ > >>>>+ "VIDIOC_G_EXT_CTRLS" : \ > >>>>+ "VIDIOC_TRY_EXT_CTRLS")) > >>>>+ > >>>>+#define SYS_IOCTL(fd, cmd, arg) \ > >>>>+ syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) > >>>>+ > >>>>+ > >>>>+int media_ioctl_ctrl(struct media_device *media, int request, > >>> > >>>unsigned int request > >> > >>OK. > >> > >>> > >>>>+ struct v4l2_control *arg) > >>> > >>>I wonder if it'd make sense to always use v4l2_ext_control instead. You > >>>can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. > >> > >>This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. > >>For ext ctrls there is media_ioctl_ext_ctrl(). > > > >Is there any reason not to use extended control always? > > > >In other words, do we have a driver that does support Media controller but > >does not support extended controls? > > Shouldn't we support non-extended controls for backward compatibility > reasons? I am not aware of the policy in this matter. To put it bluntly, supporting the non-extended controls in this use is waste of time IMHO. > > >>>As this is a user space library, I'd probably add a function to handle > >>>S/G/TRY control each. > >> > >>There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, > >>VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. > >> > >>>Have you considered binding the control to a video node rather than a > >>>media device? We have many sensors on current media devices already, and > >>>e.g. exposure time control can be found in multiple sub-devices. > >> > >>Doesn't v4l2-ctrl-redir config entry address that? > > > >How does it work if you have, say, two video nodes where you can capture > >images from a different sensor? I.e. your media graph could look like this: > > > > sensor0 -> CSI-2 0 -> video0 > > > > sensor1 -> CSI-2 1 -> video1 > > Exemplary config settings for this case: > > v4l2-ctrl-redir 0x0098091f -> "sensor0" > v4l2-ctrl-redir 0x0098091f -> "sensor1" > > In media_ioctl_ctrl the v4l2_subdev_get_pipeline_entity_by_cid(media, > ctrl.id) is called which walks through the pipeline and checks if there > has been a v4l2 control redirection defined for given entity. That's still based on media device, not video device. Two video devices may be part of different pipelines, and a different sensor as well. Redirecting the controls should be based on a video node, not media device. > > If no redirection is defined then the control is set on the first > entity in the pipeline that supports it. Effectively, for this > arrangement no redirection would be required if the control > is to be set on sensors. It would be required if we wanted > to bind the control to the videoN entity. Now I am wondering > if I should change the entry name to v4l2-ctrl-binding, or maybe > someone has better idea? > > BTW, are there some unique identifiers added to the entity names if > more than one entity of a name is to be registered? E.g. what would > happen if I had two S5C73M3 sensors in a media device? I assumed that > entity names are unique. Yes. Currently we've got away with the problem by adding the i2c address of i2c devices to the entity name. The proper solution (there was a lengthy discussion on it ~ a year ago, too late to try to find out exactly when) would be to provide all the available information on the entity to the user space using the property API (which we don't have yet). The entity name remains unique in most situations but it's not necessarily stable.
Hi Sakari, On 03/21/2016 01:07 AM, Sakari Ailus wrote: > Hi Jacek, > > On Thu, Feb 18, 2016 at 02:14:40PM +0100, Jacek Anaszewski wrote: >> Hi Sakari, >> >> On 02/18/2016 01:09 PM, Sakari Ailus wrote: >>> Hi Jacek, >>> >>> On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: >>>> Hi Sakari, >>>> >>>> Thanks for the review. >>>> >>>> On 02/15/2016 01:41 PM, Sakari Ailus wrote: >>>>> Hi Jacek, >>>>> >>>>> Jacek Anaszewski wrote: >>>>>> Ioctls executed on complex media devices need special handling. >>>>>> For instance some ioctls need to be targeted for specific sub-devices, >>>>>> depending on the media device configuration. The APIs being introduced >>>>>> address such requirements. >>>>>> >>>>>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >>>>>> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >>>>>> --- >>>>>> utils/media-ctl/Makefile.am | 2 +- >>>>>> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ >>>>>> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ >>>>>> 3 files changed, 453 insertions(+), 1 deletion(-) >>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c >>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h >>>>>> >>>>>> diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am >>>>>> index 3e883e0..7f18624 100644 >>>>>> --- a/utils/media-ctl/Makefile.am >>>>>> +++ b/utils/media-ctl/Makefile.am >>>>>> @@ -1,6 +1,6 @@ >>>>>> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la >>>>>> >>>>>> -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h >>>>>> +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h >>>>>> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) >>>>>> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) >>>>>> >>>>>> diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c >>>>>> new file mode 100644 >>>>>> index 0000000..b186121 >>>>>> --- /dev/null >>>>>> +++ b/utils/media-ctl/libv4l2media_ioctl.c >>>>>> @@ -0,0 +1,404 @@ >>>>>> +/* >>>>>> + * Copyright (c) 2015 Samsung Electronics Co., Ltd. >>>>>> + * http://www.samsung.com >>>>>> + * >>>>>> + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> >>>>>> + * >>>>>> + * This program is free software; you can redistribute it and/or modify >>>>>> + * it under the terms of the GNU Lesser General Public License as published by >>>>>> + * the Free Software Foundation; either version 2.1 of the License, or >>>>>> + * (at your option) any later version. >>>>>> + * >>>>>> + * This program is distributed in the hope that it will be useful, >>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>>>>> + * Lesser General Public License for more details. >>>>>> + */ >>>>>> + >>>>>> +#include <errno.h> >>>>>> +#include <stdlib.h> >>>>>> +#include <sys/syscall.h> >>>>>> +#include <unistd.h> >>>>>> + >>>>>> +#include <linux/videodev2.h> >>>>>> + >>>>>> +#include "libv4l2media_ioctl.h" >>>>>> +#include "mediactl-priv.h" >>>>>> +#include "mediactl.h" >>>>>> +#include "v4l2subdev.h" >>>>>> + >>>>>> +#define VIDIOC_CTRL(type) \ >>>>>> + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ >>>>>> + "VIDIOC_G_CTRL") >>>>>> + >>>>>> +#define VIDIOC_EXT_CTRL(type) \ >>>>>> + ((type) == VIDIOC_S_EXT_CTRLS ? \ >>>>>> + "VIDIOC_S_EXT_CTRLS" : \ >>>>>> + ((type) == VIDIOC_G_EXT_CTRLS ? \ >>>>>> + "VIDIOC_G_EXT_CTRLS" : \ >>>>>> + "VIDIOC_TRY_EXT_CTRLS")) >>>>>> + >>>>>> +#define SYS_IOCTL(fd, cmd, arg) \ >>>>>> + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) >>>>>> + >>>>>> + >>>>>> +int media_ioctl_ctrl(struct media_device *media, int request, >>>>> >>>>> unsigned int request >>>> >>>> OK. >>>> >>>>> >>>>>> + struct v4l2_control *arg) >>>>> >>>>> I wonder if it'd make sense to always use v4l2_ext_control instead. You >>>>> can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. >>>> >>>> This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. >>>> For ext ctrls there is media_ioctl_ext_ctrl(). >>> >>> Is there any reason not to use extended control always? >>> >>> In other words, do we have a driver that does support Media controller but >>> does not support extended controls? >> >> Shouldn't we support non-extended controls for backward compatibility >> reasons? I am not aware of the policy in this matter. > > To put it bluntly, supporting the non-extended controls in this use is waste > of time IMHO. OK, I'll drop the non-ext controls related API then. >>>>> As this is a user space library, I'd probably add a function to handle >>>>> S/G/TRY control each. >>>> >>>> There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, >>>> VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. >>>> >>>>> Have you considered binding the control to a video node rather than a >>>>> media device? We have many sensors on current media devices already, and >>>>> e.g. exposure time control can be found in multiple sub-devices. >>>> >>>> Doesn't v4l2-ctrl-redir config entry address that? >>> >>> How does it work if you have, say, two video nodes where you can capture >>> images from a different sensor? I.e. your media graph could look like this: >>> >>> sensor0 -> CSI-2 0 -> video0 >>> >>> sensor1 -> CSI-2 1 -> video1 >> >> Exemplary config settings for this case: >> >> v4l2-ctrl-redir 0x0098091f -> "sensor0" >> v4l2-ctrl-redir 0x0098091f -> "sensor1" >> >> In media_ioctl_ctrl the v4l2_subdev_get_pipeline_entity_by_cid(media, >> ctrl.id) is called which walks through the pipeline and checks if there >> has been a v4l2 control redirection defined for given entity. > > That's still based on media device, not video device. Two video devices may > be part of different pipelines, and a different sensor as well. > > Redirecting the controls should be based on a video node, not media device. Why do you consider it as based on a media device? I'd rather say that it is based on media entity, so indirectly based on media device. Is it what you have on mind? >> >> If no redirection is defined then the control is set on the first >> entity in the pipeline that supports it. Effectively, for this >> arrangement no redirection would be required if the control >> is to be set on sensors. It would be required if we wanted >> to bind the control to the videoN entity. Now I am wondering >> if I should change the entry name to v4l2-ctrl-binding, or maybe >> someone has better idea? >> >> BTW, are there some unique identifiers added to the entity names if >> more than one entity of a name is to be registered? E.g. what would >> happen if I had two S5C73M3 sensors in a media device? I assumed that >> entity names are unique. > > Yes. Currently we've got away with the problem by adding the i2c address of > i2c devices to the entity name. The proper solution (there was a lengthy > discussion on it ~ a year ago, too late to try to find out exactly when) > would be to provide all the available information on the entity to the user > space using the property API (which we don't have yet). The entity name > remains unique in most situations but it's not necessarily stable. > I assume that the fact that they're not stable mean that we cannot rely on the entity name. Using sub-dev names and video device names seems reasonable then.
Hi Jacek, On Tue, Mar 22, 2016 at 10:36:05AM +0100, Jacek Anaszewski wrote: > Hi Sakari, > > On 03/21/2016 01:07 AM, Sakari Ailus wrote: > >Hi Jacek, > > > >On Thu, Feb 18, 2016 at 02:14:40PM +0100, Jacek Anaszewski wrote: > >>Hi Sakari, > >> > >>On 02/18/2016 01:09 PM, Sakari Ailus wrote: > >>>Hi Jacek, > >>> > >>>On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: > >>>>Hi Sakari, > >>>> > >>>>Thanks for the review. > >>>> > >>>>On 02/15/2016 01:41 PM, Sakari Ailus wrote: > >>>>>Hi Jacek, > >>>>> > >>>>>Jacek Anaszewski wrote: > >>>>>>Ioctls executed on complex media devices need special handling. > >>>>>>For instance some ioctls need to be targeted for specific sub-devices, > >>>>>>depending on the media device configuration. The APIs being introduced > >>>>>>address such requirements. > >>>>>> > >>>>>>Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> > >>>>>>Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > >>>>>>--- > >>>>>> utils/media-ctl/Makefile.am | 2 +- > >>>>>> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ > >>>>>> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ > >>>>>> 3 files changed, 453 insertions(+), 1 deletion(-) > >>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c > >>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h > >>>>>> > >>>>>>diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > >>>>>>index 3e883e0..7f18624 100644 > >>>>>>--- a/utils/media-ctl/Makefile.am > >>>>>>+++ b/utils/media-ctl/Makefile.am > >>>>>>@@ -1,6 +1,6 @@ > >>>>>> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la > >>>>>> > >>>>>>-libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > >>>>>>+libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h > >>>>>> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > >>>>>> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > >>>>>> > >>>>>>diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c > >>>>>>new file mode 100644 > >>>>>>index 0000000..b186121 > >>>>>>--- /dev/null > >>>>>>+++ b/utils/media-ctl/libv4l2media_ioctl.c > >>>>>>@@ -0,0 +1,404 @@ > >>>>>>+/* > >>>>>>+ * Copyright (c) 2015 Samsung Electronics Co., Ltd. > >>>>>>+ * http://www.samsung.com > >>>>>>+ * > >>>>>>+ * Author: Jacek Anaszewski <j.anaszewski@samsung.com> > >>>>>>+ * > >>>>>>+ * This program is free software; you can redistribute it and/or modify > >>>>>>+ * it under the terms of the GNU Lesser General Public License as published by > >>>>>>+ * the Free Software Foundation; either version 2.1 of the License, or > >>>>>>+ * (at your option) any later version. > >>>>>>+ * > >>>>>>+ * This program is distributed in the hope that it will be useful, > >>>>>>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > >>>>>>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > >>>>>>+ * Lesser General Public License for more details. > >>>>>>+ */ > >>>>>>+ > >>>>>>+#include <errno.h> > >>>>>>+#include <stdlib.h> > >>>>>>+#include <sys/syscall.h> > >>>>>>+#include <unistd.h> > >>>>>>+ > >>>>>>+#include <linux/videodev2.h> > >>>>>>+ > >>>>>>+#include "libv4l2media_ioctl.h" > >>>>>>+#include "mediactl-priv.h" > >>>>>>+#include "mediactl.h" > >>>>>>+#include "v4l2subdev.h" > >>>>>>+ > >>>>>>+#define VIDIOC_CTRL(type) \ > >>>>>>+ ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ > >>>>>>+ "VIDIOC_G_CTRL") > >>>>>>+ > >>>>>>+#define VIDIOC_EXT_CTRL(type) \ > >>>>>>+ ((type) == VIDIOC_S_EXT_CTRLS ? \ > >>>>>>+ "VIDIOC_S_EXT_CTRLS" : \ > >>>>>>+ ((type) == VIDIOC_G_EXT_CTRLS ? \ > >>>>>>+ "VIDIOC_G_EXT_CTRLS" : \ > >>>>>>+ "VIDIOC_TRY_EXT_CTRLS")) > >>>>>>+ > >>>>>>+#define SYS_IOCTL(fd, cmd, arg) \ > >>>>>>+ syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) > >>>>>>+ > >>>>>>+ > >>>>>>+int media_ioctl_ctrl(struct media_device *media, int request, > >>>>> > >>>>>unsigned int request > >>>> > >>>>OK. > >>>> > >>>>> > >>>>>>+ struct v4l2_control *arg) > >>>>> > >>>>>I wonder if it'd make sense to always use v4l2_ext_control instead. You > >>>>>can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. > >>>> > >>>>This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. > >>>>For ext ctrls there is media_ioctl_ext_ctrl(). > >>> > >>>Is there any reason not to use extended control always? > >>> > >>>In other words, do we have a driver that does support Media controller but > >>>does not support extended controls? > >> > >>Shouldn't we support non-extended controls for backward compatibility > >>reasons? I am not aware of the policy in this matter. > > > >To put it bluntly, supporting the non-extended controls in this use is waste > >of time IMHO. > > OK, I'll drop the non-ext controls related API then. > > >>>>>As this is a user space library, I'd probably add a function to handle > >>>>>S/G/TRY control each. > >>>> > >>>>There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, > >>>>VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. > >>>> > >>>>>Have you considered binding the control to a video node rather than a > >>>>>media device? We have many sensors on current media devices already, and > >>>>>e.g. exposure time control can be found in multiple sub-devices. > >>>> > >>>>Doesn't v4l2-ctrl-redir config entry address that? > >>> > >>>How does it work if you have, say, two video nodes where you can capture > >>>images from a different sensor? I.e. your media graph could look like this: > >>> > >>> sensor0 -> CSI-2 0 -> video0 > >>> > >>> sensor1 -> CSI-2 1 -> video1 > >> > >>Exemplary config settings for this case: > >> > >>v4l2-ctrl-redir 0x0098091f -> "sensor0" > >>v4l2-ctrl-redir 0x0098091f -> "sensor1" > >> > >>In media_ioctl_ctrl the v4l2_subdev_get_pipeline_entity_by_cid(media, > >>ctrl.id) is called which walks through the pipeline and checks if there > >>has been a v4l2 control redirection defined for given entity. > > > >That's still based on media device, not video device. Two video devices may > >be part of different pipelines, and a different sensor as well. > > > >Redirecting the controls should be based on a video node, not media device. > > Why do you consider it as based on a media device? I'd rather say that > it is based on media entity, so indirectly based on media device. > Is it what you have on mind? The first argument of the functions in the patch is a pointer ot the media device, not the media entity. > > >> > >>If no redirection is defined then the control is set on the first > >>entity in the pipeline that supports it. Effectively, for this > >>arrangement no redirection would be required if the control > >>is to be set on sensors. It would be required if we wanted > >>to bind the control to the videoN entity. Now I am wondering > >>if I should change the entry name to v4l2-ctrl-binding, or maybe > >>someone has better idea? > >> > >>BTW, are there some unique identifiers added to the entity names if > >>more than one entity of a name is to be registered? E.g. what would > >>happen if I had two S5C73M3 sensors in a media device? I assumed that > >>entity names are unique. > > > >Yes. Currently we've got away with the problem by adding the i2c address of > >i2c devices to the entity name. The proper solution (there was a lengthy > >discussion on it ~ a year ago, too late to try to find out exactly when) > >would be to provide all the available information on the entity to the user > >space using the property API (which we don't have yet). The entity name > >remains unique in most situations but it's not necessarily stable. > > > > I assume that the fact that they're not stable mean that we cannot rely > on the entity name. Using sub-dev names and video device names seems > reasonable then. They're even less so, unfortunately; the device nodes depend e.g. on the initialisation order an other devices. Please use the entity names, they're the best option for now. I wish I'll have some time to proceed the work on the property API. So many things to do, but so little time. :-I
On 03/23/2016 05:24 PM, Sakari Ailus wrote: > Hi Jacek, > > On Tue, Mar 22, 2016 at 10:36:05AM +0100, Jacek Anaszewski wrote: >> Hi Sakari, >> >> On 03/21/2016 01:07 AM, Sakari Ailus wrote: >>> Hi Jacek, >>> >>> On Thu, Feb 18, 2016 at 02:14:40PM +0100, Jacek Anaszewski wrote: >>>> Hi Sakari, >>>> >>>> On 02/18/2016 01:09 PM, Sakari Ailus wrote: >>>>> Hi Jacek, >>>>> >>>>> On Mon, Feb 15, 2016 at 02:06:06PM +0100, Jacek Anaszewski wrote: >>>>>> Hi Sakari, >>>>>> >>>>>> Thanks for the review. >>>>>> >>>>>> On 02/15/2016 01:41 PM, Sakari Ailus wrote: >>>>>>> Hi Jacek, >>>>>>> >>>>>>> Jacek Anaszewski wrote: >>>>>>>> Ioctls executed on complex media devices need special handling. >>>>>>>> For instance some ioctls need to be targeted for specific sub-devices, >>>>>>>> depending on the media device configuration. The APIs being introduced >>>>>>>> address such requirements. >>>>>>>> >>>>>>>> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> >>>>>>>> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >>>>>>>> --- >>>>>>>> utils/media-ctl/Makefile.am | 2 +- >>>>>>>> utils/media-ctl/libv4l2media_ioctl.c | 404 ++++++++++++++++++++++++++++++++++ >>>>>>>> utils/media-ctl/libv4l2media_ioctl.h | 48 ++++ >>>>>>>> 3 files changed, 453 insertions(+), 1 deletion(-) >>>>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.c >>>>>>>> create mode 100644 utils/media-ctl/libv4l2media_ioctl.h >>>>>>>> >>>>>>>> diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am >>>>>>>> index 3e883e0..7f18624 100644 >>>>>>>> --- a/utils/media-ctl/Makefile.am >>>>>>>> +++ b/utils/media-ctl/Makefile.am >>>>>>>> @@ -1,6 +1,6 @@ >>>>>>>> noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la >>>>>>>> >>>>>>>> -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h >>>>>>>> +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h >>>>>>>> libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) >>>>>>>> libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) >>>>>>>> >>>>>>>> diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c >>>>>>>> new file mode 100644 >>>>>>>> index 0000000..b186121 >>>>>>>> --- /dev/null >>>>>>>> +++ b/utils/media-ctl/libv4l2media_ioctl.c >>>>>>>> @@ -0,0 +1,404 @@ >>>>>>>> +/* >>>>>>>> + * Copyright (c) 2015 Samsung Electronics Co., Ltd. >>>>>>>> + * http://www.samsung.com >>>>>>>> + * >>>>>>>> + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> >>>>>>>> + * >>>>>>>> + * This program is free software; you can redistribute it and/or modify >>>>>>>> + * it under the terms of the GNU Lesser General Public License as published by >>>>>>>> + * the Free Software Foundation; either version 2.1 of the License, or >>>>>>>> + * (at your option) any later version. >>>>>>>> + * >>>>>>>> + * This program is distributed in the hope that it will be useful, >>>>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>>>>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>>>>>>> + * Lesser General Public License for more details. >>>>>>>> + */ >>>>>>>> + >>>>>>>> +#include <errno.h> >>>>>>>> +#include <stdlib.h> >>>>>>>> +#include <sys/syscall.h> >>>>>>>> +#include <unistd.h> >>>>>>>> + >>>>>>>> +#include <linux/videodev2.h> >>>>>>>> + >>>>>>>> +#include "libv4l2media_ioctl.h" >>>>>>>> +#include "mediactl-priv.h" >>>>>>>> +#include "mediactl.h" >>>>>>>> +#include "v4l2subdev.h" >>>>>>>> + >>>>>>>> +#define VIDIOC_CTRL(type) \ >>>>>>>> + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ >>>>>>>> + "VIDIOC_G_CTRL") >>>>>>>> + >>>>>>>> +#define VIDIOC_EXT_CTRL(type) \ >>>>>>>> + ((type) == VIDIOC_S_EXT_CTRLS ? \ >>>>>>>> + "VIDIOC_S_EXT_CTRLS" : \ >>>>>>>> + ((type) == VIDIOC_G_EXT_CTRLS ? \ >>>>>>>> + "VIDIOC_G_EXT_CTRLS" : \ >>>>>>>> + "VIDIOC_TRY_EXT_CTRLS")) >>>>>>>> + >>>>>>>> +#define SYS_IOCTL(fd, cmd, arg) \ >>>>>>>> + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) >>>>>>>> + >>>>>>>> + >>>>>>>> +int media_ioctl_ctrl(struct media_device *media, int request, >>>>>>> >>>>>>> unsigned int request >>>>>> >>>>>> OK. >>>>>> >>>>>>> >>>>>>>> + struct v4l2_control *arg) >>>>>>> >>>>>>> I wonder if it'd make sense to always use v4l2_ext_control instead. You >>>>>>> can't access 64-bit integer controls with VIDIOC_S_CTRL for instance. >>>>>> >>>>>> This function is meant to handle VIDIOC_S_CTRL/VIDIOC_G_CTRL ioctls. >>>>>> For ext ctrls there is media_ioctl_ext_ctrl(). >>>>> >>>>> Is there any reason not to use extended control always? >>>>> >>>>> In other words, do we have a driver that does support Media controller but >>>>> does not support extended controls? >>>> >>>> Shouldn't we support non-extended controls for backward compatibility >>>> reasons? I am not aware of the policy in this matter. >>> >>> To put it bluntly, supporting the non-extended controls in this use is waste >>> of time IMHO. >> >> OK, I'll drop the non-ext controls related API then. >> >>>>>>> As this is a user space library, I'd probably add a function to handle >>>>>>> S/G/TRY control each. >>>>>> >>>>>> There is media_ioctl_ext_ctrl() that handles VIDIOC_S_EXT_CTRLS, >>>>>> VIDIOC_G_EXT_CTRLS and VIDIOC_TRY_EXT_CTRLS. >>>>>> >>>>>>> Have you considered binding the control to a video node rather than a >>>>>>> media device? We have many sensors on current media devices already, and >>>>>>> e.g. exposure time control can be found in multiple sub-devices. >>>>>> >>>>>> Doesn't v4l2-ctrl-redir config entry address that? >>>>> >>>>> How does it work if you have, say, two video nodes where you can capture >>>>> images from a different sensor? I.e. your media graph could look like this: >>>>> >>>>> sensor0 -> CSI-2 0 -> video0 >>>>> >>>>> sensor1 -> CSI-2 1 -> video1 >>>> >>>> Exemplary config settings for this case: >>>> >>>> v4l2-ctrl-redir 0x0098091f -> "sensor0" >>>> v4l2-ctrl-redir 0x0098091f -> "sensor1" >>>> >>>> In media_ioctl_ctrl the v4l2_subdev_get_pipeline_entity_by_cid(media, >>>> ctrl.id) is called which walks through the pipeline and checks if there >>>> has been a v4l2 control redirection defined for given entity. >>> >>> That's still based on media device, not video device. Two video devices may >>> be part of different pipelines, and a different sensor as well. >>> >>> Redirecting the controls should be based on a video node, not media device. >> >> Why do you consider it as based on a media device? I'd rather say that >> it is based on media entity, so indirectly based on media device. >> Is it what you have on mind? > > The first argument of the functions in the patch is a pointer ot the media > device, not the media entity. OK, so could you precise what you mean by binding the control to video node rather to a media device? How would you see the config and the API? Maybe some config example would allow me to catch the gist of your idea. >> >>>> >>>> If no redirection is defined then the control is set on the first >>>> entity in the pipeline that supports it. Effectively, for this >>>> arrangement no redirection would be required if the control >>>> is to be set on sensors. It would be required if we wanted >>>> to bind the control to the videoN entity. Now I am wondering >>>> if I should change the entry name to v4l2-ctrl-binding, or maybe >>>> someone has better idea? >>>> >>>> BTW, are there some unique identifiers added to the entity names if >>>> more than one entity of a name is to be registered? E.g. what would >>>> happen if I had two S5C73M3 sensors in a media device? I assumed that >>>> entity names are unique. >>> >>> Yes. Currently we've got away with the problem by adding the i2c address of >>> i2c devices to the entity name. The proper solution (there was a lengthy >>> discussion on it ~ a year ago, too late to try to find out exactly when) >>> would be to provide all the available information on the entity to the user >>> space using the property API (which we don't have yet). The entity name >>> remains unique in most situations but it's not necessarily stable. >>> >> >> I assume that the fact that they're not stable mean that we cannot rely >> on the entity name. Using sub-dev names and video device names seems >> reasonable then. > > They're even less so, unfortunately; the device nodes depend e.g. on the > initialisation order an other devices. Please use the entity names, they're > the best option for now. OK. > I wish I'll have some time to proceed the work on the property API. So many > things to do, but so little time. :-I > I know that feel :-|
diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am index 3e883e0..7f18624 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediatext.la -libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h +libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libv4l2media_ioctl.c libv4l2media_ioctl.h libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) diff --git a/utils/media-ctl/libv4l2media_ioctl.c b/utils/media-ctl/libv4l2media_ioctl.c new file mode 100644 index 0000000..b186121 --- /dev/null +++ b/utils/media-ctl/libv4l2media_ioctl.c @@ -0,0 +1,404 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ + +#include <errno.h> +#include <stdlib.h> +#include <sys/syscall.h> +#include <unistd.h> + +#include <linux/videodev2.h> + +#include "libv4l2media_ioctl.h" +#include "mediactl-priv.h" +#include "mediactl.h" +#include "v4l2subdev.h" + +#define VIDIOC_CTRL(type) \ + ((type) == VIDIOC_S_CTRL ? "VIDIOC_S_CTRL" : \ + "VIDIOC_G_CTRL") + +#define VIDIOC_EXT_CTRL(type) \ + ((type) == VIDIOC_S_EXT_CTRLS ? \ + "VIDIOC_S_EXT_CTRLS" : \ + ((type) == VIDIOC_G_EXT_CTRLS ? \ + "VIDIOC_G_EXT_CTRLS" : \ + "VIDIOC_TRY_EXT_CTRLS")) + +#define SYS_IOCTL(fd, cmd, arg) \ + syscall(SYS_ioctl, (int)(fd), (unsigned long)(cmd), (void *)(arg)) + + +int media_ioctl_ctrl(struct media_device *media, int request, + struct v4l2_control *arg) +{ + struct media_entity *entity = media->pipeline; + struct v4l2_control ctrl = *arg; + struct v4l2_queryctrl queryctrl; + bool ctrl_found = 0; + int ret; + + /* + * The control has to be reset to the default value + * on all of the pipeline entities, prior setting a new + * value. This is required in cases when the control config + * is changed between subsequent calls to VIDIOC_S_CTRL, + * to avoid the situation when a control is set on more + * than one sub-device. + */ + if (request == VIDIOC_S_CTRL) { + while (entity) { + queryctrl.id = ctrl.id; + + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, + &queryctrl); + if (ret < 0) { + entity = entity->next; + continue; + } + + ctrl_found = true; + + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) + break; + + ctrl.value = queryctrl.default_value; + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_CTRL, &ctrl); + if (ret < 0) + return -EINVAL; + + entity = entity->next; + } + + ctrl.value = arg->value; + } + + if (!ctrl_found) { + ret = -EINVAL; + goto exit; + } + + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl.id); + + if (entity) { + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); + } else { + /* Walk the pipeline until the request succeeds */ + entity = media->pipeline; + + ret = -ENOENT; + + while (entity) { + ret = SYS_IOCTL(entity->sd->fd, request, &ctrl); + if (!ret) + break; + + entity = entity->next; + } + } + +exit: + *arg = ctrl; + + media_dbg(media, "%s [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", + VIDIOC_CTRL(request), ctrl.id, ret ? NULL : queryctrl.name, + entity ? entity->info.name : NULL, ret); + + return ret; +} + +static int media_ioctl_single_ext_ctrl(struct media_device *media, + int request, struct v4l2_ext_controls *arg) +{ + struct media_entity *entity = media->pipeline; + struct v4l2_ext_controls ctrls = *arg; + struct v4l2_ext_control *ctrl; + struct v4l2_query_ext_ctrl queryctrl; + bool ctrl_found = 0; + int ret = -EINVAL; + + ctrl = &ctrls.controls[0]; + + /* + * The control has to be reset to the default value + * on all of the pipeline entities, prior setting a new + * value. This is required in cases when the control config + * is changed between subsequent calls to VIDIOC_S_EXT_CTRLS, + * to avoid the situation when a control is set on more + * than one sub-device. + */ + if (request == VIDIOC_S_EXT_CTRLS) { + while (entity) { + queryctrl.id = ctrl->id; + + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, + &queryctrl); + if (ret < 0) { + entity = entity->next; + continue; + } + + ctrl_found = true; + + if (queryctrl.type & V4L2_CTRL_TYPE_BUTTON) + break; + + ctrl->value64 = queryctrl.default_value; + + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_S_EXT_CTRLS, + &ctrls); + if (ret < 0) + return -EINVAL; + + entity = entity->next; + } + + ctrl->value64 = arg->controls[0].value64; + } + + if (!ctrl_found) { + ret = -EINVAL; + goto exit; + } + + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, ctrl->id); + + if (entity) { + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); + } else { + /* Walk the pipeline until the request succeeds */ + entity = media->pipeline; + + while (entity) { + ret = SYS_IOCTL(entity->sd->fd, request, &ctrls); + if (!ret) + break; + + entity = entity->next; + } + } + +exit: + *arg = ctrls; + + media_dbg(media, "%s [id: 0x%8.8x, entity: %s] (%d)\n", + VIDIOC_EXT_CTRL(request), ctrl->id, + entity ? entity->info.name : NULL, ret); + + return ret; +} + +int media_ioctl_ext_ctrl(struct media_device *media, int request, + struct v4l2_ext_controls *arg) +{ + struct v4l2_ext_controls out_ctrls = *arg, ctrls = *arg; + int ret = -EINVAL, i; + + ctrls.count = 1; + + /* + * Split cluster to individual ioctl calls for each control + * from the array, to make possible redirection of every + * single control to different sub-device, according to the + * configuration settings. + */ + for (i = 0; i < arg->count; ++i) { + ctrls.controls = &arg->controls[i]; + + ret = media_ioctl_single_ext_ctrl(media, request, &ctrls); + out_ctrls.controls[i] = ctrls.controls[i]; + if (ret < 0) { + if (ctrls.error_idx == 1) + out_ctrls.error_idx = ctrls.count; + else + out_ctrls.error_idx = i; + break; + } + } + + *arg = out_ctrls; + return ret; +} + +int sort_ctrls(const void * a, const void * b) +{ + const struct media_entity_to_cid *ctrl_a = a, *ctrl_b = b; + + return ctrl_a->queryctrl.id - ctrl_b->queryctrl.id; +} + +int media_ioctl_queryctrl(struct media_device *media, + struct v4l2_queryctrl *arg) +{ + struct media_entity *entity = media->pipeline, *target_entity; + struct v4l2_queryctrl queryctrl = *arg; + int ret = -EINVAL, num_ctrls = 0; + struct media_entity_to_cid *ctrls_found; + + /* + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to + * be found is the one with the next lowest id among all entities + * in the pipeline. + */ + if (queryctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { + ctrls_found = malloc(sizeof(*ctrls_found)); + + while (entity) { + queryctrl = *arg; + + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYCTRL, + &queryctrl); + if (!ret) { + ctrls_found = realloc(ctrls_found, + sizeof(*ctrls_found) * (num_ctrls + 1)); + ctrls_found[num_ctrls].queryctrl = queryctrl; + ctrls_found[num_ctrls].entity = entity; + ++num_ctrls; + } + + entity = entity->next; + } + + if (num_ctrls == 0) { + ret = -EINVAL; + entity = NULL; + goto done; + } + + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); + + queryctrl = ctrls_found[0].queryctrl; + target_entity = ctrls_found[0].entity; + + free(ctrls_found); + } + + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, queryctrl.id); + if (entity) + target_entity = entity; + + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, + &queryctrl); + +done: + media_dbg(media, + "VIDIOC_QUERYCTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", + ret ? arg->id : queryctrl.id, ret ? NULL : queryctrl.name, + target_entity ? target_entity->info.name : NULL, ret); + + *arg = queryctrl; + + return ret; +} + +int media_ioctl_query_ext_ctrl(struct media_device *media, + struct v4l2_query_ext_ctrl *arg) +{ + struct media_entity *entity = media->pipeline, *target_entity; + struct v4l2_query_ext_ctrl query_ext_ctrl = *arg; + int ret = -EINVAL, num_ctrls = 0; + struct media_entity_to_cid *ctrls_found; + + /* + * If id is or'ed with V4L2_CTRL_FLAG_NEXT_CTRL then the control to + * be found is the one with the next lowest id among all entities + * in the pipeline. + */ + if (query_ext_ctrl.id & V4L2_CTRL_FLAG_NEXT_CTRL) { + ctrls_found = malloc(sizeof(*ctrls_found)); + + while (entity) { + query_ext_ctrl = *arg; + + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERY_EXT_CTRL, + &query_ext_ctrl.id); + if (!ret) { + ctrls_found = realloc(ctrls_found, + sizeof(*ctrls_found) * (num_ctrls + 1)); + ctrls_found[num_ctrls].query_ext_ctrl = + query_ext_ctrl; + ctrls_found[num_ctrls].entity = entity; + ++num_ctrls; + } + + entity = entity->next; + } + + if (num_ctrls == 0) { + ret = -EINVAL; + entity = NULL; + goto done; + } + + qsort(ctrls_found, num_ctrls, sizeof(*ctrls_found), sort_ctrls); + + query_ext_ctrl = ctrls_found[0].query_ext_ctrl; + target_entity = ctrls_found[0].entity; + + free(ctrls_found); + } + + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, query_ext_ctrl.id); + if (entity) + target_entity = entity; + + ret = SYS_IOCTL(target_entity->sd->fd, VIDIOC_QUERYCTRL, + &query_ext_ctrl); + +done: + media_dbg(media, + "VIDIOC_QUERY_EXT_CTRL [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", + ret ? arg->id : query_ext_ctrl.id, + ret ? NULL : query_ext_ctrl.name, + target_entity ? target_entity->info.name : NULL, ret); + + *arg = query_ext_ctrl; + + return ret; +} + +int media_ioctl_querymenu(struct media_device *media, + struct v4l2_querymenu *arg) +{ + struct media_entity *entity = media->pipeline; + struct v4l2_querymenu querymenu = *arg; + int ret = -EINVAL; + + entity = v4l2_subdev_get_pipeline_entity_by_cid(media, querymenu.id); + if (entity) { + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); + goto exit; + } + + entity = media->pipeline; + + while (entity) { + ret = SYS_IOCTL(entity->sd->fd, VIDIOC_QUERYMENU, &querymenu); + if (!ret) + break; + + entity = entity->next; + } + +exit: + *arg = querymenu; + + media_dbg(media, "VIDIOC_QUERYMENU [id: 0x%8.8x, name: %s, entity: %s] (%d)\n", + querymenu.id, ret ? NULL : querymenu.name, + entity ? entity->info.name : NULL, ret); + + return ret; +} diff --git a/utils/media-ctl/libv4l2media_ioctl.h b/utils/media-ctl/libv4l2media_ioctl.h new file mode 100644 index 0000000..5501895 --- /dev/null +++ b/utils/media-ctl/libv4l2media_ioctl.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * Author: Jacek Anaszewski <j.anaszewski@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ + +#ifndef __LIBV4L2MEDIA_IOCTL_H +#define __LIBV4L2MEDIA_IOCTL_H + +#include <linux/videodev2.h> + +struct media_device; + +struct media_entity_to_cid { + struct media_entity *entity; + union { + struct v4l2_queryctrl queryctrl; + struct v4l2_query_ext_ctrl query_ext_ctrl; + }; +}; + +int media_ioctl_ctrl(struct media_device *media, int request, + struct v4l2_control *arg); + +int media_ioctl_ext_ctrl(struct media_device *media, int request, + struct v4l2_ext_controls *arg); + +int media_ioctl_queryctrl(struct media_device *media, + struct v4l2_queryctrl *arg); + +int media_ioctl_query_ext_ctrl(struct media_device *media, + struct v4l2_query_ext_ctrl *arg); + +int media_ioctl_querymenu(struct media_device *media, + struct v4l2_querymenu *arg); + +#endif /* __LIBV4L2MEDIA_IOCTL_H */