From patchwork Wed Jun 22 13:16:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Utkarsh Tiwari X-Patchwork-Id: 16319 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F3D17BD808 for ; Wed, 22 Jun 2022 13:17:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9FD2F6563E; Wed, 22 Jun 2022 15:17:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1655903851; bh=/PA8YHABfHDJNX1mLlcQY3k6LKfuswo8x9H9/wnml7o=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=jZ+ewN5KHJdY7X0CJd5QxLQIkTyJLnG7bcCPQfvRjYkI7bjA0b14DTnSZmcxRDStP k4gwWMFpU42PoBdaCqcOdaJmbinPWbxrRVqF6aGqL8keOIzEv0ko2EeA10x+Kg37RK MbOxw3uVpi77/TjeMC0q0IIsPKVzhwQKCouzIYr0p78l8vrSdxjeZ8WZkOS4tTEqEh cKicCmAbeUpCllh4C20vS6pMiXSZrgIWreVuMTT9cI7LRQ3nRhAwtuXhr/kOOK6RlB DNuKCmTMgvmvsQc24d2R/xn+5yAGNoejyEVqQnCFUKCJlV0iDgoUehr4tRcFKwcD0J 2zGOez++0ktgQ== Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B165761FB2 for ; Wed, 22 Jun 2022 15:17:29 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zn70NR76"; dkim-atps=neutral Received: by mail-pg1-x531.google.com with SMTP id s185so10336186pgs.3 for ; Wed, 22 Jun 2022 06:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xkf2q1NPqU5B59rU94nWkF8pe6fEleUpU2eY39SlwBs=; b=Zn70NR76UTBPuVB+uDivmSblpdpJPaBxLNRc0Q9qo5Qos8I9ATpKohCkB8H8SYqiZP Wykaa7niTrMcLZLaJ8sULkXRDhPR0DsW8HMajKUo5oYdC+mdP4lnW8KWdcV7NqmZ0h6r SA9XvWg+ZwMTq+OaLlhmpgLZk8Vfwbva5vU54zgQbjZ6YPKlrTENF7IYpNZVQHDyVo2P vjbHQw5W7tao3pvgG/J1fsKqM/lUBtcekEeqnSekuexrJPp3OLapYmbkHDZMB8IlMvoj 1kk7u3vpe/HKxjJN3PSq1EChDyr8GZ6nfbF+/LEytcbNJuuzYCnZ+4H8Yd1yaSACu/dS aSHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xkf2q1NPqU5B59rU94nWkF8pe6fEleUpU2eY39SlwBs=; b=Vttg2YY58fA0//KEeITr56gFJ0YOBjbiN0MBcfPb6hAjNwPmCu7KNOIpVS9sMuXzgO VYmxAl8Drxrxgbz9NN8ZSYAHWTQMLQt6u8smiptbtzKvORrgT9L1fGSnRdQEQOKzsqGU BW+l0Mce0sNUca3ypf2HI/ZTgXKg8vqDItF09AbpKWxPaQeYCl/N2osSQM/1L52u39Do CCfOoNi0tvjM+UvbzcTPdd85ubDHJ/Yq/Eb72Z7G7p5VKvC0tclLjU7gdOZwYvHPDLk8 WXehNqoIC873qF1G20ocq/re+9VGpy0hqJM1V6zoyfpm+BYxT3osOmFrl/W1WFbc4/JQ BEVQ== X-Gm-Message-State: AJIora/rMLFTXdMniy0OfQKuSx75Km87xDWNaTjkzGxSnpOX2DH80HWK Tizgc1tjYwS8ATmXnpSTOokvlCXL2Xs= X-Google-Smtp-Source: AGRyM1ulXiEdjqPsJadFOVCJKk5y3wxryc/jBkh/JJR9PWXef64cZtq1pnoMv/K4Us3XsfTOgaIz5g== X-Received: by 2002:a63:8949:0:b0:40d:44d6:423e with SMTP id v70-20020a638949000000b0040d44d6423emr24782pgd.525.1655903847771; Wed, 22 Jun 2022 06:17:27 -0700 (PDT) Received: from localhost.localdomain ([2406:3003:2005:1f6b:fd12:eca1:fe45:bbdb]) by smtp.gmail.com with ESMTPSA id x82-20020a627c55000000b0052089e1b88esm7124540pfc.192.2022.06.22.06.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jun 2022 06:17:27 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 22 Jun 2022 21:16:37 +0800 Message-Id: <20220622131638.79122-3-utkarsh02t@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220622131638.79122-1-utkarsh02t@gmail.com> References: <20220622131638.79122-1-utkarsh02t@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/3] qcam: Add a GUI way to use capture script X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Utkarsh Tiwari via libcamera-devel From: Utkarsh Tiwari Reply-To: Utkarsh Tiwari Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Implement an Open Capture Script button which would allow the user to open a Capture Script (*.yaml). This button has two states Open and Stop. Open state allows user to load a capture script. When clicked in open state present them with a QFileDialog to allow user to select a single file. Stop state stops the execution of the current capture script. Introduce a queueCount_ to keep track of the requests queued. When stopping the execution no count is reset and the capture continues as it is, this would allow better testing as we can stop in between script and observe. Initialize a Script Parser instance when the user selects a valid capture script. At queueRequest() time if script parser has been initialized, then populate the Request::controls() with it at queueRequest time providing the queueCount_. The queueCount_ is incremented after the getting controls from the parser, so the first request is for frame 0. Signed-off-by: Utkarsh Tiwari --- src/qcam/assets/feathericons/feathericons.qrc | 2 + src/qcam/main_window.cpp | 61 +++++++++++++++++++ src/qcam/main_window.h | 7 +++ src/qcam/meson.build | 2 + 4 files changed, 72 insertions(+) diff --git a/src/qcam/assets/feathericons/feathericons.qrc b/src/qcam/assets/feathericons/feathericons.qrc index c5302040..6b08395a 100644 --- a/src/qcam/assets/feathericons/feathericons.qrc +++ b/src/qcam/assets/feathericons/feathericons.qrc @@ -3,9 +3,11 @@ aperture.svg camera-off.svg + file.svg play-circle.svg save.svg stop-circle.svg x-circle.svg + x-square.svg diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index adeb3181..29da3947 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -232,6 +233,13 @@ int MainWindow::createToolbars() saveRaw_ = action; #endif + /* Open Script... action. */ + action = toolbar_->addAction(QIcon::fromTheme("document-open", + QIcon(":file.svg")), + "Open Capture Script"); + connect(action, &QAction::triggered, this, &MainWindow::chooseScript); + scriptExecAction_ = action; + return 0; } @@ -255,6 +263,53 @@ void MainWindow::updateTitle() setWindowTitle(title_ + " : " + QString::number(fps, 'f', 2) + " fps"); } +/** + * \brief Load a capture script for handling the capture session. + * + * If already capturing, it would restart the capture. + */ +void MainWindow::chooseScript() +{ + if (isScriptExecuting_) { + /* + * This is the second valid press of load script button, + * It indicates stopping, Stop and set button for new script + */ + script_.reset(); + scriptExecAction_->setIcon(QIcon::fromTheme("document-open", + QIcon(":file.svg"))); + scriptExecAction_->setText("Open Capture Script"); + isScriptExecuting_ = false; + return; + } + + QString scriptFile = QFileDialog::getOpenFileName(this, "Open Capture Script", QDir::currentPath(), + "Capture Script (*.yaml)"); + if (scriptFile.isEmpty()) + return; + script_ = std::make_unique(camera_, scriptFile.toStdString()); + if (!script_->valid()) { + script_.reset(); + QMessageBox::critical(this, "Invalid Script", + "Couldn't load the capture script"); + return; + } + + /* + * Valid script verified + * Set the button to indicate stopping availibility + */ + scriptExecAction_->setIcon(QIcon(":x-square.svg")); + scriptExecAction_->setText("Stop Script execution"); + isScriptExecuting_ = true; + + /* Restart the capture so we can reset every counter */ + if (isCapturing_) { + toggleCapture(false); + toggleCapture(true); + } +} + /* ----------------------------------------------------------------------------- * Camera Selection */ @@ -510,6 +565,7 @@ int MainWindow::startCapture() previousFrames_ = 0; framesCaptured_ = 0; lastBufferTime_ = 0; + queueCount_ = 0; ret = camera_->start(); if (ret) { @@ -789,5 +845,10 @@ void MainWindow::renderComplete(FrameBuffer *buffer) int MainWindow::queueRequest(Request *request) { + if (script_) + request->controls() = script_->frameControls(queueCount_); + + queueCount_++; + return camera_->queueRequest(request); } diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index c3e4b665..58df4e15 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -26,6 +26,7 @@ #include #include +#include "../cam/capture_script.h" #include "../cam/stream_options.h" #include "viewfinder.h" @@ -86,11 +87,14 @@ private: void processHotplug(HotplugEvent *e); void processViewfinder(libcamera::FrameBuffer *buffer); + void chooseScript(); + /* UI elements */ QToolBar *toolbar_; QAction *startStopAction_; QComboBox *cameraCombo_; QAction *saveRaw_; + QAction *scriptExecAction_; ViewFinder *viewfinder_; QIcon iconPlay_; @@ -112,6 +116,7 @@ private: /* Capture state, buffers queue and statistics */ bool isCapturing_; + bool isScriptExecuting_; bool captureRaw_; libcamera::Stream *vfStream_; libcamera::Stream *rawStream_; @@ -124,6 +129,8 @@ private: QElapsedTimer frameRateInterval_; uint32_t previousFrames_; uint32_t framesCaptured_; + uint32_t queueCount_; std::vector> requests_; + std::unique_ptr script_; }; diff --git a/src/qcam/meson.build b/src/qcam/meson.build index c46f4631..67074252 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -15,6 +15,7 @@ endif qcam_enabled = true qcam_sources = files([ + '../cam/capture_script.cpp', '../cam/image.cpp', '../cam/options.cpp', '../cam/stream_options.cpp', @@ -37,6 +38,7 @@ qcam_resources = files([ qcam_deps = [ libatomic, libcamera_public, + libyaml, qt5_dep, ]