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

Commit d4de047b authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: relax coda_jpeg_check_buffer for trailing bytes 



coda_jpeg_check_buffer only cares about the buffer length and contents,
so change the parameter type back from v4l2_vb2_buffer to just the
vb2_buffer.
Instead of just checking the first and last bytes for the SOI and EOI
markers, relax the EOI marker check a bit and allow up to 32 trailing
bytes after the EOI marker as hardware generated JPEGs sometimes contain
some alignment overhead.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5542570e

drivers/media/platform/coda/coda-bit.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming) 


		/* Drop frames that do not start/end with a SOI/EOI markers */

		if (ctx->codec->src_fourcc == V4L2_PIX_FMT_JPEG &&

		    !coda_jpeg_check_buffer(ctx, src_buf)) {

		    !coda_jpeg_check_buffer(ctx, &src_buf->vb2_buf)) {

			v4l2_err(&ctx->dev->v4l2_dev,

				 "dropping invalid JPEG frame %d\n",

				 ctx->qsequence);

drivers/media/platform/coda/coda-jpeg.c

+20 −6
Original line number Diff line number Diff line
@@ -178,14 +178,28 @@ int coda_jpeg_write_tables(struct coda_ctx *ctx) 
	return 0;

}



bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb)

bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb)

{

	void *vaddr = vb2_plane_vaddr(&vb->vb2_buf, 0);

	u16 soi = be16_to_cpup((__be16 *)vaddr);

	u16 eoi = be16_to_cpup((__be16 *)(vaddr +

			  vb2_get_plane_payload(&vb->vb2_buf, 0) - 2));

	void *vaddr = vb2_plane_vaddr(vb, 0);

	u16 soi, eoi;

	int len, i;



	soi = be16_to_cpup((__be16 *)vaddr);

	if (soi != SOI_MARKER)

		return false;



	len = vb2_get_plane_payload(vb, 0);

	vaddr += len - 2;

	for (i = 0; i < 32; i++) {

		eoi = be16_to_cpup((__be16 *)(vaddr - i));

		if (eoi == EOI_MARKER) {

			if (i > 0)

				vb2_set_plane_payload(vb, 0, len - i);

			return true;

		}

	}



	return soi == SOI_MARKER && eoi == EOI_MARKER;

	return false;

}



/*

drivers/media/platform/coda/coda.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf, 


int coda_h264_padding(int size, char *p);



bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb);

bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb);

int coda_jpeg_write_tables(struct coda_ctx *ctx);

void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality);