* [PATCH 1/4] HEADERS, do not merge!!!!
@ 2019-11-01 11:25 Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls Ricardo Ribalda Delgado
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-11-01 11:25 UTC (permalink / raw)
To: Hans Verkuil, linux-media, linux-kernel; +Cc: Ricardo Ribalda Delgado
---
contrib/freebsd/include/linux/videodev2.h | 1 +
include/linux/videodev2.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
index 85fa80f7..e90c8912 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1713,6 +1713,7 @@ struct v4l2_ext_control {
uint16_t *p_u16;
uint32_t *p_u32;
void *ptr;
+ struct v4l2_area *p_area;
};
} __attribute__ ((packed));
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 6d66a789..7bafe5cd 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1678,6 +1678,7 @@ struct v4l2_ext_control {
__u8 *p_u8;
__u16 *p_u16;
__u32 *p_u32;
+ struct v4l2_area *p_area;
void *ptr;
};
} __attribute__ ((packed));
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls
2019-11-01 11:25 [PATCH 1/4] HEADERS, do not merge!!!! Ricardo Ribalda Delgado
@ 2019-11-01 11:25 ` Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 3/4] v4l2-ctl: Support getting " Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 4/4] v4l2-ctl: Support setting " Ricardo Ribalda Delgado
2 siblings, 0 replies; 7+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-11-01 11:25 UTC (permalink / raw)
To: Hans Verkuil, linux-media, linux-kernel; +Cc: Ricardo Ribalda Delgado
Tested with vivid:
$ v4l2-ctl -l | grep area
area 0x0098f90b (area) : flags=has-payload
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
---
utils/v4l2-ctl/v4l2-ctl-common.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
index 651917e7..b1c12b35 100644
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
@@ -458,6 +458,9 @@ static void print_qctrl(int fd, struct v4l2_query_ext_ctrl *queryctrl,
queryctrl->minimum, queryctrl->maximum,
queryctrl->step, queryctrl->default_value);
break;
+ case V4L2_CTRL_TYPE_AREA:
+ printf("%31s %#8.8x (area) :", s.c_str(), queryctrl->id);
+ break;
default:
printf("%31s %#8.8x (unknown): type=%x",
s.c_str(), queryctrl->id, queryctrl->type);
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] v4l2-ctl: Support getting V4L2_CTRL_TYPE_AREA controls
2019-11-01 11:25 [PATCH 1/4] HEADERS, do not merge!!!! Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls Ricardo Ribalda Delgado
@ 2019-11-01 11:25 ` Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 4/4] v4l2-ctl: Support setting " Ricardo Ribalda Delgado
2 siblings, 0 replies; 7+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-11-01 11:25 UTC (permalink / raw)
To: Hans Verkuil, linux-media, linux-kernel; +Cc: Ricardo Ribalda Delgado
Tested with vivid:
v4l2-ctl -C area -d /dev/video1
area: 51966x727837
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
---
utils/v4l2-ctl/v4l2-ctl-common.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
index b1c12b35..95339561 100644
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
@@ -1150,6 +1150,11 @@ void common_get(cv4l_fd &_fd)
printf("%s: '%s'\n", name.c_str(),
safename(ctrl.string).c_str());
break;
+ case V4L2_CTRL_TYPE_AREA:
+ printf("%s: %dx%d\n", name.c_str(),
+ ctrl.p_area->width,
+ ctrl.p_area->height);
+ break;
default:
fprintf(stderr, "%s: unsupported payload type\n",
qc.name);
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls
2019-11-01 11:25 [PATCH 1/4] HEADERS, do not merge!!!! Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 3/4] v4l2-ctl: Support getting " Ricardo Ribalda Delgado
@ 2019-11-01 11:25 ` Ricardo Ribalda Delgado
2019-11-04 9:41 ` Hans Verkuil
2 siblings, 1 reply; 7+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-11-01 11:25 UTC (permalink / raw)
To: Hans Verkuil, linux-media, linux-kernel; +Cc: Ricardo Ribalda Delgado
$ v4l2-ctl -d /dev/video1 -c area=123123x233
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
---
utils/v4l2-ctl/v4l2-ctl-common.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
index 95339561..676b05e0 100644
--- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
@@ -973,6 +973,10 @@ void common_set(cv4l_fd &_fd)
strncpy(ctrl.string, iter->second.c_str(), qc.maximum);
ctrl.string[qc.maximum] = 0;
break;
+ case V4L2_CTRL_TYPE_AREA:
+ sscanf(iter->second.c_str(), "%dx%d",
+ &ctrl.p_area->width, &ctrl.p_area->height);
+ break;
default:
fprintf(stderr, "%s: unsupported payload type\n",
qc.name);
--
2.24.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls
2019-11-01 11:25 ` [PATCH 4/4] v4l2-ctl: Support setting " Ricardo Ribalda Delgado
@ 2019-11-04 9:41 ` Hans Verkuil
2019-11-04 11:21 ` Ricardo Ribalda Delgado
0 siblings, 1 reply; 7+ messages in thread
From: Hans Verkuil @ 2019-11-04 9:41 UTC (permalink / raw)
To: Ricardo Ribalda Delgado, linux-media, linux-kernel
On 11/1/19 12:25 PM, Ricardo Ribalda Delgado wrote:
> $ v4l2-ctl -d /dev/video1 -c area=123123x233
>
> Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
> ---
> utils/v4l2-ctl/v4l2-ctl-common.cpp | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> index 95339561..676b05e0 100644
> --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
> +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> @@ -973,6 +973,10 @@ void common_set(cv4l_fd &_fd)
> strncpy(ctrl.string, iter->second.c_str(), qc.maximum);
> ctrl.string[qc.maximum] = 0;
> break;
> + case V4L2_CTRL_TYPE_AREA:
> + sscanf(iter->second.c_str(), "%dx%d",
Use %ux%u since these are unsigned values.
Regards,
Hans
> + &ctrl.p_area->width, &ctrl.p_area->height);
> + break;
> default:
> fprintf(stderr, "%s: unsupported payload type\n",
> qc.name);
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls
2019-11-04 9:41 ` Hans Verkuil
@ 2019-11-04 11:21 ` Ricardo Ribalda Delgado
2019-11-04 11:52 ` Hans Verkuil
0 siblings, 1 reply; 7+ messages in thread
From: Ricardo Ribalda Delgado @ 2019-11-04 11:21 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, LKML
Hi Hans
Sure I will fix this. Shall I resend it once you have updated the
headers on v4l-utils?
Best regards
On Mon, Nov 4, 2019 at 10:41 AM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> On 11/1/19 12:25 PM, Ricardo Ribalda Delgado wrote:
> > $ v4l2-ctl -d /dev/video1 -c area=123123x233
> >
> > Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
> > ---
> > utils/v4l2-ctl/v4l2-ctl-common.cpp | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> > index 95339561..676b05e0 100644
> > --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
> > +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
> > @@ -973,6 +973,10 @@ void common_set(cv4l_fd &_fd)
> > strncpy(ctrl.string, iter->second.c_str(), qc.maximum);
> > ctrl.string[qc.maximum] = 0;
> > break;
> > + case V4L2_CTRL_TYPE_AREA:
> > + sscanf(iter->second.c_str(), "%dx%d",
>
> Use %ux%u since these are unsigned values.
>
> Regards,
>
> Hans
>
> > + &ctrl.p_area->width, &ctrl.p_area->height);
> > + break;
> > default:
> > fprintf(stderr, "%s: unsupported payload type\n",
> > qc.name);
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls
2019-11-04 11:21 ` Ricardo Ribalda Delgado
@ 2019-11-04 11:52 ` Hans Verkuil
0 siblings, 0 replies; 7+ messages in thread
From: Hans Verkuil @ 2019-11-04 11:52 UTC (permalink / raw)
To: Ricardo Ribalda Delgado; +Cc: linux-media, LKML
On 11/4/19 12:21 PM, Ricardo Ribalda Delgado wrote:
> Hi Hans
>
> Sure I will fix this. Shall I resend it once you have updated the
> headers on v4l-utils?
Don't wait for that, just resend. I can merge this as soon as the new
headers are in.
Regards,
Hans
>
> Best regards
>
> On Mon, Nov 4, 2019 at 10:41 AM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>
>> On 11/1/19 12:25 PM, Ricardo Ribalda Delgado wrote:
>>> $ v4l2-ctl -d /dev/video1 -c area=123123x233
>>>
>>> Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
>>> ---
>>> utils/v4l2-ctl/v4l2-ctl-common.cpp | 4 ++++
>>> 1 file changed, 4 insertions(+)
>>>
>>> diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp
>>> index 95339561..676b05e0 100644
>>> --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp
>>> +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp
>>> @@ -973,6 +973,10 @@ void common_set(cv4l_fd &_fd)
>>> strncpy(ctrl.string, iter->second.c_str(), qc.maximum);
>>> ctrl.string[qc.maximum] = 0;
>>> break;
>>> + case V4L2_CTRL_TYPE_AREA:
>>> + sscanf(iter->second.c_str(), "%dx%d",
>>
>> Use %ux%u since these are unsigned values.
>>
>> Regards,
>>
>> Hans
>>
>>> + &ctrl.p_area->width, &ctrl.p_area->height);
>>> + break;
>>> default:
>>> fprintf(stderr, "%s: unsupported payload type\n",
>>> qc.name);
>>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-11-04 11:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-01 11:25 [PATCH 1/4] HEADERS, do not merge!!!! Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 2/4] v4l2-ctl: Support query V4L2_CTRL_TYPE_AREA controls Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 3/4] v4l2-ctl: Support getting " Ricardo Ribalda Delgado
2019-11-01 11:25 ` [PATCH 4/4] v4l2-ctl: Support setting " Ricardo Ribalda Delgado
2019-11-04 9:41 ` Hans Verkuil
2019-11-04 11:21 ` Ricardo Ribalda Delgado
2019-11-04 11:52 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).