Patch Detail
Show a patch.
GET /api/1.1/patches/2429/?format=api
{ "id": 2429, "url": "https://patchwork.libcamera.org/api/1.1/patches/2429/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2429/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20191216124456.1049508-2-niklas.soderlund@ragnatech.se>", "date": "2019-12-16T12:44:55", "name": "[libcamera-devel,1/2] libcamera: pipelines: Align bookkeeping in queueRequest()", "commit_ref": "3de65b43a63ad3f528226f3aba937044f65e2013", "pull_url": null, "state": "accepted", "archived": false, "hash": "d8560549056e598dd93cda447219a124f37f4320", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2429/mbox/", "series": [ { "id": 589, "url": "https://patchwork.libcamera.org/api/1.1/series/589/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=589", "date": "2019-12-16T12:44:54", "name": "libcamera: Misc buffer fixes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/589/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2429/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2429/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E50E601E4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 16 Dec 2019 13:45:21 +0100 (CET)", "from bismarck.berto.se (p54ac5865.dip0.t-ipconnect.de\n\t[84.172.88.101]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid e410c1d2-2001-11ea-a00b-005056917a89;\n\tMon, 16 Dec 2019 13:45:20 +0100 (CET)" ], "X-Halon-ID": "e410c1d2-2001-11ea-a00b-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 16 Dec 2019 13:44:55 +0100", "Message-Id": "<20191216124456.1049508-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.24.0", "In-Reply-To": "<20191216124456.1049508-1-niklas.soderlund@ragnatech.se>", "References": "<20191216124456.1049508-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 1/2] libcamera: pipelines: Align\n\tbookkeeping in queueRequest()", "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>", "X-List-Received-Date": "Mon, 16 Dec 2019 12:45:21 -0000" }, "content": "Expecting pipeline handler implementations of queueRequest() to call\nthe base class queueRequest() at the correct point have led to different\nbehaviors between the pipelines.\n\nFix this by splitting queueRequest() into a base class implementation\nwhich handles the bookkeeping and a new queueRequestDevice() that is\nto be implemented by pipeline handlers and only deals with committing the\nrequest to the device.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/include/pipeline_handler.h | 4 ++-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 6 ++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 7 ++---\n src/libcamera/pipeline/uvcvideo.cpp | 6 ++--\n src/libcamera/pipeline/vimc.cpp | 6 ++--\n src/libcamera/pipeline_handler.cpp | 35 +++++++++++++++++-------\n 6 files changed, 37 insertions(+), 27 deletions(-)", "diff": "diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex a02e6e77dc9ce0e7..f3622631022d87b9 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -77,7 +77,7 @@ public:\n \tvirtual int start(Camera *camera) = 0;\n \tvirtual void stop(Camera *camera) = 0;\n \n-\tvirtual int queueRequest(Camera *camera, Request *request);\n+\tint queueRequest(Camera *camera, Request *request);\n \n \tbool completeBuffer(Camera *camera, Request *request, Buffer *buffer);\n \tvoid completeRequest(Camera *camera, Request *request);\n@@ -89,6 +89,8 @@ protected:\n \t\t\t std::unique_ptr<CameraData> data);\n \tvoid hotplugMediaDevice(MediaDevice *media);\n \n+\tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\n+\n \tCameraData *cameraData(const Camera *camera);\n \n \tCameraManager *manager_;\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 1c5fccf694289ae9..6d8c3fada127310e 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -220,7 +220,7 @@ public:\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(Camera *camera, Request *request) override;\n+\tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n@@ -756,7 +756,7 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n \tdata->rawBuffers_.clear();\n }\n \n-int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n+int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n {\n \tint error = 0;\n \n@@ -769,8 +769,6 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \t\t\terror = ret;\n \t}\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n \treturn error;\n }\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 4a583a7a1d7ef1fd..7e41222e3d01a475 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -184,7 +184,7 @@ public:\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(Camera *camera, Request *request) override;\n+\tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n@@ -810,13 +810,12 @@ void PipelineHandlerRkISP1::stop(Camera *camera)\n \tactiveCamera_ = nullptr;\n }\n \n-int PipelineHandlerRkISP1::queueRequest(Camera *camera, Request *request)\n+int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera,\n+\t\t\t\t\t Request *request)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \tStream *stream = &data->stream_;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n \tRkISP1FrameInfo *info = data->frameInfo_.create(data->frame_, request,\n \t\t\t\t\t\t\tstream);\n \tif (!info)\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 522229241ffb9e8a..3043366bee38bcfc 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -72,7 +72,7 @@ public:\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(Camera *camera, Request *request) override;\n+\tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n@@ -262,7 +262,7 @@ int PipelineHandlerUVC::processControls(UVCCameraData *data, Request *request)\n \treturn ret;\n }\n \n-int PipelineHandlerUVC::queueRequest(Camera *camera, Request *request)\n+int PipelineHandlerUVC::queueRequestDevice(Camera *camera, Request *request)\n {\n \tUVCCameraData *data = cameraData(camera);\n \tBuffer *buffer = request->findBuffer(&data->stream_);\n@@ -281,8 +281,6 @@ int PipelineHandlerUVC::queueRequest(Camera *camera, Request *request)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 06664fed42e796e4..292900bcf8d1b359 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -90,7 +90,7 @@ public:\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(Camera *camera, Request *request) override;\n+\tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n \n@@ -323,7 +323,7 @@ int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n \treturn ret;\n }\n \n-int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n+int PipelineHandlerVimc::queueRequestDevice(Camera *camera, Request *request)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tBuffer *buffer = request->findBuffer(&data->stream_);\n@@ -342,8 +342,6 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tPipelineHandler::queueRequest(camera, request);\n-\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 4349ca8957e403fe..5badf31ce793edf8 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -345,16 +345,12 @@ const ControlInfoMap &PipelineHandler::controls(Camera *camera)\n * \\param[in] request The request to queue\n *\n * This method queues a capture request to the pipeline handler for processing.\n- * The request contains a set of buffers associated with streams and a set of\n- * parameters. The pipeline handler shall program the device to ensure that the\n- * parameters will be applied to the frames captured in the buffers provided in\n- * the request.\n+ * The request is first added to the internal list of queued requests, and\n+ * then passed to the pipeline handler with a call to queueRequestDevice().\n *\n- * Pipeline handlers shall override this method. The base implementation in the\n- * PipelineHandler class keeps track of queued requests in order to ensure\n- * completion of all requests when the pipeline handler is stopped with stop().\n- * Requests completion shall be signalled by the pipeline handler using the\n- * completeRequest() method.\n+ * Keeping track of queued requests ensures automatic completion of all requests\n+ * when the pipeline handler is stopped with stop(). Request completion shall be\n+ * signalled by the pipeline handler using the completeRequest() method.\n *\n * \\return 0 on success or a negative error code otherwise\n */\n@@ -363,9 +359,28 @@ int PipelineHandler::queueRequest(Camera *camera, Request *request)\n \tCameraData *data = cameraData(camera);\n \tdata->queuedRequests_.push_back(request);\n \n-\treturn 0;\n+\tint ret = queueRequestDevice(camera, request);\n+\tif (ret)\n+\t\tdata->queuedRequests_.remove(request);\n+\n+\treturn ret;\n }\n \n+/**\n+ * \\fn PipelineHandler::queueRequestDevice()\n+ * \\brief Queue a request to the device\n+ * \\param[in] camera The camera to queue the request to\n+ * \\param[in] request The request to queue\n+ *\n+ * This method queues a capture request to the device for processing. The\n+ * request contains a set of buffers associated with streams and a set of\n+ * parameters. The pipeline handler shall program the device to ensure that the\n+ * parameters will be applied to the frames captured in the buffers provided in\n+ * the request.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+\n /**\n * \\brief Complete a buffer for a request\n * \\param[in] camera The camera the request belongs to\n", "prefixes": [ "libcamera-devel", "1/2" ] }