media: staging: media: zoran: fix TRY_FMT handling
TRY_FMT must not set actual capture values (zr->buffer_size in this case), since it is a 'try' only. zoran_try_fmt_vid_cap() also didn't fill in fmt->fmt.pix.bytesperline and fmt->fmt.pix.sizeimage correctly. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Corentin Labbe <clabbe@baylibre.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
914941827a
commit
35e77cea10
|
@ -398,7 +398,6 @@ static int zoran_try_fmt_vid_out(struct file *file, void *__fh,
|
|||
V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);
|
||||
|
||||
fmt->fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&settings);
|
||||
zr->buffer_size = fmt->fmt.pix.sizeimage;
|
||||
fmt->fmt.pix.bytesperline = 0;
|
||||
fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
|
||||
return res;
|
||||
|
@ -433,6 +432,8 @@ static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,
|
|||
bpp = DIV_ROUND_UP(zoran_formats[i].depth, 8);
|
||||
v4l_bound_align_image(&fmt->fmt.pix.width, BUZ_MIN_WIDTH, BUZ_MAX_WIDTH, bpp == 2 ? 1 : 2,
|
||||
&fmt->fmt.pix.height, BUZ_MIN_HEIGHT, BUZ_MAX_HEIGHT, 0, 0);
|
||||
fmt->fmt.pix.bytesperline = fmt->fmt.pix.width * bpp;
|
||||
fmt->fmt.pix.sizeimage = fmt->fmt.pix.bytesperline * fmt->fmt.pix.height;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue