{"id":8640,"url":"https://patchwork.libcamera.org/api/1.1/patches/8640/?format=json","web_url":"https://patchwork.libcamera.org/patch/8640/","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":"<20200704133140.1738660-20-paul.elder@ideasonboard.com>","date":"2020-07-04T13:31:37","name":"[libcamera-devel,v3,19/22] libcamera: simple: Fill stride and frameSize at config validation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cc94b22480146fa637980435c3ce1100bd55fd6a","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8640/mbox/","series":[{"id":1083,"url":"https://patchwork.libcamera.org/api/1.1/series/1083/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1083","date":"2020-07-04T13:31:18","name":"Clean up formats in v4l2-compat and pipeline handlers","version":3,"mbox":"https://patchwork.libcamera.org/series/1083/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8640/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8640/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 0A3EFBD792\n\tfor ;\n\tSat, 4 Jul 2020 13:32:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CBB8060E44;\n\tSat, 4 Jul 2020 15:32:33 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6625160E0D\n\tfor ;\n\tSat, 4 Jul 2020 15:32:32 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 02DB0296;\n\tSat, 4 Jul 2020 15:32:30 +0200 (CEST)"],"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=\"CnaNS3qI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593869552;\n\tbh=O251RtXPiK8YNtulh6euCuorom4mK8Tx7XSFg0e3I0w=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=CnaNS3qItGpRFD9mThUYO4oHKr5L+/JeycfIVkZE2fHw/R9VGD9sy8loyCtiz/qJG\n\tDPE5ZG7eBMJ8TS44MrFBI4F2PSTHjYGIeYbRydRybyq2JJLV/5/A3j4PJdkTsxC2v2\n\trC9SKvRoZr/18nJj9kdI58O3eJh9XNEVGEwvY+xc=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Jul 2020 22:31:37 +0900","Message-Id":"<20200704133140.1738660-20-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 19/22] libcamera: simple: Fill stride\n\tand frameSize at config validation","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Fill the stride and frameSize fields of the StreamConfiguration at\nconfiguration validation time instead of at camera configuration time.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v3\n---\n src/libcamera/pipeline/simple/converter.cpp | 14 +++++++++++\n src/libcamera/pipeline/simple/converter.h | 5 ++++\n src/libcamera/pipeline/simple/simple.cpp | 28 +++++++++++++++++++--\n 3 files changed, 45 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex e5e2f0f..a015e8e 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -261,4 +261,18 @@ void SimpleConverter::outputBufferReady(FrameBuffer *buffer)\n \t}\n }\n \n+unsigned int SimpleConverter::stride(const Size &size,\n+\t\t\t\t const PixelFormat &pixelFormat) const\n+{\n+\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n+\treturn info.stride(size.width, 0);\n+}\n+\n+unsigned int SimpleConverter::frameSize(const Size &size,\n+\t\t\t\t\tconst PixelFormat &pixelFormat) const\n+{\n+\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n+\treturn info.frameSize(size);\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\nindex ef18cf7..0696b8f 100644\n--- a/src/libcamera/pipeline/simple/converter.h\n+++ b/src/libcamera/pipeline/simple/converter.h\n@@ -46,6 +46,11 @@ public:\n \n \tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n \n+\tunsigned int stride(const Size &size,\n+\t\t\t const PixelFormat &pixelFormat) const;\n+\tunsigned int frameSize(const Size &size,\n+\t\t\t const PixelFormat &pixelFormat) const;\n+\n \tSignal bufferReady;\n \n private:\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 1ec8d0f..39a29a7 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -457,6 +457,32 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \n \tcfg.bufferCount = 3;\n \n+\tSimplePipelineHandler *pipe = static_cast(data_->pipe_);\n+\tSimpleConverter *converter = pipe->converter();\n+\n+\t/* Set the stride and frameSize. */\n+\tif (!converter) {\n+\t\tV4L2DeviceFormat format = {};\n+\t\tformat.fourcc = data_->video_->toV4L2PixelFormat(cfg.pixelFormat);\n+\t\tformat.size = cfg.size;\n+\n+\t\tint ret = data_->video_->tryFormat(&format);\n+\t\tif (ret < 0) {\n+\t\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\t\tcfg.stride = info.stride(cfg.size.width, 0);\n+\t\t\tcfg.frameSize = info.frameSize(cfg.size);\n+\t\t\treturn status;\n+\t\t}\n+\n+\t\tcfg.stride = format.planes[0].bpl;\n+\t\tcfg.frameSize = format.planes[0].size;\n+\n+\t\treturn status;\n+\t}\n+\n+\tcfg.stride = converter->stride(cfg.size, cfg.pixelFormat);\n+\tcfg.frameSize = converter->frameSize(cfg.size, cfg.pixelFormat);\n+\n \treturn status;\n }\n \n@@ -557,8 +583,6 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn -EINVAL;\n \t}\n \n-\tcfg.stride = captureFormat.planes[0].bpl;\n-\n \t/* Configure the converter if required. */\n \tuseConverter_ = config->needConversion();\n \n","prefixes":["libcamera-devel","v3","19/22"]}