Patch Detail
Show a patch.
GET /api/1.1/patches/16908/?format=api
{ "id": 16908, "url": "https://patchwork.libcamera.org/api/1.1/patches/16908/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16908/", "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": "<20220802102943.3221109-10-chenghaoyang@google.com>", "date": "2022-08-02T10:29:43", "name": "[libcamera-devel,v4,9/9] ipu3: Fixes frame delay", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a20e64250629b61685592a420c7d9555609b85f9", "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/16908/mbox/", "series": [ { "id": 3357, "url": "https://patchwork.libcamera.org/api/1.1/series/3357/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3357", "date": "2022-08-02T10:29:34", "name": "Use two imgus in ipu3 pipeline handler", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3357/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16908/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16908/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 BB405C3275\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 2 Aug 2022 10:30:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 89AFA6332B;\n\tTue, 2 Aug 2022 12:30:05 +0200 (CEST)", "from mail-pl1-x635.google.com (mail-pl1-x635.google.com\n\t[IPv6:2607:f8b0:4864:20::635])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1571063312\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 2 Aug 2022 12:30:04 +0200 (CEST)", "by mail-pl1-x635.google.com with SMTP id y15so13038540plp.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 02 Aug 2022 03:30:04 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(231.137.80.34.bc.googleusercontent.com. [34.80.137.231])\n\tby smtp.gmail.com with ESMTPSA id\n\tt15-20020a170902e84f00b0016db88f69a2sm1955128plg.141.2022.08.02.03.30.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 02 Aug 2022 03:30:02 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659436205;\n\tbh=/8WAQCAA70hTG+TU7mjus/Hc4ZjB7tRiVTIREFuJRAk=;\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=ZD9Mu1fwi5PfN3E0wRgg4kXTj6NerheL/LhM/YGl9af0mYydahZUTPjptGZFI3OiX\n\txRLu4yiWLlaNtdD8IjXNbbU05NHbJWOLVZTwP8Zamj2Rnwn8ZZxiyIImVTirKapBwH\n\tR8OG6FNMSrTBfXwZO3ZSlm6Uk6NXMggZFehm8P4tbyVuxm6A0QFA0uNCnj7HFiKPbV\n\tDFAoYW4LWLTG4IULPCZbzaldyeCtRFABlV5O4uqzLOJx2QuJ3el6qK92utLYq8bYzQ\n\tb5p+H5dmcWdp0VujM19BgPaE8/m14alM7jZ95aVjqJOjC82fOvj8tZQrumJ4c3NhAS\n\tsEXrHiHBANgEQ==", "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=d19T4fGNv59vqQ2SXElDkwk2dTDjZrY0C4F34OxC9Ls=;\n\tb=TCKgnWxwo+kzsSfQdMbXWiW8WsUE3G91hzATrpTT0F/zmU4NpE99spUT7O+4bOKgQo\n\ttCmlET/WdSWAQHSWMk9qCvCzyhwjVUChP8lz25eJGTesOKbGdCYebSGphIsbXGMF2shA\n\t9Dps9M9qJz7gJss+SNz2IyzkvpOYMR4ksNf5o=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"TCKgnWxw\"; \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=d19T4fGNv59vqQ2SXElDkwk2dTDjZrY0C4F34OxC9Ls=;\n\tb=3uA3N/zfI7iUTpyfWP7kUB161GgCNoNVldI1+3lbqAIw0dnFPQpvTZsRfMs0na+wXU\n\tQTHB7I/hdBaybK8v67xPD1jJMQipn8BhWFLsSZhZ7ywyS4b4rYSW0JA9OF9rP5nf3el0\n\t24bd4xVfH9moU9CYgfNCX8DqsagFxJL/pQaHwqDsgxjUsqCv4KmgOzcT4hVpgz+D2II9\n\t6u+4o0r8SYZW53YehQLmCTrc0DUISo14L5rUUxQPvfjR8JfRk7JX5HM/2dx9dcvRSadb\n\tDA7JtxKly5UYcH+SatWvx0epuJG2pXdJWPySEOiQE86BhCkUMriBjTB2X7XsmrtokO5p\n\tZdPw==", "X-Gm-Message-State": "ACgBeo38qh/1521BkmvTtsDpUEIn74Nx5Aj6CK3/Ebs9R5VscUThNlPW\n\tUgochxe32pDwOhX2z7ITbLNJeTjlIJRAAg==", "X-Google-Smtp-Source": "AA6agR5MaF6zQm4byCfXncKr7q2V1eYPFuj0mwFeJL+plyJOR9mGrrfLLNIze7Q6HOm16XLOVYNZqQ==", "X-Received": "by 2002:a17:90a:5207:b0:1ee:dfa1:afa9 with SMTP id\n\tv7-20020a17090a520700b001eedfa1afa9mr23195652pjh.246.1659436203211; \n\tTue, 02 Aug 2022 03:30:03 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 2 Aug 2022 10:29:43 +0000", "Message-Id": "<20220802102943.3221109-10-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.1.455.g008518b4e5-goog", "In-Reply-To": "<20220802102943.3221109-1-chenghaoyang@google.com>", "References": "<20220802102943.3221109-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 9/9] ipu3: Fixes frame delay", "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@google.com>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Like the shipped ipu3 HAL [1], handle the frame delay with one extra input,\nneeded for the first frame and StillCapture's non-sequential frame\nrequests.\n\n[1]:\nhttps://source.corp.google.com/chromeos_public/src/platform/camera/hal/intel/ipu3/psl/ipu3/ImguUnit.cpp;l=773\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 73 +++++++++++++++++++++++-----\n 1 file changed, 62 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex f8101c6c..36ca47c2 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -90,6 +90,9 @@ public:\n \n \tControlInfoMap ipaControls_;\n \n+\tbool firstRequest_ = true;\n+\tint lastCaptureRequestSeq_ = -1;\n+\n private:\n \tvoid metadataReady(unsigned int id, const ControlList &metadata);\n \tvoid paramsBufferReady(unsigned int id);\n@@ -884,6 +887,9 @@ int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlLis\n \tCIO2Device *cio2 = &data->cio2_;\n \tint ret;\n \n+\tdata->firstRequest_ = true;\n+\tdata->lastCaptureRequestSeq_ = -1;\n+\n \timgu0_.input_->bufferReady.connect(data,\n \t\t\t\t\t &IPU3CameraData::tryReturnBuffer);\n \timgu0_.output_->bufferReady.connect(data,\n@@ -1422,6 +1428,11 @@ void IPU3CameraData::paramsBufferReady(unsigned int id)\n \tif (!info)\n \t\treturn;\n \n+\tint yuvCount = firstRequest_ ? 2 : 1;\n+\tint stillCount = firstRequest_ || (lastCaptureRequestSeq_ + 1) != static_cast<int>(info->request->sequence()) ? 2 : 1;\n+\n+\tfirstRequest_ = false;\n+\n \tbool hasYuv = false;\n \tbool hasCapture = false;\n \t/* Queue all buffers from the request aimed for the ImgU. */\n@@ -1431,33 +1442,53 @@ void IPU3CameraData::paramsBufferReady(unsigned int id)\n \n \t\tif (stream == &outStream_) {\n \t\t\thasYuv = true;\n-\t\t\timgu0_->output_->queueBuffer(outbuffer);\n+\n+\t\t\tfor (int i = 0; i < yuvCount; ++i) {\n+\t\t\t\tbufferReturnCounters[outbuffer] += 1;\n+\t\t\t\timgu0_->output_->queueBuffer(outbuffer);\n+\t\t\t}\n \t\t} else if (stream == &vfStream_) {\n \t\t\thasYuv = true;\n-\t\t\timgu0_->viewfinder_->queueBuffer(outbuffer);\n+\n+\t\t\tfor (int i = 0; i < yuvCount; ++i) {\n+\t\t\t\tbufferReturnCounters[outbuffer] += 1;\n+\t\t\t\timgu0_->viewfinder_->queueBuffer(outbuffer);\n+\t\t\t}\n \t\t} else if (stream == &outCaptureStream_) {\n \t\t\thasCapture = true;\n \n-\t\t\timgu1_->output_->queueBuffer(outbuffer);\n+\t\t\tfor (int i = 0; i < stillCount; ++i) {\n+\t\t\t\tbufferReturnCounters[outbuffer] += 1;\n+\t\t\t\timgu1_->output_->queueBuffer(outbuffer);\n+\t\t\t}\n \t\t}\n \t}\n \n \tif (hasYuv) {\n-\t\tbufferReturnCounters[info->rawBuffer] += 1;\n-\n-\t\timgu0_->param_->queueBuffer(info->paramBuffer);\n-\t\timgu0_->stat_->queueBuffer(info->statBuffer);\n-\t\timgu0_->input_->queueBuffer(info->rawBuffer);\n+\t\tfor (int i = 0; i < yuvCount; ++i) {\n+\t\t\tbufferReturnCounters[info->paramBuffer] += 1;\n+\t\t\tbufferReturnCounters[info->statBuffer] += 1;\n+\t\t\tbufferReturnCounters[info->rawBuffer] += 1;\n+\n+\t\t\timgu0_->param_->queueBuffer(info->paramBuffer);\n+\t\t\timgu0_->stat_->queueBuffer(info->statBuffer);\n+\t\t\timgu0_->input_->queueBuffer(info->rawBuffer);\n+\t\t}\n \t} else {\n \t\tinfo->paramDequeued = true;\n \t\tinfo->metadataProcessed = true;\n \t}\n \n \tif (hasCapture) {\n-\t\tbufferReturnCounters[info->rawBuffer] += 1;\n+\t\tlastCaptureRequestSeq_ = info->request->sequence();\n \n-\t\timgu1_->param_->queueBuffer(info->captureParamBuffer);\n-\t\timgu1_->input_->queueBuffer(info->rawBuffer);\n+\t\tfor (int i = 0; i < stillCount; ++i) {\n+\t\t\tbufferReturnCounters[info->captureParamBuffer] += 1;\n+\t\t\tbufferReturnCounters[info->rawBuffer] += 1;\n+\n+\t\t\timgu1_->param_->queueBuffer(info->captureParamBuffer);\n+\t\t\timgu1_->input_->queueBuffer(info->rawBuffer);\n+\t\t}\n \t} else {\n \t\tinfo->captureParamDequeued = true;\n \t}\n@@ -1498,6 +1529,11 @@ void IPU3CameraData::tryReturnBuffer(FrameBuffer *buffer)\n */\n void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n {\n+\tif (--bufferReturnCounters[buffer] > 0)\n+\t\treturn;\n+\n+\tbufferReturnCounters.erase(buffer);\n+\n \tIPU3Frames::Info *info = frameInfos_.find(buffer);\n \tif (!info)\n \t\treturn;\n@@ -1564,6 +1600,11 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \n void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n {\n+\tif (--bufferReturnCounters[buffer] > 0)\n+\t\treturn;\n+\n+\tbufferReturnCounters.erase(buffer);\n+\n \tIPU3Frames::Info *info = frameInfos_.find(buffer);\n \tif (!info)\n \t\treturn;\n@@ -1584,6 +1625,11 @@ void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n \n void IPU3CameraData::captureParamBufferReady(FrameBuffer *buffer)\n {\n+\tif (--bufferReturnCounters[buffer] > 0)\n+\t\treturn;\n+\n+\tbufferReturnCounters.erase(buffer);\n+\n \tIPU3Frames::Info *info = frameInfos_.find(buffer);\n \tif (!info)\n \t\treturn;\n@@ -1604,6 +1650,11 @@ void IPU3CameraData::captureParamBufferReady(FrameBuffer *buffer)\n \n void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n {\n+\tif (--bufferReturnCounters[buffer] > 0)\n+\t\treturn;\n+\n+\tbufferReturnCounters.erase(buffer);\n+\n \tIPU3Frames::Info *info = frameInfos_.find(buffer);\n \tif (!info)\n \t\treturn;\n", "prefixes": [ "libcamera-devel", "v4", "9/9" ] }