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

Commit 19dc3e08 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Mauro Carvalho Chehab
Browse files

media: s5p-jpeg: set w/h when encoding 



q_data w/h must be set when encoding.

Fixes: 1c84e7f9 (media: s5p-jpeg: Add support for resolution change event)

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 65d5c96d

drivers/media/platform/s5p-jpeg/jpeg-core.c

+6 −2
Original line number Diff line number Diff line
@@ -1634,6 +1634,12 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f) 
			FMT_TYPE_OUTPUT : FMT_TYPE_CAPTURE;



	q_data->fmt = s5p_jpeg_find_format(ct, pix->pixelformat, f_type);

	if (ct->mode == S5P_JPEG_ENCODE ||

		(ct->mode == S5P_JPEG_DECODE &&

		q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG)) {

		q_data->w = pix->width;

		q_data->h = pix->height;

	}

	if (q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG) {

		/*

		 * During encoding Exynos4x12 SoCs access wider memory area
@@ -1641,8 +1647,6 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f) 
		 * the JPEG_IMAGE_SIZE register. In order to avoid sysmmu

		 * page fault calculate proper buffer size in such a case.

		 */

		q_data->w = pix->width;

		q_data->h = pix->height;

		if (ct->jpeg->variant->hw_ex4_compat &&

		    f_type == FMT_TYPE_OUTPUT && ct->mode == S5P_JPEG_ENCODE)

			q_data->size = exynos4_jpeg_get_output_buffer_size(ct,