{"id":10861,"url":"https://patchwork.libcamera.org/api/patches/10861/?format=json","web_url":"https://patchwork.libcamera.org/patch/10861/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210114104035.302968-6-paul.elder@ideasonboard.com>","date":"2021-01-14T10:40:34","name":"[libcamera-devel,5/6] android: camera_device: Load make and model from platform settings","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5f17fb525cb07fee2a9e6bd1e4da8e0263b7998a","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10861/mbox/","series":[{"id":1577,"url":"https://patchwork.libcamera.org/api/series/1577/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1577","date":"2021-01-14T10:40:29","name":"Fill in android result metadata and EXIF tags","version":1,"mbox":"https://patchwork.libcamera.org/series/1577/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10861/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10861/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 149BEBD808\n\tfor ;\n\tThu, 14 Jan 2021 10:40:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D2791680EA;\n\tThu, 14 Jan 2021 11:40:57 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A249A680E7\n\tfor ;\n\tThu, 14 Jan 2021 11:40:56 +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 2FDED2B3;\n\tThu, 14 Jan 2021 11:40:54 +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=\"fbR2vh9Z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1610620856;\n\tbh=lV3ArDdVUZJz/wSGuOjzNwhSGGlVSwh548W5Wg+E6jk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fbR2vh9Z0tekcvUtCR63uAGPdrsbJZefONVs+Bqkb+neAoG77jB/z1NrIEDJVmo2v\n\teZwQuLAKR3qM11E19nuV4UcLbUxMNse24MUusfOKcK6KfZCvhoOafTmg7C88yq01hz\n\tZ5FP7TAxyKGMq5U5B236qnN9mfJJ6sFY5hbWMAYA=","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\n\tmodel 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 \n---\n src/android/camera_device.cpp | 30 ++++++++++++++++++++++++++++++\n src/android/camera_device.h | 5 +++++\n 2 files changed, 35 insertions(+)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex d2a8e876..ed47c7cd 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#include \"libcamera/internal/file.h\"\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/utils.h\"\n@@ -344,6 +345,35 @@ 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+\tcameraMake_ = \"libcamera\";\n+\tcameraModel_ = \"cameraModel\";\n+\n+\tFile prop(\"/var/cache/camera/camera.prop\");\n+\tif (!prop.open(File::ReadOnly))\n+\t\treturn;\n+\n+\tsize_t fileSize = prop.size();\n+\tif (fileSize <= 0)\n+\t\treturn;\n+\n+\tstd::vector buf(fileSize);\n+\tif (prop.read(buf) < 0)\n+\t\treturn;\n+\n+\tstd::string fileContents(buf.begin(), buf.end());\n+\tfor (const auto &line : utils::split(fileContents, \"\\n\")) {\n+\t\toff_t 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, line.size());\n+\n+\t\tif (!key.compare(\"ro.product.model\"))\n+\t\t\tcameraModel_ = val;\n+\t\tif (!key.compare(\"ro.product.manufacturer\"))\n+\t\t\tcameraMake_ = val;\n+\t}\n }\n \n CameraDevice::~CameraDevice()\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 0874c80f..a285d0a1 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -56,6 +56,8 @@ public:\n \t\treturn config_.get();\n \t}\n \n+\tconst std::string &cameraMake() const { return cameraMake_; }\n+\tconst std::string &cameraModel() const { return cameraModel_; }\n \tint facing() const { return facing_; }\n \tint orientation() const { return orientation_; }\n \tunsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; }\n@@ -127,6 +129,9 @@ private:\n \tstd::map formatsMap_;\n \tstd::vector streams_;\n \n+\tstd::string cameraMake_;\n+\tstd::string cameraModel_;\n+\n \tint facing_;\n \tint orientation_;\n \n","prefixes":["libcamera-devel","5/6"]}