On 15/09/2023 23:11, Sebastian Fricke wrote:
> Add a new flag to the `struct v4l2_m2m_dev` to toggle whether a queue
> must be streaming in order to allow queuing jobs to the ready queue.
> Currently, both queues (CAPTURE & OUTPUT) must be streaming in order to
> allow adding new jobs. This behavior limits the usability of M2M for
> some drivers, as these have to be able, to perform analysis of the
able, to -> able to
> sequence to ensure, that userspace prepares the CAPTURE queue correctly.
ensure, that -> ensure that
>
> Signed-off-by: Sebastian Fricke <sebastian.fricke@xxxxxxxxxxxxx>
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx>
> ---
> include/media/v4l2-mem2mem.h | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
> index d6c8eb2b5201..97a48e61e358 100644
> --- a/include/media/v4l2-mem2mem.h
> +++ b/include/media/v4l2-mem2mem.h
> @@ -57,6 +57,16 @@ struct v4l2_m2m_dev;
> * @rdy_spinlock: spin lock to protect the struct usage
> * @num_rdy: number of buffers ready to be processed
> * @buffered: is the queue buffered?
> + * @ignore_streaming: Dictates whether the queue must be streaming for a job to
> + * be queued.
> + * This is useful, for example, when the driver requires to
> + * initialize the sequence with a firmware, where only a
> + * queued OUTPUT queue buffer and STREAMON on the OUTPUT
> + * queue is required to perform the anlysis of the bitstream
> + * header.
> + * This means the driver is responsible for implementing the
> + * job_ready callback correctly to make sure that requirements
> + * for actual decoding are met.
This is a bad description and field name.
Basically what this field does is that, if true, the streaming state of the
capture queue is ignored. So just call it that: ignore_cap_streaming.
And explain that, if true, job_ready() will be called even if the capture
queue is not streaming, and that that can be used to allow hardware to
analyze the bitstream header that arrives on the OUTPUT queue.
Also, doesn't this field belong to struct v4l2_m2m_ctx? It makes no sense
for the output queue, this is really a configuration for the m2m context as
a whole.
> *
> * Queue for buffers ready to be processed as soon as this
> * instance receives access to the device.
> @@ -69,6 +79,7 @@ struct v4l2_m2m_queue_ctx {
> spinlock_t rdy_spinlock;
> u8 num_rdy;
> bool buffered;
> + bool ignore_streaming;
> };
>
> /**
> @@ -564,6 +575,12 @@ static inline void v4l2_m2m_set_dst_buffered(struct v4l2_m2m_ctx *m2m_ctx,
> m2m_ctx->cap_q_ctx.buffered = buffered;
> }
>
> +static inline void v4l2_m2m_set_dst_ignore_streaming(struct v4l2_m2m_ctx *m2m_ctx,
> + bool ignore_streaming)
> +{
> + m2m_ctx->cap_q_ctx.ignore_streaming = ignore_streaming;
> +}
> +
I think this is overkill, esp. when the field is moved to m2m_ctx. Just clearly
document that drivers can set this.
Regards,
Hans
> /**
> * v4l2_m2m_ctx_release() - release m2m context
> *
>
