Merge branch 'strukturag:master' into master

Author: roticv

CMakeLists.txt

@@ -167,7 +167,7 @@ endif()
 plugin_option(OpenJPEG_ENCODER "OpenJPEG J2K encoder" OFF ON)
 plugin_option(OpenJPEG_DECODER "OpenJPEG J2K decoder" OFF ON)
 if (WITH_OpenJPEG_ENCODER OR WITH_OpenJPEG_DECODER)
-    find_package(OpenJPEG)
+    find_package(OpenJPEG 2)
 endif()
 
 # ffmpeg

examples/heif-enc.1

@@ -42,7 +42,7 @@ Output filename (optional).
 Enable logging output (more will increase logging level).
 .TP
 .BR \-P ", "\-\-params\fR
-Show all encoder parameters.
+Show all encoder parameters and exit. Input file is not required or used.
 .TP
 .BR \-b\fR\ \fIDEPTH\fR
 Bit-depth of generated HEIF file when using 16-bit PNG input (default: 10 bit).

examples/heif_enc.cc

@@ -155,7 +155,7 @@ void show_help(const char* argv0)
             << "      --no-thumb-alpha  do not save alpha channel in thumbnail image\n"
             << "  -o, --output          output filename (optional)\n"
             << "      --verbose         enable logging output (more will increase logging level)\n"
-            << "  -P, --params          show all encoder parameters\n"
+            << "  -P, --params          show all encoder parameters and exit, input file not required or used.\n"
             << "  -b, --bit-depth #     bit-depth of generated HEIF/AVIF file when using 16-bit PNG input (default: 10 bit)\n"
             << "  -p                    set encoder parameter (NAME=VALUE)\n"
             << "  -A, --avif            encode as AVIF (not needed if output filename with .avif suffix is provided)\n"
@@ -626,22 +626,6 @@ int main(int argc, char** argv)
     return 0;
   }
 
-  if (optind > argc - 1) {
-    show_help(argv[0]);
-    return 0;
-  }
-
-
-  // If we were given a list of filenames and no '-o' option, check whether the last filename is the desired output filename.
-
-  if (output_filename.empty() && argc>1) {
-    if (guess_compression_format_from_filename(argv[argc-1]) != heif_compression_undefined) {
-      output_filename = argv[argc-1];
-      argc--;
-    }
-  }
-
-
   // --- determine output compression format (from output filename or command line parameter)
 
   heif_compression_format compressionFormat;
@@ -720,6 +704,20 @@ int main(int argc, char** argv)
     return 0;
   }
 
+  if (optind > argc - 1) {
+    show_help(argv[0]);
+    return 0;
+  }
+
+
+  // If we were given a list of filenames and no '-o' option, check whether the last filename is the desired output filename.
+
+  if (output_filename.empty() && argc>1) {
+    if (guess_compression_format_from_filename(argv[argc-1]) != heif_compression_undefined) {
+      output_filename = argv[argc-1];
+      argc--;
+    }
+  }
 
   struct heif_error error;
 

libheif/box.cc

@@ -610,9 +610,14 @@ Error Box::read(BitstreamRange& range, std::shared_ptr<Box>* result)
       box = std::make_shared<Box_mskC>();
       break;
 
-    default:
+    case fourcc("mdat"):
+      // avoid generating a 'Box_other'
       box = std::make_shared<Box>();
       break;
+
+    default:
+      box = std::make_shared<Box_other>(hdr.get_short_type());
+      break;
   }
 
   box->set_short_header(hdr);
@@ -849,6 +854,77 @@ void Box::derive_box_version_recursive()
 }
 
 
+Error Box_other::parse(BitstreamRange& range)
+{
+  if (has_fixed_box_size()) {
+    size_t len = get_box_size() - get_header_size();
+    m_data.resize(len);
+    range.read(m_data.data(), len);
+  }
+  else {
+    // TODO: boxes until end of file (we will probably never need this)
+  }
+
+  return range.get_error();
+}
+
+
+Error Box_other::write(StreamWriter& writer) const
+{
+  size_t box_start = reserve_box_header_space(writer);
+
+  writer.write(m_data);
+
+  prepend_header(writer, box_start);
+
+  return Error::Ok;
+}
+
+
+std::string Box_other::dump(Indent& indent) const
+{
+  std::ostringstream sstr;
+
+  sstr << BoxHeader::dump(indent);
+
+  // --- show raw box content
+
+  sstr << std::hex << std::setfill('0');
+
+  size_t len = get_box_size() - get_header_size();
+
+  for (size_t i = 0; i < len; i++) {
+    if (i % 16 == 0) {
+      // start of line
+
+      if (i == 0) {
+        sstr << indent << "data: ";
+      }
+      else {
+        sstr << indent << "      ";
+      }
+      sstr << std::setw(4) << i << ": "; // address
+    }
+    else if (i % 16 == 8) {
+      // space in middle
+      sstr << "  ";
+    }
+    else {
+      // space between bytes
+      sstr << " ";
+    }
+
+    sstr << std::setw(2) << ((int) m_data[i]);
+
+    if (i % 16 == 15 || i == len - 1) {
+      sstr << "\n";
+    }
+  }
+
+  return sstr.str();
+}
+
+
 Error Box_ftyp::parse(BitstreamRange& range)
 {
   m_major_brand = range.read32();

libheif/box.h

@@ -258,6 +258,27 @@ class FullBox : public Box
 };
 
 
+class Box_other : public Box
+{
+public:
+  Box_other(uint32_t short_type)
+  {
+    set_short_type(short_type);
+  }
+
+  Error write(StreamWriter& writer) const override;
+
+  std::string dump(Indent&) const override;
+
+protected:
+  Error parse(BitstreamRange& range) override;
+
+  std::vector<uint8_t> m_data;
+};
+
+
+
+
 class Box_ftyp : public Box
 {
 public:

libheif/plugins/encoder_jpeg.cc

@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image*
   }
 
   uint8_t* outbuffer = nullptr;
+#ifdef LIBJPEG_TURBO_VERSION
   unsigned long outlength = 0;
+#else
+  size_t outlength = 0;
+#endif
 
   jpeg_create_compress(&cinfo);
   jpeg_mem_dest(&cinfo, &outbuffer, &outlength);

scripts/build-android-libs.sh

@@ -21,15 +21,14 @@
 
 
 # This script builds binaries for all Android architectures. They are placed in the directory 'out'.
-# The libheif source has to be unpacked to a directory named "libheif-1.16.2" (replace version number with the value of HEIF_VERSION below).
+# The script should be run in the root directory of the libheif sources.
 
 # The configuration below builds libheif with heic decoding only.
 
 # Set these variables to suit your needs
 NDK_PATH= ... # for example .../android-sdk/sdk/ndk/25.1.8937393
 TOOLCHAIN=clang
-ANDROID_VERSION=19 # the minimum version of Android to support
-HEIF_VERSION=1.16.2
+ANDROID_VERSION=24 # the minimum version of Android to support
 
 function build {
     mkdir -p build/$1
@@ -42,6 +41,7 @@ function build {
 	  -DANDROID_PLATFORM=android-${ANDROID_VERSION} \
 	  -DANDROID_TOOLCHAIN=${TOOLCHAIN} \
     	  -DENABLE_PLUGIN_LOADING=OFF \
+	  -DBUILD_TESTING=OFF \
 	  -DWITH_AOM_DECODER=OFF \
 	  -DWITH_AOM_DECODER_PLUGIN=OFF \
 	  -DWITH_AOM_ENCODER=OFF \
@@ -57,7 +57,8 @@ function build {
 	  -DCMAKE_INSTALL_PREFIX=../../out/$1 \
 	  -DCMAKE_BUILD_TYPE=Release \
 	  -Dld-version-script=OFF \
-	  ../../libheif-${HEIF_VERSION}
+	  ../..
+
     make VERBOSE=1
     make install
     cd ../..

third-party/aom.cmd

@@ -10,11 +10,16 @@
 : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir):
 : #     "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
 
-git clone -b v3.9.0 --depth 1 https://aomedia.googlesource.com/aom
+git clone -b v3.9.1 --depth 1 https://aomedia.googlesource.com/aom
 
 cd aom
 
 cmake -S . -B build.libavif -G Ninja -DCMAKE_INSTALL_PREFIX="$(pwd)/dist" -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0
 ninja -C build.libavif
 ninja -C build.libavif install
 cd ..
+
+echo ""
+echo "----- NOTE ----"
+echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:"
+echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/aom/dist/lib/pkgconfig"

third-party/dav1d.cmd

@@ -21,3 +21,9 @@ meson build --default-library=static --buildtype release --prefix "$(pwd)/dist"
 ninja -C build
 ninja -C build install
 cd ..
+
+echo ""
+echo "----- NOTE ----"
+echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH. For"
+echo "example, on Linux x86_64, run:"
+echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/dav1d/dist/lib/x86_64-linux-gnu/pkgconfig"

third-party/svt.cmd

@@ -5,15 +5,15 @@
 : # If you want to enable the SVT-AV1 encoder, please check that the WITH_SvtEnc and WITH_SvtEnc_BUILTIN CMake variables are set correctly.
 : # You will also have to set the PKG_CONFIG_PATH to "third-party/SVT-AV1/Build/linux/Release" so that the local SVT-AV1 library is found.
 
-git clone -b v1.2.1 --depth 1 https://gitlab.com/AOMediaCodec/SVT-AV1.git
+git clone -b v2.1.0 --depth 1 https://gitlab.com/AOMediaCodec/SVT-AV1.git
 
 cd SVT-AV1
 cd Build/linux
 
-./build.sh release static no-dec no-apps prefix=`pwd`/install install
+./build.sh release static no-dec no-apps prefix=$(pwd)/install install
 cd ../../..
 
 echo ""
 echo "----- NOTE ----"
 echo "Please add the path to the pkg-config file to your PKG_CONFIG_PATH, like this:"
-echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:`pwd`/SVT-AV1/Build/linux/install/lib/pkgconfig"
+echo "export PKG_CONFIG_PATH=\$PKG_CONFIG_PATH:$(pwd)/SVT-AV1/Build/linux/install/lib/pkgconfig"