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

Commit c8d36a80 authored by Thierry Escande's avatar Thierry Escande Committed by Mauro Carvalho Chehab
Browse files

media: s5p-jpeg: Split s5p_jpeg_parse_hdr() 



This patch moves the subsampling value decoding read from the JPEG
header into its own function. This new function is called
s5p_jpeg_subsampling_decode() and returns true if it successfully
decodes the subsampling value, false otherwise.

Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Acked-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 14a2de14

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

+24 −18
Original line number Diff line number Diff line
@@ -1096,6 +1096,29 @@ static void skip(struct s5p_jpeg_buffer *buf, long len) 
		get_byte(buf);

}



static bool s5p_jpeg_subsampling_decode(struct s5p_jpeg_ctx *ctx,

					unsigned int subsampling)

{

	switch (subsampling) {

	case 0x11:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_444;

		break;

	case 0x21:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_422;

		break;

	case 0x22:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_420;

		break;

	case 0x33:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY;

		break;

	default:

		return false;

	}



	return true;

}



static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,

			       unsigned long buffer, unsigned long size,

			       struct s5p_jpeg_ctx *ctx)
@@ -1207,26 +1230,9 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, 
		}

	}



	if (notfound || !sos)

	if (notfound || !sos || !s5p_jpeg_subsampling_decode(ctx, subsampling))

		return false;



	switch (subsampling) {

	case 0x11:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_444;

		break;

	case 0x21:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_422;

		break;

	case 0x22:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_420;

		break;

	case 0x33:

		ctx->subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY;

		break;

	default:

		return false;

	}



	result->w = width;

	result->h = height;

	result->sos = sos;