[{"id":12970,"web_url":"https://patchwork.libcamera.org/comment/12970/","msgid":"","date":"2020-10-05T10:54:44","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo\n\nI am incredibly happy to see this happen first ;-)\n\nAll of your work in progress prevented me from doing the same, so I'm\nreally happy to see this move now, and your other work based on top.\n\nThank you!\n\nOn 05/10/2020 11:46, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Break CameraStream out of the CameraDevice class.\n> \n> No functional changes, only the code is moved.\n> \n> Signed-off-by: Jacopo Mondi \n\nI think this will really help with the clarity of the design as it comes\nup. I should have done this straight away when the CameraStream was\nintroduced.\n\nReviewed-by: Kieran Bingham \n\n\n> ---\n> src/android/camera_device.cpp | 6 ------\n> src/android/camera_device.h | 24 +--------------------\n> src/android/camera_stream.cpp | 16 ++++++++++++++\n> src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> src/android/meson.build | 1 +\n> 5 files changed, 58 insertions(+), 29 deletions(-)\n> create mode 100644 src/android/camera_stream.cpp\n> create mode 100644 src/android/camera_stream.h\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 751699cd2113..bbc692fe109f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> \t}\n> }\n> \n> -CameraStream::CameraStream(PixelFormat format, Size size,\n> -\t\t\t unsigned int index, Encoder *encoder)\n> -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> -{\n> -}\n> -\n> /*\n> * \\struct Camera3RequestDescriptor\n> *\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 1837748d2efc..52923ec979a7 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -23,33 +23,11 @@\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/message.h\"\n> \n> +#include \"camera_stream.h\"\n> #include \"jpeg/encoder.h\"\n> \n> class CameraMetadata;\n> \n> -class CameraStream\n> -{\n> -public:\n> -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> -\t\t unsigned int index, Encoder *encoder = nullptr);\n> -\n> -\tconst libcamera::PixelFormat &format() const { return format_; }\n> -\tconst libcamera::Size &size() const { return size_; }\n> -\tunsigned int index() const { return index_; }\n> -\tEncoder *encoder() const { return encoder_.get(); }\n> -\n> -private:\n> -\tlibcamera::PixelFormat format_;\n> -\tlibcamera::Size size_;\n> -\t/*\n> -\t * The index of the libcamera StreamConfiguration as added during\n> -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> -\t * one or more streams to the Android framework.\n> -\t */\n> -\tunsigned int index_;\n> -\tstd::unique_ptr encoder_;\n> -};\n> -\n> class CameraDevice : protected libcamera::Loggable\n> {\n> public:\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> new file mode 100644\n> index 000000000000..01c62978ca3a\n> --- /dev/null\n> +++ b/src/android/camera_stream.cpp\n> @@ -0,0 +1,16 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.cpp - Camera HAL stream\n> + */\n> +\n> +#include \"camera_stream.h\"\n> +\n> +using namespace libcamera;\n> +\n> +CameraStream::CameraStream(PixelFormat format, Size size,\n> +\t\t\t unsigned int index, Encoder *encoder)\n> +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> +{\n> +}\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> new file mode 100644\n> index 000000000000..10dece7beb69\n> --- /dev/null\n> +++ b/src/android/camera_stream.h\n> @@ -0,0 +1,40 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.h - Camera HAL stream\n> + */\n> +#ifndef __ANDROID_CAMERA_STREAM_H__\n> +#define __ANDROID_CAMERA_STREAM_H__\n> +\n> +#include \n> +\n> +#include \n> +#include \n> +\n> +#include \"jpeg/encoder.h\"\n> +\n> +class CameraStream\n> +{\n> +public:\n> +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> +\t\t unsigned int index, Encoder *encoder = nullptr);\n> +\n> +\tconst libcamera::PixelFormat &format() const { return format_; }\n> +\tconst libcamera::Size &size() const { return size_; }\n> +\tunsigned int index() const { return index_; }\n> +\tEncoder *encoder() const { return encoder_.get(); }\n> +\n> +private:\n> +\tlibcamera::PixelFormat format_;\n> +\tlibcamera::Size size_;\n> +\t/*\n> +\t * The index of the libcamera StreamConfiguration as added during\n> +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> +\t * one or more streams to the Android framework.\n> +\t */\n> +\tunsigned int index_;\n> +\tstd::unique_ptr encoder_;\n> +};\n> +\n> +#endif /* __ANDROID_CAMERA_STREAM__ */\n> diff --git a/src/android/meson.build b/src/android/meson.build\n> index 0293c2036561..802bb89afe57 100644\n> --- a/src/android/meson.build\n> +++ b/src/android/meson.build\n> @@ -20,6 +20,7 @@ android_hal_sources = files([\n> 'camera_device.cpp',\n> 'camera_metadata.cpp',\n> 'camera_ops.cpp',\n> + 'camera_stream.cpp',\n> 'jpeg/encoder_libjpeg.cpp',\n> 'jpeg/exif.cpp',\n> ])\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 26084C3B5C\n\tfor ;\n\tMon, 5 Oct 2020 10:54:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BB3D963C13;\n\tMon, 5 Oct 2020 12:54:48 +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 174AF63BD5\n\tfor ;\n\tMon, 5 Oct 2020 12:54:48 +0200 (CEST)","from [192.168.0.217]\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 794B33B;\n\tMon, 5 Oct 2020 12:54:47 +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=\"AvzfmQsj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601895287;\n\tbh=Ssog0WC0V7Jrb8BOKkR7Ahb5U8DpX57iZY6/K7DpUt4=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=AvzfmQsjEwqvFKcZnjIkxsjncVYbeRZtMaESwcYgvT7WtqS2hRLbUR1+FK0Dk/sac\n\tPf6dVmpMF/t8VsAP3PBh9QZ2/fJ3qwQim4qFVZW90mI4nECOAYKRXT+6gI5HPt325y\n\tAyatqyXdgC7MRkWqke9hH9HBVZKpvwOh6LIoVNyg=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org,\n\tJacopo Mondi ","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@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":"","Date":"Mon, 5 Oct 2020 11:54:44 +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":"<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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\" "}},{"id":12971,"web_url":"https://patchwork.libcamera.org/comment/12971/","msgid":"<20201005111940.GD3931@pendragon.ideasonboard.com>","date":"2020-10-05T11:19:40","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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:35PM +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Break CameraStream out of the CameraDevice class.\n> \n> No functional changes, only the code is moved.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 6 ------\n> src/android/camera_device.h | 24 +--------------------\n> src/android/camera_stream.cpp | 16 ++++++++++++++\n> src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> src/android/meson.build | 1 +\n> 5 files changed, 58 insertions(+), 29 deletions(-)\n> create mode 100644 src/android/camera_stream.cpp\n> create mode 100644 src/android/camera_stream.h\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 751699cd2113..bbc692fe109f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> \t}\n> }\n> \n> -CameraStream::CameraStream(PixelFormat format, Size size,\n> -\t\t\t unsigned int index, Encoder *encoder)\n> -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> -{\n> -}\n> -\n> /*\n> * \\struct Camera3RequestDescriptor\n> *\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 1837748d2efc..52923ec979a7 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -23,33 +23,11 @@\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/message.h\"\n> \n> +#include \"camera_stream.h\"\n> #include \"jpeg/encoder.h\"\n> \n> class CameraMetadata;\n> \n> -class CameraStream\n> -{\n> -public:\n> -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> -\t\t unsigned int index, Encoder *encoder = nullptr);\n> -\n> -\tconst libcamera::PixelFormat &format() const { return format_; }\n> -\tconst libcamera::Size &size() const { return size_; }\n> -\tunsigned int index() const { return index_; }\n> -\tEncoder *encoder() const { return encoder_.get(); }\n> -\n> -private:\n> -\tlibcamera::PixelFormat format_;\n> -\tlibcamera::Size size_;\n> -\t/*\n> -\t * The index of the libcamera StreamConfiguration as added during\n> -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> -\t * one or more streams to the Android framework.\n> -\t */\n> -\tunsigned int index_;\n> -\tstd::unique_ptr encoder_;\n> -};\n> -\n> class CameraDevice : protected libcamera::Loggable\n> {\n> public:\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> new file mode 100644\n> index 000000000000..01c62978ca3a\n> --- /dev/null\n> +++ b/src/android/camera_stream.cpp\n> @@ -0,0 +1,16 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.cpp - Camera HAL stream\n> + */\n> +\n> +#include \"camera_stream.h\"\n> +\n> +using namespace libcamera;\n> +\n> +CameraStream::CameraStream(PixelFormat format, Size size,\n> +\t\t\t unsigned int index, Encoder *encoder)\n> +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> +{\n> +}\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> new file mode 100644\n> index 000000000000..10dece7beb69\n> --- /dev/null\n> +++ b/src/android/camera_stream.h\n> @@ -0,0 +1,40 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.h - Camera HAL stream\n> + */\n> +#ifndef __ANDROID_CAMERA_STREAM_H__\n> +#define __ANDROID_CAMERA_STREAM_H__\n> +\n> +#include \n> +\n> +#include \n> +#include \n> +\n> +#include \"jpeg/encoder.h\"\n\nYou could forward-declare Encoder instead.\n\nReviewed-by: Laurent Pinchart \n\n> +\n> +class CameraStream\n> +{\n> +public:\n> +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> +\t\t unsigned int index, Encoder *encoder = nullptr);\n> +\n> +\tconst libcamera::PixelFormat &format() const { return format_; }\n> +\tconst libcamera::Size &size() const { return size_; }\n> +\tunsigned int index() const { return index_; }\n> +\tEncoder *encoder() const { return encoder_.get(); }\n> +\n> +private:\n> +\tlibcamera::PixelFormat format_;\n> +\tlibcamera::Size size_;\n> +\t/*\n> +\t * The index of the libcamera StreamConfiguration as added during\n> +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> +\t * one or more streams to the Android framework.\n> +\t */\n> +\tunsigned int index_;\n> +\tstd::unique_ptr encoder_;\n> +};\n> +\n> +#endif /* __ANDROID_CAMERA_STREAM__ */\n> diff --git a/src/android/meson.build b/src/android/meson.build\n> index 0293c2036561..802bb89afe57 100644\n> --- a/src/android/meson.build\n> +++ b/src/android/meson.build\n> @@ -20,6 +20,7 @@ android_hal_sources = files([\n> 'camera_device.cpp',\n> 'camera_metadata.cpp',\n> 'camera_ops.cpp',\n> + 'camera_stream.cpp',\n> 'jpeg/encoder_libjpeg.cpp',\n> 'jpeg/exif.cpp',\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 AF1A7C3B5D\n\tfor ;\n\tMon, 5 Oct 2020 11:20:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2AFD463BE4;\n\tMon, 5 Oct 2020 13:20:21 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D2D6263B82\n\tfor ;\n\tMon, 5 Oct 2020 13:20:19 +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 509623B\n\tfor ;\n\tMon, 5 Oct 2020 13:20:19 +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=\"Z3RLMyiO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601896819;\n\tbh=AP8vRbFi6/tOs8Nxd+IAvhSsZCt9XiW/TbEKsUZ+3V8=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=Z3RLMyiO1w2wwgm//6SudVZAyk9Y+anJH8/CdYzRqE2y3/PpX03jN/mpq8FnuEjVR\n\tx+vj8MFtpg76g7YOIQvir9flqSbW275y36xySg7tExCwLoeG3+rS83/47nFuZvRcOG\n\tIbAX5CdLLtaxJWJT9NrxwOerbORtZU79IvwPeFTQ=","Date":"Mon, 5 Oct 2020 14:19:40 +0300","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20201005111940.GD3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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":12984,"web_url":"https://patchwork.libcamera.org/comment/12984/","msgid":"<20201005145631.gacuiim5lufzu2ml@uno.localdomain>","date":"2020-10-05T14:56:31","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Oct 05, 2020 at 02:19:40PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> Thank you for the patch.\n>\n> On Mon, Oct 05, 2020 at 01:46:35PM +0300, Laurent Pinchart wrote:\n> > From: Jacopo Mondi \n> >\n> > Break CameraStream out of the CameraDevice class.\n> >\n> > No functional changes, only the code is moved.\n> >\n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/android/camera_device.cpp | 6 ------\n> > src/android/camera_device.h | 24 +--------------------\n> > src/android/camera_stream.cpp | 16 ++++++++++++++\n> > src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> > src/android/meson.build | 1 +\n> > 5 files changed, 58 insertions(+), 29 deletions(-)\n> > create mode 100644 src/android/camera_stream.cpp\n> > create mode 100644 src/android/camera_stream.h\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 751699cd2113..bbc692fe109f 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> > \t}\n> > }\n> >\n> > -CameraStream::CameraStream(PixelFormat format, Size size,\n> > -\t\t\t unsigned int index, Encoder *encoder)\n> > -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > -{\n> > -}\n> > -\n> > /*\n> > * \\struct Camera3RequestDescriptor\n> > *\n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index 1837748d2efc..52923ec979a7 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -23,33 +23,11 @@\n> > #include \"libcamera/internal/log.h\"\n> > #include \"libcamera/internal/message.h\"\n> >\n> > +#include \"camera_stream.h\"\n> > #include \"jpeg/encoder.h\"\n> >\n> > class CameraMetadata;\n> >\n> > -class CameraStream\n> > -{\n> > -public:\n> > -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > -\t\t unsigned int index, Encoder *encoder = nullptr);\n> > -\n> > -\tconst libcamera::PixelFormat &format() const { return format_; }\n> > -\tconst libcamera::Size &size() const { return size_; }\n> > -\tunsigned int index() const { return index_; }\n> > -\tEncoder *encoder() const { return encoder_.get(); }\n> > -\n> > -private:\n> > -\tlibcamera::PixelFormat format_;\n> > -\tlibcamera::Size size_;\n> > -\t/*\n> > -\t * The index of the libcamera StreamConfiguration as added during\n> > -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > -\t * one or more streams to the Android framework.\n> > -\t */\n> > -\tunsigned int index_;\n> > -\tstd::unique_ptr encoder_;\n> > -};\n> > -\n> > class CameraDevice : protected libcamera::Loggable\n> > {\n> > public:\n> > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > new file mode 100644\n> > index 000000000000..01c62978ca3a\n> > --- /dev/null\n> > +++ b/src/android/camera_stream.cpp\n> > @@ -0,0 +1,16 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2020, Google Inc.\n> > + *\n> > + * camera_stream.cpp - Camera HAL stream\n> > + */\n> > +\n> > +#include \"camera_stream.h\"\n> > +\n> > +using namespace libcamera;\n> > +\n> > +CameraStream::CameraStream(PixelFormat format, Size size,\n> > +\t\t\t unsigned int index, Encoder *encoder)\n> > +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > +{\n> > +}\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > new file mode 100644\n> > index 000000000000..10dece7beb69\n> > --- /dev/null\n> > +++ b/src/android/camera_stream.h\n> > @@ -0,0 +1,40 @@\n> > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +/*\n> > + * Copyright (C) 2020, Google Inc.\n> > + *\n> > + * camera_stream.h - Camera HAL stream\n> > + */\n> > +#ifndef __ANDROID_CAMERA_STREAM_H__\n> > +#define __ANDROID_CAMERA_STREAM_H__\n> > +\n> > +#include \n> > +\n> > +#include \n> > +#include \n> > +\n> > +#include \"jpeg/encoder.h\"\n>\n> You could forward-declare Encoder instead.\n\nApparently not\nerror: invalid application of 'sizeof' to an incomplete type 'Encoder'\n\n>\n> Reviewed-by: Laurent Pinchart \n\nThanks\n j\n\n>\n> > +\n> > +class CameraStream\n> > +{\n> > +public:\n> > +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > +\t\t unsigned int index, Encoder *encoder = nullptr);\n> > +\n> > +\tconst libcamera::PixelFormat &format() const { return format_; }\n> > +\tconst libcamera::Size &size() const { return size_; }\n> > +\tunsigned int index() const { return index_; }\n> > +\tEncoder *encoder() const { return encoder_.get(); }\n> > +\n> > +private:\n> > +\tlibcamera::PixelFormat format_;\n> > +\tlibcamera::Size size_;\n> > +\t/*\n> > +\t * The index of the libcamera StreamConfiguration as added during\n> > +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > +\t * one or more streams to the Android framework.\n> > +\t */\n> > +\tunsigned int index_;\n> > +\tstd::unique_ptr encoder_;\n> > +};\n> > +\n> > +#endif /* __ANDROID_CAMERA_STREAM__ */\n> > diff --git a/src/android/meson.build b/src/android/meson.build\n> > index 0293c2036561..802bb89afe57 100644\n> > --- a/src/android/meson.build\n> > +++ b/src/android/meson.build\n> > @@ -20,6 +20,7 @@ android_hal_sources = files([\n> > 'camera_device.cpp',\n> > 'camera_metadata.cpp',\n> > 'camera_ops.cpp',\n> > + 'camera_stream.cpp',\n> > 'jpeg/encoder_libjpeg.cpp',\n> > 'jpeg/exif.cpp',\n> > ])\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 E0318C3B5C\n\tfor ;\n\tMon, 5 Oct 2020 14:52:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 723DE63C28;\n\tMon, 5 Oct 2020 16:52:34 +0200 (CEST)","from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2AB4863BE4\n\tfor ;\n\tMon, 5 Oct 2020 16:52:33 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 9A4C8C0002;\n\tMon, 5 Oct 2020 14:52:32 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Mon, 5 Oct 2020 16:56:31 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20201005145631.gacuiim5lufzu2ml@uno.localdomain>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>\n\t<20201005111940.GD3931@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005111940.GD3931@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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\" "}},{"id":12989,"web_url":"https://patchwork.libcamera.org/comment/12989/","msgid":"<20201005161932.GT3931@pendragon.ideasonboard.com>","date":"2020-10-05T16:19:32","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Mon, Oct 05, 2020 at 04:56:31PM +0200, Jacopo Mondi wrote:\n> On Mon, Oct 05, 2020 at 02:19:40PM +0300, Laurent Pinchart wrote:\n> > On Mon, Oct 05, 2020 at 01:46:35PM +0300, Laurent Pinchart wrote:\n> > > From: Jacopo Mondi \n> > >\n> > > Break CameraStream out of the CameraDevice class.\n> > >\n> > > No functional changes, only the code is moved.\n> > >\n> > > Signed-off-by: Jacopo Mondi \n> > > ---\n> > > src/android/camera_device.cpp | 6 ------\n> > > src/android/camera_device.h | 24 +--------------------\n> > > src/android/camera_stream.cpp | 16 ++++++++++++++\n> > > src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> > > src/android/meson.build | 1 +\n> > > 5 files changed, 58 insertions(+), 29 deletions(-)\n> > > create mode 100644 src/android/camera_stream.cpp\n> > > create mode 100644 src/android/camera_stream.h\n> > >\n> > > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > > index 751699cd2113..bbc692fe109f 100644\n> > > --- a/src/android/camera_device.cpp\n> > > +++ b/src/android/camera_device.cpp\n> > > @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> > > \t}\n> > > }\n> > >\n> > > -CameraStream::CameraStream(PixelFormat format, Size size,\n> > > -\t\t\t unsigned int index, Encoder *encoder)\n> > > -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > > -{\n> > > -}\n> > > -\n> > > /*\n> > > * \\struct Camera3RequestDescriptor\n> > > *\n> > > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > > index 1837748d2efc..52923ec979a7 100644\n> > > --- a/src/android/camera_device.h\n> > > +++ b/src/android/camera_device.h\n> > > @@ -23,33 +23,11 @@\n> > > #include \"libcamera/internal/log.h\"\n> > > #include \"libcamera/internal/message.h\"\n> > >\n> > > +#include \"camera_stream.h\"\n> > > #include \"jpeg/encoder.h\"\n> > >\n> > > class CameraMetadata;\n> > >\n> > > -class CameraStream\n> > > -{\n> > > -public:\n> > > -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > > -\t\t unsigned int index, Encoder *encoder = nullptr);\n> > > -\n> > > -\tconst libcamera::PixelFormat &format() const { return format_; }\n> > > -\tconst libcamera::Size &size() const { return size_; }\n> > > -\tunsigned int index() const { return index_; }\n> > > -\tEncoder *encoder() const { return encoder_.get(); }\n> > > -\n> > > -private:\n> > > -\tlibcamera::PixelFormat format_;\n> > > -\tlibcamera::Size size_;\n> > > -\t/*\n> > > -\t * The index of the libcamera StreamConfiguration as added during\n> > > -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > > -\t * one or more streams to the Android framework.\n> > > -\t */\n> > > -\tunsigned int index_;\n> > > -\tstd::unique_ptr encoder_;\n> > > -};\n> > > -\n> > > class CameraDevice : protected libcamera::Loggable\n> > > {\n> > > public:\n> > > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > > new file mode 100644\n> > > index 000000000000..01c62978ca3a\n> > > --- /dev/null\n> > > +++ b/src/android/camera_stream.cpp\n> > > @@ -0,0 +1,16 @@\n> > > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > > +/*\n> > > + * Copyright (C) 2020, Google Inc.\n> > > + *\n> > > + * camera_stream.cpp - Camera HAL stream\n> > > + */\n> > > +\n> > > +#include \"camera_stream.h\"\n> > > +\n> > > +using namespace libcamera;\n> > > +\n> > > +CameraStream::CameraStream(PixelFormat format, Size size,\n> > > +\t\t\t unsigned int index, Encoder *encoder)\n> > > +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > > +{\n> > > +}\n> > > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > > new file mode 100644\n> > > index 000000000000..10dece7beb69\n> > > --- /dev/null\n> > > +++ b/src/android/camera_stream.h\n> > > @@ -0,0 +1,40 @@\n> > > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > > +/*\n> > > + * Copyright (C) 2020, Google Inc.\n> > > + *\n> > > + * camera_stream.h - Camera HAL stream\n> > > + */\n> > > +#ifndef __ANDROID_CAMERA_STREAM_H__\n> > > +#define __ANDROID_CAMERA_STREAM_H__\n> > > +\n> > > +#include \n> > > +\n> > > +#include \n> > > +#include \n> > > +\n> > > +#include \"jpeg/encoder.h\"\n> >\n> > You could forward-declare Encoder instead.\n> \n> Apparently not\n> error: invalid application of 'sizeof' to an incomplete type 'Encoder'\n\nYou need to include the header in camera_stream.cpp :-)\n\n> > Reviewed-by: Laurent Pinchart \n> >\n> > > +\n> > > +class CameraStream\n> > > +{\n> > > +public:\n> > > +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > > +\t\t unsigned int index, Encoder *encoder = nullptr);\n> > > +\n> > > +\tconst libcamera::PixelFormat &format() const { return format_; }\n> > > +\tconst libcamera::Size &size() const { return size_; }\n> > > +\tunsigned int index() const { return index_; }\n> > > +\tEncoder *encoder() const { return encoder_.get(); }\n> > > +\n> > > +private:\n> > > +\tlibcamera::PixelFormat format_;\n> > > +\tlibcamera::Size size_;\n> > > +\t/*\n> > > +\t * The index of the libcamera StreamConfiguration as added during\n> > > +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > > +\t * one or more streams to the Android framework.\n> > > +\t */\n> > > +\tunsigned int index_;\n> > > +\tstd::unique_ptr encoder_;\n> > > +};\n> > > +\n> > > +#endif /* __ANDROID_CAMERA_STREAM__ */\n> > > diff --git a/src/android/meson.build b/src/android/meson.build\n> > > index 0293c2036561..802bb89afe57 100644\n> > > --- a/src/android/meson.build\n> > > +++ b/src/android/meson.build\n> > > @@ -20,6 +20,7 @@ android_hal_sources = files([\n> > > 'camera_device.cpp',\n> > > 'camera_metadata.cpp',\n> > > 'camera_ops.cpp',\n> > > + 'camera_stream.cpp',\n> > > 'jpeg/encoder_libjpeg.cpp',\n> > > 'jpeg/exif.cpp',\n> > > ])\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 F17B5C3B5C\n\tfor ;\n\tMon, 5 Oct 2020 16:20:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C207E63C6A;\n\tMon, 5 Oct 2020 18:20:13 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 79E5E63BED\n\tfor ;\n\tMon, 5 Oct 2020 18:20:12 +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 B94DB3B;\n\tMon, 5 Oct 2020 18:20:11 +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=\"fw/kiO8X\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601914811;\n\tbh=15B/N/1t9FOdx54bvwqMNsZZaTMmEzo8yvuJQ3dmyG8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=fw/kiO8XoAnebKNpCiDbPrOEqd808TvxvcaUYrn6tYXtI8Tn0LWLO+NfsR7x7IIW3\n\tyQDz65xdbWap/DnwA4RaBqKetQ1be8TahRKjp87P28+BFShQqXec1KyDQxvhmmVIN1\n\txlkvpRva5XYPB3UKs/cnhoq2l09IoPLewv5GIg+0=","Date":"Mon, 5 Oct 2020 19:19:32 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20201005161932.GT3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>\n\t<20201005111940.GD3931@pendragon.ideasonboard.com>\n\t<20201005145631.gacuiim5lufzu2ml@uno.localdomain>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005145631.gacuiim5lufzu2ml@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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\" "}},{"id":12991,"web_url":"https://patchwork.libcamera.org/comment/12991/","msgid":"<20201005163639.fqy7oubekonf7lor@uno.localdomain>","date":"2020-10-05T16:36:39","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"iHi Laurent\n\nOn Mon, Oct 05, 2020 at 07:19:32PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> On Mon, Oct 05, 2020 at 04:56:31PM +0200, Jacopo Mondi wrote:\n> > On Mon, Oct 05, 2020 at 02:19:40PM +0300, Laurent Pinchart wrote:\n> > > On Mon, Oct 05, 2020 at 01:46:35PM +0300, Laurent Pinchart wrote:\n> > > > From: Jacopo Mondi \n> > > >\n> > > > Break CameraStream out of the CameraDevice class.\n> > > >\n> > > > No functional changes, only the code is moved.\n> > > >\n> > > > Signed-off-by: Jacopo Mondi \n> > > > ---\n> > > > src/android/camera_device.cpp | 6 ------\n> > > > src/android/camera_device.h | 24 +--------------------\n> > > > src/android/camera_stream.cpp | 16 ++++++++++++++\n> > > > src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> > > > src/android/meson.build | 1 +\n> > > > 5 files changed, 58 insertions(+), 29 deletions(-)\n> > > > create mode 100644 src/android/camera_stream.cpp\n> > > > create mode 100644 src/android/camera_stream.h\n> > > >\n> > > > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > > > index 751699cd2113..bbc692fe109f 100644\n> > > > --- a/src/android/camera_device.cpp\n> > > > +++ b/src/android/camera_device.cpp\n> > > > @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> > > > \t}\n> > > > }\n> > > >\n> > > > -CameraStream::CameraStream(PixelFormat format, Size size,\n> > > > -\t\t\t unsigned int index, Encoder *encoder)\n> > > > -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > > > -{\n> > > > -}\n> > > > -\n> > > > /*\n> > > > * \\struct Camera3RequestDescriptor\n> > > > *\n> > > > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > > > index 1837748d2efc..52923ec979a7 100644\n> > > > --- a/src/android/camera_device.h\n> > > > +++ b/src/android/camera_device.h\n> > > > @@ -23,33 +23,11 @@\n> > > > #include \"libcamera/internal/log.h\"\n> > > > #include \"libcamera/internal/message.h\"\n> > > >\n> > > > +#include \"camera_stream.h\"\n> > > > #include \"jpeg/encoder.h\"\n> > > >\n> > > > class CameraMetadata;\n> > > >\n> > > > -class CameraStream\n> > > > -{\n> > > > -public:\n> > > > -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > > > -\t\t unsigned int index, Encoder *encoder = nullptr);\n> > > > -\n> > > > -\tconst libcamera::PixelFormat &format() const { return format_; }\n> > > > -\tconst libcamera::Size &size() const { return size_; }\n> > > > -\tunsigned int index() const { return index_; }\n> > > > -\tEncoder *encoder() const { return encoder_.get(); }\n> > > > -\n> > > > -private:\n> > > > -\tlibcamera::PixelFormat format_;\n> > > > -\tlibcamera::Size size_;\n> > > > -\t/*\n> > > > -\t * The index of the libcamera StreamConfiguration as added during\n> > > > -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > > > -\t * one or more streams to the Android framework.\n> > > > -\t */\n> > > > -\tunsigned int index_;\n> > > > -\tstd::unique_ptr encoder_;\n> > > > -};\n> > > > -\n> > > > class CameraDevice : protected libcamera::Loggable\n> > > > {\n> > > > public:\n> > > > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > > > new file mode 100644\n> > > > index 000000000000..01c62978ca3a\n> > > > --- /dev/null\n> > > > +++ b/src/android/camera_stream.cpp\n> > > > @@ -0,0 +1,16 @@\n> > > > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > > > +/*\n> > > > + * Copyright (C) 2020, Google Inc.\n> > > > + *\n> > > > + * camera_stream.cpp - Camera HAL stream\n> > > > + */\n> > > > +\n> > > > +#include \"camera_stream.h\"\n> > > > +\n> > > > +using namespace libcamera;\n> > > > +\n> > > > +CameraStream::CameraStream(PixelFormat format, Size size,\n> > > > +\t\t\t unsigned int index, Encoder *encoder)\n> > > > +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> > > > +{\n> > > > +}\n> > > > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > > > new file mode 100644\n> > > > index 000000000000..10dece7beb69\n> > > > --- /dev/null\n> > > > +++ b/src/android/camera_stream.h\n> > > > @@ -0,0 +1,40 @@\n> > > > +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > > > +/*\n> > > > + * Copyright (C) 2020, Google Inc.\n> > > > + *\n> > > > + * camera_stream.h - Camera HAL stream\n> > > > + */\n> > > > +#ifndef __ANDROID_CAMERA_STREAM_H__\n> > > > +#define __ANDROID_CAMERA_STREAM_H__\n> > > > +\n> > > > +#include \n> > > > +\n> > > > +#include \n> > > > +#include \n> > > > +\n> > > > +#include \"jpeg/encoder.h\"\n> > >\n> > > You could forward-declare Encoder instead.\n> >\n> > Apparently not\n> > error: invalid application of 'sizeof' to an incomplete type 'Encoder'\n>\n> You need to include the header in camera_stream.cpp :-)\n>\n\nAH, my bad, I thought the error was in the .h file because of the\nunique_ptr<> wrapping Encoder.\n\nThanks!\n\n> > > Reviewed-by: Laurent Pinchart \n> > >\n> > > > +\n> > > > +class CameraStream\n> > > > +{\n> > > > +public:\n> > > > +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> > > > +\t\t unsigned int index, Encoder *encoder = nullptr);\n> > > > +\n> > > > +\tconst libcamera::PixelFormat &format() const { return format_; }\n> > > > +\tconst libcamera::Size &size() const { return size_; }\n> > > > +\tunsigned int index() const { return index_; }\n> > > > +\tEncoder *encoder() const { return encoder_.get(); }\n> > > > +\n> > > > +private:\n> > > > +\tlibcamera::PixelFormat format_;\n> > > > +\tlibcamera::Size size_;\n> > > > +\t/*\n> > > > +\t * The index of the libcamera StreamConfiguration as added during\n> > > > +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> > > > +\t * one or more streams to the Android framework.\n> > > > +\t */\n> > > > +\tunsigned int index_;\n> > > > +\tstd::unique_ptr encoder_;\n> > > > +};\n> > > > +\n> > > > +#endif /* __ANDROID_CAMERA_STREAM__ */\n> > > > diff --git a/src/android/meson.build b/src/android/meson.build\n> > > > index 0293c2036561..802bb89afe57 100644\n> > > > --- a/src/android/meson.build\n> > > > +++ b/src/android/meson.build\n> > > > @@ -20,6 +20,7 @@ android_hal_sources = files([\n> > > > 'camera_device.cpp',\n> > > > 'camera_metadata.cpp',\n> > > > 'camera_ops.cpp',\n> > > > + 'camera_stream.cpp',\n> > > > 'jpeg/encoder_libjpeg.cpp',\n> > > > 'jpeg/exif.cpp',\n> > > > ])\n> > >\n>\n> --\n> Regards,\n>\n> Laurent Pinchart","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 A3ACAC3B5D\n\tfor ;\n\tMon, 5 Oct 2020 16:32:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 82E7F63C52;\n\tMon, 5 Oct 2020 18:32:41 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EA0D463BED\n\tfor ;\n\tMon, 5 Oct 2020 18:32:40 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 8970E1BF204;\n\tMon, 5 Oct 2020 16:32:40 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Mon, 5 Oct 2020 18:36:39 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20201005163639.fqy7oubekonf7lor@uno.localdomain>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>\n\t<20201005111940.GD3931@pendragon.ideasonboard.com>\n\t<20201005145631.gacuiim5lufzu2ml@uno.localdomain>\n\t<20201005161932.GT3931@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005161932.GT3931@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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\" "}},{"id":13005,"web_url":"https://patchwork.libcamera.org/comment/13005/","msgid":"<4e5bd366-3ab5-3011-022c-9cb52329e398@uajain.com>","date":"2020-10-06T11:08:52","subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/","name":"Umang Jain","email":"email@uajain.com"},"content":"Hi Jacopo,\n\nOn 10/5/20 4:16 PM, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n>\n> Break CameraStream out of the CameraDevice class.\n>\n> No functional changes, only the code is moved.\n>\n> Signed-off-by: Jacopo Mondi \nReviewed-by: Umang Jain \n> ---\n> src/android/camera_device.cpp | 6 ------\n> src/android/camera_device.h | 24 +--------------------\n> src/android/camera_stream.cpp | 16 ++++++++++++++\n> src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n> src/android/meson.build | 1 +\n> 5 files changed, 58 insertions(+), 29 deletions(-)\n> create mode 100644 src/android/camera_stream.cpp\n> create mode 100644 src/android/camera_stream.h\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 751699cd2113..bbc692fe109f 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> \t}\n> }\n> \n> -CameraStream::CameraStream(PixelFormat format, Size size,\n> -\t\t\t unsigned int index, Encoder *encoder)\n> -\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> -{\n> -}\n> -\n> /*\n> * \\struct Camera3RequestDescriptor\n> *\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 1837748d2efc..52923ec979a7 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -23,33 +23,11 @@\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/message.h\"\n> \n> +#include \"camera_stream.h\"\n> #include \"jpeg/encoder.h\"\n> \n> class CameraMetadata;\n> \n> -class CameraStream\n> -{\n> -public:\n> -\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> -\t\t unsigned int index, Encoder *encoder = nullptr);\n> -\n> -\tconst libcamera::PixelFormat &format() const { return format_; }\n> -\tconst libcamera::Size &size() const { return size_; }\n> -\tunsigned int index() const { return index_; }\n> -\tEncoder *encoder() const { return encoder_.get(); }\n> -\n> -private:\n> -\tlibcamera::PixelFormat format_;\n> -\tlibcamera::Size size_;\n> -\t/*\n> -\t * The index of the libcamera StreamConfiguration as added during\n> -\t * configureStreams(). A single libcamera Stream may be used to deliver\n> -\t * one or more streams to the Android framework.\n> -\t */\n> -\tunsigned int index_;\n> -\tstd::unique_ptr encoder_;\n> -};\n> -\n> class CameraDevice : protected libcamera::Loggable\n> {\n> public:\n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> new file mode 100644\n> index 000000000000..01c62978ca3a\n> --- /dev/null\n> +++ b/src/android/camera_stream.cpp\n> @@ -0,0 +1,16 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.cpp - Camera HAL stream\n> + */\n> +\n> +#include \"camera_stream.h\"\n> +\n> +using namespace libcamera;\n> +\n> +CameraStream::CameraStream(PixelFormat format, Size size,\n> +\t\t\t unsigned int index, Encoder *encoder)\n> +\t: format_(format), size_(size), index_(index), encoder_(encoder)\n> +{\n> +}\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> new file mode 100644\n> index 000000000000..10dece7beb69\n> --- /dev/null\n> +++ b/src/android/camera_stream.h\n> @@ -0,0 +1,40 @@\n> +/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +/*\n> + * Copyright (C) 2020, Google Inc.\n> + *\n> + * camera_stream.h - Camera HAL stream\n> + */\n> +#ifndef __ANDROID_CAMERA_STREAM_H__\n> +#define __ANDROID_CAMERA_STREAM_H__\n> +\n> +#include \n> +\n> +#include \n> +#include \n> +\n> +#include \"jpeg/encoder.h\"\n> +\n> +class CameraStream\n> +{\n> +public:\n> +\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n> +\t\t unsigned int index, Encoder *encoder = nullptr);\n> +\n> +\tconst libcamera::PixelFormat &format() const { return format_; }\n> +\tconst libcamera::Size &size() const { return size_; }\n> +\tunsigned int index() const { return index_; }\n> +\tEncoder *encoder() const { return encoder_.get(); }\n> +\n> +private:\n> +\tlibcamera::PixelFormat format_;\n> +\tlibcamera::Size size_;\n> +\t/*\n> +\t * The index of the libcamera StreamConfiguration as added during\n> +\t * configureStreams(). A single libcamera Stream may be used to deliver\n> +\t * one or more streams to the Android framework.\n> +\t */\n> +\tunsigned int index_;\n> +\tstd::unique_ptr encoder_;\n> +};\n> +\n> +#endif /* __ANDROID_CAMERA_STREAM__ */\n> diff --git a/src/android/meson.build b/src/android/meson.build\n> index 0293c2036561..802bb89afe57 100644\n> --- a/src/android/meson.build\n> +++ b/src/android/meson.build\n> @@ -20,6 +20,7 @@ android_hal_sources = files([\n> 'camera_device.cpp',\n> 'camera_metadata.cpp',\n> 'camera_ops.cpp',\n> + 'camera_stream.cpp',\n> 'jpeg/encoder_libjpeg.cpp',\n> 'jpeg/exif.cpp',\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 205C0BEEE0\n\tfor ;\n\tTue, 6 Oct 2020 11:08:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E36D460363;\n\tTue, 6 Oct 2020 13:08:56 +0200 (CEST)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 37DE86035D\n\tfor ;\n\tTue, 6 Oct 2020 13:08:55 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"dtaBjfJb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1601982534; bh=DQkspLyXy/h/pQj9HBJ2y1Tjii5ZYV0k70CWb4ZIyio=;\n\th=Subject:To:References:From:In-Reply-To;\n\tb=dtaBjfJbL4Gjy+XmFx8vPID9IGsfCoLu97msgH0Gc3F0OzgilTRHZvcARl7M/i4/U\n\tdXR8TDwXMTApIWH/Cj7RRnU6ysPzobvVJmg3WKZKhkVPsFftvmr0We1v1HaRiwqQJH\n\tyeE8pXsHi+zATDwe21rbkue9299beA3eAX9y1oKAI6RFaK78VIGbNqVTCqtXmbhYgo\n\tx35dXHGXU6h2UEii0Lcp5HPJ6aRDQgevN27HwfjYSbf0ijfEk4YgdRsvomliMXDuDc\n\tVLTJDgJ81uQbEzKKpUri4yHX0xT22XYWZrJou3y5lMGHfFHowyA9rBXLtQRQewIxcM\n\tGlaov/CMFA8jA==","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>","From":"Umang Jain ","Message-ID":"<4e5bd366-3ab5-3011-022c-9cb52329e398@uajain.com>","Date":"Tue, 6 Oct 2020 16:38:52 +0530","Mime-Version":"1.0","In-Reply-To":"<20201005104649.10812-2-laurent.pinchart@ideasonboard.com>","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH 01/15] android: camera_stream: Break\n\tout CameraStream","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-Transfer-Encoding":"7bit","Content-Type":"text/plain; charset=\"us-ascii\"; Format=\"flowed\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]