From b0c730e330281f38ac51cb64d9581ed278759048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Fri, 5 Apr 2019 02:52:59 +0200 Subject: libcamera: Switch to CameraConfiguration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement the camera configuration thru out the library, tests, cam and qcam tools. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- test/camera/configuration_default.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'test/camera/configuration_default.cpp') 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 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; -- cgit v1.2.1