From patchwork Tue May 19 03:06:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3809 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4587A60E1A for ; Tue, 19 May 2020 05:06:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ECgg/xvK"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E24DA30C for ; Tue, 19 May 2020 05:06:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589857597; bh=XJwg99kDEgqx3wsun9ibHGE4xDctkxQKWGgTgX6WvzY=; h=From:To:Subject:Date:From; b=ECgg/xvKprFhM3XrKS6Q5r6gUZp1/tKfI34+4ElR1fk856lb7h7Uqs4VO7cAYPP75 KPrAc12Q5JKkN/wQMvxdkvKjyC0tC6u5bd7mfQbaUq+DsGg8mZkaXPAAfmZboRhbIT TIRAUmlzHNCKi0GjuXvkzxlzHQOVGz4fp93q3SDA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 19 May 2020 06:06:23 +0300 Message-Id: <20200519030624.15985-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: pipeline: simple: converter: Add scaling support 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-List-Received-Date: Tue, 19 May 2020 03:06:37 -0000 Extend the SimpleConverter to support scaling, with reporting of the minimum and maximum output sizes supported for a given input size. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/simple/converter.cpp | 67 ++++++++++++++++++--- src/libcamera/pipeline/simple/converter.h | 7 ++- src/libcamera/pipeline/simple/simple.cpp | 2 +- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 02443e7f78ed..e5e2f0fddb62 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -8,10 +8,12 @@ #include "converter.h" #include +#include #include #include #include +#include #include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" @@ -92,15 +94,60 @@ std::vector SimpleConverter::formats(PixelFormat input) return pixelFormats; } -int SimpleConverter::configure(PixelFormat inputFormat, - PixelFormat outputFormat, const Size &size) +SizeRange SimpleConverter::sizes(const Size &input) +{ + if (!m2m_) + return {}; + + /* + * Set the size on the input side (V4L2 output) of the converter to + * enumerate the scaling capabilities on its output (V4L2 capture). + */ + V4L2DeviceFormat format; + format.fourcc = V4L2PixelFormat(); + format.size = input; + + int ret = m2m_->output()->setFormat(&format); + if (ret < 0) { + LOG(SimplePipeline, Error) + << "Failed to set format: " << strerror(-ret); + return {}; + } + + SizeRange sizes; + + format.size = { 1, 1 }; + ret = m2m_->capture()->setFormat(&format); + if (ret < 0) { + LOG(SimplePipeline, Error) + << "Failed to set format: " << strerror(-ret); + return {}; + } + + sizes.min = format.size; + + format.size = { UINT_MAX, UINT_MAX }; + ret = m2m_->capture()->setFormat(&format); + if (ret < 0) { + LOG(SimplePipeline, Error) + << "Failed to set format: " << strerror(-ret); + return {}; + } + + sizes.max = format.size; + + return sizes; +} + +int SimpleConverter::configure(PixelFormat inputFormat, const Size &inputSize, + StreamConfiguration *cfg) { V4L2DeviceFormat format; int ret; V4L2PixelFormat videoFormat = m2m_->output()->toV4L2PixelFormat(inputFormat); format.fourcc = videoFormat; - format.size = size; + format.size = inputSize; ret = m2m_->output()->setFormat(&format); if (ret < 0) { @@ -109,18 +156,16 @@ int SimpleConverter::configure(PixelFormat inputFormat, return ret; } - if (format.fourcc != videoFormat || format.size != size) { + if (format.fourcc != videoFormat || format.size != inputSize) { LOG(SimplePipeline, Error) << "Input format not supported"; return -EINVAL; } - /* - * Set the pixel format on the output, the size is identical to the - * input as we don't support scaling. - */ - videoFormat = m2m_->capture()->toV4L2PixelFormat(outputFormat); + /* Set the pixel format and size on the output. */ + videoFormat = m2m_->capture()->toV4L2PixelFormat(cfg->pixelFormat); format.fourcc = videoFormat; + format.size = cfg->size; ret = m2m_->capture()->setFormat(&format); if (ret < 0) { @@ -129,12 +174,14 @@ int SimpleConverter::configure(PixelFormat inputFormat, return ret; } - if (format.fourcc != videoFormat || format.size != size) { + if (format.fourcc != videoFormat || format.size != cfg->size) { LOG(SimplePipeline, Error) << "Output format not supported"; return -EINVAL; } + cfg->stride = format.planes[0].bpl; + return 0; } diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index a33071fa8578..1f770eb844b5 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -20,6 +20,8 @@ namespace libcamera { class FrameBuffer; class MediaDevice; struct Size; +class SizeRange; +struct StreamConfiguration; class V4L2M2MDevice; class SimpleConverter @@ -32,9 +34,10 @@ public: void close(); std::vector formats(PixelFormat input); + SizeRange sizes(const Size &input); - int configure(PixelFormat inputFormat, PixelFormat outputFormat, - const Size &size); + int configure(PixelFormat inputFormat, const Size &inputSize, + StreamConfiguration *cfg); int exportBuffers(unsigned int count, std::vector> *buffers); diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 2565190082c8..b21ad82e1a05 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -554,7 +554,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) if (useConverter_) { int ret = converter_->configure(pipeConfig.pixelFormat, - cfg.pixelFormat, cfg.size); + cfg.size, &cfg); if (ret < 0) { LOG(SimplePipeline, Error) << "Unable to configure converter"; From patchwork Tue May 19 03:06:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3810 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8A34160E1A for ; Tue, 19 May 2020 05:06:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="c3cK/ahS"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 367B59CD for ; Tue, 19 May 2020 05:06:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589857597; bh=xHyu2tEdZXAUPTLMxMQkrBCRpYFBAKj9eSrjzxyrQI8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=c3cK/ahS5vWuo4hqZQYxk4mmxQRDIf7NcCp315Mh1DP8uAWUbdDAZYzA3ueN55rev /iOxcBy+8e7u5FNECqqkg5g3sHcInahZfutb/XeJvCMQTRALdJGAq3FVjOh39eG4Ts wE3chhvUXl+Nxo3nywRwq+KZiHU2Tzqh3nrSfKUI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 19 May 2020 06:06:24 +0300 Message-Id: <20200519030624.15985-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200519030624.15985-1-laurent.pinchart@ideasonboard.com> References: <20200519030624.15985-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: pipeline: simple: Add scaling support 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-List-Received-Date: Tue, 19 May 2020 03:06:37 -0000 Use the converter to implement scaling. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/simple/simple.cpp | 30 +++++++++++++++--------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index b21ad82e1a05..dbaacbeafefa 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -75,7 +75,8 @@ public: struct Configuration { uint32_t code; PixelFormat pixelFormat; - Size size; + Size captureSize; + SizeRange outputSizes; }; Stream stream_; @@ -301,13 +302,16 @@ int SimpleCameraData::init() Configuration config; config.code = code; config.pixelFormat = pixelFormat; - config.size = format.size; + config.captureSize = format.size; if (!converter) { + config.outputSizes = config.captureSize; formats_[pixelFormat] = config; continue; } + config.outputSizes = converter->sizes(format.size); + for (PixelFormat format : converter->formats(pixelFormat)) formats_[format] = config; } @@ -440,15 +444,16 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() } const SimpleCameraData::Configuration &pipeConfig = it->second; - if (cfg.size != pipeConfig.size) { + if (!pipeConfig.outputSizes.contains(cfg.size)) { LOG(SimplePipeline, Debug) << "Adjusting size from " << cfg.size.toString() - << " to " << pipeConfig.size.toString(); - cfg.size = pipeConfig.size; + << " to " << pipeConfig.captureSize.toString(); + cfg.size = pipeConfig.captureSize; status = Adjusted; } - needConversion_ = cfg.pixelFormat != pipeConfig.pixelFormat; + needConversion_ = cfg.pixelFormat != pipeConfig.pixelFormat + || cfg.size != pipeConfig.captureSize; cfg.bufferCount = 3; @@ -485,7 +490,7 @@ CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera std::inserter(formats, formats.end()), [](const auto &format) -> decltype(formats)::value_type { const PixelFormat &pixelFormat = format.first; - const Size &size = format.second.size; + const Size &size = format.second.captureSize; return { pixelFormat, { size } }; }); @@ -537,15 +542,18 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) V4L2DeviceFormat captureFormat = {}; captureFormat.fourcc = videoFormat; - captureFormat.size = cfg.size; + captureFormat.size = pipeConfig.captureSize; ret = video->setFormat(&captureFormat); if (ret) return ret; - if (captureFormat.fourcc != videoFormat || captureFormat.size != cfg.size) { + if (captureFormat.fourcc != videoFormat || + captureFormat.size != pipeConfig.captureSize) { LOG(SimplePipeline, Error) - << "Unable to configure capture in " << cfg.toString(); + << "Unable to configure capture in " + << pipeConfig.captureSize.toString() << "-" + << videoFormat.toString(); return -EINVAL; } @@ -554,7 +562,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) if (useConverter_) { int ret = converter_->configure(pipeConfig.pixelFormat, - cfg.size, &cfg); + pipeConfig.captureSize, &cfg); if (ret < 0) { LOG(SimplePipeline, Error) << "Unable to configure converter";