Patch Detail
Show a patch.
GET /api/1.1/patches/21789/?format=api
{ "id": 21789, "url": "https://patchwork.libcamera.org/api/1.1/patches/21789/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21789/", "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": "<20241031110256.415079-1-stanislaw.gruszka@linux.intel.com>", "date": "2024-10-31T11:02:56", "name": "[v2] qcam: Use pointer when choosing camera", "commit_ref": "a43ea7ff70e332ffe6b852a0aaeeb9aa877663cf", "pull_url": null, "state": "accepted", "archived": false, "hash": "3669844e4bca14511a29826067479eac83c8a7b3", "submitter": { "id": 211, "url": "https://patchwork.libcamera.org/api/1.1/people/211/?format=api", "name": "Stanislaw Gruszka", "email": "stanislaw.gruszka@linux.intel.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21789/mbox/", "series": [ { "id": 4761, "url": "https://patchwork.libcamera.org/api/1.1/series/4761/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4761", "date": "2024-10-31T11:02:56", "name": "[v2] qcam: Use pointer when choosing camera", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4761/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21789/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21789/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 C04D6C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 31 Oct 2024 11:03:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B480B653A1;\n\tThu, 31 Oct 2024 12:03:04 +0100 (CET)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.12])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9284160360\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 31 Oct 2024 12:03:01 +0100 (CET)", "from fmviesa001.fm.intel.com ([10.60.135.141])\n\tby fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n\t31 Oct 2024 04:03:00 -0700", "from sgruszka-mobl.ger.corp.intel.com (HELO localhost)\n\t([10.245.83.36])\n\tby smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n\t31 Oct 2024 04:02:59 -0700" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=intel.com header.i=@intel.com\n\theader.b=\"R2Jpz7qH\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n\td=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n\tt=1730372582; x=1761908582;\n\th=from:to:subject:date:message-id:mime-version:\n\tcontent-transfer-encoding;\n\tbh=r71tY1kky7c7QUn7paALy5OYGwmTrBBySp7QGVGFxh8=;\n\tb=R2Jpz7qHPSqZOmKw8mUleMy7Fb5jS0+S+oDWjoTMWs9rMa4/+W89Sb40\n\tGuk+B3kUduUyMMvZoj3RoJaP0uZpFIZfaIXm/NSAvi8DzWsiEWrugQyzU\n\t806AP7AdVa6tUE/Zfg17YVanSrSssxNnH0n+lnEoHwZToPn4EvUVXLA4x\n\tuMLXSLYkdRq46zlN+xt/qMfvq/I8h/1gyZzBX3+9tZg+qIGJlcft1nDrs\n\tiz9w8TbWPtd/dOdLU57CSHhKho18mRwcF+aP3pPM1mOc3Uemy+uZqR0fm\n\tw+te9gc5nM3vkGPGHR9X//EPys1NedSl9RnpKGVex9dv7pju2/zT0Asd2 Q==;", "X-CSE-ConnectionGUID": [ "96n/gjIPSLyrGfJi26JAhQ==", "cDWUeBNzSbmYPUCcpcGkow==" ], "X-CSE-MsgGUID": [ "APVkSIx1QOW4LgkuCH5PYQ==", "ncxumKjySnGl9PNBTJwMLA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6700,10204,11241\"; a=\"34033954\"", "E=Sophos;i=\"6.11,247,1725346800\"; d=\"scan'208\";a=\"34033954\"", "E=Sophos;i=\"6.11,247,1725346800\"; d=\"scan'208\";a=\"113446130\"" ], "X-ExtLoop1": "1", "From": "Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v2] qcam: Use pointer when choosing camera", "Date": "Thu, 31 Oct 2024 12:02:56 +0100", "Message-Id": "<20241031110256.415079-1-stanislaw.gruszka@linux.intel.com>", "X-Mailer": "git-send-email 2.34.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "In order to remove redundant camera ID lookups and comparisons switch\nto pointer-based checks when choosing and switching cameras.\n\nCo-developed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>\n---\nv2:\n - better error message when no cameras are present\n - use camera_->id() is switch button, missed in previous patch\n\n src/apps/qcam/main_window.cpp | 43 +++++++++++++++--------------------\n src/apps/qcam/main_window.h | 2 +-\n 2 files changed, 19 insertions(+), 26 deletions(-)", "diff": "diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\nindex de487672..3880a846 100644\n--- a/src/apps/qcam/main_window.cpp\n+++ b/src/apps/qcam/main_window.cpp\n@@ -251,16 +251,14 @@ void MainWindow::updateTitle()\n void MainWindow::switchCamera()\n {\n \t/* Get and acquire the new camera. */\n-\tstd::string newCameraId = chooseCamera();\n+\tstd::shared_ptr<Camera> cam = chooseCamera();\n \n-\tif (newCameraId.empty())\n+\tif (!cam)\n \t\treturn;\n \n-\tif (camera_ && newCameraId == camera_->id())\n+\tif (camera_ && cam == camera_)\n \t\treturn;\n \n-\tconst std::shared_ptr<Camera> &cam = cm_->get(newCameraId);\n-\n \tif (cam->acquire()) {\n \t\tqInfo() << \"Failed to acquire camera\" << cam->id().c_str();\n \t\treturn;\n@@ -282,46 +280,41 @@ void MainWindow::switchCamera()\n \tstartStopAction_->setChecked(true);\n \n \t/* Display the current cameraId in the toolbar .*/\n-\tcameraSelectButton_->setText(QString::fromStdString(newCameraId));\n+\tcameraSelectButton_->setText(QString::fromStdString(cam->id()));\n }\n \n-std::string MainWindow::chooseCamera()\n+std::shared_ptr<Camera> MainWindow::chooseCamera()\n {\n \tif (cameraSelectorDialog_->exec() != QDialog::Accepted)\n-\t\treturn std::string();\n+\t\treturn {};\n \n-\treturn cameraSelectorDialog_->getCameraId();\n+\tstd::string id = cameraSelectorDialog_->getCameraId();\n+\treturn cm_->get(id);\n }\n \n int MainWindow::openCamera()\n {\n-\tstd::string cameraName;\n-\n \t/*\n \t * If a camera is specified on the command line, get it. Otherwise, if\n \t * only one camera is available, pick it automatically, else, display\n \t * the selector dialog box.\n \t */\n \tif (options_.isSet(OptCamera)) {\n-\t\tcameraName = static_cast<std::string>(options_[OptCamera]);\n+\t\tstd::string cameraName = static_cast<std::string>(options_[OptCamera]);\n+\t\tcamera_ = cm_->get(cameraName);\n+\t\tif (!camera_)\n+\t\t\tqInfo() << \"Camera\" << cameraName.c_str() << \"not found\";\n \t} else {\n \t\tstd::vector<std::shared_ptr<Camera>> cameras = cm_->cameras();\n-\t\tif (cameras.size() == 1)\n-\t\t\tcameraName = cameras[0]->id();\n-\t\telse\n-\t\t\tcameraName = chooseCamera();\n+\t\tcamera_ = (cameras.size() == 1) ? cameras[0] : chooseCamera();\n+\t\tif (!camera_)\n+\t\t\tqInfo() << \"No camera detected\";\n \t}\n \n-\tif (cameraName == \"\")\n-\t\treturn -EINVAL;\n-\n-\t/* Get and acquire the camera. */\n-\tcamera_ = cm_->get(cameraName);\n-\tif (!camera_) {\n-\t\tqInfo() << \"Camera\" << cameraName.c_str() << \"not found\";\n+\tif (!camera_)\n \t\treturn -ENODEV;\n-\t}\n \n+\t/* Acquire the camera. */\n \tif (camera_->acquire()) {\n \t\tqInfo() << \"Failed to acquire camera\";\n \t\tcamera_.reset();\n@@ -329,7 +322,7 @@ int MainWindow::openCamera()\n \t}\n \n \t/* Set the camera switch button with the currently selected Camera id. */\n-\tcameraSelectButton_->setText(QString::fromStdString(cameraName));\n+\tcameraSelectButton_->setText(QString::fromStdString(camera_->id()));\n \n \treturn 0;\n }\ndiff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h\nindex 4cead734..81fcf915 100644\n--- a/src/apps/qcam/main_window.h\n+++ b/src/apps/qcam/main_window.h\n@@ -73,7 +73,7 @@ private Q_SLOTS:\n private:\n \tint createToolbars();\n \n-\tstd::string chooseCamera();\n+\tstd::shared_ptr<libcamera::Camera> chooseCamera();\n \tint openCamera();\n \n \tint startCapture();\n", "prefixes": [ "v2" ] }