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

libcamera: camera: Return a pointer from generateConfiguration()

Browse source 
To prepare for specialising the CameraConfiguration class in pipeline
handlers, return a pointer to a camera configuration instead of a
reference from Camera::generateConfiguration(). The camera configuration
always needs to be allocated from the pipeline handler, and its
ownership is passed to the application.

For symmetry, change Camera::configure() to take a CameraConfiguration
pointer instead of a reference. This aligns with our coding practice of
passing parameters that are modified by the callee by pointer.

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-29 20:58:34 +03:00
parent 77ae64eb24
commit 75de3bff9e
15 changed files with 184 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

32
test/camera/capture.cpp
View file

@ -40,13 +40,25 @@ protected:
camera_->queueRequest(request);
}
int run()
int init() override
{
CameraConfiguration config =
camera_->generateConfiguration({ StreamRole::VideoRecording });
StreamConfiguration *cfg = &config[0];
CameraTest::init();
if (!config.isValid()) {
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (!config_) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
}
return TestPass;
}
int run() override
{
StreamConfiguration &cfg = config_->at(0);
if (!config_->isValid()) {
cout << "Failed to read default configuration" << endl;
return TestFail;
}
@ -56,7 +68,7 @@ protected:
return TestFail;
}
if (camera_->configure(config)) {
if (camera_->configure(config_.get())) {
cout << "Failed to set default configuration" << endl;
return TestFail;
}
@ -66,7 +78,7 @@ protected:
return TestFail;
}
Stream *stream = cfg->stream();
Stream *stream = cfg.stream();
BufferPool &pool = stream->bufferPool();
std::vector<Request *> requests;
for (Buffer &buffer : pool.buffers()) {
@ -110,10 +122,10 @@ protected:
while (timer.isRunning())
dispatcher->processEvents();
if (completeRequestsCount_ <= cfg->bufferCount * 2) {
if (completeRequestsCount_ <= cfg.bufferCount * 2) {
cout << "Failed to capture enough frames (got "
<< completeRequestsCount_ << " expected at least "
<< cfg->bufferCount * 2 << ")" << endl;
<< cfg.bufferCount * 2 << ")" << endl;
return TestFail;
}
@ -134,6 +146,8 @@ protected:
return TestPass;
}
std::unique_ptr<CameraConfiguration> config_;
};
} /* namespace */