|
@@ -196,10 +196,6 @@ static int __rvin_try_format(struct rvin_dev *vin,
|
|
|
pix->pixelformat = RVIN_DEFAULT_FORMAT;
|
|
|
}
|
|
|
|
|
|
- /* Always recalculate */
|
|
|
- pix->bytesperline = 0;
|
|
|
- pix->sizeimage = 0;
|
|
|
-
|
|
|
/* Limit to source capabilities */
|
|
|
ret = __rvin_try_format_source(vin, which, pix, source);
|
|
|
if (ret)
|
|
@@ -234,10 +230,8 @@ static int __rvin_try_format(struct rvin_dev *vin,
|
|
|
v4l_bound_align_image(&pix->width, 2, vin->info->max_width, walign,
|
|
|
&pix->height, 4, vin->info->max_height, 2, 0);
|
|
|
|
|
|
- pix->bytesperline = max_t(u32, pix->bytesperline,
|
|
|
- rvin_format_bytesperline(pix));
|
|
|
- pix->sizeimage = max_t(u32, pix->sizeimage,
|
|
|
- rvin_format_sizeimage(pix));
|
|
|
+ pix->bytesperline = rvin_format_bytesperline(pix);
|
|
|
+ pix->sizeimage = rvin_format_sizeimage(pix);
|
|
|
|
|
|
if (vin->info->model == RCAR_M1 &&
|
|
|
pix->pixelformat == V4L2_PIX_FMT_XBGR32) {
|