2019-11-01 11:36:28

by Ricardo Ribalda Delgado

Subject: [PATCH 1/4] HEADERS, do not merge!!!!

---
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

2019-11-01 11:37:12

by Ricardo Ribalda Delgado

Subject: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls

$ v4l2-ctl -d /dev/video1 -c area=123123x233

Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
---
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

2019-11-04 09:42:32

by Hans Verkuil

Subject: Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls

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 <[email protected]>
> ---
> 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);
>

2019-11-04 11:23:01

by Ricardo Ribalda Delgado

Subject: Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls

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 <[email protected]> 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 <[email protected]>
> > ---
> > 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);
> >
>

2019-11-04 11:53:41

by Hans Verkuil

Subject: Re: [PATCH 4/4] v4l2-ctl: Support setting V4L2_CTRL_TYPE_AREA controls

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 <[email protected]> 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 <[email protected]>
>>> ---
>>> 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);
>>>
>>