summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-02-08 13:15:16 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-02-08 15:36:25 +0100
commitfd38fa66c38e80ca0974ca9aba2a0009f886028f (patch)
tree5d51ac104e00bba34b7a4112a79f62512739c8d1 /src
parent8b27416267a8c14cda97f6511c2f3e0c0d42caf3 (diff)
libcamera: pipeline: vimc: Fix name of pipeline handler class
Rename the VIMC pipeline handler to match the naming convention. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/pipeline/vimc.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index 0e9ad7b5..46840a4f 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -19,11 +19,11 @@ namespace libcamera {
LOG_DEFINE_CATEGORY(VIMC)
-class PipeHandlerVimc : public PipelineHandler
+class PipelineHandlerVimc : public PipelineHandler
{
public:
- PipeHandlerVimc(CameraManager *manager);
- ~PipeHandlerVimc();
+ PipelineHandlerVimc(CameraManager *manager);
+ ~PipelineHandlerVimc();
std::map<Stream *, StreamConfiguration>
streamConfiguration(Camera *camera,
@@ -47,12 +47,12 @@ private:
Stream stream_;
};
-PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager)
+PipelineHandlerVimc::PipelineHandlerVimc(CameraManager *manager)
: PipelineHandler(manager), media_(nullptr), video_(nullptr)
{
}
-PipeHandlerVimc::~PipeHandlerVimc()
+PipelineHandlerVimc::~PipelineHandlerVimc()
{
delete video_;
@@ -61,7 +61,7 @@ PipeHandlerVimc::~PipeHandlerVimc()
}
std::map<Stream *, StreamConfiguration>
-PipeHandlerVimc::streamConfiguration(Camera *camera,
+PipelineHandlerVimc::streamConfiguration(Camera *camera,
std::vector<Stream *> &streams)
{
std::map<Stream *, StreamConfiguration> configs;
@@ -79,7 +79,7 @@ PipeHandlerVimc::streamConfiguration(Camera *camera,
return configs;
}
-int PipeHandlerVimc::configureStreams(Camera *camera,
+int PipelineHandlerVimc::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config)
{
StreamConfiguration *cfg = &config[&stream_];
@@ -95,7 +95,7 @@ int PipeHandlerVimc::configureStreams(Camera *camera,
return video_->setFormat(&format);
}
-int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)
+int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)
{
const StreamConfiguration &cfg = stream->configuration();
@@ -104,22 +104,22 @@ int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)
return video_->exportBuffers(cfg.bufferCount, &stream->bufferPool());
}
-int PipeHandlerVimc::freeBuffers(Camera *camera, Stream *stream)
+int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream)
{
return video_->releaseBuffers();
}
-int PipeHandlerVimc::start(const Camera *camera)
+int PipelineHandlerVimc::start(const Camera *camera)
{
return video_->streamOn();
}
-void PipeHandlerVimc::stop(const Camera *camera)
+void PipelineHandlerVimc::stop(const Camera *camera)
{
video_->streamOff();
}
-int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request)
+int PipelineHandlerVimc::queueRequest(const Camera *camera, Request *request)
{
Buffer *buffer = request->findBuffer(&stream_);
if (!buffer) {
@@ -134,7 +134,7 @@ int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request)
return 0;
}
-bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
+bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
{
DeviceMatch dm("vimc");
@@ -169,6 +169,6 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
return true;
}
-REGISTER_PIPELINE_HANDLER(PipeHandlerVimc);
+REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc);
} /* namespace libcamera */