From patchwork Sat Jul 4 13:31:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 8640 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0A3EFBD792 for ; Sat, 4 Jul 2020 13:32:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CBB8060E44; Sat, 4 Jul 2020 15:32:33 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CnaNS3qI"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6625160E0D for ; Sat, 4 Jul 2020 15:32:32 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 02DB0296; Sat, 4 Jul 2020 15:32:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1593869552; bh=O251RtXPiK8YNtulh6euCuorom4mK8Tx7XSFg0e3I0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CnaNS3qItGpRFD9mThUYO4oHKr5L+/JeycfIVkZE2fHw/R9VGD9sy8loyCtiz/qJG DPE5ZG7eBMJ8TS44MrFBI4F2PSTHjYGIeYbRydRybyq2JJLV/5/A3j4PJdkTsxC2v2 rC9SKvRoZr/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 and frameSize at config validation 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Fill the stride and frameSize fields of the StreamConfiguration at configuration validation time instead of at camera configuration time. Signed-off-by: Paul Elder --- New in v3 --- src/libcamera/pipeline/simple/converter.cpp | 14 +++++++++++ src/libcamera/pipeline/simple/converter.h | 5 ++++ src/libcamera/pipeline/simple/simple.cpp | 28 +++++++++++++++++++-- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index e5e2f0f..a015e8e 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -261,4 +261,18 @@ void SimpleConverter::outputBufferReady(FrameBuffer *buffer) } } +unsigned int SimpleConverter::stride(const Size &size, + const PixelFormat &pixelFormat) const +{ + const PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat); + return info.stride(size.width, 0); +} + +unsigned int SimpleConverter::frameSize(const Size &size, + const PixelFormat &pixelFormat) const +{ + const PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat); + return info.frameSize(size); +} + } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index ef18cf7..0696b8f 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -46,6 +46,11 @@ public: int queueBuffers(FrameBuffer *input, FrameBuffer *output); + unsigned int stride(const Size &size, + const PixelFormat &pixelFormat) const; + unsigned int frameSize(const Size &size, + const PixelFormat &pixelFormat) const; + Signal bufferReady; private: diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 1ec8d0f..39a29a7 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -457,6 +457,32 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() cfg.bufferCount = 3; + SimplePipelineHandler *pipe = static_cast(data_->pipe_); + SimpleConverter *converter = pipe->converter(); + + /* Set the stride and frameSize. */ + if (!converter) { + V4L2DeviceFormat format = {}; + format.fourcc = data_->video_->toV4L2PixelFormat(cfg.pixelFormat); + format.size = cfg.size; + + int ret = data_->video_->tryFormat(&format); + if (ret < 0) { + const PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat); + cfg.stride = info.stride(cfg.size.width, 0); + cfg.frameSize = info.frameSize(cfg.size); + return status; + } + + cfg.stride = format.planes[0].bpl; + cfg.frameSize = format.planes[0].size; + + return status; + } + + cfg.stride = converter->stride(cfg.size, cfg.pixelFormat); + cfg.frameSize = converter->frameSize(cfg.size, cfg.pixelFormat); + return status; } @@ -557,8 +583,6 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) return -EINVAL; } - cfg.stride = captureFormat.planes[0].bpl; - /* Configure the converter if required. */ useConverter_ = config->needConversion();