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

[media] v4l: Timestamp flags will soon contain timestamp source, not just type 



Mask out other bits when comparing timestamp types.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ade48681

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

+4 −2
Original line number Diff line number Diff line
@@ -1473,7 +1473,8 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) 
		 * For output buffers copy the timestamp if needed,

		 * and the timecode field and flag if needed.

		 */

		if (q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_COPY)

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

		    V4L2_BUF_FLAG_TIMESTAMP_COPY)

			vb->v4l2_buf.timestamp = b->timestamp;

		vb->v4l2_buf.flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;

		if (b->flags & V4L2_BUF_FLAG_TIMECODE)
@@ -2230,7 +2231,8 @@ int vb2_queue_init(struct vb2_queue *q) 
		return -EINVAL;



	/* Warn that the driver should choose an appropriate timestamp type */

	WARN_ON(q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);

	WARN_ON((q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) ==

		V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);



	INIT_LIST_HEAD(&q->queued_list);

	INIT_LIST_HEAD(&q->done_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE