{"id":10982,"url":"https://patchwork.libcamera.org/api/1.1/patches/10982/?format=json","web_url":"https://patchwork.libcamera.org/patch/10982/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210125071444.26252-5-paul.elder@ideasonboard.com>","date":"2021-01-25T07:14:40","name":"[libcamera-devel,v4,4/8] android: camera_device: Load make and model from platform settings","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"31e1617658f4aee885d0408eed85d7163564bafb","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10982/mbox/","series":[{"id":1603,"url":"https://patchwork.libcamera.org/api/1.1/series/1603/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1603","date":"2021-01-25T07:14:36","name":"Fill in android result metadata and EXIF tags","version":4,"mbox":"https://patchwork.libcamera.org/series/1603/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10982/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10982/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E6D3EC0F2B\n\tfor ;\n\tMon, 25 Jan 2021 07:15:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B6EB8682AB;\n\tMon, 25 Jan 2021 08:15:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7D1C5682A0\n\tfor ;\n\tMon, 25 Jan 2021 08:15:04 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B2B4A3E;\n\tMon, 25 Jan 2021 08:15:02 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"f4Ejvb6k\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611558904;\n\tbh=cGMm4a8BNd/BSZwtFQp+QkkR5Coh5AJ2kWJs8uISCKY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=f4Ejvb6kxiHLm4Wp4hv5Fnadt/YHkzv4A4ANnKDFSCJk3yJ5/RD8oZbXy8x2miuub\n\tcpIFOJUErrzxHCJFlps/H21eGYdKmAZfQDaj60AOSswfqKtSc70JeE2ao2lIh4yD/S\n\t8jzlECcDmvf31fsjk4+nL2Z0uJagfStsc4DKGeb4=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 25 Jan 2021 16:14:40 +0900","Message-Id":"<20210125071444.26252-5-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210125071444.26252-1-paul.elder@ideasonboard.com>","References":"<20210125071444.26252-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 4/8] android: camera_device: Load make\n\tand model from platform settings","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In ChromeOS the camera make and model is saved in\n/var/cache/camera/camera.prop. Load and save these values at\nconstruction time, if available.\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v3:\n- rename cameraMake_ and cameraModel_ to maker_ and model_\n\nChanges in v2:\n- use fstream instead of File and split\n---\n src/android/camera_device.cpp | 23 +++++++++++++++++++++++\n src/android/camera_device.h | 5 +++++\n 2 files changed, 28 insertions(+)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 3983c6dc..592e2d43 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -9,6 +9,7 @@\n #include \"camera_ops.h\"\n #include \"post_processor.h\"\n \n+#include \n #include \n #include \n #include \n@@ -351,6 +352,28 @@ CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr &camer\n \t * streamConfiguration.\n \t */\n \tmaxJpegBufferSize_ = 13 << 20; /* 13631488 from USB HAL */\n+\n+\tmaker_ = \"libcamera\";\n+\tmodel_ = \"cameraModel\";\n+\n+\t/* \\todo Support getting properties on Android */\n+\tstd::ifstream fstream(\"/var/cache/camera/camera.prop\");\n+\tif (!fstream.is_open())\n+\t\treturn;\n+\n+\tstd::string line;\n+\twhile (std::getline(fstream, line)) {\n+\t\tstd::string::size_type delimPos = line.find(\"=\");\n+\t\tif (delimPos == std::string::npos)\n+\t\t\tcontinue;\n+\t\tstd::string key = line.substr(0, delimPos);\n+\t\tstd::string val = line.substr(delimPos + 1);\n+\n+\t\tif (!key.compare(\"ro.product.model\"))\n+\t\t\tmodel_ = val;\n+\t\telse if (!key.compare(\"ro.product.manufacturer\"))\n+\t\t\tmaker_ = val;\n+\t}\n }\n \n CameraDevice::~CameraDevice()\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 597d11fc..058a3f9a 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -55,6 +55,8 @@ public:\n \t\treturn config_.get();\n \t}\n \n+\tconst std::string &cameraMake() const { return maker_; }\n+\tconst std::string &cameraModel() const { return model_; }\n \tint facing() const { return facing_; }\n \tint orientation() const { return orientation_; }\n \tunsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; }\n@@ -125,6 +127,9 @@ private:\n \tstd::map formatsMap_;\n \tstd::vector streams_;\n \n+\tstd::string maker_;\n+\tstd::string model_;\n+\n \tint facing_;\n \tint orientation_;\n \n","prefixes":["libcamera-devel","v4","4/8"]}