Em Thu, 28 Feb 2019 13:30:49 +0100
Hans Verkuil <hverkuil-cisco@xxxxxxxxx> escreveu:
> On 2/26/19 6:36 PM, Mauro Carvalho Chehab wrote:
> > The vim2m driver doesn't enforce that the capture and output
> > buffers would have the same size. Do the right thing if the
> > buffers are different, zeroing the buffer before writing,
> > ensuring that lines will be aligned and it won't write past
> > the buffer area.
>
> I don't really like this. Since the vimc driver doesn't scale it shouldn't
> automatically crop either. If you want to crop/compose, then the
> selection API should be implemented.
>
> That would be the right approach to allowing capture and output
> formats (we're talking formats here, not buffer sizes) with
> different resolutions.
The original vim2m implementation assumes that this driver would
"scale" and do format conversions (except that it didn't do neither).
While I fixed the format conversion on a past patchset, vim2m
still allows a "free" image size on both sides of the pipeline.
I agree with you that the best would be to implement a scaler
(and maybe crop/compose), but for now, we need to solve an issue that
vim2m is doing a very poor job to confine the image at the destination
buffer's resolution.
Also, as far as I remember, the first M2M devices have scalers, so
existing apps likely assume that such devices will do scaling.
So, a non-scaling M2M device is something that, in thesis, we don't
support[1].
[1] Very likely we have several ones that don't do scaling, but the
needed API bits for apps to detect if scaling is supported or not
aren't implemented.
The problem of enforcing the resolution to be identical on both capture
and output buffers is that the V4L2 API doesn't really have
a way for userspace apps to identify that it won't scale until
too late.
How do you imagine an application negotiating the image resolution?
I mean, application A may set first the capture buffer to, let's say,
320x200 and then try to set the output buffer.
Application B may do the reverse, e. g. set first the output buffer
to 320x200 and then try to set the capture buffer.
Application C could try to initialize with some default for both
capture and output buffers and only later decide what resolution
it wants and try to set both sides.
Application D could have setup both sides, started streaming at
320x200. Then, it stopped streaming and changed the capture
resolution to, let's say 640x480, without changing the resolution
of the output buffer.
For all the above scenarios, the app may either first set both
sides and then request the buffer for both, or do S_FMT/REQBUFS
for one side and then to the other side.
What I mean is that, wit just use the existing ioctls and flags, I
can't see any way for all the above scenarios work on devices that
don't scale.
One solution would be to filter the output of ENUM_FMT, TRY_FMT,
G_FMT and S_FMT when one of the sides of the M2M buffer is set,
but that would break some possible real usecases.
I suspect that the option that it would work best is to have a
flag to indicate that a M2M device has scalers.
In any case, this should be discussed and properly documented
before we would be able to implement a non-scaling M2M device.
-
Without a clear way for the API to report that the device can't scale,
an application like, for example, the GStreamer plugin, won't be able to
detect that the resolutions should be identical until too late (at
STREAMON).
IMO, this is something that we should address, but it is out of the
scope of this fixup patch.
That's why I prefer to keep vim2m working supporting different
resolutions on each side of the M2M device.
-
That's said, I may end working on a very simple scaler patch for vim2m.
I suspect that a simple decimation filtering like:
#define x_scale xout_max / xin_max
#define y_scale yout_max / yin_max
out_pixel(x, y) = in_pixel(x * x_scale, y * y_scale)
would be simple enough to implement at the current image copy
thread.
Regards,
Mauro
>
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@xxxxxxxxxx>
> > ---
> > drivers/media/platform/vim2m.c | 26 +++++++++++++++++++-------
> > 1 file changed, 19 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
> > index 89384f324e25..46e3e096123e 100644
> > --- a/drivers/media/platform/vim2m.c
> > +++ b/drivers/media/platform/vim2m.c
> > @@ -481,7 +481,9 @@ static int device_process(struct vim2m_ctx *ctx,
> > struct vim2m_dev *dev = ctx->dev;
> > struct vim2m_q_data *q_data_in, *q_data_out;
> > u8 *p_in, *p, *p_out;
> > - int width, height, bytesperline, x, y, y_out, start, end, step;
> > + unsigned int width, height, bytesperline, bytesperline_out;
> > + unsigned int x, y, y_out;
> > + int start, end, step;
> > struct vim2m_fmt *in, *out;
> >
> > q_data_in = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
> > @@ -491,8 +493,15 @@ static int device_process(struct vim2m_ctx *ctx,
> > bytesperline = (q_data_in->width * q_data_in->fmt->depth) >> 3;
> >
> > q_data_out = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
> > + bytesperline_out = (q_data_out->width * q_data_out->fmt->depth) >> 3;
> > out = q_data_out->fmt;
> >
> > + /* Crop to the limits of the destination image */
> > + if (width > q_data_out->width)
> > + width = q_data_out->width;
> > + if (height > q_data_out->height)
> > + height = q_data_out->height;
> > +
> > p_in = vb2_plane_vaddr(&in_vb->vb2_buf, 0);
> > p_out = vb2_plane_vaddr(&out_vb->vb2_buf, 0);
> > if (!p_in || !p_out) {
> > @@ -501,6 +510,10 @@ static int device_process(struct vim2m_ctx *ctx,
> > return -EFAULT;
> > }
> >
> > + /* Image size is different. Zero buffer first */
> > + if (q_data_in->width != q_data_out->width ||
> > + q_data_in->height != q_data_out->height)
> > + memset(p_out, 0, q_data_out->sizeimage);
> > out_vb->sequence = get_q_data(ctx,
> > V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
> > in_vb->sequence = q_data_in->sequence++;
> > @@ -524,6 +537,11 @@ static int device_process(struct vim2m_ctx *ctx,
> > for (x = 0; x < width >> 1; x++)
> > copy_two_pixels(in, out, &p, &p_out, y_out,
> > ctx->mode & MEM2MEM_HFLIP);
> > +
> > + /* Go to the next line at the out buffer*/
>
> Add space after 'buffer'.
>
> > + if (width < q_data_out->width)
> > + p_out += ((q_data_out->width - width)
> > + * q_data_out->fmt->depth) >> 3;
> > }
> >
> > return 0;
> > @@ -977,12 +995,6 @@ static int vim2m_buf_prepare(struct vb2_buffer *vb)
> > dprintk(ctx->dev, 2, "type: %s\n", type_name(vb->vb2_queue->type));
> >
> > q_data = get_q_data(ctx, vb->vb2_queue->type);
> > - if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
> > - dprintk(ctx->dev, "%s data will not fit into plane (%lu < %lu)\n",
> > - __func__, vb2_plane_size(vb, 0), (long)q_data->sizeimage);
> > - return -EINVAL;
> > - }
> > -
>
> As discussed on irc, this can't be removed. It checks if the provided buffer
> is large enough for the current format.
>
> Regards,
>
> Hans
>
> > vb2_set_plane_payload(vb, 0, q_data->sizeimage);
> >
> > return 0;
> >
>
Thanks,
Mauro
