NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

qcam: viewfinder: Report the natively supported pixel formats

Browse source 
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>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-03-23 04:50:14 +02:00
parent 798b7ac969
commit 8bd4f20193
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/qcam/viewfinder.cpp
View file

@ -19,16 +19,16 @@
#include "format_converter.h" #include "format_converter.h"
static const QMap<uint32_t, QImage::Format> nativeFormats static const QMap<libcamera::PixelFormat, QImage::Format> nativeFormats
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
{ DRM_FORMAT_ABGR8888, QImage::Format_RGBA8888 }, { libcamera::PixelFormat{ DRM_FORMAT_ABGR8888 }, QImage::Format_RGBA8888 },
#endif #endif
{ DRM_FORMAT_ARGB8888, QImage::Format_RGB32 }, { libcamera::PixelFormat{ DRM_FORMAT_ARGB8888 }, QImage::Format_RGB32 },
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
{ DRM_FORMAT_BGR888, QImage::Format_BGR888 }, { libcamera::PixelFormat{ DRM_FORMAT_BGR888 }, QImage::Format_BGR888 },
#endif #endif
{ DRM_FORMAT_RGB888, QImage::Format_RGB888 }, { libcamera::PixelFormat{ DRM_FORMAT_RGB888 }, QImage::Format_RGB888 },
}; };
ViewFinder::ViewFinder(QWidget *parent) 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, int ViewFinder::setFormat(const libcamera::PixelFormat &format,
const QSize &size) const QSize &size)
{ {
@ -50,7 +56,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format,
* If format conversion is needed, configure the converter and allocate * If format conversion is needed, configure the converter and allocate
* the destination image. * the destination image.
*/ */
if (!nativeFormats.contains(format)) { if (!::nativeFormats.contains(format)) {
int ret = converter_.configure(format, size); int ret = converter_.configure(format, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -83,7 +89,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
{ {
QMutexLocker locker(&mutex_); QMutexLocker locker(&mutex_);
if (nativeFormats.contains(format_)) { if (::nativeFormats.contains(format_)) {
/* /*
* If the frame format is identical to the display * If the frame format is identical to the display
* format, create a QImage that references the frame * 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(), image_ = QImage(memory, size_.width(), size_.height(),
size / size_.height(), size / size_.height(),
nativeFormats[format_]); ::nativeFormats[format_]);
std::swap(buffer, buffer_); std::swap(buffer, buffer_);
} else { } else {
/* /*

3
src/qcam/viewfinder.h
View file

@ -10,6 +10,7 @@
#include <stddef.h> #include <stddef.h>
#include <QIcon> #include <QIcon>
#include <QList>
#include <QImage> #include <QImage>
#include <QMutex> #include <QMutex>
#include <QSize> #include <QSize>
@ -35,6 +36,8 @@ public:
ViewFinder(QWidget *parent); ViewFinder(QWidget *parent);
~ViewFinder(); ~ViewFinder();
const QList<libcamera::PixelFormat> &nativeFormats() const;
int setFormat(const libcamera::PixelFormat &format, const QSize &size); int setFormat(const libcamera::PixelFormat &format, const QSize &size);
void render(libcamera::FrameBuffer *buffer, MappedBuffer *map); void render(libcamera::FrameBuffer *buffer, MappedBuffer *map);
void stop(); void stop();