{"id":10917,"url":"https://patchwork.libcamera.org/api/patches/10917/?format=json","web_url":"https://patchwork.libcamera.org/patch/10917/","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":"<20210121101549.134574-6-paul.elder@ideasonboard.com>","date":"2021-01-21T10:15:45","name":"[libcamera-devel,v2,5/9] android: camera_device: Load make and model from platform settings","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"f64ccff344c0c96c827ed392d889ccb3f632bef6","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/10917/mbox/","series":[{"id":1590,"url":"https://patchwork.libcamera.org/api/series/1590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1590","date":"2021-01-21T10:15:40","name":"Fill in android result metadata and EXIF tags","version":2,"mbox":"https://patchwork.libcamera.org/series/1590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10917/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10917/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 E589FC0F2A\n\tfor ;\n\tThu, 21 Jan 2021 10:16:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B251F681DE;\n\tThu, 21 Jan 2021 11:16:12 +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 B416B681E1\n\tfor ;\n\tThu, 21 Jan 2021 11:16:11 +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 39A7F50E;\n\tThu, 21 Jan 2021 11:16:09 +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=\"OM0qR/rw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611224171;\n\tbh=e2LS7OxkgVSQ4usA6jGOUmqGy42jH5Gfw9noQG3d4WY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OM0qR/rwI9hY7+004isdEOGO1VoAb09vVfzVAbUrT9PEhhCv+Kub8b4G8b7hFRR57\n\thXtrErKDdJWskBoPBvW8jcmlxBDRkbIoarwr5WwgaFnZFOUHV813KdS9HV9E6ZKB3g\n\t3rUW0ovWNuCuVmryNlx/XIgIMSW1ltJjscsmllNE=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 21 Jan 2021 19:15:45 +0900","Message-Id":"<20210121101549.134574-6-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 5/9] 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 \n\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 d2a8e876..16d5b472 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@@ -344,6 +345,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+\tcameraMake_ = \"libcamera\";\n+\tcameraModel_ = \"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 (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\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","v2","5/9"]}