[v3,2/9] test: ipa: libipa: Add tets for Interpolator
diff mbox series

Message ID 20240920133941.90629-3-stefan.klug@ideasonboard.com
State Accepted
Headers show
Series
  • Implement polynomial lsc support
Related show

Commit Message

Stefan Klug Sept. 20, 2024, 1:39 p.m. UTC
Add tests for the Interpolator class.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

---
Changes in v3:
- Stylefixes
- Collected tags
- Fixed copyright
---
 test/ipa/libipa/interpolator.cpp | 54 ++++++++++++++++++++++++++++++++
 test/ipa/libipa/meson.build      | 15 +++++++++
 test/ipa/meson.build             |  1 +
 3 files changed, 70 insertions(+)
 create mode 100644 test/ipa/libipa/interpolator.cpp
 create mode 100644 test/ipa/libipa/meson.build

Comments

Laurent Pinchart Sept. 23, 2024, 8:34 p.m. UTC | #1
On Fri, Sep 20, 2024 at 03:39:17PM +0200, Stefan Klug wrote:
> Add tests for the Interpolator class.
> 
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
> 
> ---
> Changes in v3:
> - Stylefixes
> - Collected tags
> - Fixed copyright
> ---
>  test/ipa/libipa/interpolator.cpp | 54 ++++++++++++++++++++++++++++++++
>  test/ipa/libipa/meson.build      | 15 +++++++++
>  test/ipa/meson.build             |  1 +
>  3 files changed, 70 insertions(+)
>  create mode 100644 test/ipa/libipa/interpolator.cpp
>  create mode 100644 test/ipa/libipa/meson.build
> 
> diff --git a/test/ipa/libipa/interpolator.cpp b/test/ipa/libipa/interpolator.cpp
> new file mode 100644
> index 000000000000..6abb776060d4
> --- /dev/null
> +++ b/test/ipa/libipa/interpolator.cpp
> @@ -0,0 +1,54 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2024, Ideas on Board Oy
> + *
> + * Interpolator tests
> + */
> +
> +#include "../src/ipa/libipa/interpolator.h"

#include <libipa/interpolator.h>

> +
> +#include <cmath>
> +#include <iostream>
> +#include <map>
> +#include <stdint.h>
> +#include <stdio.h>
> +
> +#include "test.h"
> +
> +using namespace std;
> +using namespace libcamera;
> +using namespace ipa;
> +
> +#define ASSERT_EQ(a, b)                    \
> +	if ((a) != (b)) {                  \
> +		printf(#a " != " #b "\n"); \

Come on, we're using C++ :-)

> +		return TestFail;           \

Hiding a return in a macro is really not nice.

> +	}
> +
> +class InterpolatorTest : public Test
> +{
> +protected:
> +	int run()
> +	{
> +		Interpolator<int> interpolator;
> +		interpolator.setData({ { 10, 100 }, { 20, 200 }, { 30, 300 } });
> +
> +		ASSERT_EQ(interpolator.getInterpolated(0), 100);
> +		ASSERT_EQ(interpolator.getInterpolated(10), 100);
> +		ASSERT_EQ(interpolator.getInterpolated(20), 200);
> +		ASSERT_EQ(interpolator.getInterpolated(25), 250);
> +		ASSERT_EQ(interpolator.getInterpolated(30), 300);
> +		ASSERT_EQ(interpolator.getInterpolated(40), 300);

Make this a loop and you won't need ASSERT_EQ().

> +
> +		interpolator.setQuantization(10);
> +		unsigned int q = 0;
> +		ASSERT_EQ(interpolator.getInterpolated(25, &q), 300);
> +		ASSERT_EQ(q, 30);
> +		ASSERT_EQ(interpolator.getInterpolated(24, &q), 200);
> +		ASSERT_EQ(q, 20);
> +
> +		return TestPass;
> +	}
> +};
> +
> +TEST_REGISTER(InterpolatorTest)
> diff --git a/test/ipa/libipa/meson.build b/test/ipa/libipa/meson.build
> new file mode 100644
> index 000000000000..4d2427dbd4e7
> --- /dev/null
> +++ b/test/ipa/libipa/meson.build
> @@ -0,0 +1,15 @@
> +# SPDX-License-Identifier: CC0-1.0
> +
> +libipa_test = [
> +    {'name': 'interpolator', 'sources': ['interpolator.cpp']},
> +]
> +
> +foreach test : libipa_test
> +    exe = executable(test['name'], test['sources'],
> +                     dependencies : [libcamera_private, libipa_dep],
> +                     link_with : [test_libraries],
> +                     include_directories : [test_includes_internal,
> +                                            '../../../src/ipa/libipa/'])

Use libipa_include

> +
> +    test(test['name'], exe, suite : 'ipa')
> +endforeach
> diff --git a/test/ipa/meson.build b/test/ipa/meson.build
> index e9871aba44ee..63820de54899 100644
> --- a/test/ipa/meson.build
> +++ b/test/ipa/meson.build
> @@ -1,5 +1,6 @@
>  # SPDX-License-Identifier: CC0-1.0
>  
> +subdir('libipa')
>  subdir('rkisp1')
>  
>  ipa_test = [

Patch
diff mbox series

diff --git a/test/ipa/libipa/interpolator.cpp b/test/ipa/libipa/interpolator.cpp
new file mode 100644
index 000000000000..6abb776060d4
--- /dev/null
+++ b/test/ipa/libipa/interpolator.cpp
@@ -0,0 +1,54 @@ 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2024, Ideas on Board Oy
+ *
+ * Interpolator tests
+ */
+
+#include "../src/ipa/libipa/interpolator.h"
+
+#include <cmath>
+#include <iostream>
+#include <map>
+#include <stdint.h>
+#include <stdio.h>
+
+#include "test.h"
+
+using namespace std;
+using namespace libcamera;
+using namespace ipa;
+
+#define ASSERT_EQ(a, b)                    \
+	if ((a) != (b)) {                  \
+		printf(#a " != " #b "\n"); \
+		return TestFail;           \
+	}
+
+class InterpolatorTest : public Test
+{
+protected:
+	int run()
+	{
+		Interpolator<int> interpolator;
+		interpolator.setData({ { 10, 100 }, { 20, 200 }, { 30, 300 } });
+
+		ASSERT_EQ(interpolator.getInterpolated(0), 100);
+		ASSERT_EQ(interpolator.getInterpolated(10), 100);
+		ASSERT_EQ(interpolator.getInterpolated(20), 200);
+		ASSERT_EQ(interpolator.getInterpolated(25), 250);
+		ASSERT_EQ(interpolator.getInterpolated(30), 300);
+		ASSERT_EQ(interpolator.getInterpolated(40), 300);
+
+		interpolator.setQuantization(10);
+		unsigned int q = 0;
+		ASSERT_EQ(interpolator.getInterpolated(25, &q), 300);
+		ASSERT_EQ(q, 30);
+		ASSERT_EQ(interpolator.getInterpolated(24, &q), 200);
+		ASSERT_EQ(q, 20);
+
+		return TestPass;
+	}
+};
+
+TEST_REGISTER(InterpolatorTest)
diff --git a/test/ipa/libipa/meson.build b/test/ipa/libipa/meson.build
new file mode 100644
index 000000000000..4d2427dbd4e7
--- /dev/null
+++ b/test/ipa/libipa/meson.build
@@ -0,0 +1,15 @@ 
+# SPDX-License-Identifier: CC0-1.0
+
+libipa_test = [
+    {'name': 'interpolator', 'sources': ['interpolator.cpp']},
+]
+
+foreach test : libipa_test
+    exe = executable(test['name'], test['sources'],
+                     dependencies : [libcamera_private, libipa_dep],
+                     link_with : [test_libraries],
+                     include_directories : [test_includes_internal,
+                                            '../../../src/ipa/libipa/'])
+
+    test(test['name'], exe, suite : 'ipa')
+endforeach
diff --git a/test/ipa/meson.build b/test/ipa/meson.build
index e9871aba44ee..63820de54899 100644
--- a/test/ipa/meson.build
+++ b/test/ipa/meson.build
@@ -1,5 +1,6 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
+subdir('libipa')
 subdir('rkisp1')
 
 ipa_test = [