pillow-avif-plugin 1.4.0__tar.gz → 1.4.2__tar.gz

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pillow-avif-plugin
-Version: 1.4.0
+Version: 1.4.2
 Summary: A pillow plugin that adds avif support via libavif
 Home-page: https://github.com/fdintino/pillow-avif-plugin/
 Author: Frankie Dintino

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/src/pillow_avif/AvifImagePlugin.py

@@ -3,7 +3,7 @@ from __future__ import division
 from io import BytesIO
 import sys
 
-from PIL import Image, ImageFile
+from PIL import ExifTags, Image, ImageFile
 
 try:
     from pillow_avif import _avif
@@ -56,6 +56,9 @@ class AvifImageFile(ImageFile.ImageFile):
     __loaded = -1
     __frame = 0
 
+    def load_seek(self, pos):
+        pass
+
     def _open(self):
         self._decoder = _avif.AvifDecoder(
             self.fp.read(), DECODE_CODEC_CHOICE, CHROMA_UPSAMPLING
@@ -126,23 +129,11 @@ def _save(im, fp, filename, save_all=False):
 
     is_single_frame = total == 1
 
-    qmin = info.get("qmin")
-    qmax = info.get("qmax")
-
-    if qmin is None and qmax is None:
-        # The min and max quantizer settings in libavif range from 0 (best quality)
-        # to 63 (worst quality). If neither are explicitly specified, we use a 0-100
-        # quality scale (default 75) and calculate the qmin and qmax from that.
-        #
-        # - qmin is 0 for quality >= 64. Below that, qmin has an inverse linear
-        #   relation to quality (i.e., quality 63 = qmin 1, quality 0 => qmin 63)
-        # - qmax is 0 for quality=100, then qmax increases linearly relative to
-        #   quality decreasing, until it flattens out at quality=37.
-        quality = info.get("quality", 75)
-        if not isinstance(quality, int) or quality < 0 or quality > 100:
-            raise ValueError("Invalid quality setting")
-        qmin = max(0, min(64 - quality, 63))
-        qmax = max(0, min(100 - quality, 63))
+    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:
+        raise ValueError("Invalid quality setting")
 
     duration = info.get("duration", 0)
     subsampling = info.get("subsampling", "4:2:0")
@@ -158,6 +149,20 @@ def _save(im, fp, filename, save_all=False):
     exif = info.get("exif", im.info.get("exif"))
     if isinstance(exif, Image.Exif):
         exif = exif.tobytes()
+
+    exif_orientation = 0
+    if exif:
+        exif_data = Image.Exif()
+        try:
+            exif_data.load(exif)
+        except SyntaxError:
+            pass
+        else:
+            orientation_tag = next(
+                k for k, v in ExifTags.TAGS.items() if v == "Orientation"
+            )
+            exif_orientation = exif_data.get(orientation_tag) or 0
+
     xmp = info.get("xmp", im.info.get("xmp") or im.info.get("XML:com.adobe.xmp"))
 
     if isinstance(xmp, text_type):
@@ -199,6 +204,7 @@ def _save(im, fp, filename, save_all=False):
         autotiling,
         icc_profile or b"",
         exif or b"",
+        exif_orientation,
         xmp or b"",
         advanced,
     )

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/src/pillow_avif/__init__.py

@@ -2,4 +2,4 @@ from . import AvifImagePlugin
 
 
 __all__ = ["AvifImagePlugin"]
-__version__ = "1.4.0"
+__version__ = "1.4.2"

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/src/pillow_avif/_avif.c

@@ -139,6 +139,118 @@ exc_type_for_avif_result(avifResult result) {
     }
 }
 
+static void
+exif_orientation_to_irot_imir(avifImage *image, int orientation) {
+    const avifTransformFlags otherFlags =
+        image->transformFlags & ~(AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR);
+
+    //
+    // Mapping from Exif orientation as defined in JEITA CP-3451C section 4.6.4.A
+    // Orientation to irot and imir boxes as defined in HEIF ISO/IEC 28002-12:2021
+    // sections 6.5.10 and 6.5.12.
+    switch (orientation) {
+        case 1:  // The 0th row is at the visual top of the image, and the 0th column is
+                 // the visual left-hand side.
+            image->transformFlags = otherFlags;
+            image->irot.angle = 0;  // ignored
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;   // ignored
+#else
+            image->imir.mode = 0;   // ignored
+#endif
+            return;
+        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 = otherFlags | AVIF_TRANSFORM_IMIR;
+            image->irot.angle = 0;  // ignored
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 1;
+#else
+            image->imir.mode = 1;
+#endif
+            return;
+        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 = otherFlags | AVIF_TRANSFORM_IROT;
+            image->irot.angle = 2;
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;  // ignored
+#else
+            image->imir.mode = 0;  // ignored
+#endif
+            return;
+        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 = otherFlags | AVIF_TRANSFORM_IMIR;
+            image->irot.angle = 0;  // ignored
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;
+#else
+            image->imir.mode = 0;
+#endif
+            return;
+        case 5:  // The 0th row is the visual left-hand side of the image, and the 0th
+                 // column is the visual top.
+            image->transformFlags =
+                otherFlags | AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR;
+            image->irot.angle = 1;  // applied before imir according to MIAF spec
+                                    // ISO/IEC 28002-12:2021 - section 7.3.6.7
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;
+#else
+            image->imir.mode = 0;
+#endif
+            return;
+        case 6:  // The 0th row is the visual right-hand side of the image, and the 0th
+                 // column is the visual top.
+            image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT;
+            image->irot.angle = 3;
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;  // ignored
+#else
+            image->imir.mode = 0;  // ignored
+#endif
+            return;
+        case 7:  // The 0th row is the visual right-hand side of the image, and the 0th
+                 // column is the visual bottom.
+            image->transformFlags =
+                otherFlags | 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
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;
+#else
+            image->imir.mode = 0;
+#endif
+            return;
+        case 8:  // The 0th row is the visual left-hand side of the image, and the 0th
+                 // column is the visual bottom.
+            image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT;
+            image->irot.angle = 1;
+#if AVIF_VERSION_MAJOR >= 1
+            image->imir.axis = 0;  // ignored
+#else
+            image->imir.mode = 0;  // ignored
+#endif
+            return;
+        default:  // reserved
+            break;
+    }
+
+    // The orientation tag is not mandatory (only recommended) according to JEITA
+    // CP-3451C section 4.6.8.A. The default value is 1 if the orientation tag is
+    // missing, meaning:
+    //   The 0th row is at the visual top of the image, and the 0th column is the visual
+    //   left-hand side.
+    image->transformFlags = otherFlags;
+    image->irot.angle = 0;  // ignored
+#if AVIF_VERSION_MAJOR >= 1
+    image->imir.axis = 0;   // ignored
+#else
+    image->imir.mode = 0;   // ignored
+#endif
+}
+
 static int
 _codec_available(const char *name, uint32_t flags) {
     avifCodecChoice codec = avifCodecChoiceFromName(name);
@@ -208,6 +320,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
     int qmax = 10;                           // "High Quality", but not lossless
     int quality = 75;
     int speed = 8;
+    int exif_orientation = 0;
     PyObject *icc_bytes;
     PyObject *exif_bytes;
     PyObject *xmp_bytes;
@@ -223,7 +336,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "IIsiiiissiiOOSSSO",
+            "IIsiiiissiiOOSSiSO",
             &width,
             &height,
             &subsampling,
@@ -239,6 +352,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
             &autotiling,
             &icc_bytes,
             &exif_bytes,
+            &exif_orientation,
             &xmp_bytes,
             &advanced)) {
         return NULL;
@@ -257,8 +371,18 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
         return NULL;
     }
 
-    enc_options.qmin = normalize_quantize_value(qmin);
-    enc_options.qmax = normalize_quantize_value(qmax);
+    if (qmin == -1 || qmax == -1) {
+#if AVIF_VERSION >= 1000000
+        enc_options.qmin = -1;
+        enc_options.qmax = -1;
+#else
+        enc_options.qmin = normalize_quantize_value(64 - quality);
+        enc_options.qmax = normalize_quantize_value(100 - quality);
+#endif
+    } else {
+        enc_options.qmin = normalize_quantize_value(qmin);
+        enc_options.qmax = normalize_quantize_value(qmax);
+    }
     enc_options.quality = quality;
 
     if (speed < AVIF_SPEED_SLOWEST) {
@@ -326,7 +450,12 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
 
         encoder->maxThreads = max_threads;
 #if AVIF_VERSION >= 1000000
-        encoder->quality = enc_options.quality;
+        if (enc_options.qmin != -1 && enc_options.qmax != -1) {
+            encoder->minQuantizer = enc_options.qmin;
+            encoder->maxQuantizer = enc_options.qmax;
+        } else {
+            encoder->quality = enc_options.quality;
+        }
 #else
         encoder->minQuantizer = enc_options.qmin;
         encoder->maxQuantizer = enc_options.qmax;
@@ -389,6 +518,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
                 (uint8_t *)PyBytes_AS_STRING(xmp_bytes),
                 PyBytes_GET_SIZE(xmp_bytes));
         }
+        exif_orientation_to_irot_imir(image, exif_orientation);
 
         self->image = image;
         self->frame_index = -1;

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/src/pillow_avif_plugin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pillow-avif-plugin
-Version: 1.4.0
+Version: 1.4.2
 Summary: A pillow plugin that adds avif support via libavif
 Home-page: https://github.com/fdintino/pillow-avif-plugin/
 Author: Frankie Dintino

{pillow-avif-plugin-1.4.0 → pillow-avif-plugin-1.4.2}/src/pillow_avif_plugin.egg-info/SOURCES.txt

@@ -11,5 +11,5 @@ src/pillow_avif/_avif.c
 src/pillow_avif_plugin.egg-info/PKG-INFO
 src/pillow_avif_plugin.egg-info/SOURCES.txt
 src/pillow_avif_plugin.egg-info/dependency_links.txt
-src/pillow_avif_plugin.egg-info/top_level.txt
-src/pillow_avif_plugin.egg-info/zip-safe
+src/pillow_avif_plugin.egg-info/not-zip-safe
+src/pillow_avif_plugin.egg-info/top_level.txt