From: Dave Stevenson <dave.steven...@raspberrypi.org>
Set the sequence number in vb2_v4l2_buffer mainly so the
latest v4l2-ctl reports the frame rate correctly.
Signed-off-by: Dave Stevenson <dave.steven...@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahre...@gmx.net>
Acked-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+sams...@kernel.org>
---
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 ++++
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 5a51e4d..167c218 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -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.
*/
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
index d9f0411..b5fce38 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
@@ -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 */
--
2.7.4
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
