python-pillow · hugovk · Apr 1, 2025 · Jan 3, 2021 · Oct 16, 2024 · Oct 16, 2024
diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
@@ -63,20 +63,17 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
 
 **tile_rows** / **tile_cols**
     For tile encoding, the (log 2) number of tile rows and columns to use.
-    Valid values are 0-6, default 0. Ignored if "autotiling" is set to true in libavif
-    version **0.11.0** or greater.
+    Valid values are 0-6, default 0. Ignored if "autotiling" is set to true.
 
 **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.
+    and "tile_cols" both have their default values of zero.
 
 **alpha_premultiplied**
-    Encode the image with premultiplied alpha. Defaults to ``False``. Requires libavif
-    version **0.9.0** or greater.
+    Encode the image with premultiplied alpha. Defaults to ``False``.
 
 **advanced**
-    Codec specific options. Requires libavif version **0.8.2** or greater.
+    Codec specific options.
 
 **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
@@ -91,8 +91,7 @@ Many of Pillow's features require external libraries:
 
 * **libavif** provides support for the AVIF format.
 
-  * Pillow requires libavif version **0.8.0** or greater, which is when
-    AVIF image sequence support was added.
+  * Pillow requires libavif version **1.0.0** or greater.
   * libavif is merely an API that wraps AVIF codecs. If you are compiling
     libavif from source, you will also need to install both an AVIF encoder
     and decoder, such as rav1e and dav1d, or libaom, which both encodes and

diff --git a/src/_avif.c b/src/_avif.c
@@ -20,27 +20,14 @@
 
 static PyTypeObject AvifDecoder_Type;
 
-#if AVIF_VERSION < 1000000  // 1.0.0
-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;
-    }
-}
-#endif
-
 static int
 normalize_tiles_log2(int value) {
     if (value < 0) {
        return 0;
    } else if (value > 6) {
        return 6;
    } else {
        return value;
    }
 }

@@ -55,19 +42,14 @@
        case AVIF_RESULT_TRUNCATED_DATA:
        case AVIF_RESULT_NO_CONTENT:
            return PyExc_SyntaxError;
        default:
            return PyExc_RuntimeError;
    }
 }
 
 static uint8_t
 irot_imir_to_exif_orientation(const avifImage *image) {
-    uint8_t axis;
-#if AVIF_VERSION_MAJOR >= 1
-    axis = image->imir.axis;
-#else
-    axis = image->imir.mode;
-#endif
+    uint8_t axis = image->imir.axis;
     int imir = image->transformFlags & AVIF_TRANSFORM_IMIR;
     int irot = image->transformFlags & AVIF_TRANSFORM_IROT;
     if (irot) {
@@ -77,15 +59,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) {
@@ -93,7 +75,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) {
@@ -112,17 +94,13 @@
         case 2:  // The 0th row is at the visual top of the image, and the 0th column is
                  // the visual right-hand side.
             image->transformFlags |= AVIF_TRANSFORM_IMIR;
-#if AVIF_VERSION_MAJOR >= 1
             image->imir.axis = 1;
-#else
-            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;
@@ -133,22 +111,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,22 +167,21 @@
     return PyUnicode_FromString(buffer);
 }
 
-#if AVIF_VERSION >= 80200  // 0.8.2
 static int
 _add_codec_specific_options(avifEncoder *encoder, PyObject *opts) {
     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);
@@ -215,23 +192,22 @@
        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;
 }
-#endif
 
 // Encoder functions
 PyObject *
@@ -286,9 +262,9 @@
    // Create a new animation encoder and picture frame
    avifImage *image = avifImageCreateEmpty();
    if (image == NULL) {
        PyErr_SetString(PyExc_ValueError, "Image creation failed");
        error = 1;
        goto end;
    }

    // Set these in advance so any upcoming RGB -> YUV use the proper coefficients
@@ -325,15 +301,13 @@
     image->height = height;
 
     image->depth = 8;
-#if AVIF_VERSION >= 90000  // 0.9.0
     image->alphaPremultiplied = alpha_premultiplied ? AVIF_TRUE : AVIF_FALSE;
-#endif
 
     encoder = avifEncoderCreate();
     if (!encoder) {
        PyErr_SetString(PyExc_MemoryError, "Can't allocate encoder");
        error = 1;
        goto end;
    }

    int is_aom_encode = strcmp(codec, "aom") == 0 ||
@@ -341,12 +315,7 @@
                          _codec_available("aom", AVIF_CODEC_FLAG_CAN_ENCODE));
     encoder->maxThreads = is_aom_encode && max_threads > 64 ? 64 : max_threads;
 
-#if AVIF_VERSION >= 1000000  // 1.0.0
     encoder->quality = quality;
-#else
-    encoder->minQuantizer = normalize_quantize_value(64 - quality);
-    encoder->maxQuantizer = normalize_quantize_value(100 - quality);
-#endif
 
     if (strcmp(codec, "auto") == 0) {
         encoder->codecChoice = AVIF_CODEC_CHOICE_AUTO;
@@ -361,37 +330,22 @@
     encoder->speed = speed;
     encoder->timescale = (uint64_t)1000;
 
-#if AVIF_VERSION >= 110000  // 0.11.0
     encoder->autoTiling = autotiling ? AVIF_TRUE : AVIF_FALSE;
     if (!autotiling) {
         encoder->tileRowsLog2 = normalize_tiles_log2(tile_rows_log2);
         encoder->tileColsLog2 = normalize_tiles_log2(tile_cols_log2);
     }
-#else
-    encoder->tileRowsLog2 = normalize_tiles_log2(tile_rows_log2);
-    encoder->tileColsLog2 = normalize_tiles_log2(tile_cols_log2);
-#endif
 
-    if (advanced != Py_None) {
-#if AVIF_VERSION >= 80200  // 0.8.2
-        if (_add_codec_specific_options(encoder, advanced)) {
-            error = 1;
-            goto end;
-        }
-#else
-        PyErr_SetString(
-            PyExc_ValueError, "Advanced codec options require libavif >= 0.8.2"
-        );
+    if (advanced != Py_None && _add_codec_specific_options(encoder, advanced)) {
         error = 1;
         goto end;
-#endif
     }
 
     self = PyObject_New(AvifEncoderObject, &AvifEncoder_Type);
    if (!self) {
        PyErr_SetString(PyExc_RuntimeError, "could not create encoder object");
        error = 1;
        goto end;
    }
    self->first_frame = 1;

@@ -399,13 +353,13 @@
    if (icc_buffer.len) {
        result = avifImageSetProfileICC(image, icc_buffer.buf, icc_buffer.len);
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting ICC profile failed: %s",
                avifResultToString(result)
            );
            error = 1;
            goto end;
        }
        // colorPrimaries and transferCharacteristics are ignored when an ICC
        // profile is present, so set them to UNSPECIFIED.
@@ -420,26 +374,26 @@
    if (exif_buffer.len) {
        result = avifImageSetMetadataExif(image, exif_buffer.buf, exif_buffer.len);
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting EXIF data failed: %s",
                avifResultToString(result)
            );
            error = 1;
            goto end;
        }
    }

    if (xmp_buffer.len) {
        result = avifImageSetMetadataXMP(image, xmp_buffer.buf, xmp_buffer.len);
        if (result != AVIF_RESULT_OK) {
            PyErr_Format(
                exc_type_for_avif_result(result),
                "Setting XMP data failed: %s",
                avifResultToString(result)
            );
            error = 1;
            goto end;
        }
    }

@@ -463,7 +417,7 @@
            avifEncoderDestroy(encoder);
        }
        if (self) {
            PyObject_Del(self);
        }
        return NULL;
    }
@@ -511,7 +465,7 @@
            &mode,
            &is_single_frame
        )) {
        return NULL;
    }

    if (image->width != width || image->height != height) {
@@ -532,8 +486,8 @@
    } else {
        frame = avifImageCreateEmpty();
        if (image == NULL) {
            PyErr_SetString(PyExc_ValueError, "Image creation failed");
            return NULL;
        }

        frame->width = width;
@@ -544,9 +498,7 @@
         frame->yuvRange = image->yuvRange;
         frame->yuvFormat = image->yuvFormat;
         frame->depth = image->depth;
-#if AVIF_VERSION >= 90000  // 0.9.0
         frame->alphaPremultiplied = image->alphaPremultiplied;
-#endif
     }
 
     avifRGBImageSetDefaults(&rgb, frame);
@@ -559,26 +511,26 @@

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

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

    // rgb.pixels is safe for writes
@@ -589,13 +541,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)
        );
        error = 1;
        goto end;
    }

    uint32_t addImageFlags =
@@ -643,13 +595,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);
@@ -684,42 +636,38 @@

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

    decoder = avifDecoderCreate();
    if (!decoder) {
        PyErr_SetString(PyExc_MemoryError, "Can't allocate decoder");
        PyBuffer_Release(&buffer);
         PyObject_Del(self);
         return NULL;
     }
-#if AVIF_VERSION >= 80400  // 0.8.4
     decoder->maxThreads = max_threads;
-#endif
-#if AVIF_VERSION >= 90200  // 0.9.2
     // Turn off libavif's 'clap' (clean aperture) property validation.
     decoder->strictFlags &= ~AVIF_STRICT_CLAP_VALID;
     // Allow the PixelInformationProperty ('pixi') to be missing in AV1 image
     // items. libheif v1.11.0 and older does not add the 'pixi' item property to
     // AV1 image items.
     decoder->strictFlags &= ~AVIF_STRICT_PIXI_REQUIRED;
-#endif
     decoder->codecChoice = codec;
 
     result = avifDecoderSetIOMemory(decoder, buffer.buf, buffer.len);
    if (result != AVIF_RESULT_OK) {
        PyErr_Format(
            exc_type_for_avif_result(result),
            "Setting IO memory failed: %s",
            avifResultToString(result)
        );
        avifDecoderDestroy(decoder);
        PyBuffer_Release(&buffer);
        PyObject_Del(self);
        return NULL;
    }

    result = avifDecoderParse(decoder);
@@ -806,18 +754,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",
            frame_index,
            avifResultToString(result)
        );
        return NULL;
    }

    image = decoder->image;
@@ -829,12 +777,12 @@

    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;
@@ -842,18 +790,18 @@
    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;
    }

    if (rgb.height > PY_SSIZE_T_MAX / rgb.rowBytes) {
        PyErr_SetString(PyExc_MemoryError, "Integer overflow in pixel size");
        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; 
 } 
@@ -924,7 +872,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);
@@ -948,8 +896,8 @@

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

 #ifdef Py_GIL_DISABLED