[{"id":12531,"web_url":"https://patchwork.libcamera.org/comment/12531/","msgid":"<20200915224056.GG3998@pendragon.ideasonboard.com>","date":"2020-09-15T22:40:56","subject":"Re: [libcamera-devel] [PATCH v4 10/10] android: camera_device: Make\n\tCameraStream a class","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 Sat, Sep 12, 2020 at 12:11:29PM +0200, Jacopo Mondi wrote:\n> Complete the transformation of CameraStream into a class and provide\n> a read-only interface that allows to access its parameters but not\n> modify them at run-time.\n> \n> No functional changes intended but this change aims to make the code\n> more robust by enforcing a stricter interface in the CameraStream class.\n> \n> Reviewed-by: Niklas Söderlund \n> Reviewed-by: Hirokazu Honda \n> Reviewed-by: Hirokazu Honda \n\nEven if Hiro reviewed the patch twice, I think a single tag is enough\n;-)\n\n> Reviewed-by: Kieran Bingham \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_device.cpp | 11 ++++++-----\n> src/android/camera_device.h | 14 ++++++++------\n> 2 files changed, 14 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 4d8847e72db5..7ecb2a4d82e6 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -169,8 +169,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> \t}\n> }\n> \n> -CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *e)\n> -\t: format(f), size(s), index_(i), encoder_(e)\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> @@ -1403,7 +1404,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n> \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n> \n> \t\t/* Software streams are handled after hardware streams complete. */\n> -\t\tif (cameraStream->format == formats::MJPEG)\n> +\t\tif (cameraStream->format() == formats::MJPEG)\n> \t\t\tcontinue;\n> \n> \t\t/*\n> @@ -1467,7 +1468,7 @@ void CameraDevice::requestComplete(Request *request)\n> \t\tCameraStream *cameraStream =\n> \t\t\tstatic_cast(descriptor->buffers[i].stream->priv);\n> \n> -\t\tif (cameraStream->format != formats::MJPEG)\n> +\t\tif (cameraStream->format() != formats::MJPEG)\n> \t\t\tcontinue;\n> \n> \t\tEncoder *encoder = cameraStream->encoder();\n> @@ -1502,7 +1503,7 @@ void CameraDevice::requestComplete(Request *request)\n> \t\texif.setMake(\"libcamera\");\n> \t\texif.setModel(\"cameraModel\");\n> \t\texif.setOrientation(orientation_);\n> -\t\texif.setSize(cameraStream->size);\n> +\t\texif.setSize(cameraStream->size());\n> \t\t/*\n> \t\t * We set the frame's EXIF timestamp as the time of encode.\n> \t\t * Since the precision we need for EXIF timestamp is only one\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 49a2e7f3f8bc..1837748d2efc 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -27,18 +27,20 @@\n> \n> class CameraMetadata;\n> \n> -struct CameraStream {\n> +class CameraStream\n> +{\n> public:\n> -\tCameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i,\n> -\t\t Encoder *e = nullptr);\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> -\tlibcamera::PixelFormat format;\n> -\tlibcamera::Size size;\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","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 74983C3B5B\n\tfor ;\n\tTue, 15 Sep 2020 22:41:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0ED4462E1B;\n\tWed, 16 Sep 2020 00:41:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0734D62C8C\n\tfor ;\n\tWed, 16 Sep 2020 00:41:27 +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 B9869FD8;\n\tWed, 16 Sep 2020 00:41:25 +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=\"DWC6CAM5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600209685;\n\tbh=HnnMDWwzd9cXtGmMVfz1CyUvO7YzOZ9PL0Kw7NlT3eM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=DWC6CAM5A1xTcprJXB+rkBKqCIcy1ueP6R8n5r1beUS20y+fXI+QDOZL1vbtYy0uw\n\tu2h+g7iEwqE4DraTA8q0b2tVpaSQgUwrkzxKky7CPFxaNPHthv9xWO5c7djitiN2lW\n\tabfxIlvO69P+X7zF2GemxzWR+OdrnJ/2jjSfRn78=","Date":"Wed, 16 Sep 2020 01:40:56 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20200915224056.GG3998@pendragon.ideasonboard.com>","References":"<20200912101129.12625-1-jacopo@jmondi.org>\n\t<20200912101129.12625-11-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200912101129.12625-11-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v4 10/10] android: camera_device: Make\n\tCameraStream a class","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":"hanlinchen@chromium.org, libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]