Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/wheels-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ LIBWEBP_VERSION=1.6.0
BZIP2_VERSION=1.0.8
LIBXCB_VERSION=1.17.0
BROTLI_VERSION=1.2.0
LIBAVIF_VERSION=1.3.0
LIBAVIF_VERSION=1.4.0

function build_pkg_config {
if [ -e pkg-config-stamp ]; then return; fi
Expand Down
13 changes: 5 additions & 8 deletions Tests/test_file_avif.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ def test_write_rgb(self, tmp_path: Path) -> None:

# avifdec hopper.avif avif/hopper_avif_write.png
assert_image_similar_tofile(
reloaded, "Tests/images/avif/hopper_avif_write.png", 6.02
reloaded, "Tests/images/avif/hopper_avif_write.png", 6.88
)

# This test asserts that the images are similar. If the average pixel
# difference between the two images is less than the epsilon value,
# then we're going to accept that it's a reasonable lossy version of
# the image.
assert_image_similar(reloaded, im, 8.62)
assert_image_similar(reloaded, im, 9.28)

def test_AvifEncoder_with_invalid_args(self) -> None:
"""
Expand Down Expand Up @@ -461,12 +461,9 @@ def test_decoder_codec_cannot_encode(self, tmp_path: Path) -> None:
@pytest.mark.parametrize(
"advanced",
[
{
"aq-mode": "1",
"enable-chroma-deltaq": "1",
},
(("aq-mode", "1"), ("enable-chroma-deltaq", "1")),
[("aq-mode", "1"), ("enable-chroma-deltaq", "1")],
{"tune": "psnr"},
(("tune", "psnr"),),
[("tune", "psnr")],
],
)
def test_encoder_advanced_codec_options(
Expand Down
6 changes: 1 addition & 5 deletions depends/install_libavif.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eo pipefail

version=1.3.0
version=1.4.0

if [[ "$GHA_LIBAVIF_CACHE_HIT" == "true" ]]; then

Expand All @@ -17,10 +17,6 @@ else

pushd libavif-$version

# Apply patch for SVT-AV1 4.0 compatibility
# Pending release of https://github.com/AOMediaCodec/libavif/pull/2971
patch -p1 < ../libavif-svt4.patch

if [ $(uname) == "Darwin" ] && [ -x "$(command -v brew)" ]; then
PREFIX=$(brew --prefix)
else
Expand Down
14 changes: 0 additions & 14 deletions depends/libavif-svt4.patch

This file was deleted.

2 changes: 1 addition & 1 deletion winbuild/build_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def cmd_msbuild(
"HARFBUZZ": "12.3.2",
"JPEGTURBO": "3.1.3",
"LCMS2": "2.18",
"LIBAVIF": "1.3.0",
"LIBAVIF": "1.4.0",
"LIBIMAGEQUANT": "4.4.1",
"LIBPNG": "1.6.55",
"LIBWEBP": "1.6.0",
Expand Down
Loading