[{"id":14665,"web_url":"https://patchwork.libcamera.org/comment/14665/","msgid":"","date":"2021-01-21T20:34:56","subject":"Re: [libcamera-devel] [PATCH v2 5/9] android: camera_device: Load\n\tmake and model from platform settings","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, Jan 21, 2021 at 07:15:45PM +0900, Paul Elder wrote:\n> In ChromeOS the camera make and model is saved in\n> /var/cache/camera/camera.prop. Load and save these values at\n> construction time, if available.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> Changes 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(+)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 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\ns/getline/std::getline/\n\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\ns/if/else if/\n\n> +\t\t\tcameraMake_ = val;\n> +\t}\n> }\n> \n> CameraDevice::~CameraDevice()\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 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\nMaybe just maker() and model() as the class is called *Camera*Device ?\n(make() sounds weird, hence the proposed maker())\n\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\nSame here ?\n\nReviewed-by: Laurent Pinchart \n\n> +\n> \tint facing_;\n> \tint orientation_;\n>","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 BF5A9C0F2A\n\tfor ;\n\tThu, 21 Jan 2021 20:35:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2B0B968216;\n\tThu, 21 Jan 2021 21:35:16 +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 E1CB768204\n\tfor ;\n\tThu, 21 Jan 2021 21:35:14 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6115D50E;\n\tThu, 21 Jan 2021 21:35:14 +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=\"X3nFva+G\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611261314;\n\tbh=luLA9Fm5Q0eEZWHWkqkfZr4Kl5FjvjhkmPm1gMjTAzU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=X3nFva+GRGF6VSxprGxus+M8JnUOJpPrYzRXvFnu69HXRb6r/TUY3rC5/Zl4EFlkI\n\tzgSgRucY/IRVizPQ4EjR2wpc+B4mB9nfNKU8auNxsli271aiz2dD+5N1mau35rnhi3\n\tlJNhi797nXVEVeRJGOyLCFoglMZgbpR1iPESpM88=","Date":"Thu, 21 Jan 2021 22:34:56 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>\n\t<20210121101549.134574-6-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210121101549.134574-6-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 5/9] android: camera_device: Load\n\tmake and 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]