[{"id":11989,"web_url":"https://patchwork.libcamera.org/comment/11989/","msgid":"<4f75a80a-264d-d7ae-79d3-28480e3e75d9@ideasonboard.com>","date":"2020-08-13T15:06:15","subject":"Re: [libcamera-devel] [PATCH v2 2/2] libcamera: request: Make\n\tStream pointer const","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Niklas,\n\nOn 13/08/2020 10:53, Niklas Söderlund wrote:\n> The Stream pointer just acts as a key in the Request object. There is no\n> good use-case to modify a stream from a pointer retrieved from the\n> Request, make it const. This allow pipeline handlers to better express\n\ns/allow/allows/\n\n> that the Stream pointer is retrieved in a Request should just be treated\n> as a key.\n\n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nOnly a random not-related to this patch question below:\n\nBut I think this makes complete sense to be const. The users here\nshouldn't be modifying the stream.\n\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n> ---\n>  include/libcamera/request.h          | 6 +++---\n>  src/cam/capture.cpp                  | 4 ++--\n>  src/cam/capture.h                    | 2 +-\n>  src/libcamera/camera.cpp             | 4 ++--\n>  src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n>  src/libcamera/request.cpp            | 6 +++---\n>  src/qcam/main_window.h               | 2 +-\n>  test/camera/buffer_import.cpp        | 2 +-\n>  test/camera/capture.cpp              | 2 +-\n>  9 files changed, 15 insertions(+), 15 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index e74f56a7d6415315..5976ac50c9d3c42b 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -31,7 +31,7 @@ public:\n>  \t\tRequestCancelled,\n>  \t};\n>  \n> -\tusing BufferMap = std::map<Stream *, FrameBuffer *>;\n> +\tusing BufferMap = std::map<const Stream *, FrameBuffer *>;\n>  \n>  \tRequest(Camera *camera, uint64_t cookie = 0);\n>  \tRequest(const Request &) = delete;\n> @@ -41,8 +41,8 @@ public:\n>  \tControlList &controls() { return *controls_; }\n>  \tControlList &metadata() { return *metadata_; }\n>  \tconst BufferMap &buffers() const { return bufferMap_; }\n> -\tint addBuffer(Stream *stream, FrameBuffer *buffer);\n> -\tFrameBuffer *findBuffer(Stream *stream) const;\n> +\tint addBuffer(const Stream *stream, FrameBuffer *buffer);\n> +\tFrameBuffer *findBuffer(const Stream *stream) const;\n>  \n>  \tuint64_t cookie() const { return cookie_; }\n>  \tStatus status() const { return status_; }\n> diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\n> index 0720376983470f2f..af9029b743de606b 100644\n> --- a/src/cam/capture.cpp\n> +++ b/src/cam/capture.cpp\n> @@ -169,7 +169,7 @@ void Capture::requestComplete(Request *request)\n>  \tinfo << \"fps: \" << std::fixed << std::setprecision(2) << fps;\n>  \n>  \tfor (auto it = buffers.begin(); it != buffers.end(); ++it) {\n> -\t\tStream *stream = it->first;\n> +\t\tconst Stream *stream = it->first;\n>  \t\tFrameBuffer *buffer = it->second;\n>  \t\tconst std::string &name = streamName_[stream];\n>  \n> @@ -209,7 +209,7 @@ void Capture::requestComplete(Request *request)\n>  \t}\n>  \n>  \tfor (auto it = buffers.begin(); it != buffers.end(); ++it) {\n> -\t\tStream *stream = it->first;\n> +\t\tconst Stream *stream = it->first;\n>  \t\tFrameBuffer *buffer = it->second;\n>  \n>  \t\trequest->addBuffer(stream, buffer);\n> diff --git a/src/cam/capture.h b/src/cam/capture.h\n> index 32940a2a12138887..b4e39d51fdfa9512 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/capture.h\n> @@ -36,7 +36,7 @@ private:\n>  \tstd::shared_ptr<libcamera::Camera> camera_;\n>  \tlibcamera::CameraConfiguration *config_;\n>  \n> -\tstd::map<libcamera::Stream *, std::string> streamName_;\n> +\tstd::map<const libcamera::Stream *, std::string> streamName_;\n>  \tBufferWriter *writer_;\n>  \tstd::chrono::steady_clock::time_point last_;\n>  \n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 820fa1e3065e5f88..afdd47750f58f190 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -279,7 +279,7 @@ public:\n>  \tstd::shared_ptr<PipelineHandler> pipe_;\n>  \tstd::string id_;\n>  \tstd::set<Stream *> streams_;\n\nShould streams_ also be const (if so, in a different patch, I haven't\nlooked back to see how it's used though so it might not be)\n\n\n> -\tstd::set<Stream *> activeStreams_;\n> +\tstd::set<const Stream *> activeStreams_;\n>  \n>  private:\n>  \tbool disconnected_;\n> @@ -889,7 +889,7 @@ int Camera::queueRequest(Request *request)\n>  \t}\n>  \n>  \tfor (auto const &it : request->buffers()) {\n> -\t\tStream *stream = it.first;\n> +\t\tconst Stream *stream = it.first;\n>  \n>  \t\tif (p_->activeStreams_.find(stream) == p_->activeStreams_.end()) {\n>  \t\t\tLOG(Camera, Error) << \"Invalid request\";\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index d931ed333b4a1df6..019e50b8f444c153 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -663,7 +663,7 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n>  \n>  \t/* Queue all buffers from the request aimed for the ImgU. */\n>  \tfor (auto it : request->buffers()) {\n> -\t\tStream *stream = static_cast<Stream *>(it.first);\n> +\t\tconst Stream *stream = it.first;\n>  \t\tFrameBuffer *buffer = it.second;\n>  \t\tint ret;\n>  \n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index d5f11e8c43c32766..60b306922de2fe06 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -127,7 +127,7 @@ Request::~Request()\n>   * \\retval -EEXIST The request already contains a buffer for the stream\n>   * \\retval -EINVAL The buffer does not reference a valid Stream\n>   */\n> -int Request::addBuffer(Stream *stream, FrameBuffer *buffer)\n> +int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n>  {\n>  \tif (!stream) {\n>  \t\tLOG(Request, Error) << \"Invalid stream reference\";\n> @@ -162,9 +162,9 @@ int Request::addBuffer(Stream *stream, FrameBuffer *buffer)\n>   * \\return The buffer associated with the stream, or nullptr if the stream is\n>   * not part of this request\n>   */\n> -FrameBuffer *Request::findBuffer(Stream *stream) const\n> +FrameBuffer *Request::findBuffer(const Stream *stream) const\n>  {\n> -\tauto it = bufferMap_.find(stream);\n> +\tconst auto it = bufferMap_.find(stream);\n>  \tif (it == bufferMap_.end())\n>  \t\treturn nullptr;\n>  \n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 6e1bcd76a2438b4c..3d21779e3f4a7c44 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -126,7 +126,7 @@ private:\n>  \tbool captureRaw_;\n>  \tStream *vfStream_;\n>  \tStream *rawStream_;\n> -\tstd::map<Stream *, QQueue<FrameBuffer *>> freeBuffers_;\n> +\tstd::map<const Stream *, QQueue<FrameBuffer *>> freeBuffers_;\n>  \tQQueue<CaptureRequest> doneQueue_;\n>  \tQMutex mutex_; /* Protects freeBuffers_ and doneQueue_ */\n>  \n> diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\n> index 726d2cb2fe757066..97a8582761a74dc6 100644\n> --- a/test/camera/buffer_import.cpp\n> +++ b/test/camera/buffer_import.cpp\n> @@ -51,7 +51,7 @@ protected:\n>  \t\tcompleteRequestsCount_++;\n>  \n>  \t\t/* Create a new request. */\n> -\t\tStream *stream = buffers.begin()->first;\n> +\t\tconst Stream *stream = buffers.begin()->first;\n>  \t\tFrameBuffer *buffer = buffers.begin()->second;\n>  \n>  \t\trequest = camera_->createRequest();\n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index ae572eb955753151..0fe3bf9be7f13f4f 100644\n> --- a/test/camera/capture.cpp\n> +++ b/test/camera/capture.cpp\n> @@ -44,7 +44,7 @@ protected:\n>  \t\tcompleteRequestsCount_++;\n>  \n>  \t\t/* Create a new request. */\n> -\t\tStream *stream = buffers.begin()->first;\n> +\t\tconst Stream *stream = buffers.begin()->first;\n>  \t\tFrameBuffer *buffer = buffers.begin()->second;\n>  \n>  \t\trequest = camera_->createRequest();\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 711A7BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 Aug 2020 15:06:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D036F613C0;\n\tThu, 13 Aug 2020 17:06:23 +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 55DA16038C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Aug 2020 17:06:22 +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 C9A7080C;\n\tThu, 13 Aug 2020 17:06:17 +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=\"kOI8a1pD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1597331178;\n\tbh=tmq1O7Ggbfqwg+QoWM5VjiLxD1FxuW0o3N6zuT9vZq8=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=kOI8a1pDxhjYlNaN7utLZ9C0GJiHNDJ4FiCvfezHkVAZsURUNaZ9cGBOlqufIATaa\n\t1vFLc2UFp5icwOGJ87u3aeeBmCsmmKZ3FxUqiyWbHMvaB7han/Vb/4d4mqLwacgkEu\n\tZnvg5TEiLQ2bYqKxPWcyq7wr3dkupNI92SzOTVZU=","To":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200813095344.3495212-1-niklas.soderlund@ragnatech.se>\n\t<20200813095344.3495212-3-niklas.soderlund@ragnatech.se>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<4f75a80a-264d-d7ae-79d3-28480e3e75d9@ideasonboard.com>","Date":"Thu, 13 Aug 2020 16:06:15 +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":"<20200813095344.3495212-3-niklas.soderlund@ragnatech.se>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 2/2] libcamera: request: Make\n\tStream pointer const","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]