[{"id":13020,"web_url":"https://patchwork.libcamera.org/comment/13020/","msgid":"<660b63e9-3d78-f6a0-1293-f337200534da@ideasonboard.com>","date":"2020-10-06T19:53:11","subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 06/10/2020 15:44, Jacopo Mondi wrote:\n> Fetch the format and size of the libcamera::StreamConfiguration\n> associated with a CameraStream by accessing the configuration by\n> index.\n> \n> This removes the need to store the libcamera stream format and sizes\n> as class members and avoid duplicating information that might get out\n> of sync.\n> \n> It also allows to remove the StreamConfiguration from the constructor\n> parameters list, as it can be identified by its index. While at it,\n> re-order the constructor parameters order.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 8 +++-----\n> src/android/camera_stream.cpp | 15 +++++----------\n> src/android/camera_stream.h | 18 ++++--------------\n> 3 files changed, 12 insertions(+), 29 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 47c423195796..678dca609003 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1206,9 +1206,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfiguration.pixelFormat = format;\n> \n> \t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\tunsigned int index = config_->size() - 1;\n\nHrm ... personally, I think specifying that this is an index here\nexplicitly helps the readability below.\n\n> -\t\tstreams_.emplace_back(this, stream, streamConfiguration,\n> -\t\t\t\t CameraStream::Type::Direct, index);\n> +\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n> +\t\t\t\t stream, config_->size() - 1);\n> \t\tstream->priv = static_cast(&streams_.back());\n> \t}\n> \n> @@ -1262,8 +1261,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tindex = config_->size() - 1;\n> \t\t}\n> \n> -\t\tStreamConfiguration &cfg = config_->at(index);\n> -\t\tstreams_.emplace_back(this, jpegStream, cfg, type, index);\n> +\t\tstreams_.emplace_back(this, type, jpegStream, index);\n> \t\tjpegStream->priv = static_cast(&streams_.back());\n> \t}\n> \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 9c7819efb679..3946a2cdf844 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -17,18 +17,13 @@ using namespace libcamera;\n> \n> LOG_DECLARE_CATEGORY(HAL);\n> \n> -CameraStream::CameraStream(CameraDevice *cameraDevice,\n> -\t\t\t camera3_stream_t *camera3Stream,\n> -\t\t\t const libcamera::StreamConfiguration &cfg,\n> -\t\t\t Type type, unsigned int index)\n> -\t: cameraDevice_(cameraDevice), camera3Stream_(camera3Stream),\n> -\t type_(type), index_(index)\n> +CameraStream::CameraStream(CameraDevice *cameraDevice, Type type,\n> +\t\t\t camera3_stream_t *camera3Stream, unsigned int index)\n> +\t: cameraDevice_(cameraDevice), type_(type),\n> +\t camera3Stream_(camera3Stream), index_(index)\n> {\n> \tconfig_ = cameraDevice_->cameraConfiguration();\n> \n> -\tformat_ = cfg.pixelFormat;\n> -\tsize_ = cfg.size;\n> -\n> \tif (type_ == Type::Internal || type_ == Type::Mapped)\n> \t\tencoder_ = std::make_unique();\n> }\n> @@ -63,7 +58,7 @@ int CameraStream::process(const libcamera::FrameBuffer &source,\n> \texif.setMake(\"libcamera\");\n> \texif.setModel(\"cameraModel\");\n> \texif.setOrientation(cameraDevice_->orientation());\n> -\texif.setSize(size_);\n> +\texif.setSize(configuration().size);\n> \t/*\n> \t * We set the frame's EXIF timestamp as the time of encode.\n> \t * Since the precision we need for EXIF timestamp is only one\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index d8d9d8c4b237..f46cfd605d03 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -106,16 +106,11 @@ public:\n> \t\tInternal,\n> \t\tMapped,\n> \t};\n> -\tCameraStream(CameraDevice *cameraDevice,\n> -\t\t camera3_stream_t *androidStream,\n> -\t\t const libcamera::StreamConfiguration &cfg,\n> -\t\t Type type, unsigned int index);\n> +\tCameraStream(CameraDevice *cameraDevice, Type type,\n> +\t\t camera3_stream_t *camera3Stream, unsigned int index);\n> \n> -\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> -\tconst libcamera::PixelFormat &format() const { return format_; }\n> -\tconst libcamera::Size &size() const { return size_; }\n> \tType type() const { return type_; }\n> -\n> +\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> \tconst libcamera::StreamConfiguration &configuration() const;\n> \tlibcamera::Stream *stream() const;\n> \n> @@ -126,13 +121,8 @@ public:\n> private:\n> \tCameraDevice *cameraDevice_;\n> \tlibcamera::CameraConfiguration *config_;\n> -\tcamera3_stream_t *camera3Stream_;\n> \tType type_;\n> -\n> -\t/* Libcamera facing format and sizes. */\n> -\tlibcamera::PixelFormat format_;\n> -\tlibcamera::Size size_;\n> -\n> +\tcamera3_stream_t *camera3Stream_;\n\na new line here?\n\nBut nothing blocking here.\n\nReviewed-by: Kieran Bingham \n\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>","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 0A3BEBEEE0\n\tfor ;\n\tTue, 6 Oct 2020 19:53:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AFAE63C1B;\n\tTue, 6 Oct 2020 21:53:16 +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 64EFB60363\n\tfor ;\n\tTue, 6 Oct 2020 21:53:15 +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 CA2271452;\n\tTue, 6 Oct 2020 21:53:14 +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=\"ussfxfUR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602013995;\n\tbh=760rPn4SUP0afs6VzBVRk16J+eD9hGF1Hd7KA0FPuEg=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=ussfxfURY5GC1vrTx8YAv9srKEwWjt1nYrzArQXsIzuQWMxT65o2irjOnV6Q1LlUl\n\tSNKWU7wBBBfxPQqNy+ZbgPX+6GPSwooT7UUP4mqJUqebu8/kAIYzp8KSC6rdCxB4+g\n\tKE3xhEFX6Kv4ovwFM+63V7MoeYj0Cgk2+ziAMudA=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-8-jacopo@jmondi.org>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<660b63e9-3d78-f6a0-1293-f337200534da@ideasonboard.com>","Date":"Tue, 6 Oct 2020 20:53:11 +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":"<20201006144432.22908-8-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","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":13025,"web_url":"https://patchwork.libcamera.org/comment/13025/","msgid":"<20201007013238.GC30598@pendragon.ideasonboard.com>","date":"2020-10-07T01:32:38","subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","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 Tue, Oct 06, 2020 at 04:44:26PM +0200, Jacopo Mondi wrote:\n> Fetch the format and size of the libcamera::StreamConfiguration\n> associated with a CameraStream by accessing the configuration by\n> index.\n> \n> This removes the need to store the libcamera stream format and sizes\n> as class members and avoid duplicating information that might get out\n> of sync.\n> \n> It also allows to remove the StreamConfiguration from the constructor\n> parameters list, as it can be identified by its index. While at it,\n> re-order the constructor parameters order.\n\nI like the new order (along with the rest of the patch). Really nice\nwork on this series.\n\nReviewed-by: Laurent Pinchart \n\n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 8 +++-----\n> src/android/camera_stream.cpp | 15 +++++----------\n> src/android/camera_stream.h | 18 ++++--------------\n> 3 files changed, 12 insertions(+), 29 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 47c423195796..678dca609003 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1206,9 +1206,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfiguration.pixelFormat = format;\n> \n> \t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\tunsigned int index = config_->size() - 1;\n> -\t\tstreams_.emplace_back(this, stream, streamConfiguration,\n> -\t\t\t\t CameraStream::Type::Direct, index);\n> +\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n> +\t\t\t\t stream, config_->size() - 1);\n> \t\tstream->priv = static_cast(&streams_.back());\n> \t}\n> \n> @@ -1262,8 +1261,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tindex = config_->size() - 1;\n> \t\t}\n> \n> -\t\tStreamConfiguration &cfg = config_->at(index);\n> -\t\tstreams_.emplace_back(this, jpegStream, cfg, type, index);\n> +\t\tstreams_.emplace_back(this, type, jpegStream, index);\n> \t\tjpegStream->priv = static_cast(&streams_.back());\n> \t}\n> \n> diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> index 9c7819efb679..3946a2cdf844 100644\n> --- a/src/android/camera_stream.cpp\n> +++ b/src/android/camera_stream.cpp\n> @@ -17,18 +17,13 @@ using namespace libcamera;\n> \n> LOG_DECLARE_CATEGORY(HAL);\n> \n> -CameraStream::CameraStream(CameraDevice *cameraDevice,\n> -\t\t\t camera3_stream_t *camera3Stream,\n> -\t\t\t const libcamera::StreamConfiguration &cfg,\n> -\t\t\t Type type, unsigned int index)\n> -\t: cameraDevice_(cameraDevice), camera3Stream_(camera3Stream),\n> -\t type_(type), index_(index)\n> +CameraStream::CameraStream(CameraDevice *cameraDevice, Type type,\n> +\t\t\t camera3_stream_t *camera3Stream, unsigned int index)\n> +\t: cameraDevice_(cameraDevice), type_(type),\n> +\t camera3Stream_(camera3Stream), index_(index)\n> {\n> \tconfig_ = cameraDevice_->cameraConfiguration();\n> \n> -\tformat_ = cfg.pixelFormat;\n> -\tsize_ = cfg.size;\n> -\n> \tif (type_ == Type::Internal || type_ == Type::Mapped)\n> \t\tencoder_ = std::make_unique();\n> }\n> @@ -63,7 +58,7 @@ int CameraStream::process(const libcamera::FrameBuffer &source,\n> \texif.setMake(\"libcamera\");\n> \texif.setModel(\"cameraModel\");\n> \texif.setOrientation(cameraDevice_->orientation());\n> -\texif.setSize(size_);\n> +\texif.setSize(configuration().size);\n> \t/*\n> \t * We set the frame's EXIF timestamp as the time of encode.\n> \t * Since the precision we need for EXIF timestamp is only one\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index d8d9d8c4b237..f46cfd605d03 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -106,16 +106,11 @@ public:\n> \t\tInternal,\n> \t\tMapped,\n> \t};\n> -\tCameraStream(CameraDevice *cameraDevice,\n> -\t\t camera3_stream_t *androidStream,\n> -\t\t const libcamera::StreamConfiguration &cfg,\n> -\t\t Type type, unsigned int index);\n> +\tCameraStream(CameraDevice *cameraDevice, Type type,\n> +\t\t camera3_stream_t *camera3Stream, unsigned int index);\n> \n> -\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> -\tconst libcamera::PixelFormat &format() const { return format_; }\n> -\tconst libcamera::Size &size() const { return size_; }\n> \tType type() const { return type_; }\n> -\n> +\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> \tconst libcamera::StreamConfiguration &configuration() const;\n> \tlibcamera::Stream *stream() const;\n> \n> @@ -126,13 +121,8 @@ public:\n> private:\n> \tCameraDevice *cameraDevice_;\n> \tlibcamera::CameraConfiguration *config_;\n> -\tcamera3_stream_t *camera3Stream_;\n> \tType type_;\n> -\n> -\t/* Libcamera facing format and sizes. */\n> -\tlibcamera::PixelFormat format_;\n> -\tlibcamera::Size size_;\n> -\n> +\tcamera3_stream_t *camera3Stream_;\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 4A89DBEEDF\n\tfor ;\n\tWed, 7 Oct 2020 01:33:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DDE1E63BE4;\n\tWed, 7 Oct 2020 03:33: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 B2DC863BD5\n\tfor ;\n\tWed, 7 Oct 2020 03:33:20 +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 D5F8259E;\n\tWed, 7 Oct 2020 03:33: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=\"MDVUnPEk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602034400;\n\tbh=2gQqo19peajsYfRMbhGwSjDvbgPVqZoUwnykOSuosAs=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=MDVUnPEk9oAUFnA7jiF+r6lH8pXrBMkbxOJCVF9uJKCmMrbJGuyYHG8+BdDMCVez7\n\t/bwDMn4qmaRgU9AVTrSu7sSMXDX72wfJwC+voRlbzf3hld1tYkkgVNFZby90AD6Uxm\n\tyGfFvQ9gIU68RclVljFuIiFp62F72aasGwwlvjlg=","Date":"Wed, 7 Oct 2020 04:32:38 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20201007013238.GC30598@pendragon.ideasonboard.com>","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-8-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201006144432.22908-8-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","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":13032,"web_url":"https://patchwork.libcamera.org/comment/13032/","msgid":"<20201007080856.wxffsoykg45hj5nx@uno.localdomain>","date":"2020-10-07T08:08:56","subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran\n\nOn Tue, Oct 06, 2020 at 08:53:11PM +0100, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 06/10/2020 15:44, Jacopo Mondi wrote:\n> > Fetch the format and size of the libcamera::StreamConfiguration\n> > associated with a CameraStream by accessing the configuration by\n> > index.\n> >\n> > This removes the need to store the libcamera stream format and sizes\n> > as class members and avoid duplicating information that might get out\n> > of sync.\n> >\n> > It also allows to remove the StreamConfiguration from the constructor\n> > parameters list, as it can be identified by its index. While at it,\n> > re-order the constructor parameters order.\n> >\n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/android/camera_device.cpp | 8 +++-----\n> > src/android/camera_stream.cpp | 15 +++++----------\n> > src/android/camera_stream.h | 18 ++++--------------\n> > 3 files changed, 12 insertions(+), 29 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 47c423195796..678dca609003 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -1206,9 +1206,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> > \t\tstreamConfiguration.pixelFormat = format;\n> >\n> > \t\tconfig_->addConfiguration(streamConfiguration);\n> > -\t\tunsigned int index = config_->size() - 1;\n>\n> Hrm ... personally, I think specifying that this is an index here\n> explicitly helps the readability below.\n>\n> > -\t\tstreams_.emplace_back(this, stream, streamConfiguration,\n> > -\t\t\t\t CameraStream::Type::Direct, index);\n> > +\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n> > +\t\t\t\t stream, config_->size() - 1);\n> > \t\tstream->priv = static_cast(&streams_.back());\n> > \t}\n> >\n> > @@ -1262,8 +1261,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> > \t\t\tindex = config_->size() - 1;\n> > \t\t}\n> >\n> > -\t\tStreamConfiguration &cfg = config_->at(index);\n> > -\t\tstreams_.emplace_back(this, jpegStream, cfg, type, index);\n> > +\t\tstreams_.emplace_back(this, type, jpegStream, index);\n> > \t\tjpegStream->priv = static_cast(&streams_.back());\n> > \t}\n> >\n> > diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\n> > index 9c7819efb679..3946a2cdf844 100644\n> > --- a/src/android/camera_stream.cpp\n> > +++ b/src/android/camera_stream.cpp\n> > @@ -17,18 +17,13 @@ using namespace libcamera;\n> >\n> > LOG_DECLARE_CATEGORY(HAL);\n> >\n> > -CameraStream::CameraStream(CameraDevice *cameraDevice,\n> > -\t\t\t camera3_stream_t *camera3Stream,\n> > -\t\t\t const libcamera::StreamConfiguration &cfg,\n> > -\t\t\t Type type, unsigned int index)\n> > -\t: cameraDevice_(cameraDevice), camera3Stream_(camera3Stream),\n> > -\t type_(type), index_(index)\n> > +CameraStream::CameraStream(CameraDevice *cameraDevice, Type type,\n> > +\t\t\t camera3_stream_t *camera3Stream, unsigned int index)\n> > +\t: cameraDevice_(cameraDevice), type_(type),\n> > +\t camera3Stream_(camera3Stream), index_(index)\n> > {\n> > \tconfig_ = cameraDevice_->cameraConfiguration();\n> >\n> > -\tformat_ = cfg.pixelFormat;\n> > -\tsize_ = cfg.size;\n> > -\n> > \tif (type_ == Type::Internal || type_ == Type::Mapped)\n> > \t\tencoder_ = std::make_unique();\n> > }\n> > @@ -63,7 +58,7 @@ int CameraStream::process(const libcamera::FrameBuffer &source,\n> > \texif.setMake(\"libcamera\");\n> > \texif.setModel(\"cameraModel\");\n> > \texif.setOrientation(cameraDevice_->orientation());\n> > -\texif.setSize(size_);\n> > +\texif.setSize(configuration().size);\n> > \t/*\n> > \t * We set the frame's EXIF timestamp as the time of encode.\n> > \t * Since the precision we need for EXIF timestamp is only one\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index d8d9d8c4b237..f46cfd605d03 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -106,16 +106,11 @@ public:\n> > \t\tInternal,\n> > \t\tMapped,\n> > \t};\n> > -\tCameraStream(CameraDevice *cameraDevice,\n> > -\t\t camera3_stream_t *androidStream,\n> > -\t\t const libcamera::StreamConfiguration &cfg,\n> > -\t\t Type type, unsigned int index);\n> > +\tCameraStream(CameraDevice *cameraDevice, Type type,\n> > +\t\t camera3_stream_t *camera3Stream, unsigned int index);\n> >\n> > -\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> > -\tconst libcamera::PixelFormat &format() const { return format_; }\n> > -\tconst libcamera::Size &size() const { return size_; }\n> > \tType type() const { return type_; }\n> > -\n> > +\tconst camera3_stream_t &camera3Stream() const { return *camera3Stream_; }\n> > \tconst libcamera::StreamConfiguration &configuration() const;\n> > \tlibcamera::Stream *stream() const;\n> >\n> > @@ -126,13 +121,8 @@ public:\n> > private:\n> > \tCameraDevice *cameraDevice_;\n> > \tlibcamera::CameraConfiguration *config_;\n> > -\tcamera3_stream_t *camera3Stream_;\n> > \tType type_;\n> > -\n> > -\t/* Libcamera facing format and sizes. */\n> > -\tlibcamera::PixelFormat format_;\n> > -\tlibcamera::Size size_;\n> > -\n> > +\tcamera3_stream_t *camera3Stream_;\n>\n> a new line here?\n\nI considered that, but I had troubles identifying in which blocks to\nplace members:\n\n CameraDevice\n CameraConfiguration\n Type\n\n camera3\n\n /*\n * Big comment\n */\n index\n Encoder\n\nToo sparse, why index and encoder in the same block ?\n\n CameraDevice\n CameraConfiguration\n Type\n camera3\n\n /*\n * Big comment\n */\n index\n encoder\n\n\nWhy index is different than others?\n\n CameraDevice\n CameraConfiguration\n Type\n camera3\n /*\n * Big comment\n */\n index\n encoder\n\nThis seems simpler.\n\n>\n> But nothing blocking here.\n>\n> Reviewed-by: Kieran Bingham \n\nThanks\n j\n\n>\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> >\n>\n> --\n> Regards\n> --\n> Kieran","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 216B7BEEE0\n\tfor ;\n\tWed, 7 Oct 2020 08:04:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B635363BE4;\n\tWed, 7 Oct 2020 10:04:58 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 61BD963B27\n\tfor ;\n\tWed, 7 Oct 2020 10:04:57 +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 relay10.mail.gandi.net (Postfix) with ESMTPSA id DFD1D240003;\n\tWed, 7 Oct 2020 08:04:56 +0000 (UTC)"],"Date":"Wed, 7 Oct 2020 10:08:56 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20201007080856.wxffsoykg45hj5nx@uno.localdomain>","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-8-jacopo@jmondi.org>\n\t<660b63e9-3d78-f6a0-1293-f337200534da@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<660b63e9-3d78-f6a0-1293-f337200534da@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 07/13] android: camera_stream:\n\tFetch format and size from configuration","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\" "}}]