From patchwork Wed Mar 6 02:47:52 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: 706 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 534DE611A8 for ; Wed, 6 Mar 2019 03:48:20 +0100 (CET) X-Halon-ID: 4b7644b0-3fba-11e9-985a-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 4b7644b0-3fba-11e9-985a-005056917f90; Wed, 06 Mar 2019 03:48:18 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 6 Mar 2019 03:47:52 +0100 Message-Id: <20190306024755.28726-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190306024755.28726-1-niklas.soderlund@ragnatech.se> References: <20190306024755.28726-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/5] test: camera: Add read default format 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, 06 Mar 2019 02:48:20 -0000 Add a test to verify reading the default format from a camera works. Signed-off-by: Niklas Söderlund --- test/camera/camera_test.cpp | 47 ++++++++++++++++++++++ test/camera/camera_test.h | 32 +++++++++++++++ test/camera/format_default.cpp | 71 ++++++++++++++++++++++++++++++++++ test/camera/meson.build | 12 ++++++ test/meson.build | 1 + 5 files changed, 163 insertions(+) create mode 100644 test/camera/camera_test.cpp create mode 100644 test/camera/camera_test.h create mode 100644 test/camera/format_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..d39a0ed066665946 --- /dev/null +++ b/test/camera/camera_test.cpp @@ -0,0 +1,47 @@ +/* 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; +using namespace libcamera; + +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, skip." << endl; + return TestSkip; + } + + /* Sanity check that camera have streams. */ + if (camera_->streams().size() == 0) { + cout << "Camera have no streams, fail." << endl; + return TestFail; + } + + return TestPass; +} + +void CameraTest::cleanup() +{ + if (camera_) { + camera_->release(); + camera_.reset(); + } + + cm_->stop(); +}; diff --git a/test/camera/camera_test.h b/test/camera/camera_test.h new file mode 100644 index 0000000000000000..4aadd027675a5dbd --- /dev/null +++ b/test/camera/camera_test.h @@ -0,0 +1,32 @@ +/* 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(); + + std::shared_ptr camera_; + +private: + CameraManager *cm_; +}; + +#endif /* __LIBCAMERA_CAMERA_TEST_H_ */ diff --git a/test/camera/format_default.cpp b/test/camera/format_default.cpp new file mode 100644 index 0000000000000000..11b947f44c39b40a --- /dev/null +++ b/test/camera/format_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 FormatDefault : public CameraTest +{ +protected: + int run() + { + std::map conf; + std::set streams = { *camera_->streams().begin() }; + + /* + * Test that asking for default format for a valid array of + * streams returns formats and that the formats are somewhat + * sane. + */ + conf = camera_->streamConfiguration(streams); + if (!conf.size()) { + cout << "Default format for valid streams test failed" << endl; + return TestFail; + } + + StreamConfiguration *sconf = &conf.begin()->second; + if (sconf->width == 0 || sconf->height == 0 || + sconf->pixelFormat == 0 || sconf->bufferCount == 0) { + cout << "Default format is set test failed" << endl; + return TestFail; + } + + /* + * Test that asking for format for an empty array of streams + * returns an empty list of configurations. + */ + std::set streams_empty = {}; + conf = camera_->streamConfiguration(streams_empty); + if (conf.size()) { + cout << "Default format for empty streams test failed" << endl; + return TestFail; + } + + /* + * Test that asking for format for an array of streams bad streams + * returns an empty list of configurations. + */ + Stream *stream_bad = *streams.end(); + std::set streams_bad = { stream_bad }; + conf = camera_->streamConfiguration(streams_bad); + if (conf.size()) { + cout << "Default format for bad streams test failed" << endl; + return TestFail; + } + + return TestPass; + } +}; + +} /* namespace */ + +TEST_REGISTER(FormatDefault); diff --git a/test/camera/meson.build b/test/camera/meson.build new file mode 100644 index 0000000000000000..4f2ed244a9240512 --- /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 = [ + [ 'format_default', 'format_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')