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

media: coda: use correct offset for mpeg4 decoder mvcol buffer 



The mvcol buffer needs to be placed behind the chroma plane(s) when
decoding MPEG-4, same as for the h.264 decoder. Use the real offset
with the required rounding.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 25141bc7

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

+7 −9
Original line number Diff line number Diff line
@@ -455,18 +455,16 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, 
		coda_parabuf_write(ctx, i * 3 + 1, cb);

		coda_parabuf_write(ctx, i * 3 + 2, cr);



		/* mvcol buffer for h.264 */

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

		    dev->devtype->product != CODA_DX6)

		if (dev->devtype->product == CODA_DX6)

			continue;



		/* mvcol buffer for h.264 and mpeg4 */

		if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264)

			coda_parabuf_write(ctx, 96 + i, mvcol);

		if (ctx->codec->src_fourcc == V4L2_PIX_FMT_MPEG4 && i == 0)

			coda_parabuf_write(ctx, 97, mvcol);

	}



	/* mvcol buffer for mpeg4 */

	if ((dev->devtype->product != CODA_DX6) &&

	    (ctx->codec->src_fourcc == V4L2_PIX_FMT_MPEG4))

		coda_parabuf_write(ctx, 97, ctx->internal_frames[0].paddr +

					    ysize + ysize/4 + ysize/4);



	return 0;

}