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

8
src/cam/main.cpp
View file

@ -78,10 +78,10 @@ static int parseOptions(int argc, char *argv[])
return 0;
}
static int prepareCameraConfig(std::map<Stream *, StreamConfiguration> *config)
static int prepareCameraConfig(CameraConfiguration *config)
{
*config = camera->streamConfiguration({ Stream::VideoRecording() });
Stream *stream = config->begin()->first;
Stream *stream = config->front();
if (options.isSet(OptFormat)) {
KeyValueParser::Options format = options[OptFormat];
@ -135,7 +135,7 @@ static void requestComplete(Request *request, const std::map<Stream *, Buffer *>
static int capture()
{
std::map<Stream *, StreamConfiguration> config;
CameraConfiguration config;
std::vector<Request *> requests;
int ret;
@ -151,7 +151,7 @@ static int capture()
return ret;
}
Stream *stream = config.begin()->first;
Stream *stream = config.front();
ret = camera->allocateBuffers();
if (ret) {