PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: camera_sensor: Update properties parsing

Browse Source 
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>
This commit is contained in:
Jacopo Mondi
2020-05-20 10:05:08 +02:00
parent 9386f9ac7a
commit c31785156b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcamera/camera_sensor.cpp
View File

@@ -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;
}