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

qcam: viewfinder: Add support for more native formats

Browse source 
Qt supports more 24-bit and 32-bit RGB formats for native painting. If
the frame buffer pixel format matches any of them, disable the converter
and create a QImage in the appropriate format.

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 03:50:53 +02:00
parent cb6395599e
commit f890a57b7a
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/qcam/viewfinder.cpp
View file

@ -7,16 +7,30 @@
#include "viewfinder.h" #include "viewfinder.h"
#include <stdint.h>
#include <utility> #include <utility>
#include <QImage> #include <QImage>
#include <QImageWriter> #include <QImageWriter>
#include <QMap>
#include <QMutexLocker> #include <QMutexLocker>
#include <QPainter> #include <QPainter>
#include <QtDebug> #include <QtDebug>
#include "format_converter.h" #include "format_converter.h"
static const QMap<uint32_t, QImage::Format> nativeFormats
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
{ DRM_FORMAT_ABGR8888, QImage::Format_RGBA8888 },
#endif
{ DRM_FORMAT_ARGB8888, QImage::Format_RGB32 },
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
{ DRM_FORMAT_BGR888, QImage::Format_BGR888 },
#endif
{ DRM_FORMAT_RGB888, QImage::Format_RGB888 },
};
ViewFinder::ViewFinder(QWidget *parent) ViewFinder::ViewFinder(QWidget *parent)
: QWidget(parent), buffer_(nullptr) : QWidget(parent), buffer_(nullptr)
{ {
@ -36,7 +50,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 (format != DRM_FORMAT_ARGB8888) { 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;
@ -64,7 +78,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
{ {
QMutexLocker locker(&mutex_); QMutexLocker locker(&mutex_);
if (format_ == DRM_FORMAT_ARGB8888) { 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
@ -76,7 +90,8 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
* computing it naively * computing it naively
*/ */
image_ = QImage(memory, size_.width(), size_.height(), image_ = QImage(memory, size_.width(), size_.height(),
size / size_.height(), QImage::Format_RGB32); size / size_.height(),
nativeFormats[format_]);
std::swap(buffer, buffer_); std::swap(buffer, buffer_);
} else { } else {
/* /*