From patchwork Wed Mar 13 01:05:29 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: 731 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2DCC3610B6 for ; Wed, 13 Mar 2019 02:06:21 +0100 (CET) X-Halon-ID: 34d81ee4-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 34d81ee4-452c-11e9-846a-005056917a89; Wed, 13 Mar 2019 02:06:18 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 13 Mar 2019 02:05:29 +0100 Message-Id: <20190313010532.28960-2-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 1/4] test: camera: Add read default 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:21 -0000 Add a test to verify reading the default configuration from a camera works. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- test/camera/camera_test.cpp | 74 +++++++++++++++++++++++++++ test/camera/camera_test.h | 35 +++++++++++++ test/camera/configuration_default.cpp | 71 +++++++++++++++++++++++++ test/camera/meson.build | 12 +++++ test/meson.build | 1 + 5 files changed, 193 insertions(+) create mode 100644 test/camera/camera_test.cpp create mode 100644 test/camera/camera_test.h create mode 100644 test/camera/configuration_default.cpp create mode 100644 test/camera/meson.build diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp new file mode 100644 index 0000000000000000..a92f2165bf3a53c1 --- /dev/null +++ b/test/camera/camera_test.cpp @@ -0,0 +1,74 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * libcamera Camera API tests + */ + +#include + +#include "camera_test.h" + +using namespace libcamera; +using namespace std; + +int CameraTest::init() +{ + cm_ = CameraManager::instance(); + + if (cm_->start()) { + cout << "Failed to start camera manager" << endl; + return TestFail; + } + + camera_ = cm_->get("VIMC Sensor B"); + if (!camera_) { + cout << "Can not find VIMC camera" << endl; + return TestSkip; + } + + /* Sanity check that the camera has streams. */ + if (camera_->streams().empty()) { + cout << "Camera has no stream" << endl; + return TestFail; + } + + return TestPass; +} + +void CameraTest::cleanup() +{ + if (camera_) { + camera_->release(); + camera_.reset(); + } + + cm_->stop(); +}; + +bool CameraTest::configurationValid(const std::set &streams, + const std::map &conf) const +{ + /* Test that the numbers of streams matches that of configuration. */ + if (streams.size() != conf.size()) + return false; + + /* + * Test that stream can be found in configuration and that the + * configuration is valid. + */ + for (Stream *stream : streams) { + std::map::const_iterator it = + conf.find(stream); + + if (it == conf.end()) + return false; + + const StreamConfiguration *sconf = &it->second; + if (sconf->width == 0 || sconf->height == 0 || + sconf->pixelFormat == 0 || sconf->bufferCount == 0) + return false; + } + + return true; +} diff --git a/test/camera/camera_test.h b/test/camera/camera_test.h new file mode 100644 index 0000000000000000..48fb47a23fe8f49c --- /dev/null +++ b/test/camera/camera_test.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * camera_test.h - libcamera camera test base class + */ +#ifndef __LIBCAMERA_CAMERA_TEST_H__ +#define __LIBCAMERA_CAMERA_TEST_H__ + +#include + +#include "test.h" + +using namespace libcamera; + +class CameraTest : public Test +{ +public: + CameraTest() + : cm_(nullptr) {} + +protected: + int init(); + void cleanup(); + + bool configurationValid(const std::set &streams, + const std::map &conf) const; + + std::shared_ptr camera_; + +private: + CameraManager *cm_; +}; + +#endif /* __LIBCAMERA_CAMERA_TEST_H__ */ diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp new file mode 100644 index 0000000000000000..71e79844667591b2 --- /dev/null +++ b/test/camera/configuration_default.cpp @@ -0,0 +1,71 @@ +/* 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 ConfigurationDefault : public CameraTest +{ +protected: + int run() + { + std::map conf; + + /* + * Test that asking for default configuration for a valid + * array of streams returns something valid. + */ + std::set streams = { *camera_->streams().begin() }; + conf = camera_->streamConfiguration(streams); + if (conf.empty()) { + cout << "Failed to retrieve configuration for valid streams" + << endl; + return TestFail; + } + + if (!configurationValid(streams, conf)) { + cout << "Default configuration invalid" << endl; + return TestFail; + } + + /* + * Test that asking for configuration for an empty array of + * streams returns an empty list of configurations. + */ + std::set streams_empty = {}; + conf = camera_->streamConfiguration(streams_empty); + if (!conf.empty()) { + cout << "Failed to retrieve configuration for empty streams" + << endl; + return TestFail; + } + + /* + * Test that asking for configuration for an array of bad streams + * returns an empty list of configurations. + */ + Stream *stream_bad = reinterpret_cast(0xdeadbeef); + std::set streams_bad = { stream_bad }; + conf = camera_->streamConfiguration(streams_bad); + if (!conf.empty()) { + cout << "Failed to retrieve configuration for bad streams" + << endl; + return TestFail; + } + + return TestPass; + } +}; + +} /* namespace */ + +TEST_REGISTER(ConfigurationDefault); diff --git a/test/camera/meson.build b/test/camera/meson.build new file mode 100644 index 0000000000000000..186ba211b9fde026 --- /dev/null +++ b/test/camera/meson.build @@ -0,0 +1,12 @@ +# Tests are listed in order of complexity. +# They are not alphabetically sorted. +camera_tests = [ + [ 'configuration_default', 'configuration_default.cpp' ], +] + +foreach t : camera_tests + exe = executable(t[0], [t[1], 'camera_test.cpp'], + link_with : test_libraries, + include_directories : test_includes_internal) + test(t[0], exe, suite: 'camera', is_parallel: false) +endforeach diff --git a/test/meson.build b/test/meson.build index 5fb16fa6afb62f8d..71a96921697c0e9e 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,5 +1,6 @@ subdir('libtest') +subdir('camera') subdir('media_device') subdir('pipeline') subdir('v4l2_device')