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

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

[media] coda: fix job_ready debug reporting for bitstream decoding 



Clarify whether job_ready returns false because the context is on hold, waiting
for new input buffers, whether there are not enough input buffers to fill two
into the bitstream, or whether there is not enough data in the bitstream buffer
for the bitstream reader hardware to read a whole frame.

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 83f31c8a

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

+37 −9
Original line number Diff line number Diff line
@@ -939,17 +939,45 @@ static int coda_job_ready(void *m2m_priv) 
		return 0;

	}



	if (ctx->hold ||

	    ((ctx->inst_type == CODA_INST_DECODER) &&

	     !v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) &&

	     (coda_get_bitstream_payload(ctx) < 512) &&

	     !(ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG))) {

	if (ctx->inst_type == CODA_INST_DECODER) {

		struct list_head *meta;

		bool stream_end;

		int num_metas;

		int src_bufs;



		if (ctx->hold && !v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx)) {

			v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

			 "%d: not ready: not enough bitstream data.\n",

				 "%d: not ready: on hold for more buffers.\n",

				 ctx->idx);

			return 0;

		}



		stream_end = ctx->bit_stream_param &

			     CODA_BIT_STREAM_END_FLAG;



		num_metas = 0;

		list_for_each(meta, &ctx->buffer_meta_list)

			num_metas++;



		src_bufs = v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx);



		if (!stream_end && (num_metas + src_bufs) < 2) {

			v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

				 "%d: not ready: need 2 buffers available (%d, %d)\n",

				 ctx->idx, num_metas, src_bufs);

			return 0;

		}





		if (!v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) &&

		    !stream_end && (coda_get_bitstream_payload(ctx) < 512)) {

			v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

				 "%d: not ready: not enough bitstream data (%d).\n",

				 ctx->idx, coda_get_bitstream_payload(ctx));

			return 0;

		}

	}



	if (ctx->aborting) {

		v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,

			 "not ready: aborting\n");