From e917655d06ec86224b10b992e036460a7334b407 Mon Sep 17 00:00:00 2001
From: Umang Jain <email@uajain.com>
Date: Wed, 9 Sep 2020 16:17:54 +0530
Subject: android: camera_device: Fix value of orientation metadata
Android's orientation metadata cannot have identical numerical
value to libcamera's rotation property. This is due to the fact
that libcamera's rotation property specifies the correction angle
in anticlockwise direction whereas Android's orientation metadata
specifies the value in clockwise direction. Fix that by computing
corresponding value for clockwise direction from libcamera's rotation
property.
Signed-off-by: Umang Jain <email@uajain.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/android/camera_device.cpp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 25829918..8be846bb 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -265,12 +265,17 @@ int CameraDevice::initialize()
}
/*
- * The Android orientation metadata and libcamera rotation property are
- * defined differently but have identical numerical values for Android
- * devices such as phones and tablets.
+ * The Android orientation metadata specifies its rotation correction
+ * value in clockwise direction whereas libcamera specifies the
+ * rotation property in anticlockwise direction. Read the libcamera's
+ * rotation property (anticlockwise) and compute the corresponding
+ * value for clockwise direction as required by the Android orientation
+ * metadata.
*/
- if (properties.contains(properties::Rotation))
- orientation_ = properties.get(properties::Rotation);
+ if (properties.contains(properties::Rotation)) {
+ int rotation = properties.get(properties::Rotation);
+ orientation_ = (360 - rotation) % 360;
+ }
int ret = camera_->acquire();
if (ret) {
--
cgit v1.2.1