[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: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 21beb97974c253eb7596841f3a0aa6968b1c248e..7d28899f89ce16c00cd9f00f424a948fa57e2ae8 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -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);

diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/coda/coda-jpeg.c
index 96cd42a0baaf6fd3087d82b256697f6890ffdcd8..9f899a6cefed1addb3091e0ebd343d7ba0c1a3a0 100644 (file)
--- a/drivers/media/platform/coda/coda-jpeg.c
+++ b/drivers/media/platform/coda/coda-jpeg.c
@@ -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;
 }
 
 /*

diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
index 6cda81e4163aacf50dc75715e90f833d15f9705a..d08e9843e9f2ad542420fb3cbe49e3b0488e48fb 100644 (file)
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -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);