Add regular image filter for brightness.

Author: Mysticial

SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp

@@ -170,6 +170,22 @@ ImageRGB32 filter_rgb32_euclidean(
 
 
 
+ImageRGB32 filter_rgb32_brightness(
+    const ImageViewRGB32& image,
+    Color replacement_color, bool replace_color_within_range,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::filter_rgb32_brightness(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replacement_color, replace_color_within_range,
+        weights,
+        min_brightness, max_brightness
+    );
+    return ret;
+}
 ImageRGB32 to_blackwhite_rgb32_brightness(
     const ImageViewRGB32& image,
     bool in_range_black,

SerialPrograms/Source/CommonTools/Images/ImageFilter.h

@@ -128,6 +128,16 @@ ImageRGB32 filter_rgb32_euclidean(
 
 
 
+//  Similar to "filter_rgb32_range()". But instead of checking if each of
+//  the RGB components are within a range, we check if the dot product of the
+//  components and a set of weights is within a range. By selecting the weights,
+//  you can pick which components to check the brightness of.
+ImageRGB32 filter_rgb32_brightness(
+    const ImageViewRGB32& image,
+    Color replacement_color, bool replace_color_within_range,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
 //  Similar to "to_blackwhite_rgb32_range()". But instead of checking if each of
 //  the RGB components are within a range, we check if the dot product of the
 //  components and a set of weights is within a range. By selecting the weights,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.cpp

@@ -12,31 +12,82 @@ namespace PokemonAutomation{
 namespace Kernels{
 
 
-#if 0
+
+size_t filter_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
 size_t filter_rgb32_brightness_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
     uint32_t min_brightness, uint32_t max_brightness
 );
 size_t filter_rgb32_brightness(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
     uint32_t min_brightness, uint32_t max_brightness
 ){
     if (width * height > 0xffffffff){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
     }
-
+#ifdef PA_AutoDispatch_x64_19_IceLake
+    if (CPU_CAPABILITY_CURRENT.OK_19_IceLake){
+        return filter_rgb32_brightness_x64_AVX512VNNI(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return filter_rgb32_brightness_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return filter_rgb32_brightness_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
     return filter_rgb32_brightness_Default(
         in, in_bytes_per_row, width, height,
         out, out_bytes_per_row,
         replacement, replace_color_within_range,
-        min_brightness, max_brightness
+        weights, min_brightness, max_brightness
     );
 }
-#endif
 
 
 

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h

@@ -46,16 +46,13 @@ union Rgb32BrightnessWeights{
 
 
 
-
-#if 0
 size_t filter_rgb32_brightness(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,
     uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
     uint32_t min_brightness, uint32_t max_brightness
 );
-#endif
-
 
 size_t to_blackwhite_rgb32_brightness(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp

@@ -52,6 +52,23 @@ class PixelTest_Rgb32Brightness_Default{
 
 
 
+size_t filter_rgb32_brightness_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_Default tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_Default<PixelTest_Rgb32Brightness_Default> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
 size_t to_blackwhite_rgb32_brightness_Default(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp

@@ -59,6 +59,23 @@ class PixelTest_Rgb32Brightness_x64_AVX2{
 
 
 
+size_t filter_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX2 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_AVX2<PixelTest_Rgb32Brightness_x64_AVX2> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
 size_t to_blackwhite_rgb32_brightness_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp

@@ -50,6 +50,23 @@ class PixelTest_Rgb32Brightness_x64_AVX512VNNI{
 
 
 
+size_t filter_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX512VNNI tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_AVX512<PixelTest_Rgb32Brightness_x64_AVX512VNNI> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
 size_t to_blackwhite_rgb32_brightness_x64_AVX512VNNI(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp

@@ -59,6 +59,23 @@ class PixelTest_Rgb32Brightness_x64_SSE42{
 
 
 
+size_t filter_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_SSE42 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_SSE42<PixelTest_Rgb32Brightness_x64_SSE42> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
 size_t to_blackwhite_rgb32_brightness_x64_SSE42(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp

@@ -88,12 +88,6 @@ size_t filter_rgb32_range_Default(
     filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
     return filter.count();
 }
-
-
-
-
-
-
 size_t to_blackwhite_rgb32_range_Default(
     const uint32_t* image, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,

SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp

@@ -77,11 +77,6 @@ size_t filter_rgb32_range_x64_AVX2(
     filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
     return filter.count();
 }
-
-
-
-
-
 size_t to_blackwhite_rgb32_range_x64_AVX2(
     const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
     uint32_t* out, size_t out_bytes_per_row,