Patch Detail
Show a patch.
GET /api/1.1/patches/17058/?format=api
{ "id": 17058, "url": "https://patchwork.libcamera.org/api/1.1/patches/17058/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17058/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220809205042.344923-7-utkarsh02t@gmail.com>", "date": "2022-08-09T20:50:40", "name": "[libcamera-devel,v7,6/8] qcam: CamSelectDialog: Add capture script button", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5ed8485bc953ebb14b9e99f25167341dfa5b8cd4", "submitter": { "id": 114, "url": "https://patchwork.libcamera.org/api/1.1/people/114/?format=api", "name": "Utkarsh Tiwari", "email": "utkarsh02t@gmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17058/mbox/", "series": [ { "id": 3400, "url": "https://patchwork.libcamera.org/api/1.1/series/3400/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3400", "date": "2022-08-09T20:50:34", "name": "Introduce capture scripts to qcam", "version": 7, "mbox": "https://patchwork.libcamera.org/series/3400/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17058/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17058/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 81292BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 9 Aug 2022 20:53:20 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2D33463330;\n\tTue, 9 Aug 2022 22:53:20 +0200 (CEST)", "from mail-pg1-x536.google.com (mail-pg1-x536.google.com\n\t[IPv6:2607:f8b0:4864:20::536])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8FF2263326\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 9 Aug 2022 22:53:18 +0200 (CEST)", "by mail-pg1-x536.google.com with SMTP id r22so10050094pgm.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 09 Aug 2022 13:53:18 -0700 (PDT)", "from localhost.localdomain ([2404:bd00:3:d2bc:2358:3bcd:fb4f:cbb7])\n\tby smtp.gmail.com with ESMTPSA id\n\td3-20020a623603000000b0052d981e7842sm301936pfa.208.2022.08.09.13.53.15\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Aug 2022 13:53:16 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660078400;\n\tbh=yGiyvD6CNzKoNXt3g9zqrzvMZXD/w3VQgQy4aizvZzM=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=gTwQe/XHYnID/ZV7fT7Nef4XdeTnVomAgWRBcnC+X9Bs3eaAXC9+BXAgRNMdEyXc3\n\tKOX/vLB6ZQiBht7cRccVaFFpGzxZKEQMIFHbFp67QcL+qhnYixdY2crMruSSro4sAR\n\t61TkWp7tsSbgCWNTONHMcxi4L5DDsekHUfocEIqtywDsyTMFjVOdStjC7uxhFMcA4w\n\tfksy7fi4DSf2a9ESTxYHyrEOaN/pC+iupA5tC2PDQzJSKvXCCE6CWK+gdg8NNERhPv\n\tOdj8RlfSg4Jhifq1wmFAfhk0SYM58yV54a54lcw2oPkUeIYkB67Xtgt27EFE6qvj8i\n\tTLeUXK8BliNpg==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc;\n\tbh=Mcr64yjVCfEAXiluxTvpzmJGc/Y98mtU/N/B27cP2jA=;\n\tb=IU+10EBmKTgtfPDDrs1ecW+INRHl2FQo/JncMdpxpdMsybAIIn2GvrnsH+QM45CaJw\n\t8C34zAnl7GOcYFhrNsb1a7izIOYA4SThF6xMVjkJy60t0kgmIgZwYzUPa4CGdKCBJ0sA\n\tWsZRnz5+4Za493e4TMbW87Y7FWhk8R+2R8qpgX1cOj+UHe42nHrolVCubrbt3JpccT6z\n\tb/S7pcaob23oXNPaB+Nw8gle3FsyKF66fumRr0cPgj4GxKcJ1x2s/Y7WmkqUIcRYfROL\n\thogSbAUJSR8pX+Nquub0ij/PEi1dYWdeo+O6kHqB+OsSysoST4W3IGOD4pZktF8QL/pX\n\tcwSg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"IU+10EBm\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc;\n\tbh=Mcr64yjVCfEAXiluxTvpzmJGc/Y98mtU/N/B27cP2jA=;\n\tb=AYPqx1QCNk9famHxlCgw7ORXkcbF1BEiPy1/ludvhW3cGnZyRgN9o08InDSjL4vYvH\n\tac1n6zL4dqMaTbWv1IQ/C9nrESh+75Th58kgA956v5vDrEmrk74Rhi5L25oQc41aWSym\n\tS0SF25RV92w+hb6754Bq7C2LpnHQ6JZqugAr/Cl382RflucFBUwjXQ5VRY4eLSQOSON8\n\t7rdrp1mFnVy9LU5imomi6rnk0R52PvbbdLdLURDICAAw6pgu82tvo7s5ibw52DYR38Zh\n\tFJ2CZBmHCdCETuNKYooMJ20ZVAClIDjx4rfh6GKntOg3f30JqAuEC6EVrriVtJHskL8k\n\thq2w==", "X-Gm-Message-State": "ACgBeo3ZX3A3nYtGn7cHO60tWCTAaRfAF7s5gTT1nsc30fFVRPSLY9sR\n\tnN4RDToc1S/EXtUHfxQJ20gyaampfI0=", "X-Google-Smtp-Source": "AA6agR41oW00X1WTf9EjnSirkTrq5QzprDsLoyRYioVEjt5P1WQ8jQ/XVaVRM0CsKi4hIxb58v7GFg==", "X-Received": "by 2002:a63:1021:0:b0:41c:89f8:f4f4 with SMTP id\n\tf33-20020a631021000000b0041c89f8f4f4mr21058880pgl.416.1660078396830; \n\tTue, 09 Aug 2022 13:53:16 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 10 Aug 2022 02:20:40 +0530", "Message-Id": "<20220809205042.344923-7-utkarsh02t@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220809205042.344923-1-utkarsh02t@gmail.com>", "References": "<20220809205042.344923-1-utkarsh02t@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v7 6/8] qcam: CamSelectDialog: Add capture\n\tscript button", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Utkarsh Tiwari via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Utkarsh Tiwari <utkarsh02t@gmail.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Implement an Capture Script in CamSelectDialog button which would allow\nthe user to open a Capture Script (*.yaml).\nThis button has three states :\n - Open Capture Script\n - Loaded\n - Stop the execution of current capture script\n\nWhen being clicked in open state, present them with a QFileDialog to\nallow user to select a single file. When the script is loaded the button\ndisplays \"Loaded\", the script has not been verified yet. Verifying the\nscript and executing it happens after user presses Ok.\n\nIntroduce a queueCount_ to keep track of the requests queued.\n\nWhen stopping the execution of the capture script the queueCount_ is not\nreseted and the capture is continues as it is (i.e it is not stopped or\nrestarted).\n\nRequests are queued with any controls the script matching the current\nqueueCount_.\n\nSigned-off-by: Utkarsh Tiwari <utkarsh02t@gmail.com>\n---\nDifference:\n\t1. override accept and reject to handle capture script paths.\n src/qcam/cam_select_dialog.cpp | 68 ++++++++++++++++++++++++++++++++--\n src/qcam/cam_select_dialog.h | 21 ++++++++++-\n src/qcam/main_window.cpp | 59 ++++++++++++++++++++++++++++-\n src/qcam/main_window.h | 7 ++++\n src/qcam/meson.build | 2 +\n 5 files changed, 152 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/qcam/cam_select_dialog.cpp b/src/qcam/cam_select_dialog.cpp\nindex f97ad6eb..f3df9970 100644\n--- a/src/qcam/cam_select_dialog.cpp\n+++ b/src/qcam/cam_select_dialog.cpp\n@@ -20,8 +20,8 @@\n #include <QString>\n \n CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManager,\n-\t\t\t\t\t QWidget *parent)\n-\t: QDialog(parent), cm_(cameraManager)\n+\t\t\t\t\t bool isScriptRunning, QWidget *parent)\n+\t: QDialog(parent), cm_(cameraManager), isScriptRunning_(isScriptRunning)\n {\n \t/* Use a QFormLayout for the dialog. */\n \tQFormLayout *layout = new QFormLayout(this);\n@@ -39,6 +39,16 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag\n \tconnect(cameraIdComboBox_, &QComboBox::currentTextChanged,\n \t\tthis, &CameraSelectorDialog::handleCameraChange);\n \n+\tcaptureScriptButton_ = new QPushButton;\n+\tconnect(captureScriptButton_, &QPushButton::clicked,\n+\t\tthis, &CameraSelectorDialog::handleCaptureScriptButton);\n+\n+\t/* Display the action that would be performed when button is clicked. */\n+\tif (isScriptRunning_)\n+\t\tcaptureScriptButton_->setText(\"Stop\");\n+\telse\n+\t\tcaptureScriptButton_->setText(\"Open\");\n+\n \t/* Setup the QDialogButton Box */\n \tQDialogButtonBox *buttonBox =\n \t\tnew QDialogButtonBox(QDialogButtonBox::Ok |\n@@ -50,10 +60,10 @@ CameraSelectorDialog::CameraSelectorDialog(libcamera::CameraManager *cameraManag\n \t\tthis, &QDialog::reject);\n \n \t/* Set the layout. */\n-\n \tlayout->addRow(\"Camera:\", cameraIdComboBox_);\n \tlayout->addRow(\"Location:\", cameraLocation_);\n \tlayout->addRow(\"Model:\", cameraModel_);\n+\tlayout->addRow(\"Capture Script:\", captureScriptButton_);\n \tlayout->addWidget(buttonBox);\n }\n \n@@ -62,6 +72,11 @@ std::string CameraSelectorDialog::getCameraId()\n \treturn cameraIdComboBox_->currentText().toStdString();\n }\n \n+std::string CameraSelectorDialog::getCaptureScript()\n+{\n+\treturn scriptPath_;\n+}\n+\n /* Hotplug / Unplug Support. */\n void CameraSelectorDialog::cameraAdded(libcamera::Camera *camera)\n {\n@@ -115,3 +130,50 @@ void CameraSelectorDialog::updateCamInfo(const std::shared_ptr<libcamera::Camera\n \n \tcameraModel_->setText(QString::fromStdString(model));\n }\n+\n+/* Capture script support. */\n+void CameraSelectorDialog::handleCaptureScriptButton()\n+{\n+\tif (isScriptRunning_) {\n+\t\tQ_EMIT stopCaptureScript();\n+\t\tisScriptRunning_ = false;\n+\t\tcaptureScriptButton_->setText(\"Open\");\n+\t} else {\n+\t\tselectedScriptPath_ = QFileDialog::getOpenFileName(this,\n+\t\t\t\t\t\t\t\t \"Run Capture Script\", QDir::currentPath(),\n+\t\t\t\t\t\t\t\t \"Capture Script (*.yaml)\")\n+\t\t\t\t\t .toStdString();\n+\n+\t\tif (!selectedScriptPath_.empty())\n+\t\t\tcaptureScriptButton_->setText(\"Loaded\");\n+\t\telse\n+\t\t\tcaptureScriptButton_->setText(\"Open\");\n+\t}\n+}\n+\n+void CameraSelectorDialog::accept()\n+{\n+\tscriptPath_ = selectedScriptPath_;\n+\tQDialog::accept();\n+}\n+\n+void CameraSelectorDialog::reject()\n+{\n+\tif (isScriptRunning_)\n+\t\tselectedScriptPath_ = scriptPath_;\n+\tQDialog::reject();\n+}\n+\n+void CameraSelectorDialog::informScriptReset()\n+{\n+\tisScriptRunning_ = false;\n+\tscriptPath_.clear();\n+\tcaptureScriptButton_->setText(\"Open\");\n+}\n+\n+void CameraSelectorDialog::informScriptRunning(std::string scriptPath)\n+{\n+\tisScriptRunning_ = true;\n+\tscriptPath_ = scriptPath;\n+\tcaptureScriptButton_->setText(\"Stop\");\n+}\ndiff --git a/src/qcam/cam_select_dialog.h b/src/qcam/cam_select_dialog.h\nindex 359df811..56d90596 100644\n--- a/src/qcam/cam_select_dialog.h\n+++ b/src/qcam/cam_select_dialog.h\n@@ -17,8 +17,10 @@\n #include <QComboBox>\n #include <QDialog>\n #include <QDialogButtonBox>\n+#include <QFileDialog>\n #include <QFormLayout>\n #include <QLabel>\n+#include <QPushButton>\n #include <QString>\n \n class CameraSelectorDialog : public QDialog\n@@ -26,12 +28,14 @@ class CameraSelectorDialog : public QDialog\n \tQ_OBJECT\n public:\n \tCameraSelectorDialog(libcamera::CameraManager *cameraManager,\n-\t\t\t QWidget *parent);\n+\t\t\t bool isScriptRunning, QWidget *parent);\n \n \t~CameraSelectorDialog() = default;\n \n \tstd::string getCameraId();\n \n+\tstd::string getCaptureScript();\n+\n \t/* Hotplug / Unplug Support. */\n \tvoid cameraAdded(libcamera::Camera *camera);\n \n@@ -41,11 +45,26 @@ public:\n \tvoid updateCamInfo(const std::shared_ptr<libcamera::Camera> &camera);\n \tvoid handleCameraChange();\n \n+\t/* Capture script support. */\n+\tvoid handleCaptureScriptButton();\n+\tvoid informScriptReset();\n+\tvoid informScriptRunning(std::string scriptPath);\n+\tvoid accept() override;\n+\tvoid reject() override;\n+\n+Q_SIGNALS:\n+\tvoid stopCaptureScript();\n+\n private:\n \tlibcamera::CameraManager *cm_;\n \n+\tbool isScriptRunning_;\n+\tstd::string scriptPath_;\n+\tstd::string selectedScriptPath_;\n+\n \t/* UI elements. */\n \tQComboBox *cameraIdComboBox_;\n \tQLabel *cameraLocation_;\n \tQLabel *cameraModel_;\n+\tQPushButton *captureScriptButton_;\n };\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 3feabcff..d73fb42a 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -9,6 +9,7 @@\n \n #include <assert.h>\n #include <iomanip>\n+#include <memory>\n #include <string>\n \n #include <libcamera/camera_manager.h>\n@@ -19,6 +20,7 @@\n #include <QFileDialog>\n #include <QImage>\n #include <QImageWriter>\n+#include <QMessageBox>\n #include <QMutexLocker>\n #include <QStandardPaths>\n #include <QStringList>\n@@ -151,6 +153,9 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n \t\treturn;\n \t}\n \n+\t/* Start capture script. */\n+\tloadCaptureScript();\n+\n \tstartStopAction_->setChecked(true);\n }\n \n@@ -289,10 +294,53 @@ void MainWindow::switchCamera()\n \tstartStopAction_->setChecked(true);\n }\n \n+void MainWindow::stopCaptureScript()\n+{\n+\tif (script_) {\n+\t\tscript_.reset();\n+\t\tcameraSelectorDialog_->informScriptReset();\n+\t}\n+}\n+\n+void MainWindow::loadCaptureScript()\n+{\n+\tif (scriptPath_.empty() || camera_ == nullptr)\n+\t\treturn;\n+\n+\tscript_ = std::make_unique<CaptureScript>(camera_, scriptPath_);\n+\n+\t/*\n+\t * If we are already capturing, stop so we don't have stuck image\n+\t * in viewfinder.\n+\t */\n+\tbool wasCapturing = isCapturing_;\n+\tif (isCapturing_)\n+\t\ttoggleCapture(false);\n+\n+\tif (!script_->valid()) {\n+\t\tscript_.reset();\n+\t\tcameraSelectorDialog_->informScriptReset();\n+\n+\t\tQMessageBox::critical(this, \"Invalid Script\",\n+\t\t\t\t \"Couldn't load the capture script\");\n+\n+\t} else\n+\t\tcameraSelectorDialog_->informScriptRunning(scriptPath_);\n+\n+\t/* Start capture again if we were capturing before. */\n+\tif (wasCapturing)\n+\t\ttoggleCapture(true);\n+}\n+\n std::string MainWindow::chooseCamera()\n {\n+\tbool scriptRunning = script_ != nullptr;\n+\n \t/* Construct the selection dialog, unconditionally. */\n-\tcameraSelectorDialog_ = new CameraSelectorDialog(cm_, this);\n+\tcameraSelectorDialog_ = new CameraSelectorDialog(cm_, scriptRunning, this);\n+\n+\tconnect(cameraSelectorDialog_, &CameraSelectorDialog::stopCaptureScript,\n+\t\tthis, &MainWindow::stopCaptureScript);\n \n \t/*\n \t * Use the camera specified on the command line, if any, or display the\n@@ -305,6 +353,9 @@ std::string MainWindow::chooseCamera()\n \t\tstd::string cameraId = cameraSelectorDialog_->getCameraId();\n \t\tcameraSelectButton_->setText(QString::fromStdString(cameraId));\n \n+\t\tscriptPath_ = cameraSelectorDialog_->getCaptureScript();\n+\t\tloadCaptureScript();\n+\n \t\treturn cameraId;\n \t} else\n \t\treturn std::string();\n@@ -502,6 +553,7 @@ int MainWindow::startCapture()\n \tpreviousFrames_ = 0;\n \tframesCaptured_ = 0;\n \tlastBufferTime_ = 0;\n+\tqueueCount_ = 0;\n \n \tret = camera_->start();\n \tif (ret) {\n@@ -779,5 +831,10 @@ void MainWindow::renderComplete(FrameBuffer *buffer)\n \n int MainWindow::queueRequest(Request *request)\n {\n+\tif (script_)\n+\t\trequest->controls() = script_->frameControls(queueCount_);\n+\n+\tqueueCount_++;\n+\n \treturn camera_->queueRequest(request);\n }\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex bd6f0172..887f1db1 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -28,6 +28,7 @@\n #include <QQueue>\n #include <QTimer>\n \n+#include \"../cam/capture_script.h\"\n #include \"../cam/stream_options.h\"\n \n #include \"cam_select_dialog.h\"\n@@ -90,6 +91,9 @@ private:\n \tvoid processHotplug(HotplugEvent *e);\n \tvoid processViewfinder(libcamera::FrameBuffer *buffer);\n \n+\tvoid loadCaptureScript();\n+\tvoid stopCaptureScript();\n+\n \t/* UI elements */\n \tQToolBar *toolbar_;\n \tQAction *startStopAction_;\n@@ -130,6 +134,9 @@ private:\n \tQElapsedTimer frameRateInterval_;\n \tuint32_t previousFrames_;\n \tuint32_t framesCaptured_;\n+\tuint32_t queueCount_;\n \n \tstd::vector<std::unique_ptr<libcamera::Request>> requests_;\n+\tstd::unique_ptr<CaptureScript> script_;\n+\tstd::string scriptPath_;\n };\ndiff --git a/src/qcam/meson.build b/src/qcam/meson.build\nindex 61861ea6..70a18d7e 100644\n--- a/src/qcam/meson.build\n+++ b/src/qcam/meson.build\n@@ -15,6 +15,7 @@ endif\n qcam_enabled = true\n \n qcam_sources = files([\n+ '../cam/capture_script.cpp',\n '../cam/image.cpp',\n '../cam/options.cpp',\n '../cam/stream_options.cpp',\n@@ -39,6 +40,7 @@ qcam_resources = files([\n qcam_deps = [\n libatomic,\n libcamera_public,\n+ libyaml,\n qt5_dep,\n ]\n \n", "prefixes": [ "libcamera-devel", "v7", "6/8" ] }