diff options
author | Hans Verkuil | 2019-02-04 11:11:33 +0100 |
---|---|---|
committer | Mauro Carvalho Chehab | 2019-02-18 20:44:20 +0100 |
commit | 7e4e71624491d8a8befe62b43138beb0ab696006 (patch) | |
tree | 9783e7926080cdfdad2b53d7c582eea07f0d7c56 /drivers/media/common/videobuf2/videobuf2-v4l2.c | |
parent | media: vb2: replace bool by bitfield in vb2_buffer (diff) | |
download | kernel-qcow2-linux-7e4e71624491d8a8befe62b43138beb0ab696006.tar.gz kernel-qcow2-linux-7e4e71624491d8a8befe62b43138beb0ab696006.tar.xz kernel-qcow2-linux-7e4e71624491d8a8befe62b43138beb0ab696006.zip |
media: vb2: keep track of timestamp status
If a stream is stopped, or if a USERPTR/DMABUF buffer is queued
backed by a different user address or dmabuf fd, then the timestamp
should be skipped by vb2_find_timestamp since the memory it refers
to is no longer valid.
So keep track of a 'copied_timestamp' state: it is set when the
timestamp is copied from an output to a capture buffer, and is
cleared when it is no longer valid.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/common/videobuf2/videobuf2-v4l2.c')
-rw-r--r-- | drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 3aeaea3af42a..55277370c313 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -604,7 +604,8 @@ int vb2_find_timestamp(const struct vb2_queue *q, u64 timestamp, unsigned int i; for (i = start_idx; i < q->num_buffers; i++) - if (q->bufs[i]->timestamp == timestamp) + if (q->bufs[i]->copied_timestamp && + q->bufs[i]->timestamp == timestamp) return i; return -1; } |