NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline: vimc: Fix name of pipeline handler class

Browse source 
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>
This commit is contained in:
Niklas Söderlund 2019-02-08 13:15:16 +01:00
parent 8b27416267
commit fd38fa66c3
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libcamera/pipeline/vimc.cpp
View file

@ -19,11 +19,11 @@ namespace libcamera {
LOG_DEFINE_CATEGORY(VIMC) LOG_DEFINE_CATEGORY(VIMC)
class PipeHandlerVimc : public PipelineHandler class PipelineHandlerVimc : public PipelineHandler
{ {
public: public:
PipeHandlerVimc(CameraManager *manager); PipelineHandlerVimc(CameraManager *manager);
~PipeHandlerVimc(); ~PipelineHandlerVimc();
std::map<Stream *, StreamConfiguration> std::map<Stream *, StreamConfiguration>
streamConfiguration(Camera *camera, streamConfiguration(Camera *camera,
@ -47,12 +47,12 @@ private:
Stream stream_; Stream stream_;
}; };
PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager) PipelineHandlerVimc::PipelineHandlerVimc(CameraManager *manager)
: PipelineHandler(manager), media_(nullptr), video_(nullptr) : PipelineHandler(manager), media_(nullptr), video_(nullptr)
{ {
} }
PipeHandlerVimc::~PipeHandlerVimc() PipelineHandlerVimc::~PipelineHandlerVimc()
{ {
delete video_; delete video_;
@ -61,7 +61,7 @@ PipeHandlerVimc::~PipeHandlerVimc()
} }
std::map<Stream *, StreamConfiguration> std::map<Stream *, StreamConfiguration>
PipeHandlerVimc::streamConfiguration(Camera *camera, PipelineHandlerVimc::streamConfiguration(Camera *camera,
std::vector<Stream *> &streams) std::vector<Stream *> &streams)
{ {
std::map<Stream *, StreamConfiguration> configs; std::map<Stream *, StreamConfiguration> configs;
@ -79,7 +79,7 @@ PipeHandlerVimc::streamConfiguration(Camera *camera,
return configs; return configs;
} }
int PipeHandlerVimc::configureStreams(Camera *camera, int PipelineHandlerVimc::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) std::map<Stream *, StreamConfiguration> &config)
{ {
StreamConfiguration *cfg = &config[&stream_]; StreamConfiguration *cfg = &config[&stream_];
@ -95,7 +95,7 @@ int PipeHandlerVimc::configureStreams(Camera *camera,
return video_->setFormat(&format); return video_->setFormat(&format);
} }
int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream) int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)
{ {
const StreamConfiguration &cfg = stream->configuration(); const StreamConfiguration &cfg = stream->configuration();
@ -104,22 +104,22 @@ int PipeHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)
return video_->exportBuffers(cfg.bufferCount, &stream->bufferPool()); return video_->exportBuffers(cfg.bufferCount, &stream->bufferPool());
} }
int PipeHandlerVimc::freeBuffers(Camera *camera, Stream *stream) int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream)
{ {
return video_->releaseBuffers(); return video_->releaseBuffers();
} }
int PipeHandlerVimc::start(const Camera *camera) int PipelineHandlerVimc::start(const Camera *camera)
{ {
return video_->streamOn(); return video_->streamOn();
} }
void PipeHandlerVimc::stop(const Camera *camera) void PipelineHandlerVimc::stop(const Camera *camera)
{ {
video_->streamOff(); video_->streamOff();
} }
int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request) int PipelineHandlerVimc::queueRequest(const Camera *camera, Request *request)
{ {
Buffer *buffer = request->findBuffer(&stream_); Buffer *buffer = request->findBuffer(&stream_);
if (!buffer) { if (!buffer) {
@ -134,7 +134,7 @@ int PipeHandlerVimc::queueRequest(const Camera *camera, Request *request)
return 0; return 0;
} }
bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
{ {
DeviceMatch dm("vimc"); DeviceMatch dm("vimc");
@ -169,6 +169,6 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
return true; return true;
} }
REGISTER_PIPELINE_HANDLER(PipeHandlerVimc); REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc);
} /* namespace libcamera */ } /* namespace libcamera */