mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge #19693
19693: sys/color: extend unittest and fix module r=maribu a=kfessel ### Contribution description this extends the unittest for sys_color testing more colors ### Testing procedure ``` RIOT_tree/tests/unittests$ make tests-color test ``` will fail since our `rgb2hsv` implementation is wrong (or is using an other colorspace than hsv2rgb (without documenting)) the new `hsv2rgb` test will succeed ### Issues/PRs references #19614 was the reason i had a look at this #1315 added the rgb2hsv and hsv2rgb function #9940 added the test for black special case https://www.vagrearg.org/content/hsvrgb << some optimization for that function (avoiding float) Co-authored-by: Karl Fessel <karl.fessel@ovgu.de>
This commit is contained in:
bors[bot]
GitHub
commit
24a26c91cf
@ -27,54 +27,74 @@
|
||||
|
||||
void color_rgb2hsv(color_rgb_t *rgb, color_hsv_t *hsv)
|
||||
{
|
||||
float rd, gd, bd, delta;
|
||||
float rd, gd, bd, delta, min, max;
|
||||
int imax, imin, sector;
|
||||
|
||||
/* norm RGB colors to the range [0 - 1.0] */
|
||||
rd = (float)rgb->r / 255.0f;
|
||||
gd = (float)rgb->g / 255.0f;
|
||||
bd = (float)rgb->b / 255.0f;
|
||||
|
||||
/* find value as maximum of the three colors */
|
||||
if (rd >= gd) {
|
||||
hsv->v = (rd >= bd) ? rd : bd;
|
||||
}
|
||||
else {
|
||||
hsv->v = (gd >= bd) ? gd : bd;
|
||||
/* catch special case grey first */
|
||||
if (rgb->r == rgb->g && rgb->r == rgb->b) {
|
||||
hsv->v = (float)rgb->r * (1 / 255.0f);
|
||||
hsv->s = 0.0f;
|
||||
hsv->h = 0.0f; /* hue might be anything for grey, but it is not uncommon to use 0 */
|
||||
return;
|
||||
}
|
||||
|
||||
/* compute delta from value and minimum of the three RGB colors */
|
||||
if (rd <= gd) {
|
||||
delta = (rd <= bd) ? (hsv->v - rd) : (hsv->v - bd);
|
||||
/* normalize RGB colors to the range [0 - 1.0] */
|
||||
/* multiplication is often faster than division -> using compile time constant */
|
||||
rd = (float)rgb->r * (1 / 255.0f);
|
||||
gd = (float)rgb->g * (1 / 255.0f);
|
||||
bd = (float)rgb->b * (1 / 255.0f);
|
||||
|
||||
/* find maximum of the three colors and sector */
|
||||
/* using the comparing faster integer color value */
|
||||
imax = rgb->r;
|
||||
max = rd;
|
||||
sector = 0;
|
||||
if (rgb->g > imax) {
|
||||
imax = rgb->g;
|
||||
max = gd;
|
||||
sector = 1;
|
||||
}
|
||||
else {
|
||||
delta = (gd <= bd) ? (hsv->v - gd) : (hsv->v - bd);
|
||||
if (rgb->b > imax) {
|
||||
imax = rgb->b;
|
||||
max = bd;
|
||||
sector = 2;
|
||||
}
|
||||
/* value is maximum*/
|
||||
hsv->v = max;
|
||||
|
||||
/* find of minimum the three RGB colors */
|
||||
imin = rgb->r;
|
||||
min = rd;
|
||||
if (rgb->g < imin) {
|
||||
imin = rgb->g;
|
||||
min = gd;
|
||||
}
|
||||
if (rgb->b < imin) {
|
||||
imin = rgb->b;
|
||||
min = bd;
|
||||
}
|
||||
/* compute delta from value and minimum*/
|
||||
delta = hsv->v - min;
|
||||
|
||||
/* find the saturation from value and delta */
|
||||
hsv->s = (hsv->v != 0.0f) ? (delta / hsv->v) : 0.0f;
|
||||
/* special case gray r == g == b ^= min == max */
|
||||
hsv->s = delta / max;
|
||||
|
||||
/* compute hue */
|
||||
hsv->h = 0.0f;
|
||||
if (hsv->s != 0.0f) {
|
||||
float rc, gc, bc;
|
||||
|
||||
rc = (hsv->v - rd) / delta;
|
||||
gc = (hsv->v - gd) / delta;
|
||||
bc = (hsv->v - bd) / delta;
|
||||
|
||||
if (rd == hsv->v) {
|
||||
hsv->h = bc - gc;
|
||||
}
|
||||
else if (gd == hsv->v) {
|
||||
hsv->h = 2.0f + rc - bc;
|
||||
}
|
||||
else {
|
||||
hsv->h = 4.0f + gc - rc;
|
||||
}
|
||||
hsv->h *= 60.0f;
|
||||
if (hsv->h < 0.0f) {
|
||||
hsv->h += 360.0f;
|
||||
}
|
||||
float p = 60.0f / delta;
|
||||
switch (sector){
|
||||
case 0:
|
||||
hsv->h = (gd - bd) * p;
|
||||
break;
|
||||
case 1:
|
||||
hsv->h = 120.0f + (bd - rd) * p;
|
||||
break;
|
||||
case 2:
|
||||
hsv->h = 240.0f + (rd - gd) * p;
|
||||
break;
|
||||
}
|
||||
if (hsv->h < 0.0f) {
|
||||
hsv->h += 360.0f;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -18,9 +18,11 @@
|
||||
|
||||
#include "color.h"
|
||||
|
||||
#include "container.h"
|
||||
|
||||
#include "tests-color.h"
|
||||
|
||||
#define HSV_EPSILON (1E-10f)
|
||||
#define HSV_EPSILON (1E-2f)
|
||||
|
||||
static void test_str2rgb_upper_case__success(void)
|
||||
{
|
||||
@ -75,20 +77,91 @@ static void test_rgb2hex__success(void)
|
||||
TEST_ASSERT_EQUAL_INT(0x000AB13C, hex);
|
||||
}
|
||||
|
||||
static void test_rgb2hsv__black(void)
|
||||
static void test_rgb2hsv(void)
|
||||
{
|
||||
color_hsv_t hsv;
|
||||
color_rgb_t rgb = { .r = 0x00, .g = 0x00, .b = 0x00 };
|
||||
struct { color_hsv_t hsv; color_rgb_t rgb; } h_r[] = {
|
||||
{ { 0, 0, 0 }, { 0, 0, 0 } }, /*Black*/
|
||||
{ { 0, 0, 100 }, { 255, 255, 255 } }, /*White*/
|
||||
{ { 0, 100, 100 }, { 255, 0, 0 } }, /*Red*/
|
||||
{ { 120, 100, 100 }, { 0, 255, 0 } }, /*Lime*/
|
||||
{ { 240, 100, 100 }, { 0, 0, 255 } }, /*Blue*/
|
||||
{ { 60, 100, 100 }, { 255, 255, 0 } }, /*Yellow*/
|
||||
{ { 180, 100, 100 }, { 0, 255, 255 } }, /*Cyan*/
|
||||
{ { 300, 100, 100 }, { 255, 0, 255 } }, /*Magenta*/
|
||||
{ { 0, 0, 75 }, { 191, 191, 191 } }, /*Silver*/
|
||||
{ { 0, 0, 50 }, { 128, 128, 128 } }, /*Gray*/
|
||||
{ { 0, 100, 50 }, { 128, 0, 0 } }, /*Maroon*/
|
||||
{ { 60, 100, 50 }, { 128, 128, 0 } }, /*Olive*/
|
||||
{ { 120, 100, 50 }, { 0, 128, 0 } }, /*Green*/
|
||||
{ { 300, 100, 50 }, { 128, 0, 128 } }, /*Purple*/
|
||||
{ { 180, 100, 50 }, { 0, 128, 128 } }, /*Teal*/
|
||||
{ { 240, 100, 50 }, { 0, 0, 128 } } /*Navy*/
|
||||
};
|
||||
unsigned len = ARRAY_SIZE(h_r);
|
||||
|
||||
color_rgb2hsv(&rgb, &hsv);
|
||||
for (unsigned i = 0; i < len; i++) {
|
||||
color_hsv_t hsv_o = { .h = h_r[i].hsv.h,
|
||||
.s = h_r[i].hsv.s / 100,
|
||||
.v = h_r[i].hsv.v / 100 };
|
||||
color_rgb_t rgb_o = { .r = h_r[i].rgb.r,
|
||||
.g = h_r[i].rgb.g,
|
||||
.b = h_r[i].rgb.b };
|
||||
|
||||
/* XXX floats should never be compared for equality, so we check if we
|
||||
* are within HSV_EPSILON of tolerance */
|
||||
TEST_ASSERT(-HSV_EPSILON <= hsv.s);
|
||||
TEST_ASSERT(-HSV_EPSILON <= hsv.v);
|
||||
TEST_ASSERT( HSV_EPSILON >= hsv.s);
|
||||
TEST_ASSERT( HSV_EPSILON >= hsv.v);
|
||||
/* Hue for black is undefined so we don't check it */
|
||||
color_hsv_t hsv;
|
||||
color_rgb2hsv(&rgb_o, &hsv);
|
||||
|
||||
/* XXX floats should never be compared for equality, so we check if we
|
||||
* are within HSV_EPSILON of tolerance */
|
||||
TEST_ASSERT(-HSV_EPSILON <= hsv.s - hsv_o.s);
|
||||
TEST_ASSERT( HSV_EPSILON >= hsv.s - hsv_o.s);
|
||||
TEST_ASSERT(-HSV_EPSILON <= hsv.v - hsv_o.v);
|
||||
TEST_ASSERT( HSV_EPSILON >= hsv.v - hsv_o.v);
|
||||
/* Hue for grey is undefined so we don't check it */
|
||||
if (hsv.s >= 0.0001f) {
|
||||
TEST_ASSERT(-HSV_EPSILON <= hsv.h - hsv_o.h);
|
||||
TEST_ASSERT( HSV_EPSILON >= hsv.h - hsv_o.h);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void test_hsv2rgb(void)
|
||||
{
|
||||
struct { color_hsv_t hsv; color_rgb_t rgb; } h_r[] = {
|
||||
{ { 0, 0, 0 }, { 0, 0, 0 } }, /*Black*/
|
||||
{ { 0, 0, 100 }, { 255, 255, 255 } }, /*White*/
|
||||
{ { 0, 100, 100 }, { 255, 0, 0 } }, /*Red*/
|
||||
{ { 120, 100, 100 }, { 0, 255, 0 } }, /*Lime*/
|
||||
{ { 240, 100, 100 }, { 0, 0, 255 } }, /*Blue*/
|
||||
{ { 60, 100, 100 }, { 255, 255, 0 } }, /*Yellow*/
|
||||
{ { 180, 100, 100 }, { 0, 255, 255 } }, /*Cyan*/
|
||||
{ { 300, 100, 100 }, { 255, 0, 255 } }, /*Magenta*/
|
||||
{ { 0, 0, 75 }, { 191, 191, 191 } }, /*Silver*/
|
||||
{ { 0, 0, 50 }, { 128, 128, 128 } }, /*Gray*/
|
||||
{ { 0, 100, 50 }, { 128, 0, 0 } }, /*Maroon*/
|
||||
{ { 60, 100, 50 }, { 128, 128, 0 } }, /*Olive*/
|
||||
{ { 120, 100, 50 }, { 0, 128, 0 } }, /*Green*/
|
||||
{ { 300, 100, 50 }, { 128, 0, 128 } }, /*Purple*/
|
||||
{ { 180, 100, 50 }, { 0, 128, 128 } }, /*Teal*/
|
||||
{ { 240, 100, 50 }, { 0, 0, 128 } } /*Navy*/
|
||||
};
|
||||
unsigned len = ARRAY_SIZE(h_r);
|
||||
|
||||
for (unsigned i = 0; i < len; i++) {
|
||||
color_hsv_t hsv_o = { .h = h_r[i].hsv.h,
|
||||
.s = h_r[i].hsv.s / 100,
|
||||
.v = h_r[i].hsv.v / 100 };
|
||||
color_rgb_t rgb_o = { .r = h_r[i].rgb.r,
|
||||
.g = h_r[i].rgb.g,
|
||||
.b = h_r[i].rgb.b };
|
||||
|
||||
color_rgb_t rgb;
|
||||
color_hsv2rgb(&hsv_o, &rgb);
|
||||
|
||||
TEST_ASSERT(rgb.r <= rgb_o.r + 1 && rgb.r >= rgb_o.r - 1);
|
||||
TEST_ASSERT(rgb.g <= rgb_o.g + 1 && rgb.g >= rgb_o.g - 1);
|
||||
TEST_ASSERT(rgb.b <= rgb_o.b + 1 && rgb.b >= rgb_o.b - 1);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static void test_rgb_invert__success(void)
|
||||
@ -126,7 +199,8 @@ Test *tests_color_tests(void)
|
||||
new_TestFixture(test_hex2rgb__success),
|
||||
new_TestFixture(test_rgb2hex__success),
|
||||
new_TestFixture(test_rgb2str__success),
|
||||
new_TestFixture(test_rgb2hsv__black),
|
||||
new_TestFixture(test_rgb2hsv),
|
||||
new_TestFixture(test_hsv2rgb),
|
||||
new_TestFixture(test_rgb_invert__success),
|
||||
new_TestFixture(test_rgb_complementary__success),
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user