libcamera/pinchartl/libcamera.git - Laurent Pinchart's clone of libcamera

diff options

Diffstat

-rw-r--r--

src/qcam/main_window.cpp

-rw-r--r--

src/qcam/viewfinder.h

index 260074ae..a57446e8 100644
--- a/src/qcam/viewfinder.h
+++ b/src/qcam/viewfinder.h

@@ -11,6 +11,7 @@

#include <QList>

#include <QSize>

+#include <libcamera/color_space.h>

#include <libcamera/formats.h>

#include <libcamera/framebuffer.h>

@@ -24,6 +25,7 @@ public:

virtual const QList<libcamera::PixelFormat> &nativeFormats() const = 0;

virtual int setFormat(const libcamera::PixelFormat &format, const QSize &size,

+ const libcamera::ColorSpace &colorSpace,

unsigned int stride) = 0;

virtual void render(libcamera::FrameBuffer *buffer, Image *image) = 0;

virtual void stop() = 0;

diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp
index 3ae8b03a..ec295b6d 100644
--- a/src/qcam/viewfinder_gl.cpp
+++ b/src/qcam/viewfinder_gl.cpp

@@ -71,8 +71,9 @@ const QList<libcamera::PixelFormat> &ViewFinderGL::nativeFormats() const

return supportedFormats;

}

-int ViewFinderGL::setFormat(const libcamera::PixelFormat &format,

- const QSize &size, unsigned int stride)

+int ViewFinderGL::setFormat(const libcamera::PixelFormat &format, const QSize &size,

+ [[maybe_unused]] const libcamera::ColorSpace &colorSpace,

+ unsigned int stride)

{

if (format != format_) {

diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h
index 0a9275ba..798830a3 100644
--- a/src/qcam/viewfinder_gl.h
+++ b/src/qcam/viewfinder_gl.h

@@ -39,6 +39,7 @@ public:

const QList<libcamera::PixelFormat> &nativeFormats() const override;

int setFormat(const libcamera::PixelFormat &format, const QSize &size,

+ const libcamera::ColorSpace &colorSpace,

unsigned int stride) override;

void render(libcamera::FrameBuffer *buffer, Image *image) override;

void stop() override;

diff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp
index 7a6a60c9..c20fd6bc 100644
--- a/src/qcam/viewfinder_qt.cpp
+++ b/src/qcam/viewfinder_qt.cpp

@@ -54,8 +54,9 @@ const QList<libcamera::PixelFormat> &ViewFinderQt::nativeFormats() const

return formats;

}

-int ViewFinderQt::setFormat(const libcamera::PixelFormat &format,

- const QSize &size, unsigned int stride)

+int ViewFinderQt::setFormat(const libcamera::PixelFormat &format, const QSize &size,

+ [[maybe_unused]] const libcamera::ColorSpace &colorSpace,

+ unsigned int stride)

{

image_ = QImage();

diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h
index 8c621452..eb3a9988 100644
--- a/src/qcam/viewfinder_qt.h
+++ b/src/qcam/viewfinder_qt.h

@@ -32,6 +32,7 @@ public:

const QList<libcamera::PixelFormat> &nativeFormats() const override;

int setFormat(const libcamera::PixelFormat &format, const QSize &size,

+ const libcamera::ColorSpace &colorSpace,

unsigned int stride) override;

void render(libcamera::FrameBuffer *buffer, Image *image) override;

void stop() override;


context:
space:
mode: