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

test: Unify naming of configurations in tests

Browse source 
Name all instances of CameraConfiguration "config", and all instances of
StreamConfiguration "cfg" accross all tests.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-04-29 20:41:46 +03:00
parent 3fc0189e20
commit 21e501f810
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/camera/capture.cpp
View file

@ -42,12 +42,12 @@ protected:
int run()
{
CameraConfiguration conf =
CameraConfiguration config =
camera_->streamConfiguration({ Stream::VideoRecording() });
Stream *stream = conf.front();
StreamConfiguration *sconf = &conf[stream];
Stream *stream = config.front();
StreamConfiguration *cfg = &config[stream];
if (!conf.isValid()) {
if (!config.isValid()) {
cout << "Failed to read default configuration" << endl;
return TestFail;
}
@ -57,7 +57,7 @@ protected:
return TestFail;
}
if (camera_->configureStreams(conf)) {
if (camera_->configureStreams(config)) {
cout << "Failed to set default configuration" << endl;
return TestFail;
}
@ -110,10 +110,10 @@ protected:
while (timer.isRunning())
dispatcher->processEvents();
if (completeRequestsCount_ <= sconf->bufferCount * 2) {
if (completeRequestsCount_ <= cfg->bufferCount * 2) {
cout << "Failed to capture enough frames (got "
<< completeRequestsCount_ << " expected at least "
<< sconf->bufferCount * 2 << ")" << endl;
<< cfg->bufferCount * 2 << ")" << endl;
return TestFail;
}