[{"id":12980,"web_url":"https://patchwork.libcamera.org/comment/12980/","msgid":"<20201005123011.GM3931@pendragon.ideasonboard.com>","date":"2020-10-05T12:30:11","subject":"Re: [libcamera-devel] [PATCH 11/15] android: camera_device: Make\n\tCameraStream configuration nicer","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Oct 05, 2020 at 01:46:45PM +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Loop over the CameraStream instances and use their interface to perform\n> CameraStream configuration after the Camera::configure().\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 10 ++++------\n> src/android/camera_stream.cpp | 4 ++--\n> src/android/camera_stream.h | 3 ++-\n> 3 files changed, 8 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 537883b63f15..62307726aea9 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1298,17 +1298,15 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t * StreamConfiguration and set the number of required buffers in\n> \t * the Android camera3_stream_t.\n> \t */\n> -\tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> -\t\tcamera3_stream_t *stream = stream_list->streams[i];\n> -\t\tCameraStream *cameraStream = static_cast(stream->priv);\n> -\t\tconst StreamConfiguration &cfg = cameraStream->streamConfiguration();\n> +\tfor (CameraStream &cameraStream : streams_) {\n> +\t\tcamera3_stream_t *stream = cameraStream.androidStream();\n> \n> -\t\tint ret = cameraStream->configure(cfg);\n> +\t\tint ret = cameraStream.configure();\n> \t\tif (ret)\n> \t\t\treturn ret;\n> \n> \t\t/* Use the bufferCount confirmed by the validation process. */\n> -\t\tstream->max_buffers = cfg.bufferCount;\n> +\t\tstream->max_buffers = cameraStream.streamConfiguration().bufferCount;\n\nShould this move to the CameraStream class ?\n\n> \t}\n> \n> \treturn 0;\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 76e7d240f4e7..dbde1e786300 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -56,10 +56,10 @@ const Size &CameraStream::size() const\n> \treturn streamConfiguration().size;\n> }\n> \n> -int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n> +int CameraStream::configure()\n> {\n> \tif (encoder_) {\n> -\t\tint ret = encoder_->configure(cfg);\n> +\t\tint ret = encoder_->configure(streamConfiguration());\n> \t\tif (ret)\n> \t\t\treturn ret;\n> \t}\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index e399e17b2a2f..c6ff79230b7e 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -116,13 +116,14 @@ public:\n> \n> \tint outputFormat() const { return androidStream_->format; }\n> \tType type() const { return type_; }\n> +\tcamera3_stream_t *androidStream() const { return androidStream_; }\n> \n> \tconst libcamera::StreamConfiguration &streamConfiguration() const;\n> \tlibcamera::Stream *stream() const;\n> \tconst libcamera::PixelFormat &format() const;\n> \tconst libcamera::Size &size() const;\n> \n> -\tint configure(const libcamera::StreamConfiguration &cfg);\n> +\tint configure();\n> \tint process(libcamera::FrameBuffer *source,\n> \t\t MappedCamera3Buffer *dest,\n> \t\t CameraMetadata *metadata);","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 6E9DFC3B5C\n\tfor ;\n\tMon, 5 Oct 2020 12:30:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 05E4663C13;\n\tMon, 5 Oct 2020 14:30:52 +0200 (CEST)","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 6F14C63BD5\n\tfor ;\n\tMon, 5 Oct 2020 14:30:50 +0200 (CEST)","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 DAFAC3B\n\tfor ;\n\tMon, 5 Oct 2020 14:30:49 +0200 (CEST)"],"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=\"wNTJY+T3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601901050;\n\tbh=pIwhmW2/xGw5N4AxbNNVTCBCUYiXvxI5d3WNK2j2clg=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=wNTJY+T3FOPuUuNFZK2AXFmPEMhBdhxSHLOF6B4kgizSb/Rn32ggIIqhgWPM8AGM0\n\tRXyjvRUDi9pWOStHn4xkge7Z3ATLpOlJM+11StOYyjDev2u1H1IHS/nolDbaXMOO4g\n\tBsmfdQ97v0j2uhNwit38LN10iOw+ad7eL8BQ220U=","Date":"Mon, 5 Oct 2020 15:30:11 +0300","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20201005123011.GM3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-12-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005104649.10812-12-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 11/15] android: camera_device: Make\n\tCameraStream configuration nicer","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\" "}},{"id":13012,"web_url":"https://patchwork.libcamera.org/comment/13012/","msgid":"<2bba1035-1647-6b33-3df8-c27c99792e3e@ideasonboard.com>","date":"2020-10-06T12:36:14","subject":"Re: [libcamera-devel] [PATCH 11/15] android: camera_device: Make\n\tCameraStream configuration nicer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 05/10/2020 13:30, Laurent Pinchart wrote:\n> Hi Jacopo,\n> \n> Thank you for the patch.\n> \n> On Mon, Oct 05, 2020 at 01:46:45PM +0300, Laurent Pinchart wrote:\n>> From: Jacopo Mondi \n>>\n>> Loop over the CameraStream instances and use their interface to perform\n>> CameraStream configuration after the Camera::configure().\n>>\n>> Signed-off-by: Jacopo Mondi \n>> ---\n>> src/android/camera_device.cpp | 10 ++++------\n>> src/android/camera_stream.cpp | 4 ++--\n>> src/android/camera_stream.h | 3 ++-\n>> 3 files changed, 8 insertions(+), 9 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index 537883b63f15..62307726aea9 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -1298,17 +1298,15 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \t * StreamConfiguration and set the number of required buffers in\n>> \t * the Android camera3_stream_t.\n>> \t */\n>> -\tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n>> -\t\tcamera3_stream_t *stream = stream_list->streams[i];\n>> -\t\tCameraStream *cameraStream = static_cast(stream->priv);\n>> -\t\tconst StreamConfiguration &cfg = cameraStream->streamConfiguration();\n>> +\tfor (CameraStream &cameraStream : streams_) {\n>> +\t\tcamera3_stream_t *stream = cameraStream.androidStream();\n\nOh that's nicer indeed.\n\n>> \n>> -\t\tint ret = cameraStream->configure(cfg);\n>> +\t\tint ret = cameraStream.configure();\n>> \t\tif (ret)\n>> \t\t\treturn ret;\n>> \n>> \t\t/* Use the bufferCount confirmed by the validation process. */\n>> -\t\tstream->max_buffers = cfg.bufferCount;\n>> +\t\tstream->max_buffers = cameraStream.streamConfiguration().bufferCount;\n> \n> Should this move to the CameraStream class ?>\n>> \t}\n>> \n>> \treturn 0;\n>> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n>> index 76e7d240f4e7..dbde1e786300 100644\n>> --- a/src/android/camera_stream.cpp\n>> +++ b/src/android/camera_stream.cpp\n>> @@ -56,10 +56,10 @@ const Size &CameraStream::size() const\n>> \treturn streamConfiguration().size;\n>> }\n>> \n>> -int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n>> +int CameraStream::configure()\n>> {\n>> \tif (encoder_) {\n>> -\t\tint ret = encoder_->configure(cfg);\n>> +\t\tint ret = encoder_->configure(streamConfiguration());\n>> \t\tif (ret)\n>> \t\t\treturn ret;\n>> \t}\n>> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n>> index e399e17b2a2f..c6ff79230b7e 100644\n>> --- a/src/android/camera_stream.h\n>> +++ b/src/android/camera_stream.h\n>> @@ -116,13 +116,14 @@ public:\n>> \n>> \tint outputFormat() const { return androidStream_->format; }\n>> \tType type() const { return type_; }\n>> +\tcamera3_stream_t *androidStream() const { return androidStream_; }\n\nIf the max_buffers/bufferCount does move to CameraStream, this might not\nbe needed in this patch - but I think it's certainly better to be able\nto iterate out HAL objects and get the camera3 types from our\nrepresentations - so I really like this androidStream() in it's\npotential usage.\n\nIf it ends up dropped, it can always come in when required later.\n\nI'll still add this :\n\nReviewed-by: Kieran Bingham \n\n\n>> \n>> \tconst libcamera::StreamConfiguration &streamConfiguration() const;\n>> \tlibcamera::Stream *stream() const;\n>> \tconst libcamera::PixelFormat &format() const;\n>> \tconst libcamera::Size &size() const;\n>> \n>> -\tint configure(const libcamera::StreamConfiguration &cfg);\n>> +\tint configure();\n>> \tint process(libcamera::FrameBuffer *source,\n>> \t\t MappedCamera3Buffer *dest,\n>> \t\t CameraMetadata *metadata);\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 36DF5BEEDF\n\tfor ;\n\tTue, 6 Oct 2020 12:36:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C315663C13;\n\tTue, 6 Oct 2020 14:36:18 +0200 (CEST)","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 466CB60363\n\tfor ;\n\tTue, 6 Oct 2020 14:36:17 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9CE363B;\n\tTue, 6 Oct 2020 14:36:16 +0200 (CEST)"],"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=\"scxZEakZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601987776;\n\tbh=0RESmd5l/TbMDXvjK1bLTLEskMqx/BwGLYegrDcRdhk=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=scxZEakZ4zb+wfUd6HFSQ2XCc4oy6Vq+M/1Ur2NPLxI7j9WYsMzgD1tjjAl+myM0F\n\tg1ydupQY7xTgVXKZX3W1Ak5NUHExHp9Ynt392GCiUOWoPples2cU56J8sFJ+61Jzgg\n\t5uXLbYhrIdREiCoHtW1xgVLn7mT0m4KPOyZFMKOM=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-12-laurent.pinchart@ideasonboard.com>\n\t<20201005123011.GM3931@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<2bba1035-1647-6b33-3df8-c27c99792e3e@ideasonboard.com>","Date":"Tue, 6 Oct 2020 13:36:14 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201005123011.GM3931@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 11/15] android: camera_device: Make\n\tCameraStream configuration nicer","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]