Patch Detail
Show a patch.
GET /api/patches/17094/?format=api
{ "id": 17094, "url": "https://patchwork.libcamera.org/api/patches/17094/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17094/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20220812121539.21441-1-utkarsh02t@gmail.com>", "date": "2022-08-12T12:15:39", "name": "[libcamera-devel,v8.1,6/8] qcam: CamSelectDialog: Add capture script button", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "981a73d2db01bf28775eea7551cda75308caf135", "submitter": { "id": 114, "url": "https://patchwork.libcamera.org/api/people/114/?format=api", "name": "Utkarsh Tiwari", "email": "utkarsh02t@gmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17094/mbox/", "series": [ { "id": 3409, "url": "https://patchwork.libcamera.org/api/series/3409/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3409", "date": "2022-08-12T12:15:39", "name": null, "version": 1, "mbox": "https://patchwork.libcamera.org/series/3409/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17094/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17094/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 97D3EC3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 12 Aug 2022 12:15:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1BE7661FAB;\n\tFri, 12 Aug 2022 14:15:50 +0200 (CEST)", "from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com\n\t[IPv6:2607:f8b0:4864:20::42c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F1118603EA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Aug 2022 14:15:48 +0200 (CEST)", "by mail-pf1-x42c.google.com with SMTP id q19so794107pfg.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Aug 2022 05:15:48 -0700 (PDT)", "from localhost.localdomain ([2404:bd00:3:dc0d:d8e:96a2:2dbe:5a83])\n\tby smtp.gmail.com with ESMTPSA id\n\tik4-20020a170902ab0400b0016c0eb202a5sm1548918plb.225.2022.08.12.05.15.45\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 12 Aug 2022 05:15:46 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660306550;\n\tbh=wXin4dfZWdlxruIwocqPnvDD6DwTixXnq1/SlB4SKJU=;\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=WOoGlrxE9+RlqNP77raLifbsPuvsrE8oq/vU47NEuT7Fy0k7TAGSj1Zf0f8Nuu9rl\n\tAsFLIB+xPXfz88Ue1k5JupHf94z68NwER5opcEJ7KVIjgbgB9AGQ2cP0XXwCC8EZH+\n\t1fnsYF+DFc3C7NeJXPuLLARFadsZFeJtxs3w/a/yLLN72r+jlQf2nj3h9XUO+F0GCa\n\tFvnbVMlltYHebkinD5mLNM7Cwz4bezCeEB/9GaB/BWyn43HixxVaZd7hHEsB+f0Q6J\n\tU0Y8eapzUc4jcBAON4X3guvNa/BLgWXM2nBYtufLbWdTKlSQXbZSNK6cFzLhbnu6MA\n\tU776+QxX28Tiw==", "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=MOvtulXyMj//il5ULsG9BMva1Q2taIraU0/CKP0RhfY=;\n\tb=VxZo8eTm6YJ34cpW+0DnmUEv5ePAWrrZXvfwz6FwVE7FJrPCAOKvaWcWWWLdK5vROn\n\tW6K333koAa+o3Kho2mG3NPyNgFkupRHzfjBjyconE9htXPYtczy5TpGVYmJWaBbGqWQC\n\teFIEwy+BAxrgDvEffeoIihRH7xToz8MZg35t44XdgHFBG5seFnn2V30hFoxhxO03ZJl+\n\t5pCwme+Y4xD3XnyjflDp07U5uBJEsNthl2t341T8e6KuuBvdtw1u6Obl5Lyj7KDACsbC\n\tNwDSZCNOCPBIH+rh72bSzZ9a7pBRBCjyPJ7tFRdUtrRTDjrcPulgtRZXol1iw1E8M7h+\n\tpOyQ==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"VxZo8eTm\"; 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=MOvtulXyMj//il5ULsG9BMva1Q2taIraU0/CKP0RhfY=;\n\tb=CR8SvJmpfzWamIH3kZ8ZkJWW4L9cvjnNZeh7cPX5/rm/YVo3tMLkQOS44Kb20uzQrE\n\tZr/yRcOejh5DgwVadWJdHxi5RkWa5CCipvdnslqbibA8NjtT3g8bAfrBNJS5uFo02zw7\n\tK3y3kGzxw6zhRGS/SSHQEzbBDs9Sy3O994nEnXDHj5LZRdJ/BLUJSqisNuinWcMk9vec\n\t/gci7EX/zMAgTtXpC7xXapiOg8U9gT8qT4MsCu9xJY162I5a+24DZixmQ8Mr5T7JkWJM\n\thpoLjFDsgbvZAjRK0s3CMhYdMBgJ+HYjyr1dEL5kvgL/xZq7SWBqJZ3LFJUCou5AaUOn\n\tvGJA==", "X-Gm-Message-State": "ACgBeo1TiretGA/JstV0/Szau0RP2R1zuXC8BgjR4OKWcbbOj94j6tvZ\n\tKD6q2/yrfyPc9hwpIYssjKtnL287N5M=", "X-Google-Smtp-Source": "AA6agR4dAvuX/TjkH8razk90tShWD+MXpO/uDTbLCTH/kP5TOHtZzleqF05tVpMRagpfvZ2i9t0Wqw==", "X-Received": "by 2002:a63:1726:0:b0:41d:b30:46d4 with SMTP id\n\tx38-20020a631726000000b0041d0b3046d4mr2878327pgl.27.1660306546943; \n\tFri, 12 Aug 2022 05:15:46 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 12 Aug 2022 17:45:39 +0530", "Message-Id": "<20220812121539.21441-1-utkarsh02t@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220810150349.414043-7-utkarsh02t@gmail.com>", "References": "<20220810150349.414043-7-utkarsh02t@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8.1 6/8] qcam: CamSelectDialog: Add\n\tcapture script 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 clicked in an open state, present the user with a QFileDialog to\nallow selecting 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\nreset and the capture 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 from v8:\n\t1. selectedScriptPath_ is now cleared when informScriptReset() is invoked.\nDifference from v7:\n\t1. Fix grammetical errors in the commit message\n\t2. Intialize the cameraSelectorDialog_ to nullptr in Construct\n\t\tso we construct the CameraSelectorDialog just once\n src/qcam/cam_select_dialog.cpp | 70 ++++++++++++++++++++++++++++++++--\n src/qcam/cam_select_dialog.h | 20 +++++++++-\n src/qcam/main_window.cpp | 59 +++++++++++++++++++++++++++-\n src/qcam/main_window.h | 7 ++++\n src/qcam/meson.build | 2 +\n 5 files changed, 153 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/qcam/cam_select_dialog.cpp b/src/qcam/cam_select_dialog.cpp\nindex f97ad6eb..58cbfc28 100644\n--- a/src/qcam/cam_select_dialog.cpp\n+++ b/src/qcam/cam_select_dialog.cpp\n@@ -16,12 +16,13 @@\n #include <QComboBox>\n #include <QDialog>\n #include <QDialogButtonBox>\n+#include <QFileDialog>\n #include <QFormLayout>\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 +40,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 +61,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 +73,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 +131,51 @@ 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+\tselectedScriptPath_.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 16475af6..bbdf897e 100644\n--- a/src/qcam/cam_select_dialog.h\n+++ b/src/qcam/cam_select_dialog.h\n@@ -17,18 +17,21 @@\n #include <QComboBox>\n #include <QDialog>\n #include <QLabel>\n+#include <QPushButton>\n \n class CameraSelectorDialog : public QDialog\n {\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@@ -38,11 +41,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 bf40572a..3c7c3173 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@@ -152,6 +154,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@@ -290,11 +295,54 @@ 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, only the first time. */\n \tif (!cameraSelectorDialog_)\n-\t\tcameraSelectorDialog_ = new CameraSelectorDialog(cm_, this);\n+\t\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@@ -309,6 +357,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@@ -506,6 +557,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@@ -783,5 +835,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 d161365a..10994b67 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -27,6 +27,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@@ -89,6 +90,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", "v8.1", "6/8" ] }