{"id":19107,"url":"https://patchwork.libcamera.org/api/1.1/patches/19107/?format=json","web_url":"https://patchwork.libcamera.org/patch/19107/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20231006132000.23504-6-naush@raspberrypi.com>","date":"2023-10-06T13:19:45","name":"[libcamera-devel,05/20] mojom: pipeline: ipa: rpi: Add fields for PiSP objects","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8ac47f0dc9ec07201ce2c0c3e3c6c4b22ac04c26","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19107/mbox/","series":[{"id":4047,"url":"https://patchwork.libcamera.org/api/1.1/series/4047/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4047","date":"2023-10-06T13:19:40","name":"Raspberry Pi: Preliminary PiSP support","version":1,"mbox":"https://patchwork.libcamera.org/series/4047/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19107/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19107/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 4E2FAC32B8\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  6 Oct 2023 13:20:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 026F762978;\n\tFri,  6 Oct 2023 15:20:05 +0200 (CEST)","from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com\n\t[IPv6:2a00:1450:4864:20::42f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DCA216296B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  6 Oct 2023 15:20:02 +0200 (CEST)","by mail-wr1-x42f.google.com with SMTP id\n\tffacd0b85a97d-3231df68584so1935522f8f.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 06 Oct 2023 06:20:02 -0700 (PDT)","from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tm8-20020a056000180800b00321773bb933sm1639478wrh.77.2023.10.06.06.20.01\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 06 Oct 2023 06:20:01 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1696598405;\n\tbh=q0vFDvJ59VY1d2uiPajM23Wn3sUowIiscRNkmUTSDtU=;\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:\n\tFrom;\n\tb=lYUvC/bMkUMShHVx11bjv+A2MEOJiJE+yBdqehrqboJxRJtwkCk3GwZAeERWYnY9N\n\t5FM5dPTkbuVOa3duWkzPynLTy/VwweO/SgZzT0pPljltznr2HvR9PXEihde1brnjw0\n\tSnXy7e/XNaczI9DdVo8eDJk3wiuVCVW8wTjg23gTBs80pbDrL8n3R2qGrOilUi0EZ2\n\t3GyQphJIC8JvUY7s5NgzQ5Kr5p+UDuJo/uBmdHgDKZiM5Pse4EdDnzdjSrdIFTeom/\n\tIR7jLb2uw1tnCLRLgn6j6h07XUVsEjY5dtsUJFz5FY/RsWaViW7hJirAAqTc9GHZRo\n\tJI8L3OYL0kg7A==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1696598402; x=1697203202;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=yWhhsdkDeaFIuTb/9tB3mwgwsDiB+8l3puInlWZGtSQ=;\n\tb=m8jvrtCUbjOPnCI28XSfi26YWvIvyJZnkx+/1GcdQykOxoBxqb40pXDeQ27x3RqnW2\n\twl2RoU4qzOn14hCxccR8M3bztXJgZ6MKissE8pDYt4PAxkw+n3OtV1JcFOsilWe3xP9v\n\tfaN0SzCZ/nIPVk+9FOsFvIAOBFqcq9EbPrpL14EirEpQQLbT/GLzYREevFp7KT7vvDOb\n\tLH7FllfynhRJNVSTXJqWnc+qnKAgce4DZD16H5P8sDsorQnwMDqZ+/YozCKdNjkLoMcD\n\tIdEzBVYee0h6x0D9HvuWhLky1JaSoWsq/zGAAjlYp4M1hJ1/MDtbv/rPr31oqhpKXx2f\n\t5YIA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"m8jvrtCU\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1696598402; x=1697203202;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=yWhhsdkDeaFIuTb/9tB3mwgwsDiB+8l3puInlWZGtSQ=;\n\tb=iqIEL1lLd2G1sfAd+EeldrOctUQCoKo63ldUGvW8hkl4CFcibgqDabXVycfbny3w6x\n\toiYWud/cdD694b7ZAgclmrb0GbKPSHypEJYy/0RwgHKxGkWTcaGOxNl2zQQFUUkPw1bt\n\t+WrlFPnJCzSCP6uGQJAzKlf6EvXLdRYbN6epa4lQW1FGfAMvIAL07bdThpnSgcqUPXTB\n\toomCRERBhDvmEdjr2BmAezvncN3CnbiWC6ogTy/MjkT6m8fOK9OZuF2Ez+7s2heGjtQv\n\t2577dr8BijV0+hGpY/a4NYSaBWqE+r0Thp+KkoHUs+rihFsWtWfOBqScJx71+BAd/9hN\n\tGI5A==","X-Gm-Message-State":"AOJu0YzIC1FaMTLcjse85IozHRVUGLWejjIg7OWBi7+XVnDlIZlnEydd\n\t8yDtJ15i/vQW/WwNA+6D1/EaJcETwODLyfzGDg0lDA==","X-Google-Smtp-Source":"AGHT+IH5/weplZezGmoJcHhoaPIICwc9LriXGWyRKURF6QSSKwxyp/q8ZBQzSTxgCq0ZxktPT9OaQQ==","X-Received":"by 2002:adf:e491:0:b0:320:b2a:4ea6 with SMTP id\n\ti17-20020adfe491000000b003200b2a4ea6mr6888820wrm.9.1696598402020; \n\tFri, 06 Oct 2023 06:20:02 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Fri,  6 Oct 2023 14:19:45 +0100","Message-Id":"<20231006132000.23504-6-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20231006132000.23504-1-naush@raspberrypi.com>","References":"<20231006132000.23504-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 05/20] mojom: pipeline: ipa: rpi: Add\n\tfields for PiSP objects","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":"Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Naushir Patuck <naush@raspberrypi.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Add the PiSP Frontend and Backend SharedMemObject file descriptors to\nthe ipa::init() call. This will allow the pipeline handler to pass these\nobjects to the IPA after construction.\n\nAdd a flag to indicate if buffer swaps are needed when starting the\nISP for the stitch block.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\n---\n include/libcamera/ipa/raspberrypi.mojom | 6 +++++-\n src/ipa/rpi/common/ipa_base.cpp         | 2 +-\n src/libcamera/pipeline/rpi/vc4/vc4.cpp  | 5 +++--\n 3 files changed, 9 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex ab4c4e2edca3..5986c4366c15 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -22,6 +22,9 @@ struct SensorConfig {\n struct InitParams {\n \tbool lensPresent;\n \tlibcamera.IPACameraSensorInfo sensorInfo;\n+\t/* PISP specific */\n+\tlibcamera.SharedFD fe;\n+\tlibcamera.SharedFD be;\n };\n \n struct InitResult {\n@@ -219,13 +222,14 @@ interface IPARPiEventInterface {\n \t * \\fn prepareIspComplete()\n \t * \\brief Signal completion of \\a prepareIsp\n \t * \\param[in] buffers Bayer and embedded buffers actioned.\n+\t * \\param[in] stitchSwapBuffers Whether the stitch block buffers need to be swapped.\n \t *\n \t * This asynchronous event is signalled to the pipeline handler once\n \t * the \\a prepareIsp signal has completed, and the ISP is ready to start\n \t * processing the frame. The embedded data buffer may be recycled after\n \t * this event.\n \t */\n-\tprepareIspComplete(BufferIds buffers);\n+\tprepareIspComplete(BufferIds buffers, bool stitchSwapBuffers);\n \n \t/**\n \t * \\fn processStatsComplete()\ndiff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex 5939fe57f040..97f647a9e53e 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -446,7 +446,7 @@ void IpaBase::prepareIsp(const PrepareParams &params)\n \tframeCount_++;\n \n \t/* Ready to push the input buffer into the ISP. */\n-\tprepareIspComplete.emit(params.buffers);\n+\tprepareIspComplete.emit(params.buffers, false);\n }\n \n void IpaBase::processStats(const ProcessParams &params)\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex bc90d6324777..233473e2fe2b 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -78,7 +78,7 @@ public:\n \tvoid ispOutputDequeue(FrameBuffer *buffer);\n \n \tvoid processStatsComplete(const ipa::RPi::BufferIds &buffers);\n-\tvoid prepareIspComplete(const ipa::RPi::BufferIds &buffers);\n+\tvoid prepareIspComplete(const ipa::RPi::BufferIds &buffers, bool stitchSwapBuffers);\n \tvoid setIspControls(const ControlList &controls);\n \tvoid setCameraTimeout(uint32_t maxFrameLengthMs);\n \n@@ -833,7 +833,8 @@ void Vc4CameraData::processStatsComplete(const ipa::RPi::BufferIds &buffers)\n \thandleState();\n }\n \n-void Vc4CameraData::prepareIspComplete(const ipa::RPi::BufferIds &buffers)\n+void Vc4CameraData::prepareIspComplete(const ipa::RPi::BufferIds &buffers,\n+\t\t\t\t       [[maybe_unused]] bool stitchSwapBuffers)\n {\n \tunsigned int embeddedId = buffers.embedded & RPi::MaskID;\n \tunsigned int bayer = buffers.bayer & RPi::MaskID;\n","prefixes":["libcamera-devel","05/20"]}