Skip to content

Commit

Permalink
Merge pull request #2 from yochy4671/master
Browse files Browse the repository at this point in the history
update submodules
  • Loading branch information
uyjulian committed Aug 17, 2022
2 parents c5a5c9c + 4d5e467 commit 1e4c2ae
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ endif
ARCHIVE ?= $(PROJECT_BASENAME).$(TARGET_ARCH).7z

LIBDAV1D_LIBS += external/dav1d/$(BUILD_DIR_EXTERNAL_NAME)/src/libdav1d.a
LIBAVIF_SOURCES += external/libavif/src/codec_dav1d.c external/libavif/src/alpha.c external/libavif/src/avif.c external/libavif/src/colr.c external/libavif/src/io.c external/libavif/src/mem.c external/libavif/src/obu.c external/libavif/src/rawdata.c external/libavif/src/read.c external/libavif/src/reformat.c external/libavif/src/reformat_libyuv.c external/libavif/src/stream.c external/libavif/src/utils.c external/libavif/src/write.c
LIBAVIF_SOURCES += external/libavif/src/codec_dav1d.c external/libavif/src/alpha.c external/libavif/src/avif.c external/libavif/src/colr.c external/libavif/src/io.c external/libavif/src/mem.c external/libavif/src/obu.c external/libavif/src/rawdata.c external/libavif/src/read.c external/libavif/src/reformat.c external/libavif/src/reformat_libyuv.c external/libavif/src/stream.c external/libavif/src/utils.c external/libavif/src/write.c external/libavif/src/diag.c external/libavif/src/scale.c
SOURCES := extractor.c spi00in.c ifavif.rc $(LIBAVIF_SOURCES)
OBJECTS := $(SOURCES:.c=$(OBJECT_EXTENSION))
OBJECTS := $(OBJECTS:.cpp=$(OBJECT_EXTENSION))
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ The following binaries are available:
* [Win32 (ARM 32-bit Clang)](https://github.com/uyjulian/ifavif/releases/latest/download/ifavif.arm32.clang.7z)
* [Win32 (ARM 64-bit Clang)](https://github.com/uyjulian/ifavif/releases/latest/download/ifavif.arm64.clang.7z)

## Preparing the environment

* Ubuntu
```
$ sudo apt install mingw-w64 meson nasm
```

## Building

After cloning submodules and preparing the environment, a simple invocation of `make` will generate `ifavif.spi`.
Expand Down
2 changes: 1 addition & 1 deletion external/dav1d
Submodule dav1d updated from f06148 to 99172b
2 changes: 1 addition & 1 deletion external/libavif
Submodule libavif updated 93 files
+39 −20 .github/workflows/ci.yml
+24 −0 .github/workflows/cifuzz.yml
+20 −0 .github/workflows/docker-ci.yml
+2 −2 .travis.yml
+204 −1 CHANGELOG.md
+89 −90 CMakeLists.txt
+207 −24 LICENSE
+10 −0 android_jni/.gitignore
+59 −0 android_jni/README.md
+1 −0 android_jni/avifandroidjni/.gitignore
+33 −0 android_jni/avifandroidjni/build.gradle
+14 −0 android_jni/avifandroidjni/proguard-rules.pro
+4 −0 android_jni/avifandroidjni/src/main/AndroidManifest.xml
+62 −0 android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java
+29 −0 android_jni/avifandroidjni/src/main/jni/CMakeLists.txt
+159 −0 android_jni/avifandroidjni/src/main/jni/libavif_jni.cc
+17 −0 android_jni/build.gradle
+24 −0 android_jni/gradle.properties
+ android_jni/gradle/wrapper/gradle-wrapper.jar
+5 −0 android_jni/gradle/wrapper/gradle-wrapper.properties
+185 −0 android_jni/gradlew
+89 −0 android_jni/gradlew.bat
+9 −0 android_jni/settings.gradle
+159 −75 apps/avifdec.c
+137 −29 apps/avifenc.c
+243 −22 apps/shared/avifjpeg.c
+23 −4 apps/shared/avifpng.c
+5 −1 apps/shared/avifpng.h
+144 −16 apps/shared/avifutil.c
+20 −10 apps/shared/avifutil.h
+73 −48 apps/shared/y4m.c
+12 −2 appveyor.yml
+4 −5 cmake/Modules/Findaom.cmake
+14 −0 cmake/Modules/Findlibyuv.cmake
+4 −5 cmake/Modules/Findrav1e.cmake
+1 −0 contrib/gdk-pixbuf/CMakeLists.txt
+2 −2 contrib/gdk-pixbuf/loader.c
+212 −0 contrib/irefmerge.coffee
+18 −3 examples/avif_example_decode_streaming.c
+1 −1 ext/aom.cmd
+2 −1 ext/dav1d.cmd
+3 −3 ext/libgav1.cmd
+39 −0 ext/libgav1_android.sh
+3 −1 ext/libyuv.cmd
+4 −4 ext/rav1e.cmd
+1 −1 ext/svt.cmd
+1 −1 ext/svt.sh
+1 −1 ext/zlibpng.cmd
+0 −10 fuzz.sh
+246 −41 include/avif/avif.h
+71 −19 include/avif/internal.h
+3 −3 libavif.pc.cmake
+0 −14 src/alpha.c
+438 −17 src/avif.c
+331 −99 src/codec_aom.c
+25 −11 src/codec_dav1d.c
+17 −8 src/codec_libgav1.c
+4 −4 src/codec_rav1e.c
+92 −62 src/codec_svt.c
+34 −0 src/diag.c
+2 −2 src/obu.c
+1,404 −432 src/read.c
+228 −94 src/reformat.c
+376 −10 src/reformat_libyuv.c
+163 −0 src/scale.c
+25 −8 src/stream.c
+30 −23 src/utils.c
+251 −50 src/write.c
+59 −0 tests/CMakeLists.txt
+258 −0 tests/avifgridapitest.c
+535 −0 tests/avifincrtest.c
+4 −185 tests/aviftest.c
+206 −0 tests/avify4mtest.c
+0 −3,074 tests/cJSON.c
+0 −293 tests/cJSON.h
+0 −161 tests/compare.c
+0 −27 tests/compare.h
+ tests/data/io/cosmos1650_yuv444_10bpc_p3pq.avif
+ tests/data/io/extentsalpha.avif
+ tests/data/io/kodim03_yuv420_8bpc.avif
+ tests/data/io/kodim23_yuv420_8bpc.avif
+ tests/data/io/twoextents.avif
+ tests/data/originals/cosmos1650_yuv444_10bpc_p3pq.avif
+ tests/data/originals/kodim03_yuv420_8bpc.avif
+ tests/data/originals/kodim23_yuv420_8bpc.avif
+ tests/data/sofa_grid1x5_420.avif
+1,296 −1,296 tests/data/tests.json
+1 −1 tests/docker/Dockerfile
+14 −8 tests/docker/build.sh
+1 −1 tests/docker/docker-compose.yml
+20 −5 tests/oss-fuzz/avif_decode_fuzzer.cc
+0 −290 tests/testcase.c
+0 −35 tests/testcase.h

0 comments on commit 1e4c2ae

Please sign in to comment.