media: coda: mark last returned frame
authorPhilipp Zabel <p.zabel@pengutronix.de>
Tue, 18 Jun 2019 16:45:32 +0000 (12:45 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 24 Jun 2019 18:45:53 +0000 (14:45 -0400)
If reordering is not enabled, the last decoded frame has to be the last
returned buffer. Otherwise wait for the firmware to report no more
frame to display. In that case the return buffer is the last one as
well, and can be reported as such.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/coda/coda-bit.c

index 1157454..167a927 100644 (file)
@@ -2381,6 +2381,23 @@ static void coda_finish_decode(struct coda_ctx *ctx)
                                             V4L2_BUF_FLAG_BFRAME);
                dst_buf->flags |= ready_frame->type;
                meta = &ready_frame->meta;
+               if (meta->last && !coda_reorder_enable(ctx)) {
+                       /*
+                        * If this was the last decoded frame, and reordering
+                        * is disabled, this will be the last display frame.
+                        */
+                       coda_dbg(1, ctx, "last meta, marking as last frame\n");
+                       dst_buf->flags |= V4L2_BUF_FLAG_LAST;
+               } else if (ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG &&
+                          display_idx == -1) {
+                       /*
+                        * If there is no designated presentation frame anymore,
+                        * this frame has to be the last one.
+                        */
+                       coda_dbg(1, ctx,
+                                "no more frames to return, marking as last frame\n");
+                       dst_buf->flags |= V4L2_BUF_FLAG_LAST;
+               }
                dst_buf->timecode = meta->timecode;
                dst_buf->vb2_buf.timestamp = meta->timestamp;