summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2020-05-20 10:05:08 +0200
committerJacopo Mondi <jacopo@jmondi.org>2020-05-21 13:31:59 +0200
commitc31785156bf9d6cbb5e4c41bf3f7344914bbb411 (patch)
tree42235594478375427d6520eb8562e82841b5ec29
parent9386f9ac7a055766826268d60c600fe182e3e741 (diff)
libcamera: camera_sensor: Update properties parsing
Update the properties parsing routine in the CameraSensor class to use the newly defined V4L2 control V4L2_CID_CAMERA_ORIENTATION in place of the downstream V4L2_CID_CAMERA_SENSOR_LOCATION which has now been removed. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/libcamera/camera_sensor.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index 174df17c..b14b4051 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -210,24 +210,23 @@ int CameraSensor::init()
int32_t propertyValue;
/* Camera Location: default is front location. */
- const auto &locationControl = controls.find(V4L2_CID_CAMERA_SENSOR_LOCATION);
- if (locationControl != controls.end()) {
- int32_t v4l2Location =
- locationControl->second.def().get<int32_t>();
+ const auto &orientation = controls.find(V4L2_CID_CAMERA_ORIENTATION);
+ if (orientation != controls.end()) {
+ int32_t v4l2Orientation = orientation->second.def().get<int32_t>();
- switch (v4l2Location) {
+ switch (v4l2Orientation) {
default:
LOG(CameraSensor, Warning)
<< "Unsupported camera location "
- << v4l2Location << ", setting to Front";
+ << v4l2Orientation << ", setting to Front";
/* Fall-through */
- case V4L2_LOCATION_FRONT:
+ case V4L2_CAMERA_ORIENTATION_FRONT:
propertyValue = properties::CameraLocationFront;
break;
- case V4L2_LOCATION_BACK:
+ case V4L2_CAMERA_ORIENTATION_BACK:
propertyValue = properties::CameraLocationBack;
break;
- case V4L2_LOCATION_EXTERNAL:
+ case V4L2_CAMERA_ORIENTATION_EXTERNAL:
propertyValue = properties::CameraLocationExternal;
break;
}