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

libcamera: camera: Log requested configuration in configureStreams()

Browse source 
The IPU3 pipeline handler logs the requested configuration in its
configureStreams() handler. This is useful for other pipeline handlers
as well, move it to the Camera class.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-04-14 22:33:20 +03:00
parent 8f6f63a208
commit 9c90781332
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libcamera/camera.cpp
View file

@ -5,6 +5,8 @@
* camera.cpp - Camera device * camera.cpp - Camera device
*/ */
#include <iomanip>
#include <libcamera/camera.h> #include <libcamera/camera.h>
#include <libcamera/request.h> #include <libcamera/request.h>
#include <libcamera/stream.h> #include <libcamera/stream.h>
@ -595,11 +597,23 @@ int Camera::configureStreams(const CameraConfiguration &config)
return -EINVAL; return -EINVAL;
} }
std::ostringstream msg("configuring streams:");
unsigned int index = 0;
for (Stream *stream : config) { for (Stream *stream : config) {
if (streams_.find(stream) == streams_.end()) if (streams_.find(stream) == streams_.end())
return -EINVAL; return -EINVAL;
const StreamConfiguration &cfg = config[stream];
msg << " (" << index << ") " << cfg.width << "x"
<< cfg.height << "-0x" << std::hex << std::setfill('0')
<< std::setw(8) << cfg.pixelFormat;
index++;
} }
LOG(Camera, Info) << msg.str();
ret = pipe_->configureStreams(this, config); ret = pipe_->configureStreams(this, config);
if (ret) if (ret)
return ret; return ret;

6
src/libcamera/pipeline/ipu3/ipu3.cpp
View file

@ -244,12 +244,6 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,
ImgUDevice *imgu = data->imgu_; ImgUDevice *imgu = data->imgu_;
int ret; int ret;
LOG(IPU3, Info)
<< "Requested image format " << cfg.width << "x"
<< cfg.height << "-0x" << std::hex << std::setfill('0')
<< std::setw(8) << cfg.pixelFormat << " on camera '"
<< camera->name() << "'";
/* /*
* Verify that the requested size respects the IPU3 alignement * Verify that the requested size respects the IPU3 alignement
* requirements (the image width shall be a multiple of 8 pixels and * requirements (the image width shall be a multiple of 8 pixels and