aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch13
1 files changed, 9 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch b/target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch
index 1c9277f8eb..3efa7660bf 100644
--- a/target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch
+++ b/target/linux/brcm2708/patches-3.10/0140-V4L2-Fix-JPEG-timestamp-issue.patch
@@ -1,7 +1,7 @@
-From 126bd13f65c8e88fd4eb037433ab39f7faf803ca Mon Sep 17 00:00:00 2001
+From a1eed4a5fcd05d266f68dd30fa17ba045a2a322e Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dsteve@broadcom.com>
Date: Thu, 19 Dec 2013 17:33:02 +0000
-Subject: [PATCH 140/174] V4L2: Fix JPEG timestamp issue
+Subject: [PATCH 140/196] V4L2: Fix JPEG timestamp issue
JPEG images were coming through from the GPU with timestamp
of 0. Detect this and give current system time instead
@@ -12,9 +12,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
drivers/media/platform/bcm2835/bcm2835-camera.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
+diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
+index 4766a9c..9fc90a2 100644
--- a/drivers/media/platform/bcm2835/bcm2835-camera.c
+++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
-@@ -238,7 +238,8 @@ static void buffer_cb(struct vchiq_mmal_
+@@ -238,7 +238,8 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
}
} else {
if (dev->capture.frame_count) {
@@ -24,7 +26,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
s64 runtime_us = pts -
dev->capture.vc_start_timestamp;
u32 div = 0;
-@@ -259,7 +260,7 @@ static void buffer_cb(struct vchiq_mmal_
+@@ -259,7 +260,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
USEC_PER_SEC;
}
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
@@ -33,3 +35,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
"with offset %llu to %d.%06d\n",
(int)dev->capture.kernel_start_ts.
tv_sec,
+--
+1.9.1
+