From f39be2686446c41a5fbf93eba7fb40ca99efcc3a Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 9 Sep 2014 13:57:32 +0200 Subject: Add software roi feature to dexela plugin --- test/CMakeLists.txt | 4 ++++ test/test-software-roi.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 test/test-software-roi.c (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0e8cfad..afe79ec 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,10 +1,14 @@ cmake_minimum_required(VERSION 2.6) +include_directories(${ucadexela_SOURCE_DIR}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl) add_executable(test-mock test-mock.c) add_executable(test-ring-buffer test-ring-buffer.c) +add_executable(test-software-roi test-software-roi.c ${ucadexela_SOURCE_DIR}/software-roi.c) target_link_libraries(test-mock uca ${UCA_DEPS}) target_link_libraries(test-ring-buffer uca ${UCA_DEPS}) +target_link_libraries(test-software-roi ${UCA_DEPS}) diff --git a/test/test-software-roi.c b/test/test-software-roi.c new file mode 100644 index 0000000..2b628c5 --- /dev/null +++ b/test/test-software-roi.c @@ -0,0 +1,53 @@ +#include +#include "software-roi.h" + +static const guchar test_frame[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 1, 2, 3, 4, 5, 6, 7, 8, +}; +static const guint test_frame_width = 9; + +static guchar test_roi_2x1_5x3[] = { + 2, 3, 4, 5, 6, + 2, 3, 4, 5, 6, + 2, 3, 4, 5, 6, +}; + +void typical_roi_test(void) +{ + guint roiX = 2; + guint roiY = 1; + guint roiWidth = 5; + guint roiHeight = 3; + guint roiSize = roiWidth * roiHeight; + guchar roiFrame[roiSize]; + apply_software_roi(test_frame, test_frame_width, roiFrame, roiX, roiY, roiWidth, roiHeight); + for (guint i = 0; i < roiSize; i++) { + g_assert_cmpint(test_roi_2x1_5x3[i], ==, roiFrame[i]); + } +} + +void nrows_only_roi_test(void) +{ + guint roiX = 0; + guint roiY = 0; + guint roiWidth = test_frame_width; + guint roiHeight = 3; + guint roiSize = roiWidth * roiHeight; + guchar roiFrame[roiSize]; + apply_software_roi(test_frame, test_frame_width, roiFrame, roiX, roiY, roiWidth, roiHeight); + for (guint i = 0; i < roiSize; i++) { + g_assert_cmpint(test_frame[i], ==, roiFrame[i]); + } +} + +int main(int argc, char** argv) +{ + g_test_init(&argc, &argv, NULL); + g_test_add_func("/software-roi/apply-typical-roi", typical_roi_test); + g_test_add_func("/software-roi/apply-roi-nrows-only", nrows_only_roi_test); + return g_test_run(); +} -- cgit v1.2.3 From 718cb1e5d2059b5d88bfe34d8c8bcca6a4550249 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 16 Sep 2014 11:34:47 +0200 Subject: Fix dexela software roi for multi-byte images --- test/test-software-roi.c | 54 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/test-software-roi.c b/test/test-software-roi.c index 2b628c5..08ab742 100644 --- a/test/test-software-roi.c +++ b/test/test-software-roi.c @@ -2,18 +2,34 @@ #include "software-roi.h" static const guchar test_frame[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, - 0, 1, 2, 3, 4, 5, 6, 7, 8, - 0, 1, 2, 3, 4, 5, 6, 7, 8, - 0, 1, 2, 3, 4, 5, 6, 7, 8, - 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 10, 20, 30, 40, 50, 60, 70, 80, + 0, 11, 21, 31, 41, 51, 61, 71, 81, + 0, 12, 22, 32, 42, 52, 62, 72, 82, + 0, 13, 23, 33, 43, 53, 63, 73, 83, + 0, 14, 24, 34, 44, 54, 64, 74, 84, }; static const guint test_frame_width = 9; - static guchar test_roi_2x1_5x3[] = { - 2, 3, 4, 5, 6, - 2, 3, 4, 5, 6, - 2, 3, 4, 5, 6, + 21, 31, 41, 51, 61, + 22, 32, 42, 52, 62, + 23, 33, 43, 53, 63, +}; + +static const guchar test_frame16bit[] = { + 0, 0, 10, 10, 20, 20, 30, 30, 40, 40, 50, 50, 60, 60, 70, 70, + 1, 1, 11, 11, 21, 21, 31, 31, 41, 41, 51, 51, 61, 61, 71, 71, + 2, 2, 12, 12, 22, 22, 32, 32, 42, 42, 52, 52, 62, 62, 72, 72, + 3, 3, 13, 13, 23, 23, 33, 33, 43, 43, 53, 53, 63, 63, 73, 73, + 4, 4, 14, 14, 24, 24, 34, 34, 44, 44, 54, 54, 64, 64, 74, 74, + 5, 5, 15, 15, 25, 25, 35, 35, 45, 45, 55, 55, 65, 65, 75, 75, + 6, 6, 16, 16, 26, 26, 36, 36, 46, 46, 56, 56, 66, 66, 76, 76, +}; +static const guint test_frame16bit_width = 8; +static guchar test_roi16bit_3x3_5x3[] = { + 33, 33, 43, 43, 53, 53, 63, 63, 73, 73, + 34, 34, 44, 44, 54, 54, 64, 64, 74, 74, + 35, 35, 45, 45, 55, 55, 65, 65, 75, 75, + 36, 36, 46, 46, 56, 56, 66, 66, 76, 76, }; void typical_roi_test(void) @@ -24,7 +40,7 @@ void typical_roi_test(void) guint roiHeight = 3; guint roiSize = roiWidth * roiHeight; guchar roiFrame[roiSize]; - apply_software_roi(test_frame, test_frame_width, roiFrame, roiX, roiY, roiWidth, roiHeight); + apply_software_roi(test_frame, test_frame_width, 1, roiFrame, roiX, roiY, roiWidth, roiHeight); for (guint i = 0; i < roiSize; i++) { g_assert_cmpint(test_roi_2x1_5x3[i], ==, roiFrame[i]); } @@ -38,16 +54,32 @@ void nrows_only_roi_test(void) guint roiHeight = 3; guint roiSize = roiWidth * roiHeight; guchar roiFrame[roiSize]; - apply_software_roi(test_frame, test_frame_width, roiFrame, roiX, roiY, roiWidth, roiHeight); + apply_software_roi(test_frame, test_frame_width, 1, roiFrame, roiX, roiY, roiWidth, roiHeight); for (guint i = 0; i < roiSize; i++) { g_assert_cmpint(test_frame[i], ==, roiFrame[i]); } } +void multibyte_image_test(void) +{ + guint roiX = 3; + guint roiY = 3; + guint roiWidth = 5; + guint roiHeight = 3; + guint bytesPerPixel = 2; + guint roiSize = roiWidth * bytesPerPixel * roiHeight; + guchar roiFrame[roiSize]; + apply_software_roi(test_frame16bit, test_frame16bit_width, bytesPerPixel, roiFrame, roiX, roiY, roiWidth, roiHeight); + for (guint i = 0; i < roiSize; i++) { + g_assert_cmpint(test_roi16bit_3x3_5x3[i], ==, roiFrame[i]); + } +} + int main(int argc, char** argv) { g_test_init(&argc, &argv, NULL); g_test_add_func("/software-roi/apply-typical-roi", typical_roi_test); g_test_add_func("/software-roi/apply-roi-nrows-only", nrows_only_roi_test); + g_test_add_func("/software-roi/apply-roi-multibyte-image", multibyte_image_test); return g_test_run(); } -- cgit v1.2.3