diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-11-22 16:22:56 +0100 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-01-12 16:10:38 +0100 |
| commit | 9217f274f64f690b768d332663e1731a3ee5ef15 (patch) | |
| tree | ee152928be1eaea656c929e56e27e97b175de435 /src/qcam/main_window.h | |
| parent | eb4030f6c07174a520be1ebd73628e9ae4789569 (diff) | |
libcamera: Switch to FrameBuffer interface
Switch to the FrameBuffer interface where all buffers are treated as
external buffers and are allocated outside the camera. Applications
allocating buffers using libcamera are switched to use the
FrameBufferAllocator helper.
Follow-up changes to this one will finalize the transition to the new
FrameBuffer interface by removing code that is left unused after this
change.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/qcam/main_window.h')
| -rw-r--r-- | src/qcam/main_window.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 0786e915..05cde4ce 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -14,8 +14,10 @@ #include <QObject> #include <QTimer> +#include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/camera_manager.h> +#include <libcamera/framebuffer_allocator.h> #include <libcamera/stream.h> #include "../cam/options.h" @@ -49,7 +51,7 @@ private: void stopCapture(); void requestComplete(Request *request); - int display(Buffer *buffer); + int display(FrameBuffer *buffer); QString title_; QTimer titleTimer_; @@ -57,6 +59,8 @@ private: const OptionsParser::Options &options_; std::shared_ptr<Camera> camera_; + FrameBufferAllocator *allocator_; + bool isCapturing_; std::unique_ptr<CameraConfiguration> config_; |