Minor code tidy: move channel permutation into ImageMath.c

Author: bangnoise

source/HapCompressor.c

@@ -41,7 +41,7 @@
 #include "Tasks.h"
 #include "Buffers.h"
 #include "DXTEncoder.h"
-#include <Accelerate/Accelerate.h>
+#include "ImageMath.h"
 
 /*
  Defines determining the method of DXT compression.
@@ -681,28 +681,14 @@ static void Background_Encode(void *info)
                 case k32RGBAPixelFormat:
                     if (sourcePixelFormat == k32BGRAPixelFormat)
                     {
-                        vImage_Buffer src = {
-                            sourceBaseAddress,
-                            glob->height,
-                            glob->width,
-                            sourceBytesPerRow
-                        };
-                        
-                        vImage_Buffer dst = {
-                            HapCodecBufferGetBaseAddress(formatConvertBuffer),
-                            glob->height,
-                            glob->width,
-                            glob->formatConvertBufferBytesPerRow
-                        };
-                        
                         uint8_t permuteMap[] = {2, 1, 0, 3};
-                        vImage_Error permuteError = vImagePermuteChannels_ARGB8888(&src, &dst, permuteMap, kvImageNoFlags);
-                        
-                        if (permuteError != kvImageNoError)
-                        {
-                            err = internalComponentErr;
-                            goto bail;
-                        }
+                        ImageMath_Permute8888(sourceBaseAddress,
+                                              sourceBytesPerRow,
+                                              HapCodecBufferGetBaseAddress(formatConvertBuffer),
+                                              glob->formatConvertBufferBytesPerRow,
+                                              glob->width,
+                                              glob->height,
+                                              permuteMap);
                     }
                     else
                     {

source/HapDecompressor.c

@@ -64,7 +64,7 @@
 
 #ifdef HAP_SQUISH_DECODE
     #include "squish-c.h"
-    #include <Accelerate/Accelerate.h>
+    #include "ImageMath.h"
 #endif
 
 // Data structures
@@ -671,17 +671,14 @@ pascal ComponentResult Hap_DDrawBand(HapDecompressorGlobals glob, ImageSubCodecD
                 // TODO: avoid the permute stage
                 if (myDrp->needsPermute)
                 {
-                    vImage_Buffer srcV, dstV;
-                    srcV.data = HapCodecBufferGetBaseAddress(myDrp->permuteBuffer);
-                    srcV.width = myDrp->dxtWidth;
-                    srcV.height = myDrp->dxtHeight;
-                    srcV.rowBytes = myDrp->dxtWidth * 4;
-                    dstV.data = drp->baseAddr;
-                    dstV.width = myDrp->dxtWidth;
-                    dstV.height = myDrp->dxtHeight;
-                    dstV.rowBytes = drp->rowBytes;
                     uint8_t permuteMap[] = {2, 1, 0, 3};
-                    vImagePermuteChannels_ARGB8888(&srcV, &dstV, permuteMap, kvImageNoFlags);
+                    ImageMath_Permute8888(HapCodecBufferGetBaseAddress(myDrp->permuteBuffer),
+                                          myDrp->dxtWidth * 4,
+                                          drp->baseAddr,
+                                          drp->rowBytes,
+                                          myDrp->dxtWidth,
+                                          myDrp->dxtHeight,
+                                          permuteMap);
                 }
                 else
                 {

source/ImageMath.c

@@ -141,3 +141,56 @@ void ImageMath_MatrixMultiply8888(const void *src,
     }
 #endif // IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
 }
+
+void ImageMath_Permute8888(const void *src,
+                           size_t src_bytes_per_row,
+                           void *dst,
+                           size_t dst_bytes_per_row,
+                           unsigned long width,
+                           unsigned long height,
+                           const uint8_t permuteMap[4])
+{
+#ifdef IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+    if (vImagePermuteChannels_ARGB8888 != NULL)
+    {
+#endif // IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+#ifdef IMAGE_MATH_USE_V_IMAGE
+        vImage_Buffer v_src = {
+            (void *)src,
+            height,
+            width,
+            src_bytes_per_row
+        };
+        
+        vImage_Buffer v_dst = {
+            dst,
+            height,
+            width,
+            dst_bytes_per_row
+        };
+        
+        vImagePermuteChannels_ARGB8888(&v_src, &v_dst, permuteMap, kvImageNoFlags);
+#endif // IMAGE_MATH_USE_V_IMAGE
+#ifdef IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+    }
+    else
+    {
+#endif // IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+#if !defined(IMAGE_MATH_USE_V_IMAGE) || defined(IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED)
+        for (unsigned long y = 0; y < height; y++) {
+            for (unsigned long x = 0; x < width; x++) {
+                const uint8_t *pixel_src = src + (x * 4);
+                uint8_t *pixel_dst = dst + (x * 4);
+                
+                for( int i = 0; i < 4; i++ ) {
+                    pixel_dst[i] = pixel_src[permuteMap[i]];
+                }
+            }
+            src += src_bytes_per_row;
+            dst += dst_bytes_per_row;
+        }
+#endif // !defined(IMAGE_MATH_USE_V_IMAGE) || defined(IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED)
+#ifdef IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+    }
+#endif // IMAGE_MATH_USE_V_IMAGE_WEAK_LINKED
+}

source/ImageMath.h

@@ -44,4 +44,12 @@ void ImageMath_MatrixMultiply8888(const void *src,
                                   const int16_t	*pre_bias,	// An array of 4 int16_t or NULL, added before matrix op
                                   const int32_t *post_bias);	// An array of 4 int32_t or NULL, added after matrix op
 
+void ImageMath_Permute8888(const void *src,
+                           size_t src_bytes_per_row,
+                           void *dst,
+                           size_t dst_bytes_per_row,
+                           unsigned long width,
+                           unsigned long height,
+                           const uint8_t permuteMap[4]); // positions are dst channel order, values are src channel order
+
 #endif