From patchwork Tue Jan 30 18:13:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 19470 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B08ADC32A9 for ; Tue, 30 Jan 2024 18:13:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7580D62131; Tue, 30 Jan 2024 19:13:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SLzSTIVy"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DAEED6212F for ; Tue, 30 Jan 2024 19:13:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706638397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U0bMaMtknryfhkQqNQUEoHRL3v5MS+VNOg+/vLle8rs=; b=SLzSTIVyguKYt4b2AhXy5vmSjYoXlyJAdpZT+9fNEziXBZVoWm0WGq17R68ckz03eJqyhg ktYMQY4IcKEcuZ39QsbMNRZwXdkd9Nxnk3QGvJ+xH8skTubHtxlZHgzPJWZXNrBOumJekM d074TXf3CG0zdNfKimLY76hl3+tZf/o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-J7japHXTMIKBxBC9mitQ8Q-1; Tue, 30 Jan 2024 13:13:14 -0500 X-MC-Unique: J7japHXTMIKBxBC9mitQ8Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55E1F101A526; Tue, 30 Jan 2024 18:13:14 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C76240C122E; Tue, 30 Jan 2024 18:13:13 +0000 (UTC) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Subject: [RFC 1/2] libcamera: debayer: Move sizes() to DebayerCpu implementation Date: Tue, 30 Jan 2024 19:13:10 +0100 Message-ID: <20240130181311.43745-2-hdegoede@redhat.com> In-Reply-To: <20240130181311.43745-1-hdegoede@redhat.com> References: <20240130181311.43745-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , Pavel Machek , Bryan O'Donoghue Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The amount of padding needed for interpolation at the borders depends on the implementation. Stop assuming that all implementations need a pattern-width x pattern-height border around the output size for padding and move the sizes() method out of the base-class. Signed-off-by: Hans de Goede --- .../libcamera/internal/software_isp/debayer.h | 26 +------------------ .../internal/software_isp/debayer_cpu.h | 1 + src/libcamera/software_isp/debayer_cpu.cpp | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/include/libcamera/internal/software_isp/debayer.h b/include/libcamera/internal/software_isp/debayer.h index 9109bf32..ab1ce994 100644 --- a/include/libcamera/internal/software_isp/debayer.h +++ b/include/libcamera/internal/software_isp/debayer.h @@ -94,31 +94,7 @@ public: * * \return The valid size ranges or an empty range if there are none. */ - SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) - { - Size pattern_size = patternSize(inputFormat); - - if (pattern_size.isNull()) - return {}; - - /* - * For debayer interpolation a border of pattern-height x pattern-width - * is kept around the entire image. Combined with a minimum-size of - * pattern-height x pattern-width this means the input-size needs to be - * at least (3 * pattern-height) x (3 * pattern-width). - */ - if (inputSize.width < (3 * pattern_size.width) || - inputSize.height < (3 * pattern_size.height)) { - LOG(Debayer, Warning) - << "Input format size too small: " << inputSize.toString(); - return {}; - } - - return SizeRange(Size(pattern_size.width, pattern_size.height), - Size((inputSize.width - 2 * pattern_size.width) & ~(pattern_size.width - 1), - (inputSize.height - 2 * pattern_size.height) & ~(pattern_size.height - 1)), - pattern_size.width, pattern_size.height); - } + virtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0; /** * \brief Signals when the input buffer is ready. diff --git a/include/libcamera/internal/software_isp/debayer_cpu.h b/include/libcamera/internal/software_isp/debayer_cpu.h index 52af117f..bcb634d5 100644 --- a/include/libcamera/internal/software_isp/debayer_cpu.h +++ b/include/libcamera/internal/software_isp/debayer_cpu.h @@ -62,6 +62,7 @@ public: strideAndFrameSize(const PixelFormat &outputFormat, const Size &size); void process(FrameBuffer *input, FrameBuffer *output, DebayerParams params); + SizeRange sizes(PixelFormat inputFormat, const Size &inputSize); /** * \brief Get the file descriptor for the statistics. diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index b6393925..14fc383e 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -945,4 +945,30 @@ void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams inputBufferReady.emit(input); } +SizeRange DebayerCpu::sizes(PixelFormat inputFormat, const Size &inputSize) +{ + Size pattern_size = patternSize(inputFormat); + + if (pattern_size.isNull()) + return {}; + + /* + * For debayer interpolation a border of pattern-height x pattern-width + * is kept around the entire image. Combined with a minimum-size of + * pattern-height x pattern-width this means the input-size needs to be + * at least (3 * pattern-height) x (3 * pattern-width). + */ + if (inputSize.width < (3 * pattern_size.width) || + inputSize.height < (3 * pattern_size.height)) { + LOG(Debayer, Warning) + << "Input format size too small: " << inputSize.toString(); + return {}; + } + + return SizeRange(Size(pattern_size.width, pattern_size.height), + Size((inputSize.width - 2 * pattern_size.width) & ~(pattern_size.width - 1), + (inputSize.height - 2 * pattern_size.height) & ~(pattern_size.height - 1)), + pattern_size.width, pattern_size.height); +} + } /* namespace libcamera */