[{"id":16238,"web_url":"https://patchwork.libcamera.org/comment/16238/","msgid":"","date":"2021-04-13T20:00:56","subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Tue, Apr 13, 2021 at 04:50:41PM +0200, Jacopo Mondi wrote:\n> Open the HAL configuration file in the Camera HAL manager and get\n> the camera properties for each created CameraDevice and initialize it\n> with them.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 56 +++++++++++++++++++++++++-----\n> src/android/camera_device.h | 3 +-\n> src/android/camera_hal_manager.cpp | 37 +++++++++++++++++++-\n> src/android/camera_hal_manager.h | 3 ++\n> 4 files changed, 89 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 89044efa7ebe..2e93936fdb4b 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -6,6 +6,7 @@\n> */\n> \n> #include \"camera_device.h\"\n> +#include \"camera_hal_config.h\"\n> #include \"camera_ops.h\"\n> #include \"post_processor.h\"\n> \n> @@ -443,12 +444,25 @@ std::unique_ptr CameraDevice::create(unsigned int id,\n> }\n> \n> /*\n> - * Initialize the camera static information.\n> + * Initialize the camera static information retrieved from the\n> + * Camera::properties or from the cameraPros.\n> + *\n> + * cameraProps is optional for external camera devices and is defaulted to\n> + * nullptr.\n> + *\n> * This method is called before the camera device is opened.\n> */\n> -int CameraDevice::initialize()\n> +int CameraDevice::initialize(const CameraProps *cameraProps)\n> {\n> -\t/* Initialize orientation and facing side of the camera. */\n> +\t/*\n> +\t * Initialize orientation and facing side of the camera.\n> +\t *\n> +\t * If the libcamera::Camera provides those information as retrieved\n> +\t * from firmware use them, otherwise fallback to values parsed from\n> +\t * the configuration file. If the configuration file is not available\n> +\t * the camera is external so its location and rotation can be safely\n> +\t * defaulted.\n> +\t */\n> \tconst ControlList &properties = camera_->properties();\n> \n> \tif (properties.contains(properties::Location)) {\n> @@ -464,12 +478,22 @@ int CameraDevice::initialize()\n> \t\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n> \t\t\tbreak;\n> \t\t}\n> +\n> +\t\tif (cameraProps && cameraProps->facing != -1 &&\n> +\t\t facing_ != cameraProps->facing) {\n> +\t\t\tLOG(HAL, Warning)\n> +\t\t\t\t<< \"Camera location does not match\"\n> +\t\t\t\t<< \" configuration file. Using \" << facing_;\n> +\t\t}\n> +\t} else if (cameraProps) {\n> +\t\tif (cameraProps->facing == -1) {\n> +\t\t\tLOG(HAL, Error)\n> +\t\t\t\t<< \"Camera facing not in configuration file\";\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> +\t\tfacing_ = cameraProps->facing;\n> \t} else {\n> -\t\t/*\n> -\t\t * \\todo Retrieve the camera location from configuration file\n> -\t\t * if not available from the library.\n> -\t\t */\n> -\t\tfacing_ = CAMERA_FACING_FRONT;\n> +\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n> \t}\n> \n> \t/*\n> @@ -483,8 +507,24 @@ int CameraDevice::initialize()\n> \tif (properties.contains(properties::Rotation)) {\n> \t\tint rotation = properties.get(properties::Rotation);\n> \t\torientation_ = (360 - rotation) % 360;\n> +\t\tif (cameraProps && cameraProps->rotation != -1 &&\n> +\t\t orientation_ != cameraProps->rotation) {\n> +\t\t\tLOG(HAL, Warning)\n> +\t\t\t\t<< \"Camera orientation does not match\"\n> +\t\t\t\t<< \" configuration file. Using \" << orientation_;\n> +\t\t}\n> +\t} else if (cameraProps) {\n> +\t\tif (cameraProps->rotation == -1) {\n> +\t\t\tLOG(HAL, Error)\n> +\t\t\t\t<< \"Camera rotation not in configuration file\";\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> +\t\torientation_ = cameraProps->rotation;\n> +\t} else {\n> +\t\torientation_ = 0;\n> \t}\n> \n> +\t/* Acquire the camera and initialize available stream configurations. */\n> \tint ret = camera_->acquire();\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to temporarily acquire the camera\";\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 11bdfec8d587..598d89f1cff0 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -29,6 +29,7 @@\n> #include \"camera_worker.h\"\n> #include \"jpeg/encoder.h\"\n> \n> +class CameraProps;\n> class CameraDevice : protected libcamera::Loggable\n> {\n> public:\n> @@ -36,7 +37,7 @@ public:\n> \t\t\t\t\t\t std::shared_ptr cam);\n> \t~CameraDevice();\n> \n> -\tint initialize();\n> +\tint initialize(const CameraProps *cameraProps = nullptr);\n\nYou can drop the = nullptr if you agree with the change below.\n\n> \n> \tint open(const hw_module_t *hardwareModule);\n> \tvoid close();\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index bf3fcda75237..1defc3f9c5bd 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -41,6 +41,16 @@ int CameraHalManager::init()\n> {\n> \tcameraManager_ = std::make_unique();\n> \n> +\t/*\n> +\t * Open and parse configuration file.\n> +\t *\n> +\t * If the configuration file is not available the HAL only supports\n> +\t * external cameras. If it exists but it's not valid then error out.\n> +\t */\n> +\thalConfig_.open();\n> +\tif (halConfig_.exists() && !halConfig_.valid())\n> +\t\treturn -EINVAL;\n> +\n> \t/* Support camera hotplug. */\n> \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n> \tcameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved);\n> @@ -100,6 +110,8 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> \tauto iter = cameraIdsMap_.find(cam->id());\n> \tif (iter != cameraIdsMap_.end()) {\n> \t\tid = iter->second;\n> +\t\tif (id >= firstExternalCameraId_)\n> +\t\t\tisCameraExternal = true;\n> \t} else {\n> \t\tisCameraNew = true;\n> \n> @@ -117,7 +129,30 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> \n> \t/* Create a CameraDevice instance to wrap the libcamera Camera. */\n> \tstd::unique_ptr camera = CameraDevice::create(id, cam);\n> -\tint ret = camera->initialize();\n> +\n> +\t/*\n> +\t * The configuration file must be valid for internal cameras.\n> +\t * External cameras can be initialized without configuration file.\n> +\t */\n> +\tint ret = -EINVAL;\n> +\tif (!halConfig_.exists()) {\n> +\t\tif (isCameraExternal)\n> +\t\t\tret = camera->initialize();\n> +\t} else {\n> +\t\t/*\n> +\t\t * Get camera properties from the configuration file which\n> +\t\t * exists and is valid.\n> +\t\t *\n> +\t\t * Internal cameras are required to have a corresponding entry\n> +\t\t * in the configuration file. External cameras are not required\n> +\t\t * to.\n> +\t\t */\n> +\t\tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n> +\t\tif (cameraProps->valid)\n> +\t\t\tret = camera->initialize(cameraProps);\n> +\t\telse if (isCameraExternal)\n> +\t\t\tret = camera->initialize();\n> +\t}\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n> \t\treturn;\n\nIf the configuration file does not exist and the camera is internal,\nwe'll only print \"Failed to initialize camera\", which will be confusing.\nHow about the following ?\n\n\t/*\n\t * The configuration file must be valid, and contain a corresponding\n\t * entry for internal cameras. External cameras can be initialized\n\t * without configuration file.\n\t */\n\tif (!isCameraExternal && !halConfig_.exists()) {\n\t\tLOG(HALConfig, Error)\n\t\t\t<< \"HAL configuration file is mandatory for internal cameras\";\n\t\treturn -EINVAL;\n\t}\n\n\tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n\tif (!isCameraExternal && !cameraProps) {\n\t\tLOG(HALConfig, Error)\n\t\t\t<< \"HAL configuration entry for camera \" << cam->id()\n\t\t\t<< \" is missing\";\n\t\treturn -EINVAL;\n\t}\n\n\tret = camera->initialize(cameraProps);\n\tif (ret) {\n\t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n\t\treturn;\n\t}\n\nReviewed-by: Laurent Pinchart \n\n\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index d9bf27989965..af1581da6579 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -19,6 +19,8 @@\n> \n> #include \n> \n> +#include \"camera_hal_config.h\"\n> +\n> class CameraDevice;\n> \n> class CameraHalManager\n> @@ -50,6 +52,7 @@ private:\n> \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n> \n> \tstd::unique_ptr cameraManager_;\n> +\tCameraHalConfig halConfig_;\n> \n> \tconst camera_module_callbacks_t *callbacks_;\n> \tstd::vector> cameras_;","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 AC231BD224\n\tfor ;\n\tTue, 13 Apr 2021 20:01:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0B758687FE;\n\tTue, 13 Apr 2021 22:01:49 +0200 (CEST)","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 F19F0602D1\n\tfor ;\n\tTue, 13 Apr 2021 22:01:47 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 50C249F0;\n\tTue, 13 Apr 2021 22:01:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PWAo+qjZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618344107;\n\tbh=1e9RzsKAvb35/N91szhyN9y2KeOljvjXZEnDnCyfjY4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=PWAo+qjZuZwTswcrQmv3Yh9QGuKouWBNgeSmOpivlx1ZIxTr4Msv7opQZWF0htOj1\n\tRA7wK5CxxRJYkC3FNIK5kDLMPLVMTVNiI5j4BDOArT2ygE69Z3kr8zj/imhoKM7izW\n\tXsAtiIVzTH+9KHY0EHwOiEdwAMwAEwf10HmrZVzM=","Date":"Tue, 13 Apr 2021 23:00:56 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210413145042.48185-1-jacopo@jmondi.org>\n\t<20210413145042.48185-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210413145042.48185-5-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16285,"web_url":"https://patchwork.libcamera.org/comment/16285/","msgid":"<66e8f156-2f82-5f35-2dc9-15640132c439@ideasonboard.com>","date":"2021-04-14T18:33:26","subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 13/04/2021 21:00, Laurent Pinchart wrote:\n> Hi Jacopo,\n> \n> Thank you for the patch.\n> \n> On Tue, Apr 13, 2021 at 04:50:41PM +0200, Jacopo Mondi wrote:\n>> Open the HAL configuration file in the Camera HAL manager and get\n>> the camera properties for each created CameraDevice and initialize it\n>> with them.\n>>\n>> Signed-off-by: Jacopo Mondi \n>> ---\n>> src/android/camera_device.cpp | 56 +++++++++++++++++++++++++-----\n>> src/android/camera_device.h | 3 +-\n>> src/android/camera_hal_manager.cpp | 37 +++++++++++++++++++-\n>> src/android/camera_hal_manager.h | 3 ++\n>> 4 files changed, 89 insertions(+), 10 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index 89044efa7ebe..2e93936fdb4b 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -6,6 +6,7 @@\n>> */\n>> \n>> #include \"camera_device.h\"\n>> +#include \"camera_hal_config.h\"\n>> #include \"camera_ops.h\"\n>> #include \"post_processor.h\"\n>> \n>> @@ -443,12 +444,25 @@ std::unique_ptr CameraDevice::create(unsigned int id,\n>> }\n>> \n>> /*\n>> - * Initialize the camera static information.\n>> + * Initialize the camera static information retrieved from the\n>> + * Camera::properties or from the cameraPros.\n>> + *\n>> + * cameraProps is optional for external camera devices and is defaulted to\n>> + * nullptr.\n>> + *\n>> * This method is called before the camera device is opened.\n>> */\n>> -int CameraDevice::initialize()\n>> +int CameraDevice::initialize(const CameraProps *cameraProps)\n>> {\n>> -\t/* Initialize orientation and facing side of the camera. */\n>> +\t/*\n>> +\t * Initialize orientation and facing side of the camera.\n>> +\t *\n>> +\t * If the libcamera::Camera provides those information as retrieved\n>> +\t * from firmware use them, otherwise fallback to values parsed from\n>> +\t * the configuration file. If the configuration file is not available\n>> +\t * the camera is external so its location and rotation can be safely\n>> +\t * defaulted.\n>> +\t */\n>> \tconst ControlList &properties = camera_->properties();\n>> \n>> \tif (properties.contains(properties::Location)) {\n>> @@ -464,12 +478,22 @@ int CameraDevice::initialize()\n>> \t\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n>> \t\t\tbreak;\n>> \t\t}\n>> +\n>> +\t\tif (cameraProps && cameraProps->facing != -1 &&\n>> +\t\t facing_ != cameraProps->facing) {\n>> +\t\t\tLOG(HAL, Warning)\n>> +\t\t\t\t<< \"Camera location does not match\"\n>> +\t\t\t\t<< \" configuration file. Using \" << facing_;\n>> +\t\t}\n>> +\t} else if (cameraProps) {\n>> +\t\tif (cameraProps->facing == -1) {\n>> +\t\t\tLOG(HAL, Error)\n>> +\t\t\t\t<< \"Camera facing not in configuration file\";\n>> +\t\t\treturn -EINVAL;\n>> +\t\t}\n>> +\t\tfacing_ = cameraProps->facing;\n>> \t} else {\n>> -\t\t/*\n>> -\t\t * \\todo Retrieve the camera location from configuration file\n>> -\t\t * if not available from the library.\n>> -\t\t */\n>> -\t\tfacing_ = CAMERA_FACING_FRONT;\n>> +\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n>> \t}\n>> \n>> \t/*\n>> @@ -483,8 +507,24 @@ int CameraDevice::initialize()\n>> \tif (properties.contains(properties::Rotation)) {\n>> \t\tint rotation = properties.get(properties::Rotation);\n>> \t\torientation_ = (360 - rotation) % 360;\n>> +\t\tif (cameraProps && cameraProps->rotation != -1 &&\n>> +\t\t orientation_ != cameraProps->rotation) {\n>> +\t\t\tLOG(HAL, Warning)\n>> +\t\t\t\t<< \"Camera orientation does not match\"\n>> +\t\t\t\t<< \" configuration file. Using \" << orientation_;\n>> +\t\t}\n>> +\t} else if (cameraProps) {\n>> +\t\tif (cameraProps->rotation == -1) {\n>> +\t\t\tLOG(HAL, Error)\n>> +\t\t\t\t<< \"Camera rotation not in configuration file\";\n>> +\t\t\treturn -EINVAL;\n>> +\t\t}\n>> +\t\torientation_ = cameraProps->rotation;\n>> +\t} else {\n>> +\t\torientation_ = 0;\n>> \t}\n>> \n>> +\t/* Acquire the camera and initialize available stream configurations. */\n>> \tint ret = camera_->acquire();\n>> \tif (ret) {\n>> \t\tLOG(HAL, Error) << \"Failed to temporarily acquire the camera\";\n>> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n>> index 11bdfec8d587..598d89f1cff0 100644\n>> --- a/src/android/camera_device.h\n>> +++ b/src/android/camera_device.h\n>> @@ -29,6 +29,7 @@\n>> #include \"camera_worker.h\"\n>> #include \"jpeg/encoder.h\"\n>> \n>> +class CameraProps;\n\nThis triggers a compiler warning on GCC\n\nIn file included from ../src/android/camera_device.cpp:9:\n../src/android/camera_hal_config.h:16:1: error: 'CameraProps' defined as\na struct here but previously declared as a class; this is valid, but may\nresult in linker errors under the Microsoft C++ ABI\n[-Werror,-Wmismatched-tags]\nstruct CameraProps {\n^\n../src/android/camera_device.h:32:1: note: did you mean struct here?\nclass CameraProps;\n\n\n\n>> class CameraDevice : protected libcamera::Loggable\n>> {\n>> public:\n>> @@ -36,7 +37,7 @@ public:\n>> \t\t\t\t\t\t std::shared_ptr cam);\n>> \t~CameraDevice();\n>> \n>> -\tint initialize();\n>> +\tint initialize(const CameraProps *cameraProps = nullptr);\n> \n> You can drop the = nullptr if you agree with the change below.\n> \n>> \n>> \tint open(const hw_module_t *hardwareModule);\n>> \tvoid close();\n>> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n>> index bf3fcda75237..1defc3f9c5bd 100644\n>> --- a/src/android/camera_hal_manager.cpp\n>> +++ b/src/android/camera_hal_manager.cpp\n>> @@ -41,6 +41,16 @@ int CameraHalManager::init()\n>> {\n>> \tcameraManager_ = std::make_unique();\n>> \n>> +\t/*\n>> +\t * Open and parse configuration file.\n>> +\t *\n>> +\t * If the configuration file is not available the HAL only supports\n>> +\t * external cameras. If it exists but it's not valid then error out.\n>> +\t */\n>> +\thalConfig_.open();\n>> +\tif (halConfig_.exists() && !halConfig_.valid())\n>> +\t\treturn -EINVAL;\n>> +\n>> \t/* Support camera hotplug. */\n>> \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n>> \tcameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved);\n>> @@ -100,6 +110,8 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n>> \tauto iter = cameraIdsMap_.find(cam->id());\n>> \tif (iter != cameraIdsMap_.end()) {\n>> \t\tid = iter->second;\n>> +\t\tif (id >= firstExternalCameraId_)\n>> +\t\t\tisCameraExternal = true;\n>> \t} else {\n>> \t\tisCameraNew = true;\n>> \n>> @@ -117,7 +129,30 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n>> \n>> \t/* Create a CameraDevice instance to wrap the libcamera Camera. */\n>> \tstd::unique_ptr camera = CameraDevice::create(id, cam);\n>> -\tint ret = camera->initialize();\n>> +\n>> +\t/*\n>> +\t * The configuration file must be valid for internal cameras.\n>> +\t * External cameras can be initialized without configuration file.\n>> +\t */\n>> +\tint ret = -EINVAL;\n>> +\tif (!halConfig_.exists()) {\n>> +\t\tif (isCameraExternal)\n>> +\t\t\tret = camera->initialize();\n>> +\t} else {\n>> +\t\t/*\n>> +\t\t * Get camera properties from the configuration file which\n>> +\t\t * exists and is valid.\n>> +\t\t *\n>> +\t\t * Internal cameras are required to have a corresponding entry\n>> +\t\t * in the configuration file. External cameras are not required\n>> +\t\t * to.\n>> +\t\t */\n>> +\t\tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n>> +\t\tif (cameraProps->valid)\n>> +\t\t\tret = camera->initialize(cameraProps);\n>> +\t\telse if (isCameraExternal)\n>> +\t\t\tret = camera->initialize();\n>> +\t}\n>> \tif (ret) {\n>> \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n>> \t\treturn;\n> \n> If the configuration file does not exist and the camera is internal,\n> we'll only print \"Failed to initialize camera\", which will be confusing.\n> How about the following ?\n> \n> \t/*\n> \t * The configuration file must be valid, and contain a corresponding\n> \t * entry for internal cameras. External cameras can be initialized\n> \t * without configuration file.\n> \t */\n> \tif (!isCameraExternal && !halConfig_.exists()) {\n> \t\tLOG(HALConfig, Error)\n> \t\t\t<< \"HAL configuration file is mandatory for internal cameras\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> \tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n> \tif (!isCameraExternal && !cameraProps) {\n> \t\tLOG(HALConfig, Error)\n> \t\t\t<< \"HAL configuration entry for camera \" << cam->id()\n> \t\t\t<< \" is missing\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> \tret = camera->initialize(cameraProps);\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n> \t\treturn;\n> \t}\n> \n> Reviewed-by: Laurent Pinchart \n> \n> \n>> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n>> index d9bf27989965..af1581da6579 100644\n>> --- a/src/android/camera_hal_manager.h\n>> +++ b/src/android/camera_hal_manager.h\n>> @@ -19,6 +19,8 @@\n>> \n>> #include \n>> \n>> +#include \"camera_hal_config.h\"\n>> +\n>> class CameraDevice;\n>> \n>> class CameraHalManager\n>> @@ -50,6 +52,7 @@ private:\n>> \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n>> \n>> \tstd::unique_ptr cameraManager_;\n>> +\tCameraHalConfig halConfig_;\n>> \n>> \tconst camera_module_callbacks_t *callbacks_;\n>> \tstd::vector> cameras_;\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 3BC1FBD224\n\tfor ;\n\tWed, 14 Apr 2021 18:33:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A677E6880C;\n\tWed, 14 Apr 2021 20:33:31 +0200 (CEST)","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 5688A68803\n\tfor ;\n\tWed, 14 Apr 2021 20:33:30 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8F1C588C;\n\tWed, 14 Apr 2021 20:33:29 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"lnES01K7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618425209;\n\tbh=pBs9g+TSpxxNgttOuMrFlv+90Ze6AmfiVcmrRq2TLW4=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=lnES01K7fWuY29H4L2tN0gKNYYCbhItl5TQdh4HS3KA+DzKwfWrPEEnb+ffzcqv5R\n\t0308ryWDfLaIx/wdGvmm6/X6WNk9qxcL+EV7IzQXgofnw6ea9EV0Nv+xqpGcjl8D/T\n\ttxUxqJbMemKhdbjmFyqFGmnsyOrHdB69UDzrtGd4=","To":"Laurent Pinchart ,\n\tJacopo Mondi ","References":"<20210413145042.48185-1-jacopo@jmondi.org>\n\t<20210413145042.48185-5-jacopo@jmondi.org>\n\t","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<66e8f156-2f82-5f35-2dc9-15640132c439@ideasonboard.com>","Date":"Wed, 14 Apr 2021 19:33:26 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16293,"web_url":"https://patchwork.libcamera.org/comment/16293/","msgid":"<20210415071101.x5ujp3uxsmg3l7gb@uno.localdomain>","date":"2021-04-15T07:11:01","subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Wed, Apr 14, 2021 at 07:33:26PM +0100, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 13/04/2021 21:00, Laurent Pinchart wrote:\n> > Hi Jacopo,\n> >\n> > Thank you for the patch.\n> >\n> > On Tue, Apr 13, 2021 at 04:50:41PM +0200, Jacopo Mondi wrote:\n> >> Open the HAL configuration file in the Camera HAL manager and get\n> >> the camera properties for each created CameraDevice and initialize it\n> >> with them.\n> >>\n> >> Signed-off-by: Jacopo Mondi \n> >> ---\n> >> src/android/camera_device.cpp | 56 +++++++++++++++++++++++++-----\n> >> src/android/camera_device.h | 3 +-\n> >> src/android/camera_hal_manager.cpp | 37 +++++++++++++++++++-\n> >> src/android/camera_hal_manager.h | 3 ++\n> >> 4 files changed, 89 insertions(+), 10 deletions(-)\n> >>\n> >> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> >> index 89044efa7ebe..2e93936fdb4b 100644\n> >> --- a/src/android/camera_device.cpp\n> >> +++ b/src/android/camera_device.cpp\n> >> @@ -6,6 +6,7 @@\n> >> */\n> >>\n> >> #include \"camera_device.h\"\n> >> +#include \"camera_hal_config.h\"\n> >> #include \"camera_ops.h\"\n> >> #include \"post_processor.h\"\n> >>\n> >> @@ -443,12 +444,25 @@ std::unique_ptr CameraDevice::create(unsigned int id,\n> >> }\n> >>\n> >> /*\n> >> - * Initialize the camera static information.\n> >> + * Initialize the camera static information retrieved from the\n> >> + * Camera::properties or from the cameraPros.\n> >> + *\n> >> + * cameraProps is optional for external camera devices and is defaulted to\n> >> + * nullptr.\n> >> + *\n> >> * This method is called before the camera device is opened.\n> >> */\n> >> -int CameraDevice::initialize()\n> >> +int CameraDevice::initialize(const CameraProps *cameraProps)\n> >> {\n> >> -\t/* Initialize orientation and facing side of the camera. */\n> >> +\t/*\n> >> +\t * Initialize orientation and facing side of the camera.\n> >> +\t *\n> >> +\t * If the libcamera::Camera provides those information as retrieved\n> >> +\t * from firmware use them, otherwise fallback to values parsed from\n> >> +\t * the configuration file. If the configuration file is not available\n> >> +\t * the camera is external so its location and rotation can be safely\n> >> +\t * defaulted.\n> >> +\t */\n> >> \tconst ControlList &properties = camera_->properties();\n> >>\n> >> \tif (properties.contains(properties::Location)) {\n> >> @@ -464,12 +478,22 @@ int CameraDevice::initialize()\n> >> \t\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n> >> \t\t\tbreak;\n> >> \t\t}\n> >> +\n> >> +\t\tif (cameraProps && cameraProps->facing != -1 &&\n> >> +\t\t facing_ != cameraProps->facing) {\n> >> +\t\t\tLOG(HAL, Warning)\n> >> +\t\t\t\t<< \"Camera location does not match\"\n> >> +\t\t\t\t<< \" configuration file. Using \" << facing_;\n> >> +\t\t}\n> >> +\t} else if (cameraProps) {\n> >> +\t\tif (cameraProps->facing == -1) {\n> >> +\t\t\tLOG(HAL, Error)\n> >> +\t\t\t\t<< \"Camera facing not in configuration file\";\n> >> +\t\t\treturn -EINVAL;\n> >> +\t\t}\n> >> +\t\tfacing_ = cameraProps->facing;\n> >> \t} else {\n> >> -\t\t/*\n> >> -\t\t * \\todo Retrieve the camera location from configuration file\n> >> -\t\t * if not available from the library.\n> >> -\t\t */\n> >> -\t\tfacing_ = CAMERA_FACING_FRONT;\n> >> +\t\tfacing_ = CAMERA_FACING_EXTERNAL;\n> >> \t}\n> >>\n> >> \t/*\n> >> @@ -483,8 +507,24 @@ int CameraDevice::initialize()\n> >> \tif (properties.contains(properties::Rotation)) {\n> >> \t\tint rotation = properties.get(properties::Rotation);\n> >> \t\torientation_ = (360 - rotation) % 360;\n> >> +\t\tif (cameraProps && cameraProps->rotation != -1 &&\n> >> +\t\t orientation_ != cameraProps->rotation) {\n> >> +\t\t\tLOG(HAL, Warning)\n> >> +\t\t\t\t<< \"Camera orientation does not match\"\n> >> +\t\t\t\t<< \" configuration file. Using \" << orientation_;\n> >> +\t\t}\n> >> +\t} else if (cameraProps) {\n> >> +\t\tif (cameraProps->rotation == -1) {\n> >> +\t\t\tLOG(HAL, Error)\n> >> +\t\t\t\t<< \"Camera rotation not in configuration file\";\n> >> +\t\t\treturn -EINVAL;\n> >> +\t\t}\n> >> +\t\torientation_ = cameraProps->rotation;\n> >> +\t} else {\n> >> +\t\torientation_ = 0;\n> >> \t}\n> >>\n> >> +\t/* Acquire the camera and initialize available stream configurations. */\n> >> \tint ret = camera_->acquire();\n> >> \tif (ret) {\n> >> \t\tLOG(HAL, Error) << \"Failed to temporarily acquire the camera\";\n> >> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> >> index 11bdfec8d587..598d89f1cff0 100644\n> >> --- a/src/android/camera_device.h\n> >> +++ b/src/android/camera_device.h\n> >> @@ -29,6 +29,7 @@\n> >> #include \"camera_worker.h\"\n> >> #include \"jpeg/encoder.h\"\n> >>\n> >> +class CameraProps;\n>\n> This triggers a compiler warning on GCC\n>\n> In file included from ../src/android/camera_device.cpp:9:\n> ../src/android/camera_hal_config.h:16:1: error: 'CameraProps' defined as\n> a struct here but previously declared as a class; this is valid, but may\n> result in linker errors under the Microsoft C++ ABI\n> [-Werror,-Wmismatched-tags]\n> struct CameraProps {\n> ^\n> ../src/android/camera_device.h:32:1: note: did you mean struct here?\n> class CameraProps;\n>\n\nUuuups, yes indeed! Thanks for spotting!\n\n>\n>\n> >> class CameraDevice : protected libcamera::Loggable\n> >> {\n> >> public:\n> >> @@ -36,7 +37,7 @@ public:\n> >> \t\t\t\t\t\t std::shared_ptr cam);\n> >> \t~CameraDevice();\n> >>\n> >> -\tint initialize();\n> >> +\tint initialize(const CameraProps *cameraProps = nullptr);\n> >\n> > You can drop the = nullptr if you agree with the change below.\n> >\n> >>\n> >> \tint open(const hw_module_t *hardwareModule);\n> >> \tvoid close();\n> >> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> >> index bf3fcda75237..1defc3f9c5bd 100644\n> >> --- a/src/android/camera_hal_manager.cpp\n> >> +++ b/src/android/camera_hal_manager.cpp\n> >> @@ -41,6 +41,16 @@ int CameraHalManager::init()\n> >> {\n> >> \tcameraManager_ = std::make_unique();\n> >>\n> >> +\t/*\n> >> +\t * Open and parse configuration file.\n> >> +\t *\n> >> +\t * If the configuration file is not available the HAL only supports\n> >> +\t * external cameras. If it exists but it's not valid then error out.\n> >> +\t */\n> >> +\thalConfig_.open();\n> >> +\tif (halConfig_.exists() && !halConfig_.valid())\n> >> +\t\treturn -EINVAL;\n> >> +\n> >> \t/* Support camera hotplug. */\n> >> \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n> >> \tcameraManager_->cameraRemoved.connect(this, &CameraHalManager::cameraRemoved);\n> >> @@ -100,6 +110,8 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> >> \tauto iter = cameraIdsMap_.find(cam->id());\n> >> \tif (iter != cameraIdsMap_.end()) {\n> >> \t\tid = iter->second;\n> >> +\t\tif (id >= firstExternalCameraId_)\n> >> +\t\t\tisCameraExternal = true;\n> >> \t} else {\n> >> \t\tisCameraNew = true;\n> >>\n> >> @@ -117,7 +129,30 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> >>\n> >> \t/* Create a CameraDevice instance to wrap the libcamera Camera. */\n> >> \tstd::unique_ptr camera = CameraDevice::create(id, cam);\n> >> -\tint ret = camera->initialize();\n> >> +\n> >> +\t/*\n> >> +\t * The configuration file must be valid for internal cameras.\n> >> +\t * External cameras can be initialized without configuration file.\n> >> +\t */\n> >> +\tint ret = -EINVAL;\n> >> +\tif (!halConfig_.exists()) {\n> >> +\t\tif (isCameraExternal)\n> >> +\t\t\tret = camera->initialize();\n> >> +\t} else {\n> >> +\t\t/*\n> >> +\t\t * Get camera properties from the configuration file which\n> >> +\t\t * exists and is valid.\n> >> +\t\t *\n> >> +\t\t * Internal cameras are required to have a corresponding entry\n> >> +\t\t * in the configuration file. External cameras are not required\n> >> +\t\t * to.\n> >> +\t\t */\n> >> +\t\tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n> >> +\t\tif (cameraProps->valid)\n> >> +\t\t\tret = camera->initialize(cameraProps);\n> >> +\t\telse if (isCameraExternal)\n> >> +\t\t\tret = camera->initialize();\n> >> +\t}\n> >> \tif (ret) {\n> >> \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n> >> \t\treturn;\n> >\n> > If the configuration file does not exist and the camera is internal,\n> > we'll only print \"Failed to initialize camera\", which will be confusing.\n> > How about the following ?\n> >\n> > \t/*\n> > \t * The configuration file must be valid, and contain a corresponding\n> > \t * entry for internal cameras. External cameras can be initialized\n> > \t * without configuration file.\n> > \t */\n> > \tif (!isCameraExternal && !halConfig_.exists()) {\n> > \t\tLOG(HALConfig, Error)\n> > \t\t\t<< \"HAL configuration file is mandatory for internal cameras\";\n> > \t\treturn -EINVAL;\n> > \t}\n> >\n> > \tconst CameraProps *cameraProps = &halConfig_.cameraProps(cam->id());\n> > \tif (!isCameraExternal && !cameraProps) {\n> > \t\tLOG(HALConfig, Error)\n> > \t\t\t<< \"HAL configuration entry for camera \" << cam->id()\n> > \t\t\t<< \" is missing\";\n> > \t\treturn -EINVAL;\n> > \t}\n> >\n> > \tret = camera->initialize(cameraProps);\n> > \tif (ret) {\n> > \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n> > \t\treturn;\n> > \t}\n> >\n> > Reviewed-by: Laurent Pinchart \n> >\n> >\n> >> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> >> index d9bf27989965..af1581da6579 100644\n> >> --- a/src/android/camera_hal_manager.h\n> >> +++ b/src/android/camera_hal_manager.h\n> >> @@ -19,6 +19,8 @@\n> >>\n> >> #include \n> >>\n> >> +#include \"camera_hal_config.h\"\n> >> +\n> >> class CameraDevice;\n> >>\n> >> class CameraHalManager\n> >> @@ -50,6 +52,7 @@ private:\n> >> \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n> >>\n> >> \tstd::unique_ptr cameraManager_;\n> >> +\tCameraHalConfig halConfig_;\n> >>\n> >> \tconst camera_module_callbacks_t *callbacks_;\n> >> \tstd::vector> cameras_;\n> >\n>\n> --\n> Regards\n> --\n> Kieran","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 418B1BD224\n\tfor ;\n\tThu, 15 Apr 2021 07:10:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4269D68812;\n\tThu, 15 Apr 2021 09:10:25 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8FB866880A\n\tfor ;\n\tThu, 15 Apr 2021 09:10:23 +0200 (CEST)","from uno.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id E3031240005;\n\tThu, 15 Apr 2021 07:10:22 +0000 (UTC)"],"Date":"Thu, 15 Apr 2021 09:11:01 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20210415071101.x5ujp3uxsmg3l7gb@uno.localdomain>","References":"<20210413145042.48185-1-jacopo@jmondi.org>\n\t<20210413145042.48185-5-jacopo@jmondi.org>\n\t\n\t<66e8f156-2f82-5f35-2dc9-15640132c439@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<66e8f156-2f82-5f35-2dc9-15640132c439@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Get\n\tproperties from configuration","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]