From patchwork Mon Jun 29 15:14:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 8503 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 87046BFFE2 for ; Mon, 29 Jun 2020 15:14:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 431F060AF9; Mon, 29 Jun 2020 17:14:31 +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="wUr0DQP4"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A93A609C8 for ; Mon, 29 Jun 2020 17:14:30 +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 BA45D299; Mon, 29 Jun 2020 17:14:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1593443669; bh=uDGAMhzcGy4/p/LxfmWvTyzPftJuB8tIFbXFSA0nhjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wUr0DQP4oW5a2XRK8m53YhZ/Sp2tdx4Agqdlj7FnuWdrbyxVglu85jrwKubgk8CSO Uo/UYr7ybP293o1Z3BZsSwXJFi6Zn4qcBnpwalmq3Eg2UkTo3itnMUu7r22X8gKbi0 IExVXQkZLocsWo/AC+vB/oBRohSmGhpw6A9df4wU= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 30 Jun 2020 00:14:09 +0900 Message-Id: <20200629151411.216477-5-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200629151411.216477-1-paul.elder@ideasonboard.com> References: <20200629151411.216477-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/6] libcamera: PixelFormatInfo: Add methods bytesPerLine and imageSize 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" Add instance methods to PixelFormatInfo for calculating bytes-per-line and image size. This will simplify existing code that calculates these things. Signed-off-by: Paul Elder --- include/libcamera/internal/formats.h | 3 +++ src/libcamera/formats.cpp | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h index 3c7440a..1372a43 100644 --- a/include/libcamera/internal/formats.h +++ b/include/libcamera/internal/formats.h @@ -46,6 +46,9 @@ public: static const PixelFormatInfo &info(const PixelFormat &format); static const PixelFormatInfo &info(const V4L2PixelFormat &format); + unsigned int bytesPerLine(unsigned int width); + unsigned int imageSize(unsigned int width, unsigned int height); + const char *name; PixelFormat format; V4L2PixelFormat v4l2Format; diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 7029a94..dc1d348 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -7,12 +7,16 @@ #include "libcamera/internal/formats.h" +#include #include #include #include "libcamera/internal/log.h" + +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + /** * \file internal/formats.h * \brief Types and helper methods to handle libcamera image formats @@ -670,4 +674,21 @@ const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format) return info->second; } +unsigned int PixelFormatInfo::bytesPerLine(unsigned int width) +{ + if (!isValid()) + return 0; + + return DIV_ROUND_UP(width, pixelsPerGroup) * bytesPerGroup; + +} + +unsigned int PixelFormatInfo::imageSize(unsigned int width, unsigned int height) +{ + if (!isValid()) + return 0; + + return height * bytesPerLine(width); +} + } /* namespace libcamera */