Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 045030fa authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Fix bytesperline and plane payload setup 



Make sure the sizeimage for 3-planar color formats is
width * height * 3/2 and the bytesperline is same for each
plane in case of a multi-planar format.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c4a62733

drivers/media/video/s5p-fimc/fimc-capture.c

+4 −2
Original line number Diff line number Diff line
@@ -539,8 +539,10 @@ static int fimc_cap_s_fmt_mplane(struct file *file, void *priv, 
		return -EINVAL;

	}



	for (i = 0; i < frame->fmt->colplanes; i++)

		frame->payload[i] = pix->plane_fmt[i].bytesperline * pix->height;

	for (i = 0; i < frame->fmt->colplanes; i++) {

		frame->payload[i] =

			(pix->width * pix->height * frame->fmt->depth[i]) >> 3;

	}



	/* Output DMA frame pixel size and offsets. */

	frame->f_width = pix->plane_fmt[0].bytesperline * 8

drivers/media/video/s5p-fimc/fimc-core.c

+16 −14
Original line number Diff line number Diff line
@@ -927,23 +927,23 @@ int fimc_vidioc_try_fmt_mplane(struct file *file, void *priv, 
	pix->num_planes = fmt->memplanes;

	pix->colorspace	= V4L2_COLORSPACE_JPEG;



	for (i = 0; i < pix->num_planes; ++i) {

		int bpl = pix->plane_fmt[i].bytesperline;



		dbg("[%d] bpl: %d, depth: %d, w: %d, h: %d",

		    i, bpl, fmt->depth[i], pix->width, pix->height);

	for (i = 0; i < pix->num_planes; ++i) {

		u32 bpl = pix->plane_fmt[i].bytesperline;

		u32 *sizeimage = &pix->plane_fmt[i].sizeimage;



		if (!bpl || (bpl * 8 / fmt->depth[i]) > pix->width)

			bpl = (pix->width * fmt->depth[0]) >> 3;

		if (fmt->colplanes > 1 && (bpl == 0 || bpl < pix->width))

			bpl = pix->width; /* Planar */



		if (!pix->plane_fmt[i].sizeimage)

			pix->plane_fmt[i].sizeimage = pix->height * bpl;

		if (fmt->colplanes == 1 && /* Packed */

		    (bpl == 0 || ((bpl * 8) / fmt->depth[i]) < pix->width))

			bpl = (pix->width * fmt->depth[0]) / 8;



		pix->plane_fmt[i].bytesperline = bpl;

		if (i == 0) /* Same bytesperline for each plane. */

			mod_x = bpl;



		dbg("[%d]: bpl: %d, sizeimage: %d",

		    i, pix->plane_fmt[i].bytesperline,

		    pix->plane_fmt[i].sizeimage);

		pix->plane_fmt[i].bytesperline = mod_x;

		*sizeimage = (pix->width * pix->height * fmt->depth[i]) / 8;

	}



	return 0;
@@ -985,8 +985,10 @@ static int fimc_m2m_s_fmt_mplane(struct file *file, void *priv, 
	if (!frame->fmt)

		return -EINVAL;



	for (i = 0; i < frame->fmt->colplanes; i++)

		frame->payload[i] = pix->plane_fmt[i].bytesperline * pix->height;

	for (i = 0; i < frame->fmt->colplanes; i++) {

		frame->payload[i] =

			(pix->width * pix->height * frame->fmt->depth[i]) / 8;

	}



	frame->f_width	= pix->plane_fmt[0].bytesperline * 8 /

		frame->fmt->depth[0];