Add AVIF speed dial to cmdline

Author: Joe Drago

lib/include/colorist/context.h

@@ -164,6 +164,8 @@ typedef struct clWriteParams
     int quantizerMax;      // AVIF only. 0-63 range. 0 is lossless. -1 is "ignore and use quality"
     int tileRowsLog2;      // AVIF only. 0-6 range. 0 is disabled. Requests 2^n tile rows during encoding.
     int tileColsLog2;      // AVIF only. 0-6 range. 0 is disabled. Requests 2^n tile cols during encoding.
+    int speed;             // AVIF only. [-1,10] range. -1 is "let the codec choose a default".
+                           //            0 is best quality, 10 is fastest encoding speed
     const char * codec;    // AVIF only. Specify a codec to write with (NULL == auto)
 } clWriteParams;
 void clWriteParamsSetDefaults(struct clContext * C, clWriteParams * writeParams);

lib/src/context.c

@@ -452,6 +452,7 @@ void clWriteParamsSetDefaults(struct clContext * C, clWriteParams * writeParams)
     writeParams->quantizerMax = -1;
     writeParams->tileRowsLog2 = 0;
     writeParams->tileColsLog2 = 0;
+    writeParams->speed = -1;
     writeParams->codec = NULL;
 }
 
@@ -905,6 +906,14 @@ clBool clContextParseArgs(clContext * C, int argc, const char * argv[])
                 }
                 C->params.writeParams.quantizerMin = CL_CLAMP(C->params.writeParams.quantizerMin, 0, 63);
                 C->params.writeParams.quantizerMax = CL_CLAMP(C->params.writeParams.quantizerMax, 0, 63);
+            } else if (!strcmp(arg, "--speed")) {
+                NEXTARG();
+                if (!strcmp(arg, "auto")) {
+                    C->params.writeParams.speed = -1;
+                } else {
+                    C->params.writeParams.speed = atoi(arg);
+                    C->params.writeParams.speed = CL_CLAMP(C->params.writeParams.speed, 0, 10);
+                }
             } else if (!strcmp(arg, "--tiling")) {
                 NEXTARG();
                 char tmpBuffer[16]; // the biggest legal string is "6,6", so I don't mind truncation here
@@ -1100,6 +1109,7 @@ void clContextPrintSyntax(clContext * C)
     clContextLog(C, NULL, 0, "    --quantizer MIN,MAX      : Choose min and max quantizer values directly instead of using -q (AVIF only, 0-63 range, 0,0 is lossless)");
     clContextLog(C, NULL, 0, "    --tiling ROWS,COLS       : Enable tiling when encoding (AVIF only, 0-6 range, log2 based. Enables 2^ROWS rows and/or 2^COLS cols)");
     clContextLog(C, NULL, 0, "    --codec READ,WRITE       : Specify which internal codec to be used when decoding (AVIF only, auto,auto is default, see libavif version below for choices)");
+    clContextLog(C, NULL, 0, "    --speed SPEED            : Specify the quality/speed tradeoff when encoding (AVIF only, [0-10] range. auto = default (let the codec decide), 0=best quality, 10=fastest)");
     clContextLog(C, NULL, 0, "");
     clContextLog(C, NULL, 0, "Convert Options:");
     clContextLog(C, NULL, 0, "    --resize w,h,filter      : Resize dst image to WxH. Use optional filter (auto (default), box, triangle, cubic, catmullrom, mitchell, nearest)");

lib/src/format_avif.c

@@ -293,6 +293,12 @@ clBool clFormatWriteAVIF(struct clContext * C, struct clImage * image, const cha
     } else {
         clContextLog(C, "avif", 1, "Encoding tiling (log2): disabled");
     }
+    encoder->speed = writeParams->speed;
+    if (encoder->speed == -1) {
+        clContextLog(C, "avif", 1, "Encoding speed (0=BestQuality, 10=Fastest): default (%s)", codecName);
+    } else {
+        clContextLog(C, "avif", 1, "Encoding speed (0=BestQuality, 10=Fastest): %d", encoder->speed);
+    }
     avifResult encodeResult = avifEncoderWrite(encoder, avif, &avifOutput);
     if (encodeResult != AVIF_RESULT_OK) {
         clContextLogError(C, "AVIF encoder failed (%s)", avifResultToString(encodeResult));