Removed unused upsampling setting

Author: radarhere

Tests/test_file_avif.py

@@ -549,22 +549,6 @@ def test_decoder_codec_available_cannot_decode(self) -> None:
     def test_decoder_codec_available_invalid(self) -> None:
         assert _avif.decoder_codec_available("foo") is False
 
-    @pytest.mark.parametrize("upsampling", ["fastest", "best", "nearest", "bilinear"])
-    def test_decoder_upsampling(
-        self, monkeypatch: pytest.MonkeyPatch, upsampling: str
-    ) -> None:
-        monkeypatch.setattr(AvifImagePlugin, "CHROMA_UPSAMPLING", upsampling)
-
-        with Image.open(TEST_AVIF_FILE):
-            pass
-
-    def test_decoder_upsampling_invalid(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(AvifImagePlugin, "CHROMA_UPSAMPLING", "foo")
-
-        with pytest.raises(ValueError):
-            with Image.open(TEST_AVIF_FILE):
-                pass
-
     def test_p_mode_transparency(self) -> None:
         im = Image.new("P", size=(64, 64))
         draw = ImageDraw.Draw(im)

src/PIL/AvifImagePlugin.py

@@ -16,7 +16,6 @@
 # Decoder options as module globals, until there is a way to pass parameters
 # to Image.open (see https://github.com/python-pillow/Pillow/issues/569)
 DECODE_CODEC_CHOICE = "auto"
-CHROMA_UPSAMPLING = "auto"
 DEFAULT_MAX_THREADS = 0
 
 _VALID_AVIF_MODES = {"RGB", "RGBA"}
@@ -76,7 +75,6 @@ def _open(self) -> None:
         self._decoder = _avif.AvifDecoder(
             self.fp.read(),
             DECODE_CODEC_CHOICE,
-            CHROMA_UPSAMPLING,
             _get_default_max_threads(),
         )
 

src/_avif.c

@@ -3,12 +3,6 @@
 #include <Python.h>
 #include "avif/avif.h"
 
-#if AVIF_VERSION < 80300
-#define AVIF_CHROMA_UPSAMPLING_AUTOMATIC AVIF_CHROMA_UPSAMPLING_BILINEAR
-#define AVIF_CHROMA_UPSAMPLING_BEST_QUALITY AVIF_CHROMA_UPSAMPLING_BILINEAR
-#define AVIF_CHROMA_UPSAMPLING_FASTEST AVIF_CHROMA_UPSAMPLING_NEAREST
-#endif
-
 typedef struct {
     avifPixelFormat subsampling;
     int qmin;
@@ -671,35 +665,18 @@ AvifDecoderNew(PyObject *self_, PyObject *args) {
     PyObject *avif_bytes;
     AvifDecoderObject *self = NULL;
 
-    char *upsampling_str;
     char *codec_str;
     avifCodecChoice codec;
-    avifChromaUpsampling upsampling;
     int max_threads;
 
     avifResult result;
 
     if (!PyArg_ParseTuple(
-            args, "Sssi", &avif_bytes, &codec_str, &upsampling_str, &max_threads
+            args, "Ssi", &avif_bytes, &codec_str, &max_threads
         )) {
         return NULL;
     }
 
-    if (!strcmp(upsampling_str, "auto")) {
-        upsampling = AVIF_CHROMA_UPSAMPLING_AUTOMATIC;
-    } else if (!strcmp(upsampling_str, "fastest")) {
-        upsampling = AVIF_CHROMA_UPSAMPLING_FASTEST;
-    } else if (!strcmp(upsampling_str, "best")) {
-        upsampling = AVIF_CHROMA_UPSAMPLING_BEST_QUALITY;
-    } else if (!strcmp(upsampling_str, "nearest")) {
-        upsampling = AVIF_CHROMA_UPSAMPLING_NEAREST;
-    } else if (!strcmp(upsampling_str, "bilinear")) {
-        upsampling = AVIF_CHROMA_UPSAMPLING_BILINEAR;
-    } else {
-        PyErr_Format(PyExc_ValueError, "Invalid upsampling option: %s", upsampling_str);
-        return NULL;
-    }
-
     if (strcmp(codec_str, "auto") == 0) {
         codec = AVIF_CODEC_CHOICE_AUTO;
     } else {