[libcamera-devel] [PATCH v2 1/4] test: camera: Add read default configuration test

[Laurent Pinchart]

Hi Niklas,

Thank you for the patch.

On Mon, Mar 11, 2019 at 03:22:29AM +0100, Niklas Söderlund wrote:
> Add a test to verify reading the default configuration from a camera
> works.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
>  test/camera/camera_test.cpp           | 74 +++++++++++++++++++++++++++
>  test/camera/camera_test.h             | 35 +++++++++++++
>  test/camera/configuration_default.cpp | 68 ++++++++++++++++++++++++
>  test/camera/meson.build               | 12 +++++
>  test/meson.build                      |  1 +
>  5 files changed, 190 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..4ba6813c40ece44b
> --- /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 <iostream>
> +
> +#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<Stream *> &streams,
> +				    const std::map<Stream *, StreamConfiguration> &conf) const
> +{
> +	/* Test numbers of streams matches that of configurations. */

"Test that the numbers ..."

s/configurations/configuration/

> +	if (streams.size() != conf.size())
> +		return false;
> +
> +	/*
> +	 * Test stream can be found in configuration and that the

s/Test/Test that/

> +	 * configuration is valid.
> +	 */
> +	for (Stream *stream : streams) {
> +		std::map<Stream *, StreamConfiguration>::const_iterator itr =
> +			conf.find(stream);
> +
> +		if (itr == conf.end())
> +			return false;

We customarily name iterators it, not itr.

> +
> +		const StreamConfiguration *sconf = &itr->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 <libcamera/libcamera.h>
> +
> +#include "test.h"
> +
> +using namespace libcamera;
> +
> +class CameraTest : public Test
> +{
> +public:
> +	CameraTest()
> +		: cm_(nullptr) {}
> +
> +protected:
> +	int init();
> +	void cleanup();
> +
> +	bool configurationValid(const std::set<Stream *> &streams,
> +				const std::map<Stream *, StreamConfiguration> &conf) const;
> +
> +	std::shared_ptr<Camera> 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..b488b977c890a6da
> --- /dev/null
> +++ b/test/camera/configuration_default.cpp
> @@ -0,0 +1,68 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2019, Google Inc.
> + *
> + * libcamera Camera API tests
> + */
> +
> +#include <iostream>
> +
> +#include "camera_test.h"
> +
> +using namespace std;
> +
> +namespace {
> +
> +class ConfigurationDefault : public CameraTest
> +{
> +protected:
> +	int run()
> +	{
> +		std::map<Stream *, StreamConfiguration> conf;
> +
> +		/*
> +		 * Test that asking for default configuration for a valid
> +		 * array of streams returns something valid.
> +		 */
> +		std::set<Stream *> streams = { *camera_->streams().begin() };
> +		conf = camera_->streamConfiguration(streams);
> +		if (conf.empty()) {
> +			cout << "Retrieving configuration for valid streams" << endl;

"Failed to retrieve" ?

> +			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<Stream *> streams_empty = {};
> +		conf = camera_->streamConfiguration(streams_empty);
> +		if (!conf.empty()) {
> +			cout << "Retrieving configuration for empty streams" << endl;

Same here.

> +			return TestFail;
> +		}
> +
> +		/*
> +		 * Test that asking for configuration for an array of bad streams
> +		 * returns an empty list of configurations.
> +		 */
> +		Stream *stream_bad = reinterpret_cast<Stream *>(0xdeadbeef);
> +		std::set<Stream *> streams_bad = { stream_bad };
> +		conf = camera_->streamConfiguration(streams_bad);
> +		if (!conf.empty()) {
> +			cout << "Retrieving configuration for bad streams" << endl;

And here.

With these small issues addressed,

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> +			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')

-- 
Regards,

Laurent Pinchart