From patchwork Mon Jan 21 23:06:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 319 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9814860C9D for ; Tue, 22 Jan 2019 00:07:16 +0100 (CET) X-Halon-ID: 4a0eb00f-1dd1-11e9-874f-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 4a0eb00f-1dd1-11e9-874f-005056917f90; Tue, 22 Jan 2019 00:07:14 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Tue, 22 Jan 2019 00:06:39 +0100 Message-Id: <20190121230640.8783-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121230640.8783-1-niklas.soderlund@ragnatech.se> References: <20190121230640.8783-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC 3/4] libcamera: streamformat: add basic class for stream formats X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 23:07:17 -0000 Each stream in a camera object have its own format specification. The StreamFormat class holds all this information and should be filled in by the application to configure a camera. Signed-off-by: Niklas Söderlund --- include/libcamera/libcamera.h | 1 + include/libcamera/meson.build | 1 + include/libcamera/stream_format.h | 32 ++++++++++++ src/libcamera/meson.build | 1 + src/libcamera/stream_format.cpp | 82 +++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+) create mode 100644 include/libcamera/stream_format.h create mode 100644 src/libcamera/stream_format.cpp diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h index 272dfd5e4a67d5de..7aefdcee51eca69c 100644 --- a/include/libcamera/libcamera.h +++ b/include/libcamera/libcamera.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #endif /* __LIBCAMERA_LIBCAMERA_H__ */ diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 54a680787e5c17aa..ca4e43fe70e42277 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -6,6 +6,7 @@ libcamera_api = files([ 'libcamera.h', 'signal.h', 'stream.h', + 'stream_format.h', 'timer.h', ]) diff --git a/include/libcamera/stream_format.h b/include/libcamera/stream_format.h new file mode 100644 index 0000000000000000..34d93c1c56284e6a --- /dev/null +++ b/include/libcamera/stream_format.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * stream_format.h - Stream format interface + */ +#ifndef __LIBCAMERA_STREAM_FORMAT_H__ +#define __LIBCAMERA_STREAM_FORMAT_H__ + +namespace libcamera { + +class StreamFormat final +{ +public: + StreamFormat(); + + unsigned int width() const { return width_; }; + unsigned int height() const { return height_; }; + unsigned int pixelformat() const { return pixelformat_; }; + + void setDimension(unsigned int width, unsigned int height); + void setPixelFormat(unsigned int pixelformat); + +private: + unsigned int width_; + unsigned int height_; + unsigned int pixelformat_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_STREAM_FORMAT_H__ */ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 9f6ff99eebe2f5bc..819b92a511c3ee09 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -11,6 +11,7 @@ libcamera_sources = files([ 'pipeline_handler.cpp', 'signal.cpp', 'stream.cpp', + 'stream_format.cpp', 'timer.cpp', 'v4l2_device.cpp', ]) diff --git a/src/libcamera/stream_format.cpp b/src/libcamera/stream_format.cpp new file mode 100644 index 0000000000000000..9171980907b7a840 --- /dev/null +++ b/src/libcamera/stream_format.cpp @@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * stream_format.cpp - Stream image format settings + */ + +#include + +/** + * \file stream_format.h + * \brief Stream format specification + * + * A camera device can provide frames in different resolutions and formats + * concurrently from a single image source. The StreamFormat class represents + * one of the multiple concurrent streams format. + * + * All streams exposed by a camera device share the same image source and are + * thus not fully independent. Parameters related to the image source, such as + * the exposure time or flash control, are common to all streams. Other + * parameters, such as format or resolution, may be specified per-stream, + * depending on the capabilities of the camera device. + */ + +namespace libcamera { + +/** + * \class StreamFormat + * \brief Stream format settings + * + * The StreamFormat class models all parameters which an application can set + * for a individual stream which is part of a camera device. + */ + +/** + * \brief Create a stream format information carrier + */ +StreamFormat::StreamFormat() + : width_(0), height_(0), pixelformat_(0) +{ +} + +/** + * \fn StreamFormat::width() + * \brief Retrieve the Stream width + * \return The stream width + */ + +/** + * \fn StreamFormat::height() + * \brief Retrieve the Stream height + * \return The stream height + */ + +/** + * \fn StreamFormat::pixelformat() + * \brief Retrieve the Stream pixelformat + * \return The stream pixelformat + */ + +/** + * \brief Set the width and height of the stream format + * \param[in] width The desired width of the stream + * \param[in] height The desired height of the stream + */ +void StreamFormat::setDimension(unsigned int width, unsigned int height) +{ + width_ = width; + height_ = height; +} + +/** + * \brief Set the pixelformat of the stream format + * \param[in] pixelformat The desired pixelformat of the stream + */ +void StreamFormat::setPixelFormat(unsigned int pixelformat) +{ + pixelformat_ = pixelformat; +} + + +} /* namespace libcamera */