You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
6 years ago
|
From 8e15cefda972657178522ceb72c834ecd6ed9380 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||
|
|
Date: Thu, 21 Jun 2018 17:02:14 +0100
|
||
|
|
Subject: [PATCH 407/454] 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: Dave Stevenson <dave.stevenson@raspberrypi.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(+)
|
||
|
|
|
||
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
@@ -416,6 +416,7 @@ static void buffer_cb(struct vchiq_mmal_
|
||
|
|
}
|
||
|
|
}
|
||
|
|
dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
|
||
|
|
+ buf->vb.sequence = dev->capture.sequence++;
|
||
|
|
|
||
|
|
vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
|
||
|
|
if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
|
||
|
|
@@ -544,6 +545,9 @@ static int start_streaming(struct vb2_qu
|
||
|
|
/* 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.
|
||
|
|
*/
|
||
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
|
||
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
|
||
|
|
@@ -96,6 +96,8 @@ struct bm2835_mmal_dev {
|
||
|
|
ktime_t kernel_start_ts;
|
||
|
|
/* Timestamp of last frame */
|
||
|
|
u64 last_timestamp;
|
||
|
|
+ /* Sequence number of last buffer */
|
||
|
|
+ u32 sequence;
|
||
|
|
|
||
|
|
struct vchiq_mmal_port *port; /* port being used for capture */
|
||
|
|
/* camera port being used for capture */
|