Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 26373,
    "url": "https://patchwork.libcamera.org/api/patches/26373/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/26373/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/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": "<20260325151416.2114564-32-stefan.klug@ideasonboard.com>",
    "date": "2026-03-25T15:14:03",
    "name": "[v2,31/32] pipeline: rkisp1: Use BufferQueue for buffer handling",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "889d4a2fb5b9f9ac03ebc00b93a0575ff6d48aec",
    "submitter": {
        "id": 184,
        "url": "https://patchwork.libcamera.org/api/people/184/?format=api",
        "name": "Stefan Klug",
        "email": "stefan.klug@ideasonboard.com"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/26373/mbox/",
    "series": [
        {
            "id": 5849,
            "url": "https://patchwork.libcamera.org/api/series/5849/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5849",
            "date": "2026-03-25T15:13:32",
            "name": "rkisp1: pipeline rework for PFC",
            "version": 2,
            "mbox": "https://patchwork.libcamera.org/series/5849/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/26373/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/26373/checks/",
    "tags": {},
    "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 A9D8AC330F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 25 Mar 2026 15:16:10 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0A83D62CDA;\n\tWed, 25 Mar 2026 16:16:10 +0100 (CET)",
            "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9349A62CDA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 25 Mar 2026 16:16:08 +0100 (CET)",
            "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:b16a:5ed9:4ada:a95a])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 7491C1BCF; \n\tWed, 25 Mar 2026 16:14:50 +0100 (CET)"
        ],
        "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Nx44KS3C\"; dkim-atps=neutral",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1774451690;\n\tbh=SA7jM4U/YCt/5CDGIYRGgwJ47FMrJHgOfmAWoKdKPYk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Nx44KS3C9tKyCKc+gRJHdtdDudTqeEhxeKyxR9uMGycBaD3M3d7ezKMTK7YDU13xV\n\ts1taJ/84apRU0b8qCxH4nXnmZyK4DSlPOsOt5A5uqtX90ay9QR37l7KtyZw3N7DfZP\n\tD/cQ1FLKRWqzWtLI0vWv1eNG7GpSGZr4lo0t5q2Y=",
        "From": "Stefan Klug <stefan.klug@ideasonboard.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>",
        "Subject": "[PATCH v2 31/32] pipeline: rkisp1: Use BufferQueue for buffer\n\thandling",
        "Date": "Wed, 25 Mar 2026 16:14:03 +0100",
        "Message-ID": "<20260325151416.2114564-32-stefan.klug@ideasonboard.com>",
        "X-Mailer": "git-send-email 2.51.0",
        "In-Reply-To": "<20260325151416.2114564-1-stefan.klug@ideasonboard.com>",
        "References": "<20260325151416.2114564-1-stefan.klug@ideasonboard.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "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>",
        "Errors-To": "libcamera-devel-bounces@lists.libcamera.org",
        "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"
    },
    "content": "Migrate the pipeline handler to use the BufferQueue helper. This\nsimplifies the code and makes it easier to understand.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n\n---\n\nChanges in v2:\n- Added this patch\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 224 ++++++++---------------\n 1 file changed, 79 insertions(+), 145 deletions(-)",
    "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 998ee3c813bc..e047f073d695 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -12,7 +12,6 @@\n #include <memory>\n #include <numeric>\n #include <optional>\n-#include <queue>\n #include <vector>\n \n #include <linux/media-bus-format.h>\n@@ -35,6 +34,7 @@\n #include <libcamera/ipa/rkisp1_ipa_interface.h>\n #include <libcamera/ipa/rkisp1_ipa_proxy.h>\n \n+#include \"libcamera/internal/buffer_queue.h\"\n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/camera_sensor_properties.h\"\n@@ -89,6 +89,7 @@ public:\n \t */\n \tunsigned int frame_;\n \tstd::vector<IPABuffer> ipaBuffers_;\n+\tstd::vector<const FrameBuffer *> ipaFrameBuffers_;\n \n \tRkISP1MainPath *mainPath_;\n \tRkISP1SelfPath *selfPath_;\n@@ -156,11 +157,6 @@ struct RequestInfo {\n \tbool sequenceValid = false;\n };\n \n-struct ParamBufferInfo {\n-\tFrameBuffer *buffer = nullptr;\n-\tsize_t expectedSequence = 0;\n-};\n-\n struct DewarpBufferInfo {\n \tFrameBuffer *inputBuffer;\n \tstruct {\n@@ -247,6 +243,9 @@ private:\n \tstd::unique_ptr<V4L2VideoDevice> param_;\n \tstd::unique_ptr<V4L2VideoDevice> stat_;\n \n+\tstd::unique_ptr<BufferQueue> paramQueue_;\n+\tstd::unique_ptr<BufferQueue> statQueue_;\n+\n \tbool hasSelfPath_;\n \tbool isRaw_;\n \n@@ -256,28 +255,18 @@ private:\n \tstd::unique_ptr<ConverterDW100Module> dewarper_;\n \n \t/* Internal buffers used when dewarper is being used */\n-\tstd::vector<std::unique_ptr<FrameBuffer>> mainPathBuffers_;\n-\tstd::queue<FrameBuffer *> availableMainPathBuffers_;\n+\tstd::unique_ptr<BufferQueue> mainPathQueue_;\n \n \tbool running_ = false;\n \n-\tstd::vector<std::unique_ptr<FrameBuffer>> paramBuffers_;\n-\tstd::vector<std::unique_ptr<FrameBuffer>> statBuffers_;\n-\tstd::queue<FrameBuffer *> availableParamBuffers_;\n-\tstd::queue<FrameBuffer *> availableStatBuffers_;\n-\n \tstd::deque<RequestInfo> queuedRequests_;\n \n \tstd::map<unsigned int, SensorFrameInfo> sensorFrameInfos_;\n \n \tstd::deque<DewarpBufferInfo> queuedDewarpBuffers_;\n-\tSequenceSyncHelper paramsSyncHelper_;\n+\n \tSequenceSyncHelper imageSyncHelper_;\n \n-\tstd::queue<ParamBufferInfo> computingParamBuffers_;\n-\tstd::queue<ParamBufferInfo> queuedParamBuffers_;\n-\n-\tuint32_t nextParamsSequence_;\n \tuint32_t nextStatsToProcess_;\n \n \tCamera *activeCamera_;\n@@ -379,24 +368,19 @@ int RkISP1CameraData::loadTuningFile(const std::string &path)\n void RkISP1CameraData::paramsComputed(unsigned int frame, unsigned int bufferId, unsigned int bytesused)\n {\n \tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\n-\tParamBufferInfo &pInfo = pipe->computingParamBuffers_.front();\n-\tpipe->computingParamBuffers_.pop();\n \n-\tFrameBuffer *buffer = pInfo.buffer;\n+\tFrameBuffer *buffer = pipe->paramQueue_->front(BufferQueue::Preparing);\n+\n \tASSERT(buffer->cookie() == bufferId);\n \n \tLOG(RkISP1Schedule, Debug) << \"Queue params for \" << frame << \" \" << buffer;\n \n \tbuffer->_d()->metadata().planes()[0].bytesused = bytesused;\n-\tint ret = pipe->param_->queueBuffer(buffer);\n-\tif (ret < 0) {\n+\n+\tint ret = pipe->paramQueue_->preparedBuffer();\n+\tif (ret < 0)\n \t\tLOG(RkISP1, Error) << \"Failed to queue parameter buffer: \"\n \t\t\t\t   << strerror(-ret);\n-\t\tpipe->availableParamBuffers_.push(buffer);\n-\t\treturn;\n-\t}\n-\n-\tpipe->queuedParamBuffers_.push({ buffer, frame });\n }\n \n void RkISP1CameraData::setSensorControls(unsigned int frame,\n@@ -462,8 +446,11 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \t * info.statsBuffer can be null, if ipa->processStats() was called\n \t * without a buffer to just fill the metadata.\n \t */\n-\tif (info.statsBuffer)\n-\t\tpipe->availableStatBuffers_.push(info.statsBuffer);\n+\tif (info.statsBuffer) {\n+\t\tASSERT(pipe->statQueue_->front(BufferQueue::Postprocessing) == info.statsBuffer);\n+\t\tpipe->statQueue_->postprocessedBuffer();\n+\t}\n+\n \tinfo.statsBuffer = nullptr;\n \n \tpipe->tryCompleteRequests();\n@@ -879,6 +866,15 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tisRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n \tdata->usesDewarper_ = data->canUseDewarper_ && !isRaw_;\n \n+\tauto delegate = std::make_unique<BufferQueueDelegate<RkISP1Path>>(&mainPath_);\n+\tif (data->usesDewarper_) {\n+\t\tmainPathQueue_ = std::make_unique<BufferQueue>(std::move(delegate), BufferQueue::PostprocessStage, \"MainPath\");\n+\t} else {\n+\t\tmainPathQueue_ = std::make_unique<BufferQueue>(std::move(delegate), 0, \"MainPath\");\n+\t}\n+\n+\tmainPathQueue_->bufferReady.connect(this, &PipelineHandlerRkISP1::imageBufferReady);\n+\n \tTransform transform = config->combinedTransform();\n \tbool transposeAfterIsp = false;\n \tif (data->usesDewarper_) {\n@@ -1088,9 +1084,9 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S\n \t\tif (data->usesDewarper_)\n \t\t\treturn dewarper_->exportBuffers(&data->mainPathStream_, count, buffers);\n \t\telse\n-\t\t\treturn mainPath_.exportBuffers(count, buffers);\n+\t\t\treturn data->mainPath_->exportBuffers(count, buffers);\n \t} else if (hasSelfPath_ && stream == &data->selfPathStream_) {\n-\t\treturn selfPath_.exportBuffers(count, buffers);\n+\t\treturn data->selfPath_->exportBuffers(count, buffers);\n \t}\n \n \treturn -EINVAL;\n@@ -1102,39 +1098,35 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n \tutils::ScopeExitActions actions;\n \tunsigned int ipaBufferId = 1;\n \tint ret;\n+\t/* Start at index 1 */\n+\tdata->ipaFrameBuffers_.resize(1);\n \n \tactions += [&]() {\n-\t\tparamBuffers_.clear();\n-\t\tstatBuffers_.clear();\n-\t\tmainPathBuffers_.clear();\n+\t\tparamQueue_->releaseBuffers();\n+\t\tstatQueue_->releaseBuffers();\n+\t\tmainPathQueue_->releaseBuffers();\n \t};\n \n \tif (!isRaw_) {\n-\t\tret = param_->allocateBuffers(kRkISP1InternalBufferCount, &paramBuffers_);\n+\t\tret = paramQueue_->allocateBuffers(kRkISP1InternalBufferCount);\n \t\tif (ret < 0)\n \t\t\treturn ret;\n \n-\t\tret = stat_->allocateBuffers(kRkISP1InternalBufferCount, &statBuffers_);\n+\t\tret = statQueue_->allocateBuffers(kRkISP1InternalBufferCount);\n \t\tif (ret < 0)\n \t\t\treturn ret;\n \t}\n \n \t/* If the dewarper is being used, allocate internal buffers for ISP. */\n \tif (data->usesDewarper_) {\n-\t\tret = mainPath_.exportBuffers(kRkISP1DewarpImageBufferCount,\n-\t\t\t\t\t      &mainPathBuffers_);\n+\t\tret = mainPathQueue_->allocateBuffers(kRkISP1DewarpImageBufferCount);\n \t\tif (ret < 0)\n \t\t\treturn ret;\n-\n-\t\tfor (std::unique_ptr<FrameBuffer> &buffer : mainPathBuffers_)\n-\t\t\tavailableMainPathBuffers_.push(buffer.get());\n \t} else if (data->mainPath_->isEnabled()) {\n-\t\tret = mainPath_.importBuffers(data->mainPathStream_.configuration().bufferCount);\n+\t\tret = mainPathQueue_->importBuffers(data->mainPathStream_.configuration().bufferCount);\n \n \t\tif (ret < 0)\n \t\t\treturn ret;\n-\n-\t\tactions += [&]() { mainPath_.releaseBuffers(); };\n \t}\n \n \tif (hasSelfPath_ && data->selfPath_->isEnabled()) {\n@@ -1146,8 +1138,7 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n \t\tactions += [&]() { selfPath_.releaseBuffers(); };\n \t}\n \n-\tauto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers,\n-\t\t\t       std::queue<FrameBuffer *> &queue) {\n+\tauto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers) {\n \t\tfor (const std::unique_ptr<FrameBuffer> &buffer : buffers) {\n \t\t\tSpan<const FrameBuffer::Plane> planes = buffer->planes();\n \n@@ -1155,12 +1146,12 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n \t\t\tdata->ipaBuffers_.emplace_back(buffer->cookie(),\n \t\t\t\t\t\t       std::vector<FrameBuffer::Plane>{ planes.begin(),\n \t\t\t\t\t\t\t\t\t\t\tplanes.end() });\n-\t\t\tqueue.push(buffer.get());\n+\t\t\tdata->ipaFrameBuffers_.push_back(buffer.get());\n \t\t}\n \t};\n \n-\tpushBuffers(paramBuffers_, availableParamBuffers_);\n-\tpushBuffers(statBuffers_, availableStatBuffers_);\n+\tpushBuffers(paramQueue_->buffers());\n+\tpushBuffers(statQueue_->buffers());\n \n \tdata->ipa_->mapBuffers(data->ipaBuffers_);\n \n@@ -1172,19 +1163,6 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \n-\twhile (!availableStatBuffers_.empty())\n-\t\tavailableStatBuffers_.pop();\n-\n-\twhile (!availableParamBuffers_.empty())\n-\t\tavailableParamBuffers_.pop();\n-\n-\twhile (!availableMainPathBuffers_.empty())\n-\t\tavailableMainPathBuffers_.pop();\n-\n-\tparamBuffers_.clear();\n-\tstatBuffers_.clear();\n-\tmainPathBuffers_.clear();\n-\n \tstd::vector<unsigned int> ids;\n \tfor (IPABuffer &ipabuf : data->ipaBuffers_)\n \t\tids.push_back(ipabuf.id);\n@@ -1192,14 +1170,9 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n \tdata->ipa_->unmapBuffers(ids);\n \tdata->ipaBuffers_.clear();\n \n-\tif (param_->releaseBuffers())\n-\t\tLOG(RkISP1, Error) << \"Failed to release parameters buffers\";\n-\n-\tif (stat_->releaseBuffers())\n-\t\tLOG(RkISP1, Error) << \"Failed to release stat buffers\";\n-\n-\tif (mainPath_.releaseBuffers())\n-\t\tLOG(RkISP1, Error) << \"Failed to release main path buffers\";\n+\tparamQueue_->releaseBuffers();\n+\tstatQueue_->releaseBuffers();\n+\tmainPathQueue_->releaseBuffers();\n \n \tif (hasSelfPath_ && selfPath_.releaseBuffers())\n \t\tLOG(RkISP1, Error) << \"Failed to release self path buffers\";\n@@ -1223,16 +1196,14 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n \tif (!!controls)\n \t\tctrls = *controls;\n \n-\tparamsSyncHelper_.reset();\n \timageSyncHelper_.reset();\n-\tnextParamsSequence_ = 0;\n \tnextStatsToProcess_ = 0;\n \tdata->frame_ = 0;\n \n \tuint32_t paramBufferId = 0;\n \tFrameBuffer *paramBuffer = nullptr;\n \tif (!isRaw_) {\n-\t\tparamBuffer = availableParamBuffers_.front();\n+\t\tparamBuffer = paramQueue_->front(BufferQueue::Idle);\n \t\tparamBufferId = paramBuffer->cookie();\n \t}\n \n@@ -1245,10 +1216,9 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n \t}\n \n \tif (paramBuffer) {\n-\t\tavailableParamBuffers_.pop();\n-\t\tcomputingParamBuffers_.push({ paramBuffer, nextParamsSequence_++ });\n-\t\tparamsSyncHelper_.pushCorrection(0);\n-\t\tdata->paramsComputed(0, paramBufferId, res.paramBufferBytesUsed);\n+\t\tuint32_t seq;\n+\t\tparamQueue_->prepareBuffer(&seq);\n+\t\tdata->paramsComputed(seq, paramBufferId, res.paramBufferBytesUsed);\n \t}\n \n \tactions += [&]() { data->ipa_->stop(); };\n@@ -1337,12 +1307,6 @@ void PipelineHandlerRkISP1::stopDevice(Camera *camera)\n \t\t\tLOG(RkISP1, Warning)\n \t\t\t\t<< \"Failed to stop parameters for \" << camera->id();\n \n-\t\t/*\n-\t\t * The param buffers are not returned in order, so the queue\n-\t\t * becomes useless.\n-\t\t */\n-\t\tqueuedParamBuffers_ = {};\n-\n \t\tif (data->usesDewarper_)\n \t\t\tdewarper_->stop();\n \t}\n@@ -1359,8 +1323,6 @@ void PipelineHandlerRkISP1::stopDevice(Camera *camera)\n \tsensorFrameInfos_.clear();\n \n \tASSERT(queuedDewarpBuffers_.empty());\n-\tASSERT(queuedParamBuffers_.empty());\n-\tASSERT(computingParamBuffers_.empty());\n \n \tfreeBuffers(camera);\n \n@@ -1374,29 +1336,30 @@ void PipelineHandlerRkISP1::queueInternalBuffers()\n \n \tRkISP1CameraData *data = cameraData(activeCamera_);\n \n-\twhile (!availableStatBuffers_.empty()) {\n-\t\tFrameBuffer *buf = availableStatBuffers_.front();\n-\t\tavailableStatBuffers_.pop();\n-\t\tdata->pipe()->stat_->queueBuffer(buf);\n+\twhile (!statQueue_->empty(BufferQueue::Idle)) {\n+\t\tint ret = statQueue_->queueBuffer();\n+\t\tif (ret)\n+\t\t\tbreak;\n \t}\n \n \t/*\n \t * In case of the dewarper, there is a seperate buffer loop for the main\n \t * path\n \t */\n-\twhile (!availableMainPathBuffers_.empty()) {\n-\t\tFrameBuffer *buf = availableMainPathBuffers_.front();\n-\t\tavailableMainPathBuffers_.pop();\n+\tif (!data->usesDewarper_)\n+\t\treturn;\n \n-\t\tLOG(RkISP1Schedule, Debug) << \"Queue mainPath \" << buf;\n-\t\tdata->mainPath_->queueBuffer(buf);\n+\twhile (!mainPathQueue_->empty(BufferQueue::Idle)) {\n+\t\tLOG(RkISP1Schedule, Debug) << \"Queue mainPath \" << mainPathQueue_->front(BufferQueue::Idle);\n+\t\tint ret = mainPathQueue_->queueBuffer();\n+\t\tif (ret)\n+\t\t\tbreak;\n \t}\n }\n \n void PipelineHandlerRkISP1::computeParamBuffers(uint32_t maxSequence)\n {\n \tRkISP1CameraData *data = cameraData(activeCamera_);\n-\n \tif (isRaw_) {\n \t\t/*\n \t\t * Call computeParams with an empty param buffer to trigger the\n@@ -1406,38 +1369,24 @@ void PipelineHandlerRkISP1::computeParamBuffers(uint32_t maxSequence)\n \t\treturn;\n \t}\n \n-\twhile (nextParamsSequence_ <= maxSequence) {\n-\t\tif (availableParamBuffers_.empty()) {\n+\twhile (paramQueue_->nextSequence() <= maxSequence) {\n+\t\tif (paramQueue_->empty(BufferQueue::Idle)) {\n \t\t\tLOG(RkISP1Schedule, Warning)\n \t\t\t\t<< \"Ran out of parameter buffers\";\n \t\t\treturn;\n \t\t}\n \n-\t\tint correction = paramsSyncHelper_.correction();\n+\t\tint correction = paramQueue_->sequenceCorrection();\n \t\tif (correction != 0)\n \t\t\tLOG(RkISP1Schedule, Warning)\n \t\t\t\t<< \"Correcting params sequence \"\n \t\t\t\t<< correction;\n \n \t\tuint32_t paramsSequence;\n-\t\tif (correction >= 0) {\n-\t\t\tnextParamsSequence_ += correction;\n-\t\t\tparamsSyncHelper_.pushCorrection(correction);\n-\t\t\tparamsSequence = nextParamsSequence_++;\n-\t\t} else {\n-\t\t\t/*\n-\t\t\t * Inject the same sequence multiple times, to correct\n-\t\t\t * for the offset.\n-\t\t\t */\n-\t\t\tparamsSyncHelper_.pushCorrection(-1);\n-\t\t\tparamsSequence = nextParamsSequence_;\n-\t\t}\n-\n-\t\tFrameBuffer *buf = availableParamBuffers_.front();\n-\t\tavailableParamBuffers_.pop();\n-\t\tcomputingParamBuffers_.push({ buf, paramsSequence });\n+\t\tFrameBuffer *buffer = paramQueue_->front(BufferQueue::Idle);\n+\t\tparamQueue_->prepareBuffer(&paramsSequence);\n \t\tLOG(RkISP1Schedule, Debug) << \"Request params for \" << paramsSequence;\n-\t\tdata->ipa_->computeParams(paramsSequence, buf->cookie());\n+\t\tdata->ipa_->computeParams(paramsSequence, buffer->cookie());\n \t}\n }\n \n@@ -1473,7 +1422,7 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n \t\tFrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_);\n \t\tFrameBuffer *selfPathBuffer = request->findBuffer(&data->selfPathStream_);\n \t\tif (mainPathBuffer)\n-\t\t\tdata->mainPath_->queueBuffer(mainPathBuffer);\n+\t\t\tmainPathQueue_->queueBuffer(mainPathBuffer);\n \n \t\tif (data->selfPath_ && selfPathBuffer)\n \t\t\tdata->selfPath_->queueBuffer(selfPathBuffer);\n@@ -1676,10 +1625,18 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (stat_->open() < 0)\n \t\treturn false;\n \n+\tstatQueue_ = std::make_unique<BufferQueue>(std::make_unique<BufferQueueDelegate<V4L2VideoDevice>>(stat_.get()),\n+\t\t\t\t\t\t   BufferQueue::PostprocessStage,\n+\t\t\t\t\t\t   \"Stat\");\n+\n \tparam_ = V4L2VideoDevice::fromEntityName(media_.get(), \"rkisp1_params\");\n \tif (param_->open() < 0)\n \t\treturn false;\n \n+\tparamQueue_ = std::make_unique<BufferQueue>(std::make_unique<BufferQueueDelegate<V4L2VideoDevice>>(param_.get()),\n+\t\t\t\t\t\t    BufferQueue::PrepareStage,\n+\t\t\t\t\t\t    \"Params\");\n+\n \t/* Locate and open the ISP main and self paths. */\n \tif (!mainPath_.init(media_))\n \t\treturn false;\n@@ -1688,7 +1645,6 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \tisp_->frameStart.connect(this, &PipelineHandlerRkISP1::frameStart);\n-\tmainPath_.bufferReady.connect(this, &PipelineHandlerRkISP1::imageBufferReady);\n \tif (hasSelfPath_)\n \t\tselfPath_.bufferReady.connect(this, &PipelineHandlerRkISP1::imageBufferReady);\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statBufferReady);\n@@ -1816,7 +1772,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\tif (data->usesDewarper_) {\n \t\t\tLOG(RkISP1Schedule, Info)\n \t\t\t\t<< \"Image buffer ready, but no corresponding request\";\n-\t\t\tavailableMainPathBuffers_.push(buffer);\n+\t\t\tmainPathQueue_->postprocessedBuffer();\n \t\t\treturn;\n \t\t}\n \n@@ -1938,7 +1894,7 @@ void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)\n \n \t\toutputMeta.sequence = dwInfo.inputMeta.sequence;\n \n-\t\tavailableMainPathBuffers_.push(dwInfo.inputBuffer);\n+\t\tmainPathQueue_->postprocessedBuffer();\n \t\tdwInfo.inputBuffer = nullptr;\n \t\tdwInfo.outputBuffer = nullptr;\n \n@@ -1957,25 +1913,10 @@ void PipelineHandlerRkISP1::paramBufferReady(FrameBuffer *buffer)\n {\n \tLOG(RkISP1Schedule, Debug) << \"Param buffer ready \" << buffer;\n \n-\t/* After stream off, the buffers are returned out of order, so\n-\t * we don't care about the rest.\n-\t */\n-\tif (!running_) {\n-\t\tavailableParamBuffers_.push(buffer);\n-\t\treturn;\n-\t}\n-\n-\tParamBufferInfo pInfo = queuedParamBuffers_.front();\n-\tqueuedParamBuffers_.pop();\n-\n-\tASSERT(pInfo.buffer == buffer);\n-\n \tsize_t metaSequence = buffer->metadata().sequence;\n \tLOG(RkISP1Schedule, Debug) << \"Params buffer ready \"\n-\t\t\t\t   << \" Expected: \" << pInfo.expectedSequence\n+\t\t\t\t   << \" Expected: \" << paramQueue_->expectedSequence(buffer)\n \t\t\t\t   << \" got: \" << metaSequence;\n-\tparamsSyncHelper_.gotFrame(pInfo.expectedSequence, metaSequence);\n-\tavailableParamBuffers_.push(buffer);\n }\n \n void PipelineHandlerRkISP1::statBufferReady(FrameBuffer *buffer)\n@@ -1985,15 +1926,8 @@ void PipelineHandlerRkISP1::statBufferReady(FrameBuffer *buffer)\n \n \tsize_t sequence = buffer->metadata().sequence;\n \n-\tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n-\t\tLOG(RkISP1Schedule, Warning) << \"Stats cancelled \" << sequence;\n-\t\t/*\n-\t\t * We can't assume that the sequence of the stat buffer is valid,\n-\t\t * so there is nothing left to do.\n-\t\t */\n-\t\tavailableStatBuffers_.push(buffer);\n+\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n \t\treturn;\n-\t}\n \n \tLOG(RkISP1Schedule, Debug) << \"Stats ready \" << sequence;\n \n@@ -2004,7 +1938,7 @@ void PipelineHandlerRkISP1::statBufferReady(FrameBuffer *buffer)\n \n \tif (nextStatsToProcess_ > sequence) {\n \t\tLOG(RkISP1Schedule, Warning) << \"Stats were too late. Ignored\";\n-\t\tavailableStatBuffers_.push(buffer);\n+\t\tstatQueue_->postprocessedBuffer();\n \t\treturn;\n \t}\n \n",
    "prefixes": [
        "v2",
        "31/32"
    ]
}