wip: openjph HT decoder

.github/workflows/coverity.yml

@@ -3,15 +3,19 @@ name: coverity
 on:
   push:
     branches: [ coverity ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   scan:
     runs-on: ubuntu-20.04
     env:
       TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
       WITH_AOM: 1
+      WITH_DAV1D: 1
       WITH_GRAPHICS: 1
       WITH_LIBDE265: 1
+      WITH_RAV1E: 1
       WITH_X265: 1
     steps:
     - uses: actions/checkout@v4
@@ -21,7 +25,7 @@ jobs:
       with:
         path: |
           coverity_tool.tar.gz
-        key: ${{ runner.os }}
+        key: coverity_tool-${{ runner.os }}
 
     - name: Download Coverity build tool
       run: |
@@ -39,10 +43,13 @@ jobs:
 
     - name: Build with Coverity build tool
       run: |
-        export PATH=`pwd`/coverity_tool/bin:$PATH
-        cov-build --dir cov-int make
+        export PATH=$(pwd)/coverity_tool/bin:$PATH
+        export PKG_CONFIG_PATH="$(pwd)/libde265/dist/lib/pkgconfig/:$(pwd)/third-party/rav1e/dist/lib/pkgconfig/:$(pwd)/third-party/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig/"
+        cmake --preset=develop .
+        cov-build --dir cov-int make -j$(nproc)
 
     - name: Submit build result to Coverity Scan
+      if: github.ref == 'refs/heads/coverity'
       run: |
         tar czvf libheif.tar.gz cov-int
         curl --form token=$TOKEN \

.github/workflows/emscripten.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   emscripten:
     env:
-      EMSCRIPTEN_VERSION: 3.1.47
+      EMSCRIPTEN_VERSION: 3.1.61
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.16.3) # Oldest Ubuntu LTS (20.04 currently)
 
-project(libheif LANGUAGES C CXX VERSION 1.17.6)
+project(libheif LANGUAGES C CXX VERSION 1.18.0)
 
 # compatibility_version is never allowed to be decreased for any specific SONAME.
 # Libtool in the libheif-1.15.1 release had set it to 17.0.0, so we have to use this for the v1.x.y versions.
@@ -137,6 +137,30 @@ if (WITH_UVG266)
     endif ()
 endif ()
 
+# vvdec
+
+plugin_option(VVDEC "vvdec VVC decoder (experimental)" OFF OFF)
+if (WITH_VVDEC)
+    # TODO: how to do configure vvdec cleanly?
+    find_package(Threads REQUIRED)
+    find_package(vvdec 2.3.0)
+    if (vvdec_FOUND)
+        set(vvdec_LIBRARIES vvdec::vvdec)
+    endif()
+endif ()
+
+# vvenc
+
+plugin_option(VVENC "vvenc VVC encoder (experimental)" OFF OFF)
+if (WITH_VVENC)
+    # TODO: how to do configure vvenc cleanly?
+    find_package(Threads REQUIRED)
+    find_package(vvenc 1.12.0)
+    if (vvenc_FOUND)
+        set(vvenc_LIBRARIES vvenc::vvenc)
+    endif()
+endif ()
+
 # dav1d
 
 plugin_option(DAV1D "Dav1d AV1 decoder" OFF ON)
@@ -200,7 +224,7 @@ endif ()
 # openjph
 
 plugin_option(OPENJPH_ENCODER "OpenJPH HT-J2K encoder" OFF ON)
-# plugin_option(OPENJPH_DECODER "OpenJPH HT-J2K decoder" OFF ON)
+plugin_option(OPENJPH_DECODER "OpenJPH HT-J2K decoder" OFF ON)
 if (WITH_OPENJPH_ENCODER OR WITH_OPENJPH_DECODER)
     find_package(OPENJPH)
 endif()
@@ -226,9 +250,11 @@ plugin_compilation_info(JPEG_DECODER JPEG "JPEG decoder")
 plugin_compilation_info(JPEG_ENCODER JPEG "JPEG encoder")
 plugin_compilation_info(OpenJPEG_DECODER OpenJPEG "OpenJPEG J2K decoder")
 plugin_compilation_info(OpenJPEG_ENCODER OpenJPEG "OpenJPEG J2K encoder")
-# plugin_compilation_info(OPENJPH_DECODER OPENJPH "OpenJPH HT-J2K decoder")
+plugin_compilation_info(OPENJPH_DECODER OPENJPH "OpenJPH HT-J2K decoder")
 plugin_compilation_info(OPENJPH_ENCODER OPENJPH "OpenJPH HT-J2K encoder")
 plugin_compilation_info(UVG266_ENCODER UVG266 "uvg266 VVC enc. (experimental)")
+plugin_compilation_info(VVENC vvenc "vvenc VVC enc. (experimental)")
+plugin_compilation_info(VVDEC vvdec "vvdec VVC dec. (experimental)")
 
 # --- show summary which formats are supported
 
@@ -284,9 +310,12 @@ endif()
 if (OPENJPH_FOUND AND WITH_OPENJPH_DECODER)
     set(SUPPORTS_J2K_HT_ENCODING TRUE)
 endif()
-if (UVG266_FOUND)
+if (UVG266_FOUND OR vvenc_FOUND)
     set(SUPPORTS_VVC_ENCODING TRUE)
 endif()
+if (vvdec_FOUND AND WITH_VVDEC)
+    set(SUPPORTS_VVC_DECODING TRUE)
+endif()
 
 if (WITH_UNCOMPRESSED_CODEC)
     set(SUPPORTS_UNCOMPRESSED_DECODING TRUE)
@@ -297,7 +326,7 @@ message("\n=== Supported formats ===")
 message("format        decoding   encoding")
 format_compilation_info("HEIC" SUPPORTS_HEIC_DECODING SUPPORTS_HEIC_ENCODING)
 format_compilation_info("AVIF" SUPPORTS_AVIF_DECODING SUPPORTS_AVIF_ENCODING)
-format_compilation_info("VVC"  FALSE SUPPORTS_VVC_ENCODING)
+format_compilation_info("VVC"  SUPPORTS_VVC_DECODING SUPPORTS_VVC_ENCODING)
 format_compilation_info("JPEG" SUPPORTS_JPEG_DECODING SUPPORTS_JPEG_ENCODING)
 format_compilation_info("JPEG2000" SUPPORTS_J2K_DECODING SUPPORTS_J2K_ENCODING)
 format_compilation_info("JPEG2000-HT" SUPPORTS_J2K_HT_DECODING SUPPORTS_J2K_HT_ENCODING)
@@ -366,8 +395,22 @@ endif()
 if (LIBSHARPYUV_FOUND)
     list(APPEND REQUIRES_PRIVATE "libsharpyuv")
 endif()
-if (WITH_DEFLATE_HEADER_COMPRESSION)
-    list(APPEND REQUIRES_PRIVATE "zlib")
+if (WITH_HEADER_COMPRESSION OR WITH_UNCOMPRESSED_CODEC)
+    find_package(ZLIB)
+    if (ZLIB_FOUND)
+        message("zlib found")
+        list(APPEND REQUIRES_PRIVATE "zlib")
+    else()
+        message("zlib not found")
+    endif()
+
+    find_package(Brotli)
+    if (Brotli_FOUND)
+        message("Brotli found")
+        list(APPEND REQUIRES_PRIVATE "libbrotlidec")
+    else()
+        message("Brotli not found")
+    endif()
 endif()
 
 list(JOIN REQUIRES_PRIVATE " " REQUIRES_PRIVATE)
@@ -392,7 +435,7 @@ option(WITH_GDK_PIXBUF "Build gdk-pixbuf plugin" ON)
 
 option(WITH_REDUCED_VISIBILITY "Reduced symbol visibility in library" ON)
 
-option(WITH_DEFLATE_HEADER_COMPRESSION OFF)
+option(WITH_HEADER_COMPRESSION OFF)
 option(ENABLE_MULTITHREADING_SUPPORT "Switch off for platforms without multithreading support" ON)
 option(ENABLE_PARALLEL_TILE_DECODING "Will launch multiple decoders to decode tiles in parallel (requires ENABLE_MULTITHREADING_SUPPORT)" ON)
 

CMakePresets.json

@@ -45,7 +45,7 @@
         "WITH_FFMPEG_DECODER_PLUGIN" : "OFF",
 
         "WITH_REDUCED_VISIBILITY" : "OFF",
-        "WITH_DEFLATE_HEADER_COMPRESSION" : "ON",
+        "WITH_HEADER_COMPRESSION" : "ON",
         "WITH_LIBSHARPYUV" : "ON",
         "WITH_EXAMPLES": "ON",
         "WITH_FUZZERS": "OFF"
@@ -91,7 +91,7 @@
         "WITH_FFMPEG_DECODER_PLUGIN" : "ON",
 
         "WITH_REDUCED_VISIBILITY" : "ON",
-        "WITH_DEFLATE_HEADER_COMPRESSION" : "ON",
+        "WITH_HEADER_COMPRESSION" : "ON",
         "WITH_LIBSHARPYUV" : "ON",
         "WITH_EXAMPLES": "ON",
         "WITH_FUZZERS": "OFF"
@@ -123,7 +123,7 @@
         "WITH_FFMPEG_DECODER" : "OFF",
 
         "WITH_REDUCED_VISIBILITY" : "ON",
-        "WITH_DEFLATE_HEADER_COMPRESSION" : "OFF",
+        "WITH_HEADER_COMPRESSION" : "OFF",
         "WITH_LIBSHARPYUV" : "ON",
         "WITH_EXAMPLES": "ON",
         "WITH_FUZZERS": "OFF"
@@ -137,7 +137,8 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "ENABLE_PLUGIN_LOADING" : "OFF",
         "BUILD_TESTING" : "ON",
-        "WITH_REDUCED_VISIBILITY" : "OFF"
+        "WITH_REDUCED_VISIBILITY" : "OFF",
+        "WITH_UNCOMPRESSED_CODEC" : "ON"
       }
     },
     {

README.md

@@ -26,14 +26,14 @@ libheif has support for:
 * decoding of files while downloading (e.g. extract image size before file has been completely downloaded)
 
 Supported codecs:
-| Format       |  Decoders        |  Encoders             |
-|:-------------|:----------------:|:---------------------:|
-| HEIC         | libde265, ffmpeg | x265, kvazaar         |
-| AVIF         | AOM, dav1d       | AOM, rav1e, svt-av1   |
-| VVC          | -                | uvg266 (experimental) |
-| JPEG         | libjpeg(-turbo)  | libjpeg(-turbo)       |
-| JPEG2000     | OpenJPEG         | OpenJPEG              |
-| uncompressed | built-in         | built-in              |
+| Format       |  Decoders           |  Encoders                    |
+|:-------------|:-------------------:|:----------------------------:|
+| HEIC         | libde265, ffmpeg    | x265, kvazaar                |
+| AVIF         | AOM, dav1d          | AOM, rav1e, svt-av1          |
+| VVC          | vvdec (experimental)| vvenc, uvg266 (experimental) |
+| JPEG         | libjpeg(-turbo)     | libjpeg(-turbo)              |
+| JPEG2000     | OpenJPEG            | OpenJPEG                     |
+| uncompressed | built-in            | built-in                     |
 
 ## API
 
@@ -155,13 +155,13 @@ For each codec, there are two configuration variables:
 * `WITH_{codec}_PLUGIN`: when enabled, the codec is compiled as a separate plugin.
 
 In order to use dynamic plugins, also make sure that `ENABLE_PLUGIN_LOADING` is enabled.
-The placeholder `{codec}` can have these values: `LIBDE265`, `X265`, `AOM_DECODER`, `AOM_ENCODER`, `SvtEnc`, `DAV1D`, `FFMPEG_DECODER`, `JPEG_DECODER`, `JPEG_ENCODER`, `KVAZAAR`, `OpenJPEG_DECODER`, `OpenJPEG_ENCODER`, `OPENJPH_ENCODER`
+The placeholder `{codec}` can have these values: `LIBDE265`, `X265`, `AOM_DECODER`, `AOM_ENCODER`, `SvtEnc`, `DAV1D`, `FFMPEG_DECODER`, `JPEG_DECODER`, `JPEG_ENCODER`, `KVAZAAR`, `OpenJPEG_DECODER`, `OpenJPEG_ENCODER`, `OPENJPH_ENCODER`, `VVDEC`, `VVENC`, `UVG266`.
 
 Further options are:
 
-* `WITH_UNCOMPRESSED_CODEC`: enable support for uncompressed images according to ISO/IEC 23001-17:2023. This is *experimental*
-   and not available as a dynamic plugin.
-* `WITH_DEFLATE_HEADER_COMPRESSION`: enables support for compressed metadata. When enabled, it adds a dependency to `zlib`.
+* `WITH_UNCOMPRESSED_CODEC`: enable support for uncompressed images according to ISO/IEC 23001-17:2024. This is *experimental*
+   and not available as a dynamic plugin. When enabled, it adds a dependency to `zlib`, and optionally will use `brotli`.
+* `WITH_HEADER_COMPRESSION`: enables support for compressed metadata. When enabled, it adds a dependency to `zlib`.
    Note that header compression is not widely supported yet.
 * `WITH_LIBSHARPYUV`: enables high-quality YCbCr/RGB color space conversion algorithms (requires `libsharpyuv`,
    e.g. from the `third-party` directory).
@@ -170,7 +170,7 @@ Further options are:
 * `PLUGIN_DIRECTORY`: the directory where libheif will search for dynamic plugins when the environment
   variable `LIBHEIF_PLUGIN_PATH` is not set.
 * `WITH_REDUCED_VISIBILITY`: only export those symbols into the library that are public API.
-  Has to be turned off for running the tests.
+  Has to be turned off for running some tests.
 
 ### macOS
 
@@ -305,15 +305,15 @@ This is `libheif` running in JavaScript in your browser.
 ## Example programs
 
 Some example programs are provided in the `examples` directory.
-The program `heif-convert` converts all images stored in an HEIF/AVIF file to JPEG or PNG.
+The program `heif-dec` converts all images stored in an HEIF/AVIF file to JPEG or PNG.
 `heif-enc` lets you convert JPEG files to HEIF/AVIF.
 The program `heif-info` is a simple, minimal decoder that dumps the file structure to the console.
 
 For example convert `example.heic` to JPEGs and one of the JPEGs back to HEIF:
 
 ```sh
 cd examples/
-./heif-convert example.heic example.jpeg
+./heif-dec example.heic example.jpeg
 ./heif-enc example-1.jpeg -o example.heif
 ```
 
@@ -377,5 +377,5 @@ The sample applications are distributed under the terms of the MIT License.
 See COPYING for more details.
 
 Copyright (c) 2017-2020 Struktur AG</br>
-Copyright (c) 2017-2023 Dirk Farin</br>
+Copyright (c) 2017-2024 Dirk Farin</br>
 Contact: Dirk Farin <[email protected]>

appveyor.yml

@@ -4,29 +4,32 @@ image: Visual Studio 2022
 configuration: Release
 cache: c:\tools\vcpkg\installed\
 
-matrix:
-  allow_failures:
-    - arch: arm64 # libde265 currently doesn't support arm64 on vcpkg
-
 environment:
   matrix:
   - arch: x64
   - arch: arm64
 
 install:
-  - vcpkg install libde265:%arch%-windows
-  - vcpkg install x265:%arch%-windows
+  - vcpkg install aom:%arch%-windows
   - vcpkg install dav1d:%arch%-windows
+  - vcpkg install ffmpeg[avcodec]:%arch%-windows
+  - vcpkg install libde265:%arch%-windows
+  - vcpkg install libjpeg-turbo:%arch%-windows
+  - vcpkg install libpng:%arch%-windows
+  - vcpkg install tiff:%arch%-windows
+  - ps: If (${env:arch} -eq "x64") { vcpkg install x265:${env:arch}-windows }
+  - vcpkg install zlib:%arch%-windows
   - cd c:\tools\vcpkg
   - vcpkg integrate install
   - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
   - mkdir build
   - cd build
-  - cmake .. -A %arch% -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+  - cmake .. -A %arch% -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DWITH_DAV1D=ON -DWITH_AOM_DECODER=ON -DWITH_AOM_ENCODER=ON -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON -DWITH_UNCOMPRESSED_CODEC=ON -DWITH_HEADER_COMPRESSION=ON -DWITH_FFMPEG_DECODER=ON
 
 build:
+  parallel: true
   verbosity: normal
 
 artifacts:

build-emscripten.sh

@@ -20,12 +20,14 @@ SRCDIR=$1
 
 CORES="${CORES:-`nproc --all`}"
 ENABLE_LIBDE265="${ENABLE_LIBDE265:-1}"
-LIBDE265_VERSION="${LIBDE265_VERSION:-1.0.12}"
+LIBDE265_VERSION="${LIBDE265_VERSION:-1.0.15}"
 ENABLE_AOM="${ENABLE_AOM:-0}"
 AOM_VERSION="${AOM_VERSION:-3.6.1}"
 STANDALONE="${STANDALONE:-0}"
 DEBUG="${DEBUG:-0}"
 USE_WASM="${USE_WASM:-1}"
+USE_TYPESCRIPT="${USE_TYPESCRIPT:-1}"
+USE_UNSAFE_EVAL="${USE_UNSAFE_EVAL:-1}"
 
 echo "Build using ${CORES} CPU cores"
 
@@ -46,9 +48,10 @@ if [ "$ENABLE_LIBDE265" = "1" ]; then
         emmake make -j${CORES}
         cd ..
     fi
-    CONFIGURE_ARGS_LIBDE265="-DLIBDE265_INCLUDE_DIR=${DIR}/libde265-${LIBDE265_VERSION} -DLIBDE265_LIBRARY=-L${DIR}/libde265-${LIBDE265_VERSION}/libde265/.libs"
+    LIBDE265_DIR="$(pwd)/libde265-${LIBDE265_VERSION}"
+    CONFIGURE_ARGS_LIBDE265="-DLIBDE265_INCLUDE_DIR=${LIBDE265_DIR} -DLIBDE265_LIBRARY=-L${LIBDE265_DIR}/libde265/.libs"
     LIBRARY_LINKER_FLAGS="$LIBRARY_LINKER_FLAGS -lde265"
-    LIBRARY_INCLUDE_FLAGS="$LIBRARY_INCLUDE_FLAGS -L${DIR}/libde265-${LIBDE265_VERSION}/libde265/.libs"
+    LIBRARY_INCLUDE_FLAGS="$LIBRARY_INCLUDE_FLAGS -L${LIBDE265_DIR}/libde265/.libs"
 fi
 
 CONFIGURE_ARGS_AOM=""
@@ -80,9 +83,10 @@ if [ "$ENABLE_AOM" = "1" ]; then
         cd ..
     fi
 
-    CONFIGURE_ARGS_AOM="-DAOM_INCLUDE_DIR=${DIR}/aom-${AOM_VERSION}/aom-source -DAOM_LIBRARY=-L${DIR}/aom-${AOM_VERSION}"
+    AOM_DIR="$(pwd)/aom-${AOM_VERSION}"
+    CONFIGURE_ARGS_AOM="-DAOM_INCLUDE_DIR=${AOM_DIR}/aom-source -DAOM_LIBRARY=-L${AOM_DIR}"
     LIBRARY_LINKER_FLAGS="$LIBRARY_LINKER_FLAGS -laom"
-    LIBRARY_INCLUDE_FLAGS="$LIBRARY_INCLUDE_FLAGS -L${DIR}/aom-${AOM_VERSION}"
+    LIBRARY_INCLUDE_FLAGS="$LIBRARY_INCLUDE_FLAGS -L${AOM_DIR}"
 fi
 
 EXTRA_EXE_LINKER_FLAGS="-lembind"
@@ -108,7 +112,12 @@ EXPORTED_FUNCTIONS=$($EMSDK/upstream/bin/llvm-nm $LIBHEIFA --format=just-symbols
 
 echo "Running Emscripten..."
 
-BUILD_FLAGS="-lembind -o libheif.js --post-js ${SRCDIR}/post.js -sWASM=$USE_WASM"
+BUILD_FLAGS="-lembind -o libheif.js --post-js ${SRCDIR}/post.js -sWASM=$USE_WASM -sDYNAMIC_EXECUTION=$USE_UNSAFE_EVAL"
+
+if [ "$USE_TYPESCRIPT" = "1" ]; then
+    BUILD_FLAGS="$BUILD_FLAGS --emit-tsd libheif.d.ts"
+fi
+
 RELEASE_BUILD_FLAGS="-O3"
 
 if [ "$STANDALONE" = "1" ]; then
@@ -128,7 +137,6 @@ emcc -Wl,--whole-archive "$LIBHEIFA" -Wl,--no-whole-archive \
     -sEXPORT_NAME="libheif" \
     -sWASM_ASYNC_COMPILATION=0 \
     -sALLOW_MEMORY_GROWTH \
-    --memory-init-file 0 \
     -std=c++11 \
     $LIBRARY_INCLUDE_FLAGS \
     $LIBRARY_LINKER_FLAGS \