brcm2708: rename target to bcm27xx
[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0441-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0441-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch b/target/linux/brcm2708/patches-4.19/950-0441-staging-bcm2835-codec-Convert-V4L2-nsec-timestamps-t.patch
deleted file mode 100644 (file)
index 48bb146..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3da653227926705fe0dcb7b6057be1ca811f47b8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Fri, 10 May 2019 14:11:58 +0100
-Subject: [PATCH] staging: bcm2835-codec: Convert V4L2 nsec timestamps
- to MMAL usec
-
-V4L2 uses nsecs, whilst MMAL uses usecs, but the code wasn't converting
-between them. This upsets video encode rate control.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c     | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -823,7 +823,8 @@ static void op_buffer_cb(struct vchiq_mm
-               vb2->flags |= V4L2_BUF_FLAG_LAST;
-       }
--      vb2->vb2_buf.timestamp = mmal_buf->pts;
-+      /* vb2 timestamps in nsecs, mmal in usecs */
-+      vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
-       vb2_set_plane_payload(&vb2->vb2_buf, 0, mmal_buf->length);
-       if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
-@@ -847,6 +848,7 @@ static void op_buffer_cb(struct vchiq_mm
- static void vb2_to_mmal_buffer(struct m2m_mmal_buffer *buf,
-                              struct vb2_v4l2_buffer *vb2)
- {
-+      u64 pts;
-       buf->mmal.mmal_flags = 0;
-       if (vb2->flags & V4L2_BUF_FLAG_KEYFRAME)
-               buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_FLAG_KEYFRAME;
-@@ -869,7 +871,10 @@ static void vb2_to_mmal_buffer(struct m2
-       if (!buf->mmal.length || vb2->flags & V4L2_BUF_FLAG_LAST)
-               buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_FLAG_EOS;
--      buf->mmal.pts = vb2->vb2_buf.timestamp;
-+      /* vb2 timestamps in nsecs, mmal in usecs */
-+      pts = vb2->vb2_buf.timestamp;
-+      do_div(pts, 1000);
-+      buf->mmal.pts = pts;
-       buf->mmal.dts = MMAL_TIME_UNKNOWN;
- }