[{"id":3425,"web_url":"https://patchwork.libcamera.org/comment/3425/","msgid":"<20200112134029.GA25899@pendragon.ideasonboard.com>","date":"2020-01-12T13:40:29","subject":"Re: [libcamera-devel] [PATCH v4 01/32] libcamera: request: remove\n\tprepare()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Sun, Jan 12, 2020 at 02:01:41AM +0100, Niklas Söderlund wrote:\n> The association of buffers to a request can be done directly in\n> addBuffer() instead of when the request is queued to the camera. Keep\n> the check that a request contains buffers by moving it to\n> Camera::queueRequest() where prepare() was previously called.\n> \n> As a bonus we can remove a friend statement in Request.\n> \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/request.h | 2 --\n> src/libcamera/buffer.cpp | 4 ++--\n> src/libcamera/camera.cpp | 11 +++++------\n> src/libcamera/request.cpp | 26 ++------------------------\n> 4 files changed, 9 insertions(+), 34 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 2d5a5964e99eb75f..728f380de4f010c3 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -48,10 +48,8 @@ public:\n> \tbool hasPendingBuffers() const { return !pending_.empty(); }\n> \n> private:\n> -\tfriend class Camera;\n> \tfriend class PipelineHandler;\n> \n> -\tint prepare();\n> \tvoid complete();\n> \n> \tbool completeBuffer(Buffer *buffer);\n> diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp\n> index 960eeb8f7d193ddd..5305e3c391da6a69 100644\n> --- a/src/libcamera/buffer.cpp\n> +++ b/src/libcamera/buffer.cpp\n> @@ -360,7 +360,7 @@ Buffer::Buffer(unsigned int index, const Buffer *metadata)\n> * The intended callers of this method are buffer completion handlers that\n> * need to associate a buffer to the request it belongs to.\n> *\n> - * A Buffer is associated to a request by Request::prepare() and the\n> + * A Buffer is associated to a request by Request::addBuffer() and the\n> * association is valid until the buffer completes. The returned request\n> * pointer is valid only during that interval.\n> *\n> @@ -397,7 +397,7 @@ void Buffer::cancel()\n> * \\fn Buffer::setRequest()\n> * \\brief Set the request this buffer belongs to\n> *\n> - * The intended callers are Request::prepare() and Request::completeBuffer().\n> + * The intended callers are Request::addBuffer() and Request::completeBuffer().\n> */\n> \n> } /* namespace libcamera */\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index e810fb725d81350d..5d294b10647db8da 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -810,6 +810,11 @@ int Camera::queueRequest(Request *request)\n> \tif (!stateIs(CameraRunning))\n> \t\treturn -EACCES;\n> \n> +\tif (request->buffers().empty()) {\n> +\t\tLOG(Camera, Error) << \"Request contains no buffers\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> \tfor (auto const &it : request->buffers()) {\n> \t\tStream *stream = it.first;\n> \t\tBuffer *buffer = it.second;\n> @@ -832,12 +837,6 @@ int Camera::queueRequest(Request *request)\n> \t\tbuffer->mem_ = &stream->buffers()[buffer->index_];\n> \t}\n> \n> -\tint ret = request->prepare();\n> -\tif (ret) {\n> -\t\tLOG(Camera, Error) << \"Failed to prepare request\";\n> -\t\treturn ret;\n> -\t}\n> -\n> \treturn pipe_->queueRequest(this, request);\n> }\n> \n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index c14ed1a4d3ce55d0..84a5f55879ccf5b5 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -139,6 +139,8 @@ int Request::addBuffer(std::unique_ptr buffer)\n> \t\treturn -EEXIST;\n> \t}\n> \n> +\tbuffer->setRequest(this);\n> +\tpending_.insert(buffer.get());\n> \tbufferMap_[stream] = buffer.release();\n> \n> \treturn 0;\n> @@ -203,30 +205,6 @@ Buffer *Request::findBuffer(Stream *stream) const\n> * otherwise\n> */\n> \n> -/**\n> - * \\brief Validate the request and prepare it for the completion handler\n> - *\n> - * Requests that contain no buffers are invalid and are rejected.\n> - *\n> - * \\return 0 on success or a negative error code otherwise\n> - * \\retval -EINVAL The request is invalid\n> - */\n> -int Request::prepare()\n> -{\n> -\tif (bufferMap_.empty()) {\n> -\t\tLOG(Request, Error) << \"Invalid request due to missing buffers\";\n> -\t\treturn -EINVAL;\n> -\t}\n> -\n> -\tfor (auto const &pair : bufferMap_) {\n> -\t\tBuffer *buffer = pair.second;\n> -\t\tbuffer->setRequest(this);\n> -\t\tpending_.insert(buffer);\n> -\t}\n> -\n> -\treturn 0;\n> -}\n> -\n> /**\n> * \\brief Complete a queued request\n> *","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BBA0C6045E\n\tfor ;\n\tSun, 12 Jan 2020 14:41:13 +0100 (CET)","from pendragon.ideasonboard.com (85-76-9-232-nat.elisa-mobile.fi\n\t[85.76.9.232])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DB42F30F;\n\tSun, 12 Jan 2020 14:41:00 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578836473;\n\tbh=LjSBP1BgadonXTL2VMsKMURD9ozUqUZfaVnJtdb7GrY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=R8kF3irEonDeG2nGAtdjMS7efCCmNe7FIGh90hiT0Yh4QCo6oyr5Skm7Rvpn4OTmJ\n\te1wvvzDC062CY4GIq/SnKaOoiULMKFSjK68mTq9vlrHhqGcPU3tchCkrMhRrOK1Hso\n\tnWGy8ahxHtF4X2gi/NrswyG6WZSas7TqewsTam8E=","Date":"Sun, 12 Jan 2020 15:40:29 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200112134029.GA25899@pendragon.ideasonboard.com>","References":"<20200112010212.2609025-1-niklas.soderlund@ragnatech.se>\n\t<20200112010212.2609025-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200112010212.2609025-2-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v4 01/32] libcamera: request: remove\n\tprepare()","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","X-List-Received-Date":"Sun, 12 Jan 2020 13:41:13 -0000"}}]