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

libcamera: Switch to CameraConfiguration

Browse source 
Implement the camera configuration thru out the library, tests, cam and
qcam tools.

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-04-05 02:52:59 +02:00
parent 9a7dc3ce7f
commit b0c730e330
16 changed files with 54 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,11 @@ public:
PipelineHandlerVimc(CameraManager *manager);
~PipelineHandlerVimc();
std::map<Stream *, StreamConfiguration>
CameraConfiguration
streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages) override;
int configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config) override;
const CameraConfiguration &config) override;
int allocateBuffers(Camera *camera, Stream *stream) override;
int freeBuffers(Camera *camera, Stream *stream) override;
@ -82,12 +82,12 @@ PipelineHandlerVimc::~PipelineHandlerVimc()
media_->release();
}
std::map<Stream *, StreamConfiguration>
CameraConfiguration
PipelineHandlerVimc::streamConfiguration(Camera *camera,
const std::vector<StreamUsage> &usages)
{
VimcCameraData *data = cameraData(camera);
std::map<Stream *, StreamConfiguration> configs;
CameraConfiguration configs;
StreamConfiguration config{};
config.width = 640;
@ -101,10 +101,10 @@ PipelineHandlerVimc::streamConfiguration(Camera *camera,
}
int PipelineHandlerVimc::configureStreams(Camera *camera,
std::map<Stream *, StreamConfiguration> &config)
const CameraConfiguration &config)
{
VimcCameraData *data = cameraData(camera);
StreamConfiguration *cfg = &config[&data->stream_];
const StreamConfiguration *cfg = &config[&data->stream_];
int ret;
LOG(VIMC, Debug) << "Configure the camera for resolution "