Merge branch 'master' into media-file

.github/workflows/compilability_check.yml

@@ -1,5 +1,5 @@
 name: Compilability check
-on: push
+on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-20.04

README.md

@@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in
 
 The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does.
 
-By default this script downloads and builds the FFmpeg **4.4.1**, but the version can be overridden.
+By default this script downloads and builds the FFmpeg **5.0**, but the version can be overridden.
 
 The details of how this script is implemented are described in this series of posts:
 * [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422)

scripts/libaom/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-AOM_VERSION=v3.2.0
+AOM_VERSION=v3.3.0
 
 downloadTarArchive \
   "libaom" \

scripts/libdav1d/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-DAV1D_VERSION=0.9.2
+DAV1D_VERSION=1.0.0
 
 downloadTarArchive \
   "libdav1d" \

scripts/libfreetype/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-FREETYPE_VERSION=2.11.0
+FREETYPE_VERSION=2.11.1
 
 downloadTarArchive \
   "libfreetype" \

scripts/libwebp/build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+./configure \
+    --prefix=${INSTALL_DIR} \
+    --host=${TARGET_TRIPLE_MACHINE_ARCH}-linux-android \
+    --with-sysroot=${SYSROOT_PATH} \
+    --target=${TARGET} \
+    CC=${FAM_CC} || exit 1
+
+${MAKE_EXECUTABLE} clean
+${MAKE_EXECUTABLE} -j${HOST_NPROC}
+${MAKE_EXECUTABLE} install

scripts/libwebp/download.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source ${SCRIPTS_DIR}/common-functions.sh
+
+WEBP_VERSION=1.2.2
+
+downloadTarArchive \
+  "libwebp" \
+  "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz"

scripts/parse-arguments.sh

@@ -9,7 +9,7 @@
 ABIS_TO_BUILD=()
 API_LEVEL=19
 SOURCE_TYPE=TAR
-SOURCE_VALUE=4.4.1
+SOURCE_VALUE=5.0
 EXTERNAL_LIBRARIES=()
 FFMPEG_GPL_ENABLED=false
 
@@ -22,6 +22,7 @@ SUPPORTED_LIBRARIES_FREE=(
   "libtwolame"
   "libspeex"
   "libvpx"
+  "libwebp"
   "libfreetype"
   "libfribidi"
 )
@@ -85,6 +86,9 @@ for argument in "$@"; do
   --enable-libopus | -opus)
     EXTERNAL_LIBRARIES+=("libopus")
     ;;
+  --enable-webp | -webp)
+    EXTERNAL_LIBRARIES+=("libwebp")
+    ;;
   --enable-libwavpack | -wavpack)
     EXTERNAL_LIBRARIES+=("libwavpack")
     ;;