Commit 7ce6fd8f authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Handle buffer timestamp flags correctly 



For COPY timestamps, buffer timestamp source flags will traverse the queue
untouched.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 872484ce

drivers/media/v4l2-core/videobuf2-core.c

+20 −1
Original line number Diff line number Diff line
@@ -488,7 +488,16 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b) 
	 * Clear any buffer state related flags.

	 */

	b->flags &= ~V4L2_BUFFER_MASK_FLAGS;

	b->flags |= q->timestamp_flags;

	b->flags |= q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK;

	if ((q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) !=

	    V4L2_BUF_FLAG_TIMESTAMP_COPY) {

		/*

		 * For non-COPY timestamps, drop timestamp source bits

		 * and obtain the timestamp source from the queue.

		 */

		b->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;

		b->flags |= q->timestamp_flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;

	}



	switch (vb->state) {

	case VB2_BUF_STATE_QUEUED:
@@ -1031,6 +1040,16 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b 


	/* Zero flags that the vb2 core handles */

	vb->v4l2_buf.flags = b->flags & ~V4L2_BUFFER_MASK_FLAGS;

	if ((vb->vb2_queue->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) !=

	    V4L2_BUF_FLAG_TIMESTAMP_COPY || !V4L2_TYPE_IS_OUTPUT(b->type)) {

		/*

		 * Non-COPY timestamps and non-OUTPUT queues will get

		 * their timestamp and timestamp source flags from the

		 * queue.

		 */

		vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;

	}



	if (V4L2_TYPE_IS_OUTPUT(b->type)) {

		/*

		 * For output buffers mask out the timecode flag:

CRA Git | Maintained and supported by SUSTech CRA and CCSE