[libcamera-devel,1/2] qcam: viewfinder: Report the natively supported pixel formats

3297 diff mbox series

Expose the pixel formats natively supported by the viewfinder, to allow
selection of stream formats that would minimize usage of software
conversion.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/qcam/viewfinder.cpp | 22 ++++++++++++++--------
 src/qcam/viewfinder.h   |  3 +++
 2 files changed, 17 insertions(+), 8 deletions(-)

Hi Laurent,

On 24/03/2020 10:30, Laurent Pinchart wrote:
> Expose the pixel formats natively supported by the viewfinder, to allow
> selection of stream formats that would minimize usage of software
> conversion.
> 

Hopefully the name aliasing won't cause an issue. The table is private
to viewfinder.cpp, so I think it's fine.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/qcam/viewfinder.cpp | 22 ++++++++++++++--------
>  src/qcam/viewfinder.h   |  3 +++
>  2 files changed, 17 insertions(+), 8 deletions(-)
> 
> diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp
> index df5ee5ee7b83..0d68f62ee6d7 100644
> --- a/src/qcam/viewfinder.cpp
> +++ b/src/qcam/viewfinder.cpp
> @@ -19,16 +19,16 @@
>  
>  #include "format_converter.h"
>  
> -static const QMap<uint32_t, QImage::Format> nativeFormats
> +static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats

Indeed - making this a libcamera::PixelFormat makes sense.

>  {
>  #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
> -	{ DRM_FORMAT_ABGR8888, QImage::Format_RGBA8888 },
> +	{ libcamera::PixelFormat{ DRM_FORMAT_ABGR8888 }, QImage::Format_RGBA8888 },
>  #endif
> -	{ DRM_FORMAT_ARGB8888, QImage::Format_RGB32 },
> +	{ libcamera::PixelFormat{ DRM_FORMAT_ARGB8888 }, QImage::Format_RGB32 },
>  #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
> -	{ DRM_FORMAT_BGR888, QImage::Format_BGR888 },
> +	{ libcamera::PixelFormat{ DRM_FORMAT_BGR888 }, QImage::Format_BGR888 },
>  #endif
> -	{ DRM_FORMAT_RGB888, QImage::Format_RGB888 },
> +	{ libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_RGB888 },
>  };
>  
>  ViewFinder::ViewFinder(QWidget *parent)
> @@ -41,6 +41,12 @@ ViewFinder::~ViewFinder()
>  {
>  }
>  
> +const QList<libcamera::PixelFormat> &ViewFinder::nativeFormats() const
> +{
> +	static const QList<libcamera::PixelFormat> formats = ::nativeFormats.keys();
> +	return formats;
> +}
> +
>  int ViewFinder::setFormat(const libcamera::PixelFormat &format,
>  			  const QSize &size)
>  {
> @@ -50,7 +56,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format,
>  	 * If format conversion is needed, configure the converter and allocate
>  	 * the destination image.
>  	 */
> -	if (!nativeFormats.contains(format)) {
> +	if (!::nativeFormats.contains(format)) {
>  		int ret = converter_.configure(format, size);
>  		if (ret < 0)
>  			return ret;
> @@ -83,7 +89,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
>  	{
>  		QMutexLocker locker(&mutex_);
>  
> -		if (nativeFormats.contains(format_)) {
> +		if (::nativeFormats.contains(format_)) {
>  			/*
>  			 * If the frame format is identical to the display
>  			 * format, create a QImage that references the frame
> @@ -96,7 +102,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
>  			 */
>  			image_ = QImage(memory, size_.width(), size_.height(),
>  					size / size_.height(),
> -					nativeFormats[format_]);
> +					::nativeFormats[format_]);
>  			std::swap(buffer, buffer_);
>  		} else {
>  			/*
> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h
> index 1a27f99ea202..b3f1d25d9d60 100644
> --- a/src/qcam/viewfinder.h
> +++ b/src/qcam/viewfinder.h
> @@ -10,6 +10,7 @@
>  #include <stddef.h>
>  
>  #include <QIcon>
> +#include <QList>
>  #include <QImage>
>  #include <QMutex>
>  #include <QSize>
> @@ -35,6 +36,8 @@ public:
>  	ViewFinder(QWidget *parent);
>  	~ViewFinder();
>  
> +	const QList<libcamera::PixelFormat> &nativeFormats() const;
> +
>  	int setFormat(const libcamera::PixelFormat &format, const QSize &size);
>  	void render(libcamera::FrameBuffer *buffer, MappedBuffer *map);
>  	void stop();
>