Merge branch 'CR_8286_exit_cam_zejian.su' into 'jh7110-master'

CR_8286: Queue one more buffer to the isp pipeline See merge request sdk/buildroot!157
2023-12-06 09:52:33 +00:00
parent b26aeff97c bda973be30
commit 6328533502
3 changed files with 40 additions and 2 deletions
@@ -0,0 +1,38 @@
+From 06f16b0b104d7a00a9d44a3fdef434db7e9a3c08 Mon Sep 17 00:00:00 2001
+From: "zejian.su" <zejian.su@starfivetech.com>
+Date: Tue, 5 Dec 2023 16:43:06 +0800
+Subject: [PATCH] Queue one more buffer to the isp pipeline.
+
+If need n frames from the starfive isp pipeline, it need to queue n+1 buffer to it.
+So one more buffer should be fed to the pipeline.
+
+Signed-off-by: zejian.su <zejian.su@starfivetech.com>
+---
+ src/apps/cam/camera_session.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
+index 8fcec630..a730570b 100644
+--- a/src/apps/cam/camera_session.cpp
+++ b/src/apps/cam/camera_session.cpp
+@@ -339,7 +339,7 @@ int CameraSession::startCapture()
+ 
+ int CameraSession::queueRequest(Request *request)
+ {
+-	if (captureLimit_ && queueCount_ >= captureLimit_)
+	if (captureLimit_ && queueCount_ > captureLimit_)
+ 		return 0;
+ 
+ 	if (script_)
+@@ -371,7 +371,7 @@ void CameraSession::processRequest(Request *request)
+ 	 * capture limit is reached and we don't want to emit the signal every
+ 	 * single time.
+ 	 */
+-	if (captureLimit_ && captureCount_ >= captureLimit_)
+	if (captureLimit_ && captureCount_ > captureLimit_)
+ 		return;
+ 
+ 	const Request::BufferMap &buffers = request->buffers();
+-- 
+2.34.1
+
@@ -1,3 +1,3 @@
-sha256 843dc93048bed9a1d6890ddc54dc83669cba0e2be95ab0a52f6f6dadd9d71416  libcamera-6b51f180d9e720a38b1947309c27a01bd048ab5d-br1.tar.gz
+sha256 a9dfa421a2e4bc9c8e7859c965f9e813c5b74657458d803a21c3491c731b6ea9  libcamera-0e986c920e7c4b46d3b7947cb53a2274f1a8bd80-br1.tar.gz


@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBCAMERA_VERSION = 6b51f180d9e720a38b1947309c27a01bd048ab5d
+LIBCAMERA_VERSION = 0e986c920e7c4b46d3b7947cb53a2274f1a8bd80
 LIBCAMERA_SITE = https://github.com/starfive-tech/libcamera
 LIBCAMERA_SITE_METHOD = git