* [PATCH 1/3] [media] coda: round up frame sizes to multiples of 16 for MPEG-4 decoder
@ 2017-12-07 14:59 Philipp Zabel
2017-12-07 14:59 ` [PATCH 2/3] [media] coda: allocate space for mpeg4 decoder mvcol buffer Philipp Zabel
2017-12-07 14:59 ` [PATCH 3/3] [media] coda: use correct offset " Philipp Zabel
0 siblings, 2 replies; 3+ messages in thread
From: Philipp Zabel @ 2017-12-07 14:59 UTC (permalink / raw)
To: linux-media; +Cc: Mauro Carvalho Chehab, kernel, Philipp Zabel
We need internal frames to be rounded up to full macroblocks for MPEG-4
decoding as well.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/platform/coda/coda-bit.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index bfc4ecf6f068b..87002bede5ea1 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -395,6 +395,7 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx,
if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 ||
ctx->codec->dst_fourcc == V4L2_PIX_FMT_H264 ||
+ ctx->codec->src_fourcc == V4L2_PIX_FMT_MPEG4 ||
ctx->codec->dst_fourcc == V4L2_PIX_FMT_MPEG4) {
width = round_up(q_data->width, 16);
height = round_up(q_data->height, 16);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] [media] coda: allocate space for mpeg4 decoder mvcol buffer
2017-12-07 14:59 [PATCH 1/3] [media] coda: round up frame sizes to multiples of 16 for MPEG-4 decoder Philipp Zabel
@ 2017-12-07 14:59 ` Philipp Zabel
2017-12-07 14:59 ` [PATCH 3/3] [media] coda: use correct offset " Philipp Zabel
1 sibling, 0 replies; 3+ messages in thread
From: Philipp Zabel @ 2017-12-07 14:59 UTC (permalink / raw)
To: linux-media; +Cc: Mauro Carvalho Chehab, kernel, Philipp Zabel
The MPEG-4 decoder mvcol buffer was registered, but its size not added
to a frame buffer allocation. This could cause the decoder to write past
the end of the allocated buffer for large frame sizes.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/platform/coda/coda-bit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 87002bede5ea1..32db1227d0258 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -414,8 +414,10 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx,
size = round_up(ysize, 4096) + ysize / 2;
else
size = ysize + ysize / 2;
- if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 &&
- dev->devtype->product != CODA_DX6)
+ /* Add space for mvcol buffers */
+ if (dev->devtype->product != CODA_DX6 &&
+ (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 ||
+ (ctx->codec->src_fourcc == V4L2_PIX_FMT_MPEG4 && i == 0)))
size += ysize / 4;
name = kasprintf(GFP_KERNEL, "fb%d", i);
if (!name) {
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] [media] coda: use correct offset for mpeg4 decoder mvcol buffer
2017-12-07 14:59 [PATCH 1/3] [media] coda: round up frame sizes to multiples of 16 for MPEG-4 decoder Philipp Zabel
2017-12-07 14:59 ` [PATCH 2/3] [media] coda: allocate space for mpeg4 decoder mvcol buffer Philipp Zabel
@ 2017-12-07 14:59 ` Philipp Zabel
1 sibling, 0 replies; 3+ messages in thread
From: Philipp Zabel @ 2017-12-07 14:59 UTC (permalink / raw)
To: linux-media; +Cc: Mauro Carvalho Chehab, kernel, Philipp Zabel
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: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/platform/coda/coda-bit.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 32db1227d0258..9fe113cb901f8 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -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;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-07 14:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-07 14:59 [PATCH 1/3] [media] coda: round up frame sizes to multiples of 16 for MPEG-4 decoder Philipp Zabel
2017-12-07 14:59 ` [PATCH 2/3] [media] coda: allocate space for mpeg4 decoder mvcol buffer Philipp Zabel
2017-12-07 14:59 ` [PATCH 3/3] [media] coda: use correct offset " Philipp Zabel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.