{"id":23516,"url":"https://patchwork.libcamera.org/api/patches/23516/?format=json","web_url":"https://patchwork.libcamera.org/patch/23516/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250611013245.133785-11-bryan.odonoghue@linaro.org>","date":"2025-06-11T01:32:20","name":"[10/35] libcamera: software_isp: Move param select code to Debayer base class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0aa82b19778b580643bf5ec439c86cafa509936f","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23516/mbox/","series":[{"id":5212,"url":"https://patchwork.libcamera.org/api/series/5212/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5212","date":"2025-06-11T01:32:10","name":"Add GLES 2.0 GPUISP to libcamera","version":1,"mbox":"https://patchwork.libcamera.org/series/5212/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23516/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23516/checks/","tags":{},"headers":{"Return-Path":"","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 60CD1C3327\n\tfor ;\n\tWed, 11 Jun 2025 01:33:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CED3A68DCE;\n\tWed, 11 Jun 2025 03:33:32 +0200 (CEST)","from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 06FAF68DD0\n\tfor ;\n\tWed, 11 Jun 2025 03:33:30 +0200 (CEST)","by mail-wm1-x32e.google.com with SMTP id\n\t5b1f17b1804b1-450ccda1a6eso56809745e9.2\n\tfor ;\n\tTue, 10 Jun 2025 18:33:30 -0700 (PDT)","from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-4532514138asm5680625e9.3.2025.06.10.18.33.27\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 10 Jun 2025 18:33:28 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"v+pfrmHa\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1749605609; x=1750210409;\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=9PVu7x00JvXUNXl45gheWNt7X7t7eecspR+1Or+mgZ8=;\n\tb=v+pfrmHa0yl8WJ0hwuUFpkHITr9LfGcDU+Ninvz90xjdbDaBAmgi3VGSzM5FJx+8iu\n\t6SascQO0M84HEQnJOvLGBR2hYqIRbmX2VZgTwu2ZhJOef9ESFxg136Gp+Ep1CMoKU/FR\n\ttgrYUzxuk5zV+TmXpbEjnuWHllUvcIODPzumr4r0gbqv2v+RMmH8e68YdWQX7NaXkaLy\n\tsRZ93/fL63JOBV6GntEl18DNJ8Givny1e7pqCou//nQc41PFBfwfdqheVircDQ0xmHQl\n\thTcgs31CFhMjvI2lkyAlNKpruQoccK3qLtcliIirbWkI/HJm/RcXI5xfuX7/tu2bmbYA\n\t2KOQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1749605609; x=1750210409;\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=9PVu7x00JvXUNXl45gheWNt7X7t7eecspR+1Or+mgZ8=;\n\tb=g9KlqQ0gkt6QPXkxXb3hTmb5SvOHY2aUV7mLTYnD/pGRZpg1vadZEvDHEYFFbhNOMi\n\t8oV2zMKDdq7wLaM4uImEQvDep1Qo6he+JjWl+EaDoqjsg8U4UvKImFJxGX7nkM4jzu0F\n\tlBRUqA66PB/6+p6JK5q0G2Maf2VNoMQzcNOPG8BXRCW3ng4l8fww2XxBqOlz2LzkZxde\n\tz2o5pMsW0+Imyfw1Gv5UdcKuRzMYoV7bhX72P/INomY4wHqgnz8yWwcWwR4Am1JYdmS4\n\tsXIDcNi+9YyJQfc7PfluTZCLrd7J4IIynX+tXilnPxHAo/rWX92j3dzTje8JX0zqKiYl\n\tFBFw==","X-Gm-Message-State":"AOJu0YxoEtgpNSdWLPOKo0Gyj9YN3L0gmA5zoJ8IFwZ7AbVMN7PpHHC1\n\tBHThuUKIY43t0Qg+Dk4MkGWRDRysu/p0zVmgk/MhGPkA7rFJdMV8yZcPI2A99janNCCgWfoHiha\n\t2gXIi+oE=","X-Gm-Gg":"ASbGncs51d654lEl8xUUmTgjpfZyE9D1l/WmdvLob+RxXAlmUmjYiEyDH/ueLc5vLEt\n\t0JWzZGAbUNC3hf6Debu9C1uy1MmTYeYpdpPdGxUNDLuckY26KYc0EOuejxupA9JrJwapEpkLkrI\n\tvAQKVbA/PhM+34RsrSV8XvxgEvLAawV6vl0mbLaA6SrWqOKZWtZIaBc4NXIX7Irhj3Yzg4CXu3n\n\txv3wupff72i+x+4EUZ5Hyz3AxF283fEvEn8m+R1FYoEzIgY2qJTvN7H2M6BWvnE+Hi++/+s81zI\n\tW1YJzUw+GddeYj5In4FF2fcEOoZWfQN6qJ2I8GHN0ZYE2dRPzMuO1qOhxCaExjBt6tRp7KqqxUC\n\tARf8Wj5t+aBIYnav/jZu275pvyQCwduYAAXRRL6pawg==","X-Google-Smtp-Source":"AGHT+IH1pjZUNAWQum5V8DLvmjxoGKt/RBAENA6acO4UcvGrZYV0esNj4/K6d9O75I0FJ7DNEV12RQ==","X-Received":"by 2002:a05:600c:6986:b0:439:9424:1b70 with SMTP id\n\t5b1f17b1804b1-45324f6a144mr6240575e9.30.1749605609353; \n\tTue, 10 Jun 2025 18:33:29 -0700 (PDT)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"Bryan O'Donoghue ","Subject":"[PATCH 10/35] libcamera: software_isp: Move param select code to\n\tDebayer base class","Date":"Wed, 11 Jun 2025 02:32:20 +0100","Message-ID":"<20250611013245.133785-11-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.49.0","In-Reply-To":"<20250611013245.133785-1-bryan.odonoghue@linaro.org>","References":"<20250611013245.133785-1-bryan.odonoghue@linaro.org>","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Move the parameter selection code into the Debayer base class in-order to\nfacilitate reuse of the lookup tables in the eGL shaders.\n\nSigned-off-by: Bryan O'Donoghue \n---\n src/libcamera/software_isp/debayer.cpp | 40 ++++++++++++++++++++++\n src/libcamera/software_isp/debayer.h | 5 +++\n src/libcamera/software_isp/debayer_cpu.cpp | 29 +++-------------\n 3 files changed, 49 insertions(+), 25 deletions(-)","diff":"diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nindex 29fdcbbf..75e4bffa 100644\n--- a/src/libcamera/software_isp/debayer.cpp\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -187,4 +187,44 @@ Debayer::~Debayer()\n * \\brief Signals when the output buffer is ready\n */\n \n+/**\n+ * \\fn void Debayer::setParams(DebayerParams ¶ms)\n+ * \\brief Select the bayer params to use for the next frame debayer\n+ * \\param[in] params The parameters to be used in debayering\n+ */\n+void Debayer::setParams(DebayerParams ¶ms)\n+{\n+\tgreen_ = params.green;\n+\tgreenCcm_ = params.greenCcm;\n+\tif (swapRedBlueGains_) {\n+\t\tred_ = params.blue;\n+\t\tblue_ = params.red;\n+\t\tredCcm_ = params.blueCcm;\n+\t\tblueCcm_ = params.redCcm;\n+\t\tfor (unsigned int i = 0; i < 256; i++) {\n+\t\t\tstd::swap(redCcm_[i].r, redCcm_[i].b);\n+\t\t\tstd::swap(blueCcm_[i].r, blueCcm_[i].b);\n+\t\t}\n+\t} else {\n+\t\tred_ = params.red;\n+\t\tblue_ = params.blue;\n+\t\tredCcm_ = params.redCcm;\n+\t\tblueCcm_ = params.blueCcm;\n+\t}\n+\tgammaLut_ = params.gammaLut;\n+}\n+\n+/**\n+ * \\fn void Debayer::dmaSyncBegin(DebayerParams ¶ms)\n+ * \\brief Common CPU/GPU Dma Sync Buffer begin\n+ */\n+void Debayer::dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output)\n+{\n+\tfor (const FrameBuffer::Plane &plane : input->planes())\n+\t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Read);\n+\n+\tfor (const FrameBuffer::Plane &plane : output->planes())\n+\t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write);\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h\nindex 01b6e916..0af66b55 100644\n--- a/src/libcamera/software_isp/debayer.h\n+++ b/src/libcamera/software_isp/debayer.h\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/software_isp/benchmark.h\"\n #include \"libcamera/internal/software_isp/debayer_params.h\"\n \n@@ -82,6 +83,10 @@ public:\n \n private:\n \tvirtual Size patternSize(PixelFormat inputFormat) = 0;\n+\n+protected:\n+\tvoid setParams(DebayerParams ¶ms);\n+\tvoid dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output);\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 13db8a8c..4ef573a3 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -22,7 +22,6 @@\n #include \n \n #include \"libcamera/internal/bayer_format.h\"\n-#include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n@@ -740,30 +739,10 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \tbench_.startFrame();\n \n \tstd::vector dmaSyncers;\n-\tfor (const FrameBuffer::Plane &plane : input->planes())\n-\t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Read);\n-\n-\tfor (const FrameBuffer::Plane &plane : output->planes())\n-\t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write);\n-\n-\tgreen_ = params.green;\n-\tgreenCcm_ = params.greenCcm;\n-\tif (swapRedBlueGains_) {\n-\t\tred_ = params.blue;\n-\t\tblue_ = params.red;\n-\t\tredCcm_ = params.blueCcm;\n-\t\tblueCcm_ = params.redCcm;\n-\t\tfor (unsigned int i = 0; i < 256; i++) {\n-\t\t\tstd::swap(redCcm_[i].r, redCcm_[i].b);\n-\t\t\tstd::swap(blueCcm_[i].r, blueCcm_[i].b);\n-\t\t}\n-\t} else {\n-\t\tred_ = params.red;\n-\t\tblue_ = params.blue;\n-\t\tredCcm_ = params.redCcm;\n-\t\tblueCcm_ = params.blueCcm;\n-\t}\n-\tgammaLut_ = params.gammaLut;\n+\n+\tdmaSyncBegin(dmaSyncers, input, output);\n+\n+\tsetParams(params);\n \n \t/* Copy metadata from the input buffer */\n \tFrameMetadata &metadata = output->_d()->metadata();\n","prefixes":["10/35"]}