diff options
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 | ||||
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1_path.h | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 86a8fd4f..71d10005 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -403,10 +403,10 @@ protected: pipe_->stat_->queueBuffer(info->statBuffer); if (info->mainPathBuffer) - pipe_->mainPath_.video_->queueBuffer(info->mainPathBuffer); + pipe_->mainPath_.queueBuffer(info->mainPathBuffer); if (info->selfPathBuffer) - pipe_->selfPath_.video_->queueBuffer(info->selfPathBuffer); + pipe_->selfPath_.queueBuffer(info->selfPathBuffer); } private: @@ -752,9 +752,9 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S unsigned int count = stream->configuration().bufferCount; if (stream == &data->mainPathStream_) - return mainPath_.video_->exportBuffers(count, buffers); + return mainPath_.exportBuffers(count, buffers); else if (stream == &data->selfPathStream_) - return selfPath_.video_->exportBuffers(count, buffers); + return selfPath_.exportBuffers(count, buffers); return -EINVAL; } @@ -1154,8 +1154,8 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator) if (!selfPath_.init(media_)) return false; - mainPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady); - selfPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady); + mainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady); + selfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady); stat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady); param_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady); diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h index 7433ad03..377772ca 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -12,13 +12,15 @@ #include <libcamera/camera.h> #include <libcamera/geometry.h> #include <libcamera/pixel_format.h> +#include <libcamera/signal.h> #include <libcamera/span.h> +#include "libcamera/internal/v4l2_videodevice.h" + namespace libcamera { class MediaDevice; class V4L2Subdevice; -class V4L2VideoDevice; struct StreamConfiguration; struct V4L2SubdeviceFormat; @@ -37,6 +39,15 @@ public: int configure(const StreamConfiguration &config, const V4L2SubdeviceFormat &inputFormat); + int exportBuffers(unsigned int bufferCount, + std::vector<std::unique_ptr<FrameBuffer>> *buffers) + { + return video_->exportBuffers(bufferCount, buffers); + } + + int queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); } + Signal<FrameBuffer *> &bufferReady() { return video_->bufferReady; } + /* \todo Make video private. */ V4L2VideoDevice *video_; |