On Friday, August 26, 2011 15:06:05 Tomasz Stanislawski wrote:
> This patch allows new video drivers to work correctly with applications that
> use the old-style crop API. The old crop ioctl is simulated by using
> selection
> callbacks.
>
> Signed-off-by: Tomasz Stanislawski <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> ---
> drivers/media/video/v4l2-ioctl.c | 86 +++++++++++++++++++++++++++++++++----
> 1 files changed, 76 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/video/v4l2-ioctl.c
> b/drivers/media/video/v4l2-ioctl.c
> index 6e02b45..543405b 100644
> --- a/drivers/media/video/v4l2-ioctl.c
> +++ b/drivers/media/video/v4l2-ioctl.c
> @@ -1696,11 +1696,31 @@ static long __video_do_ioctl(struct file *file,
> {
> struct v4l2_crop *p = arg;
>
> - if (!ops->vidioc_g_crop)
> + dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
> +
> + if (ops->vidioc_g_crop) {
> + ret = ops->vidioc_g_crop(file, fh, p);
> + } else
> + if (ops->vidioc_g_selection) {
> + /* simulate capture crop using selection api */
> + struct v4l2_selection s = {
> + .type = p->type,
> + .target = V4L2_SEL_CROP_ACTIVE,
> + };
> +
> + /* crop means compose for output devices */
> + if (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
> + s.target = V4L2_SEL_COMPOSE_ACTIVE;
> +
> + ret = ops->vidioc_g_selection(file, fh, &s);
> +
> + /* copying results to old structure on success */
> + if (!ret)
> + p->c = s.r;
> + } else {
> break;
> + }
>
> - dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
> - ret = ops->vidioc_g_crop(file, fh, p);
> if (!ret)
> dbgrect(vfd, "", &p->c);
> break;
> @@ -1709,11 +1729,26 @@ static long __video_do_ioctl(struct file *file,
> {
> struct v4l2_crop *p = arg;
>
> - if (!ops->vidioc_s_crop)
> - break;
> dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
> dbgrect(vfd, "", &p->c);
> - ret = ops->vidioc_s_crop(file, fh, p);
> +
> + if (ops->vidioc_s_crop) {
> + ret = ops->vidioc_s_crop(file, fh, p);
> + } else
> + if (ops->vidioc_s_selection) {
> + /* simulate capture crop using selection api */
> + struct v4l2_selection s = {
> + .type = p->type,
> + .target = V4L2_SEL_CROP_ACTIVE,
> + .r = p->c,
> + };
> +
> + /* crop means compose for output devices */
> + if (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
> + s.target = V4L2_SEL_COMPOSE_ACTIVE;
> +
> + ret = ops->vidioc_s_selection(file, fh, &s);
> + }
> break;
> }
> case VIDIOC_G_SELECTION:
> @@ -1746,12 +1781,43 @@ static long __video_do_ioctl(struct file *file,
> {
> struct v4l2_cropcap *p = arg;
>
> - /*FIXME: Should also show v4l2_fract pixelaspect */
> - if (!ops->vidioc_cropcap)
> + dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
> + if (ops->vidioc_cropcap) {
> + ret = ops->vidioc_cropcap(file, fh, p);
> + } else
> + if (ops->vidioc_g_selection) {
> + struct v4l2_selection s = { .type = p->type };
> + struct v4l2_rect bounds;
> +
> + /* obtaining bounds */
> + if (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
> + s.target = V4L2_SEL_COMPOSE_BOUNDS;
> + else
> + s.target = V4L2_SEL_CROP_BOUNDS;
> + ret = ops->vidioc_g_selection(file, fh, &s);
> + if (ret)
> + break;
> + bounds = s.r;
> +
> + /* obtaining defrect */
> + if (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
> + s.target = V4L2_SEL_COMPOSE_DEFAULT;
> + else
> + s.target = V4L2_SEL_CROP_DEFAULT;
> + ret = ops->vidioc_g_selection(file, fh, &s);
> + if (ret)
> + break;
> +
> + /* storing results */
> + p->bounds = bounds;
> + p->defrect = s.r;
> + p->pixelaspect.numerator = 1;
> + p->pixelaspect.denominator = 1;
> + } else {
> break;
> + }
>
> - dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names));
> - ret = ops->vidioc_cropcap(file, fh, p);
> + /*FIXME: Should also show v4l2_fract pixelaspect */
We really need a solution for this. I'm not happy that this hasn't been
resolved yet.
What about this: if ops->vidioc_g_selection is non-NULL, then fill in bounds
and defrect as above. But also call ops->vidioc_cropcap at the end if non-NULL,
so that the driver can fill in the pixelaspect.
So the code would look like this:
if (ops->vidioc_g_selection) {
fill in bounds and defrect and set pixelaspect to 1, 1
}
if (ops->vidioc_cropcap)
ops->vidioc_cropcap();
If a driver supports g_selection, then cropcap only needs to fill in the
pixelaspect.
> if (!ret) {
> dbgrect(vfd, "bounds ", &p->bounds);
> dbgrect(vfd, "defrect ", &p->defrect);
>
And let's show the pixelaspect here as well.
Does this sounds reasonable?
Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
