pillow-avif-plugin 1.2.2__cp37-cp37m-macosx_10_10_x86_64.whl → 1.4.4__cp37-cp37m-macosx_10_10_x86_64.whl

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
@@ -16,6 +16,7 @@ except ImportError:
 # 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"}
 
@@ -51,15 +52,17 @@ def _accept(prefix):
 
 
 class AvifImageFile(ImageFile.ImageFile):
-
     format = "AVIF"
     format_description = "AVIF image"
     __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
+            self.fp.read(), DECODE_CODEC_CHOICE, CHROMA_UPSAMPLING, DEFAULT_MAX_THREADS
         )
 
         # Get info from decoder
@@ -67,7 +70,10 @@ class AvifImageFile(ImageFile.ImageFile):
         self._size = width, height
         self.n_frames = n_frames
         self.is_animated = self.n_frames > 1
-        self.mode = self.rawmode = mode
+        try:
+            self.mode = self.rawmode = mode
+        except AttributeError:
+            self._mode = self.rawmode = mode
         self.tile = []
 
         if icc:
@@ -124,41 +130,45 @@ 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 90) 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", 90)
-        if not isinstance(quality, int):
-            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")
-    speed = info.get("speed", 8)
+    speed = info.get("speed", 6)
+    max_threads = info.get("max_threads", DEFAULT_MAX_THREADS)
     codec = info.get("codec", "auto")
     range_ = info.get("range", "full")
     tile_rows_log2 = info.get("tile_rows", 0)
-    tile_cols_log2 = info.get("tile_rows", 0)
+    tile_cols_log2 = info.get("tile_cols", 0)
     alpha_premultiplied = bool(info.get("alpha_premultiplied", False))
+    autotiling = bool(info.get("autotiling", tile_rows_log2 == tile_cols_log2 == 0))
 
     icc_profile = info.get("icc_profile", im.info.get("icc_profile"))
     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):
-        xmp = xmp.encode('utf-8')
+        xmp = xmp.encode("utf-8")
 
     advanced = info.get("advanced")
     if isinstance(advanced, dict):
@@ -173,10 +183,11 @@ def _save(im, fp, filename, save_all=False):
         if invalid:
             raise ValueError(
                 "advanced codec options must be a dict of key-value string "
-                "pairs or a series of key-value two-tuples")
-        advanced = tuple([
-            (str(k).encode("utf-8"), str(v).encode("utf-8"))
-            for k, v in advanced])
+                "pairs or a series of key-value two-tuples"
+            )
+        advanced = tuple(
+            [(str(k).encode("utf-8"), str(v).encode("utf-8")) for k, v in advanced]
+        )
 
     # Setup the AVIF encoder
     enc = _avif.AvifEncoder(
@@ -185,16 +196,20 @@ def _save(im, fp, filename, save_all=False):
         subsampling,
         qmin,
         qmax,
+        quality,
         speed,
+        max_threads,
         codec,
         range_,
         tile_rows_log2,
         tile_cols_log2,
         alpha_premultiplied,
+        autotiling,
         icc_profile or b"",
         exif or b"",
+        exif_orientation,
         xmp or b"",
-        advanced
+        advanced,
     )
 
     # Add each frame
@@ -218,6 +233,10 @@ def _save(im, fp, filename, save_all=False):
                         "A" in ims.mode
                         or "a" in ims.mode
                         or (ims.mode == "P" and "A" in ims.im.getpalettemode())
+                        or (
+                            ims.mode == "P"
+                            and ims.info.get("transparency", None) is not None
+                        )
                     )
                     rawmode = "RGBA" if alpha else "RGB"
                     frame = ims.convert(rawmode)

pillow_avif/__init__.py

@@ -1,5 +1,5 @@
 from . import AvifImagePlugin
 
 
-__all__ = ['AvifImagePlugin']
-__version__ = '1.2.2'
+__all__ = ["AvifImagePlugin"]
+__version__ = "1.4.4"

{pillow_avif_plugin-1.2.2.dist-info → pillow_avif_plugin-1.4.4.dist-info}/LICENSE

@@ -258,6 +258,41 @@ LIBGAV1
    limitations under the License.
 
 
+----
+
+LIBYUV
+
+Copyright 2011 The LibYuv Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 ----
 
 RAV1E

{pillow_avif_plugin-1.2.2.dist-info → pillow_avif_plugin-1.4.4.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pillow-avif-plugin
-Version: 1.2.2
+Version: 1.4.4
 Summary: A pillow plugin that adds avif support via libavif
 Home-page: https://github.com/fdintino/pillow-avif-plugin/
 Download-URL: https://github.com/fdintino/pillow-avif-plugin/releases
 Author: Frankie Dintino
 Author-email: fdintino@theatlantic.com
 License: MIT License
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -17,11 +16,12 @@ Classifier: Programming Language :: C
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Multimedia :: Graphics
@@ -34,5 +34,3 @@ License-File: LICENSE
 This is a plugin that adds support for AVIF files until official support has been added (see [this pull request](https://github.com/python-pillow/Pillow/pull/5201)).
 
 To register this plugin with pillow you will need to add `import pillow_avif` somewhere in your application.
-
-

pillow_avif_plugin-1.4.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+pillow_avif/AvifImagePlugin.py,sha256=MfIVDuN7jVDceVl68b9R5lTHxzrHG6wpt6Ca-NbFdAw,8486
+pillow_avif/__init__.py,sha256=WQFEMp706st11VAv63ZKU1Detvxgq6CAyL3AySmoJAs,84
+pillow_avif/_avif.cpython-37m-darwin.so,sha256=uW2Zg3ZufF6FML_PkHSpXYGg6pm5jmkfbeDRU7UpTmA,24810792
+pillow_avif_plugin-1.4.4.dist-info/LICENSE,sha256=2l49eVdgaNy9JTEPbstz1GaaPKw02gFdtuThTNUi730,25213
+pillow_avif_plugin-1.4.4.dist-info/METADATA,sha256=0a9T5wIn2CbcqytY96XPXOZYQ9t6mqpV6PwH_eDbWYQ,1668
+pillow_avif_plugin-1.4.4.dist-info/WHEEL,sha256=HfXAYhgQ34BhcNt1Y83kqt02hxEE-KNvttiJH3T5IsM,111
+pillow_avif_plugin-1.4.4.dist-info/top_level.txt,sha256=xrg4zRnqDyl_JEyEQh3oCcAU4BHneocD-DCFDzf4g9E,12
+pillow_avif_plugin-1.4.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+pillow_avif_plugin-1.4.4.dist-info/RECORD,,

{pillow_avif_plugin-1.2.2.dist-info → pillow_avif_plugin-1.4.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: false
 Tag: cp37-cp37m-macosx_10_10_x86_64
 

pillow_avif_plugin-1.2.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-pillow_avif_plugin-1.2.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pillow_avif_plugin-1.2.2.dist-info/RECORD,,
-pillow_avif_plugin-1.2.2.dist-info/LICENSE,sha256=Y-GPM2BDn_PNAiKqwHfB2ubsfRy0GSy4Y_0XqT_80Sg,23691
-pillow_avif_plugin-1.2.2.dist-info/WHEEL,sha256=skNqN-ggnyfJIwZg4zPa58wZKk7PZBGkMiXnAznkIu4,111
-pillow_avif_plugin-1.2.2.dist-info/top_level.txt,sha256=xrg4zRnqDyl_JEyEQh3oCcAU4BHneocD-DCFDzf4g9E,12
-pillow_avif_plugin-1.2.2.dist-info/METADATA,sha256=XNgTWgeMvz2n2oiQuA0M0_lv28BHyTcAXc1S8SA5Mmg,1636
-pillow_avif/AvifImagePlugin.py,sha256=J-a1lf1yj7RqH9ZI7_WEMCAuG77ofcek_f5GtiY_auc,8177
-pillow_avif/__init__.py,sha256=KjJsqr2XKw0ZJsUUdN5M5bRoIISUDzap1R6Pk5H75J4,84
-pillow_avif/_avif.cpython-37m-darwin.so,sha256=8hDyZ74dAv0OnHHgiH82nJjAFlv2sWTDz8oqY0oMXyU,58768
-pillow_avif/.dylibs/libvmaf.1.dylib,sha256=v8ncAM-8HJCo-SZosucYrTad31f6ifV35Wrg2_GFCoo,883376
-pillow_avif/.dylibs/libaom.3.3.0.dylib,sha256=5X0yeXsgJrAkD6X0w2QA9DhApNz3k5pQ-aGrrOwp9JU,5608000
-pillow_avif/.dylibs/libbrotlienc.1.0.9.dylib,sha256=BXy1Q64D9uACKg4a6or1DYu7CY4li10N-9a7x_tuLVE,601200
-pillow_avif/.dylibs/libavif.14.0.1.dylib,sha256=U-1W46eMLXUDxUMyJt7N28EcWHO_6YoQqXA7yN9G5dc,15895328
-pillow_avif/.dylibs/libbrotlidec.1.0.9.dylib,sha256=wOqDdWuVLPz2bHPeQwl1xE59XZxobqkDW7Z4_Ai4Ezc,71216
-pillow_avif/.dylibs/libbrotlicommon.1.0.9.dylib,sha256=DKEXX3UWu07Wo6LLXY2DdSzPLu05v02dltUoqCEgSuc,159632
-pillow_avif/.dylibs/libjxl.0.6.1.dylib,sha256=enNqwiPbO4SGDWklbS91gm4Vad5Zq1IEOV0R27kzj-E,2635136