update README

using the names of compiler tools same way as they are used (without full path) for ffmpeg build

.travis.yml

@@ -2,36 +2,32 @@ branches:
   only:
   - master
   - development
-sudo: false
 git:
   quiet: true
-addons:
-  apt:
-    packages:
-      - autoconf
-      - automake
-      - libtool
-      - pkg-config
-      - curl
-      - git
-      - cmake
-      - gcc
-      - gperf
-      - texinfo
-      - yasm
-      - nasm
-      - bison
-      - autogen
-      - patch
-  homebrew:
-    packages:
-      - nasm
-    update: true
-matrix:
+jobs:
   include:
     - name: "Android Main Build"
       language: android
+      os: linux
       dist : trusty
+      addons:
+        apt:
+          packages:
+            - autoconf
+            - automake
+            - libtool
+            - pkg-config
+            - curl
+            - git
+            - cmake
+            - gcc
+            - gperf
+            - texinfo
+            - yasm
+            - nasm
+            - bison
+            - autogen
+            - patch
       android:
         components:
           - tools
@@ -42,13 +38,13 @@ matrix:
           - extra-google-m2repository
           - extra-android-m2repository
       install:
-        - echo y | sdkmanager "ndk-bundle"
+        - echo y | sdkmanager "ndk;21.0.6113669"
         - echo y | sdkmanager "cmake;3.10.2.4988404"
         - echo y | sdkmanager "lldb;3.1"
       before_install:
         - touch $HOME/.android/repositories.cfg
       before_script:
-        - export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle
+        - export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk/21.0.6113669
         - rm -f ./build.log
       after_success:
         - grep -e INFO ./build.log | grep build
@@ -56,10 +52,29 @@ matrix:
         - tail -30 ./build.log
         - tail -30 ./src/ffmpeg/ffbuild/config.log
       script:
-        - bash ./android.sh --no-output-redirection
+        - bash ./android.sh --no-output-redirection -d
     - name: "Android LTS Build"
       language: android
+      os: linux
       dist : trusty
+      addons:
+        apt:
+          packages:
+            - autoconf
+            - automake
+            - libtool
+            - pkg-config
+            - curl
+            - git
+            - cmake
+            - gcc
+            - gperf
+            - texinfo
+            - yasm
+            - nasm
+            - bison
+            - autogen
+            - patch
       android:
         components:
           - tools
@@ -71,13 +86,13 @@ matrix:
           - extra-google-m2repository
           - extra-android-m2repository
       install:
-        - echo y | sdkmanager "ndk-bundle"
+        - echo y | sdkmanager "ndk;21.0.6113669"
         - echo y | sdkmanager "cmake;3.10.2.4988404"
         - echo y | sdkmanager "lldb;3.1"
       before_install:
         - touch $HOME/.android/repositories.cfg
       before_script:
-        - export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk-bundle
+        - export ANDROID_NDK_ROOT=$ANDROID_HOME/ndk/21.0.6113669
         - rm -f ./build.log
       after_success:
         - grep -e INFO ./build.log | grep build
@@ -85,10 +100,16 @@ matrix:
         - tail -30 ./build.log
         - tail -30 ./src/ffmpeg/ffbuild/config.log
       script:
-        - bash ./android.sh --lts --no-output-redirection
+        - bash ./android.sh --lts --no-output-redirection -d
     - name: "iOS Main Build"
       language: objective-c
+      os: osx
       osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
       before_script:
         - rm -f ./build.log
       after_success:
@@ -97,10 +118,16 @@ matrix:
         - tail -30 ./build.log
         - tail -30 ./src/ffmpeg/ffbuild/config.log
       script:
-        - bash ./ios.sh --no-output-redirection
+        - bash ./ios.sh --no-output-redirection --disable-arm64e
     - name: "iOS LTS Build"
       language: objective-c
       osx_image: xcode7.3
+      os: osx
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
       before_script:
         - rm -f ./build.log
       after_success:
@@ -109,10 +136,16 @@ matrix:
         - tail -30 ./build.log
         - tail -30 ./src/ffmpeg/ffbuild/config.log
       script:
-        - bash ./ios.sh --lts --no-output-redirection
+        - bash ./ios.sh --lts --no-output-redirection --disable-armv7 --disable-armv7s --disable-i386
     - name: "tvOS Main Build"
       language: objective-c
+      os: osx
       osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
       before_script:
         - rm -f ./build.log
       after_success:
@@ -124,7 +157,13 @@ matrix:
         - bash ./tvos.sh --no-output-redirection
     - name: "tvOS LTS Build"
       language: objective-c
+      os: osx
       osx_image: xcode7.3
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
       before_script:
         - rm -f ./build.log
       after_success:

README.md

@@ -1,4 +1,4 @@
-# MobileFFmpeg [![Financial Contributors on Open Collective](https://opencollective.com/mobile-ffmpeg/all/badge.svg?label=financial+contributors)](https://opencollective.com/mobile-ffmpeg) ![GitHub release](https://img.shields.io/badge/release-v4.3.1-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v4.3.1-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v4.3.1-blue.svg) [![Build Status](https://travis-ci.org/tanersener/mobile-ffmpeg.svg?branch=master)](https://travis-ci.org/tanersener/mobile-ffmpeg)
+# MobileFFmpeg [![Financial Contributors on Open Collective](https://opencollective.com/mobile-ffmpeg/all/badge.svg?label=financial+contributors)](https://opencollective.com/mobile-ffmpeg) ![GitHub release](https://img.shields.io/badge/release-v4.3.2-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v4.3.2-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v4.3.2-blue.svg) [![Build Status](https://travis-ci.org/tanersener/mobile-ffmpeg.svg?branch=master)](https://travis-ci.org/tanersener/mobile-ffmpeg)
 
 FFmpeg for Android, iOS and tvOS
 
@@ -14,16 +14,16 @@ FFmpeg for Android, iOS and tvOS
     
         `chromaprint`, `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `openh264`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `twolame`, `wavpack`
     
-    - 4 external libraries with GPL license
+    - 5 external libraries with GPL license
     
-        `vid.stab`, `x264`, `x265`, `xvidcore`
+        `rubberband`, `vid.stab`, `x264`, `x265`, `xvidcore`
 
     - Concurrent execution
 
 - Exposes both FFmpeg library and MobileFFmpeg wrapper library capabilities
-- Includes cross-compile instructions for 44 open-source libraries
+- Includes cross-compile instructions for 46 open-source libraries
     
-    `chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `leptonica`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libsndfile`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `openh264`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `tiff`, `twolame`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
+    `chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `leptonica`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libsamplerate`, `libsndfile`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `openh264`, `opus`, `rubberband`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `tiff`, `twolame`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
 
 - Licensed under LGPL 3.0, can be customized to support GPL v3.0
 
@@ -36,22 +36,22 @@ FFmpeg for Android, iOS and tvOS
 - Supports `API Level 16+`
 
 #### 1.2 iOS
-- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386` and `x86_64` architectures
-- Supports `bzip2`, `zlib`, `iconv` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
+- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386`, `x86_64` and `x86_64` (Mac Catalyst) architectures
+- Supports `bzip2`, `iconv`, `libuuid`, `zlib` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
 - Objective-C API
 - Camera access
 - `ARC` enabled library
 - Built with `-fembed-bitcode` flag
-- Creates static framework and static universal (fat) library (.a)
+- Creates static frameworks, static xcframeworks and static universal (fat) libraries (.a)
 - Supports `iOS SDK 9.3` or later
  
 #### 1.3 tvOS
 - Builds `arm64` and `x86_64` architectures
-- Supports `bzip2`, `zlib`, `iconv` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox` system frameworks
+- Supports `bzip2`, `iconv`, `libuuid`, `zlib` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox` system frameworks
 - Objective-C API
 - `ARC` enabled library
 - Built with `-fembed-bitcode` flag
-- Creates static framework and static universal (fat) library (.a)
+- Creates static frameworks and static universal (fat) libraries (.a)
 - Supports `tvOS SDK 9.2` or later
 
 ### 2. Using
@@ -120,7 +120,7 @@ Please remember that some parts of `FFmpeg` are licensed under the `GPL` and onl
 1. Add MobileFFmpeg dependency to your `build.gradle` in `mobile-ffmpeg-<package name>` format
     ```
     dependencies {
-        implementation 'com.arthenica:mobile-ffmpeg-full:4.3.1'
+        implementation 'com.arthenica:mobile-ffmpeg-full:4.3.2'
     }
     ```
 
@@ -223,12 +223,12 @@ Please remember that some parts of `FFmpeg` are licensed under the `GPL` and onl
 
     - iOS
     ```
-    pod 'mobile-ffmpeg-full', '~> 4.3.1'
+    pod 'mobile-ffmpeg-full', '~> 4.3.2'
     ```
 
     - tvOS
     ```
-    pod 'mobile-ffmpeg-tvos-full', '~> 4.3.1'
+    pod 'mobile-ffmpeg-tvos-full', '~> 4.3.2'
     ```
 
 2. Execute FFmpeg commands.
@@ -362,6 +362,7 @@ Exact version number is obtained using `git describe --tags`.
 
 |  MobileFFmpeg Version | FFmpeg Version | Release Date |
 | :----: | :----: |:----: |
+| [4.3.2](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.3.2) | 4.3-dev-2955 | Apr 15, 2020 |
 | [4.3.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.3.1) | 4.3-dev-1944 | Jan 25, 2020 |
 | [4.3.1.LTS](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.3.1.LTS) | 4.3-dev-1944 | Jan 25, 2020 |
 | [4.3](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.3) | 4.3-dev-1181 | Oct 27, 2019 |
@@ -397,10 +398,14 @@ This table shows the differences between two variants.
 | Android Architectures | arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64 | arm-v7a<br/>arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64 |
 | Xcode Support | 10.1 | 7.3.1 |
 | iOS SDK | 12.1 | 9.3 |
-| iOS Architectures | arm64<br/>arm64e<br/>x86-64 | armv7<br/>arm64<br/>i386<br/>x86-64 |
+| iOS Architectures | arm64<br/>arm64e<sup>1</sup><br/>x86-64<br/>x86-64-mac-catalyst<sup>2</sup> | armv7<br/>arm64<br/>i386<br/>x86-64 |
 | tvOS SDK | 10.2 | 9.2 |
 | tvOS Architectures | arm64<br/>x86-64 | arm64<br/>x86-64 |
 
+<sup>1</sup> - Included until `v4.3.2`
+
+<sup>2</sup> - Included since `v4.3.2`
+
 ### 5. Building
 
 Build scripts from `master` and `development` branches are tested periodically. See the latest status from the table below.
@@ -424,7 +429,7 @@ Please visit [Android Prerequisites](https://github.com/tanersener/mobile-ffmpeg
 
 2. Android builds require these additional packages.
     - **Android SDK 4.1 Jelly Bean (API Level 16)** or later
-    - **Android NDK r20** or later with LLDB and CMake
+    - **Android NDK r21** or later with LLDB and CMake
 
 3. iOS builds need these extra packages and tools.
     - **Xcode 7.3.1** or later
@@ -478,14 +483,16 @@ All libraries created by the top level build scripts (`android.sh`, `ios.sh` and
 the `prebuilt` directory.
 
 - `Android` archive (.aar file) is located under the `android-aar` folder
-- `iOS` frameworks are located under the `ios-framework`folder
-- `iOS` universal binaries are located under the `ios-universal`folder
-- `tvOS` frameworks are located under the `tvos-framework`folder
-- `tvOS` universal binaries are located under the `tvos-universal`folder 
+- `iOS` frameworks are located under the `ios-framework` folder
+- `iOS` xcframeworks are located under the `ios-xcframework` folder
+- `iOS` universal binaries are located under the `ios-universal` folder
+- `tvOS` frameworks are located under the `tvos-framework` folder
+- `tvOS` universal binaries are located under the `tvos-universal` folder
 
 #### 5.4 GPL Support
-It is possible to enable GPL licensed libraries `x264`, `xvidcore` since `v1.1` and `vid.stab`, `x265` since `v2.1` 
-from the top level build scripts. Their source code is not included in the repository and downloaded when enabled.
+It is possible to enable GPL licensed libraries `x264`, `xvidcore` since `v1.1`; `vid.stab`, `x265` since `v2.1` and
+`rubberband` since `v4.3.2` from the top level build scripts. Their source code is not included in the repository and
+downloaded when enabled.
 
 #### 5.5 External Libraries
 `build` directory includes build scripts of all external libraries. Two scripts exist for each external library, 
@@ -549,7 +556,11 @@ Please visit [License](https://github.com/tanersener/mobile-ffmpeg/wiki/License)
 
 ### 9. Contributing
 
-If you have any recommendations or ideas to improve it, please feel free to submit issues or pull requests. Any help is appreciated.
+Feel free to submit issues or pull requests. 
+
+Please note that `master` branch includes only the latest released source code. Changes planned for the next release 
+are implemented under the `development` branch. So, if you want to create a pull request, please open it against the 
+`development`.
 
 ### 10. See Also
 

android/app/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MobileFFmpeg Android API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.3.1
+PROJECT_NUMBER         = 4.3.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

android/app/build.gradle

@@ -2,12 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
+    ndkVersion "21.0.6113669"
 
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 240431
-        versionName "4.3.1"
+        versionCode 240432
+        versionName "4.3.2"
         project.archivesBaseName = "mobile-ffmpeg"
         consumerProguardFiles 'proguard-rules.pro'
     }

android/app/src/main/cpp/fftools_cmdutils.h

@@ -77,7 +77,6 @@ extern __thread AVDictionary *swr_opts;
 extern __thread AVDictionary *format_opts, *codec_opts, *resample_opts;
 extern __thread int hide_banner;
 extern __thread int find_stream_info;
-extern __thread int filter_nbthreads;
 
 /**
  * Register a program-specific cleanup routine.

android/app/src/main/cpp/fftools_ffmpeg.h

@@ -627,6 +627,7 @@ extern __thread AVIOContext *progress_avio;
 extern __thread float max_error_rate;
 extern __thread char *videotoolbox_pixfmt;
 
+extern __thread int filter_nbthreads;
 extern __thread int filter_complex_nbthreads;
 extern __thread int vstats_version;
 

android/app/src/main/cpp/mobileffmpeg.h

@@ -27,7 +27,7 @@
 #include "libavutil/ffversion.h"
 
 /** Library version string */
-#define MOBILE_FFMPEG_VERSION "4.3.1"
+#define MOBILE_FFMPEG_VERSION "4.3.2"
 
 /** Defines tag used for Android logging. */
 #define LIB_NAME "mobile-ffmpeg"

android/app/src/main/cpp/mobileffplay.c

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <jni.h>
-#include "libavcodec/jni.h"
-
-/** Forward declaration for function defined in fftools_ffplay.c */
-int ffplay_execute(int argc, char **argv);
-
-/** Forward declaration for functions defined in SDl_android.c */
-void set_mobile_ffmpeg_ffplay_execute(int (*ffplay_execute_function)(int argc, char **argv));
-jint SDL_Android_Initialize(JavaVM* vm, void* reserved);
-
-/**
- * Initializes SDL for FFplay. It must be called before other SDL functions.
- */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_FFplay_nativeSDLInit(JNIEnv *env, jclass object) {
-    set_mobile_ffmpeg_ffplay_execute(ffplay_execute);
-    JavaVM *globalVm = av_jni_get_java_vm(NULL);
-    if (globalVm) {
-        SDL_Android_Initialize(globalVm, NULL);
-    }
-}

android/app/src/main/cpp/mobileffplay.h

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MOBILE_FFPLAY_H
-#define MOBILE_FFPLAY_H
-
-#include <jni.h>
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeFFplayExecute
- * Signature: ([Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFplayExecute(JNIEnv *, jclass, jobjectArray);
-
-#endif /* MOBILE_FFPLAY_H */

android/app/src/main/java/com/arthenica/mobileffmpeg/Config.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Taner Sener
+ * Copyright (c) 2018 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -85,7 +85,7 @@ public class Config {
         /* LOAD NOT-LOADED LIBRARIES ON API < 21 */
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             final List<String> externalLibrariesEnabled = getExternalLibraries();
-            if (externalLibrariesEnabled.contains("tesseract") || externalLibrariesEnabled.contains("x265") || externalLibrariesEnabled.contains("snappy") || externalLibrariesEnabled.contains("openh264")) {
+            if (externalLibrariesEnabled.contains("tesseract") || externalLibrariesEnabled.contains("x265") || externalLibrariesEnabled.contains("snappy") || externalLibrariesEnabled.contains("openh264") || externalLibrariesEnabled.contains("rubberband")) {
                 // libc++_shared.so included only when tesseract or x265 is enabled
                 System.loadLibrary("c++_shared");
             }
@@ -103,7 +103,6 @@ public class Config {
         Abi.class.getName();
         FFmpeg.class.getName();
         FFprobe.class.getName();
-        FFplay.class.getName();
 
         /*
          * NEON supported arm-v7a library has a different name
@@ -599,26 +598,26 @@ public class Config {
     /**
      * <p>Enables native redirection. Necessary for log and statistics callback functions.
      */
-    private native static void enableNativeRedirection();
+    private static native void enableNativeRedirection();
 
     /**
      * <p>Disables native redirection
      */
-    private native static void disableNativeRedirection();
+    private static native void disableNativeRedirection();
 
     /**
      * Sets native log level
      *
      * @param level log level
      */
-    private native static void setNativeLogLevel(int level);
+    private static native void setNativeLogLevel(int level);
 
     /**
      * Returns native log level.
      *
      * @return log level
      */
-    private native static int getNativeLogLevel();
+    private static native int getNativeLogLevel();
 
     /**
      * <p>Returns FFmpeg version bundled within the library natively.

android/app/src/main/java/com/arthenica/mobileffmpeg/FFplay.java

@@ -1,526 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Surface;
-
-import com.arthenica.mobileffmpeg.player.AudioHandler;
-import com.arthenica.mobileffmpeg.player.ControllerHandler;
-import com.arthenica.mobileffmpeg.player.PlayerManager;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import static com.arthenica.mobileffmpeg.Config.TAG;
-
-public class FFplay {
-
-    private static final boolean enabled;
-
-    private static boolean separateMouseAndTouch;
-
-    private static AudioHandler audioHandler;
-
-    private static ControllerHandler controllerHandler;
-
-    private static PlayerManager playerManager;
-
-    static {
-
-        /* MOUSE AND TOUCH IS THE SAME DEVICE BY DEFAULT */
-        separateMouseAndTouch = false;
-
-        /* FFPLAY DEPENDS ON SDL. CHECK WHETHER IT IS ENABLED OR NOT */
-        if (Config.getExternalLibraries().contains("sdl2")) {
-            init();
-
-            /* FFPLAY METHODS ARE ENABLED ONLY IF INITIALIZATION COMPLETES SUCCESSFULLY */
-            enabled = true;
-        } else {
-            enabled = false;
-        }
-    }
-
-    static void init() {
-
-        // ENABLE SDL FIRST
-        nativeSDLInit();
-
-        // COMPLETE OTHER COMPONENTS AFTER
-        nativePlayerInit();
-        nativeAudioInit();
-        nativeControllerInit();
-    }
-
-    /**
-     * <p>Synchronously executes FFplay with arguments provided.
-     *
-     * @param arguments FFplay command options/arguments as string array
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
-     */
-    public static int execute(final String[] arguments) {
-        if (enabled) {
-            return nativePlayerRun(arguments);
-        } else {
-            throw new RuntimeException("sdl not found. FFplay requires sdl to run.");
-        }
-    }
-
-    public static boolean isSeparateMouseAndTouch() {
-        return separateMouseAndTouch;
-    }
-
-    public static void setSeparateMouseAndTouch(boolean separateMouseAndTouch) {
-        FFplay.separateMouseAndTouch = separateMouseAndTouch;
-    }
-
-    public static AudioHandler getAudioHandler() {
-        return audioHandler;
-    }
-
-    public static ControllerHandler getControllerHandler() {
-        return controllerHandler;
-    }
-
-    public static PlayerManager getPlayerManager() {
-        return playerManager;
-    }
-
-    public static void setAudioHandler(final AudioHandler newAudioHandler) {
-        audioHandler = newAudioHandler;
-    }
-
-    public static void setControllerManager(final ControllerHandler newControllerHandler) {
-        controllerHandler = newControllerHandler;
-    }
-
-    public static void setPlayerManager(PlayerManager newPlayerManager) {
-        playerManager = newPlayerManager;
-    }
-
-    public static String playerNativeGetHint(final String name) {
-        return nativePlayerNativeGetHint(name);
-    }
-
-    public static void inputSetComposingText(final String text, final int newCursorPosition) {
-        nativeInputSetComposingText(text, newCursorPosition);
-    }
-
-    public static void inputGenerateScancodeForUnichar(final char c) {
-        nativeInputGenerateScancodeForUnichar(c);
-    }
-
-    public static void inputCommitText(String text, int newCursorPosition) {
-        nativeInputCommitText(text, newCursorPosition);
-    }
-
-    public static void playerNativeSetenv(final String name, final String value) {
-        //@TODO We already have this method under Config
-        nativePlayerNativeSetenv(name, value);
-    }
-
-    public static void playerOnDropFile(final String filename) {
-        nativePlayerOnDropFile(filename);
-    }
-
-    public static void playerNativeLowMemory() {
-        nativePlayerNativeLowMemory();
-    }
-
-    public static void playerNativeQuit() {
-        nativePlayerNativeQuit();
-    }
-
-    public static void playerNativePause() {
-        nativePlayerNativePause();
-    }
-
-    public static void playerNativeResume() {
-        nativePlayerNativeResume();
-    }
-
-    public static void playerOnKeyDown(final int keyCode) {
-        nativePlayerOnKeyDown(keyCode);
-    }
-
-    public static void playerOnKeyUp(final int keyCode) {
-        nativePlayerOnKeyUp(keyCode);
-    }
-
-    public static void playerOnKeyboardFocusLost() {
-        nativePlayerOnKeyboardFocusLost();
-    }
-
-    public static void playerOnClipboardChanged() {
-        nativePlayerOnClipboardChanged();
-    }
-
-    public static void playerOnSurfaceChanged() {
-        nativePlayerOnSurfaceChanged();
-    }
-
-    public static void playerOnSurfaceDestroyed() {
-        nativePlayerOnSurfaceDestroyed();
-    }
-
-    public static void playerOnMouse(final int button, final int action, final float x, final float y) {
-        nativePlayerOnMouse(button, action, x, y);
-    }
-
-    public static int controllerAddHaptic(final int deviceId, final String name) {
-        return nativeControllerAddHaptic(deviceId, name);
-    }
-
-    public static int controllerRemoveHaptic(final int deviceId) {
-        return nativeControllerRemoveHaptic(deviceId);
-    }
-
-    public static int controllerAddJoystick(final int deviceId, final String name, final String desc, final int isAccelerometer, final int nButtons, final int nAxes, final int nHats, final int nBalls) {
-        return nativeControllerAddJoystick(deviceId, name, desc, isAccelerometer, nButtons, nAxes, nHats, nBalls);
-    }
-
-    public static int controllerRemoveJoystick(final int deviceId) {
-        return nativeControllerRemoveJoystick(deviceId);
-    }
-
-    public static void controllerOnJoy(final int deviceId, final int axis, final float value) {
-        nativeControllerOnJoy(deviceId, axis, value);
-    }
-
-    public static void controllerOnHat(final int deviceId, final int hatId, final int x, final int y) {
-        nativeControllerOnHat(deviceId, hatId, x, y);
-    }
-
-    public static void playerOnResize(final int x, final int y, final int format, final float rate) {
-        nativePlayerOnResize(x, y, format, rate);
-    }
-
-    public static int controllerOnPadDown(final int deviceId, final int keycode) {
-        return nativeControllerOnPadDown(deviceId, keycode);
-    }
-
-    public static int controllerOnPadUp(final int deviceId, final int keycode) {
-        return nativeControllerOnPadUp(deviceId, keycode);
-    }
-
-    public static void playerOnTouch(final int touchDevId, final int pointerFingerId, final int action, final float x, final float y, final float p) {
-        nativePlayerOnTouch(touchDevId, pointerFingerId, action, x, y, p);
-    }
-
-    public static void playerOnAccel(final float x, final float y, final float z) {
-        nativePlayerOnAccel(x, y, z);
-    }
-
-    /* AUDIO FUNCTIONS CALLED BY NATIVE THREADS */
-
-    static int audioOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, final int desiredFrames) {
-        if (audioHandler != null) {
-            return audioHandler.audioOpen(sampleRate, is16Bit, isStereo, desiredFrames);
-        } else {
-            return -1;
-        }
-    }
-
-    static void audioWriteShortBuffer(final short[] buffer) {
-        if (audioHandler != null) {
-            audioHandler.audioWriteShortBuffer(buffer);
-        }
-    }
-
-    static void audioWriteByteBuffer(final byte[] buffer) {
-        if (audioHandler != null) {
-            audioHandler.audioWriteByteBuffer(buffer);
-        }
-    }
-
-    static int captureOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, final int desiredFrames) {
-        if (audioHandler != null) {
-            return audioHandler.captureOpen(sampleRate, is16Bit, isStereo, desiredFrames);
-        } else {
-            return -1;
-        }
-    }
-
-    static int captureReadShortBuffer(final short[] buffer, final boolean blocking) {
-        if (audioHandler != null) {
-            return audioHandler.captureReadShortBuffer(buffer, blocking);
-        } else {
-            return -1;
-        }
-    }
-
-    static int captureReadByteBuffer(final byte[] buffer, final boolean blocking) {
-        if (audioHandler != null) {
-            return audioHandler.captureReadByteBuffer(buffer, blocking);
-        } else {
-            return -1;
-        }
-    }
-
-    static void audioClose() {
-        if (audioHandler != null) {
-            audioHandler.audioClose();
-        }
-    }
-
-    static void captureClose() {
-        if (audioHandler != null) {
-            audioHandler.captureClose();
-        }
-    }
-
-    /* CONTROLLER FUNCTIONS CALLED BY NATIVE THREADS */
-
-    static void pollInputDevices() {
-        if (controllerHandler != null) {
-            controllerHandler.pollInputDevices();
-        }
-    }
-
-    static void pollHapticDevices() {
-        if (controllerHandler != null) {
-            controllerHandler.pollHapticDevices();
-        }
-    }
-
-    static void hapticRun(final int deviceId, final int length) {
-        if (controllerHandler != null) {
-            controllerHandler.hapticRun(deviceId, length);
-        }
-    }
-
-    /* PLAYER FUNCTIONS CALLED BY NATIVE THREADS */
-
-    static boolean setActivityTitle(final String title) {
-        if (playerManager != null) {
-            return playerManager.setActivityTitle(title);
-        } else {
-            return true;
-        }
-    }
-
-    static void setWindowStyle(final boolean fullScreen) {
-        if (playerManager != null) {
-            playerManager.setWindowStyle(fullScreen);
-        }
-    }
-
-    static void setOrientation(final int w, final int h, final boolean resizable, final String hint) {
-        if (playerManager != null) {
-            playerManager.setOrientation(w, h, resizable, hint);
-        }
-    }
-
-    static boolean isScreenKeyboardShown() {
-        if (playerManager != null) {
-            return playerManager.isScreenKeyboardShown();
-        } else {
-            return false;
-        }
-    }
-
-    static boolean sendMessage(final int command, final int param) {
-        if (playerManager != null) {
-            return playerManager.sendMessage(command, param);
-        } else {
-            return false;
-        }
-    }
-
-    static Context getContext() {
-        if (playerManager != null) {
-            return playerManager.getContext();
-        } else {
-            return null;
-        }
-    }
-
-    static boolean isAndroidTV() {
-        if (playerManager != null) {
-            return playerManager.isAndroidTV();
-        } else {
-            return false;
-        }
-    }
-
-    static DisplayMetrics getDisplayDPI() {
-        if (playerManager != null) {
-            return playerManager.getDisplayDPI();
-        } else {
-            return null;
-        }
-    }
-
-    static boolean getManifestEnvironmentVariables() {
-        if (playerManager != null) {
-            return playerManager.getManifestEnvironmentVariables();
-        } else {
-            return false;
-        }
-    }
-
-    static boolean showTextInput(final int x, final int y, final int w, final int h) {
-        if (playerManager != null) {
-            return playerManager.showTextInput(x, y, w, h);
-        } else {
-            return false;
-        }
-    }
-
-    static Surface getNativeSurface() {
-        if (playerManager != null) {
-            return playerManager.getNativeSurface();
-        } else {
-            return null;
-        }
-    }
-
-    static int[] inputGetInputDeviceIds(final int sources) {
-        if (playerManager != null) {
-            return playerManager.inputGetInputDeviceIds(sources);
-        } else {
-            return new int[0];
-        }
-    }
-
-    static boolean clipboardHasText() {
-        if (playerManager != null) {
-            return playerManager.clipboardHasText();
-        } else {
-            return false;
-        }
-    }
-
-    static String clipboardGetText() {
-        if (playerManager != null) {
-            return playerManager.clipboardGetText();
-        } else {
-            return "";
-        }
-    }
-
-    static void clipboardSetText(final String string) {
-        if (playerManager != null) {
-            playerManager.clipboardSetText(string);
-        }
-    }
-
-    static InputStream openAPKExpansionInputStream(final String fileName) throws IOException {
-        Log.e(TAG, "Opening APK Expansion is not supported.");
-        return null;
-    }
-
-    static int messageBoxShowMessageBox(final int flags, final String title, final String message, final int[] buttonFlags, final int[] buttonIds, final String[] buttonTexts, final int[] colors) {
-        if (playerManager != null) {
-            return playerManager.showMessageBox(flags, title, message, buttonFlags, buttonIds, buttonTexts, colors);
-        } else {
-            return -1;
-        }
-    }
-
-    /* NATIVE SDL FUNCTIONS */
-
-    /**
-     * <p>Initializes SDL for FFplay. It must be called before other SDL functions.
-     */
-    native static void nativeSDLInit();
-
-    /* NATIVE PLAYER FUNCTIONS */
-
-    native static int nativePlayerInit();
-
-    /**
-     * <p>Synchronously executes FFplay natively with arguments provided.
-     *
-     * @param arguments FFplay command options/arguments as string array
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
-     */
-    native static int nativePlayerRun(final String[] arguments);
-
-    native static void nativePlayerNativeLowMemory();
-
-    native static void nativePlayerNativeQuit();
-
-    native static void nativePlayerNativePause();
-
-    native static void nativePlayerNativeResume();
-
-    native static void nativePlayerOnDropFile(final String filename);
-
-    native static void nativePlayerOnResize(final int x, final int y, final int format, final float rate);
-
-    native static void nativePlayerOnKeyDown(final int keyCode);
-
-    native static void nativePlayerOnKeyUp(final int keyCode);
-
-    native static void nativePlayerOnKeyboardFocusLost();
-
-    native static void nativePlayerOnMouse(final int button, final int action, final float x, final float y);
-
-    native static void nativePlayerOnTouch(final int touchDevId, final int pointerFingerId, final int action, final float x, final float y, final float p);
-
-    native static void nativePlayerOnAccel(final float x, final float y, final float z);
-
-    native static void nativePlayerOnClipboardChanged();
-
-    native static void nativePlayerOnSurfaceChanged();
-
-    native static void nativePlayerOnSurfaceDestroyed();
-
-    native static String nativePlayerNativeGetHint(final String name);
-
-    native static void nativePlayerNativeSetenv(final String name, final String value);
-
-    /* NATIVE AUDIO FUNCTIONS */
-
-    native static int nativeAudioInit();
-
-    /* NATIVE CONTROLLER FUNCTIONS */
-
-    native static int nativeControllerInit();
-
-    native static int nativeControllerAddJoystick(final int deviceId, final String name, final String desc, final int isAccelerometer, final int nButtons, final int nAxes, final int nHats, final int nBalls);
-
-    native static int nativeControllerRemoveJoystick(final int deviceId);
-
-    native static int nativeControllerAddHaptic(final int deviceId, final String name);
-
-    native static int nativeControllerRemoveHaptic(final int deviceId);
-
-    native static int nativeControllerOnPadDown(final int deviceId, final int keycode);
-
-    native static int nativeControllerOnPadUp(final int deviceId, final int keycode);
-
-    native static void nativeControllerOnJoy(final int deviceId, final int axis, final float value);
-
-    native static void nativeControllerOnHat(final int deviceId, final int hatId, final int x, final int y);
-
-    /* NATIVE INPUT FUNCTIONS */
-
-    native static void nativeInputCommitText(final String text, final int newCursorPosition);
-
-    native static void nativeInputGenerateScancodeForUnichar(final char c);
-
-    native static void nativeInputSetComposingText(final String text, final int newCursorPosition);
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/Packages.java

@@ -54,6 +54,7 @@ class Packages {
         supportedExternalLibraries.add("opencore-amr");
         supportedExternalLibraries.add("openh264");
         supportedExternalLibraries.add("opus");
+        supportedExternalLibraries.add("rubberband");
         supportedExternalLibraries.add("sdl2");
         supportedExternalLibraries.add("shine");
         supportedExternalLibraries.add("snappy");

android/app/src/main/java/com/arthenica/mobileffmpeg/player/AudioHandler.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-public interface AudioHandler {
-
-    void initialize();
-
-    int audioOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, final int desiredFrames);
-
-    void audioWriteShortBuffer(final short[] buffer);
-
-    void audioWriteByteBuffer(final byte[] buffer);
-
-    int captureOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, final int desiredFrames);
-
-    int captureReadShortBuffer(final short[] buffer, final boolean blocking);
-
-    int captureReadByteBuffer(final byte[] buffer, final boolean blocking);
-
-    void audioClose();
-
-    void captureClose();
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/ControllerHandler.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.content.Context;
-import android.view.MotionEvent;
-
-public interface ControllerHandler {
-
-    void initialize(final Context context);
-
-    boolean handleJoystickMotionEvent(final MotionEvent event);
-
-    void pollInputDevices();
-
-    void pollHapticDevices();
-
-    void hapticRun(final int deviceId, final int length);
-
-    boolean isDeviceSDLJoystick(final int deviceId);
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/FullScreenActivity.java

@@ -1,180 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLActivity renamed as FullScreenActivity
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-import static com.arthenica.mobileffmpeg.Config.TAG;
-import static com.arthenica.mobileffmpeg.player.PlayerSession.FFPLAY_COMMAND;
-import static com.arthenica.mobileffmpeg.player.PlayerSession.NativeState;
-
-public class FullScreenActivity extends Activity {
-    protected PlayerSurface playerSurface;
-    protected ViewGroup viewLayout;
-    protected PlayerSession playerSession;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        String ffplayCommand = intent.getStringExtra(FFPLAY_COMMAND);
-
-        if (ffplayCommand == null) {
-            Log.i(TAG, "FullScreenActivity created with empty ffplay command.");
-        } else {
-            Log.v(TAG, "FullScreenActivity created.");
-        }
-
-        playerSession = new PlayerSession(getRequestedOrientation(), this, ffplayCommand);
-        playerSurface = new PlayerSurface(this);
-        playerSurface.init(this, new GenericMotionListener(), playerSession);
-
-        viewLayout = new RelativeLayout(this);
-        viewLayout.addView(playerSurface);
-
-        setContentView(viewLayout);
-        setWindowStyle(false);
-    }
-
-    @Override
-    protected void onPause() {
-        Log.v(TAG, "FullScreenActivity paused.");
-        setNextNativeState(NativeState.PAUSED);
-        setResumedCalled(false);
-        handleNativeState();
-        super.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        Log.v(TAG, "FullScreenActivity resumed.");
-        setNextNativeState(NativeState.RESUMED);
-        setResumedCalled(true);
-        handleNativeState();
-        super.onResume();
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        Log.v(TAG, String.format("FullScreenActivity window focus changed, hasFocus: %s.", hasFocus));
-        setHasFocus(hasFocus);
-        if (hasFocus) {
-            setNextNativeState(NativeState.RESUMED);
-        } else {
-            setNextNativeState(NativeState.PAUSED);
-        }
-        handleNativeState();
-        super.onWindowFocusChanged(hasFocus);
-    }
-
-    @Override
-    public void onLowMemory() {
-        Log.v(TAG, "FullScreenActivity is on low memory.");
-        FFplay.playerNativeLowMemory();
-        super.onLowMemory();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Log.v(TAG, "FullScreenActivity destroyed.");
-        setNextNativeState(NativeState.PAUSED);
-        handleNativeState();
-
-        // Send a quit message to the application
-        FFplay.playerNativeQuit();
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(final KeyEvent event) {
-        int keyCode = event.getKeyCode();
-
-        // Ignore certain special keys so they're handled by Android
-        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
-                keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
-                keyCode == KeyEvent.KEYCODE_CAMERA ||
-                keyCode == KeyEvent.KEYCODE_ZOOM_IN ||
-                keyCode == KeyEvent.KEYCODE_ZOOM_OUT) {
-            return false;
-        }
-
-        return super.dispatchKeyEvent(event);
-    }
-
-    protected void setNextNativeState(final NativeState nextNativeState) {
-        PlayerSession playerSession = this.playerSession;
-        if (playerSession != null) {
-            playerSession.setNextNativeState(nextNativeState);
-        }
-    }
-
-    protected void handleNativeState() {
-        PlayerSurface playerSurface = this.playerSurface;
-        if (playerSurface != null) {
-            playerSurface.handleNativeState();
-        }
-    }
-
-    protected void setHasFocus(final boolean hasFocus) {
-        PlayerSurface playerSurface = this.playerSurface;
-        if (playerSurface != null) {
-            playerSurface.setHasFocus(hasFocus);
-        }
-    }
-
-    protected void setResumedCalled(final boolean resumedCalled) {
-        PlayerSurface playerSurface = this.playerSurface;
-        if (playerSurface != null) {
-            playerSurface.setResumedCalled(resumedCalled);
-        }
-    }
-
-    protected void setWindowStyle(final boolean fullScreen) {
-        PlayerSurface playerSurface = this.playerSurface;
-        if (playerSurface != null) {
-            playerSurface.setWindowStyle(fullScreen);
-        }
-    }
-
-    public PlayerSurface getPlayerSurface() {
-        return playerSurface;
-    }
-
-    public PlayerSession getPlayerSession() {
-        return playerSession;
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericAudioHandler.java

@@ -1,191 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLAudioHandler renamed as GenericAudioHandler
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioRecord;
-import android.media.AudioTrack;
-import android.media.MediaRecorder;
-import android.os.Build;
-import android.util.Log;
-
-import static com.arthenica.mobileffmpeg.Config.TAG;
-
-public class GenericAudioHandler implements AudioHandler {
-    protected AudioTrack audioTrack;
-    protected AudioRecord audioRecord;
-
-    public void initialize() {
-        audioTrack = null;
-        audioRecord = null;
-    }
-
-    public int audioOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, int desiredFrames) {
-        int channelConfig = isStereo ? AudioFormat.CHANNEL_OUT_STEREO : AudioFormat.CHANNEL_OUT_MONO;
-        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
-        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
-
-        Log.v(TAG, String.format("AudioHandler audio: wanted %s %s %skHz, %d frames buffer.", isStereo ? "stereo" : "mono", is16Bit ? "16-bit" : "8-bit", sampleRate / 1000f, desiredFrames));
-
-        // Let the user pick a larger buffer if they really want -- but ye
-        // gods they probably shouldn't, the minimums are horrifyingly high
-        // latency already
-        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
-
-        if (audioTrack == null) {
-            audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
-                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
-
-            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
-            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
-            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
-
-            if (audioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
-                Log.e(TAG, "AudioHandler failed during initialization of AudioTrack.");
-                audioTrack = null;
-                return -1;
-            }
-
-            audioTrack.play();
-        }
-
-        Log.v(TAG, String.format("AudioHandler audio: got %s %s %skHz, %d frames buffer.", (audioTrack.getChannelCount() >= 2) ? "stereo" : "mono", (audioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit", audioTrack.getSampleRate() / 1000f, desiredFrames));
-
-        return 0;
-    }
-
-    public void audioWriteShortBuffer(final short[] buffer) {
-        if (audioTrack == null) {
-            Log.e(TAG, "AudioHandler attempted to make audio call with uninitialized audio!");
-            return;
-        }
-
-        for (int i = 0; i < buffer.length; ) {
-            int result = audioTrack.write(buffer, i, buffer.length - i);
-            if (result > 0) {
-                i += result;
-            } else if (result == 0) {
-                try {
-                    Thread.sleep(1);
-                } catch (InterruptedException e) {
-                    // Nom nom
-                }
-            } else {
-                Log.w(TAG, "AudioHandler audio: error return from write(short).");
-                return;
-            }
-        }
-    }
-
-    public void audioWriteByteBuffer(final byte[] buffer) {
-        if (audioTrack == null) {
-            Log.e(TAG, "AudioHandler attempted to make audio call with uninitialized audio!");
-            return;
-        }
-
-        for (int i = 0; i < buffer.length; ) {
-            int result = audioTrack.write(buffer, i, buffer.length - i);
-            if (result > 0) {
-                i += result;
-            } else if (result == 0) {
-                try {
-                    Thread.sleep(1);
-                } catch (InterruptedException e) {
-                    // Nom nom
-                }
-            } else {
-                Log.w(TAG, "AudioHandler audio: error return from write(byte).");
-                return;
-            }
-        }
-    }
-
-    public int captureOpen(final int sampleRate, final boolean is16Bit, final boolean isStereo, int desiredFrames) {
-        int channelConfig = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
-        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
-        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
-
-        Log.v(TAG, String.format("AudioHandler capture: wanted %s %s %skHz, %d frames buffer.", isStereo ? "stereo" : "mono", is16Bit ? "16-bit" : "8-bit", sampleRate / 1000f, desiredFrames));
-
-        // Let the user pick a larger buffer if they really want -- but ye
-        // gods they probably shouldn't, the minimums are horrifyingly high
-        // latency already
-        desiredFrames = Math.max(desiredFrames, (AudioRecord.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
-
-        if (audioRecord == null) {
-            audioRecord = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, sampleRate, channelConfig, audioFormat, desiredFrames * frameSize);
-
-            // see notes about AudioTrack state in audioOpen(), above. Probably also applies here.
-            if (audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
-                Log.e(TAG, "AudioHandler failed during initialization of AudioRecord.");
-                audioRecord.release();
-                audioRecord = null;
-                return -1;
-            }
-
-            audioRecord.startRecording();
-        }
-
-        Log.v(TAG, String.format("AudioHandler capture: got %s %s %skHz, %d frames buffer.", (audioRecord.getChannelCount() >= 2) ? "stereo" : "mono", (audioRecord.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit", audioRecord.getSampleRate() / 1000f, desiredFrames));
-
-        return 0;
-    }
-
-    public int captureReadShortBuffer(final short[] buffer, final boolean blocking) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return audioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
-        } else {
-            return audioRecord.read(buffer, 0, buffer.length);
-        }
-    }
-
-    public int captureReadByteBuffer(final byte[] buffer, final boolean blocking) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return audioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
-        } else {
-            return audioRecord.read(buffer, 0, buffer.length);
-        }
-    }
-
-    public void audioClose() {
-        if (audioTrack != null) {
-            audioTrack.stop();
-            audioTrack.release();
-            audioTrack = null;
-        }
-    }
-
-    public void captureClose() {
-        if (audioRecord != null) {
-            audioRecord.stop();
-            audioRecord.release();
-            audioRecord = null;
-        }
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericCommandHandler.java

@@ -1,110 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.Window;
-import android.view.WindowManager;
-
-import static com.arthenica.mobileffmpeg.Config.TAG;
-
-/**
- * A Handler class for Messages from native SDL applications.
- * It uses current Activities as target (e.g. for the title).
- * static to prevent implicit references to enclosing object.
- */
-public class GenericCommandHandler extends Handler {
-
-    public static final int COMMAND_CHANGE_TITLE = 1;
-    public static final int COMMAND_CHANGE_WINDOW_STYLE = 2;
-    public static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
-
-    protected final Context context;
-
-    public GenericCommandHandler(final Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public void handleMessage(final Message message) {
-        switch (message.arg1) {
-            case COMMAND_CHANGE_TITLE:
-                if (context instanceof Activity) {
-                    ((Activity) context).setTitle((String) message.obj);
-                } else {
-                    Log.e(TAG, "CommandHandler error handling message, getContext() returned no Activity.");
-                }
-                break;
-            case COMMAND_CHANGE_WINDOW_STYLE:
-                if (Build.VERSION.SDK_INT < 19) {
-                    // This version of Android doesn't support the immersive fullscreen mode
-                    break;
-                }
-/* This needs more testing, per bug 4096 - Enabling fullscreen on Android causes the app to toggle fullscreen mode continuously in a loop
- ***
-                if (context instanceof Activity) {
-                    Window window = ((Activity) context).getWindow();
-                    if (window != null) {
-                        if ((message.obj instanceof Integer) && (((Integer) message.obj).intValue() != 0)) {
-                            int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-                                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-                                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                                        View.SYSTEM_UI_FLAG_FULLSCREEN |
-                                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-                            window.getDecorView().setSystemUiVisibility(flags);
-                            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                        } else {
-                            int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
-                            window.getDecorView().setSystemUiVisibility(flags);
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                        }
-                    }
-                } else {
-                    Log.e(TAG, "error handling message, getContext() returned no Activity");
-                }
-***/
-                break;
-            case COMMAND_SET_KEEP_SCREEN_ON: {
-                if (context instanceof Activity) {
-                    Window window = ((Activity) context).getWindow();
-                    if (window != null) {
-                        if ((message.obj instanceof Integer) && (((Integer) message.obj).intValue() != 0)) {
-                            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-                        } else {
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-                        }
-                    }
-                }
-                break;
-            }
-            default:
-                Log.e(TAG, String.format("CommandHandler error handling message, command is %d.", message.arg1));
-        }
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericControllerHandler.java

@@ -1,81 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLControllerHandler renamed as GenericControllerHandler
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.content.Context;
-import android.view.InputDevice;
-import android.view.MotionEvent;
-
-public class GenericControllerHandler implements ControllerHandler {
-    protected GenericJoystickHandler genericJoystickHandler;
-    protected GenericHapticHandler genericHapticHandler;
-
-    public void initialize(final Context context) {
-        genericJoystickHandler = new GenericJoystickHandler(this);
-        genericHapticHandler = new GenericHapticHandler(context);
-    }
-
-    /**
-     * Joystick glue code, just a series of stubs that redirect to the JoystickHandler instance.
-     */
-    public boolean handleJoystickMotionEvent(final MotionEvent event) {
-        return genericJoystickHandler.handleMotionEvent(event);
-    }
-
-    public void pollInputDevices() {
-        genericJoystickHandler.pollInputDevices();
-    }
-
-    public void pollHapticDevices() {
-        genericHapticHandler.pollHapticDevices();
-    }
-
-    public void hapticRun(final int deviceId, final int length) {
-        genericHapticHandler.run(deviceId, length);
-    }
-
-    /**
-     * Check if a given device is considered a possible SDL joystick.
-     *
-     * @param deviceId device identifier
-     * @return true if device is a joystick, false otherwise
-     */
-    public boolean isDeviceSDLJoystick(final int deviceId) {
-        InputDevice device = InputDevice.getDevice(deviceId);
-        if ((device == null) || device.isVirtual() || (deviceId < 0)) {
-            return false;
-        }
-
-        int sources = device.getSources();
-        return (((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) ||
-                ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
-                ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
-        );
-    }
-
-}
-

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericHapticHandler.java

@@ -1,148 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLHapticHandler renamed as GenericHapticHandler
- * - SDLHaptic class renamed as Haptic
- * - Haptic class refactored
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Vibrator;
-import android.view.InputDevice;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-import java.util.ArrayList;
-
-/**
- * <p>Generic haptic handler for FFplay Controller.
- */
-public class GenericHapticHandler {
-
-    public static class Haptic {
-        public final int deviceId;
-        public final String name;
-        public final Vibrator vibrator;
-
-        public Haptic(final int deviceId, final String name, final Vibrator vibrator) {
-            this.deviceId = deviceId;
-            this.name = name;
-            this.vibrator = vibrator;
-        }
-
-    }
-
-    protected final ArrayList<Haptic> hapticList;
-    protected final Vibrator vibratorService;
-
-    public GenericHapticHandler(final Context context) {
-        hapticList = new ArrayList<>();
-        vibratorService = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-    }
-
-    @SuppressLint("MissingPermission")
-    public void run(final int deviceId, final int length) {
-        Haptic haptic = getHaptic(deviceId);
-        if (haptic != null) {
-            haptic.vibrator.vibrate(length);
-        }
-    }
-
-    public void pollHapticDevices() {
-
-        final int DEVICE_ID_VIBRATOR_SERVICE = 999999;
-        boolean hasVibratorService = false;
-
-        final int[] deviceIdArray = InputDevice.getDeviceIds();
-        // It helps processing the device ids in reverse order
-        // For example, in the case of the XBox 360 wireless dongle,
-        // so the first controller seen by SDL matches what the receiver
-        // considers to be the first controller
-        for (int i = deviceIdArray.length - 1; i > -1; i--) {
-            Haptic haptic = getHaptic(deviceIdArray[i]);
-            if (haptic == null) {
-                InputDevice device = InputDevice.getDevice(deviceIdArray[i]);
-                Vibrator vib = device.getVibrator();
-                if (vib.hasVibrator()) {
-                    haptic = new Haptic(deviceIdArray[i], device.getName(), vib);
-                    hapticList.add(haptic);
-                    FFplay.controllerAddHaptic(haptic.deviceId, haptic.name);
-                }
-            }
-        }
-
-        /* Check VIBRATOR_SERVICE */
-        if (vibratorService != null) {
-            hasVibratorService = vibratorService.hasVibrator();
-
-            if (hasVibratorService) {
-                Haptic haptic = getHaptic(DEVICE_ID_VIBRATOR_SERVICE);
-                if (haptic == null) {
-                    haptic = new Haptic(DEVICE_ID_VIBRATOR_SERVICE, "VIBRATOR_SERVICE", vibratorService);
-                    hapticList.add(haptic);
-                    FFplay.controllerAddHaptic(haptic.deviceId, haptic.name);
-                }
-            }
-        }
-
-        /* Check removed devices */
-        ArrayList<Integer> removedDevices = new ArrayList<>();
-        for (int i = 0; i < hapticList.size(); i++) {
-            int deviceId = hapticList.get(i).deviceId;
-            int j;
-            for (j = 0; j < deviceIdArray.length; j++) {
-                if (deviceId == deviceIdArray[j]) break;
-            }
-
-            if (deviceId == DEVICE_ID_VIBRATOR_SERVICE && hasVibratorService) {
-                // don't remove the vibrator if it is still present
-            } else if (j == deviceIdArray.length) {
-                removedDevices.add(deviceId);
-            }
-        }
-
-        for (int i = 0; i < removedDevices.size(); i++) {
-            int deviceId = removedDevices.get(i);
-            FFplay.controllerRemoveHaptic(deviceId);
-            for (int j = 0; j < hapticList.size(); j++) {
-                if (hapticList.get(j).deviceId == deviceId) {
-                    hapticList.remove(j);
-                    break;
-                }
-            }
-        }
-    }
-
-    protected Haptic getHaptic(final int deviceId) {
-        for (int i = 0; i < hapticList.size(); i++) {
-            if (hapticList.get(i).deviceId == deviceId) {
-                return hapticList.get(i);
-            }
-        }
-        return null;
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericJoystickHandler.java

@@ -1,179 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLJoystickHandler renamed as GenericJoystickHandler
- * - SDLJoystick class renamed as Joystick
- * - Joystick class refactored
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.view.InputDevice;
-import android.view.MotionEvent;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * <p>Generic joystick handler for FFplay Controller.
- */
-public class GenericJoystickHandler {
-
-    public static class Joystick {
-        public final int deviceId;
-        public final String name;
-        public final String desc;
-        public final ArrayList<InputDevice.MotionRange> axes;
-        public final ArrayList<InputDevice.MotionRange> hats;
-
-        public Joystick(final int deviceId, final String name, final String desc, final ArrayList<InputDevice.MotionRange> axes, final ArrayList<InputDevice.MotionRange> hats) {
-            this.deviceId = deviceId;
-            this.name = name;
-            this.desc = desc;
-            this.axes = axes;
-            this.hats = hats;
-        }
-    }
-
-    public static class RangeComparator implements Comparator<InputDevice.MotionRange> {
-        @Override
-        public int compare(final InputDevice.MotionRange arg0, final InputDevice.MotionRange arg1) {
-            return arg0.getAxis() - arg1.getAxis();
-        }
-    }
-
-    protected final ArrayList<Joystick> joystickList;
-    protected final ControllerHandler controllerHandler;
-
-    public GenericJoystickHandler(final ControllerHandler controllerHandler) {
-        this.joystickList = new ArrayList<>();
-        this.controllerHandler = controllerHandler;
-    }
-
-    public void pollInputDevices() {
-        int[] deviceIds = InputDevice.getDeviceIds();
-        // It helps processing the device ids in reverse order
-        // For example, in the case of the XBox 360 wireless dongle,
-        // so the first controller seen by SDL matches what the receiver
-        // considers to be the first controller
-
-        for (int i = deviceIds.length - 1; i > -1; i--) {
-            Joystick joystick = getJoystick(deviceIds[i]);
-            if (joystick == null) {
-                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
-                if (controllerHandler.isDeviceSDLJoystick(deviceIds[i])) {
-                    joystick = new Joystick(deviceIds[i], joystickDevice.getName(), getJoystickDescriptor(joystickDevice), new ArrayList<InputDevice.MotionRange>(), new ArrayList<InputDevice.MotionRange>());
-                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
-                    Collections.sort(ranges, new RangeComparator());
-
-                    for (InputDevice.MotionRange range : ranges) {
-                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
-                                joystick.hats.add(range);
-                            } else {
-                                joystick.axes.add(range);
-                            }
-                        }
-                    }
-
-                    joystickList.add(joystick);
-                    FFplay.controllerAddJoystick(joystick.deviceId, joystick.name, joystick.desc, 0, -1, joystick.axes.size(), joystick.hats.size() / 2, 0);
-                }
-            }
-        }
-
-        /* Check removed devices */
-        ArrayList<Integer> removedDevices = new ArrayList<>();
-        for (int i = 0; i < joystickList.size(); i++) {
-            int deviceId = joystickList.get(i).deviceId;
-            int j;
-            for (j = 0; j < deviceIds.length; j++) {
-                if (deviceId == deviceIds[j]) break;
-            }
-            if (j == deviceIds.length) {
-                removedDevices.add(deviceId);
-            }
-        }
-
-        for (int i = 0; i < removedDevices.size(); i++) {
-            int deviceId = removedDevices.get(i);
-            FFplay.controllerRemoveJoystick(deviceId);
-            for (int j = 0; j < joystickList.size(); j++) {
-                if (joystickList.get(j).deviceId == deviceId) {
-                    joystickList.remove(j);
-                    break;
-                }
-            }
-        }
-    }
-
-    protected Joystick getJoystick(int deviceId) {
-        for (int i = 0; i < joystickList.size(); i++) {
-            if (joystickList.get(i).deviceId == deviceId) {
-                return joystickList.get(i);
-            }
-        }
-        return null;
-    }
-
-    public boolean handleMotionEvent(final MotionEvent event) {
-        if ((event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
-            int actionPointerIndex = event.getActionIndex();
-            int action = event.getActionMasked();
-
-            if (action == MotionEvent.ACTION_MOVE) {
-                Joystick joystick = getJoystick(event.getDeviceId());
-                if (joystick != null) {
-                    for (int i = 0; i < joystick.axes.size(); i++) {
-                        InputDevice.MotionRange range = joystick.axes.get(i);
-                        /* Normalize the value to -1...1 */
-                        float value = (event.getAxisValue(range.getAxis(), actionPointerIndex) - range.getMin()) / range.getRange() * 2.0f - 1.0f;
-                        FFplay.controllerOnJoy(joystick.deviceId, i, value);
-                    }
-                    for (int i = 0; i < joystick.hats.size(); i += 2) {
-                        int hatX = Math.round(event.getAxisValue(joystick.hats.get(i).getAxis(), actionPointerIndex));
-                        int hatY = Math.round(event.getAxisValue(joystick.hats.get(i + 1).getAxis(), actionPointerIndex));
-                        FFplay.controllerOnHat(joystick.deviceId, i / 2, hatX, hatY);
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public String getJoystickDescriptor(final InputDevice joystickDevice) {
-        String desc = joystickDevice.getDescriptor();
-
-        if (desc != null && !desc.isEmpty()) {
-            return desc;
-        }
-
-        return joystickDevice.getName();
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/GenericMotionListener.java

@@ -1,90 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLGenericMotionListener renamed as GenericMotionListener
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.view.InputDevice;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-/**
- * <p>Generic motion listener for FFplay Player.
- */
-public class GenericMotionListener implements View.OnGenericMotionListener {
-
-    @Override
-    public boolean onGenericMotion(final View view, final MotionEvent event) {
-        ControllerHandler controllerHandler = FFplay.getControllerHandler();
-        float x, y;
-        int action;
-
-        switch (event.getSource()) {
-            case InputDevice.SOURCE_JOYSTICK:
-            case InputDevice.SOURCE_GAMEPAD:
-            case InputDevice.SOURCE_DPAD: {
-                if (controllerHandler != null) {
-                    return controllerHandler.handleJoystickMotionEvent(event);
-                } else {
-                    return false;
-                }
-            }
-            case InputDevice.SOURCE_MOUSE: {
-                if (!FFplay.isSeparateMouseAndTouch()) {
-                    break;
-                }
-                action = event.getActionMasked();
-                switch (action) {
-                    case MotionEvent.ACTION_SCROLL: {
-                        x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
-                        y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
-
-                        FFplay.playerOnMouse(0, action, x, y);
-                        return true;
-                    }
-                    case MotionEvent.ACTION_HOVER_MOVE: {
-                        x = event.getX(0);
-                        y = event.getY(0);
-
-                        FFplay.playerOnMouse(0, action, x, y);
-                        return true;
-                    }
-                    default: {
-                        break;
-                    }
-                }
-                break;
-            }
-            default: {
-                break;
-            }
-        }
-
-        return false;
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/PlayerClipboard.java

@@ -1,92 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLClipboardHandler renamed as PlayerClipboard
- * - Added null checks for clipboardManager field
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-/**
- * <p>Clipboard for FFplay Player.
- */
-public class PlayerClipboard implements ClipboardManager.OnPrimaryClipChangedListener {
-
-    protected final Context context;
-    protected final ClipboardManager clipboardManager;
-
-    public PlayerClipboard(final Context context) {
-        this.context = context;
-        this.clipboardManager = (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-
-        if (this.clipboardManager != null) {
-            this.clipboardManager.addPrimaryClipChangedListener(this);
-        }
-    }
-
-    public boolean clipboardHasText() {
-        if (clipboardManager != null) {
-            final ClipData clip = clipboardManager.getPrimaryClip();
-            return (clip != null) && (clip.getItemCount() > 0);
-        }
-
-        return false;
-    }
-
-    public String clipboardGetText() {
-        CharSequence text = null;
-
-        if (clipboardManager != null) {
-            ClipData clip = clipboardManager.getPrimaryClip();
-            if (clip != null && clip.getItemCount() > 0) {
-                text = clip.getItemAt(0).coerceToText(context);
-            }
-        }
-
-        if (text != null) {
-            return text.toString();
-        } else {
-            return null;
-        }
-    }
-
-    public void clipboardSetText(final String string) {
-        if (clipboardManager != null) {
-            clipboardManager.removePrimaryClipChangedListener(this);
-            clipboardManager.setPrimaryClip(ClipData.newPlainText(null, string));
-            clipboardManager.addPrimaryClipChangedListener(this);
-        }
-    }
-
-    @Override
-    public void onPrimaryClipChanged() {
-        FFplay.playerOnClipboardChanged();
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/PlayerManager.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.view.Surface;
-
-public interface PlayerManager {
-
-    void initialize();
-
-    boolean setActivityTitle(final String title);
-
-    void setWindowStyle(final boolean fullScreen);
-
-    void setOrientation(final int w, final int h, final boolean resizable, final String hint);
-
-    boolean isScreenKeyboardShown();
-
-    boolean sendMessage(final int command, final int param);
-
-    Context getContext();
-
-    boolean isAndroidTV();
-
-    DisplayMetrics getDisplayDPI();
-
-    boolean getManifestEnvironmentVariables();
-
-    boolean showTextInput(final int x, final int y, final int w, final int h);
-
-    Surface getNativeSurface();
-
-    int[] inputGetInputDeviceIds(final int sources);
-
-    boolean clipboardHasText();
-
-    String clipboardGetText();
-
-    void clipboardSetText(final String string);
-
-    int showMessageBox(final int flags, final String title, final String message, final int[] buttonFlags, final int[] buttonIds, final String[] buttonTexts, final int[] colors);
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/PlayerSession.java

@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2020 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.content.Context;
-import android.os.AsyncTask;
-
-import com.arthenica.mobileffmpeg.FFplay;
-import com.arthenica.mobileffmpeg.util.AsyncSingleFFplayExecuteTask;
-
-public class PlayerSession {
-
-    public static final String FFPLAY_COMMAND = "ffplayCommand";
-
-    public enum NativeState {
-        INIT, RESUMED, PAUSED
-    }
-
-    protected int requestedOrientation;
-    protected Context context;
-    protected final String command;
-    protected NativeState nextNativeState;
-    protected NativeState currentNativeState;
-
-    public PlayerSession(final int requestedOrientation, final Context context, final String command) {
-        this.requestedOrientation = requestedOrientation;
-        this.context = context;
-        this.command = command;
-    }
-
-    public NativeState getNextNativeState() {
-        return nextNativeState;
-    }
-
-    public void setNextNativeState(final NativeState nextNativeState) {
-        this.nextNativeState = nextNativeState;
-    }
-
-    public NativeState getCurrentNativeState() {
-        return currentNativeState;
-    }
-
-    public void setCurrentNativeState(final NativeState currentNativeState) {
-        this.currentNativeState = currentNativeState;
-    }
-
-    public Context getContext() {
-        return context;
-    }
-
-    public void setContext(final Context context) {
-        this.context = context;
-    }
-
-    public int getRequestedOrientation() {
-        return requestedOrientation;
-    }
-
-    public AsyncTask<String, Integer, Integer> execute() {
-        FFplay.setAudioHandler(new GenericAudioHandler());
-        FFplay.setControllerManager(new GenericControllerHandler());
-
-        AudioHandler audioHandler = FFplay.getAudioHandler();
-        if (audioHandler != null) {
-            audioHandler.initialize();
-        }
-        ControllerHandler controllerHandler = FFplay.getControllerHandler();
-        if (controllerHandler != null) {
-            controllerHandler.initialize(context);
-        }
-
-        AsyncSingleFFplayExecuteTask task = new AsyncSingleFFplayExecuteTask(command);
-        return task.execute("");
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/player/PlayerSurface.java

@@ -1,683 +0,0 @@
-/*
- * Simple DirectMedia Layer
- * Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-/*
- * CHANGES 07.2020
- * - SDLSurface renamed as PlayerSurface
- */
-
-package com.arthenica.mobileffmpeg.player;
-
-import android.app.Activity;
-import android.app.UiModeManager;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.PixelFormat;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.WindowManager;
-
-import com.arthenica.mobileffmpeg.FFplay;
-import com.arthenica.mobileffmpeg.player.PlayerSession.NativeState;
-
-import java.util.Arrays;
-
-import static android.content.Context.UI_MODE_SERVICE;
-import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;
-import static com.arthenica.mobileffmpeg.Config.TAG;
-import static com.arthenica.mobileffmpeg.player.GenericCommandHandler.COMMAND_CHANGE_TITLE;
-import static com.arthenica.mobileffmpeg.player.GenericCommandHandler.COMMAND_CHANGE_WINDOW_STYLE;
-
-/**
- * PlayerSurface. This is what we draw on, so we need to know when it's created in order to do
- * anything useful.
- * <p>
- * Because of this, that's where we set up the SDL thread
- */
-public class PlayerSurface extends SurfaceView implements SurfaceHolder.Callback,
-        View.OnKeyListener, View.OnTouchListener, SensorEventListener, PlayerManager {
-
-    protected Activity activity;
-    protected Handler commandHandler;
-    protected PlayerClipboard playerClipboard;
-    protected SensorManager sensorManager;
-    protected Display display;
-    protected float width, height;
-    protected PlayerSession playerSession;
-    protected boolean ready;
-    protected boolean resumedCalled;
-    protected boolean hasFocus;
-
-    public PlayerSurface(final Context context) {
-        super(context);
-
-        onCreated(context);
-    }
-
-    public PlayerSurface(final Context context, final AttributeSet attrs) {
-        super(context, attrs);
-
-        onCreated(context);
-    }
-
-    public PlayerSurface(final Context context, final AttributeSet attrs, final int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-
-        onCreated(context);
-    }
-
-    public PlayerSurface(final Context context, final AttributeSet attrs, final int defStyleAttr, final int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-
-        onCreated(context);
-    }
-
-    protected void onCreated(final Context context) {
-        Log.v(TAG, String.format("PlayerSurface created on device: %s and model: %s.", android.os.Build.DEVICE, android.os.Build.MODEL));
-
-        getHolder().addCallback(this);
-
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        requestFocus();
-        setOnKeyListener(this);
-        setOnTouchListener(this);
-
-        commandHandler = new GenericCommandHandler(context);
-        playerClipboard = new PlayerClipboard(context);
-        display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-        sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-
-        // Some arbitrary defaults to avoid a potential division by zero
-        width = 1.0f;
-        height = 1.0f;
-
-        ready = false;
-    }
-
-    public void init(final Activity activity, final View.OnGenericMotionListener motionListener, final PlayerSession playerSession) {
-        this.activity = activity;
-        setOnGenericMotionListener(motionListener);
-
-        FFplay.setPlayerManager(this);
-
-        this.playerSession = playerSession;
-    }
-
-    public void handlePause() {
-        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
-    }
-
-    public void handleResume() {
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        requestFocus();
-        setOnKeyListener(this);
-        setOnTouchListener(this);
-        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
-    }
-
-    public Surface getNativeSurface() {
-        return getHolder().getSurface();
-    }
-
-    @Override
-    public void surfaceCreated(final SurfaceHolder ignored) {
-    }
-
-    @Override
-    public void surfaceDestroyed(final SurfaceHolder holder) {
-
-        // Transition to pause, if needed
-        setNextNativeState(NativeState.PAUSED);
-        handleNativeState();
-
-        ready = false;
-        FFplay.playerOnSurfaceDestroyed();
-    }
-
-    @Override
-    public void surfaceChanged(final SurfaceHolder holder, final int format, final int width, final int height) {
-        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
-        switch (format) {
-            case PixelFormat.A_8:
-                Log.v(TAG, "PlayerSurface using pixel format A_8");
-                break;
-            case PixelFormat.LA_88:
-                Log.v(TAG, "PlayerSurface using pixel format LA_88");
-                break;
-            case PixelFormat.L_8:
-                Log.v(TAG, "PlayerSurface using pixel format L_8");
-                break;
-            case PixelFormat.RGBA_4444:
-                Log.v(TAG, "PlayerSurface using pixel format RGBA_4444");
-                sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
-                break;
-            case PixelFormat.RGBA_5551:
-                Log.v(TAG, "PlayerSurface using pixel format RGBA_5551");
-                sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
-                break;
-            case PixelFormat.RGBA_8888:
-                Log.v(TAG, "PlayerSurface using pixel format RGBA_8888");
-                sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
-                break;
-            case PixelFormat.RGBX_8888:
-                Log.v(TAG, "PlayerSurface using pixel format RGBX_8888");
-                sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
-                break;
-            case PixelFormat.RGB_332:
-                Log.v(TAG, "PlayerSurface using pixel format RGB_332");
-                sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
-                break;
-            case PixelFormat.RGB_565:
-                Log.v(TAG, "PlayerSurface using pixel format RGB_565");
-                sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
-                break;
-            case PixelFormat.RGB_888:
-                Log.v(TAG, "PlayerSurface using pixel format RGB_888");
-                // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
-                sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
-                break;
-            default:
-                Log.v(TAG, String.format("PlayerSurface using pixel format unknown %d", format));
-                break;
-        }
-
-        this.width = width;
-        this.height = height;
-
-        FFplay.playerOnResize(width, height, sdlFormat, display.getRefreshRate());
-
-        Log.v(TAG, String.format("PlayerSurface window size: %dx%d.", width, height));
-
-        boolean skip = false;
-        int requestedOrientation = getRequestedOrientation();
-
-        if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-            // Accept any
-        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) {
-            if (this.width > this.height) {
-                skip = true;
-            }
-        } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) {
-            if (this.width < this.height) {
-                skip = true;
-            }
-        }
-
-        // Special Patch for Square Resolution: Black Berry Passport
-        if (skip) {
-            double min = Math.min(this.width, this.height);
-            double max = Math.max(this.width, this.height);
-
-            if (max / min < 1.20) {
-                Log.v(TAG, "PlayerSurface don't skip on such aspect-ratio. Could be a square resolution.");
-                skip = false;
-            }
-        }
-
-        if (skip) {
-            Log.v(TAG, "PlayerSurface skip .. Surface is not ready.");
-            ready = false;
-            return;
-        }
-
-        /* Surface is ready */
-        ready = true;
-
-        /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
-        FFplay.playerOnSurfaceChanged();
-
-        handleNativeState();
-    }
-
-    @Override
-    public boolean onKey(final View v, final int keyCode, final KeyEvent event) {
-        final ControllerHandler controllerHandler = FFplay.getControllerHandler();
-        // Dispatch the different events depending on where they come from
-        // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
-        // So, we try to process them as JOYSTICK/DPAD/GAMEPAD events first, if that fails we try them as KEYBOARD
-        //
-        // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and
-        // SOURCE_JOYSTICK, while its key events arrive from the keyboard source
-        // So, retrieve the device itself and check all of its sources
-        if (controllerHandler != null && controllerHandler.isDeviceSDLJoystick(event.getDeviceId())) {
-            // Note that we process events with specific key codes here
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (FFplay.controllerOnPadDown(event.getDeviceId(), keyCode) == 0) {
-                    return true;
-                }
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (FFplay.controllerOnPadUp(event.getDeviceId(), keyCode) == 0) {
-                    return true;
-                }
-            }
-        }
-
-        if ((event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (isTextInputEvent(event)) {
-                    FFplay.inputCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                }
-                FFplay.playerOnKeyDown(keyCode);
-                return true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                FFplay.playerOnKeyUp(keyCode);
-                return true;
-            }
-        }
-
-        if ((event.getSource() & InputDevice.SOURCE_MOUSE) != 0) {
-            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
-            // they are ignored here because sending them as mouse input to SDL is messy
-            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
-                switch (event.getAction()) {
-                    case KeyEvent.ACTION_DOWN:
-                    case KeyEvent.ACTION_UP:
-                        // mark the event as handled or it will be handled by system
-                        // handling KEYCODE_BACK by system will call onBackPressed()
-                        return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean onTouch(final View v, final MotionEvent event) {
-        final int touchDevId = event.getDeviceId();
-        final int pointerCount = event.getPointerCount();
-        int action = event.getActionMasked();
-        int pointerFingerId;
-        int mouseButton;
-        int i = -1;
-        float x, y, p;
-
-        if (event.getSource() == InputDevice.SOURCE_MOUSE && FFplay.isSeparateMouseAndTouch()) {
-            try {
-                mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
-            } catch (Exception e) {
-                mouseButton = 1;    // oh well.
-            }
-            FFplay.playerOnMouse(mouseButton, action, event.getX(0), event.getY(0));
-        } else {
-            switch (action) {
-                case MotionEvent.ACTION_MOVE:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i) / width;
-                        y = event.getY(i) / height;
-                        p = event.getPressure(i);
-                        if (p > 1.0f) {
-                            // may be larger than 1.0f on some devices
-                            // see the documentation of getPressure(i)
-                            p = 1.0f;
-                        }
-                        FFplay.playerOnTouch(touchDevId, pointerFingerId, action, x, y, p);
-                    }
-                    break;
-
-                case MotionEvent.ACTION_UP:
-                case MotionEvent.ACTION_DOWN:
-                    // Primary pointer up/down, the index is always zero
-                    i = 0;
-                case MotionEvent.ACTION_POINTER_UP:
-                case MotionEvent.ACTION_POINTER_DOWN:
-                    // Non primary pointer up/down
-                    if (i == -1) {
-                        i = event.getActionIndex();
-                    }
-
-                    pointerFingerId = event.getPointerId(i);
-                    x = event.getX(i) / width;
-                    y = event.getY(i) / height;
-                    p = event.getPressure(i);
-                    if (p > 1.0f) {
-                        // may be larger than 1.0f on some devices
-                        // see the documentation of getPressure(i)
-                        p = 1.0f;
-                    }
-                    FFplay.playerOnTouch(touchDevId, pointerFingerId, action, x, y, p);
-                    break;
-
-                case MotionEvent.ACTION_CANCEL:
-                    for (i = 0; i < pointerCount; i++) {
-                        pointerFingerId = event.getPointerId(i);
-                        x = event.getX(i) / width;
-                        y = event.getY(i) / height;
-                        p = event.getPressure(i);
-                        if (p > 1.0f) {
-                            // may be larger than 1.0f on some devices
-                            // see the documentation of getPressure(i)
-                            p = 1.0f;
-                        }
-                        FFplay.playerOnTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onAccuracyChanged(final Sensor sensor, final int accuracy) {
-        // TODO
-    }
-
-    @Override
-    public void onSensorChanged(final SensorEvent event) {
-        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
-            float x, y;
-            switch (display.getRotation()) {
-                case Surface.ROTATION_90:
-                    x = -event.values[1];
-                    y = event.values[0];
-                    break;
-                case Surface.ROTATION_270:
-                    x = event.values[1];
-                    y = -event.values[0];
-                    break;
-                case Surface.ROTATION_180:
-                    x = -event.values[1];
-                    y = -event.values[0];
-                    break;
-                default:
-                    x = event.values[0];
-                    y = event.values[1];
-                    break;
-            }
-            FFplay.playerOnAccel(-x / SensorManager.GRAVITY_EARTH,
-                    y / SensorManager.GRAVITY_EARTH,
-                    event.values[2] / SensorManager.GRAVITY_EARTH);
-        }
-    }
-
-    public void enableSensor(final int sensorType, final boolean enabled) {
-        // TODO: This uses getDefaultSensor - what if we have >1 accels?
-        if (enabled) {
-            sensorManager.registerListener(this,
-                    sensorManager.getDefaultSensor(sensorType),
-                    SensorManager.SENSOR_DELAY_GAME, null);
-        } else {
-            sensorManager.unregisterListener(this, sensorManager.getDefaultSensor(sensorType));
-        }
-    }
-
-    int getRequestedOrientation() {
-        final PlayerSession playerSession = this.playerSession;
-        if (playerSession == null) {
-            return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-        } else {
-            return playerSession.getRequestedOrientation();
-        }
-    }
-
-    public void setNextNativeState(final NativeState nextNativeState) {
-        final PlayerSession playerSession = this.playerSession;
-        if (playerSession != null) {
-            playerSession.setNextNativeState(nextNativeState);
-        }
-    }
-
-    public void setCurrentNativeState(final NativeState currentNativeState) {
-        final PlayerSession playerSession = this.playerSession;
-        if (playerSession != null) {
-            playerSession.setCurrentNativeState(currentNativeState);
-        }
-    }
-
-    public static boolean isTextInputEvent(final KeyEvent event) {
-        if (event.isCtrlPressed()) {
-            return false;
-        }
-
-        return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
-    }
-
-    public void handleNativeState() {
-        Log.v(TAG, String.format("PlayerSurface handling nativeState with ready: %s, hasFocus: %s, resumed: %s.", ready, hasFocus, resumedCalled));
-
-        NativeState currentNativeState = null;
-        NativeState nextNativeState = null;
-        if (playerSession != null) {
-            currentNativeState = playerSession.getCurrentNativeState();
-            nextNativeState = playerSession.getNextNativeState();
-        }
-
-        Log.v(TAG, String.format("PlayerSurface handling nativeState with current:%s, next: %s.", currentNativeState, nextNativeState));
-
-        if (nextNativeState == currentNativeState) {
-            // Already in same state, discard.
-            return;
-        }
-
-        // Try a transition to init state
-        if (nextNativeState == NativeState.INIT) {
-
-            setCurrentNativeState(nextNativeState);
-            return;
-        }
-
-        // Try a transition to paused state
-        if (nextNativeState == NativeState.PAUSED) {
-            FFplay.playerNativePause();
-            handlePause();
-            setCurrentNativeState(nextNativeState);
-            return;
-        }
-
-        // Try a transition to resumed state
-        if (nextNativeState == NativeState.RESUMED) {
-            play();
-        }
-    }
-
-    public void play() {
-        if (ready && resumedCalled) {
-            initialize();
-            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
-            if (playerSession != null) {
-                playerSession.execute();
-            }
-            FFplay.playerNativeResume();
-            handleResume();
-            setCurrentNativeState(NativeState.RESUMED);
-        } else {
-            Log.v(TAG, String.format("PlayerSurface play failed for ready:%s, hasFocus: %s, resumed: %s.", ready, hasFocus, resumedCalled));
-        }
-    }
-
-    public void setHasFocus(final boolean hasFocus) {
-        this.hasFocus = hasFocus;
-    }
-
-    public void setResumedCalled(final boolean resumedCalled) {
-        this.resumedCalled = resumedCalled;
-    }
-
-    public boolean sendCommand(final int command, final Object data) {
-        Message message = commandHandler.obtainMessage();
-        message.arg1 = command;
-        message.obj = data;
-        return commandHandler.sendMessage(message);
-    }
-
-    public void initialize() {
-        setHasFocus(true);
-        setNextNativeState(NativeState.INIT);
-        setCurrentNativeState(NativeState.INIT);
-    }
-
-    public boolean setActivityTitle(final String title) {
-        return sendCommand(COMMAND_CHANGE_TITLE, title);
-    }
-
-    public void setWindowStyle(final boolean fullScreen) {
-        sendCommand(COMMAND_CHANGE_WINDOW_STYLE, fullScreen ? 1 : 0);
-    }
-
-    public void setOrientation(final int w, final int h, final boolean resizable, final String hint) {
-        int orientation = -1;
-
-        if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-        } else if (hint.contains("LandscapeRight")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-        } else if (hint.contains("LandscapeLeft")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
-        } else if (hint.contains("Portrait") && hint.contains("PortraitUpsideDown")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-        } else if (hint.contains("Portrait")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-        } else if (hint.contains("PortraitUpsideDown")) {
-            orientation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
-        }
-
-        /* no valid hint */
-        if (orientation == -1) {
-            if (resizable) {
-                /* no fixed orientation */
-            } else {
-                if (w > h) {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-                } else {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-                }
-            }
-        }
-
-        Log.v(TAG, String.format("PlayerSurface set orientation:%d, width:%d, height:%d, resizable:%s and hint:%s.", orientation, w, h, resizable, hint));
-
-        if (orientation != -1) {
-            activity.setRequestedOrientation(orientation);
-        }
-    }
-
-    public boolean isScreenKeyboardShown() {
-        return false;
-    }
-
-    public boolean sendMessage(final int command, final int param) {
-        return sendCommand(command, param);
-    }
-
-    public boolean isAndroidTV() {
-        UiModeManager uiModeManager = (UiModeManager) getContext().getSystemService(UI_MODE_SERVICE);
-        return (uiModeManager.getCurrentModeType() == UI_MODE_TYPE_TELEVISION);
-    }
-
-    public DisplayMetrics getDisplayDPI() {
-        return getContext().getResources().getDisplayMetrics();
-    }
-
-    public boolean getManifestEnvironmentVariables() {
-        try {
-            ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(getContext().getPackageName(), PackageManager.GET_META_DATA);
-            Bundle bundle = applicationInfo.metaData;
-            if (bundle == null) {
-                return false;
-            }
-            String prefix = "SDL_ENV.";
-            final int trimLength = prefix.length();
-            for (String key : bundle.keySet()) {
-                if (key.startsWith(prefix)) {
-                    String name = key.substring(trimLength);
-                    String value = bundle.get(key).toString();
-                    FFplay.playerNativeSetenv(name, value);
-                }
-            }
-
-            return true;
-        } catch (final Exception e) {
-            Log.i(TAG, "PlayerSurface failed to set environment variables. " + e.toString());
-        }
-        return false;
-    }
-
-    public boolean showTextInput(final int x, final int y, final int w, final int h) {
-        return false;
-    }
-
-    public int[] inputGetInputDeviceIds(final int sources) {
-        int[] ids = InputDevice.getDeviceIds();
-        int[] filtered = new int[ids.length];
-        int used = 0;
-
-        for (int id : ids) {
-            InputDevice device = InputDevice.getDevice(id);
-            if ((device != null) && ((device.getSources() & sources) != 0)) {
-                filtered[used++] = device.getId();
-            }
-        }
-
-        return Arrays.copyOf(filtered, used);
-    }
-
-    public int showMessageBox(
-            final int flags,
-            final String title,
-            final String message,
-            final int[] buttonFlags,
-            final int[] buttonIds,
-            final String[] buttonTexts,
-            final int[] colors) {
-
-        Log.i(TAG, String.format("PlayerSurface was asked to showMessageBox for title: %s, message: %s and %d buttons: %s.", title, message, (buttonIds != null) ? buttonIds.length : 0, Arrays.toString(buttonTexts)));
-
-        return -1;
-    }
-
-    public boolean clipboardHasText() {
-        return playerClipboard.clipboardHasText();
-    }
-
-    public String clipboardGetText() {
-        return playerClipboard.clipboardGetText();
-    }
-
-    public void clipboardSetText(final String string) {
-        playerClipboard.clipboardSetText(string);
-    }
-
-}

android/app/src/main/java/com/arthenica/mobileffmpeg/util/AsyncSingleFFplayExecuteTask.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2018-2019 Taner Sener
- *
- * This file is part of MobileFFmpeg.
- *
- * MobileFFmpeg is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MobileFFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.arthenica.mobileffmpeg.util;
-
-import android.os.AsyncTask;
-import android.util.Log;
-
-import com.arthenica.mobileffmpeg.FFplay;
-
-import static com.arthenica.mobileffmpeg.Config.TAG;
-
-public class AsyncSingleFFplayExecuteTask extends AsyncTask<String, Integer, Integer> {
-    private final String command;
-
-    public AsyncSingleFFplayExecuteTask(final String command) {
-        this.command = command;
-    }
-
-    @Override
-    protected Integer doInBackground(final String... ignored) {
-
-        Log.v(TAG, String.format("Running FFplay for %s.", command));
-
-        int rc = FFplay.execute(command.split(" "));
-
-        Log.v(TAG, String.format("Finished running FFplay for %s.", command));
-
-        return rc;
-    }
-
-    @Override
-    protected void onPostExecute(final Integer ignored) {
-    }
-
-}

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/jni/Android.mk

@@ -4,20 +4,6 @@ $(call import-add-path, $(LOCAL_PATH))
 MY_ARM_MODE := arm
 MY_ARM_NEON := false
 MY_PATH := ../app/src/main/cpp
-MY_LIBRARY_LTS_SOURCE := $(MY_PATH)/android_lts_support.c
-MY_LIBRARY_SOURCE := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/mobileffprobe.c $(MY_PATH)/mobileffmpeg_exception.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffprobe.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
-MY_LIBRARY_SHARED_LIBRARIES := libavfilter libavformat libavcodec libavutil libswresample libavdevice libswscale
-MY_LIBRARY_LDLIBS := -llog -lz -landroid
-MY_LIBRARY_INCLUDES :=
-MY_LIBRARY_WHOLE_STATIC_LIBRARIES :=
-
-# ENABLE FFPLAY
-ifeq ("$(shell test -e $(LOCAL_PATH)/../build/.ffplay && echo ffplay)","ffplay")
-    MY_LIBRARY_SOURCE += $(MY_PATH)/fftools_ffplay.c $(MY_PATH)/mobileffplay.c
-    MY_LIBRARY_WHOLE_STATIC_LIBRARIES += sdl
-    MY_LIBRARY_LDLIBS += -lGLESv1_CM -lGLESv2
-    MY_LIBRARY_INCLUDES := -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/sdl/include/SDL2 -I${LOCAL_PATH}/../../src/sdl/src/core/android
-endif
 
 # DEFINE ARCH FLAGS
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
@@ -58,21 +44,17 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := mobileffmpeg
-LOCAL_SRC_FILES := $(MY_LIBRARY_SOURCE)
 ifeq ($(TARGET_PLATFORM),android-16)
-    LOCAL_SRC_FILES += $(MY_LIBRARY_LTS_SOURCE)
+    LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/mobileffprobe.c $(MY_PATH)/android_lts_support.c $(MY_PATH)/mobileffmpeg_exception.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffprobe.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
 else ifeq ($(TARGET_PLATFORM),android-17)
-    LOCAL_SRC_FILES += $(MY_LIBRARY_LTS_SOURCE)
+    LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/mobileffprobe.c $(MY_PATH)/android_lts_support.c $(MY_PATH)/mobileffmpeg_exception.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffprobe.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
+else
+    LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/mobileffprobe.c $(MY_PATH)/mobileffmpeg_exception.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffprobe.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
 endif
-LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include ${MY_LIBRARY_INCLUDES}
-LOCAL_LDLIBS := ${MY_LIBRARY_LDLIBS}
-LOCAL_SHARED_LIBRARIES := ${MY_LIBRARY_SHARED_LIBRARIES}
-LOCAL_WHOLE_STATIC_LIBRARIES := ${MY_LIBRARY_WHOLE_STATIC_LIBRARIES}
+LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include
+LOCAL_LDLIBS := -llog -lz -landroid
+LOCAL_SHARED_LIBRARIES := c++_shared libavfilter libavformat libavcodec libavutil libswresample libavdevice libswscale
 LOCAL_ARM_NEON := ${MY_ARM_NEON}
 include $(BUILD_SHARED_LIBRARY)
 
-ifeq ("$(shell test -e $(LOCAL_PATH)/../build/.ffplay && echo ffplay)","ffplay")
-    $(call import-module, sdl)
-endif
-
 $(call import-module, ffmpeg)

android/jni/sdl/Android.mk

@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-MY_ARM_MODE := arm
-MY_SDL_LIB := ../../../prebuilt/android-$(TARGET_ARCH)/sdl/lib
-
-include $(CLEAR_VARS)
-LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_MODULE := sdl
-LOCAL_SRC_FILES := $(MY_SDL_LIB)/libSDL2.a
-include $(PREBUILT_STATIC_LIBRARY)

android/test-app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.arthenica.mobileffmpeg.test"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 240431
-        versionName "4.3.1"
+        versionCode 240432
+        versionName "4.3.2"
     }
     buildTypes {
         debug {
@@ -51,8 +51,9 @@ android.applicationVariants.all { variant ->
 }
 
 dependencies {
-    implementation project(':app')
-    // implementation 'com.arthenica:mobile-ffmpeg-full:4.3.1'
+    // implementation project(':app')
+    implementation 'com.arthenica:mobile-ffmpeg-full:4.3.2'
+    implementation 'com.arthenica:smart-exception-java:0.1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }

android/test-app/src/main/AndroidManifest.xml

@@ -26,14 +26,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name="com.arthenica.mobileffmpeg.player.FullScreenActivity"
-            android:label="play"
-            android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
-        </activity>
-
     </application>
 
 </manifest>

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/MainActivity.java

@@ -36,6 +36,7 @@ import com.arthenica.mobileffmpeg.Config;
 import com.arthenica.mobileffmpeg.util.AsyncSingleFFmpegExecuteTask;
 import com.arthenica.mobileffmpeg.util.ResourcesUtil;
 import com.arthenica.mobileffmpeg.util.SingleExecuteCallback;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,6 +57,10 @@ public class MainActivity extends AppCompatActivity {
             Manifest.permission.CAMERA
     };
 
+    static {
+        Exceptions.registerRootPackage("com.arthenica");
+    }
+
     protected static final Queue<Callable> actionQueue = new ConcurrentLinkedQueue<>();
 
     protected static final Handler handler = new Handler();
@@ -72,7 +77,7 @@ public class MainActivity extends AppCompatActivity {
                     try {
                         callable.call();
                     } catch (final Exception e) {
-                        android.util.Log.e(MainActivity.TAG, "Running UI action received error.", e);
+                        android.util.Log.e(TAG, String.format("Running UI action received error.%s", Exceptions.getStackTraceString(e)));
                     }
                 }
             } while (callable != null);
@@ -123,7 +128,7 @@ public class MainActivity extends AppCompatActivity {
             registerAppFont();
             Log.d(TAG, "Application fonts registered.");
         } catch (final IOException e) {
-            Log.e(TAG, "Font registration failed.", e);
+            Log.e(TAG, String.format("Font registration failed.%s", Exceptions.getStackTraceString(e)));
         }
 
         Log.d(TAG, "Listing supported camera ids.");

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/PipeTabFragment.java

@@ -43,6 +43,7 @@ import com.arthenica.mobileffmpeg.util.AsyncCatImageTask;
 import com.arthenica.mobileffmpeg.util.DialogUtil;
 import com.arthenica.mobileffmpeg.util.ResourcesUtil;
 import com.arthenica.mobileffmpeg.util.SingleExecuteCallback;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -188,7 +189,7 @@ public class PipeTabFragment extends Fragment {
             startAsyncCatImageProcess(image3File.getAbsolutePath(), pipe3);
 
         } catch (IOException e) {
-            Log.e(TAG, "Create video failed", e);
+            Log.e(TAG, String.format("Create video failed %s", Exceptions.getStackTraceString(e)));
             Popup.show(requireContext(), "Create video failed");
         }
     }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/SubtitleTabFragment.java

@@ -42,6 +42,7 @@ import com.arthenica.mobileffmpeg.StatisticsCallback;
 import com.arthenica.mobileffmpeg.util.DialogUtil;
 import com.arthenica.mobileffmpeg.util.ResourcesUtil;
 import com.arthenica.mobileffmpeg.util.SingleExecuteCallback;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -103,7 +104,7 @@ public class SubtitleTabFragment extends Fragment {
 
             @Override
             public void apply(LogMessage message) {
-                android.util.Log.d(MainActivity.TAG, message.getText());
+                Log.d(MainActivity.TAG, message.getText());
             }
         });
     }
@@ -229,7 +230,7 @@ public class SubtitleTabFragment extends Fragment {
             }, ffmpegCommand);
 
         } catch (IOException e) {
-            Log.e(TAG, "Burn subtitles failed", e);
+            Log.e(TAG, String.format("Burn subtitles failed %s", Exceptions.getStackTraceString(e)));
             Popup.show(requireContext(), "Burn subtitles failed");
         }
     }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/VidStabTabFragment.java

@@ -38,6 +38,7 @@ import com.arthenica.mobileffmpeg.LogMessage;
 import com.arthenica.mobileffmpeg.util.DialogUtil;
 import com.arthenica.mobileffmpeg.util.ResourcesUtil;
 import com.arthenica.mobileffmpeg.util.SingleExecuteCallback;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -92,7 +93,7 @@ public class VidStabTabFragment extends Fragment {
 
             @Override
             public void apply(LogMessage message) {
-                android.util.Log.d(MainActivity.TAG, message.getText());
+                Log.d(MainActivity.TAG, message.getText());
             }
         });
     }
@@ -121,7 +122,7 @@ public class VidStabTabFragment extends Fragment {
                 stabilizedVideoFile.delete();
             }
 
-            android.util.Log.d(TAG, "Testing VID.STAB");
+            Log.d(TAG, "Testing VID.STAB");
 
             showCreateProgressDialog();
 
@@ -131,13 +132,13 @@ public class VidStabTabFragment extends Fragment {
 
             final String ffmpegCommand = Video.generateShakingVideoScript(image1File.getAbsolutePath(), image2File.getAbsolutePath(), image3File.getAbsolutePath(), videoFile.getAbsolutePath());
 
-            android.util.Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
+            Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
 
             MainActivity.executeAsync(new SingleExecuteCallback() {
 
                 @Override
                 public void apply(final int returnCode, final String commandOutput) {
-                    android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
+                    Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
 
                     hideCreateProgressDialog();
 
@@ -147,30 +148,30 @@ public class VidStabTabFragment extends Fragment {
                         public Object call() {
                             if (returnCode == RETURN_CODE_SUCCESS) {
 
-                                android.util.Log.d(TAG, "Create completed successfully; stabilizing video.");
+                                Log.d(TAG, "Create completed successfully; stabilizing video.");
 
                                 final String analyzeVideoCommand = String.format("-y -i %s -vf vidstabdetect=shakiness=10:accuracy=15:result=%s -f null -", videoFile.getAbsolutePath(), shakeResultsFile.getAbsolutePath());
 
                                 showStabilizeProgressDialog();
 
-                                android.util.Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", analyzeVideoCommand));
+                                Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", analyzeVideoCommand));
 
                                 MainActivity.executeAsync(new SingleExecuteCallback() {
 
                                     @Override
                                     public void apply(final int returnCode, final String commandOutput) {
-                                        android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
+                                        Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
 
                                         if (returnCode == RETURN_CODE_SUCCESS) {
                                             final String stabilizeVideoCommand = String.format("-y -i %s -vf vidstabtransform=smoothing=30:input=%s -c:v mpeg4 %s", videoFile.getAbsolutePath(), shakeResultsFile.getAbsolutePath(), stabilizedVideoFile.getAbsolutePath());
 
-                                            android.util.Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", stabilizeVideoCommand));
+                                            Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", stabilizeVideoCommand));
 
                                             MainActivity.executeAsync(new SingleExecuteCallback() {
 
                                                 @Override
                                                 public void apply(final int returnCode, final String commandOutput) {
-                                                    android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
+                                                    Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
 
                                                     hideStabilizeProgressDialog();
 
@@ -179,12 +180,12 @@ public class VidStabTabFragment extends Fragment {
                                                         @Override
                                                         public Object call() {
                                                             if (returnCode == RETURN_CODE_SUCCESS) {
-                                                                android.util.Log.d(TAG, "Stabilize video completed successfully; playing videos.");
+                                                                Log.d(TAG, "Stabilize video completed successfully; playing videos.");
                                                                 playVideo();
                                                                 playStabilizedVideo();
                                                             } else {
                                                                 Popup.show(requireContext(), "Stabilize video failed. Please check log for the details.");
-                                                                android.util.Log.d(TAG, String.format("Stabilize video failed with rc=%d", returnCode));
+                                                                Log.d(TAG, String.format("Stabilize video failed with rc=%d", returnCode));
                                                             }
 
                                                             return null;
@@ -196,14 +197,14 @@ public class VidStabTabFragment extends Fragment {
                                         } else {
                                             hideStabilizeProgressDialog();
                                             Popup.show(requireContext(), "Stabilize video failed. Please check log for the details.");
-                                            android.util.Log.d(TAG, String.format("Stabilize video failed with rc=%d", returnCode));
+                                            Log.d(TAG, String.format("Stabilize video failed with rc=%d", returnCode));
                                         }
                                     }
                                 }, analyzeVideoCommand);
 
                             } else {
                                 Popup.show(requireContext(), "Create video failed. Please check log for the details.");
-                                android.util.Log.d(TAG, String.format("Create failed with rc=%d", returnCode));
+                                Log.d(TAG, String.format("Create failed with rc=%d", returnCode));
                             }
 
                             return null;
@@ -213,7 +214,7 @@ public class VidStabTabFragment extends Fragment {
             }, ffmpegCommand);
 
         } catch (IOException e) {
-            android.util.Log.e(TAG, "Stabilize video failed", e);
+            Log.e(TAG, String.format("Stabilize video failed %s", Exceptions.getStackTraceString(e)));
             Popup.show(requireContext(), "Stabilize video failed");
         }
     }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/VideoTabFragment.java

@@ -20,15 +20,18 @@
 package com.arthenica.mobileffmpeg.test;
 
 import android.app.AlertDialog;
-import android.content.pm.ActivityInfo;
+import android.media.MediaPlayer;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.AndroidRuntimeException;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.MediaController;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.VideoView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,17 +39,14 @@ import androidx.fragment.app.Fragment;
 
 import com.arthenica.mobileffmpeg.Config;
 import com.arthenica.mobileffmpeg.FFmpeg;
-import com.arthenica.mobileffmpeg.FFplay;
 import com.arthenica.mobileffmpeg.LogCallback;
 import com.arthenica.mobileffmpeg.LogMessage;
 import com.arthenica.mobileffmpeg.Statistics;
 import com.arthenica.mobileffmpeg.StatisticsCallback;
-import com.arthenica.mobileffmpeg.player.GenericMotionListener;
-import com.arthenica.mobileffmpeg.player.PlayerSession;
-import com.arthenica.mobileffmpeg.player.PlayerSurface;
 import com.arthenica.mobileffmpeg.util.DialogUtil;
 import com.arthenica.mobileffmpeg.util.ResourcesUtil;
 import com.arthenica.mobileffmpeg.util.SingleExecuteCallback;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.IOException;
@@ -58,13 +58,11 @@ import static com.arthenica.mobileffmpeg.test.MainActivity.TAG;
 
 public class VideoTabFragment extends Fragment implements AdapterView.OnItemSelectedListener {
 
+    private VideoView videoView;
     private AlertDialog progressDialog;
     private String selectedCodec;
     private Statistics statistics;
 
-    private PlayerSession playerSession;
-    private PlayerSurface playerSurface;
-
     public VideoTabFragment() {
         super(R.layout.fragment_video_tab);
     }
@@ -86,20 +84,23 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
 
                 @Override
                 public void onClick(View v) {
-                    playVideo();
-                    // encodeVideo();
+                    encodeVideo();
                     // encodeWebp();
                 }
             });
         }
 
+        videoView = view.findViewById(R.id.videoPlayerFrame);
+
         progressDialog = DialogUtil.createProgressDialog(requireContext(), "Encoding video");
 
         selectedCodec = getResources().getStringArray(R.array.video_codec)[0];
+    }
 
-        playerSession = new PlayerSession(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, getContext(), getVideoFile().getAbsolutePath());
-        playerSurface = view.findViewById(R.id.videoPlayerFrame);
-        playerSurface.init(getActivity(), new GenericMotionListener(), playerSession);
+    @Override
+    public void onResume() {
+        super.onResume();
+        setActive();
     }
 
     public static VideoTabFragment newInstance() {
@@ -155,7 +156,7 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
         try {
 
             // IF VIDEO IS PLAYING STOP PLAYBACK
-            // videoView.stopPlayback();
+            videoView.stopPlayback();
 
             if (videoFile.exists()) {
                 videoFile.delete();
@@ -206,7 +207,7 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
             }, ffmpegCommand);
 
         } catch (IOException e) {
-            Log.e(TAG, "Encode video failed", e);
+            Log.e(TAG, String.format("Encode video failed %s", Exceptions.getStackTraceString(e)));
             Popup.show(requireContext(), "Encode video failed");
         }
     }
@@ -228,13 +229,13 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
 
             Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
         } catch (IOException e) {
-            Log.e(TAG, "Encode webp failed", e);
+            Log.e(TAG, String.format("Encode webp failed %s", Exceptions.getStackTraceString(e)));
             Popup.show(requireContext(), "Encode webp failed");
         }
     }
 
     protected void playVideo() {
-        /* MediaController mediaController = new MediaController(requireContext());
+        MediaController mediaController = new MediaController(requireContext());
         mediaController.setAnchorView(videoView);
         videoView.setVideoURI(Uri.parse("file://" + getVideoFile().getAbsolutePath()));
         videoView.setMediaController(mediaController);
@@ -254,12 +255,7 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
                 return false;
             }
         });
-        videoView.start();*/
-
-        // Intent intent = new Intent(getContext(), FullScreenActivity.class);
-        // intent.putExtra(PlayerSession.FFPLAY_COMMAND, getVideoFile().getAbsolutePath());
-        // startActivity(intent);
-        playerSurface.play();
+        videoView.start();
     }
 
     public String getSelectedVideoCodec() {
@@ -398,41 +394,4 @@ public class VideoTabFragment extends Fragment implements AdapterView.OnItemSele
         });
     }
 
-    @Override
-    public void onPause() {
-        Log.v(Config.TAG, "VideoTabFragment paused.");
-        playerSurface.setNextNativeState(PlayerSession.NativeState.PAUSED);
-        playerSurface.setResumedCalled(false);
-        playerSurface.handleNativeState();
-        super.onPause();
-    }
-
-    @Override
-    public void onResume() {
-        Log.v(Config.TAG, "VideoTabFragment resumed.");
-        setActive();
-        playerSurface.setNextNativeState(PlayerSession.NativeState.RESUMED);
-        playerSurface.setResumedCalled(true);
-        playerSurface.handleNativeState();
-        super.onResume();
-    }
-
-    @Override
-    public void onLowMemory() {
-        Log.v(Config.TAG, "VideoTabFragment is on low memory.");
-        FFplay.playerNativeLowMemory();
-        super.onLowMemory();
-    }
-
-    @Override
-    public void onDestroy() {
-        Log.v(Config.TAG, "VideoTabFragment destroyed.");
-        playerSurface.setNextNativeState(PlayerSession.NativeState.PAUSED);
-        playerSurface.handleNativeState();
-
-        // Send a quit message to the application
-        FFplay.playerNativeQuit();
-        super.onDestroy();
-    }
-
 }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/util/AsyncCatImageTask.java

@@ -22,6 +22,8 @@ package com.arthenica.mobileffmpeg.util;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import com.arthenica.smartexception.java.Exceptions;
+
 import java.io.IOException;
 
 import static com.arthenica.mobileffmpeg.test.MainActivity.TAG;
@@ -41,7 +43,7 @@ public class AsyncCatImageTask extends AsyncTask<String, Integer, Integer> {
 
             return rc;
         } catch (final IOException | InterruptedException e) {
-            Log.e(TAG, String.format("Async cat image command failed for %s.", inputs[0]), e);
+            Log.e(TAG, String.format("Async cat image command failed for %s.%s", inputs[0], Exceptions.getStackTraceString(e)));
             return -1;
         }
     }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/util/ResourcesUtil.java

@@ -25,12 +25,15 @@ import android.graphics.BitmapFactory;
 import android.util.Log;
 
 import com.arthenica.mobileffmpeg.test.MainActivity;
+import com.arthenica.smartexception.java.Exceptions;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import static com.arthenica.mobileffmpeg.test.MainActivity.TAG;
+
 public class ResourcesUtil {
     public static void resourceToFile(Resources resources, final int resourceId, final File file) throws IOException {
         Bitmap bitmap = BitmapFactory.decodeResource(resources, resourceId);
@@ -60,7 +63,7 @@ public class ResourcesUtil {
                 outputStream.write(buffer, 0, readSize);
             }
         } catch (final IOException e) {
-            Log.e(MainActivity.TAG, "Saving raw resource failed.", e);
+            Log.e(TAG, String.format("Saving raw resource failed.%s", Exceptions.getStackTraceString(e)));
         } finally {
             inputStream.close();
             outputStream.flush();

android/test-app/src/main/res/layout/fragment_video_tab.xml

@@ -52,7 +52,7 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <com.arthenica.mobileffmpeg.player.PlayerSurface
+    <VideoView
         android:id="@+id/videoPlayerFrame"
         android:layout_width="wrap_content"
         android:background="@drawable/rounded_video_frame"

build/android-chromaprint.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="chromaprint"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

build/android-common.sh

@@ -40,28 +40,30 @@ get_library_name() {
         19) echo "xvidcore" ;;
         20) echo "x265" ;;
         21) echo "libvidstab" ;;
-        22) echo "libilbc" ;;
-        23) echo "opus" ;;
-        24) echo "snappy" ;;
-        25) echo "soxr" ;;
-        26) echo "libaom" ;;
-        27) echo "chromaprint" ;;
-        28) echo "twolame" ;;
-        29) echo "sdl" ;;
-        30) echo "tesseract" ;;
-        31) echo "openh264" ;;
-        32) echo "giflib" ;;
-        33) echo "jpeg" ;;
-        34) echo "libogg" ;;
-        35) echo "libpng" ;;
-        36) echo "libuuid" ;;
-        37) echo "nettle" ;;
-        38) echo "tiff" ;;
-        39) echo "expat" ;;
-        40) echo "libsndfile" ;;
-        41) echo "leptonica" ;;
-        42) echo "android-zlib" ;;
-        43) echo "android-media-codec" ;;
+        22) echo "rubberband" ;;
+        23) echo "libilbc" ;;
+        24) echo "opus" ;;
+        25) echo "snappy" ;;
+        26) echo "soxr" ;;
+        27) echo "libaom" ;;
+        28) echo "chromaprint" ;;
+        29) echo "twolame" ;;
+        30) echo "sdl" ;;
+        31) echo "tesseract" ;;
+        32) echo "openh264" ;;
+        33) echo "giflib" ;;
+        34) echo "jpeg" ;;
+        35) echo "libogg" ;;
+        36) echo "libpng" ;;
+        37) echo "libuuid" ;;
+        38) echo "nettle" ;;
+        39) echo "tiff" ;;
+        40) echo "expat" ;;
+        41) echo "libsndfile" ;;
+        42) echo "leptonica" ;;
+        43) echo "libsamplerate" ;;
+        44) echo "android-zlib" ;;
+        45) echo "android-media-codec" ;;
     esac
 }
 
@@ -75,7 +77,7 @@ get_arch_name() {
     esac
 }
 
-get_target_host() {
+get_build_host() {
     case ${ARCH} in
         arm-v7a | arm-v7a-neon)
             echo "arm-linux-androideabi"
@@ -204,7 +206,7 @@ get_android_arch() {
 }
 
 get_common_includes() {
-    echo "-I${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/include -I${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/local/include"
+    echo ""
 }
 
 get_common_cflags() {
@@ -250,27 +252,27 @@ get_size_optimization_cflags() {
                     ARCH_OPTIMIZATION="${LINK_TIME_OPTIMIZATION_FLAGS} -O2 -ffunction-sections -fdata-sections"
                 ;;
                 *)
-                    ARCH_OPTIMIZATION="-O2 -ffunction-sections -fdata-sections"
+                    ARCH_OPTIMIZATION="-Os -ffunction-sections -fdata-sections"
                 ;;
             esac
         ;;
         arm64-v8a)
             case $1 in
                 ffmpeg)
-                    ARCH_OPTIMIZATION="${LINK_TIME_OPTIMIZATION_FLAGS} -fuse-ld=bfd -O2 -ffunction-sections -fdata-sections"
+                    ARCH_OPTIMIZATION="${LINK_TIME_OPTIMIZATION_FLAGS} -fuse-ld=gold -O2 -ffunction-sections -fdata-sections"
                 ;;
                 *)
-                    ARCH_OPTIMIZATION="-O2 -ffunction-sections -fdata-sections"
+                    ARCH_OPTIMIZATION="-Os -ffunction-sections -fdata-sections"
                 ;;
             esac
         ;;
         x86 | x86-64)
             case $1 in
                 ffmpeg)
-                    ARCH_OPTIMIZATION="${LINK_TIME_OPTIMIZATION_FLAGS} -O2 -ffunction-sections -fdata-sections"
+                    ARCH_OPTIMIZATION="${LINK_TIME_OPTIMIZATION_FLAGS} -Os -ffunction-sections -fdata-sections"
                 ;;
                 *)
-                    ARCH_OPTIMIZATION="-O2 -ffunction-sections -fdata-sections"
+                    ARCH_OPTIMIZATION="-Os -ffunction-sections -fdata-sections"
                 ;;
             esac
         ;;
@@ -282,7 +284,6 @@ get_size_optimization_cflags() {
 }
 
 get_app_specific_cflags() {
-
     local APP_FLAGS=""
     case $1 in
         xvidcore)
@@ -294,12 +295,12 @@ get_app_specific_cflags() {
         kvazaar)
             APP_FLAGS="-std=gnu99 -Wno-unused-function"
         ;;
+        rubberband)
+            APP_FLAGS="-std=c99 -Wno-unused-function"
+        ;;
         shine)
             APP_FLAGS="-Wno-unused-function"
         ;;
-        sdl)
-            APP_FLAGS="-std=c11 -Wno-unused-function"
-        ;;
         soxr | snappy | libwebp)
             APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
         ;;
@@ -333,7 +334,7 @@ get_cxxflags() {
     fi
 
     if [[ -z ${MOBILE_FFMPEG_DEBUG} ]]; then
-        local OPTIMIZATION_FLAGS="-O2 -ffunction-sections -fdata-sections"
+        local OPTIMIZATION_FLAGS="-Os -ffunction-sections -fdata-sections"
     else
         local OPTIMIZATION_FLAGS="${MOBILE_FFMPEG_DEBUG}"
     fi
@@ -355,6 +356,9 @@ get_cxxflags() {
         x265)
             echo "-std=c++11 -fno-exceptions ${OPTIMIZATION_FLAGS}"
         ;;
+        rubberband)
+            echo "-std=c++11 ${OPTIMIZATION_FLAGS}"
+        ;;
         *)
             echo "-std=c++11 -fno-exceptions -fno-rtti ${OPTIMIZATION_FLAGS}"
         ;;
@@ -362,7 +366,7 @@ get_cxxflags() {
 }
 
 get_common_linked_libraries() {
-    local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${TARGET_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${TARGET_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"
+    local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${BUILD_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${BUILD_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"
 
     case $1 in
         ffmpeg)
@@ -395,10 +399,10 @@ get_size_optimization_ldflags() {
         arm64-v8a)
             case $1 in
                 ffmpeg)
-                    echo "-Wl,--gc-sections ${LINK_TIME_OPTIMIZATION_FLAGS} -fuse-ld=bfd -O2 -ffunction-sections -fdata-sections -finline-functions"
+                    echo "-Wl,--gc-sections ${LINK_TIME_OPTIMIZATION_FLAGS} -fuse-ld=gold -O2 -ffunction-sections -fdata-sections -finline-functions"
                 ;;
                 *)
-                    echo "-Wl,--gc-sections -O2 -ffunction-sections -fdata-sections"
+                    echo "-Wl,--gc-sections -Os -ffunction-sections -fdata-sections"
                 ;;
             esac
         ;;
@@ -408,7 +412,7 @@ get_size_optimization_ldflags() {
                     echo "-Wl,--gc-sections,--icf=safe ${LINK_TIME_OPTIMIZATION_FLAGS} -O2 -ffunction-sections -fdata-sections -finline-functions"
                 ;;
                 *)
-                    echo "-Wl,--gc-sections,--icf=safe -O2 -ffunction-sections -fdata-sections"
+                    echo "-Wl,--gc-sections,--icf=safe -Os -ffunction-sections -fdata-sections"
                 ;;
             esac
         ;;
@@ -677,25 +681,6 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_libwebp_package_config() {
-    local LIB_WEBP_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/libwebp.pc" << EOF
-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/libwebp
-exec_prefix=\${prefix}
-libdir=\${prefix}/lib
-includedir=\${prefix}/include
-
-Name: libwebp
-Description: webp codec library
-Version: ${LIB_WEBP_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lwebp -lwebpdecoder -lwebpdemux
-Cflags: -I\${includedir}
-EOF
-}
-
 create_libxml2_package_config() {
     local LIBXML2_VERSION="$1"
 
@@ -834,7 +819,7 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_zlib_package_config() {
+create_zlib_system_package_config() {
     ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')
 
     cat > "${INSTALL_PKG_CONFIG_DIR}/zlib.pc" << EOF
@@ -916,15 +901,15 @@ download_gpl_library_source() {
             GPL_LIB_DEST_DIR="libvidstab"
         ;;
         x264)
-            GPL_LIB_URL="https://code.videolan.org/videolan/x264/-/archive/1771b556ee45207f8711744ccbd5d42a3949b14c/x264-1771b556ee45207f8711744ccbd5d42a3949b14c.tar.bz2"
-            GPL_LIB_FILE="x264-1771b556ee45207f8711744ccbd5d42a3949b14c.tar.bz2"
-            GPL_LIB_ORIG_DIR="x264-1771b556ee45207f8711744ccbd5d42a3949b14c"
+            GPL_LIB_URL="https://code.videolan.org/videolan/x264/-/archive/296494a4011f58f32adc54304a2654627558c59a/x264-296494a4011f58f32adc54304a2654627558c59a.tar.bz2"
+            GPL_LIB_FILE="x264-296494a4011f58f32adc54304a2654627558c59a.tar.bz2"
+            GPL_LIB_ORIG_DIR="x264-296494a4011f58f32adc54304a2654627558c59a"
             GPL_LIB_DEST_DIR="x264"
         ;;
         x265)
-            GPL_LIB_URL="https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz"
-            GPL_LIB_FILE="x265-3.2.1.tar.gz"
-            GPL_LIB_ORIG_DIR="x265_3.2.1"
+            GPL_LIB_URL="https://bitbucket.org/multicoreware/x265/downloads/x265_3.3.tar.gz"
+            GPL_LIB_FILE="x265_3.3.tar.gz"
+            GPL_LIB_ORIG_DIR="x265_3.3"
             GPL_LIB_DEST_DIR="x265"
         ;;
         xvidcore)
@@ -933,6 +918,12 @@ download_gpl_library_source() {
             GPL_LIB_ORIG_DIR="xvidcore"
             GPL_LIB_DEST_DIR="xvidcore"
         ;;
+        rubberband)
+            GPL_LIB_URL="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
+            GPL_LIB_FILE="rubberband-1.8.2.tar.bz2"
+            GPL_LIB_ORIG_DIR="rubberband-1.8.2"
+            GPL_LIB_DEST_DIR="rubberband"
+        ;;
     esac
 
     local GPL_LIB_SOURCE_PATH="${BASEDIR}/src/${GPL_LIB_DEST_DIR}"
@@ -1006,16 +997,16 @@ download_gpl_library_source() {
 set_toolchain_clang_paths() {
     export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin
 
-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
     
-    export AR=${TARGET_HOST}-ar
+    export AR=${BUILD_HOST}-ar
     export CC=$(get_clang_target_host)-clang
     export CXX=$(get_clang_target_host)-clang++
 
     if [ "$1" == "x264" ]; then
         export AS=${CC}
     else
-        export AS=${TARGET_HOST}-as
+        export AS=${BUILD_HOST}-as
     fi
 
     case ${ARCH} in
@@ -1024,9 +1015,9 @@ set_toolchain_clang_paths() {
         ;;
     esac
 
-    export LD=${TARGET_HOST}-ld
-    export RANLIB=${TARGET_HOST}-ranlib
-    export STRIP=${TARGET_HOST}-strip
+    export LD=${BUILD_HOST}-ld
+    export RANLIB=${BUILD_HOST}-ranlib
+    export STRIP=${BUILD_HOST}-strip
 
     export INSTALL_PKG_CONFIG_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/pkgconfig"
     export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
@@ -1036,7 +1027,7 @@ set_toolchain_clang_paths() {
     fi
 
     if [ ! -f ${ZLIB_PACKAGE_CONFIG_PATH} ]; then
-        create_zlib_package_config
+        create_zlib_system_package_config
     fi
 
     prepare_inline_sed
@@ -1053,14 +1044,14 @@ build_cpufeatures() {
 
     set_toolchain_clang_paths "cpu-features"
 
-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
     export CFLAGS=$(get_cflags "cpu-features")
     export CXXFLAGS=$(get_cxxflags "cpu-features")
     export LDFLAGS=$(get_ldflags "cpu-features")
 
     # THEN BUILD FOR THIS ABI
     $(get_clang_target_host)-clang -c ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
+    ${BUILD_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
     $(get_clang_target_host)-clang -shared ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.so 1>>${BASEDIR}/build.log 2>&1
 
     create_cpufeatures_package_config
@@ -1079,13 +1070,13 @@ build_android_lts_support() {
     set_toolchain_clang_paths ${LIB_NAME}
 
     # PREPARING FLAGS
-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
     CFLAGS=$(get_cflags ${LIB_NAME})
     LDFLAGS=$(get_ldflags ${LIB_NAME})
 
     # THEN BUILD FOR THIS ABI
     $(get_clang_target_host)-clang ${CFLAGS} -Wno-unused-command-line-argument -c ${BASEDIR}/android/app/src/main/cpp/android_lts_support.c -o ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o ${LDFLAGS} 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
+    ${BUILD_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
 }
 
 autoreconf_library() {

build/android-expat.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="expat"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_expat} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -51,7 +51,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-ffmpeg.sh

@@ -29,12 +29,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -76,7 +76,7 @@ esac
 CONFIGURE_POSTFIX=""
 HIGH_PRIORITY_INCLUDES=""
 
-for library in {1..44}
+for library in {1..46}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -194,6 +194,11 @@ do
                 LDFLAGS+=" $(pkg-config --libs --static opus)"
                 CONFIGURE_POSTFIX+=" --enable-libopus"
             ;;
+            rubberband)
+                CFLAGS+=" $(pkg-config --cflags rubberband)"
+                LDFLAGS+=" $(pkg-config --libs --static rubberband)"
+                CONFIGURE_POSTFIX+=" --enable-librubberband --enable-gpl"
+            ;;
             shine)
                 CFLAGS+=" $(pkg-config --cflags shine)"
                 LDFLAGS+=" $(pkg-config --libs --static shine)"
@@ -285,9 +290,9 @@ do
     else
 
         # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
-        if [[ ${library} -eq 30 ]]; then
+        if [[ ${library} -eq 31 ]]; then
             CONFIGURE_POSTFIX+=" --disable-sdl2"
-        elif [[ ${library} -eq 43 ]]; then
+        elif [[ ${library} -eq 45 ]]; then
             CONFIGURE_POSTFIX+=" --disable-zlib"
         fi
     fi
@@ -336,12 +341,8 @@ export LDFLAGS="${LDFLAGS}"
 # USE HIGHER LIMITS FOR FFMPEG LINKING
 ulimit -n 2048 1>>${BASEDIR}/build.log 2>&1
 
-# Workaround for issue #328
-rm -f ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
-cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
-
 ./configure \
-    --cross-prefix="${TARGET_HOST}-" \
+    --cross-prefix="${BUILD_HOST}-" \
     --sysroot="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
     --prefix="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
     --pkg-config="${HOST_PKG_CONFIG_PATH}" \
@@ -358,10 +359,8 @@ cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB
     --enable-optimizations \
     --enable-swscale \
     --enable-shared \
-    --disable-v4l2-m2m \
-    --disable-outdev=v4l2 \
+    --enable-v4l2-m2m \
     --disable-outdev=fbdev \
-    --disable-indev=v4l2 \
     --disable-indev=fbdev \
     ${SIZE_OPTIONS} \
     --disable-openssl \

build/android-fontconfig.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fontconfig"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fontconfig} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
     --disable-rpath \
     --disable-libxml2 \
     --disable-docs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-freetype.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="freetype"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -58,7 +58,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib
     --disable-shared \
     --disable-fast-install \
     --disable-mmap \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-fribidi.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fribidi"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fribidi} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -52,7 +52,7 @@ fi
     --disable-fast-install \
     --disable-debug \
     --disable-deprecated \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-giflib.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="giflib"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR"
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_giflib} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-gmp.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gmp} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -51,11 +51,11 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gmp_package_config "6.1.2"
+create_gmp_package_config "6.2.0"
 
 make install || exit 1

build/android-gnutls.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gnutls"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -58,7 +58,7 @@ esac
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gnutls} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -83,11 +83,11 @@ fi
     --disable-tests \
     --disable-tools \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gnutls_package_config "3.6.11.1"
+create_gnutls_package_config "3.6.13"
 
 make install || exit 1

build/android-jpeg.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})

build/android-kvazaar.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="kvazaar"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -40,7 +40,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_kvazaar} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -62,7 +62,7 @@ LIBS="${ARCH_SPECIFIC_LIBS}" ./configure \
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make || exit 1
 

build/android-lame.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="lame"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_lame} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
     --disable-frontend \
     --disable-efence \
     --disable-gtktest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-leptonica.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="leptonica"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export CPPFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include"
@@ -54,7 +54,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_leptonica} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -72,7 +72,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libaom.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libaom"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

build/android-libass.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libass"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libass} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -69,7 +69,7 @@ esac
     --disable-profile \
     --disable-coretext \
     ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libiconv.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libiconv"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libiconv} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-rpath \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libilbc.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libilbc"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libilbc} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libogg.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libogg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libogg} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libpng.sh

@@ -23,29 +23,29 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libpng"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 
-CPU_SPECIFIC_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
     x86 | x86-64)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-intel-sse=yes"
+        ARCH_OPTIONS="--enable-hardware-optimizations --enable-intel-sse=yes"
     ;;
     arm-v7a-neon | arm64-v8a)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-arm-neon=yes"
+        ARCH_OPTIONS="--enable-hardware-optimizations --enable-arm-neon=yes"
     ;;
     arm-v7a)
         # hardware-optimizations not enabled because
         # when --enable-hardware-optimizations is added
         # make tries to build arm-neon specific instructions, which breaks compilation
-        CPU_SPECIFIC_OPTIONS="--enable-arm-neon=no"
+        ARCH_OPTIONS="--enable-arm-neon=no"
     ;;
 esac
 
@@ -53,7 +53,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libpng} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -67,8 +67,8 @@ fi
     --disable-fast-install \
     --disable-unversioned-libpng-pc \
     --disable-unversioned-libpng-config \
-    ${CPU_SPECIFIC_OPTIONS} \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libsamplerate.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+if [[ -z ${ANDROID_NDK_ROOT} ]]; then
+    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
+    exit 1
+fi
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${API} ]]; then
+    echo -e "(*) API not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+. ${BASEDIR}/build/android-common.sh
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="libsamplerate"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+export CFLAGS=$(get_cflags ${LIB_NAME})
+export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+export LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# RECONFIGURE IF REQUESTED
+if [[ ${RECONF_libsamplerate} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
+fi
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --with-pic \
+    --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot \
+    --enable-static \
+    --disable-fftw \
+    --disable-shared \
+    --disable-fast-install \
+    --host=${BUILD_HOST} || exit 1
+
+# DISABLE building of examples manually
+${SED_INLINE} 's/examples tests//g' ${BASEDIR}/src/${LIB_NAME}/Makefile
+
+make -j$(get_cpu_count) || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+
+make install || exit 1

build/android-libsndfile.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libsndfile"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -53,7 +53,7 @@ fi
     --disable-alsa \
     --disable-full-suite \
     --disable-external-libs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libtheora.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libtheora"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libtheora} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -60,7 +60,7 @@ fi
     --disable-sdltest \
     ${ASM_FLAGS} \
     --disable-valgrind-testing \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libuuid.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libuuid"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libuuid} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libvidstab.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvidstab"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

build/android-libvorbis.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvorbis"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -55,7 +55,7 @@ PKG_CONFIG= ./configure \
     --disable-docs \
     --disable-examples \
     --disable-oggtest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-libvpx.sh

@@ -23,7 +23,7 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvpx"
 set_toolchain_clang_paths ${LIB_NAME}
 

build/android-libwebp.sh

@@ -23,85 +23,61 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libwebp"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
-CFLAGS=$(get_cflags ${LIB_NAME})
-CXXFLAGS=$(get_cxxflags ${LIB_NAME})
-LDFLAGS=$(get_ldflags ${LIB_NAME})
+BUILD_HOST=$(get_build_host)
+export CFLAGS=$(get_cflags ${LIB_NAME})
+export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+export LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
 
-SIMD_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
     arm-v7a)
-        SIMD_OPTIONS="-DWEBP_ENABLE_SIMD=OFF"
+        ARCH_OPTIONS="--disable-neon --disable-neon-rtcd"
+    ;;
+    arm-v7a-neon | arm64-v8a)
+        ARCH_OPTIONS="--enable-neon --enable-neon-rtcd"
     ;;
     *)
-        SIMD_OPTIONS="-DWEBP_ENABLE_SIMD=ON"
+        ARCH_OPTIONS="--enable-sse2 --enable-sse4.1"
     ;;
 esac
 
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
-if [ -d "build" ]; then
-    rm -rf build
-fi
+make distclean 2>/dev/null 1>/dev/null
 
-mkdir build;
-cd build
+# ALWAYS RECONFIGURE
+autoreconf_library ${LIB_NAME}
 
-# OVERRIDING INCLUDE PATH ORDER
-CFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include \
--I${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include \
--I${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/include \
--I${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/include $CFLAGS"
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
-    -DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
-    -DCMAKE_SYSTEM_NAME=Generic \
-    -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \
-    -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \
-    -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \
-    -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \
-    -DGIF_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include" \
-    -DJPEG_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include" \
-    -DJPEG_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/lib" \
-    -DPNG_PNG_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/include" \
-    -DPNG_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib" \
-    -DTIFF_INCLUDE_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/include" \
-    -DTIFF_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/lib" \
-    -DZLIB_INCLUDE_DIR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/include" \
-    -DZLIB_LIBRARY="${ANDROID_NDK_ROOT}/platform/android-${API}/arch-$(get_target_build)/usr/lib" \
-    -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
-    -DGLUT_INCLUDE_DIR= \
-    -DGLUT_cocoa_LIBRARY= \
-    -DGLUT_glut_LIBRARY= \
-    -DOPENGL_INCLUDE_DIR= \
-    -DSDLMAIN_LIBRARY= \
-    -DSDL_INCLUDE_DIR= \
-    -DWEBP_BUILD_CWEBP=0 \
-    -DWEBP_BUILD_DWEBP=0 \
-    -DWEBP_BUILD_EXTRAS=0 \
-    -DWEBP_BUILD_GIF2WEBP=0 \
-    -DWEBP_BUILD_IMG2WEBP=0 \
-    -DWEBP_BUILD_WEBPMUX=0 \
-    -DWEBP_BUILD_WEBPINFO=0 \
-    ${SIMD_OPTIONS} \
-    -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
-    -DBUILD_SHARED_LIBS=0 .. || exit 1
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --with-pic \
+    --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot \
+    --enable-static \
+    --disable-shared \
+    --disable-dependency-tracking \
+    --enable-libwebpmux \
+    ${ARCH_OPTIONS} \
+    --with-pngincludedir="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/include" \
+    --with-pnglibdir="${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib" \
+    --with-jpegincludedir="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/include" \
+    --with-jpeglibdir="${BASEDIR}/prebuilt/android-$(get_target_build)/jpeg/lib" \
+    --with-gifincludedir="${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include" \
+    --with-giflibdir="${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/lib" \
+    --with-tiffincludedir="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/include" \
+    --with-tifflibdir="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/lib" \
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
-# CREATE PACKAGE CONFIG MANUALLY
-create_libwebp_package_config "1.1.0"
+# MANUALLY COPY PKG-CONFIG FILES
+cp ${BASEDIR}/src/${LIB_NAME}/src/*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+cp ${BASEDIR}/src/${LIB_NAME}/src/demux/*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+cp ${BASEDIR}/src/${LIB_NAME}/src/mux/*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
 
 make install || exit 1

build/android-libxml2.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libxml2"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -44,7 +44,7 @@ make distclean 2>/dev/null 1>/dev/null
 # #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
 #
 
-# ALWAYS RECONFIGURED
+# ALWAYS RECONFIGURE
 autoreconf_library ${LIB_NAME}
 
 ./configure \
@@ -60,7 +60,7 @@ autoreconf_library ${LIB_NAME}
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-nettle.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="nettle"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -47,7 +47,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_nettle} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -65,7 +65,7 @@ fi
     --disable-gcov \
     --disable-documentation \
     ${OPTIONAL_CPU_SUPPORT} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-opencore-amr.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opencore-amr"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opencore_amr} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
     --disable-shared \
     --disable-fast-install \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-openh264.sh

@@ -23,51 +23,45 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="openh264"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
 
 case ${ARCH} in
     arm-v7a-neon)
+      ASM_ARCH=arm
         # Enabling NEON causes undefined symbol error for WelsCopy8x8_neon
         # CFLAGS+=" -DHAVE_NEON"
     ;;
     arm64-v8a)
+        ASM_ARCH=arm64
         CFLAGS+=" -DHAVE_NEON_AARCH64"
     ;;
     x86*)
+        ASM_ARCH=x86
         CFLAGS+=" -DHAVE_AVX2"
     ;;
 esac
 
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
-# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES
-${SED_INLINE} 's/arm64 aarch64/arm64% aarch64/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
-${SED_INLINE} 's/%86 x86_64,/%86 x86_64 x86-64,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
-${SED_INLINE} 's/filter-out arm64,/filter-out arm64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
-${SED_INLINE} 's/CFLAGS += -DHAVE_NEON/#CFLAGS += -DHAVE_NEON/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm64)/ifneq (\$(filter arm64%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), x86)/ifneq (\$(filter %86 x86-64, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm)/ifneq (\$(filter armv%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-
-# DO NOT USE DEFAULT ANDROID ARCH FLAGS
-${SED_INLINE} 's/ CFLAGS +=/ #CFLAGS +=/g' ${BASEDIR}/src/${LIB_NAME}/build/platform-android.mk
-${SED_INLINE} 's/ LDFLAGS +=/ #LDFLAGS +=/g' ${BASEDIR}/src/${LIB_NAME}/build/platform-android.mk
-
 make clean 2>/dev/null 1>/dev/null
 
+# revert ios changes
+git checkout ${BASEDIR}/src/${LIB_NAME}/build 1>>${BASEDIR}/build.log 2>&1
+git checkout ${BASEDIR}/src/${LIB_NAME}/codec 1>>${BASEDIR}/build.log 2>&1
+
 make -j$(get_cpu_count) \
 ARCH="$(get_toolchain_arch)" \
-CC="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/${CC}" \
+CC="$CC" \
 CFLAGS="$CFLAGS" \
-CXX="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/${CXX}" \
+CXX="$CXX" \
 CXXFLAGS="${CXXFLAGS}" \
 LDFLAGS="$LDFLAGS" \
 OS=android \
@@ -75,8 +69,10 @@ PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
 NDKLEVEL="${API}" \
 NDKROOT="${ANDROID_NDK_ROOT}" \
 NDK_TOOLCHAIN_VERSION=clang \
+AR="$AR" \
+ASM_ARCH=${ASM_ARCH} \
 TARGET="android-${API}" \
 install-static || exit 1
 
 # MANUALLY COPY PKG-CONFIG FILES
-cp ${BASEDIR}/src/${LIB_NAME}/openh264-static.pc ${INSTALL_PKG_CONFIG_DIR}/openh264.pc || exit 1
+cp ${BASEDIR}/src/${LIB_NAME}/openh264-static.pc ${INSTALL_PKG_CONFIG_DIR}/openh264.pc || exit 1

build/android-opus.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opus"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opus} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
     --disable-maintainer-mode \
     --disable-doc \
     --disable-extra-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-rubberband.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+if [[ -z ${ANDROID_NDK_ROOT} ]]; then
+    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
+    exit 1
+fi
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${API} ]]; then
+    echo -e "(*) API not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+. ${BASEDIR}/build/android-common.sh
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="rubberband"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+CFLAGS=$(get_cflags ${LIB_NAME})
+CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# DISABLE OPTIONAL FEATURES MANUALLY, SINCE ./configure DOES NOT PROVIDE OPTIONS FOR THEM
+rm -f ${BASEDIR}/src/${LIB_NAME}/configure.ac
+cp ${BASEDIR}/tools/make/rubberband/configure.ac ${BASEDIR}/src/${LIB_NAME}/configure.ac
+rm -f ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+cp ${BASEDIR}/tools/make/rubberband/Makefile.android.in ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+
+# FIX PACKAGE CONFIG FILE DEPENDENCIES
+rm -f ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+cp ${BASEDIR}/tools/make/rubberband/rubberband.pc.in ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+${SED_INLINE} 's/%DEPENDENCIES%/sndfile, samplerate/g' ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+
+# ALWAYS RECONFIGURE
+autoreconf_library ${LIB_NAME}
+
+# MANUALLY CREATE LIB DIRECTORY
+mkdir -p ${BASEDIR}/src/${LIB_NAME}/lib || exit 1
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --host=${BUILD_HOST} || exit 1
+
+make AR="$AR" -j$(get_cpu_count) || exit 1
+
+make install || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1

build/android-sdl.sh

@@ -23,81 +23,39 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="sdl"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
 
-SIMD_OPTIONS=""
-case ${ARCH} in
-    arm-v7a)
-        SIMD_OPTIONS="-DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_ANDROID_ARM_MODE=ON -DCMAKE_ANDROID_ARM_NEON=OFF -DCMAKE_SYSTEM_PROCESSOR=armv7-a"
-    ;;
-    arm-v7a-neon)
-        SIMD_OPTIONS="-DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_ANDROID_ARM_MODE=ON -DCMAKE_ANDROID_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR=armv7-a"
-    ;;
-    arm64-v8a)
-        SIMD_OPTIONS="-DCMAKE_ANDROID_ARCH_ABI=$(get_android_arch 2) -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor)"
-    ;;
-    x86)
-        SIMD_OPTIONS="-DCMAKE_ANDROID_ARCH_ABI=$(get_android_arch 3) -DCMAKE_SYSTEM_PROCESSOR=i686"
-    ;;
-    x86-64)
-        SIMD_OPTIONS="-DCMAKE_ANDROID_ARCH_ABI=$(get_android_arch 4) -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor)"
-    ;;
-esac
-
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
-if [ -d "build" ]; then
-    rm -rf build
+make distclean 2>/dev/null 1>/dev/null
+
+# RECONFIGURE IF REQUESTED
+if [[ ${RECONF_sdl} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
 fi
 
-mkdir build;
-cd build
-
-# USE OUR OWN IMPLEMENTATION
-rm -f ${BASEDIR}/src/${LIB_NAME}/src/core/android/SDL_android.c
-cp ${BASEDIR}/tools/make/sdl/SDL_android.c ${BASEDIR}/src/${LIB_NAME}/src/core/android/SDL_android.c
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
-    -DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${TARGET_HOST}/lib;${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${TARGET_HOST}/${API};${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib" \
-    -DCMAKE_ANDROID_NDK=${ANDROID_NDK_ROOT} \
-    -DCMAKE_SYSTEM_LIBRARY_PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${TARGET_HOST}/lib;${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${TARGET_HOST}/${API};${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib" \
-    -DCMAKE_SYSTEM_NAME=Android \
-    -DCMAKE_ANDROID_API="${API}" \
-    -DCMAKE_ANDROID_NDK="${ANDROID_NDK_ROOT}" \
-    ${SIMD_OPTIONS} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
-    -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \
-    -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \
-    -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \
-    -DCMAKE_RANLIB="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$RANLIB" \
-    -DSDL_SHARED=0 \
-    -DSDL_STATIC=1 \
-    -DSDL_STATIC_PIC=1 .. || exit 1
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --with-pic \
+    --without-x \
+    --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot \
+    --enable-static \
+    --disable-shared \
+    --disable-fast-install \
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
-# WORKAROUND FOR LINKERS THAT CAN NOT USE FULL PATHS i.e. arm64-v8a LINKER
-${SED_INLINE} "s/\.so / /g" sdl2.pc
-${SED_INLINE} "s/${ANDROID_NDK_ROOT//\//\\/}\/toolchains\/llvm\/prebuilt\/${TOOLCHAIN//\//\\/}\/${TARGET_HOST//\//\\/}\/lib\/lib//g" sdl2.pc
-${SED_INLINE} "s/${ANDROID_NDK_ROOT//\//\\/}\/toolchains\/llvm\/prebuilt\/${TOOLCHAIN//\//\\/}\/sysroot\/usr\/lib\/${TARGET_HOST//\//\\/}\/${API}\/lib//g" sdl2.pc
-${SED_INLINE} "s/${ANDROID_NDK_ROOT//\//\\/}\/toolchains\/llvm\/prebuilt\/${TOOLCHAIN//\//\\/}\/lib\/lib//g" sdl2.pc
-
 # MANUALLY COPY PKG-CONFIG FILES
-cp *.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
 
 make install || exit 1

build/android-shine.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="shine"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_shine} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-snappy.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="snappy"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -67,6 +67,6 @@ cmake -Wno-dev \
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_snappy_package_config "1.1.7"
+create_snappy_package_config "1.1.8"
 
 make install || exit 1

build/android-soxr.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="soxr"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

build/android-speex.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="speex"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -43,7 +43,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_speex} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
     --disable-shared \
     --disable-binaries \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-tesseract.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tesseract"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -60,7 +60,7 @@ export ac_cv_c_bigendian=no
     --disable-cube \
     --disable-tessdata-prefix \
     --disable-largefile \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 ${SED_INLINE} 's/\-lrt//g' ${BASEDIR}/src/${LIB_NAME}/api/Makefile
 

build/android-tiff.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tiff"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_tiff} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
     --disable-cxx \
     --disable-win32-io \
     --disable-lzma \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-twolame.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="twolame"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_twolame} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -53,7 +53,7 @@ export SNDFILE_LIBS="$(pkg-config --libs --static sndfile)"
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-wavpack.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="wavpack"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_wavpack} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -52,7 +52,7 @@ fi
     --disable-apps \
     --disable-fast-install \
     --disable-tests \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-x264.sh

@@ -28,12 +28,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x264"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -71,7 +71,7 @@ esac
     --enable-static \
     --disable-cli \
     ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/android-x265.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x265"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,19 +42,19 @@ if [[ ${DOWNLOAD_RESULT} -ne 0 ]]; then
 fi
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
-ASM_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
     arm-v7a | arm-v7a-neon)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
     ;;
     arm64-v8a)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
     ;;
     x86)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
     ;;
     x86-64)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
     ;;
 esac
 
@@ -87,13 +87,13 @@ cmake -Wno-dev \
     -DSTATIC_LINK_CRT=1 \
     -DENABLE_PIC=1 \
     -DENABLE_CLI=0 \
-    ${ASM_OPTIONS} \
+    ${ARCH_OPTIONS} \
     -DCMAKE_SYSTEM_PROCESSOR="${ARCH}" \
     -DENABLE_SHARED=0 ../source || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_x265_package_config "3.2.1"
+create_x265_package_config "3.3"
 
 make install || exit 1

build/android-xvidcore.sh

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="xvidcore"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME}/build/generic || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_xvidcore} -eq 1 ]]; then
     ./bootstrap.sh
 fi
@@ -55,7 +55,7 @@ esac
 ./configure \
     --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
     ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/ios-chromaprint.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="chromaprint"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

build/ios-common.sh

@@ -39,33 +39,35 @@ get_library_name() {
         18) echo "xvidcore" ;;
         19) echo "x265" ;;
         20) echo "libvidstab" ;;
-        21) echo "libilbc" ;;
-        22) echo "opus" ;;
-        23) echo "snappy" ;;
-        24) echo "soxr" ;;
-        25) echo "libaom" ;;
-        26) echo "chromaprint" ;;
-        27) echo "twolame" ;;
-        28) echo "sdl" ;;
-        29) echo "tesseract" ;;
-        30) echo "openh264" ;;
-        31) echo "giflib" ;;
-        32) echo "jpeg" ;;
-        33) echo "libogg" ;;
-        34) echo "libpng" ;;
-        35) echo "libuuid" ;;
+        21) echo "rubberband" ;;
+        22) echo "libilbc" ;;
+        23) echo "opus" ;;
+        24) echo "snappy" ;;
+        25) echo "soxr" ;;
+        26) echo "libaom" ;;
+        27) echo "chromaprint" ;;
+        28) echo "twolame" ;;
+        29) echo "sdl" ;;
+        30) echo "tesseract" ;;
+        31) echo "openh264" ;;
+        32) echo "giflib" ;;
+        33) echo "jpeg" ;;
+        34) echo "libogg" ;;
+        35) echo "libpng" ;;
         36) echo "nettle" ;;
         37) echo "tiff" ;;
         38) echo "expat" ;;
         39) echo "libsndfile" ;;
         40) echo "leptonica" ;;
-        41) echo "ios-zlib" ;;
-        42) echo "ios-audiotoolbox" ;;
-        43) echo "ios-coreimage" ;;
-        44) echo "ios-bzip2" ;;
-        45) echo "ios-videotoolbox" ;;
-        46) echo "ios-avfoundation" ;;
-        47) echo "ios-libiconv" ;;
+        41) echo "libsamplerate" ;;
+        42) echo "ios-zlib" ;;
+        43) echo "ios-audiotoolbox" ;;
+        44) echo "ios-coreimage" ;;
+        45) echo "ios-bzip2" ;;
+        46) echo "ios-videotoolbox" ;;
+        47) echo "ios-avfoundation" ;;
+        48) echo "ios-libiconv" ;;
+        49) echo "ios-libuuid" ;;
     esac
 }
 
@@ -79,15 +81,16 @@ get_package_config_file_name() {
         11) echo "libxml-2.0" ;;
         12) echo "opencore-amrnb" ;;
         20) echo "vidstab" ;;
-        25) echo "aom" ;;
-        26) echo "libchromaprint" ;;
-        28) echo "sdl2" ;;
-        32) echo "libjpeg" ;;
-        33) echo "ogg" ;;
-        35) echo "uuid" ;;
+        26) echo "aom" ;;
+        27) echo "libchromaprint" ;;
+        29) echo "sdl2" ;;
+        33) echo "libjpeg" ;;
+        34) echo "ogg" ;;
         37) echo "libtiff-4" ;;
         39) echo "sndfile" ;;
         40) echo "lept" ;;
+        41) echo "samplerate" ;;
+        49) echo "uuid" ;;
         *) echo $(get_library_name $1)
     esac
 }
@@ -103,17 +106,17 @@ get_static_archive_name() {
         9) echo "libvpx.a" ;;
         11) echo "libxml2.a" ;;
         20) echo "libvidstab.a" ;;
-        21) echo "libilbc.a" ;;
-        25) echo "libaom.a" ;;
-        27) echo "libtwolame.a" ;;
-        28) echo "libSDL2.a" ;;
-        29) echo "libtesseract.a" ;;
-        31) echo "libgif.a" ;;
-        33) echo "libogg.a" ;;
-        34) echo "libpng.a" ;;
-        35) echo "libuuid.a" ;;
+        22) echo "libilbc.a" ;;
+        26) echo "libaom.a" ;;
+        28) echo "libtwolame.a" ;;
+        29) echo "libSDL2.a" ;;
+        30) echo "libtesseract.a" ;;
+        32) echo "libgif.a" ;;
+        34) echo "libogg.a" ;;
+        35) echo "libpng.a" ;;
         39) echo "libsndfile.a" ;;
         40) echo "liblept.a" ;;
+        41) echo "libsamplerate.a" ;;
         *) echo lib$(get_library_name $1).a
     esac
 }
@@ -126,20 +129,35 @@ get_arch_name() {
         3) echo "arm64e" ;;
         4) echo "i386" ;;
         5) echo "x86-64" ;;
+        6) echo "x86-64-mac-catalyst" ;;
     esac
 }
 
 get_target_host() {
+      case ${ARCH} in
+        x86-64-mac-catalyst)
+            echo "x86_64-apple-ios13.0-macabi"
+        ;;
+        *)
+            echo "$(get_target_arch)-ios-darwin"
+        ;;
+    esac
+}
+
+get_build_host() {
     echo "$(get_target_arch)-ios-darwin"
 }
 
 get_target_build_directory() {
     case ${ARCH} in
         x86-64)
-            echo "ios-x86_64-apple-darwin"
+            echo "ios-x86_64"
+        ;;
+        x86-64-mac-catalyst)
+            echo "ios-x86_64-mac-catalyst"
         ;;
         *)
-            echo "ios-${ARCH}-apple-darwin"
+            echo "ios-${ARCH}"
         ;;
     esac
 }
@@ -149,7 +167,7 @@ get_target_arch() {
         arm64 | arm64e)
             echo "aarch64"
         ;;
-        x86-64)
+        x86-64 | x86-64-mac-catalyst)
             echo "x86_64"
         ;;
         *)
@@ -170,6 +188,9 @@ get_sdk_name() {
         i386 | x86-64)
             echo "iphonesimulator"
         ;;
+        x86-64-mac-catalyst)
+            echo "macosx"
+        ;;
     esac
 }
 
@@ -185,6 +206,9 @@ get_min_version_cflags() {
         i386 | x86-64)
             echo "-mios-simulator-version-min=${IOS_MIN_VERSION}"
         ;;
+        x86-64-mac-catalyst)
+            echo "-miphoneos-version-min=13.0"
+        ;;
     esac
 }
 
@@ -203,6 +227,9 @@ get_common_cflags() {
         i386 | x86-64)
             echo "-fstrict-aliasing -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
         ;;
+        x86-64-mac-catalyst)
+            echo "-fstrict-aliasing -fembed-bitcode ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+        ;;
         *)
             echo "-fstrict-aliasing -fembed-bitcode -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
         ;;
@@ -229,6 +256,9 @@ get_arch_specific_cflags() {
         x86-64)
             echo "-arch x86_64 -target $(get_target_host) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DMOBILE_FFMPEG_X86_64"
         ;;
+        x86-64-mac-catalyst)
+            echo "-arch x86_64 -target $(get_target_host) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DMOBILE_FFMPEG_X86_64_MAC_CATALYST -isysroot ${SDK_PATH} -isystem ${SDK_PATH}/System/iOSSupport/usr/include -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
+        ;;
     esac
 }
 
@@ -236,31 +266,11 @@ get_size_optimization_cflags() {
 
     local ARCH_OPTIMIZATION=""
     case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
-            case $1 in
-                x264 | x265)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-                ffmpeg | mobile-ffmpeg)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-                *)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-            esac
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
+          ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
         ;;
         i386 | x86-64)
-            case $1 in
-                x264 | ffmpeg)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-                x265)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-                *)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-            esac
+          ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
         ;;
     esac
 
@@ -273,7 +283,7 @@ get_size_optimization_asm_cflags() {
     case $1 in
         jpeg | ffmpeg)
             case ${ARCH} in
-                armv7 | armv7s | arm64 | arm64e)
+                armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
                     ARCH_OPTIMIZATION="-Oz"
                 ;;
                 i386 | x86-64)
@@ -321,7 +331,7 @@ get_app_specific_cflags() {
         mobile-ffmpeg)
             APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc"
         ;;
-        sdl)
+        sdl2)
             APP_FLAGS="-DPIC -Wno-unused-function -D__IPHONEOS__"
         ;;
         shine)
@@ -381,7 +391,7 @@ get_cxxflags() {
 
     local BITCODE_FLAGS=""
     case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
             local BITCODE_FLAGS="-fembed-bitcode"
         ;;
     esac
@@ -393,15 +403,18 @@ get_cxxflags() {
         gnutls)
             echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
         ;;
-        opencore-amr)
-            echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
-        ;;
         libwebp | xvidcore)
             echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
         ;;
         libaom)
             echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
         ;;
+        opencore-amr)
+            echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+        ;;
+        rubberband)
+            echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+        ;;
         *)
             echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
         ;;
@@ -418,7 +431,7 @@ get_common_ldflags() {
 
 get_size_optimization_ldflags() {
     case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
             case $1 in
                 ffmpeg | mobile-ffmpeg)
                     echo "-Oz -dead_strip"
@@ -444,22 +457,25 @@ get_size_optimization_ldflags() {
 get_arch_specific_ldflags() {
     case ${ARCH} in
         armv7)
-            echo "-arch armv7 -march=armv7 -mfpu=neon -mfloat-abi=softfp -fembed-bitcode"
+            echo "-arch armv7 -march=armv7 -mfpu=neon -mfloat-abi=softfp -fembed-bitcode -target $(get_target_host)"
         ;;
         armv7s)
-            echo "-arch armv7s -march=armv7s -mfpu=neon -mfloat-abi=softfp -fembed-bitcode"
+            echo "-arch armv7s -march=armv7s -mfpu=neon -mfloat-abi=softfp -fembed-bitcode -target $(get_target_host)"
         ;;
         arm64)
-            echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode"
+            echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode -target $(get_target_host)"
         ;;
         arm64e)
-            echo "-arch arm64e -march=armv8.3-a+crc+crypto -fembed-bitcode"
+            echo "-arch arm64e -march=armv8.3-a+crc+crypto -fembed-bitcode -target $(get_target_host)"
         ;;
         i386)
-            echo "-arch i386 -march=i386"
+            echo "-arch i386 -march=i386 -target $(get_target_host)"
         ;;
         x86-64)
-            echo "-arch x86_64 -march=x86-64"
+            echo "-arch x86_64 -march=x86-64 -target $(get_target_host)"
+        ;;
+        x86-64-mac-catalyst)
+            echo "-arch x86_64 -march=x86-64 -target $(get_target_host) -isysroot ${SDK_PATH} -L${SDK_PATH}/System/iOSSupport/usr/lib -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
         ;;
     esac
 }
@@ -477,7 +493,7 @@ get_ldflags() {
     case $1 in
         mobile-ffmpeg)
             case ${ARCH} in
-                armv7 | armv7s | arm64 | arm64e)
+                armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
                     echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} -fembed-bitcode -Wc,-fembed-bitcode ${OPTIMIZATION_FLAGS}"
                 ;;
                 *)
@@ -614,7 +630,7 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_libiconv_package_config() {
+create_libiconv_system_package_config() {
     local LIB_ICONV_VERSION=$(grep '_LIBICONV_VERSION' ${SDK_PATH}/usr/include/iconv.h | grep -Eo '0x.*' | grep -Eo '.*    ')
 
     cat > "${INSTALL_PKG_CONFIG_DIR}/libiconv.pc" << EOF
@@ -702,25 +718,6 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_libwebp_package_config() {
-    local LIB_WEBP_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/libwebp.pc" << EOF
-prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/libwebp
-exec_prefix=\${prefix}
-libdir=\${prefix}/lib
-includedir=\${prefix}/include
-
-Name: libwebp
-Description: webp codec library
-Version: ${LIB_WEBP_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lwebp -lwebpdecoder -lwebpdemux
-Cflags: -I\${includedir}
-EOF
-}
-
 create_libxml2_package_config() {
     local LIBXML2_VERSION="$1"
 
@@ -802,13 +799,13 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_uuid_package_config() {
+create_libuuid_system_package_config() {
     local UUID_VERSION="$1"
 
     cat > "${INSTALL_PKG_CONFIG_DIR}/uuid.pc" << EOF
-prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/libuuid
+prefix=${SDK_PATH}
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/usr/lib
 includedir=\${prefix}/include
 
 Name: uuid
@@ -816,7 +813,7 @@ Description: Universally unique id library
 Version: ${UUID_VERSION}
 Requires:
 Cflags: -I\${includedir}
-Libs: -L\${libdir} -luuid
+Libs: -L\${libdir}
 EOF
 }
 
@@ -839,7 +836,7 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_zlib_package_config() {
+create_zlib_system_package_config() {
     ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${SDK_PATH}/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')
 
     cat > "${INSTALL_PKG_CONFIG_DIR}/zlib.pc" << EOF
@@ -858,7 +855,7 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_bzip2_package_config() {
+create_bzip2_system_package_config() {
     BZIP2_VERSION=$(grep -Eo 'version.*of' ${SDK_PATH}/usr/include/bzlib.h | sed -e 's/of//;s/version//g;s/\ //g')
 
     cat > "${INSTALL_PKG_CONFIG_DIR}/bzip2.pc" << EOF
@@ -923,15 +920,15 @@ download_gpl_library_source() {
             GPL_LIB_DEST_DIR="libvidstab"
         ;;
         x264)
-            GPL_LIB_URL="https://code.videolan.org/videolan/x264/-/archive/1771b556ee45207f8711744ccbd5d42a3949b14c/x264-1771b556ee45207f8711744ccbd5d42a3949b14c.tar.bz2"
-            GPL_LIB_FILE="x264-1771b556ee45207f8711744ccbd5d42a3949b14c.tar.bz2"
-            GPL_LIB_ORIG_DIR="x264-1771b556ee45207f8711744ccbd5d42a3949b14c"
+            GPL_LIB_URL="https://code.videolan.org/videolan/x264/-/archive/296494a4011f58f32adc54304a2654627558c59a/x264-296494a4011f58f32adc54304a2654627558c59a.tar.bz2"
+            GPL_LIB_FILE="x264-296494a4011f58f32adc54304a2654627558c59a.tar.bz2"
+            GPL_LIB_ORIG_DIR="x264-296494a4011f58f32adc54304a2654627558c59a"
             GPL_LIB_DEST_DIR="x264"
         ;;
         x265)
-            GPL_LIB_URL="https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz"
-            GPL_LIB_FILE="x265-3.2.tar.gz"
-            GPL_LIB_ORIG_DIR="x265_3.2.1"
+            GPL_LIB_URL="https://bitbucket.org/multicoreware/x265/downloads/x265_3.3.tar.gz"
+            GPL_LIB_FILE="x265_3.3.tar.gz"
+            GPL_LIB_ORIG_DIR="x265_3.3"
             GPL_LIB_DEST_DIR="x265"
         ;;
         xvidcore)
@@ -940,6 +937,12 @@ download_gpl_library_source() {
             GPL_LIB_ORIG_DIR="xvidcore"
             GPL_LIB_DEST_DIR="xvidcore"
         ;;
+        rubberband)
+            GPL_LIB_URL="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
+            GPL_LIB_FILE="rubberband-1.8.2.tar.bz2"
+            GPL_LIB_ORIG_DIR="rubberband-1.8.2"
+            GPL_LIB_DEST_DIR="rubberband"
+        ;;
     esac
 
     local GPL_LIB_SOURCE_PATH="${BASEDIR}/src/${GPL_LIB_DEST_DIR}"
@@ -1028,8 +1031,6 @@ set_toolchain_clang_paths() {
         LOCAL_GAS_PREPROCESSOR="${BASEDIR}/src/x264/tools/gas-preprocessor.pl"
     fi
 
-    TARGET_HOST=$(get_target_host)
-    
     export AR="$(xcrun --sdk $(get_sdk_name) -f ar)"
     export CC="clang"
     export OBJC="$(xcrun --sdk $(get_sdk_name) -f clang)"
@@ -1068,21 +1069,26 @@ set_toolchain_clang_paths() {
     export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
     export BZIP2_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/bzip2.pc"
     export LIB_ICONV_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/libiconv.pc"
+    export LIB_UUID_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/uuid.pc"
 
     if [ ! -d ${INSTALL_PKG_CONFIG_DIR} ]; then
         mkdir -p ${INSTALL_PKG_CONFIG_DIR}
     fi
 
     if [ ! -f ${ZLIB_PACKAGE_CONFIG_PATH} ]; then
-        create_zlib_package_config
+        create_zlib_system_package_config
     fi
 
     if [ ! -f ${LIB_ICONV_PACKAGE_CONFIG_PATH} ]; then
-        create_libiconv_package_config
+        create_libiconv_system_package_config
     fi
 
     if [ ! -f ${BZIP2_PACKAGE_CONFIG_PATH} ]; then
-        create_bzip2_package_config
+        create_bzip2_system_package_config
+    fi
+
+    if [ ! -f ${LIB_UUID_PACKAGE_CONFIG_PATH} ]; then
+        create_libuuid_system_package_config
     fi
 
     prepare_inline_sed

build/ios-expat.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="expat"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_expat} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/ios-ffmpeg.sh

@@ -32,12 +32,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 FFMPEG_CFLAGS=""
 FFMPEG_LDFLAGS=""
 export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
@@ -46,6 +46,7 @@ TARGET_CPU=""
 TARGET_ARCH=""
 BITCODE_FLAGS=""
 NEON_FLAG=""
+ARCH_OPTIONS="--enable-asm"
 case ${ARCH} in
     armv7)
         TARGET_CPU="armv7"
@@ -78,19 +79,27 @@ case ${ARCH} in
         BITCODE_FLAGS=""
     ;;
     x86-64)
+        ARCH_OPTIONS="--disable-asm"
         TARGET_CPU="x86_64"
         TARGET_ARCH="x86_64"
         NEON_FLAG="	--disable-neon"
         BITCODE_FLAGS=""
     ;;
+    x86-64-mac-catalyst)
+        ARCH_OPTIONS="--disable-asm"
+        TARGET_CPU="x86_64"
+        TARGET_ARCH="x86_64"
+        NEON_FLAG="	--disable-neon"
+        BITCODE_FLAGS="-fembed-bitcode -Wc,-fembed-bitcode"
+    ;;
 esac
 
 if [[ ${APPLE_TVOS_BUILD} -eq 1 ]]; then
     CONFIGURE_POSTFIX="--disable-avfoundation"
-    LIBRARY_COUNT=47
+    LIBRARY_COUNT=49
 else
     CONFIGURE_POSTFIX=""
-    LIBRARY_COUNT=48
+    LIBRARY_COUNT=50
 fi
 
 library=1
@@ -205,6 +214,12 @@ do
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static opus)"
                 CONFIGURE_POSTFIX+=" --enable-libopus"
             ;;
+            rubberband)
+                FFMPEG_CFLAGS+=" $(pkg-config --cflags rubberband)"
+                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static rubberband)"
+                FFMPEG_LDFLAGS+=" -framework Accelerate"
+                CONFIGURE_POSTFIX+=" --enable-librubberband --enable-gpl"
+            ;;
             sdl)
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags sdl2)"
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static sdl2)"
@@ -274,10 +289,6 @@ do
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags libpng)"
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static libpng)"
             ;;
-            libuuid)
-                FFMPEG_CFLAGS+=" $(pkg-config --cflags uuid)"
-                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static uuid)"
-            ;;
             nettle)
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags nettle)"
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static nettle)"
@@ -319,21 +330,21 @@ do
     else
 
         # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
-        if [[ ${library} -eq 29 ]]; then
+        if [[ ${library} -eq 30 ]]; then
             CONFIGURE_POSTFIX+=" --disable-sdl2"
-        elif [[ ${library} -eq 42 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-zlib"
         elif [[ ${library} -eq 43 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
+            CONFIGURE_POSTFIX+=" --disable-zlib"
         elif [[ ${library} -eq 44 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-coreimage"
+            CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
         elif [[ ${library} -eq 45 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-bzlib"
+            CONFIGURE_POSTFIX+=" --disable-coreimage"
         elif [[ ${library} -eq 46 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-videotoolbox"
+            CONFIGURE_POSTFIX+=" --disable-bzlib"
         elif [[ ${library} -eq 47 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-avfoundation"
+            CONFIGURE_POSTFIX+=" --disable-videotoolbox"
         elif [[ ${library} -eq 48 ]]; then
+            CONFIGURE_POSTFIX+=" --disable-avfoundation"
+        elif [[ ${library} -eq 49 ]]; then
             CONFIGURE_POSTFIX+=" --disable-iconv"
         fi
     fi
@@ -394,11 +405,18 @@ if [[ -z ${NO_WORKSPACE_CLEANUP_ffmpeg} ]]; then
     make distclean 2>/dev/null 1>/dev/null
 fi
 
+# Workaround to prevent adding of -mdynamic-no-pic flag
 ${SED_INLINE} 's/check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic;/check_cflags -mdynamic-no-pic;/g' ./configure 1>>${BASEDIR}/build.log 2>&1
 
-# Workaround for issue #328
-rm -f ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
-cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
+# Workaround for videotoolbox on mac catalyst
+if [ ${ARCH} == "x86-64-mac-catalyst" ]; then
+    ${SED_INLINE} 's/    CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/   \/\/ CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/g' ${BASEDIR}/src/${LIB_NAME}/libavcodec/videotoolbox.c
+else
+    ${SED_INLINE} 's/   \/\/ CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/    CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/g' ${BASEDIR}/src/${LIB_NAME}/libavcodec/videotoolbox.c
+fi
+
+# Workaround for not supported iOS/tvOS features
+git checkout 2e595085ef653f365af49e6a32f012cc6d9ee03c -- ${BASEDIR}/src/${LIB_NAME}/libavdevice/avfoundation.m 1>>${BASEDIR}/build.log 2>&1
 
 ./configure \
     --sysroot=${SDK_PATH} \
@@ -416,7 +434,7 @@ cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB
     ${NEON_FLAG} \
     --enable-cross-compile \
     --enable-pic \
-    --enable-asm \
+    ${ARCH_OPTIONS} \
     --enable-inline-asm \
     --enable-optimizations \
     --enable-swscale \
@@ -456,6 +474,12 @@ cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB
     --disable-vdpau \
     ${CONFIGURE_POSTFIX} 1>>${BASEDIR}/build.log 2>&1
 
+# Workaround for issue #328
+echo "" >>ffbuild/config.mak
+echo "all:" >>ffbuild/config.mak
+echo "libswscale/aarch64/hscale.o: ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S" >>ffbuild/config.mak
+echo '	$(COMPILE_S)' >>ffbuild/config.mak
+
 if [ $? -ne 0 ]; then
     echo "failed"
     exit 1

build/ios-fontconfig.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fontconfig"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fontconfig} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +59,7 @@ fi
     --disable-rpath \
     --disable-libxml2 \
     --disable-docs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 # DISABLE IOS TESTS with system() calls - system() is deprecated for IOS
 # 1. test-bz106632.c

build/ios-freetype.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="freetype"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -62,7 +62,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/libpng/l
     --disable-shared \
     --disable-fast-install \
     --disable-mmap \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/ios-fribidi.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fribidi"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fribidi} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
     --disable-fast-install \
     --disable-debug \
     --disable-deprecated \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/ios-giflib.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="giflib"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR"
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_giflib} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -54,7 +54,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 

build/ios-gmp.sh

@@ -27,7 +27,7 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}
 
@@ -39,7 +39,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gmp} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -47,10 +47,17 @@ fi
 # PREPARING FLAGS
 case ${ARCH} in
     i386)
-        TARGET_HOST="x86-apple-darwin"
+        unset gmp_cv_asm_w32
+        BUILD_HOST="x86-apple-darwin"
+    ;;
+    x86-64-mac-catalyst)
+        # Workaround for 'cannot determine how to define a 32-bit word' error
+        export gmp_cv_asm_w32=".long"
+        BUILD_HOST=$(get_build_host)
     ;;
     *)
-        TARGET_HOST=$(get_target_host)
+        unset gmp_cv_asm_w32
+        BUILD_HOST=$(get_build_host)
     ;;
 esac
 
@@ -63,11 +70,11 @@ esac
     --disable-assembly \
     --disable-fast-install \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gmp_package_config "6.1.2"
+create_gmp_package_config "6.2.0"
 
 make install || exit 1

build/ios-gnutls.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gnutls"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -48,18 +48,18 @@ export HOGWEED_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/nettle/
 export GMP_CFLAGS="-I${BASEDIR}/prebuilt/$(get_target_build_directory)/gmp/include"
 export GMP_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/gmp/lib -lgmp"
 
-HARDWARE_ACCELERATION=""
+ARCH_OPTIONS=""
 case ${ARCH} in
     arm64 | arm64e)
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
     ;;
     i386)
         # DISABLING thread_local WHICH IS NOT SUPPORTED ON i386
         export CFLAGS+=" -D__thread="
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
     ;;
     *)
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
     ;;
 esac
 
@@ -71,7 +71,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gnutls} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -84,7 +84,7 @@ fi
     --with-included-unistring \
     --without-idn \
     --without-p11-kit \
-    ${HARDWARE_ACCELERATION} \
+    ${ARCH_OPTIONS} \
     --enable-static \
     --disable-openssl-compatibility \
     --disable-shared \
@@ -96,11 +96,11 @@ fi
     --disable-tests \
     --disable-tools \
     --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gnutls_package_config "3.6.11.1"
+create_gnutls_package_config "3.6.13"
 
 make install || exit 1

build/ios-jpeg.sh

@@ -27,25 +27,25 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 export CCAS=${AS}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export ASM_FLAGS=$(get_asmflags ${LIB_NAME})
 
-SIMD_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
     armv7 | armv7s | arm64 | arm64e)
-        SIMD_OPTIONS="-DWITH_SIMD=1"
+        ARCH_OPTIONS="-DWITH_SIMD=1"
     ;;
     *)
-        SIMD_OPTIONS="-DWITH_SIMD=0"
+        ARCH_OPTIONS="-DWITH_SIMD=0"
     ;;
 esac
 
@@ -80,7 +80,7 @@ cmake -Wno-dev \
     -DENABLE_STATIC=1 \
     -DENABLE_SHARED=0 \
     -DWITH_JPEG8=1 \
-    ${SIMD_OPTIONS} \
+    ${ARCH_OPTIONS} \
     -DWITH_TURBOJPEG=0 \
     -DWITH_JAVA=0 \
     -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \

build/ios-kvazaar.sh

@@ -27,17 +27,22 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="kvazaar"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
+ARCH_OPTIONS=""
 case ${ARCH} in
     i386)
-        TARGET_HOST="x86-apple-darwin"
+        BUILD_HOST="x86-apple-darwin"
+    ;;
+    x86-64 | x86-64-mac-catalyst)
+        ARCH_OPTIONS="--disable-asm"
+        BUILD_HOST=$(get_build_host)
     ;;
     *)
-        TARGET_HOST=$(get_target_host)
+        BUILD_HOST=$(get_build_host)
     ;;
 esac
 export CFLAGS=$(get_cflags ${LIB_NAME})
@@ -51,7 +56,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_kvazaar} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -63,7 +68,8 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1
 
 make || exit 1
 

build/ios-lame.sh

@@ -27,12 +27,12 @@ else
     . ${BASEDIR}/build/ios-common.sh
 fi
 
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="lame"
 set_toolchain_clang_paths ${LIB_NAME}
 
 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_lame} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +59,7 @@ fi
     --disable-frontend \
     --disable-efence \
     --disable-gtktest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1