PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pipeline: rkisp1: Add wrappers for accessing the path video device

Browse Source 
As a step to be able to make RkISP1Path::video_ private add simple
wrappers for buffer handling. There is no functional change.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2020-09-24 23:27:09 +02:00
parent df64542035
commit c2dfdecd05
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -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);

13
src/libcamera/pipeline/rkisp1/rkisp1_path.h
View File

@@ -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_;