{"id":21773,"url":"https://patchwork.libcamera.org/api/patches/21773/?format=json","web_url":"https://patchwork.libcamera.org/patch/21773/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241030071739.271004-1-stanislaw.gruszka@linux.intel.com>","date":"2024-10-30T07:17:39","name":"qcam: Use pointer when choosing camera","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0474b770a64baa9dcaaf4b10645ef53b322723d4","submitter":{"id":211,"url":"https://patchwork.libcamera.org/api/people/211/?format=json","name":"Stanislaw Gruszka","email":"stanislaw.gruszka@linux.intel.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21773/mbox/","series":[{"id":4754,"url":"https://patchwork.libcamera.org/api/series/4754/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4754","date":"2024-10-30T07:17:39","name":"qcam: Use pointer when choosing camera","version":1,"mbox":"https://patchwork.libcamera.org/series/4754/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21773/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21773/checks/","tags":{},"headers":{"Return-Path":"","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 1ED19C3237\n\tfor ;\n\tWed, 30 Oct 2024 07:17:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C521D65399;\n\tWed, 30 Oct 2024 08:17:47 +0100 (CET)","from mgamail.intel.com (mgamail.intel.com [198.175.65.16])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00F816039B\n\tfor ;\n\tWed, 30 Oct 2024 08:17:44 +0100 (CET)","from fmviesa005.fm.intel.com ([10.60.135.145])\n\tby orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n\t30 Oct 2024 00:17:42 -0700","from sgruszka-mobl.ger.corp.intel.com (HELO localhost)\n\t([10.245.118.67]) by fmviesa005-auth.fm.intel.com with\n\tESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2024 00:17:42 -0700"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=intel.com header.i=@intel.com\n\theader.b=\"Y5Fxy5iB\"; 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=1730272665; x=1761808665;\n\th=from:to:subject:date:message-id:mime-version:\n\tcontent-transfer-encoding;\n\tbh=GdkHhxJ9pSwiYC8aUshBpjd13h+1QlYUdBnMv0VhIF4=;\n\tb=Y5Fxy5iBQP5eJ/PHG6XxcOxwlgLywgdP+/LJsCChkvd4NGRGwdIcku0V\n\tBcgD7uu9FrMpVgtc6FFmqzaaC6cJwzr5nm6nAxYdtfq0gW93R5+J0ERbS\n\tDn3OBnRQ69kKAxsTvlVicEjlvfOGbBgKuNsKdyons5hx9JrJ3LMJmKagA\n\tSw9pg+n9iAJjUr4ERElysc5n3BNG1M3spucfFBgUBY1jazOg7XGpmyiRg\n\td4Ju33PwG+t4cbLLq99oZIoxczAYOPmcYUJiLrJkoRYBEAyfYZDVWeVDv\n\tFIExu+TBmMnuzQkb+4TtkEhhv/7kqkbKKcFjF9TeisYPk4r8gKMzE5jgJ A==;","X-CSE-ConnectionGUID":["DeMrAsRLSOqCnhU4k2c++w==","DjZ5dzNjRAC0NwOKsxQB/A=="],"X-CSE-MsgGUID":["f/pRUTd2RfC+woa692aIMw==","SHoGEl5gQnettRZ+3Hrqyg=="],"X-IronPort-AV":["E=McAfee;i=\"6700,10204,11222\"; a=\"30104973\"","E=Sophos;i=\"6.11,199,1725346800\"; d=\"scan'208\";a=\"30104973\"","E=Sophos;i=\"6.11,244,1725346800\"; d=\"scan'208\";a=\"86780055\""],"X-ExtLoop1":"1","From":"Stanislaw Gruszka ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH] qcam: Use pointer when choosing camera","Date":"Wed, 30 Oct 2024 08:17:39 +0100","Message-Id":"<20241030071739.271004-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \nSigned-off-by: Laurent Pinchart \nSigned-off-by: Stanislaw Gruszka \n---\n src/apps/qcam/main_window.cpp | 30 +++++++++++++-----------------\n src/apps/qcam/main_window.h | 2 +-\n 2 files changed, 14 insertions(+), 18 deletions(-)","diff":"diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\nindex de487672..e0bbcc75 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 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 &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,20 +280,21 @@ 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 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+\tstd::string cameraName = \"\";\n \n \t/*\n \t * If a camera is specified on the command line, get it. Otherwise, if\n@@ -304,24 +303,21 @@ int MainWindow::openCamera()\n \t */\n \tif (options_.isSet(OptCamera)) {\n \t\tcameraName = static_cast(options_[OptCamera]);\n+\t\tcamera_ = cm_->get(cameraName);\n \t} else {\n \t\tstd::vector> cameras = cm_->cameras();\n \t\tif (cameras.size() == 1)\n-\t\t\tcameraName = cameras[0]->id();\n+\t\t\tcamera_ = cameras[0];\n \t\telse\n-\t\t\tcameraName = chooseCamera();\n+\t\t\tcamera_ = chooseCamera();\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 \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();\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 chooseCamera();\n \tint openCamera();\n \n \tint startCapture();\n","prefixes":[]}