{"id":3332,"url":"https://patchwork.libcamera.org/api/patches/3332/?format=json","web_url":"https://patchwork.libcamera.org/patch/3332/","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":"<20200326145927.324919-5-jacopo@jmondi.org>","date":"2020-03-26T14:59:25","name":"[libcamera-devel,v4,4/6] libcamera: camera_sensor: Break out properties initialization","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"66186e2b7bbddbba8f32e5883f774ffaaaf7d700","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/3332/mbox/","series":[{"id":782,"url":"https://patchwork.libcamera.org/api/series/782/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=782","date":"2020-03-26T14:59:21","name":"Camera properties and camera sensor factory","version":4,"mbox":"https://patchwork.libcamera.org/series/782/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3332/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3332/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 30EF1605D2\n\tfor ;\n\tThu, 26 Mar 2020 15:56:35 +0100 (CET)","from localhost.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E005A20009\n\tfor ;\n\tThu, 26 Mar 2020 14:56:34 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 26 Mar 2020 15:59:25 +0100","Message-Id":"<20200326145927.324919-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200326145927.324919-1-jacopo@jmondi.org>","References":"<20200326145927.324919-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 4/6] libcamera: camera_sensor: Break\n\tout properties initialization","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","X-List-Received-Date":"Thu, 26 Mar 2020 14:56:36 -0000"},"content":"Refactor the CameraSensor properties initialization to a dedicated virtual\nfunction that derived classes could override to register sensor-specific\nproperty values.\n\nWhile at it, move documentation of the properties() method to match the\ndeclaration order in the class definition and make the properties_ and\nsubdev_ fields protected to allow subclasses access.\n\nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/camera_sensor.cpp | 115 +++++++++++++++-----------\n src/libcamera/include/camera_sensor.h | 7 +-\n 2 files changed, 73 insertions(+), 49 deletions(-)","diff":"diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex c1a29e0b3cfc..09771fc40bbb 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -51,7 +51,7 @@ LOG_DEFINE_CATEGORY(CameraSensor);\n * Once constructed the instance must be initialized with init().\n */\n CameraSensor::CameraSensor(const MediaEntity *entity)\n-\t: entity_(entity), properties_(properties::properties)\n+\t: properties_(properties::properties), entity_(entity)\n {\n \tsubdev_ = new V4L2Subdevice(entity);\n }\n@@ -93,45 +93,6 @@ int CameraSensor::init()\n \tif (ret < 0)\n \t\treturn ret;\n \n-\t/* Retrieve and store the camera sensor properties. */\n-\tconst ControlInfoMap &controls = subdev_->controls();\n-\tint32_t propertyValue;\n-\n-\t/* Camera Location: default is front location. */\n-\tconst auto &locationControl = controls.find(V4L2_CID_CAMERA_SENSOR_LOCATION);\n-\tif (locationControl != controls.end()) {\n-\t\tint32_t v4l2Location =\n-\t\t\tlocationControl->second.def().get();\n-\n-\t\tswitch (v4l2Location) {\n-\t\tdefault:\n-\t\t\tLOG(CameraSensor, Warning)\n-\t\t\t\t<< \"Unsupported camera location \"\n-\t\t\t\t<< v4l2Location << \", setting to Front\";\n-\t\t\t/* Fall-through */\n-\t\tcase V4L2_LOCATION_FRONT:\n-\t\t\tpropertyValue = properties::CameraLocationFront;\n-\t\t\tbreak;\n-\t\tcase V4L2_LOCATION_BACK:\n-\t\t\tpropertyValue = properties::CameraLocationBack;\n-\t\t\tbreak;\n-\t\tcase V4L2_LOCATION_EXTERNAL:\n-\t\t\tpropertyValue = properties::CameraLocationExternal;\n-\t\t\tbreak;\n-\t\t}\n-\t} else {\n-\t\tpropertyValue = properties::CameraLocationFront;\n-\t}\n-\tproperties_.set(properties::Location, propertyValue);\n-\n-\t/* Camera Rotation: default is 0 degrees. */\n-\tconst auto &rotationControl = controls.find(V4L2_CID_CAMERA_SENSOR_ROTATION);\n-\tif (rotationControl != controls.end())\n-\t\tpropertyValue = rotationControl->second.def().get();\n-\telse\n-\t\tpropertyValue = 0;\n-\tproperties_.set(properties::Rotation, propertyValue);\n-\n \t/* Enumerate and cache media bus codes and sizes. */\n \tconst ImageFormats formats = subdev_->formats(0);\n \tif (formats.isEmpty()) {\n@@ -162,6 +123,58 @@ int CameraSensor::init()\n \tstd::sort(mbusCodes_.begin(), mbusCodes_.end());\n \tstd::sort(sizes_.begin(), sizes_.end());\n \n+\treturn initProperties();\n+}\n+\n+/**\n+ * \\brief Initialize the camera sensor standard properties\n+ *\n+ * This method initializes the camera sensor standard properties, by inspecting\n+ * the control information reported by the sensor subdevice.\n+ *\n+ * Derived classes may override this method to register sensor-specific\n+ * properties if needed. If they do so, they shall call the base\n+ * initProperties() method to register standard properties.\n+ *\n+ * \\return 0 on success, a negative error code otherwise\n+ */\n+int CameraSensor::initProperties()\n+{\n+\tconst ControlInfoMap &controlMap = subdev_->controls();\n+\tint32_t propertyValue;\n+\n+\t/* Camera Location: default is front location. */\n+\tconst auto &locationControl = controlMap.find(V4L2_CID_CAMERA_SENSOR_LOCATION);\n+\tif (locationControl != controlMap.end()) {\n+\t\tint32_t v4l2Location =\n+\t\t\tlocationControl->second.def().get();\n+\t\tswitch (v4l2Location) {\n+\t\tcase V4L2_LOCATION_EXTERNAL:\n+\t\t\tpropertyValue = properties::CameraLocationExternal;\n+\t\t\tbreak;\n+\t\tcase V4L2_LOCATION_FRONT:\n+\t\t\tpropertyValue = properties::CameraLocationFront;\n+\t\t\tbreak;\n+\t\tcase V4L2_LOCATION_BACK:\n+\t\t\tpropertyValue = properties::CameraLocationBack;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(CameraSensor, Error)\n+\t\t\t\t<< \"Unsupported camera location: \" << v4l2Location;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t} else {\n+\t\tpropertyValue = properties::CameraLocationFront;\n+\t}\n+\tproperties_.set(properties::Location, propertyValue);\n+\n+\t/* Camera Rotation: default is 0 degrees. */\n+\tpropertyValue = 0;\n+\tconst auto &rotationControl = controlMap.find(V4L2_CID_CAMERA_SENSOR_ROTATION);\n+\tif (rotationControl != controlMap.end())\n+\t\tpropertyValue = rotationControl->second.def().get();\n+\tproperties_.set(properties::Rotation, propertyValue);\n+\n \treturn 0;\n }\n \n@@ -327,12 +340,6 @@ int CameraSensor::getControls(ControlList *ctrls)\n \treturn subdev_->getControls(ctrls);\n }\n \n-/**\n- * \\fn CameraSensor::properties()\n- * \\brief Retrieve the camera sensor properties\n- * \\return The list of camera sensor properties\n- */\n-\n /**\n * \\brief Write controls to the sensor\n * \\param[in] ctrls The list of controls to write\n@@ -363,11 +370,27 @@ int CameraSensor::setControls(ControlList *ctrls)\n \treturn subdev_->setControls(ctrls);\n }\n \n+/**\n+ * \\fn CameraSensor::properties()\n+ * \\brief Retrieve the camera sensor properties\n+ * \\return The list of camera sensor properties\n+ */\n+\n std::string CameraSensor::logPrefix() const\n {\n \treturn \"'\" + subdev_->entity()->name() + \"'\";\n }\n \n+/**\n+ * \\var CameraSensor::properties_\n+ * \\brief The list of camera sensor properties\n+ */\n+\n+/**\n+ * \\var CameraSensor::subdev_\n+ * \\brief The camera sensor V4L2 subdevice\n+ */\n+\n /**\n * \\class CameraSensorFactory\n * \\brief Factory of camera sensors\ndiff --git a/src/libcamera/include/camera_sensor.h b/src/libcamera/include/camera_sensor.h\nindex 8ffc787e740f..6e4d2b0118bc 100644\n--- a/src/libcamera/include/camera_sensor.h\n+++ b/src/libcamera/include/camera_sensor.h\n@@ -34,6 +34,7 @@ public:\n \tCameraSensor &operator=(const CameraSensor &) = delete;\n \n \tint init();\n+\tvirtual int initProperties();\n \n \tconst MediaEntity *entity() const { return entity_; }\n \tconst std::vector &mbusCodes() const { return mbusCodes_; }\n@@ -53,14 +54,14 @@ public:\n protected:\n \tstd::string logPrefix() const;\n \n+\tControlList properties_;\n+\tV4L2Subdevice *subdev_;\n+\n private:\n \tconst MediaEntity *entity_;\n-\tV4L2Subdevice *subdev_;\n \n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\n-\n-\tControlList properties_;\n };\n \n class CameraSensorFactory\n","prefixes":["libcamera-devel","v4","4/6"]}