Removed qmin and qmax (#17)

python-pillow · hugovk · Apr 1, 2025 · Jan 3, 2021 · Oct 16, 2024 · Oct 16, 2024
commit 1410d23453fca292060ca546bbd0aba8073d51e3
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
@@ -17,7 +17,7 @@ brew install \
     dav1d \
     aom \
     rav1e \
-    ninja
+    svt-av1
 if [[ "$ImageOS" == "macos13" ]]; then
     brew install --ignore-dependencies libraqm
 else

diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
@@ -60,10 +60,10 @@ jobs:
               mingw-w64-x86_64-gcc \
               mingw-w64-x86_64-ghostscript \
               mingw-w64-x86_64-lcms2 \
+              mingw-w64-x86_64-libavif \
               mingw-w64-x86_64-libimagequant \
               mingw-w64-x86_64-libjpeg-turbo \
               mingw-w64-x86_64-libraqm \
-              mingw-w64-x86_64-libavif \
               mingw-w64-x86_64-libtiff \
               mingw-w64-x86_64-libwebp \
               mingw-w64-x86_64-openjpeg2 \

diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
@@ -1359,14 +1359,8 @@ as 8-bit RGB(A).
 The :py:meth:`~PIL.Image.Image.save` method supports the following options:
 
 **quality**
-    Integer, 1-100, defaults to 75. 0 gives the smallest size and poorest
-    quality, 100 the largest and best quality. The value of this setting
-    controls the ``qmin`` and ``qmax`` encoder options.
-
-**qmin** / **qmax**
-    Integer, 0-63. The quality of images created by an AVIF encoder are
-    controlled by minimum and maximum quantizer values. The higher these
-    values are, the worse the quality.
+    Integer, 0-100, defaults to 75. 0 gives the smallest size and poorest
+    quality, 100 the largest and best quality.
 
 **subsampling**
     If present, sets the subsampling for the encoder. Defaults to ``4:2:0``.
@@ -1380,6 +1374,10 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
 **speed**
     Quality/speed trade-off (0=slower-better, 10=fastest). Defaults to 6.
 
+**max_threads**
+    Limit the number of active threads used. By default, there is no limit. If the aom
+    codec is used, there is a maximum of 64.
+
 **range**
     YUV range, either "full" or "limited". Defaults to "full"
 
@@ -1392,8 +1390,17 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
     For tile encoding, the (log 2) number of tile rows and columns to use.
     Valid values are 0-6, default 0.
 
+**autotiling**
+    Split the image up to allow parallelization. Enabled automatically if "tile_rows"
+    and "tile_cols" both have their default values of zero. Requires libavif version
+    **0.11.0** or greater.
+
 **alpha_premultiplied**
-    Encode the image with premultiplied alpha. Defaults to ``False``
+    Encode the image with premultiplied alpha. Defaults to ``False``. Requires libavif
+    version **0.9.0** or greater.
+
+**advanced**
+    Codec specific options. Requires libavif version **0.8.2** or greater.
 
 **icc_profile**
     The ICC Profile to include in the saved file.

diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst
@@ -170,7 +170,7 @@ Many of Pillow's features require external libraries:
     instead of installing libavif through Homebrew directly, you can use
     Homebrew to install libavif's build dependencies::
 
-        brew install aom dav1d rav1e
+        brew install aom dav1d rav1e svt-av1
 
     Then see ``depends/install_libavif.sh`` to install libavif.
 

diff --git a/src/PIL/AvifImagePlugin.py b/src/PIL/AvifImagePlugin.py
@@ -47,9 +47,9 @@

 def _get_default_max_threads():
    if DEFAULT_MAX_THREADS:
        return DEFAULT_MAX_THREADS
    if hasattr(os, "sched_getaffinity"):
        return len(os.sched_getaffinity(0))
    else:
        return os.cpu_count() or 1

@@ -156,8 +156,6 @@
 
     is_single_frame = total == 1
 
-    qmin = info.get("qmin", -1)
-    qmax = info.get("qmax", -1)
     quality = info.get("quality", 75)
     if not isinstance(quality, int) or quality < 0 or quality > 100:
         msg = "Invalid quality setting"
@@ -218,8 +216,6 @@
         im.size[0],
         im.size[1],
         subsampling,
-        qmin,
-        qmax,
         quality,
         speed,
         max_threads,

diff --git a/src/PIL/features.py b/src/PIL/features.py
@@ -289,8 +289,8 @@ def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None:
         ("freetype2", "FREETYPE2"),
         ("littlecms2", "LITTLECMS2"),
         ("webp", "WEBP"),
-        ("jpg", "JPEG"),
         ("avif", "AVIF"),
+        ("jpg", "JPEG"),
         ("jpg_2000", "OPENJPEG (JPEG2000)"),
         ("zlib", "ZLIB (PNG/ZIP)"),
         ("libtiff", "LIBTIFF"),

diff --git a/src/_avif.c b/src/_avif.c
@@ -25,22 +25,22 @@
 static PyTypeObject AvifDecoder_Type;

 static int
 normalize_quantize_value(int qvalue) {
    if (qvalue < AVIF_QUANTIZER_BEST_QUALITY) {
        return AVIF_QUANTIZER_BEST_QUALITY;
    } else if (qvalue > AVIF_QUANTIZER_WORST_QUALITY) {
        return AVIF_QUANTIZER_WORST_QUALITY;
    } else {
        return qvalue;
    }
 }

 static int
 normalize_tiles_log2(int value) {
    if (value < 0) {
        return 0;
    } else if (value > 6) {
        return 6;
    } else {
        return value;
    }
@@ -57,8 +57,8 @@
        case AVIF_RESULT_TRUNCATED_DATA:
        case AVIF_RESULT_NO_CONTENT:
            return PyExc_SyntaxError;
        default:
            return PyExc_RuntimeError;
    }
 }

@@ -79,15 +79,15 @@
                return axis ? 7   // 90 degrees anti-clockwise then swap left and right.
                            : 5;  // 90 degrees anti-clockwise then swap top and bottom.
            }
            return 6;  // 90 degrees anti-clockwise.
        }
        if (angle == 2) {
            if (imir) {
                return axis
                           ? 4   // 180 degrees anti-clockwise then swap left and right.
                           : 2;  // 180 degrees anti-clockwise then swap top and bottom.
            }
            return 3;  // 180 degrees anti-clockwise.
        }
        if (angle == 3) {
            if (imir) {
@@ -95,7 +95,7 @@
                           ? 5   // 270 degrees anti-clockwise then swap left and right.
                           : 7;  // 270 degrees anti-clockwise then swap top and bottom.
            }
            return 8;  // 270 degrees anti-clockwise.
        }
    }
    if (imir) {
@@ -120,11 +120,11 @@
            image->imir.mode = 1;
 #endif
            break;
        case 3:  // The 0th row is at the visual bottom of the image, and the 0th column
                 // is the visual right-hand side.
            image->transformFlags |= AVIF_TRANSFORM_IROT;
            image->irot.angle = 2;
            break;
        case 4:  // The 0th row is at the visual bottom of the image, and the 0th column
                 // is the visual left-hand side.
            image->transformFlags |= AVIF_TRANSFORM_IMIR;
@@ -135,22 +135,22 @@
            image->irot.angle = 1;  // applied before imir according to MIAF spec
                                    // ISO/IEC 28002-12:2021 - section 7.3.6.7
            break;
        case 6:  // The 0th row is the visual right-hand side of the image, and the 0th
                 // column is the visual top.
            image->transformFlags |= AVIF_TRANSFORM_IROT;
            image->irot.angle = 3;
            break;
        case 7:  // The 0th row is the visual right-hand side of the image, and the 0th
                 // column is the visual bottom.
            image->transformFlags |= AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR;
            image->irot.angle = 3;  // applied before imir according to MIAF spec
                                    // ISO/IEC 28002-12:2021 - section 7.3.6.7
            break;
        case 8:  // The 0th row is the visual left-hand side of the image, and the 0th
                 // column is the visual bottom.
            image->transformFlags |= AVIF_TRANSFORM_IROT;
            image->irot.angle = 1;
            break;
    }
 }

@@ -189,38 +189,38 @@
    Py_ssize_t i, size;
    PyObject *keyval, *py_key, *py_val;
    if (!PyTuple_Check(opts)) {
        PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
        return 1;
    }
    size = PyTuple_GET_SIZE(opts);

    for (i = 0; i < size; i++) {
        keyval = PyTuple_GetItem(opts, i);
        if (!PyTuple_Check(keyval) || PyTuple_GET_SIZE(keyval) != 2) {
            PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
            return 1;
        }
        py_key = PyTuple_GetItem(keyval, 0);
        py_val = PyTuple_GetItem(keyval, 1);
        if (!PyUnicode_Check(py_key) || !PyUnicode_Check(py_val)) {
            PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
            return 1;
        }
        const char *key = PyUnicode_AsUTF8(py_key);
        const char *val = PyUnicode_AsUTF8(py_val);
        if (key == NULL || val == NULL) {
            PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
            return 1;
        }

        avifResult result = avifEncoderSetCodecSpecificOption(encoder, key, val);
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting advanced codec options failed: %s",
                avifResultToString(result)
            );
            return 1;
        }
    }
    return 0;
@@ -234,8 +234,6 @@
     avifEncoder *encoder;
 
     char *subsampling;
-    int qmin;
-    int qmax;
     int quality;
     int speed;
     int exif_orientation;
@@ -255,12 +253,10 @@
 
     if (!PyArg_ParseTuple(
             args,
-            "IIsiiiiissiiOOSSiSO",
+            "IIsiiissiiOOSSiSO",
             &width,
             &height,
             &subsampling,
-            &qmin,
-            &qmax,
             &quality,
             &speed,
             &max_threads,
@@ -308,9 +304,9 @@

    // Validate canvas dimensions
    if (width <= 0 || height <= 0) {
        PyErr_SetString(PyExc_ValueError, "invalid canvas dimensions");
        avifImageDestroy(image);
        return NULL;
    }
    image->width = width;
    image->height = height;
@@ -327,17 +323,12 @@
                          _codec_available("aom", AVIF_CODEC_FLAG_CAN_ENCODE));
     encoder->maxThreads = is_aom_encode && max_threads > 64 ? 64 : max_threads;
 
-    if (qmin == -1 || qmax == -1) {
 #if AVIF_VERSION >= 1000000
-        encoder->quality = quality;
+    encoder->quality = quality;
 #else
-        encoder->minQuantizer = normalize_quantize_value(64 - quality);
-        encoder->maxQuantizer = normalize_quantize_value(100 - quality);
+    encoder->minQuantizer = normalize_quantize_value(64 - quality);
+    encoder->maxQuantizer = normalize_quantize_value(100 - quality);
 #endif
-    } else {
-        encoder->minQuantizer = normalize_quantize_value(qmin);
-        encoder->maxQuantizer = normalize_quantize_value(qmax);
-    }
 
     if (strcmp(codec, "auto") == 0) {
         encoder->codecChoice = AVIF_CODEC_CHOICE_AUTO;
@@ -345,9 +336,9 @@
        encoder->codecChoice = avifCodecChoiceFromName(codec);
    }
    if (speed < AVIF_SPEED_SLOWEST) {
        speed = AVIF_SPEED_SLOWEST;
    } else if (speed > AVIF_SPEED_FASTEST) {
        speed = AVIF_SPEED_FASTEST;
    }
    encoder->speed = speed;
    encoder->timescale = (uint64_t)1000;
@@ -361,9 +352,9 @@
    if (advanced != Py_None) {
 #if AVIF_VERSION >= 80200
        if (_add_codec_specific_options(encoder, advanced)) {
            avifImageDestroy(image);
            avifEncoderDestroy(encoder);
            return NULL;
        }
 #else
        PyErr_SetString(
@@ -377,10 +368,10 @@

    self = PyObject_New(AvifEncoderObject, &AvifEncoder_Type);
    if (!self) {
        PyErr_SetString(PyExc_RuntimeError, "could not create encoder object");
        avifImageDestroy(image);
        avifEncoderDestroy(encoder);
        return NULL;
    }
    self->frame_index = -1;
    self->icc_bytes = NULL;
@@ -397,16 +388,16 @@
            image, (uint8_t *)PyBytes_AS_STRING(icc_bytes), size
        );
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting ICC profile failed: %s",
                avifResultToString(result)
            );
            avifImageDestroy(image);
            avifEncoderDestroy(encoder);
            Py_XDECREF(self->icc_bytes);
            PyObject_Del(self);
            return NULL;
        }
        // colorPrimaries and transferCharacteristics are ignored when an ICC
        // profile is present, so set them to UNSPECIFIED.
@@ -427,17 +418,17 @@
            image, (uint8_t *)PyBytes_AS_STRING(exif_bytes), size
        );
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting EXIF data failed: %s",
                avifResultToString(result)
            );
            avifImageDestroy(image);
            avifEncoderDestroy(encoder);
            Py_XDECREF(self->icc_bytes);
            Py_XDECREF(self->exif_bytes);
            PyObject_Del(self);
            return NULL;
        }
    }

@@ -450,18 +441,18 @@
            image, (uint8_t *)PyBytes_AS_STRING(xmp_bytes), size
        );
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting XMP data failed: %s",
                avifResultToString(result)
            );
            avifImageDestroy(image);
            avifEncoderDestroy(encoder);
            Py_XDECREF(self->icc_bytes);
            Py_XDECREF(self->exif_bytes);
            Py_XDECREF(self->xmp_bytes);
            PyObject_Del(self);
            return NULL;
        }
    }
    if (exif_orientation > 1) {
@@ -518,7 +509,7 @@
            &mode,
            &is_single_frame
        )) {
        return NULL;
    }

    is_first_frame = self->frame_index == -1;
@@ -568,25 +559,25 @@

    result = avifRGBImageAllocatePixels(&rgb);
    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Pixel allocation failed: %s",
            avifResultToString(result)
        );
        return NULL;
    }

    if (rgb.rowBytes * rgb.height != size) {
        PyErr_Format(
            PyExc_RuntimeError,
            "rgb data is incorrect size: %u * %u (%u) != %u",
            rgb.rowBytes,
            rgb.height,
            rgb.rowBytes * rgb.height,
            size
        );
        ret = NULL;
        goto end;
    }

    // rgb.pixels is safe for writes
@@ -597,13 +588,13 @@
    Py_END_ALLOW_THREADS;

    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Conversion to YUV failed: %s",
            avifResultToString(result)
        );
        ret = NULL;
        goto end;
    }

    uint32_t addImageFlags = AVIF_ADD_IMAGE_FLAG_NONE;
@@ -652,13 +643,13 @@
    Py_END_ALLOW_THREADS;

    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Failed to finish encoding: %s",
            avifResultToString(result)
        );
        avifRWDataFree(&raw);
        return NULL;
    }

    ret = PyBytes_FromStringAndSize((char *)raw.data, raw.size);
@@ -693,8 +684,8 @@

    self = PyObject_New(AvifDecoderObject, &AvifDecoder_Type);
    if (!self) {
        PyErr_SetString(PyExc_RuntimeError, "could not create decoder object");
        return NULL;
    }

    Py_INCREF(avif_bytes);
@@ -718,14 +709,14 @@
        decoder, (uint8_t *)PyBytes_AS_STRING(self->data), PyBytes_GET_SIZE(self->data)
    );
    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Setting IO memory failed: %s",
            avifResultToString(result)
        );
        avifDecoderDestroy(decoder);
        PyObject_Del(self);
        return NULL;
    }

    result = avifDecoderParse(decoder);
@@ -817,18 +808,18 @@
    decoder = self->decoder;

    if (!PyArg_ParseTuple(args, "I", &frame_index)) {
        return NULL;
    }

    result = avifDecoderNthImage(decoder, frame_index);
    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Failed to decode frame %u: %s",
            decoder->imageIndex + 1,
            avifResultToString(result)
        );
        return NULL;
    }

    image = decoder->image;
@@ -848,18 +839,18 @@
    row_bytes = rgb.width * avifRGBImagePixelSize(&rgb);

    if (rgb.height > PY_SSIZE_T_MAX / row_bytes) {
        PyErr_SetString(PyExc_MemoryError, "Integer overflow in pixel size");
        return NULL;
    }

    result = avifRGBImageAllocatePixels(&rgb);
    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Pixel allocation failed: %s",
            avifResultToString(result)
        );
        return NULL;
    }

    Py_BEGIN_ALLOW_THREADS;
@@ -867,13 +858,13 @@
    Py_END_ALLOW_THREADS;

    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Conversion from YUV failed: %s",
            avifResultToString(result)
        );
        avifRGBImageFreePixels(&rgb);
        return NULL;
    }

    size = rgb.rowBytes * rgb.height;
 if (rgb.height > PY_SSIZE_T_MAX / row_bytes) { 
     PyErr_SetString(PyExc_MemoryError, "Integer overflow in pixel size"); 
     return NULL; 
 } 
 if (rgb.height > PY_SSIZE_T_MAX / row_bytes) { 
     PyErr_SetString(PyExc_MemoryError, "Integer overflow in pixel size"); 
     return NULL; 
 } 
@@ -946,7 +937,7 @@
 static int
 setup_module(PyObject *m) {
    if (PyType_Ready(&AvifDecoder_Type) < 0 || PyType_Ready(&AvifEncoder_Type) < 0) {
        return -1;
    }

    PyObject *d = PyModule_GetDict(m);
@@ -970,8 +961,8 @@

    m = PyModule_Create(&module_def);
    if (setup_module(m) < 0) {
        Py_DECREF(m);
        return NULL;
    }

    return m;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ brew install \ @@
         dav1d \
         aom \
         rav1e \
-        ninja
+        svt-av1
     if [[ "$ImageOS" == "macos13" ]]; then
         brew install --ignore-dependencies libraqm
     else
@@ Expand Down @@