[libcamera-devel] [PATCH v2 2/3] libcamera: camera_sensor: Do not register Location if not available

Jacopo Mondi jacopo at jmondi.org
Fri Mar 19 14:01:19 CET 2021


Do not register the Location property if not available from the firmware
interface instead of defaulting it to External.

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/libcamera/camera_sensor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index 27f82071151e..f7ed91d990f7 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -468,12 +468,10 @@ int CameraSensor::initProperties()
 			propertyValue = properties::CameraLocationBack;
 			break;
 		}
+		properties_.set(properties::Location, propertyValue);
 	} else {
-		LOG(CameraSensor, Warning)
-			<< "Failed to retrieve the camera location, setting to External";
-		propertyValue = properties::CameraLocationExternal;
+		LOG(CameraSensor, Warning) << "Failed to retrieve the camera location";
 	}
-	properties_.set(properties::Location, propertyValue);
 
 	const auto &rotationControl = controls.find(V4L2_CID_CAMERA_SENSOR_ROTATION);
 	if (rotationControl != controls.end()) {
-- 
2.30.0



More information about the libcamera-devel mailing list