Don't slice-encode with encoders which don't benefit from it

Author: bangnoise

source/DXTEncoder.h

@@ -67,6 +67,7 @@ struct HapCodecDXTEncoder {
     HapCodecDXTEncoder_DescribeFunction describe_function;
 #endif
     Boolean pad_source_buffers;
+    Boolean can_slice;
 };
 
 #define HapCodecDXTEncoderDestroy(x) if ((x) && (x)->destroy_function) (x)->destroy_function((x))

source/GLDXTEncoder.c

@@ -125,6 +125,7 @@ HapCodecDXTEncoderRef HapCodecGLEncoderCreate(unsigned int width, unsigned int h
         encoder->base.pixelformat_function = HapCodecGLEncoderWantedPixelFormat;
         encoder->base.encode_function = HapCodecGLEncoderEncode;
         encoder->base.pad_source_buffers = true;
+        encoder->base.can_slice = false;
 
         encoder->queue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
         encoder->encoder = HapCodecGLCreateEncoder(width, height, encoder_format);

source/HapCompressor.c

@@ -692,15 +692,17 @@ static void Encode_Slice(void *p, unsigned int index)
         }
     }
 
-    // Encode the DXT frame
-
-    task->encoder->encode_function(task->encoder,
-                                   dxtInput,
-                                   task->dxtInputBytesPerRow,
-                                   task->dxtInputFormat,
-                                   dxt,
-                                   task->width,
-                                   sliceHeight);
+    if (task->encoder->can_slice)
+    {
+        // Encode the DXT frame
+        task->encoder->encode_function(task->encoder,
+                                       dxtInput,
+                                       task->dxtInputBytesPerRow,
+                                       task->dxtInputFormat,
+                                       dxt,
+                                       task->width,
+                                       sliceHeight);
+    }
 }
 
 static void Background_Encode(void *info)
@@ -932,6 +934,17 @@ Hap_CEncodeFrame(
 
         HapParallelFor(Encode_Slice, &dxtTask, glob->sliceCount);
 
+        if (dxtTask.encoder->can_slice == false)
+        {
+            dxtTask.encoder->encode_function(dxtTask.encoder,
+                                             dxtTask.dxtInput,
+                                             dxtTask.dxtInputBytesPerRow,
+                                             dxtTask.dxtInputFormat,
+                                             dxtTask.dxt,
+                                             dxtTask.width,
+                                             dxtTask.height);
+        }
+
         CVPixelBufferUnlockBaseAddress(sourcePixelBuffer, kHapCodecCVPixelBufferLockFlags);
 
         // Detach the sourceFrame as soon as we are finished with it

source/SquishEncoder.c

@@ -192,6 +192,7 @@ HapCodecDXTEncoderRef HapCodecSquishEncoderCreate(HapCodecSquishEncoderQuality q
         encoder->base.encode_function = HapCodecSquishEncoderEncode;
         encoder->base.destroy_function = HapCodecSquishEncoderDestroy;
         encoder->base.pad_source_buffers = false;
+        encoder->base.can_slice = true;
 
         switch (quality) {
             case HapCodecSquishEncoderWorstQuality:

source/YCoCgDXTEncoder.c

@@ -73,6 +73,7 @@ HapCodecDXTEncoderRef HapCodecYCoCgDXTEncoderCreate(void)
         encoder->describe_function = HapCodecYCoCgDXTEncoderDescribe;
 #endif
         encoder->pad_source_buffers = false;
+        encoder->can_slice = true;
     }
     return encoder;
 }