From 5f56c29fab381211373772d7ed20f4690bb1421c Mon Sep 17 00:00:00 2001 From: Eric Claeys <83164203+EricClaeys@users.noreply.github.com> Date: Thu, 6 Jul 2023 21:05:00 -0500 Subject: [PATCH] Update capture_RPi.cpp: add extraargs to end of cmd line This means the extra args will overwrite anything already on the command line. --- src/capture_RPi.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/capture_RPi.cpp b/src/capture_RPi.cpp index 5ae009303..a707fab29 100644 --- a/src/capture_RPi.cpp +++ b/src/capture_RPi.cpp @@ -82,14 +82,6 @@ int RPicapture(config cg, cv::Mat *image) ss << cg.fullFilename; command += " --output '" + ss.str() + "'"; - if (*cg.extraArgs) - { - // add the extra arguments as is; do not parse them - ss.str(""); - ss << cg.extraArgs; - command += " " + ss.str(); - } - if (cg.isLibcamera) { // libcamera tuning file @@ -318,6 +310,14 @@ int RPicapture(config cg, cv::Mat *image) command += " --quality " + ss.str(); } + if (*cg.extraArgs) + { + // add the extra arguments as is; do not parse them + ss.str(""); + ss << cg.extraArgs; + command += " " + ss.str(); + } + // Log the command we're going to run without the // LIBCAMERA_LOG... // string and without any redirect of stdout or stderr.