{"id":11083,"url":"https://patchwork.libcamera.org/api/patches/11083/?format=json","web_url":"https://patchwork.libcamera.org/patch/11083/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210131224702.8838-5-laurent.pinchart@ideasonboard.com>","date":"2021-01-31T22:46:46","name":"[libcamera-devel,04/20] libcamera: pipeline: simple: converter: Use StreamConfiguration for input configuration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5d6c0446fd03483057f8d16c94a28a709c4aa49e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/11083/mbox/","series":[{"id":1633,"url":"https://patchwork.libcamera.org/api/series/1633/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1633","date":"2021-01-31T22:46:42","name":"[libcamera-devel,01/20] libcamera: pipeline: simple: Manage converter with std::unique_ptr<>","version":1,"mbox":"https://patchwork.libcamera.org/series/1633/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11083/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11083/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1B40DBD808\n\tfor ;\n\tSun, 31 Jan 2021 22:47:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B89E2683E0;\n\tSun, 31 Jan 2021 23:47:35 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 296D0683E6\n\tfor ;\n\tSun, 31 Jan 2021 23:47:29 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A7ACB8EC;\n\tSun, 31 Jan 2021 23:47:28 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"D9it4Glh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612133248;\n\tbh=XcnYxUCHJg5ctwjJ37SV0l3szVn/PcayYP781pv6gBc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=D9it4GlhrODCWtTf6BRD05gWR2zJI0QM8t1i9W1TImcEgSGIN3V7KvUE7hdAVcPKO\n\t8ebyUwKf0kOSb4DFEaNTp23xZ+Xhi2mBKUbKWqW9amBta7/YyFFtG+1hXjrxEc//VQ\n\tk9Vm9FvzhLgkyVE8vu6I7yojzW8Y6MXK29zoMyiA=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 1 Feb 2021 00:46:46 +0200","Message-Id":"<20210131224702.8838-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 04/20] libcamera: pipeline: simple:\n\tconverter: Use StreamConfiguration for input configuration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Phi-Bang Nguyen ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Group the configuration parameters for the converter input in a\nStreamConfiguration instance. This makes the configure() function\nsignature cleaner, and will allow passing additional parameters (such as\nstride and buffer count).\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/pipeline/simple/converter.cpp | 12 +++++++-----\n src/libcamera/pipeline/simple/converter.h | 2 +-\n src/libcamera/pipeline/simple/simple.cpp | 7 +++++--\n 3 files changed, 13 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 8f54caaca983..6f4e41db2e00 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -148,15 +148,17 @@ SimpleConverter::strideAndFrameSize(const PixelFormat &pixelFormat,\n \treturn std::make_tuple(format.planes[0].bpl, format.planes[0].size);\n }\n \n-int SimpleConverter::configure(PixelFormat inputFormat, const Size &inputSize,\n+int SimpleConverter::configure(const StreamConfiguration &inputCfg,\n \t\t\t const StreamConfiguration &outputCfg)\n {\n-\tV4L2DeviceFormat format;\n \tint ret;\n \n-\tV4L2PixelFormat videoFormat = m2m_->output()->toV4L2PixelFormat(inputFormat);\n+\tV4L2PixelFormat videoFormat =\n+\t\tm2m_->output()->toV4L2PixelFormat(inputCfg.pixelFormat);\n+\n+\tV4L2DeviceFormat format;\n \tformat.fourcc = videoFormat;\n-\tformat.size = inputSize;\n+\tformat.size = inputCfg.size;\n \n \tret = m2m_->output()->setFormat(&format);\n \tif (ret < 0) {\n@@ -165,7 +167,7 @@ int SimpleConverter::configure(PixelFormat inputFormat, const Size &inputSize,\n \t\treturn ret;\n \t}\n \n-\tif (format.fourcc != videoFormat || format.size != inputSize) {\n+\tif (format.fourcc != videoFormat || format.size != inputCfg.size) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Input format not supported\";\n \t\treturn -EINVAL;\ndiff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\nindex 07a632abd8f6..47a056e582d6 100644\n--- a/src/libcamera/pipeline/simple/converter.h\n+++ b/src/libcamera/pipeline/simple/converter.h\n@@ -38,7 +38,7 @@ public:\n \tstd::tuple\n \tstrideAndFrameSize(const PixelFormat &pixelFormat, const Size &size);\n \n-\tint configure(PixelFormat inputFormat, const Size &inputSize,\n+\tint configure(const StreamConfiguration &inputCfg,\n \t\t const StreamConfiguration &outputCfg);\n \tint exportBuffers(unsigned int count,\n \t\t\t std::vector> *buffers);\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 4e3127814b89..0a53fa934261 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -603,8 +603,11 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tuseConverter_ = config->needConversion();\n \n \tif (useConverter_) {\n-\t\tret = converter_->configure(pipeConfig.pixelFormat,\n-\t\t\t\t\t pipeConfig.captureSize, cfg);\n+\t\tStreamConfiguration inputCfg;\n+\t\tinputCfg.pixelFormat = pipeConfig.pixelFormat;\n+\t\tinputCfg.size = pipeConfig.captureSize;\n+\n+\t\tret = converter_->configure(inputCfg, cfg);\n \t\tif (ret < 0) {\n \t\t\tLOG(SimplePipeline, Error)\n \t\t\t\t<< \"Unable to configure converter\";\n","prefixes":["libcamera-devel","04/20"]}