Patch Detail

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

{
    "id": 15900,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/15900/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/15900/",
    "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": "<20220512103258.324339-5-chenghaoyang@google.com>",
    "date": "2022-05-12T10:32:54",
    "name": "[libcamera-devel,4/8] Add StillCapture stream and imgu1 param buffers",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "2d3aa444cf0e9b8ba575c0ec7856313e899468fe",
    "submitter": {
        "id": 117,
        "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api",
        "name": "Cheng-Hao Yang",
        "email": "chenghaoyang@chromium.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/15900/mbox/",
    "series": [
        {
            "id": 3111,
            "url": "https://patchwork.libcamera.org/api/1.1/series/3111/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3111",
            "date": "2022-05-12T10:32:50",
            "name": "Use two imgus in ipu3 pipeline handler",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/3111/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/15900/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/15900/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 C5B98C326C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 12 May 2022 10:33:13 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7407E65663;\n\tThu, 12 May 2022 12:33:13 +0200 (CEST)",
            "from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com\n\t[IPv6:2607:f8b0:4864:20::1032])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 525DF6565F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 12 May 2022 12:33:11 +0200 (CEST)",
            "by mail-pj1-x1032.google.com with SMTP id\n\tgj17-20020a17090b109100b001d8b390f77bso7441182pjb.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 12 May 2022 03:33:11 -0700 (PDT)",
            "from chenghaoyang-low.c.googlers.com.com\n\t(174.71.80.34.bc.googleusercontent.com. [34.80.71.174])\n\tby smtp.gmail.com with ESMTPSA id\n\tt19-20020a62d153000000b005087c23ad8dsm3402219pfl.0.2022.05.12.03.33.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 12 May 2022 03:33:09 -0700 (PDT)"
        ],
        "DKIM-Signature": [
            "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652351593;\n\tbh=8EXAg82AdSpsCl53qJ1YTLjmuqrdevfnkMrtDo45H0w=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=TQo/eogZkquhMrQV3FkrK16aQyv2WoiU5/H3eHOe2vDFKSg1RGbobMSbSQGSvH8k3\n\t2WIVUH4LxaNpMZ+ShcaurOr2sn9QYnaE1E/FLQk+lmnV9oGjENBSOfvyU2+vITObX5\n\txDl3UBTO6T8nJel7AguDPvXv3DKZ2wsUA7COI7G2p/uZ8jmJxNWUSN84OXhXptRbj9\n\t50XJJ+LtMpxDg3nkvmTjm4fkHvuDAY43S+R8aQ0hZ7KkWJaWYPOGWZf906Dh5ISpNz\n\te/ygFhmynFnOkghNz8vhJ6O7xRYZ/9CNOXFvShcwdLcwuIQusnk2ZEhQgHbrVMlqfw\n\t+6NjZjvuPKI3w==",
            "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=dZ83oghNle34XzMKsAViAcUAcF3HO4Rp6e5Vv7F90BI=;\n\tb=UCHZrqwPB3g98duyykennGiyK+cGQ8Zxu++Al8lcHkRaKGXY4bIWTEAUbVnJbTE8LL\n\tJtM84pXa9KliKF7wMGQPS2NCg70hZ/d40pUR8QjsigPNH0oDePTurxm4jtePbRO4bCr+\n\tgQuxKx0VRUD+qf1du84wa+VAkOxVSlNYSo9MQ="
        ],
        "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"UCHZrqwP\"; \n\tdkim-atps=neutral",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=dZ83oghNle34XzMKsAViAcUAcF3HO4Rp6e5Vv7F90BI=;\n\tb=S69nc3WO+j+0MSty8UjARHKVQMwTsDx2yy27308IhVypeMzM092J/46Bm6B5Miz3mE\n\tQkwO2LlriE0ZCE5keEBiD76F8WMcOz9zzF7eGcoFvNETFYlzE3EbmBuEHMGgDN/XI3Td\n\tzcdg6m/rSNrq4pPaXkxgcI90ZbZa+KmGSFbRtLTyCz3xvcUrAuLVr82jgnusq+yKRBWw\n\teA57rh9rTYVwRrp4GnpVcVYDX6uLPFlmhHlYpW9dWZspjtCRY8x25Qk+R/jTMmgq0VOY\n\tqGeWPLutVWEIezKFTyc1uEunGDChESiHt5VJEk02hMCO/QE50BMcKCrZoUVx257ZtE5O\n\t61lA==",
        "X-Gm-Message-State": "AOAM531URiU1YHfmim8rYmN5EaT250Qbbd/WksEgGgFvwcqzyddcrR3r\n\tUUhY0o3Po++r5gUSOIzwaZVANwJukzCVeNVJ",
        "X-Google-Smtp-Source": "ABdhPJxwJ4kMWi5LVGWffE3L139TDcMTaDnN1N0TWlR/2azoOZOXpgsCracV47bQliSytkuXnbYNlw==",
        "X-Received": "by 2002:a17:90b:4a01:b0:1dc:b062:da0e with SMTP id\n\tkk1-20020a17090b4a0100b001dcb062da0emr10190358pjb.87.1652351589551; \n\tThu, 12 May 2022 03:33:09 -0700 (PDT)",
        "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Thu, 12 May 2022 10:32:54 +0000",
        "Message-Id": "<20220512103258.324339-5-chenghaoyang@google.com>",
        "X-Mailer": "git-send-email 2.36.0.512.ge40c2bad7a-goog",
        "In-Reply-To": "<20220512103258.324339-1-chenghaoyang@google.com>",
        "References": "<20220512103258.324339-1-chenghaoyang@google.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 4/8] Add StillCapture stream and imgu1\n\tparam buffers",
        "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>",
        "From": "Harvey Yang via libcamera-devel <libcamera-devel@lists.libcamera.org>",
        "Reply-To": "Harvey Yang <chenghaoyang@chromium.org>",
        "Cc": "Harvey Yang <chenghaoyang@chromium.org>",
        "Errors-To": "libcamera-devel-bounces@lists.libcamera.org",
        "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"
    },
    "content": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nThis patch adds the StillCapture stream and imgu1 param buffers, and the\nfollowing patches will enable imgu1 to handle StillCapture stream\nspecifically, when the imgu0 needs to handle video/preview streams.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/libcamera/pipeline/ipu3/frames.cpp | 23 +++++++++++++++++++++--\n src/libcamera/pipeline/ipu3/frames.h   |  8 +++++++-\n src/libcamera/pipeline/ipu3/ipu3.cpp   | 20 +++++++++++++++++++-\n 3 files changed, 47 insertions(+), 4 deletions(-)",
    "diff": "diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\nindex a4c3477c..f9b705a5 100644\n--- a/src/libcamera/pipeline/ipu3/frames.cpp\n+++ b/src/libcamera/pipeline/ipu3/frames.cpp\n@@ -23,7 +23,8 @@ IPU3Frames::IPU3Frames()\n }\n \n void IPU3Frames::init(const std::vector<std::unique_ptr<FrameBuffer>> &paramBuffers,\n-\t\t      const std::vector<std::unique_ptr<FrameBuffer>> &statBuffers)\n+\t\t      const std::vector<std::unique_ptr<FrameBuffer>> &statBuffers,\n+\t\t      const std::vector<std::unique_ptr<FrameBuffer>> &captureParamBuffers)\n {\n \tfor (const std::unique_ptr<FrameBuffer> &buffer : paramBuffers)\n \t\tavailableParamBuffers_.push(buffer.get());\n@@ -31,6 +32,9 @@ void IPU3Frames::init(const std::vector<std::unique_ptr<FrameBuffer>> &paramBuff\n \tfor (const std::unique_ptr<FrameBuffer> &buffer : statBuffers)\n \t\tavailableStatBuffers_.push(buffer.get());\n \n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : captureParamBuffers)\n+\t\tavailableCaptureParamBuffers_.push(buffer.get());\n+\n \tframeInfo_.clear();\n }\n \n@@ -38,6 +42,7 @@ void IPU3Frames::clear()\n {\n \tavailableParamBuffers_ = {};\n \tavailableStatBuffers_ = {};\n+\tavailableCaptureParamBuffers_ = {};\n }\n \n IPU3Frames::Info *IPU3Frames::create(Request *request)\n@@ -54,14 +59,22 @@ IPU3Frames::Info *IPU3Frames::create(Request *request)\n \t\treturn nullptr;\n \t}\n \n+\tif (availableCaptureParamBuffers_.empty()) {\n+\t\tLOG(IPU3, Debug) << \"Capture parameters buffer underrun\";\n+\t\treturn nullptr;\n+\t}\n+\n \tFrameBuffer *paramBuffer = availableParamBuffers_.front();\n \tFrameBuffer *statBuffer = availableStatBuffers_.front();\n+\tFrameBuffer *captureParamBuffer = availableCaptureParamBuffers_.front();\n \n \tparamBuffer->_d()->setRequest(request);\n \tstatBuffer->_d()->setRequest(request);\n+\tcaptureParamBuffer->_d()->setRequest(request);\n \n \tavailableParamBuffers_.pop();\n \tavailableStatBuffers_.pop();\n+\tavailableCaptureParamBuffers_.pop();\n \n \t/* \\todo Remove the dynamic allocation of Info */\n \tstd::unique_ptr<Info> info = std::make_unique<Info>();\n@@ -71,7 +84,9 @@ IPU3Frames::Info *IPU3Frames::create(Request *request)\n \tinfo->rawBuffer = nullptr;\n \tinfo->paramBuffer = paramBuffer;\n \tinfo->statBuffer = statBuffer;\n+\tinfo->captureParamBuffer = captureParamBuffer;\n \tinfo->paramDequeued = false;\n+\tinfo->captureParamDequeued = false;\n \tinfo->metadataProcessed = false;\n \n \tframeInfo_[id] = std::move(info);\n@@ -84,6 +99,7 @@ void IPU3Frames::remove(IPU3Frames::Info *info)\n \t/* Return params and stat buffer for reuse. */\n \tavailableParamBuffers_.push(info->paramBuffer);\n \tavailableStatBuffers_.push(info->statBuffer);\n+\tavailableCaptureParamBuffers_.push(info->captureParamBuffer);\n \n \t/* Delete the extended frame information. */\n \tframeInfo_.erase(info->id);\n@@ -102,6 +118,9 @@ bool IPU3Frames::tryComplete(IPU3Frames::Info *info)\n \tif (!info->paramDequeued)\n \t\treturn false;\n \n+\tif (!info->captureParamDequeued)\n+\t\treturn false;\n+\n \tremove(info);\n \n \tbufferAvailable.emit();\n@@ -131,7 +150,7 @@ IPU3Frames::Info *IPU3Frames::find(FrameBuffer *buffer)\n \t\t\t\treturn info;\n \n \t\tif (info->rawBuffer == buffer || info->paramBuffer == buffer ||\n-\t\t    info->statBuffer == buffer)\n+\t\t    info->statBuffer == buffer || info->captureParamBuffer == buffer)\n \t\t\treturn info;\n \t}\n \ndiff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h\nindex 6e3cb915..8fcb8a14 100644\n--- a/src/libcamera/pipeline/ipu3/frames.h\n+++ b/src/libcamera/pipeline/ipu3/frames.h\n@@ -36,16 +36,20 @@ public:\n \t\tFrameBuffer *paramBuffer;\n \t\tFrameBuffer *statBuffer;\n \n+\t\tFrameBuffer *captureParamBuffer;\n+\n \t\tControlList effectiveSensorControls;\n \n \t\tbool paramDequeued;\n+\t\tbool captureParamDequeued;\n \t\tbool metadataProcessed;\n \t};\n \n \tIPU3Frames();\n \n \tvoid init(const std::vector<std::unique_ptr<FrameBuffer>> &paramBuffers,\n-\t\t  const std::vector<std::unique_ptr<FrameBuffer>> &statBuffers);\n+\t\t  const std::vector<std::unique_ptr<FrameBuffer>> &statBuffers,\n+\t\t  const std::vector<std::unique_ptr<FrameBuffer>> &captureParamBuffers);\n \tvoid clear();\n \n \tInfo *create(Request *request);\n@@ -61,6 +65,8 @@ private:\n \tstd::queue<FrameBuffer *> availableParamBuffers_;\n \tstd::queue<FrameBuffer *> availableStatBuffers_;\n \n+\tstd::queue<FrameBuffer *> availableCaptureParamBuffers_;\n+\n \tstd::map<unsigned int, std::unique_ptr<Info>> frameInfo_;\n };\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 5dd13c41..b635976b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -70,6 +70,7 @@ public:\n \tStream outStream_;\n \tStream vfStream_;\n \tStream rawStream_;\n+\tStream outCaptureStream_;\n \n \tRectangle cropRegion_;\n \tbool supportsFlips_;\n@@ -696,6 +697,8 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n \t\treturn imgu0_.viewfinder_->exportBuffers(count, buffers);\n \telse if (stream == &data->rawStream_)\n \t\treturn data->cio2_.exportBuffers(count, buffers);\n+\telse if (stream == &data->outCaptureStream_)\n+\t\treturn imgu1_.output_->exportBuffers(count, buffers);\n \n \treturn -EINVAL;\n }\n@@ -718,11 +721,17 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n \t\tdata->outStream_.configuration().bufferCount,\n \t\tdata->vfStream_.configuration().bufferCount,\n \t\tdata->rawStream_.configuration().bufferCount,\n+\t\tdata->outCaptureStream_.configuration().bufferCount,\n \t});\n \n \tret = imgu0_.allocateBuffers(bufferCount);\n \tif (ret < 0)\n \t\treturn ret;\n+\tret = imgu1_.allocateBuffers(bufferCount);\n+\tif (ret < 0) {\n+\t\timgu0_.freeBuffers();\n+\t\treturn ret;\n+\t}\n \n \t/* Map buffers to the IPA. */\n \tunsigned int ipaBufferId = 1;\n@@ -737,9 +746,14 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n \t\tipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n \t}\n \n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : imgu1_.paramBuffers_) {\n+\t\tbuffer->setCookie(ipaBufferId++);\n+\t\tipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n+\t}\n+\n \tdata->ipa_->mapBuffers(ipaBuffers_);\n \n-\tdata->frameInfos_.init(imgu0_.paramBuffers_, imgu0_.statBuffers_);\n+\tdata->frameInfos_.init(imgu0_.paramBuffers_, imgu0_.statBuffers_, imgu1_.paramBuffers_);\n \tdata->frameInfos_.bufferAvailable.connect(\n \t\tdata, &IPU3CameraData::queuePendingRequests);\n \n@@ -760,6 +774,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n \tipaBuffers_.clear();\n \n \timgu0_.freeBuffers();\n+\timgu1_.freeBuffers();\n \n \treturn 0;\n }\n@@ -1139,6 +1154,7 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t\t&data->outStream_,\n \t\t\t&data->vfStream_,\n \t\t\t&data->rawStream_,\n+\t\t\t&data->outCaptureStream_,\n \t\t};\n \t\tCIO2Device *cio2 = &data->cio2_;\n \n@@ -1314,6 +1330,8 @@ void IPU3CameraData::paramsBufferReady(unsigned int id)\n \timgu0_->param_->queueBuffer(info->paramBuffer);\n \timgu0_->stat_->queueBuffer(info->statBuffer);\n \timgu0_->input_->queueBuffer(info->rawBuffer);\n+\n+\tinfo->captureParamDequeued = true;\n }\n \n void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)\n",
    "prefixes": [
        "libcamera-devel",
        "4/8"
    ]
}