From patchwork Tue May 19 16:55:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3822 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C264C603DA for ; Tue, 19 May 2020 18:55:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="DdCi33me"; 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 280C230C for ; Tue, 19 May 2020 18:55:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589907357; bh=YKKB8tqYb6shN8PKwNsZe7H9E3mCT+v/KmyajrpYwuk=; h=From:To:Subject:Date:From; b=DdCi33meQnJRHDjgIt70UwWrFUK4aLrk1pOGoR3+QJ4skOU1uLYayL/kcc84C6EMy DkMfaV1M05Jn/ZoMNHvhpWQHM9EY/qjjqL/IEXs74TuqDc+rW7x/DYP288c9fxtO3G 5MOs1nYD396BJ35oaR7XlthAi2jjaXFULUPNfreE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 19 May 2020 19:55:41 +0300 Message-Id: <20200519165543.30465-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/3] libcamera: pipeline: simple: Add stride 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 16:55:58 -0000 Report the stride when configuring the camera. The stride is retrieved from the capture device first, and overridden by the converter if used. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/simple/converter.cpp | 13 ++++++++----- src/libcamera/pipeline/simple/converter.h | 4 ++-- src/libcamera/pipeline/simple/simple.cpp | 5 +++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 02443e7f78ed..7a9d67b37624 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" @@ -93,14 +94,14 @@ std::vector SimpleConverter::formats(PixelFormat input) } int SimpleConverter::configure(PixelFormat inputFormat, - PixelFormat outputFormat, const Size &size) + StreamConfiguration *cfg) { V4L2DeviceFormat format; int ret; V4L2PixelFormat videoFormat = m2m_->output()->toV4L2PixelFormat(inputFormat); format.fourcc = videoFormat; - format.size = size; + format.size = cfg->size; ret = m2m_->output()->setFormat(&format); if (ret < 0) { @@ -109,7 +110,7 @@ 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) << "Input format not supported"; return -EINVAL; @@ -119,7 +120,7 @@ int SimpleConverter::configure(PixelFormat inputFormat, * 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); + videoFormat = m2m_->capture()->toV4L2PixelFormat(cfg->pixelFormat); format.fourcc = videoFormat; ret = m2m_->capture()->setFormat(&format); @@ -129,12 +130,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..0beb96a55d5b 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -20,6 +20,7 @@ namespace libcamera { class FrameBuffer; class MediaDevice; struct Size; +struct StreamConfiguration; class V4L2M2MDevice; class SimpleConverter @@ -33,8 +34,7 @@ public: std::vector formats(PixelFormat input); - int configure(PixelFormat inputFormat, PixelFormat outputFormat, - const Size &size); + int configure(PixelFormat inputFormat, 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..68595bc29726 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -549,12 +549,13 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) return -EINVAL; } + cfg.stride = captureFormat.planes[0].bpl; + /* Configure the converter if required. */ useConverter_ = config->needConversion(); if (useConverter_) { - int ret = converter_->configure(pipeConfig.pixelFormat, - cfg.pixelFormat, cfg.size); + int ret = converter_->configure(pipeConfig.pixelFormat, &cfg); if (ret < 0) { LOG(SimplePipeline, Error) << "Unable to configure converter"; From patchwork Tue May 19 16:55:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3823 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E0116041F for ; Tue, 19 May 2020 18:55:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AGDR3UBs"; 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 AA3169CD for ; Tue, 19 May 2020 18:55:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589907357; bh=3G3Zug1duQL5eIFrXq9GAoEZXAUxMluKzehA9fmN8/E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AGDR3UBsBgKijUU/ygshEv5G7uztKvGEAEmI/Ld5OEbMLA4gw5ioveJg3kCGljWEs 56pojQ799MdUp8RONLGsvfFWAj0J9qtFteT1vHJW+T7xL1YDI68EMhWBZDtIsm+QtM PYRB01vz+spXQt34jKxIm1nb1db4wcyEuajrYsZE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 19 May 2020 19:55:42 +0300 Message-Id: <20200519165543.30465-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200519165543.30465-1-laurent.pinchart@ideasonboard.com> References: <20200519165543.30465-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/3] 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 16:55:58 -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 | 58 ++++++++++++++++++--- src/libcamera/pipeline/simple/converter.h | 5 +- src/libcamera/pipeline/simple/simple.cpp | 3 +- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 7a9d67b37624..e5e2f0fddb62 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -8,6 +8,7 @@ #include "converter.h" #include +#include #include #include @@ -93,7 +94,52 @@ std::vector SimpleConverter::formats(PixelFormat input) return pixelFormats; } -int SimpleConverter::configure(PixelFormat inputFormat, +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; @@ -101,7 +147,7 @@ int SimpleConverter::configure(PixelFormat inputFormat, V4L2PixelFormat videoFormat = m2m_->output()->toV4L2PixelFormat(inputFormat); format.fourcc = videoFormat; - format.size = cfg->size; + format.size = inputSize; ret = m2m_->output()->setFormat(&format); if (ret < 0) { @@ -110,18 +156,16 @@ int SimpleConverter::configure(PixelFormat inputFormat, return ret; } - if (format.fourcc != videoFormat || format.size != cfg->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. - */ + /* 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) { diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index 0beb96a55d5b..1f770eb844b5 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -20,6 +20,7 @@ namespace libcamera { class FrameBuffer; class MediaDevice; struct Size; +class SizeRange; struct StreamConfiguration; class V4L2M2MDevice; @@ -33,8 +34,10 @@ public: void close(); std::vector formats(PixelFormat input); + SizeRange sizes(const Size &input); - int configure(PixelFormat inputFormat, StreamConfiguration *cfg); + 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 68595bc29726..686639c3b0c9 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -555,7 +555,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) useConverter_ = config->needConversion(); if (useConverter_) { - int ret = converter_->configure(pipeConfig.pixelFormat, &cfg); + int ret = converter_->configure(pipeConfig.pixelFormat, + cfg.size, &cfg); if (ret < 0) { LOG(SimplePipeline, Error) << "Unable to configure converter"; From patchwork Tue May 19 16:55:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3824 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DB4F760E4B for ; Tue, 19 May 2020 18:55:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ZcLFLdQX"; 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 02B5130C for ; Tue, 19 May 2020 18:55:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589907358; bh=SWWL5T+v5y1I0P3QzUD3x/xXqK6U1ANjDWntoaMHjSA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZcLFLdQXbKAMkbUNnNF+HJlg8664ZVaqPnix9DrIgt0e1LRIjjVYgRLasjjkGNNwg n+9HfGCOAiDaHxr4jUxstvZfl4u1tLmqH0c5wlP4suNYGHVX1lway1EZMbM2014hp3 RiugPHj1PW6XFUmz/KyxzWLaevsbChJMRByeU8GQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 19 May 2020 19:55:43 +0300 Message-Id: <20200519165543.30465-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200519165543.30465-1-laurent.pinchart@ideasonboard.com> References: <20200519165543.30465-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/3] 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 16:55:59 -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 686639c3b0c9..1ec8d0f7de03 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; } @@ -556,7 +564,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";