{"id":14972,"url":"https://patchwork.libcamera.org/api/1.1/patches/14972/?format=json","web_url":"https://patchwork.libcamera.org/patch/14972/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20211201152306.3401143-1-kieran.bingham@ideasonboard.com>","date":"2021-12-01T15:23:06","name":"[libcamera-devel] libcamera: pipeline: simple: Support output size ranges","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4adc32766535b60f316fcdb6890d41ce4611b79b","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/1.1/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/14972/mbox/","series":[{"id":2796,"url":"https://patchwork.libcamera.org/api/1.1/series/2796/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2796","date":"2021-12-01T15:23:06","name":"[libcamera-devel] libcamera: pipeline: simple: Support output size ranges","version":1,"mbox":"https://patchwork.libcamera.org/series/2796/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14972/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14972/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 EA7AEBF415\n\tfor ;\n\tWed, 1 Dec 2021 15:23:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3164960746;\n\tWed, 1 Dec 2021 16:23:11 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C0886011A\n\tfor ;\n\tWed, 1 Dec 2021 16:23:10 +0100 (CET)","from Monstersaurus.local\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0FC71A15;\n\tWed, 1 Dec 2021 16:23:10 +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=\"qtFALp1I\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638372190;\n\tbh=L/V/k0PmnxOPR5qPqcaJNU3lzX6xXKMlFpuEWOp4YZA=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=qtFALp1INxUdSooe3+bfAHmrUP16KIz3OliMQxXCYzmm/VsnROwbtGEV3btxzxQVu\n\tZx2rtrKyA4yyMiHOkmz0z1BZ6hIl9KoUTZx2LgMWICI/kAlQmsB/5bKmiJB2VxoPQY\n\tjlvt/6I5QJrfQ8m6DxMWc4xIu4pj38b5erLyZAck=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 1 Dec 2021 15:23:06 +0000","Message-Id":"<20211201152306.3401143-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: pipeline: simple: Support\n\toutput size ranges","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":"Benjamin Schaaf ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Benjamin Schaaf \n\nUse the list of supported ranges from the video format to configure the\nstream and subdev instead of the capture size, allowing streams to be\nconfigured below the maximum resolution.\n\nBug: https://bugs.libcamera.org/show_bug.cgi?id=96\nSigned-off-by: Benjamin Schaaf \n---\nSent on behalf of Benjamin as posted at https://bugs.libcamera.org/attachment.cgi?id=33\n\n src/libcamera/pipeline/simple/simple.cpp | 34 ++++++++++++++++--------\n 1 file changed, 23 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 701fb4be0b71..a597e27f6139 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -213,7 +213,7 @@ public:\n \t\tPixelFormat captureFormat;\n \t\tSize captureSize;\n \t\tstd::vector outputFormats;\n-\t\tSizeRange outputSizes;\n+\t\tstd::vector outputSizes;\n \t};\n \n \tstd::vector streams_;\n@@ -492,10 +492,10 @@ int SimpleCameraData::init()\n \n \t\t\tif (!converter_) {\n \t\t\t\tconfig.outputFormats = { pixelFormat };\n-\t\t\t\tconfig.outputSizes = config.captureSize;\n+\t\t\t\tconfig.outputSizes = videoFormat.second;\n \t\t\t} else {\n \t\t\t\tconfig.outputFormats = converter_->formats(pixelFormat);\n-\t\t\t\tconfig.outputSizes = converter_->sizes(format.size);\n+\t\t\t\tconfig.outputSizes = { converter_->sizes(format.size) };\n \t\t\t}\n \n \t\t\tconfigs_.push_back(config);\n@@ -804,17 +804,23 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\t\tstatus = Adjusted;\n \t\t}\n \n-\t\tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n+\t\tauto sizeIt = std::find_if(pipeConfig_->outputSizes.begin(),\n+\t\t\t\t\t pipeConfig_->outputSizes.end(),\n+\t\t\t\t\t [&](SizeRange r) { return r.contains(cfg.size); });\n+\t\tif (sizeIt == pipeConfig_->outputSizes.end()) {\n \t\t\tLOG(SimplePipeline, Debug)\n \t\t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n \t\t\t\t<< \" to \" << pipeConfig_->captureSize.toString();\n-\t\t\tcfg.size = pipeConfig_->captureSize;\n+\n+\t\t\tcfg.size = pipeConfig_->outputSizes[0].max;\n \t\t\tstatus = Adjusted;\n+\n+\t\t\t/* \\todo Create a libcamera core class to group format and size */\n+\t\t\tif (cfg.size != pipeConfig_->captureSize)\n+\t\t\t\tneedConversion_ = true;\n \t\t}\n \n-\t\t/* \\todo Create a libcamera core class to group format and size */\n-\t\tif (cfg.pixelFormat != pipeConfig_->captureFormat ||\n-\t\t cfg.size != pipeConfig_->captureSize)\n+\t\tif (cfg.pixelFormat != pipeConfig_->captureFormat)\n \t\t\tneedConversion_ = true;\n \n \t\t/* Set the stride, frameSize and bufferCount. */\n@@ -907,8 +913,14 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tif (ret < 0)\n \t\treturn ret;\n \n+\tSize size;\n+\tfor (unsigned int i = 0; i < config->size(); ++i) {\n+\t\tStreamConfiguration &cfg = config->at(i);\n+\t\tsize.expandTo(cfg.size);\n+\t}\n+\n \tconst SimpleCameraData::Configuration *pipeConfig = config->pipeConfig();\n-\tV4L2SubdeviceFormat format{ pipeConfig->code, data->sensor_->resolution() };\n+\tV4L2SubdeviceFormat format{ pipeConfig->code, size };\n \n \tret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat);\n \tif (ret < 0)\n@@ -919,7 +931,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \n \tV4L2DeviceFormat captureFormat;\n \tcaptureFormat.fourcc = videoFormat;\n-\tcaptureFormat.size = pipeConfig->captureSize;\n+\tcaptureFormat.size = size;\n \n \tret = video->setFormat(&captureFormat);\n \tif (ret)\n@@ -932,7 +944,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t}\n \n \tif (captureFormat.fourcc != videoFormat ||\n-\t captureFormat.size != pipeConfig->captureSize) {\n+\t captureFormat.size != size) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Unable to configure capture in \"\n \t\t\t<< pipeConfig->captureSize.toString() << \"-\"\n","prefixes":["libcamera-devel"]}