Patch Detail
Show a patch.
GET /api/patches/16430/?format=api
{ "id": 16430, "url": "https://patchwork.libcamera.org/api/patches/16430/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16430/", "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": "<20220629103018.4025635-5-chenghaoyang@google.com>", "date": "2022-06-29T10:30:13", "name": "[libcamera-devel,v3,4/9] ipu3: 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/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/16430/mbox/", "series": [ { "id": 3232, "url": "https://patchwork.libcamera.org/api/series/3232/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3232", "date": "2022-06-29T10:30:09", "name": "Use two imgus in ipu3 pipeline handler", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3232/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16430/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16430/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 CCE88BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 29 Jun 2022 10:30:34 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 575E765648;\n\tWed, 29 Jun 2022 12:30:34 +0200 (CEST)", "from mail-pf1-x436.google.com (mail-pf1-x436.google.com\n\t[IPv6:2607:f8b0:4864:20::436])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 138726563E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Jun 2022 12:30:29 +0200 (CEST)", "by mail-pf1-x436.google.com with SMTP id d17so14666718pfq.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Jun 2022 03:30:28 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\tjb4-20020a170903258400b00169071538a0sm10946059plb.267.2022.06.29.03.30.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 29 Jun 2022 03:30:27 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656498634;\n\tbh=frMGXmQgQkeQXSJMRCgTkMQ6+oAY30aS/uEiFMkQG+0=;\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=h2GgL24ywoxSRsS4lxCCF5LkotAAFLqosKpufsai7t/BgfnNuHZeX9VI1FE2ffnhQ\n\tY/dE9xfhbt3HLddfL5/Y1PKDyxB2BWWs2mrCzH33CSttttgWxODIwcxh+e05GkaLyW\n\ty+gCAXv6bR1w/uOSWdJcMbCCugoVuMMbvbEuWGyMLNgaB0c4zdi2sPdWxS1gj2DHey\n\tw0hMWXZBbXk00Ky7CrqFmid9CeW5JFDdY1GfRiHED1ik+vbvFQoEh044a3KF8DG/nE\n\tL+0ZApd8owIzuwIx5Xab2DKuVHkrqmAemRozBLzSfaiqVdJioRAGbyju4b/Pt6WAEv\n\tq6+o0I6Jg7Lyw==", "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=Bm9QfL5yVumPD3LxUYZj9M11EUpxJ2l+LkPlvWOTvvI=;\n\tb=lxokORtiTbEBE9Kgl7BT/fm7mD+LAcsGJGlaNh49QrOQ/yYe7lBSp+cMCRmBSaMRmW\n\t9xN7hSi5scLO+uiVmPHzM21t2ygf1I2HXwnWsSR0SVcJ7/K9f6+QQglRFcxkKPaKgydN\n\tvBs8UzszujAQTr+TfxjrKK6NO56pYjBr1Cu6o=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"lxokORti\"; \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=Bm9QfL5yVumPD3LxUYZj9M11EUpxJ2l+LkPlvWOTvvI=;\n\tb=2nWXY6bjGamiX+MuDsceygQCDhrmn8wsvVNtp/D+lIKmUrgaihRKgM4lYlGECGvHIK\n\tJnSrPKYOSFUDwFNnsESFW1T0NmA6A2mB8keaitJ1ErePkAVFe49l5t37bxcD3ULliEgx\n\tx38jJp9oSy4IGjQdPbnseSFKyzMJL0i+f/OFpOEc/hLas+vwOfOxlzkp+u2muLYflgqo\n\tFYOhKf+0BTbsqrvhCpYHDYMs/YrFLgOKxwZZpNr1EwIP5zpGDKtWGjGycjcePnz55aBh\n\tAD4ivOcVV3OYzfpbzT/T12qerB4c71DfZn7EH/zR32FTiqsb2x7W7L/QerKAmw17MWfO\n\tZNfQ==", "X-Gm-Message-State": "AJIora9D3xXnZHMfK0Y7BoMqNzhqHLTroreh+DXQY0Npi6Wwl+VcsIEL\n\tmrjxtmnbsl0VGAL2rryuR2oI8EuMqqvfjM19", "X-Google-Smtp-Source": "AGRyM1vkkN/TnEluT0pya00m74p7lQANCS3jYhhAcLvsegibe5B6LZQ/nqB9ORLWYugxtLB+ItX0XQ==", "X-Received": "by 2002:a63:8141:0:b0:40d:28fc:440f with SMTP id\n\tt62-20020a638141000000b0040d28fc440fmr2466104pgd.12.1656498627408; \n\tWed, 29 Jun 2022 03:30:27 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 29 Jun 2022 10:30:13 +0000", "Message-Id": "<20220629103018.4025635-5-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.0.rc0.161.g10f37bed90-goog", "In-Reply-To": "<20220629103018.4025635-1-chenghaoyang@google.com>", "References": "<20220629103018.4025635-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 4/9] ipu3: Add StillCapture stream and\n\timgu1 param 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.\nThe following patches will enable imgu1 to handle StillCapture stream\nspecifically, when the imgu0 is needed 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>> ¶mBuffers,\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>> ¶mBuff\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>> ¶mBuffers,\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 e219f704..a201c5ca 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@@ -1143,6 +1158,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@@ -1318,6 +1334,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", "v3", "4/9" ] }