HI,
On Thu, 2019-01-24 at 09:47 +0100, Hans Verkuil wrote:
> There really is no reason why vb2_find_timestamp can't just find
> buffers in any state. Drop that part of the test.
>
> This also means that vb->timestamp should only be set to 0 when
> the driver doesn't copy timestamps.
>
> This change allows for more efficient pipelining (i.e. you can use
> a buffer for a reference frame even when it is queued).
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@xxxxxxxxxxx>
I guess I'll prepare a new patch to revert the change I made earlier
for cedrus, since it's no longer needed!
Cheers,
Paul
> ---
> Changes since v1: set timestamp to 0 unless copy_timestamp is set instead of also
> checking whether it is an output queue.
> ---
> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> index 75ea90e795d8..2a093bff0bf5 100644
> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> @@ -567,7 +567,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, struct vb2_plane *planes)
> struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
> unsigned int plane;
>
> - if (!vb->vb2_queue->is_output || !vb->vb2_queue->copy_timestamp)
> + if (!vb->vb2_queue->copy_timestamp)
> vb->timestamp = 0;
>
> for (plane = 0; plane < vb->num_planes; ++plane) {
> @@ -594,14 +594,9 @@ int vb2_find_timestamp(const struct vb2_queue *q, u64 timestamp,
> {
> unsigned int i;
>
> - for (i = start_idx; i < q->num_buffers; i++) {
> - struct vb2_buffer *vb = q->bufs[i];
> -
> - if ((vb->state == VB2_BUF_STATE_DEQUEUED ||
> - vb->state == VB2_BUF_STATE_DONE) &&
> - vb->timestamp == timestamp)
> + for (i = start_idx; i < q->num_buffers; i++)
> + if (q->bufs[i]->timestamp == timestamp)
> return i;
> - }
> return -1;
> }
> EXPORT_SYMBOL_GPL(vb2_find_timestamp);
> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
> index a9961bc776dc..8a10889dc2fd 100644
> --- a/include/media/videobuf2-v4l2.h
> +++ b/include/media/videobuf2-v4l2.h
> @@ -59,8 +59,7 @@ struct vb2_v4l2_buffer {
> * vb2_find_timestamp() - Find buffer with given timestamp in the queue
> *
> * @q: pointer to &struct vb2_queue with videobuf2 queue.
> - * @timestamp: the timestamp to find. Only buffers in state DEQUEUED or DONE
> - * are considered.
> + * @timestamp: the timestamp to find.
> * @start_idx: the start index (usually 0) in the buffer array to start
> * searching from. Note that there may be multiple buffers
> * with the same timestamp value, so you can restart the search
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
