From bd9f2ef17a8e294872ce4fba559e752f3bfbc1de Mon Sep 17 00:00:00 2001 From: Javernaut Date: Tue, 9 Jun 2020 10:37:36 +0300 Subject: [PATCH 1/5] Test of FFmpeg 4.3 release branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e75cf86..4e6ba46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb - sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb script: - - ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 + - ./ffmpeg-android-maker.sh --source-git-branch=release/4.3 -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 From 3e6885cf74c3d4cfab57c418e5e42ccffe738659 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 12 Jun 2020 19:28:09 +0300 Subject: [PATCH 2/5] Updating Android NDK to 21.3.6528147 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e75cf86..6f9d130 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ install: - curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip --output $HOME/android-sdk.zip - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk - export ANDROID_SDK_HOME=$HOME/android-sdk - - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.1.6352462 + - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147 # Installing necessary components of Android SDK - function installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} $1 > /dev/null; } - - installAndroidComponent "ndk;21.1.6352462" + - installAndroidComponent "ndk;21.3.6528147" - installAndroidComponent "cmake;3.10.2.4988404" # Installing meson, ninja and nasm that are necessary for libdav1d building - sudo apt-get install python3-pip python3-setuptools python3-wheel ninja-build From 6a251e8a6ffb758ba02bfe7e70ae0aa76c419376 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Thu, 18 Jun 2020 13:17:04 +0300 Subject: [PATCH 3/5] Using FFmpeg 4.3 by default --- .travis.yml | 2 +- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e6ba46..e75cf86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb - sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb script: - - ./ffmpeg-android-maker.sh --source-git-branch=release/4.3 -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 + - ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 diff --git a/README.md b/README.md index 944ad67..fbc38da 100644 --- a/README.md +++ b/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.2.3**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **4.3**, 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) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index fd0d75e..528c769 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=16 SOURCE_TYPE=TAR -SOURCE_VALUE=4.2.3 +SOURCE_VALUE=4.3 BINUTILS=gnu EXTERNAL_LIBRARIES=() From 067bf7410db3e9a4c22ec384c9c637e378ecabd3 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 12 Jun 2020 19:29:52 +0300 Subject: [PATCH 4/5] Updating Android command line tools to 6514223 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f9d130..b3ec923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: openjdk8 dist: xenial install: # Installing Android SDK - - curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip --output $HOME/android-sdk.zip + - curl https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip --output $HOME/android-sdk.zip - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk - export ANDROID_SDK_HOME=$HOME/android-sdk - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147 From 6f0a084f8e1445efdcbde17fb0527f33696cef8c Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 12 Jun 2020 20:02:22 +0300 Subject: [PATCH 5/5] Updating Android SDK command line tools and Android NDK in Dockerfile --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 7e1d329..975ab5d 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,8 +2,8 @@ FROM ubuntu:20.04 # Arguments that can be overridden in 'docker build' command: # Versions of Android SDK and NDK. The CMake is installed via NDK. -ARG VERSION_SDK=6200805 -ARG VERSION_NDK=21.0.6113669 +ARG VERSION_SDK=6514223 +ARG VERSION_NDK=21.3.6528147 ARG VERSION_CMAKE=3.10.2.4988404 # Packages to install via apt-get