From patchwork Mon Dec 4 00:10:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 19269 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 14353C322E for ; Mon, 4 Dec 2023 00:10:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A20D6629DB; Mon, 4 Dec 2023 01:10:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1701648653; bh=X2oPJy3GZr8rWVQz96jg/g4d2q0hf8JwiEbzhCfdJ2M=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=1LTKBiJQxrgY+1a3OWd8VsSTZ0zOiIozDMlxBsgUO0pXQ8ns8JMBCpSFEwVxKqsRC sU/DNa97+K3R6RLk41Lf17IdBja0+HGOpPOpivEUx/KAX+L9MRbNI6NLz6hitSGQNX 3tVDrHtO7LvolabtqHkCMW9+UvaajGzc+3/L/ZkTjqu17nd556pGf7RAOvlKLnlcgN 4T3+tSx3uCU4gR8WJ6QT9DPTbrcraYondw+ZFsMmljmMDCLajxXxgBH3kvKumuHQdm 6q9z5WamAye2Xk5wRvMtjQt+Uc6mt1+aMoAhhFmq7cy/oZUpWRgqIlFd+G/5ZOvt6L zFzJz1VfOUYKQ== Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B5B67629D6 for ; Mon, 4 Dec 2023 01:10:52 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="lU2VD5s0"; dkim-atps=neutral Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3316d09c645so3751104f8f.0 for ; Sun, 03 Dec 2023 16:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701648652; x=1702253452; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uWT6dMbaiuLENDzwFc4xPPz9KU9sfJhCzfIGiy01m4M=; b=lU2VD5s0eoTvLBuWNtBd/xhV3x1312d9e+V/YvJn7kQP62UCvnBNVWA2/89nmawLza RkovyqnwksnDu4q30D98mV2TH9zCtjEAVU7fvH2p1YfJakqURtak2z06SQ181nl0U32F 8UNLHAhABdgKuxAIbAdd8KlstK67zABHAXIAbaMvTspYfGFIsCV0GrqGQ+xi+Xmcy5KC eY9ms355JXFbDsdnQDB4DS3+pddZjCoG+WaN1BWrcYpYdwQ7PYeFg7Pz80xKssgDHsCx kd7WnRPV8r3mgmw/jO1wmtja/eS8fYOCN3aJ8jERvoEdqzHTH1qZ04UngsxBPWhxz7B8 Sb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701648652; x=1702253452; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uWT6dMbaiuLENDzwFc4xPPz9KU9sfJhCzfIGiy01m4M=; b=tTxCr539IBebJgHygsQKqIF54jKdA0Ggk+wJ9NeDuu6UIfRGhWWbeS+nkXG6UjqOUS +JIKQD/OeMiB2gZR1iAYkssAOKbxYb7DXqe8O4RZTm7UlwygZsyLDA1zbsIvoe9mFqVN /Ln/lhVmyLmOLLRGfhtb6xEz2YRpaswJTtNRgVPRQUhjgmjYTYhjGQjDviw/8VCsq5Af ge9lKvBhyhg6XnZ8r60qEE6rOQWUM/p6NTIcKP7YZp3mtCvqhnjcOAga51aUSKBcCqNI GBE1YJesdxFEqkn/VPOs+m0Jgp1YmxiecRnY1aj/5Vn4GQ+LuS9hp7MhOmvg4lFUhpCi qr8A== X-Gm-Message-State: AOJu0YwsGL/iLoU410JPnAWu57zsTP6+tIL8LgPLRKIkzCE1b2eQLVf8 txlhycslucYeNuWppdRpoj+Sm3xScMV11PbJPlc= X-Google-Smtp-Source: AGHT+IHBx/C1Kxp4bUv5MC/KL5sbrtJM9xvxvGO2tDRIUWyJiv8Tnv+6ckcymJb3yIONjJNX3uVVzA== X-Received: by 2002:adf:e5c9:0:b0:333:2fd2:4afb with SMTP id a9-20020adfe5c9000000b003332fd24afbmr2384787wrn.119.1701648652407; Sun, 03 Dec 2023 16:10:52 -0800 (PST) Received: from Lat-5310.. ([87.116.165.212]) by smtp.gmail.com with ESMTPSA id u29-20020adfa19d000000b003332db7d91dsm8835997wru.39.2023.12.03.16.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 16:10:52 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Mon, 4 Dec 2023 03:10:13 +0300 Message-Id: <20231204001013.404720-8-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231204001013.404720-1-andrey.konovalov@linaro.org> References: <20231204001013.404720-1-andrey.konovalov@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 7/7] [DNI] libcamera: pipeline: simple: enable use of SoftwareISP and Soft IPA 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: , X-Patchwork-Original-From: Andrey Konovalov via libcamera-devel From: Andrey Konovalov Reply-To: Andrey Konovalov Cc: mripard@redhat.com, g.martti@gmail.com, t.langendam@gmail.com, srinivas.kandagatla@linaro.org, bryan.odonoghue@linaro.org, admin@dennisbonke.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Some quick changes to make SoftwareISP and Soft IPA usable in the cases when the pipeline doesn't use Converter. Signed-off-by: Andrey Konovalov --- src/libcamera/pipeline/simple/simple.cpp | 134 +++++++++++++++++++---- 1 file changed, 111 insertions(+), 23 deletions(-) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 878794f6..8c119a98 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -25,6 +25,8 @@ #include #include +#include +#include #include #include @@ -32,12 +34,14 @@ #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/converter.h" #include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/software_isp.h" +#include "libcamera/internal/software_isp/swisp_linaro.h" #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" - namespace libcamera { LOG_DEFINE_CATEGORY(SimplePipeline) @@ -274,6 +278,8 @@ public: bool useConversion_; std::unique_ptr converter_; + std::unique_ptr swIsp_; + std::unique_ptr ipa_; private: void tryPipeline(unsigned int code, const Size &size); @@ -281,6 +287,9 @@ private: void conversionInputDone(FrameBuffer *buffer); void conversionOutputDone(FrameBuffer *buffer); + + void ispStatsReady(int dummy); + void setSensorControls(const ControlList &sensorControls); }; class SimpleCameraConfiguration : public CameraConfiguration @@ -509,6 +518,38 @@ int SimpleCameraData::init() } } + /* + * Create Linaro's implementation of SoftwareIsp unconditionally if no converter is used + * - to be revisited + */ + if (!converter_) { + swIsp_ = std::make_unique("linaro"); + if (!swIsp_) { + LOG(SimplePipeline, Warning) + << "Failed to create software ISP, disabling software debayering"; + swIsp_.reset(); + } + swIsp_->inputBufferReady.connect(this, &SimpleCameraData::conversionInputDone); + swIsp_->outputBufferReady.connect(this, &SimpleCameraData::conversionOutputDone); + swIsp_->ispStatsReady.connect(this, &SimpleCameraData::ispStatsReady); + + /* Create Linaro's IPA for the SoftwareIsp - to be revisited */ + ipa_ = IPAManager::createIPA(pipe, 0, 0); + if (!ipa_) { + LOG(SimplePipeline, Warning) << "Creating IPA for software ISP failed"; + return -ENOENT; + } + ret = ipa_->init(IPASettings{ "No cfg file", "No sensor model" }, + swIsp_->getStatsFD(), + sensor_->controls()); + if (ret) { + LOG(SimplePipeline, Warning) << "IPA init failed"; + return ret; + } + ipa_->setSensorControls.connect(this, &SimpleCameraData::setSensorControls); + ipa_->configure(sensor_->controls()); + } + video_ = pipe->video(entities_.back().entity); ASSERT(video_); @@ -599,12 +640,15 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size) config.captureFormat = pixelFormat; config.captureSize = format.size; - if (!converter_) { - config.outputFormats = { pixelFormat }; - config.outputSizes = config.captureSize; - } else { + if (converter_) { config.outputFormats = converter_->formats(pixelFormat); config.outputSizes = converter_->sizes(format.size); + } else if (swIsp_) { + config.outputFormats = swIsp_->formats(pixelFormat); + config.outputSizes = swIsp_->sizes(pixelFormat, format.size); + } else { + config.outputFormats = { pixelFormat }; + config.outputSizes = config.captureSize; } configs_.push_back(config); @@ -750,9 +794,9 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer) } /* - * The converter is in use. Requeue the internal buffer for - * capture (unless the stream is being stopped), and complete - * the request with all the user-facing buffers. + * The converter or Software ISP is in use. Requeue the internal + * buffer for capture (unless the stream is being stopped), and + * complete the request with all the user-facing buffers. */ if (buffer->metadata().status != FrameMetadata::FrameCancelled) video_->queueBuffer(buffer); @@ -798,9 +842,9 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer) buffer->metadata().timestamp); /* - * Queue the captured and the request buffer to the converter if format - * conversion is needed. If there's no queued request, just requeue the - * captured buffer for capture. + * Queue the captured and the request buffer to the converter or Software + * ISP if format conversion is needed. If there's no queued request, just + * requeue the captured buffer for capture. */ if (useConversion_) { if (conversionQueue_.empty()) { @@ -808,7 +852,11 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer) return; } - converter_->queueBuffers(buffer, conversionQueue_.front()); + if (converter_) + converter_->queueBuffers(buffer, conversionQueue_.front()); + else + swIsp_->queueBuffers(buffer, conversionQueue_.front()); + conversionQueue_.pop(); return; } @@ -834,6 +882,21 @@ void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer) pipe->completeRequest(request); } +void SimpleCameraData::ispStatsReady([[maybe_unused]] int dummy) +{ + if (!ipa_) + return; + + ipa_->processStats(sensor_->getControls({ V4L2_CID_ANALOGUE_GAIN, + V4L2_CID_EXPOSURE })); +} + +void SimpleCameraData::setSensorControls(const ControlList &sensorControls) +{ + ControlList ctrls(sensorControls); + sensor_->setControls(&ctrls); +} + /* Retrieve all source pads connected to a sink pad through active routes. */ std::vector SimpleCameraData::routedSourcePads(MediaPad *sink) { @@ -1013,8 +1076,10 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() /* Set the stride, frameSize and bufferCount. */ if (needConversion_) { std::tie(cfg.stride, cfg.frameSize) = - data_->converter_->strideAndFrameSize(cfg.pixelFormat, - cfg.size); + (data_->converter_) ? data_->converter_->strideAndFrameSize(cfg.pixelFormat, + cfg.size) + : data_->swIsp_->strideAndFrameSize(cfg.pixelFormat, + cfg.size); if (cfg.stride == 0) return Invalid; } else { @@ -1177,7 +1242,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) inputCfg.stride = captureFormat.planes[0].bpl; inputCfg.bufferCount = kNumInternalBuffers; - return data->converter_->configure(inputCfg, outputCfgs); + return (data->converter_) ? data->converter_->configure(inputCfg, outputCfgs) + : data->swIsp_->configure(inputCfg, outputCfgs); } int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream, @@ -1191,8 +1257,10 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream, * whether the converter is used or not. */ if (data->useConversion_) - return data->converter_->exportBuffers(data->streamIndex(stream), - count, buffers); + return (data->converter_) ? data->converter_->exportBuffers(data->streamIndex(stream), + count, buffers) + : data->swIsp_->exportBuffers(data->streamIndex(stream), + count, buffers); else return data->video_->exportBuffers(count, buffers); } @@ -1237,10 +1305,24 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL } if (data->useConversion_) { - ret = data->converter_->start(); - if (ret < 0) { - stop(camera); - return ret; + if (data->converter_) { + ret = data->converter_->start(); + if (ret < 0) { + stop(camera); + return ret; + } + } else if (data->swIsp_) { + ret = data->ipa_->start(); + if (ret < 0) { + stop(camera); + return ret; + } + ret = data->swIsp_->start(); + if (ret < 0) { + data->ipa_->stop(); + stop(camera); + return ret; + } } /* Queue all internal buffers for capture. */ @@ -1256,8 +1338,14 @@ void SimplePipelineHandler::stopDevice(Camera *camera) SimpleCameraData *data = cameraData(camera); V4L2VideoDevice *video = data->video_; - if (data->useConversion_) - data->converter_->stop(); + if (data->useConversion_) { + if (data->converter_) + data->converter_->stop(); + else if (data->swIsp_) { + data->swIsp_->stop(); + data->ipa_->stop(); + } + } video->streamOff(); video->releaseBuffers();