brcm2708: organize kernel patches

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch b/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch
deleted file mode 100644 (file)
index b70a20e..0000000
--- a/target/linux/brcm2708/patches-4.19/950-0240-staging-bcm2835-camera-Ensure-H264-header-bytes-get-.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From bf5bbfec3cb99c469eb59f2b19411146c47feb73 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 29 Oct 2018 14:21:04 +0000
-Subject: [PATCH 240/806] staging: bcm2835-camera: Ensure H264 header bytes get
- a sensible timestamp
-
-H264 header come from VC with 0 timestamps, which means they get a
-strange timestamp when processed with VC/kernel start times,
-particularly if used with the inline header option.
-Remember the last frame timestamp and use that if set, or otherwise
-use the kernel start time.
-
-https://github.com/raspberrypi/linux/issues/1836
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../bcm2835-camera/bcm2835-camera.c           | 30 +++++++++++++++++--
- .../bcm2835-camera/bcm2835-camera.h           |  2 ++
- 2 files changed, 29 insertions(+), 3 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -363,8 +363,13 @@ static void buffer_cb(struct vchiq_mmal_
-               }
-       } else {
-               if (dev->capture.frame_count) {
--                      if (dev->capture.vc_start_timestamp != -1 &&
--                          pts != 0) {
-+                      if (dev->capture.vc_start_timestamp == -1) {
-+                              buf->vb.vb2_buf.timestamp = ktime_get_ns();
-+                              v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
-+                                       "Buffer time set as current time - %lld",
-+                                       buf->vb.vb2_buf.timestamp);
-+
-+                      } else if (pts != 0) {
-                               ktime_t timestamp;
-                               s64 runtime_us = pts -
-                                   dev->capture.vc_start_timestamp;
-@@ -377,10 +382,28 @@ static void buffer_cb(struct vchiq_mmal_
-                                        ktime_to_ns(timestamp));
-                               buf->vb.vb2_buf.timestamp = ktime_to_ns(timestamp);
-                       } else {
--                              buf->vb.vb2_buf.timestamp = ktime_get_ns();
-+                              if (dev->capture.last_timestamp) {
-+                                      buf->vb.vb2_buf.timestamp =
-+                                              dev->capture.last_timestamp;
-+                                      v4l2_dbg(1, bcm2835_v4l2_debug,
-+                                               &dev->v4l2_dev,
-+                                               "Buffer time set as last timestamp - %lld",
-+                                               buf->vb.vb2_buf.timestamp);
-+                              } else {
-+                                      buf->vb.vb2_buf.timestamp =
-+                                              ktime_to_ns(dev->capture.kernel_start_ts);
-+                                      v4l2_dbg(1, bcm2835_v4l2_debug,
-+                                               &dev->v4l2_dev,
-+                                               "Buffer time set as start timestamp - %lld",
-+                                               buf->vb.vb2_buf.timestamp);
-+                              }
-                       }
-+                      dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
- 
-                       vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
-+                      v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
-+                               "Buffer has ts %llu",
-+                               dev->capture.last_timestamp);
-                       vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
- 
-                       if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
-@@ -546,6 +569,7 @@ static int start_streaming(struct vb2_qu
-                        dev->capture.vc_start_timestamp, parameter_size);
- 
-       dev->capture.kernel_start_ts = ktime_get();
-+      dev->capture.last_timestamp = 0;
- 
-       /* enable the camera port */
-       dev->capture.port->cb_ctx = dev;
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-@@ -90,6 +90,8 @@ struct bm2835_mmal_dev {
-               s64         vc_start_timestamp;
-               /* Kernel start timestamp for streaming */
-               ktime_t kernel_start_ts;
-+              /* Timestamp of last frame */
-+              u64             last_timestamp;
- 
-               struct vchiq_mmal_port  *port; /* port being used for capture */
-               /* camera port being used for capture */