mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

staging: bcm2835-camera: Set sequence number correctly

Browse source 
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.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Stevenson 2019-06-29 14:48:24 +02:00 committed by Greg Kroah-Hartman
parent a26be06d6d
commit abb4718cc6
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View file

@ -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.
*/

2
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
View file

@ -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 */