Commit abb4718c authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Set sequence number correctly 



Set the sequence number in vb2_v4l2_buffer mainly so the
latest v4l2-ctl reports the frame rate correctly.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a26be06d

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+4 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
	} else {

		buf->vb.vb2_buf.timestamp = ktime_get_ns();

	}

	buf->vb.sequence = dev->capture.sequence++;



	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);

	if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
@@ -515,6 +516,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) 
	/* enable frame capture */

	dev->capture.frame_count = 1;



	/* reset sequence number */

	dev->capture.sequence = 0;



	/* if the preview is not already running, wait for a few frames for AGC

	 * to settle down.

	 */

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ struct bm2835_mmal_dev { 
		s64         vc_start_timestamp;

		/* Kernel start timestamp for streaming */

		ktime_t kernel_start_ts;

		/* Sequence number of last buffer */

		u32		sequence;



		struct vchiq_mmal_port  *port; /* port being used for capture */

		/* camera port being used for capture */

CRA Git | Maintained and supported by SUSTech CRA and CCSE