From patchwork Wed Mar 13 01:05:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 732 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 16FCF600FD for ; Wed, 13 Mar 2019 02:06:22 +0100 (CET) X-Halon-ID: 360d9ffb-452c-11e9-846a-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 360d9ffb-452c-11e9-846a-005056917a89; Wed, 13 Mar 2019 02:06:20 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 13 Mar 2019 02:05:30 +0100 Message-Id: <20190313010532.28960-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313010532.28960-1-niklas.soderlund@ragnatech.se> References: <20190313010532.28960-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/4] test: camera: Add setting of configuration test X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2019 01:06:22 -0000 Try to set the default configuration, a modified valid configuration and an invalid configuration. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- test/camera/configuration_set.cpp | 91 +++++++++++++++++++++++++++++++ test/camera/meson.build | 1 + 2 files changed, 92 insertions(+) create mode 100644 test/camera/configuration_set.cpp diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp new file mode 100644 index 0000000000000000..dedb85009335aa46 --- /dev/null +++ b/test/camera/configuration_set.cpp @@ -0,0 +1,91 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * libcamera Camera API tests + */ + +#include + +#include "camera_test.h" + +using namespace std; + +namespace { + +class ConfigurationSet : public CameraTest +{ +protected: + int run() + { + std::set streams = { *camera_->streams().begin() }; + std::map conf = + camera_->streamConfiguration(streams); + StreamConfiguration *sconf = &conf.begin()->second; + + if (!configurationValid(streams, conf)) { + cout << "Failed to read default configuration" << endl; + return TestFail; + } + + if (camera_->acquire()) { + cout << "Failed to acquire the camera" << endl; + return TestFail; + } + + /* Test that setting the default configuration works. */ + if (camera_->configureStreams(conf)) { + cout << "Failed to set default configuration" << endl; + return TestFail; + } + + /* + * Test that configuring the camera fails if it is not + * acquired, this will also test release and reacquiring + * of the camera. + */ + if (camera_->release()) { + cout << "Failed to release the camera" << endl; + return TestFail; + } + + if (!camera_->configureStreams(conf)) { + cout << "Setting configuration on a camera not acquired succeeded when it should have failed" + << endl; + return TestFail; + } + + if (camera_->acquire()) { + cout << "Failed to acquire the camera" << endl; + return TestFail; + } + + /* + * Test that modifying the default configuration works. Doubling + * the default configuration of the VIMC camera is known to + * work. + */ + sconf->width *= 2; + sconf->height *= 2; + if (camera_->configureStreams(conf)) { + cout << "Failed to set modified configuration" << endl; + return TestFail; + } + + /* + * Test that setting an invalid configuration fails. + */ + sconf->width = 0; + sconf->height = 0; + if (!camera_->configureStreams(conf)) { + cout << "Invalid configuration incorrectly accepted" << endl; + return TestFail; + } + + return TestPass; + } +}; + +} /* namespace */ + +TEST_REGISTER(ConfigurationSet); diff --git a/test/camera/meson.build b/test/camera/meson.build index 186ba211b9fde026..ed4837190ff6c52c 100644 --- a/test/camera/meson.build +++ b/test/camera/meson.build @@ -2,6 +2,7 @@ # They are not alphabetically sorted. camera_tests = [ [ 'configuration_default', 'configuration_default.cpp' ], + [ 'configuration_set', 'configuration_set.cpp' ], ] foreach t : camera_tests