From patchwork Mon May 26 10:15:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 23431 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 17650C31E9 for ; Mon, 26 May 2025 10:15:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E6B6168D9D; Mon, 26 May 2025 12:15:49 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="NJpbX3cH"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 458B5627DA for ; Mon, 26 May 2025 12:15:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748254547; 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; bh=OxHdn+afk7TLfv/4jN7yF+4P6uRw1AP/iLD3jOYAf2k=; b=NJpbX3cHtBnjOQqi0KakGzZ31JSw0TiBfohjIlaQdYmQOo+BufRYH5K4Ju9LYuUqadVlNr IT5xEL62V73kx0t0/diJCwvmPSbKDi+3LDtw9pSHYPLJhCxJbGHx5U4Ehe/LB54es+IPrt cwriOPS78H07v0Qscuq4G3c0d2wVfEM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-597-9-QWmE66MLOcY_B6ckdilQ-1; Mon, 26 May 2025 06:15:43 -0400 X-MC-Unique: 9-QWmE66MLOcY_B6ckdilQ-1 X-Mimecast-MFC-AGG-ID: 9-QWmE66MLOcY_B6ckdilQ_1748254542 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DBE218004A7; Mon, 26 May 2025 10:15:42 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.78]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E419B180045B; Mon, 26 May 2025 10:15:39 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Laurent Pinchart , Kieran Bingham , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= , Paul Elder , Robert Mader Subject: [PATCH v6 00/12] Enable raw streams with software ISP Date: Mon, 26 May 2025 12:15:20 +0200 Message-ID: <20250526101536.29222-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 4o1hD7eRNR9Bpu6Yt5m7PExcBRr6FgW1c2wtdVvVQ6k_1748254542 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This makes raw streams working again in ‘simple’ pipeline when software ISP is enabled for the given device. At most one raw stream and one processed stream (possibly both at once) are supported. An example ‘cam’ invocation requesting a raw stream rather than a debayered stream: cam -c1 -C8 -s role=raw,width=1920,height=1080 -Ffile#.raw Or for both raw and processed streams: cam -c1 -C8 -Ffile# \ -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \ -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 \ When only a raw stream is requested, there are no exposure/gain adjustments applied. This could be improved in future, once software ISP gets a mechanism to gather image statistics without processing and using them to make the adjustments, or once manual exposure controls are added to software ISP. In the meantime, exposure must be changed externally. Tested-by: Kieran Bingham Tested-by: Robert Mader Changes in v6: - An unnecessary copy of formats avoided. - rawRequested_ and processedrequested_ set to false when there are no roles. - rawRequested_ and processedrequested_ updated in SimpleCameraConfiguration::validate(). Changes in v5: - Possible temporary segfault in the patch adding plain output configurations avoided. - PixelFormatInfo::isRaw() helper added. - SimplePipelineHandler::setUpFormatSizes replaced with a lambda function. - SimpleCameraData::{rawRequested_,processedRequested_} are set in SimpleCameraConfiguration first and copied to SimpleCameraData only after successful configure(). Changes in v4: - Broken range pruning due to passing a value rather than a reference fixed. - New common function isFormatRaw introduced. - The patch assigning colour spaces in the simple pipeline, previously posted separately, included in this series, as the first patch. It can still be handled separately; in any case the rest sort of depends on it. - Setting metadataRequired to false where needed to prevent freezes and assertion errors; related to metadata reporting support merged to master since v3. Changes in v3: - Significantly reworked, with both functional and clarity improvements. The level of guesswork and confusion is hopefully reduced enough now to drop the RFC prefix. - The number of streams is set to 2 only with software ISP. - SimpleCameraData::pipeConfig_ nullptr check patch dropped. - PPM/raw file output patch dropped from this series. Let’s handle this separately as the patch series is already complex enough. Changes in v2: - Completely reworked. - Extended to be able to produce a raw stream together with a processed stream. Milan Zamazal (12): libcamera: software_isp: Assign colour spaces in configurations libcamera: simple: Set the number of software ISP streams to 2 libcamera: formats: Add a helper to check for a raw pixel format libcamera: formats: Add a helper to check for a raw pixel info libcamera: simple: Don't use raw output formats with conversions libcamera: simple: Add plain output configurations libcamera: simple: Identify requested stream roles libcamera: simple: Consider raw output configurations libcamera: simple: Validate raw stream configurations libcamera: simple: Don't enforce conversion with an added raw stream libcamera: simple: Require metadata only when software ISP is used libcamera: simple: Make raw streams working include/libcamera/internal/formats.h | 3 + src/libcamera/formats.cpp | 16 + src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 11 +- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 10 - src/libcamera/pipeline/rkisp1/rkisp1.cpp | 11 +- src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 7 +- src/libcamera/pipeline/simple/simple.cpp | 274 ++++++++++++++---- 8 files changed, 244 insertions(+), 92 deletions(-)