{"id":19772,"url":"https://patchwork.libcamera.org/api/patches/19772/?format=json","web_url":"https://patchwork.libcamera.org/patch/19772/","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":"<20240319123622.675599-16-mzamazal@redhat.com>","date":"2024-03-19T12:36:02","name":"[v6,15/18] libcamera: debayer_cpu: Add BGR888 output support","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"05a2beda476b7d4e6325e90eb19ae20c3485295b","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19772/mbox/","series":[{"id":4231,"url":"https://patchwork.libcamera.org/api/series/4231/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4231","date":"2024-03-19T12:35:47","name":"libcamera: introduce Software ISP and Software IPA","version":6,"mbox":"https://patchwork.libcamera.org/series/4231/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19772/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19772/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 2CAE1C3272\n\tfor ;\n\tTue, 19 Mar 2024 12:37:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B16CB62D2E;\n\tTue, 19 Mar 2024 13:37:39 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3827B62FFC\n\tfor ;\n\tTue, 19 Mar 2024 13:37:37 +0100 (CET)","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-101-6COubDljOl6v3oMT07M2bQ-1;\n\tTue, 19 Mar 2024 08:37:33 -0400","from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8ADA53C40B55;\n\tTue, 19 Mar 2024 12:37:32 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.226.119])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 498B61C060A6;\n\tTue, 19 Mar 2024 12:37:30 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"SnkDvzpr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1710851856;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=1SNWhZi4uEprycadqZza9PiEjPAcyWfysP5QdmO0OZA=;\n\tb=SnkDvzprJC79yYH7oU+ZRillTDH1G5lFs8TOIK9hPnhCR+gipcyafxPOHg0YFEeOZUROee\n\tenqmLdQE322kY4Dua+4yLMR4HGWOhCyufrNxybC235mGGaEn6pSJhL5WkrPIgta815FrmJ\n\tMhhyn3ObmY2JjYk18T7XXfh/+NZuMFw=","X-MC-Unique":"6COubDljOl6v3oMT07M2bQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Hans de Goede ,\n\tAndrey Konovalov ,\n\tBryan O'Donoghue ,\n\tMaxime Ripard , Milan Zamazal , \n\tPavel Machek ,\n\tKieran Bingham ,\n\tStefan Klug ","Subject":"[PATCH v6 15/18] libcamera: debayer_cpu: Add BGR888 output support","Date":"Tue, 19 Mar 2024 13:36:02 +0100","Message-ID":"<20240319123622.675599-16-mzamazal@redhat.com>","In-Reply-To":"<20240319123622.675599-1-mzamazal@redhat.com>","References":"<20240319123622.675599-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.7","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","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":"From: Hans de Goede \n\nBGR888 is RGB888 with the red and blue pixels swapped, adjust\nthe debayering to swap the red and blue pixels in the bayer pattern\nto add support for writing formats::BGR888.\n\nTested-by: Bryan O'Donoghue # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \nReviewed-by: Milan Zamazal \nSigned-off-by: Hans de Goede \nReviewed-by: Stefan Klug \n---\n src/libcamera/software_isp/debayer_cpu.cpp | 42 +++++++++++++++++++---\n src/libcamera/software_isp/debayer_cpu.h | 1 +\n 2 files changed, 38 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex eb1c2718..a1692693 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -268,7 +268,7 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf\n \t\tconfig.bpp = (bayerFormat.bitDepth + 7) & ~7;\n \t\tconfig.patternSize.width = 2;\n \t\tconfig.patternSize.height = 2;\n-\t\tconfig.outputFormats = std::vector({ formats::RGB888 });\n+\t\tconfig.outputFormats = std::vector({ formats::RGB888, formats::BGR888 });\n \t\treturn 0;\n \t}\n \n@@ -278,7 +278,7 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf\n \t\tconfig.bpp = 10;\n \t\tconfig.patternSize.width = 4; /* 5 bytes per *4* pixels */\n \t\tconfig.patternSize.height = 2;\n-\t\tconfig.outputFormats = std::vector({ formats::RGB888 });\n+\t\tconfig.outputFormats = std::vector({ formats::RGB888, formats::BGR888 });\n \t\treturn 0;\n \t}\n \n@@ -289,7 +289,7 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf\n \n int DebayerCpu::getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config)\n {\n-\tif (outputFormat == formats::RGB888) {\n+\tif (outputFormat == formats::RGB888 || outputFormat == formats::BGR888) {\n \t\tconfig.bpp = 24;\n \t\treturn 0;\n \t}\n@@ -325,13 +325,41 @@ int DebayerCpu::setupStandardBayerOrder(BayerFormat::Order order)\n \treturn 0;\n }\n \n-/* TODO: this ignores outputFormat since there is only 1 supported outputFormat for now */\n-int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, [[maybe_unused]] PixelFormat outputFormat)\n+int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat)\n {\n \tBayerFormat bayerFormat =\n \t\tBayerFormat::fromPixelFormat(inputFormat);\n \n \txShift_ = 0;\n+\tswapRedBlueGains_ = false;\n+\n+\tswitch (outputFormat) {\n+\tcase formats::RGB888:\n+\t\tbreak;\n+\tcase formats::BGR888:\n+\t\t/* Swap R and B in bayer order to generate BGR888 instead of RGB888 */\n+\t\tswapRedBlueGains_ = true;\n+\n+\t\tswitch (bayerFormat.order) {\n+\t\tcase BayerFormat::BGGR:\n+\t\t\tbayerFormat.order = BayerFormat::RGGB;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::GBRG:\n+\t\t\tbayerFormat.order = BayerFormat::GRBG;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::GRBG:\n+\t\t\tbayerFormat.order = BayerFormat::GBRG;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::RGGB:\n+\t\t\tbayerFormat.order = BayerFormat::BGGR;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tgoto invalid_fmt;\n+\t\t}\n+\t\tbreak;\n+\tdefault:\n+\t\tgoto invalid_fmt;\n+\t}\n \n \tif ((bayerFormat.bitDepth == 8 || bayerFormat.bitDepth == 10 || bayerFormat.bitDepth == 12) &&\n \t bayerFormat.packing == BayerFormat::Packing::None &&\n@@ -378,6 +406,7 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, [[maybe_unused]] Pi\n \t\t}\n \t}\n \n+invalid_fmt:\n \tLOG(Debayer, Error) << \"Unsupported input output format combination\";\n \treturn -EINVAL;\n }\n@@ -661,6 +690,9 @@ void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams\n \t\tgamma_correction_ = params.gamma;\n \t}\n \n+\tif (swapRedBlueGains_)\n+\t\tstd::swap(params.gainR, params.gainB);\n+\n \tfor (unsigned int i = 0; i < kRGBLookupSize; i++) {\n \t\tconstexpr unsigned int div =\n \t\t\tkRGBLookupSize * DebayerParams::kGain10 / kGammaLookupSize;\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex fd1fa180..5f44fc65 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -145,6 +145,7 @@ private:\n \tunsigned int lineBufferIndex_;\n \tunsigned int xShift_; /* Offset of 0/1 applied to window_.x */\n \tbool enableInputMemcpy_;\n+\tbool swapRedBlueGains_;\n \tfloat gamma_correction_;\n \tunsigned int measuredFrames_;\n \tint64_t frameProcessTime_;\n","prefixes":["v6","15/18"]}