[libcamera-devel] [PATCH v4 4/8] android: camera_device: Load make and model from platform settings
Paul Elder
paul.elder at ideasonboard.com
Mon Jan 25 08:14:40 CET 2021
In ChromeOS the camera make and model is saved in
/var/cache/camera/camera.prop. Load and save these values at
construction time, if available.
Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
Changes in v3:
- rename cameraMake_ and cameraModel_ to maker_ and model_
Changes in v2:
- use fstream instead of File and split
---
src/android/camera_device.cpp | 23 +++++++++++++++++++++++
src/android/camera_device.h | 5 +++++
2 files changed, 28 insertions(+)
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 3983c6dc..592e2d43 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -9,6 +9,7 @@
#include "camera_ops.h"
#include "post_processor.h"
+#include <fstream>
#include <sys/mman.h>
#include <tuple>
#include <vector>
@@ -351,6 +352,28 @@ CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr<Camera> &camer
* streamConfiguration.
*/
maxJpegBufferSize_ = 13 << 20; /* 13631488 from USB HAL */
+
+ maker_ = "libcamera";
+ model_ = "cameraModel";
+
+ /* \todo Support getting properties on Android */
+ std::ifstream fstream("/var/cache/camera/camera.prop");
+ if (!fstream.is_open())
+ return;
+
+ std::string line;
+ while (std::getline(fstream, line)) {
+ std::string::size_type delimPos = line.find("=");
+ if (delimPos == std::string::npos)
+ continue;
+ std::string key = line.substr(0, delimPos);
+ std::string val = line.substr(delimPos + 1);
+
+ if (!key.compare("ro.product.model"))
+ model_ = val;
+ else if (!key.compare("ro.product.manufacturer"))
+ maker_ = val;
+ }
}
CameraDevice::~CameraDevice()
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 597d11fc..058a3f9a 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -55,6 +55,8 @@ public:
return config_.get();
}
+ const std::string &cameraMake() const { return maker_; }
+ const std::string &cameraModel() const { return model_; }
int facing() const { return facing_; }
int orientation() const { return orientation_; }
unsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; }
@@ -125,6 +127,9 @@ private:
std::map<int, libcamera::PixelFormat> formatsMap_;
std::vector<CameraStream> streams_;
+ std::string maker_;
+ std::string model_;
+
int facing_;
int orientation_;
--
2.27.0
More information about the libcamera-devel
mailing list