[{"id":36663,"web_url":"https://patchwork.libcamera.org/comment/36663/","msgid":"<20251103145027.GW27255@pendragon.ideasonboard.com>","date":"2025-11-03T14:50:27","subject":"Re: [PATCH v1] android: camera_hal_manager: Remove\n\t`cameraLocation()`","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Mon, Nov 03, 2025 at 03:47:55PM +0100, Barnabás Pőcze wrote:\n> Inline the function as it is only used in a single place and does not do\n> anything complicated. This also lets the `operator==` of `std::optional`\n> take care of the proper comparison instead of defaulting the value to -1\n> and comparing that.\n> \n> Signed-off-by: Barnabás Pőcze \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_hal_manager.cpp | 7 +------\n> src/android/camera_hal_manager.h | 2 --\n> 2 files changed, 1 insertion(+), 8 deletions(-)\n> \n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 7500c749be..a7a2571754 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -125,7 +125,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> \t\t * Now check if this is an external camera and assign\n> \t\t * its id accordingly.\n> \t\t */\n> -\t\tif (cameraLocation(cam.get()) == properties::CameraLocationExternal) {\n> +\t\tif (cam->properties().get(properties::Location) == properties::CameraLocationExternal) {\n> \t\t\tisCameraExternal = true;\n> \t\t\tid = nextExternalCameraId_;\n> \t\t} else {\n> @@ -227,11 +227,6 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam)\n> \tLOG(HAL, Debug) << \"Camera ID: \" << id << \" removed successfully.\";\n> }\n> \n> -int32_t CameraHalManager::cameraLocation(const Camera *cam)\n> -{\n> -\treturn cam->properties().get(properties::Location).value_or(-1);\n> -}\n> -\n> CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)\n> {\n> \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 836a8daf70..e2d4eacbb5 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -48,8 +48,6 @@ private:\n> \n> \tCameraHalManager();\n> \n> -\tstatic int32_t cameraLocation(const libcamera::Camera *cam);\n> -\n> \tvoid cameraAdded(std::shared_ptr cam);\n> \tvoid cameraRemoved(std::shared_ptr cam);\n> \n> -- \n> 2.51.2\n>","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 38079BDE4C\n\tfor ;\n\tMon, 3 Nov 2025 14:50:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DF889609D8;\n\tMon, 3 Nov 2025 15:50:43 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8EF22606A0\n\tfor ;\n\tMon, 3 Nov 2025 15:50:41 +0100 (CET)","from pendragon.ideasonboard.com (82-203-160-149.bb.dnainternet.fi\n\t[82.203.160.149])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 7FDF47CE;\n\tMon, 3 Nov 2025 15:48:48 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"KtTNkJNC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762181328;\n\tbh=Hk06obMVA7PKCAIZIMUfanpESIwy/VUGeUBB5YiFByg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=KtTNkJNC9y5cFL0s2DnCaE183Zgz4Zoas3uHy+FLkEVx9GcY4u7/TmSIObr63nIMq\n\tT0kjV3GGuXFk3s+FYXa0/LdE9hx8TCBzHOs+fAVOoeJ2cV2P4dP3/DnnJwrCAqOLpp\n\tySK924NzrDV3ACDAZ8D0lTpk3NEFPZBGqAbCQC/g=","Date":"Mon, 3 Nov 2025 16:50:27 +0200","From":"Laurent Pinchart ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1] android: camera_hal_manager: Remove\n\t`cameraLocation()`","Message-ID":"<20251103145027.GW27255@pendragon.ideasonboard.com>","References":"<20251103144755.438422-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20251103144755.438422-1-barnabas.pocze@ideasonboard.com>","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\" "}},{"id":36666,"web_url":"https://patchwork.libcamera.org/comment/36666/","msgid":"<176218355546.3742839.9999896926714984881@ping.linuxembedded.co.uk>","date":"2025-11-03T15:25:55","subject":"Re: [PATCH v1] android: camera_hal_manager: Remove\n\t`cameraLocation()`","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Barnabás Pőcze (2025-11-03 14:47:55)\n> Inline the function as it is only used in a single place and does not do\n> anything complicated. This also lets the `operator==` of `std::optional`\n> take care of the proper comparison instead of defaulting the value to -1\n> and comparing that.\n> \n> Signed-off-by: Barnabás Pőcze \n> ---\n> src/android/camera_hal_manager.cpp | 7 +------\n> src/android/camera_hal_manager.h | 2 --\n> 2 files changed, 1 insertion(+), 8 deletions(-)\n> \n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 7500c749be..a7a2571754 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -125,7 +125,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> * Now check if this is an external camera and assign\n> * its id accordingly.\n> */\n> - if (cameraLocation(cam.get()) == properties::CameraLocationExternal) {\n> + if (cam->properties().get(properties::Location) == properties::CameraLocationExternal) {\n\nThis still looks sane so:\n\nReviewed-by: Kieran Bingham \n\n> isCameraExternal = true;\n> id = nextExternalCameraId_;\n> } else {\n> @@ -227,11 +227,6 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam)\n> LOG(HAL, Debug) << \"Camera ID: \" << id << \" removed successfully.\";\n> }\n> \n> -int32_t CameraHalManager::cameraLocation(const Camera *cam)\n> -{\n> - return cam->properties().get(properties::Location).value_or(-1);\n> -}\n> -\n> CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)\n> {\n> auto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 836a8daf70..e2d4eacbb5 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -48,8 +48,6 @@ private:\n> \n> CameraHalManager();\n> \n> - static int32_t cameraLocation(const libcamera::Camera *cam);\n> -\n> void cameraAdded(std::shared_ptr cam);\n> void cameraRemoved(std::shared_ptr cam);\n> \n> -- \n> 2.51.2\n>","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 B412EBDE4C\n\tfor ;\n\tMon, 3 Nov 2025 15:26:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C6F4D60A80;\n\tMon, 3 Nov 2025 16:25:59 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0730E606A0\n\tfor ;\n\tMon, 3 Nov 2025 16:25:58 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 08D4DC73;\n\tMon, 3 Nov 2025 16:24:05 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"p++tCYm2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762183445;\n\tbh=J4/jVSlfHZ2fR5oCUgPpfowQ5668aKkJCVrXcSHrgxU=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=p++tCYm20R+UBZRohQ8meW/VegJbFzKT9w6TH8K1ir7y7t5tdMMav+Cbcw3pjljdS\n\tlYJGjrZ9ynn5LW/7cCm0h+2yeqHuXKgNoZ+QCCk9O1mq32BZjFdKrAfDRgI6/mbQaV\n\ta8b5QnjOLfLx3aX63kLnnrm22BaQeHqi5w/cfqUg=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251103144755.438422-1-barnabas.pocze@ideasonboard.com>","References":"<20251103144755.438422-1-barnabas.pocze@ideasonboard.com>","Subject":"Re: [PATCH v1] android: camera_hal_manager: Remove\n\t`cameraLocation()`","From":"Kieran Bingham ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 03 Nov 2025 15:25:55 +0000","Message-ID":"<176218355546.3742839.9999896926714984881@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}}]