mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
88 lines
3.3 KiB
Diff
88 lines
3.3 KiB
Diff
From 9b3e8f10d89d6c580eab3340fb1b954f99165b40 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Mon, 13 Feb 2017 11:10:50 +0000
|
|
Subject: [PATCH 198/454] BCM2835-V4L2: Ensure H264 header bytes get a sensible
|
|
timestamp
|
|
|
|
H264 header come off 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
|
|
@@ -341,8 +341,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) {
|
|
struct timeval timestamp;
|
|
s64 runtime_us = pts -
|
|
dev->capture.vc_start_timestamp;
|
|
@@ -375,10 +380,27 @@ static void buffer_cb(struct vchiq_mmal_
|
|
buf->vb.vb2_buf.timestamp = timestamp.tv_sec * 1000000000ULL +
|
|
timestamp.tv_usec * 1000ULL;
|
|
} 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 =
|
|
+ dev->capture.kernel_start_ts.tv_sec * 1000000000ULL +
|
|
+ dev->capture.kernel_start_ts.tv_usec * 1000ULL;
|
|
+ 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 &&
|
|
@@ -547,6 +569,8 @@ static int start_streaming(struct vb2_qu
|
|
"Start time %lld size %d\n",
|
|
dev->capture.vc_start_timestamp, parameter_size);
|
|
|
|
+ dev->capture.last_timestamp = 0;
|
|
+
|
|
v4l2_get_timestamp(&dev->capture.kernel_start_ts);
|
|
|
|
/* enable the camera port */
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
|
|
@@ -93,6 +93,8 @@ struct bm2835_mmal_dev {
|
|
s64 vc_start_timestamp;
|
|
/* Kernel start timestamp for streaming */
|
|
struct timeval 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 */
|