diff options
author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-05 02:52:59 +0200 |
---|---|---|
committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-09 16:59:19 +0200 |
commit | b0c730e330281f38ac51cb64d9581ed278759048 (patch) | |
tree | dd7398671330775d1ca302fe7871222a435eba6a /test/camera/configuration_default.cpp | |
parent | 9a7dc3ce7f4253578a0f7c0d58417425c8155cb3 (diff) |
libcamera: Switch to CameraConfiguration
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>
Diffstat (limited to 'test/camera/configuration_default.cpp')
-rw-r--r-- | test/camera/configuration_default.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp index 09861716..dd510668 100644 --- a/test/camera/configuration_default.cpp +++ b/test/camera/configuration_default.cpp @@ -18,17 +18,11 @@ class ConfigurationDefault : public CameraTest protected: int run() { - std::map<Stream *, StreamConfiguration> conf; + CameraConfiguration conf; /* Test asking for configuration for a video stream. */ conf = camera_->streamConfiguration({ Stream::VideoRecording() }); - if (conf.empty()) { - cout << "Failed to retrieve configuration for video streams" - << endl; - return TestFail; - } - - if (!configurationValid(conf)) { + if (!conf.isValid()) { cout << "Default configuration invalid" << endl; return TestFail; } @@ -38,7 +32,7 @@ protected: * stream usages returns an empty list of configurations. */ conf = camera_->streamConfiguration({}); - if (!conf.empty()) { + if (conf.isValid()) { cout << "Failed to retrieve configuration for empty usage list" << endl; return TestFail; |