From patchwork Thu Jan 14 10:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 10861 X-Patchwork-Delegate: paul.elder@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 149BEBD808 for ; Thu, 14 Jan 2021 10:40:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D2791680EA; Thu, 14 Jan 2021 11:40:57 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fbR2vh9Z"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A249A680E7 for ; Thu, 14 Jan 2021 11:40:56 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2FDED2B3; Thu, 14 Jan 2021 11:40:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1610620856; bh=lV3ArDdVUZJz/wSGuOjzNwhSGGlVSwh548W5Wg+E6jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbR2vh9Z0tekcvUtCR63uAGPdrsbJZefONVs+Bqkb+neAoG77jB/z1NrIEDJVmo2v eZwQuLAKR3qM11E19nuV4UcLbUxMNse24MUusfOKcK6KfZCvhoOafTmg7C88yq01hz Z5FP7TAxyKGMq5U5B236qnN9mfJJ6sFY5hbWMAYA= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 14 Jan 2021 19:40:34 +0900 Message-Id: <20210114104035.302968-6-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210114104035.302968-1-paul.elder@ideasonboard.com> References: <20210114104035.302968-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/6] android: camera_device: Load make and model from platform settings X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 --- src/android/camera_device.cpp | 30 ++++++++++++++++++++++++++++++ src/android/camera_device.h | 5 +++++ 2 files changed, 35 insertions(+) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index d2a8e876..ed47c7cd 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -18,6 +18,7 @@ #include #include +#include "libcamera/internal/file.h" #include "libcamera/internal/formats.h" #include "libcamera/internal/log.h" #include "libcamera/internal/utils.h" @@ -344,6 +345,35 @@ CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr &camer * streamConfiguration. */ maxJpegBufferSize_ = 13 << 20; /* 13631488 from USB HAL */ + + cameraMake_ = "libcamera"; + cameraModel_ = "cameraModel"; + + File prop("/var/cache/camera/camera.prop"); + if (!prop.open(File::ReadOnly)) + return; + + size_t fileSize = prop.size(); + if (fileSize <= 0) + return; + + std::vector buf(fileSize); + if (prop.read(buf) < 0) + return; + + std::string fileContents(buf.begin(), buf.end()); + for (const auto &line : utils::split(fileContents, "\n")) { + off_t delimPos = line.find("="); + if (delimPos == std::string::npos) + continue; + std::string key = line.substr(0, delimPos); + std::string val = line.substr(delimPos + 1, line.size()); + + if (!key.compare("ro.product.model")) + cameraModel_ = val; + if (!key.compare("ro.product.manufacturer")) + cameraMake_ = val; + } } CameraDevice::~CameraDevice() diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 0874c80f..a285d0a1 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -56,6 +56,8 @@ public: return config_.get(); } + const std::string &cameraMake() const { return cameraMake_; } + const std::string &cameraModel() const { return cameraModel_; } int facing() const { return facing_; } int orientation() const { return orientation_; } unsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; } @@ -127,6 +129,9 @@ private: std::map formatsMap_; std::vector streams_; + std::string cameraMake_; + std::string cameraModel_; + int facing_; int orientation_;