Using released versions in test-apps.

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-open_collective: mobile-ffmpeg
-patreon: tanersener
-custom: ['https://buymeacoff.ee/tanersener','https://paypal.me/teodosiyminchev']

.github/ISSUE_TEMPLATE/issue-template.md

@@ -1,33 +0,0 @@
----
-name: Issue Template
-about: Create an issue to help us improve
-
----
-
-**Description**
-Description of what the issue is about.
-
-**Expected behavior**
-What you expected to happen.
-
-**Current behavior**
-What happened.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Logs**
-Post logs here or paste them to [Ghostbin](https://ghostbin.co) and insert the link here.
-
-**Environment**
- - Platform: [e.g. Android/IOS]
- - Architecture: [arm-v7a, arm-v7a-neon, arm64-v8a, x86, x86_64, armv7, armv7s, arm64, i386, x86_64]
- - Version (if applicable) [e.g. v1.2]
- - Source branch (if applicable) [e.g. master, dev-v2.x]
- - Xcode version (if applicable) [e.g. 7.3.1, 9.0.1]
- - Cocoapods version (if applicable) [e.g. 1.2.1]
- - Android Studio version (if applicable) [e.g. 3.1]
- - Android NDK version (if applicable) [e.g. 16b, 17c]
-
-**Other**
-Add any other context about the problem here.

.github/workflows/stale.yml

@@ -1,19 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "0 0 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-        stale-pr-message: 'This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'

.travis.yml

@@ -1,174 +0,0 @@
-branches:
-  only:
-  - master
-  - development
-git:
-  quiet: true
-  depth: false
-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
-            - bison
-            - autogen
-            - patch
-      android:
-        components:
-          - tools
-          - platform-tools
-          - build-tools-28.0.3
-          - android-24
-          - extra-google-google_play_services
-          - extra-google-m2repository
-          - extra-android-m2repository
-      install:
-        - echo y | sdkmanager "ndk;21.3.6528147"
-        - echo y | sdkmanager "cmake;3.10.2.4988404"
-      before_install:
-        - touch $HOME/.android/repositories.cfg
-      before_script:
-        - export ANDROID_NDK_ROOT=${ANDROID_HOME}ndk/21.3.6528147
-        - rm -f ./build.log
-        - wget https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz;tar zxvf nasm-2.14.02.tar.gz;cd nasm-2.14.02;./configure;make;sudo make install;cd ..
-      after_success:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - 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
-            - bison
-            - autogen
-            - patch
-      android:
-        components:
-          - tools
-          - platform-tools
-          - build-tools-28.0.3
-          - android-16
-          - android-21
-          - extra-google-google_play_services
-          - extra-google-m2repository
-          - extra-android-m2repository
-      install:
-        - echo y | sdkmanager "ndk;21.3.6528147"
-        - echo y | sdkmanager "cmake;3.10.2.4988404"
-      before_install:
-        - touch $HOME/.android/repositories.cfg
-      before_script:
-        - export ANDROID_NDK_ROOT=${ANDROID_HOME}ndk/21.3.6528147
-        - rm -f ./build.log
-        - wget https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz;tar zxvf nasm-2.14.02.tar.gz;cd nasm-2.14.02;./configure;make;sudo make install;cd ..
-      after_success:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - 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:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - 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:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - 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:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - 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:
-        - grep -e INFO ./build.log | grep build
-      after_failure:
-        - tail -30 ./build.log
-        - tail -30 ./src/ffmpeg/ffbuild/config.log
-      script:
-        - bash ./tvos.sh --lts --no-output-redirection

README.md

@@ -1,221 +1,85 @@
-# 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.4-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v4.4-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v4.4-blue.svg) [![Build Status](https://travis-ci.org/tanersener/mobile-ffmpeg.svg?branch=master)](https://travis-ci.org/tanersener/mobile-ffmpeg)
+# MobileFFmpeg [![Join the chat at https://gitter.im/mobile-ffmpeg/Lobby](https://badges.gitter.im/mobile-ffmpeg/Lobby.svg)](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![GitHub release](https://img.shields.io/badge/release-v2.2-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v2.2-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v2.2-blue.svg)
 
-FFmpeg for Android, iOS and tvOS
+FFmpeg for Android and IOS
 
-<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/mobile-ffmpeg-logo-v7.png" width="320">
+<img src="https://github.com/tanersener/mobile-ffmpeg/blob/dev-v2.x/docs/assets/mobile-ffmpeg-logo-v4.png" width="240">
 
 ### 1. Features
-- Includes both `FFmpeg` and `FFprobe`
 - Use binaries available at `Github`/`JCenter`/`CocoaPods` or build your own version with external libraries you need
 - Supports
-    - Android, iOS and tvOS
-    - FFmpeg `v3.4.x`, `v4.0.x`, `v4.1`, `v4.2` , `v4.3` and `v4.4-dev` releases
-    - 29 external libraries
+    - Both Android and IOS
+    - FFmpeg `v3.4.x` and `v4.0.x` releases
+    - 24 external libraries
     
-        `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`, `vo-amrwbenc`, `wavpack`
+        `chromaprint`, `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `wavpack`
     
-    - 5 external libraries with GPL license
+    - 4 external libraries with GPL license
     
-        `rubberband`, `vid.stab`, `x264`, `x265`, `xvidcore`
+        `vid.stab`, `x264`, `x265`, `xvidcore`
 
-    - Concurrent execution
-
-- Exposes both FFmpeg library and MobileFFmpeg wrapper library capabilities
-- Includes cross-compile instructions for 47 open-source libraries
+- Exposes FFmpeg capabilities both from FFmpeg libraries and through MobileFFmpeg wrapper library
+- Creates shared libraries (.so for Android, .dylib for IOS)
+- Includes cross-compile instructions for 38 open-source libraries
     
-    `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`, `vo-amrwbenc`, `wavpack`, `x264`, `x265`, `xvidcore`
+    `chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `tiff`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
 
 - Licensed under LGPL 3.0, can be customized to support GPL v3.0
-
 #### 1.1 Android
-- Builds `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures
-- Supports `zlib` and `MediaCodec` system libraries
-- Camera access on [supported devices](https://developer.android.com/ndk/guides/stable_apis#camera)
-- Builds shared native libraries (.so)
+- Supports `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures
 - Creates Android archive with .aar extension
-- Supports `API Level 16+`
-
-#### 1.2 iOS
-- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386`, `x86_64` and `x86_64` (Mac Catalyst) architectures
-- Supports `bzip2`, `iconv`, `libuuid`, `zlib` system libraries and `AudioToolbox`, `VideoToolbox`, `AVFoundation` system frameworks
-- Objective-C API
-- Camera access
+#### 1.2 IOS
+- Supports `armv7`, `armv7s`, `arm64`, `i386` and `x86_64` architectures
 - `ARC` enabled library
 - Built with `-fembed-bitcode` flag
-- 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`, `iconv`, `libuuid`, `zlib` system libraries and `AudioToolbox`, `VideoToolbox` system frameworks
-- Objective-C API
-- `ARC` enabled library
-- Built with `-fembed-bitcode` flag
-- Creates static frameworks and static universal (fat) libraries (.a)
-- Supports `tvOS SDK 9.2` or later
+- Creates IOS shared/dynamic universal (fat) library
+- Creates IOS static universal (fat) library
+- Creates IOS dynamic framework for IOS 8 or later
+- Supports Xcode 7.3.1 or later
 
 ### 2. Using
+Prebuilt libraries are available at [Github](https://github.com/tanersener/mobile-ffmpeg/releases), [JCenter](https://bintray.com/bintray/jcenter) and [CocoaPods](https://cocoapods.org). Refer to [Using IOS Universal Binaries](https://github.com/tanersener/mobile-ffmpeg/wiki/Using-IOS-Universal-Binaries) guide to import IOS universal binaries released at [Github](https://github.com/tanersener/mobile-ffmpeg/releases).
 
-Prebuilt binaries are available at [Github](https://github.com/tanersener/mobile-ffmpeg/releases), [JCenter](https://bintray.com/bintray/jcenter) and [CocoaPods](https://cocoapods.org).
+There are eight different prebuilt packages. Below you can see which external libraries are enabled in each of them.
 
-#### 2.1 Packages
+| min | min-gpl | https | https-gpl | audio | video | full | full-gpl |
+| :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: |
+|  -  |  vid.stab<sup>3</sup> <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup>  |  gnutls  |  gnutls <br/> vid.stab<sup>3</sup> <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup>  |  chromaprint<sup>3</sup> <br/> lame <br/> libilbc<sup>1</sup> <br/> libvorbis <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> soxr<sup>2</sup> <br/> speex <br/> wavpack  |  fontconfig <br/> freetype <br/> fribidi <br/> kvazaar <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libtheora <br/> libvpx <br/> snappy<sup>1</sup>  |  chromaprint<sup>3</sup> <br/> fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libilbc<sup>1</sup> <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> snappy<sup>1</sup> <br/> soxr<sup>2</sup> <br/> speex <br/> wavpack  |  chromaprint<sup>3</sup> <br/> fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom<sup>2</sup> <br/> libass <br/> libiconv <br/> libilbc<sup>1</sup> <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus<sup>1</sup> <br/> shine <br/> snappy<sup>1</sup> <br/> soxr<sup>2</sup> <br/> speex <br/> vid.stab<sup>3</sup> <br/> wavpack <br/> x264<sup>1</sup> <br/> x265<sup>3</sup> <br/> xvidcore<sup>1</sup>  |
 
-There are eight different `mobile-ffmpeg` packages. Below you can see which system libraries and external libraries are enabled in each of them. 
+<sup>1</sup> - Supported since `v1.1`
 
-Please remember that some parts of `FFmpeg` are licensed under the `GPL` and only `GPL` licensed `mobile-ffmpeg` packages include them.
+<sup>2</sup> - Supported since `v2.0`
 
-<table>
-<thead>
-<tr>
-<th align="center"></th>
-<th align="center"><sup>min</sup></th>
-<th align="center"><sup>min-gpl</sup></th>
-<th align="center"><sup>https</sup></th>
-<th align="center"><sup>https-gpl</sup></th>
-<th align="center"><sup>audio</sup></th>
-<th align="center"><sup>video</sup></th>
-<th align="center"><sup>full</sup></th>
-<th align="center"><sup>full-gpl</sup></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center"><sup>external libraries</sup></td>
-<td align="center">-</td>
-<td align="center"><sup>vid.stab</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
-<td align="center"><sup>gmp</sup><br><sup>gnutls</sup></td>
-<td align="center"><sup>gmp</sup><br><sup>gnutls</sup><br><sup>vid.stab</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
-<td align="center"><sup>lame</sup><br><sup>libilbc</sup><br><sup>libvorbis</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>shine</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>twolame</sup><br><sup>vo-amrwbenc</sup><br><sup>wavpack</sup></td>
-<td align="center"><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>kvazaar</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libtheora</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>snappy</sup></td>
-<td align="center"><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>gmp</sup><br><sup>gnutls</sup><br><sup>kvazaar</sup><br><sup>lame</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libilbc</sup><br><sup>libtheora</sup><br><sup>libvorbis</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>libxml2</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>shine</sup><br><sup>snappy</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>twolame</sup><br><sup>vo-amrwbenc</sup><br><sup>wavpack</sup></td>
-<td align="center"><sup>fontconfig</sup><br><sup>freetype</sup><br><sup>fribidi</sup><br><sup>gmp</sup><br><sup>gnutls</sup><br><sup>kvazaar</sup><br><sup>lame</sup><br><sup>libaom</sup><br><sup>libass</sup><br><sup>libiconv</sup><br><sup>libilbc</sup><br><sup>libtheora</sup><br><sup>libvorbis</sup><br><sup>libvpx</sup><br><sup>libwebp</sup><br><sup>libxml2</sup><br><sup>opencore-amr</sup><br><sup>opus</sup><br><sup>shine</sup><br><sup>snappy</sup><br><sup>soxr</sup><br><sup>speex</sup><br><sup>twolame</sup><br><sup>vid.stab</sup><br><sup>vo-amrwbenc</sup><br><sup>wavpack</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</sup></td>
-</tr>
-<tr>
-<td align="center"><sup>android system libraries</sup></td>
-<td align="center" colspan=8><sup>zlib</sup><br><sup>MediaCodec</sup></td>
-</tr>
-<tr>
-<td align="center"><sup>ios system libraries</sup></td>
-<td align="center" colspan=8><sup>zlib</sup><br><sup>AudioToolbox</sup><br><sup>AVFoundation</sup><br><sup>iconv</sup><br><sup>VideoToolbox</sup><br><sup>bzip2</sup></td>
-</tr>
-<tr>
-<td align="center"><sup>tvos system libraries</sup></td>
-<td align="center" colspan=8><sup>zlib</sup><br><sup>AudioToolbox</sup><br><sup>iconv</sup><br><sup>VideoToolbox</sup><br><sup>bzip2</sup></td>
-</tr>
-</tbody>
-</table>
+<sup>3</sup> - Supported since `v2.1`
 
- - `libilbc`, `opus`, `snappy`, `x264` and `xvidcore` are supported since `v1.1`
-
- - `libaom` and `soxr` are supported since `v2.0`
-
- - `chromaprint`, `vid.stab` and `x265` are supported since `v2.1`
-
- - `sdl`, `tesseract`, `twolame` external libraries; `zlib`, `MediaCodec` Android system libraries; `bzip2`, `zlib` iOS system libraries and `AudioToolbox`, `VideoToolbox`, `AVFoundation` iOS system frameworks are supported since `v3.0`
-
- - Since `v4.2`, `chromaprint`, `sdl` and `tesseract` libraries are not included in binary releases. You can still build them and include in your releases
- 
- - `AVFoundation` is not available on `tvOS`, `VideoToolbox` is not available on `tvOS` LTS releases
- 
- - Since `v4.3.1`, `iOS` and `tvOS` releases started to use `iconv` system library instead of `iconv` external library 
-
- - `vo-amrwbenc` is supported since `v4.4`
-
-#### 2.2 Android
-1. Add MobileFFmpeg dependency to your `build.gradle` in `mobile-ffmpeg-<package name>` pattern.
+#### 2.1 Android
+1. Add MobileFFmpeg dependency from `jcenter()`
     ```
-    dependencies {
-        implementation 'com.arthenica:mobile-ffmpeg-full:4.4'
+    dependencies {`
+        implementation 'com.arthenica:mobile-ffmpeg-full:2.2'
     }
     ```
 
-2. Execute synchronous FFmpeg commands.
+2. Execute commands.
     ```
-    import com.arthenica.mobileffmpeg.Config;
     import com.arthenica.mobileffmpeg.FFmpeg;
 
     int rc = FFmpeg.execute("-i file1.mp4 -c:v mpeg4 file2.mp4");
-   
+
     if (rc == RETURN_CODE_SUCCESS) {
         Log.i(Config.TAG, "Command execution completed successfully.");
     } else if (rc == RETURN_CODE_CANCEL) {
         Log.i(Config.TAG, "Command execution cancelled by user.");
     } else {
-        Log.i(Config.TAG, String.format("Command execution failed with rc=%d and the output below.", rc));
-        Config.printLastCommandOutput(Log.INFO);
+        Log.i(Config.TAG, String.format("Command execution failed with rc=%d.", rc));
     }
     ```
 
-3. Execute asynchronous FFmpeg commands.
+3. Stop an ongoing operation.
     ```
-    import com.arthenica.mobileffmpeg.Config;
-    import com.arthenica.mobileffmpeg.FFmpeg;
-
-    long executionId = FFmpeg.executeAsync("-i file1.mp4 -c:v mpeg4 file2.mp4", new ExecuteCallback() {
-
-        @Override
-        public void apply(final long executionId, final int returnCode) {
-            if (returnCode == RETURN_CODE_SUCCESS) {
-                Log.i(Config.TAG, "Async command execution completed successfully.");
-            } else if (returnCode == RETURN_CODE_CANCEL) {
-                Log.i(Config.TAG, "Async command execution cancelled by user.");
-            } else {
-                Log.i(Config.TAG, String.format("Async command execution failed with returnCode=%d.", returnCode));
-            }
-        }
-    });
+    FFmpeg.cancel();
     ```
 
-4. Execute FFprobe commands.
-    ```
-    import com.arthenica.mobileffmpeg.Config;
-    import com.arthenica.mobileffmpeg.FFprobe;
-
-    int rc = FFprobe.execute("-i file1.mp4");
-   
-    if (rc == RETURN_CODE_SUCCESS) {
-        Log.i(Config.TAG, "Command execution completed successfully.");
-    } else {
-        Log.i(Config.TAG, String.format("Command execution failed with rc=%d and the output below.", rc));
-        Config.printLastCommandOutput(Log.INFO);
-    }
-    ```
-
-5. Check execution output later.
-    ```
-    int rc = Config.getLastReturnCode();
- 
-    if (rc == RETURN_CODE_SUCCESS) {
-        Log.i(Config.TAG, "Command execution completed successfully.");
-    } else if (rc == RETURN_CODE_CANCEL) {
-        Log.i(Config.TAG, "Command execution cancelled by user.");
-    } else {
-        Log.i(Config.TAG, String.format("Command execution failed with rc=%d and the output below.", rc));
-        Config.printLastCommandOutput(Log.INFO);
-    }
-    ```
-
-6. Stop ongoing FFmpeg operations.
-    - Stop all executions
-        ```
-        FFmpeg.cancel();
-        ```
-    - Stop a specific execution
-        ```
-        FFmpeg.cancel(executionId);
-        ```
-
-7. Get media information for a file.
-    ```
-    MediaInformation info = FFprobe.getMediaInformation("<file path or uri>");
-    ```
-
-8. Record video using Android camera.
-    ```
-    FFmpeg.execute("-f android_camera -i 0:0 -r 30 -pixel_format bgr0 -t 00:00:05 <record file path>");
-    ```
-
-9. Enable log callback.
+4. Enable log callback.
     ```
     Config.enableLogCallback(new LogCallback() {
         public void apply(LogMessage message) {
@@ -224,7 +88,7 @@ Please remember that some parts of `FFmpeg` are licensed under the `GPL` and onl
     });
     ```
 
-10. Enable statistics callback.
+5. Enable statistics callback.
     ```
     Config.enableStatisticsCallback(new StatisticsCallback() {
         public void apply(Statistics newStatistics) {
@@ -232,427 +96,168 @@ Please remember that some parts of `FFmpeg` are licensed under the `GPL` and onl
         }
     });
     ```
-11. Ignore the handling of a signal.
-    ```
-    Config.ignoreSignal(Signal.SIGXCPU);
-    ```
 
-12. List ongoing executions.
-    ```
-    final List<FFmpegExecution> ffmpegExecutions = FFmpeg.listExecutions();
-    for (int i = 0; i < ffmpegExecutions.size(); i++) {
-        FFmpegExecution execution = ffmpegExecutions.get(i);
-        Log.d(TAG, String.format("Execution %d = id:%d, startTime:%s, command:%s.", i, execution.getExecutionId(), execution.getStartTime(), execution.getCommand()));
-    }
-    ```
-
-13. Set default log level.
+6. Set log level.
     ```
     Config.setLogLevel(Level.AV_LOG_FATAL);
     ```
 
-14. Register custom fonts directory.
+7. Register custom fonts directory.
     ```
     Config.setFontDirectory(this, "<folder with fonts>", Collections.EMPTY_MAP);
     ```
 
-#### 2.3 iOS / tvOS
-1. Add MobileFFmpeg dependency to your `Podfile` in `mobile-ffmpeg-<package name>` pattern.
-
-    - iOS
+#### 2.2 IOS
+1. Add MobileFFmpeg pod to your `Podfile`
     ```
-    pod 'mobile-ffmpeg-full', '~> 4.4'
+    pod 'mobile-ffmpeg-full', '~> 2.2'
     ```
 
-    - tvOS
+2. Create and execute commands.
     ```
-    pod 'mobile-ffmpeg-tvos-full', '~> 4.4'
-    ```
-
-2. Execute synchronous FFmpeg commands.
-    ```
-    #import <mobileffmpeg/MobileFFmpegConfig.h>
     #import <mobileffmpeg/MobileFFmpeg.h>
 
     int rc = [MobileFFmpeg execute: @"-i file1.mp4 -c:v mpeg4 file2.mp4"];
-   
-    if (rc == RETURN_CODE_SUCCESS) {
-        NSLog(@"Command execution completed successfully.\n");
-    } else if (rc == RETURN_CODE_CANCEL) {
-        NSLog(@"Command execution cancelled by user.\n");
-    } else {
-        NSLog(@"Command execution failed with rc=%d and output=%@.\n", rc, [MobileFFmpegConfig getLastCommandOutput]);
-    }
-    ```
-
-3. Execute asynchronous FFmpeg commands.
-    ```
-    #import <mobileffmpeg/MobileFFmpegConfig.h>
-    #import <mobileffmpeg/MobileFFmpeg.h>
-
-    long executionId = [MobileFFmpeg executeAsync:@"-i file1.mp4 -c:v mpeg4 file2.mp4" withCallback:self];
-
-    - (void)executeCallback:(long)executionId :(int)returnCode {
-        if (rc == RETURN_CODE_SUCCESS) {
-            NSLog(@"Async command execution completed successfully.\n");
-        } else if (rc == RETURN_CODE_CANCEL) {
-            NSLog(@"Async command execution cancelled by user.\n");
-        } else {
-            NSLog(@"Async command execution failed with rc=%d.\n", rc);
-        }
-    }
-    ```
-
-4. Execute FFprobe commands.
-    ```
-    #import <mobileffmpeg/MobileFFmpegConfig.h>
-    #import <mobileffmpeg/MobileFFprobe.h>
-
-    int rc = [MobileFFprobe execute: @"-i file1.mp4"];
-   
-    if (rc == RETURN_CODE_SUCCESS) {
-        NSLog(@"Command execution completed successfully.\n");
-    } else if (rc == RETURN_CODE_CANCEL) {
-        NSLog(@"Command execution cancelled by user.\n");
-    } else {
-        NSLog(@"Command execution failed with rc=%d and output=%@.\n", rc, [MobileFFmpegConfig getLastCommandOutput]);
-    }
-    ```
-    
-5. Check execution output later.
-    ```
-    int rc = [MobileFFmpegConfig getLastReturnCode];
-    NSString *output = [MobileFFmpegConfig getLastCommandOutput];
 
     if (rc == RETURN_CODE_SUCCESS) {
         NSLog(@"Command execution completed successfully.\n");
     } else if (rc == RETURN_CODE_CANCEL) {
         NSLog(@"Command execution cancelled by user.\n");
     } else {
-        NSLog(@"Command execution failed with rc=%d and output=%@.\n", rc, output);
+        NSLog(@"Command execution failed with rc=%d.\n", rc);
     }
     ```
 
-6. Stop ongoing FFmpeg operations.
-    - Stop all executions
-        ```
-        [MobileFFmpeg cancel];
-
-        ```
-    - Stop a specific execution
-        ```
-        [MobileFFmpeg cancel:executionId];
-        ```
-
-7. Get media information for a file.
+3. Stop an ongoing operation.
     ```
-    MediaInformation *mediaInformation = [MobileFFprobe getMediaInformation:@"<file path or uri>"];
+    [MobileFFmpeg cancel];
     ```
 
-8. Record video and audio using iOS camera. This operation is not supported on `tvOS` since `AVFoundation` is not available on `tvOS`.
-
+4. Enable log callback.
     ```
-    [MobileFFmpeg execute: @"-f avfoundation -r 30 -video_size 1280x720 -pixel_format bgr0 -i 0:0 -vcodec h264_videotoolbox -vsync 2 -f h264 -t 00:00:05 %@", recordFilePath];
-    ```
-
-9. Enable log callback.
-    ```
-    [MobileFFmpegConfig setLogDelegate:self];
-
-    - (void)logCallback:(long)executionId :(int)level :(NSString*)message {
+    - (void)logCallback: (int)level :(NSString*)message {
         dispatch_async(dispatch_get_main_queue(), ^{
             NSLog(@"%@", message);
         });
     }
+    ...
+    [MobileFFmpegConfig setLogDelegate:self];
     ```
 
-10. Enable statistics callback.
+5. Enable statistics callback.
     ```
-    [MobileFFmpegConfig setStatisticsDelegate:self];
-
     - (void)statisticsCallback:(Statistics *)newStatistics {
         dispatch_async(dispatch_get_main_queue(), ^{
             NSLog(@"frame: %d, time: %d\n", newStatistics.getVideoFrameNumber, newStatistics.getTime);
         });
     }
+    ...
+    [MobileFFmpegConfig setStatisticsDelegate:self];
     ```
 
-11. Ignore the handling of a signal.
-    ```
-    [MobileFFmpegConfig ignoreSignal:SIGXCPU];
-    ```
-
-12. List ongoing executions.
-    ```
-    NSArray* ffmpegExecutions = [MobileFFmpeg listExecutions];
-    for (int i = 0; i < [ffmpegExecutions count]; i++) {
-        FFmpegExecution* execution = [ffmpegExecutions objectAtIndex:i];
-        NSLog(@"Execution %d = id: %ld, startTime: %@, command: %@.\n", i, [execution getExecutionId], [execution getStartTime], [execution getCommand]);
-    }
-    ```
-
-13. Set default log level.
+6. Set log level.
     ```
     [MobileFFmpegConfig setLogLevel:AV_LOG_FATAL];
     ```
 
-14. Register custom fonts directory.
+7. Register custom fonts directory.
     ```
     [MobileFFmpegConfig setFontDirectory:@"<folder with fonts>" with:nil];
     ```
-
-#### 2.4 Manual Installation
-##### 2.4.1 Android
-
-You can import `MobileFFmpeg` aar packages in `Android Studio` using the `File` -> `New` -> `New Module` -> `Import .JAR/.AAR Package` menu.
-
-##### 2.4.2 iOS / tvOS
-
-iOS and tvOS frameworks can be installed manually using the [Importing Frameworks](https://github.com/tanersener/mobile-ffmpeg/wiki/Importing-Frameworks) guide. 
-If you want to use universal binaries please refer to [Using Universal Binaries](https://github.com/tanersener/mobile-ffmpeg/wiki/Using-Universal-Binaries) guide.   
     
-#### 2.5 Test Application
+#### 2.3 Test Application
 You can see how MobileFFmpeg is used inside an application by running test applications provided.
-There is an `Android` test application under the `android/test-app` folder, an `iOS` test application under the 
-`ios/test-app` folder and a `tvOS` test application under the `tvos/test-app` folder. 
+There is an Android test application under the `android/test-app` folder and an IOS test application, which requires 
+`Xcode 9.x` or later, under the `ios/test-app` folder. Both applications are identical and supports command 
+execution, video encoding, accessing https, encoding audio, burning subtitles and video stabilization.
 
-All applications are identical and supports command execution, video encoding, accessing https, encoding audio, 
-burning subtitles, video stabilisation, pipe operations and concurrent command execution.
-
-<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/android_test_app.gif" width="240">
+<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/ios_test_app.gif" width="240">
 
 ### 3. Versions
 
-`MobileFFmpeg` version number is aligned with `FFmpeg` since version `4.2`. 
+- `MobileFFmpeg v1.x` is the previous stable, includes `FFmpeg v3.4.4`
 
-In previous versions, `MobileFFmpeg` version of a release and `FFmpeg` version included in that release was different. 
-The following table lists `FFmpeg` versions used in `MobileFFmpeg` releases.
-  
-- `dev` part in `FFmpeg` version number indicates that `FFmpeg` source is pulled from the `FFmpeg` `master` branch. 
-Exact version number is obtained using `git describe --tags`. 
+- `MobileFFmpeg v2.x` is the current stable, includes `FFmpeg v4.0.3`
 
-|  MobileFFmpeg Version | FFmpeg Version | Release Date |
-| :----: | :----: |:----: |
-| [4.4](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.4) | 4.4-dev-416 | Jul 25, 2020 |
-| [4.4.LTS](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.4.LTS) | 4.4-dev-416 | Jul 24, 2020 |
-| [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 |
-| [4.2.2](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.2.2) | 4.2-dev-1824 | July 3, 2019 |
-| [4.2.2.LTS](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.2.2.LTS) | 4.2-dev-1824 | July 3, 2019 |
-| [4.2.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.2.1) | 4.2-dev-1156 | Apr 2, 2019 |
-| [4.2](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.2) | 4.2-dev-480 | Jan 3, 2019 |
-| [4.2.LTS](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v4.2.LTS) | 4.2-dev-480 | Jan 3, 2019 |
-| [3.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v3.1) | 4.1-10 | Dec 11, 2018 |
-| [3.0](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v3.0) | 4.1-dev-1517 | Oct 25, 2018 |
-| [2.2](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v2.2) | 4.0.3 | Nov 10, 2018 |
-| [2.1.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v2.1.1) | 4.0.2 | Sep 19, 2018 |
-| [2.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v2.1) | 4.0.2 | Sep 5, 2018 |
-| [2.0](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v2.0) | 4.0.1 | Jun 30, 2018 |
-| [1.2](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v1.2) | 3.4.4 | Aug 30, 2018|
-| [1.1](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v1.1) | 3.4.2 | Jun 18, 2018 |
-| [1.0](https://github.com/tanersener/mobile-ffmpeg/releases/tag/v1.0) | 3.4.2 | Jun 6, 2018 |
-
-### 4. LTS Releases
-
-Starting from `v4.2`, `MobileFFmpeg` binaries are published in two different variants: `Main Release` and `LTS Release`. 
-
-- Main releases include complete functionality of the library and support the latest SDK/API features.
-
-- LTS releases are customized to support a wider range of devices. They are built using older API/SDK versions, so some features are not available on them.
-
-This table shows the differences between two variants.
-
-|        | Main Release | LTS Release |
-| :----: | :----: | :----: |
-| Android API Level | 24 | 16 | 
-| Android Camera Access | Yes | - |
-| 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 AVFoundation | Yes | - |
-| 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.
-
-| branch | status |
-| :---: | :---: |
-|  master | [![Build Status](https://travis-ci.org/tanersener/mobile-ffmpeg.svg?branch=master)](https://travis-ci.org/tanersener/mobile-ffmpeg) |
-|  development | [![Build Status](https://travis-ci.org/tanersener/mobile-ffmpeg.svg?branch=development)](https://travis-ci.org/tanersener/mobile-ffmpeg) |
-
-
-#### 5.1 Prerequisites
+### 4. Building
+#### 4.1 Prerequisites
 1. Use your package manager (apt, yum, dnf, brew, etc.) to install the following packages.
 
     ```
-    autoconf automake libtool pkg-config curl cmake gcc gperf texinfo yasm nasm bison autogen patch git
+    autoconf automake libtool pkg-config curl cmake gcc gperf texinfo yasm nasm bison
     ```
 Some of these packages are not mandatory for the default build.
-Please visit [Android Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/Android-Prerequisites), 
-[iOS Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/iOS-Prerequisites) and 
-[tvOS Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/tvOS-Prerequisites) for the details.
+Please visit [Android Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/Android-Prerequisites) and
+[IOS Prerequisites](https://github.com/tanersener/mobile-ffmpeg/wiki/IOS-Prerequisites) for the details.
 
 2. Android builds require these additional packages.
-    - **Android SDK 4.1 Jelly Bean (API Level 16)** or later
-    - **Android NDK r21** or later with LLDB and CMake
+    - **Android SDK 5.0 Lollipop (API Level 21)** or later
+    - **Android NDK r16b** or later with LLDB and CMake
+    - **gradle 4.4** or later
 
-3. iOS builds need these extra packages and tools.
+3. IOS builds need these extra packages and tools.
+    - **IOS SDK 7.0.x** or later
     - **Xcode 7.3.1** or later
-    - **iOS SDK 9.3** or later
     - **Command Line Tools**
 
-4. tvOS builds need these extra packages and tools.
-    - **Xcode 7.3.1** or later
-    - **tvOS SDK 9.2** or later
-    - **Command Line Tools**
+#### 4.2 Build Scripts
+Use `android.sh` and `ios.sh` to build MobileFFmpeg for each platform.
+After a successful build, compiled FFmpeg and MobileFFmpeg libraries can be found under `prebuilt` directory.
 
-#### 5.2 Build Scripts
-Use `android.sh`, `ios.sh` and `tvos.sh` to build MobileFFmpeg for each platform. 
-
-All three scripts support additional options and 
-can be customized to enable/disable specific external libraries and/or architectures. Please refer to wiki pages of
-[android.sh](https://github.com/tanersener/mobile-ffmpeg/wiki/android.sh), 
-[ios.sh](https://github.com/tanersener/mobile-ffmpeg/wiki/ios.sh) and 
-[tvos.sh](https://github.com/tanersener/mobile-ffmpeg/wiki/tvos.sh) to see all available build options.
-##### 5.2.1 Android 
+Both `android.sh` and `ios.sh` can be customized to override default settings,
+[android.sh](https://github.com/tanersener/mobile-ffmpeg/wiki/android.sh) and
+[ios.sh](https://github.com/tanersener/mobile-ffmpeg/wiki/ios.sh) wiki pages include all available build options.
+##### 4.2.1 Android 
 ```
-export ANDROID_HOME=<Android SDK Path>
 export ANDROID_NDK_ROOT=<Android NDK Path>
 ./android.sh
 ```
 
 <img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/android_custom.gif" width="600">
 
-##### 5.2.2 iOS
+##### 4.2.2 IOS
 ```
-./ios.sh
+./ios.sh    
 ```
 
 <img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/ios_custom.gif" width="600">
 
-##### 5.2.3 tvOS
-```
-./tvos.sh
-```
+#### 4.3 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.
 
-<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/tvos_custom.gif" width="600">
+#### 4.4 External Libraries
+`build` directory includes build scripts for external libraries. There are two scripts for each library, one for Android
+and one for IOS. They include all options/flags used to cross-compile the libraries. `ASM` is enabled by most of them, 
+exceptions are listed under the [ASM Support](https://github.com/tanersener/mobile-ffmpeg/wiki/ASM-Support) page.
 
-
-##### 5.2.4 Building LTS Binaries
-
-Use `--lts` option to build lts binaries for each platform.
-
-#### 5.3 Build Output
-
-All libraries created by the top level build scripts (`android.sh`, `ios.sh` and `tvos.sh`) can be found under 
-the `prebuilt` directory.
-
-- `Android` archive (.aar file) is located under the `android-aar` 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`; `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, 
-one for `Android` and one for `iOS / tvOS`. Each of these two scripts contains options/flags used to cross-compile the 
-library on the specified mobile platform. 
-
-CPU optimizations (`ASM`) are enabled for most of the external libraries. Details and exceptions can be found under the 
-[ASM Support](https://github.com/tanersener/mobile-ffmpeg/wiki/ASM-Support) wiki page.
-
-### 6. Documentation
+### 5. Documentation
 
 A more detailed documentation is available at [Wiki](https://github.com/tanersener/mobile-ffmpeg/wiki).
 
-### 7. Contributors
+### 6. License
 
-#### 7.1 Code Contributors
+This project is licensed under the LGPL v3.0. However, if source code is built using optional `--enable-gpl` flag or 
+prebuilt binaries with `-gpl` postfix are used then MobileFFmpeg is subject to the GPL v3.0 license.
 
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="https://github.com/tanersener/mobile-ffmpeg/graphs/contributors"><img src="https://opencollective.com/mobile-ffmpeg/contributors.svg?width=890&button=false" /></a>
+Source code of FFmpeg and external libraries is included in compliance with their individual licenses.
 
-#### 7.2 Financial Contributors
+`strip-frameworks.sh` script included and distributed is published under the [Apache License version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
 
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/mobile-ffmpeg/contribute)]
-
-##### 7.2.1 Individuals
-
-<a href="https://opencollective.com/mobile-ffmpeg"><img src="https://opencollective.com/mobile-ffmpeg/individuals.svg?width=890"></a>
-
-##### 7.2.2 Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/mobile-ffmpeg/contribute)]
-
-<a href="https://opencollective.com/mobile-ffmpeg/organization/0/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/1/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/2/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/3/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/4/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/5/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/6/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/7/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/8/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/mobile-ffmpeg/organization/9/website"><img src="https://opencollective.com/mobile-ffmpeg/organization/9/avatar.svg"></a>
-
-### 8. License
-
-`MobileFFmpeg` is licensed under the LGPL v3.0. However, if source code is built using the optional `--enable-gpl` flag
-or prebuilt binaries with `-gpl` postfix are used, then MobileFFmpeg is subject to the GPL v3.0 license.
-
-The source code of all external libraries included is in compliance with their individual licenses.
-
-`openh264` source code included in this repository is licensed under the 2-clause BSD License but this license does 
-not cover the `MPEG LA` licensing fees. If you build `mobile-ffmpeg` with `openh264` and distribute that library, then 
-you are subject to pay `MPEG LA` licensing fees. Refer to [OpenH264 FAQ](https://www.openh264.org/faq.html) page for 
-the details. Please note that `mobile-ffmpeg` does not publish a binary with `openh264` inside.
-
-`strip-frameworks.sh` script included and distributed (until v4.x) is published under the
-[Apache License version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
-
-In test applications; embedded fonts are licensed under the
-[SIL Open Font License](https://opensource.org/licenses/OFL-1.1), other digital assets are published in the public
-domain.
+In test applications, fonts embedded are licensed under the [SIL Open Font License](https://opensource.org/licenses/OFL-1.1); other digital assets are published in the public domain.
 
 Please visit [License](https://github.com/tanersener/mobile-ffmpeg/wiki/License) page for the details.
 
-### 9. Patents
+### 7. Contributing
 
-It is not clearly explained in their documentation but it is believed that `FFmpeg`, `kvazaar`, `x264` and `x265`
-include algorithms which are subject to software patents. If you live in a country where software algorithms are
-patentable then you'll probably need to pay royalty fees to patent holders. We are not lawyers though, so we recommend
-that you seek legal advice first. See [FFmpeg Patent Mini-FAQ](https://ffmpeg.org/legal.html).
+If you have any recommendations or ideas to improve it, please feel free to submit issues or pull requests. Any help is appreciated.
 
-`openh264` clearly states that it uses patented algorithms. Therefore, if you build mobile-ffmpeg with openh264 and
-distribute that library, then you are subject to pay MPEG LA licensing fees. Refer to
-[OpenH264 FAQ](https://www.openh264.org/faq.html) page for the details.
-
-### 10. Contributing
-
-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. Therefore, if you want to create a pull request, please open it against
-the `development`.
-
-### 11. See Also
+### 8. See Also
 
 - [libav gas-preprocessor](https://github.com/libav/gas-preprocessor/raw/master/gas-preprocessor.pl)
 - [FFmpeg API Documentation](https://ffmpeg.org/doxygen/4.0/index.html)
 - [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart)
+- [FFmpeg License and Legal Considerations](https://ffmpeg.org/legal.html)
 - [FFmpeg External Library Licenses](https://www.ffmpeg.org/doxygen/4.0/md_LICENSE.html)
+

android/.gitignore

@@ -1,13 +1,12 @@
 *.iml
-.gradle/
-local.properties
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
 .DS_Store
-/build/
-/app/build/
-/test-app/build/
-/app/.cxx/
-captures
-.externalNativeBuild/
-.idea/
+/build
+/captures
+.externalNativeBuild
+/.idea/
 /obj/
 /libs/

android/app/.gitignore

@@ -0,0 +1,2 @@
+/build
+/local.properties

android/app/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.18
+# Doxyfile 1.8.14
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,10 +17,10 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
 # https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
@@ -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.4
+PROJECT_NUMBER         = 2.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
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -197,16 +189,6 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
-# such as
-# /***************
-# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
-# Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
-# The default value is: NO.
-
-JAVADOC_BANNER         = NO
-
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
@@ -256,13 +238,15 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines (in the resulting output). You can put ^^ in the value part of an
 # alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
 
 ALIASES                =
 
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -291,26 +275,17 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -321,7 +296,7 @@ EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -333,7 +308,7 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
+# Minimum value: 0, maximum value: 99, default value: 0.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
@@ -469,12 +444,6 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
-# methods of a class will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIV_VIRTUAL   = NO
-
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -529,8 +498,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -553,7 +522,7 @@ INTERNAL_DOCS          = NO
 # names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -785,8 +754,7 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# parameter documentation, but not about the absence of documentation.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -845,10 +813,8 @@ INPUT_ENCODING         = UTF-8
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
-# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -923,7 +889,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = cmdutils.* ffmpeg.* ffmpeg_*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1045,7 +1011,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
+# function all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -1082,7 +1048,7 @@ SOURCE_TOOLTIPS        = YES
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1260,9 +1226,9 @@ HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
+# are dynamically created via Javascript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
+# page. Disable this option to support browsers that do not have Javascript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1292,13 +1258,13 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
+# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1337,7 +1303,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@@ -1413,7 +1379,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1421,8 +1387,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1430,23 +1395,21 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1530,17 +1493,6 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png The default and svg Looks nicer but requires the
-# pdf2svg tool.
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1561,14 +1513,8 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# https://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1596,7 +1542,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
 # MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
@@ -1638,7 +1584,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
+# implemented using a web server instead of a web client using Javascript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1722,35 +1668,21 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX. In case there is no backslash (\) as first character
-# it will be automatically added in the LaTeX code.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = makeindex
-
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1885,14 +1817,6 @@ LATEX_BIB_STYLE        = plain
 
 LATEX_TIMESTAMP        = NO
 
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1932,9 +1856,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1943,8 +1867,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -2030,13 +1954,6 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -2238,6 +2155,12 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2251,6 +2174,15 @@ EXTERNAL_PAGES         = YES
 
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.

android/app/build.gradle

@@ -1,18 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
-    ndkVersion "21.3.6528147"
-
+    compileSdkVersion 27
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 30
-        versionCode 240440
-        versionName "4.4"
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 22
+        versionName "2.2"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         project.archivesBaseName = "mobile-ffmpeg"
-        consumerProguardFiles 'proguard-rules.pro'
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -26,16 +23,32 @@ android {
         }
     }
 
-    testOptions {
-        unitTests.returnDefaultValues = true
+    libraryVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (outputFile != null && outputFileName.endsWith('.aar')) {
+                outputFileName = "${archivesBaseName}-${android.defaultConfig.versionName}.aar"
+            }
+        }
     }
 }
 
-dependencies {
-    testImplementation "androidx.test.ext:junit:1.1.1"
-    testImplementation "org.json:json:20190722"
+task javadoc(type: Javadoc) {
+    title = 'MobileFFmpeg'
+    destinationDir = file("${projectDir}/../../docs/android/javadoc")
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    source = android.sourceSets.main.java.srcDirs
 }
 
-if (System.properties.containsKey('releaseMobileFFmpeg')) {
-    apply from: "${rootProject.projectDir}/../tools/release/android/release.template.gradle"
+afterEvaluate {
+    javadoc.classpath += files(android.libraryVariants.collect { variant ->
+        variant.javaCompile.classpath.files
+    })
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

android/app/proguard-rules.pro

@@ -5,13 +5,17 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
--keep class com.arthenica.mobileffmpeg.Config {
-    native <methods>;
-    void log(long, int, byte[]);
-    void statistics(long, int, float, float, long , int, double, double);
-    void closeParcelFileDescriptor(int);
-}
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
 
--keep class com.arthenica.mobileffmpeg.AbiDetect {
-    native <methods>;
-}
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android/app/release.template.gradle

@@ -0,0 +1,180 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+buildscript {
+    repositories {
+	google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+    }
+}
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode Integer.parseInt(releaseVersionCode)
+        versionName releaseVersionName
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        project.archivesBaseName = releaseProject
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ["../libs"]
+        }
+    }
+
+    libraryVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (outputFile != null && outputFileName.endsWith('.aar')) {
+                outputFileName = "${archivesBaseName}-${android.defaultConfig.versionName}.aar"
+            }
+        }
+    }
+}
+
+ext {
+    bintrayRepo = 'maven'
+    bintrayName = releaseProject
+
+    publishedGroupId = 'com.arthenica'
+    libraryName = releaseProject
+    artifact = releaseProject
+
+    libraryDescription = releaseProjectDescription
+
+    siteUrl = 'https://github.com/tanersener/mobile-ffmpeg'
+    gitUrl = 'https://github.com/tanersener/mobile-ffmpeg.git'
+
+    libraryVersion = releaseVersionName
+
+    developerId = 'tanersener'
+    developerName = 'Taner Sener'
+    developerEmail = 'tanersener@gmail.com'
+
+    if (Project.hasProperty('releaseGPL')) {
+        licenseName = 'GNU General Public License version 3'
+        licenseUrl = 'https://www.gnu.org/licenses/gpl-3.0.txt'
+        allLicenses = ["GPL-3.0"]
+    } else {
+        licenseName = 'GNU Lesser General Public License, Version 3'
+        licenseUrl = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
+        allLicenses = ["LGPL-3.0"]
+    }
+}
+
+group = publishedGroupId
+version = libraryVersion
+
+install {
+    repositories.mavenInstaller {
+        pom.project {
+            packaging 'aar'
+            groupId publishedGroupId
+            artifactId artifact
+
+            name libraryName
+            description libraryDescription
+            url siteUrl
+
+            licenses {
+                license {
+                    name licenseName
+                    url licenseUrl
+                }
+            }
+            developers {
+                developer {
+                    id developerId
+                    name developerName
+                    email developerEmail
+                }
+            }
+            scm {
+                connection gitUrl
+                developerConnection gitUrl
+                url siteUrl
+            }
+        }
+    }
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        dryRun = false
+        publish = false
+        override = false
+        publicDownloadNumbers = false
+        version {
+            desc = libraryDescription
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+task javadoc(type: Javadoc) {
+    title = 'MobileFFmpeg'
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+afterEvaluate {
+    javadoc.classpath += files(android.libraryVariants.collect { variant ->
+        variant.javaCompile.classpath.files
+    })
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}

android/app/src/androidTest/java/com/arthenica/mobileffmpeg/ExampleInstrumentedTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 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.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.arthenica.mobileffmpeg", appContext.getPackageName());
+    }
+}

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.arthenica.mobileffmpeg">
 
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"/>
 </manifest>

android/app/src/main/cpp/.gitignore

@@ -1,2 +0,0 @@
-/android_lts_support.o
-/libandroidltssupport.a

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

@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <math.h>
-#include <errno.h>
-#include <malloc.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if __ANDROID_API__ < 17
-
-int posix_memalign(void** memptr, size_t alignment, size_t size) {
-  if ((alignment & (alignment - 1)) != 0 || alignment == 0) {
-    return EINVAL;
-  }
-
-  if (alignment % sizeof(void*) != 0) {
-    return EINVAL;
-  }
-
-  *memptr = memalign(alignment, size);
-  if (*memptr == NULL) {
-    return errno;
-  }
-
-  return 0;
-}
-
-#endif /* __ANDROID_API__ < 17 */
-
-double log2(double x) {
-    return (log(x) / M_LN2);
-}
-
-float log2f(float x) {
- return (float) log2((double) x);
-}
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif

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

@@ -20,14 +20,6 @@
  */
 
 /*
- * CHANGES 01.2020
- * - ffprobe support changes
- * - (optindex < argc) validation in parse_options() method updated with (optindex >= argc) check
- *
- * CHANGES 12.2019
- * - Concurrent execution support
- * - log_callback_report method re-added to fix -report option issues
- *
  * CHANGES 08.2018
  * --------------------------------------------------------
  * - fftools_ prefix added to file name and parent header
@@ -93,19 +85,15 @@
 
 static int init_report(const char *env);
 extern void mobileffmpeg_log_callback_function(void *ptr, int level, const char* format, va_list vargs);
-extern void (*report_callback)(int, float, float, int64_t, int, double, double);
 
-__thread char *program_name;
-__thread int program_birth_year;
+AVDictionary *sws_dict;
+AVDictionary *swr_opts;
+AVDictionary *format_opts, *codec_opts, *resample_opts;
 
-__thread AVDictionary *sws_dict;
-__thread AVDictionary *swr_opts;
-__thread AVDictionary *format_opts, *codec_opts, *resample_opts;
-
-FILE *report_file;
-int report_file_level = AV_LOG_DEBUG;
-__thread int hide_banner = 0;
-__thread volatile int longjmp_value = 0;
+static FILE *report_file;
+static int report_file_level = AV_LOG_DEBUG;
+int hide_banner = 0;
+int longjmp_value = 0;
 
 enum show_muxdemuxers {
     SHOW_DEFAULT,
@@ -127,29 +115,9 @@ void uninit_opts(void)
     av_dict_free(&resample_opts);
 }
 
-void log_callback_report(void *ptr, int level, const char *fmt, va_list vl)
-{
-    va_list vl2;
-    char line[1024];
-    static int print_prefix = 1;
-
-    va_copy(vl2, vl);
-    if (report_callback == NULL) {
-        av_log_default_callback(ptr, level, fmt, vl);
-    } else {
-        mobileffmpeg_log_callback_function(ptr, level, fmt, vl);
-    }
-    av_log_format_line(ptr, level, fmt, vl2, line, sizeof(line), &print_prefix);
-    va_end(vl2);
-    if (report_file_level >= level) {
-        fputs(line, report_file);
-        fflush(report_file);
-    }
-}
-
 void init_dynload(void)
 {
-#if HAVE_SETDLLDIRECTORY
+#ifdef _WIN32
     /* Calling SetDllDirectory with the empty string (but not NULL) removes the
      * current working directory from the DLL search path as a security pre-caution. */
     SetDllDirectory("");
@@ -223,7 +191,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
             continue;
 
         if (first) {
-            av_log(NULL, AV_LOG_STDERR, "%s\n", msg);
+            printf("%s\n", msg);
             first = 0;
         }
         av_strlcpy(buf, po->name, sizeof(buf));
@@ -231,9 +199,9 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
             av_strlcat(buf, " ", sizeof(buf));
             av_strlcat(buf, po->argname, sizeof(buf));
         }
-        av_log(NULL, AV_LOG_STDERR, "-%-17s  %s\n", buf, po->help);
+        printf("-%-17s  %s\n", buf, po->help);
     }
-    av_log(NULL, AV_LOG_STDERR, "\n");
+    printf("\n");
 }
 
 void show_help_children(const AVClass *class, int flags)
@@ -241,7 +209,7 @@ void show_help_children(const AVClass *class, int flags)
     const AVClass *child = NULL;
     if (class->option) {
         av_opt_show2(&class, NULL, flags, 0);
-        av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("\n");
     }
 
     while ((child = av_opt_child_class_next(class, child)))
@@ -433,14 +401,12 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
                 continue;
             }
             opt++;
-            if (optindex >= argc) {
-                if ((ret = parse_option(optctx, opt, NULL, options)) < 0)
-                    exit_program(1);
-            } else {
+
+            if (optindex < argc) {
                 if ((ret = parse_option(optctx, opt, argv[optindex], options)) < 0)
                     exit_program(1);
+                optindex += ret;
             }
-            optindex += ret;
         } else {
             if (parse_arg_function)
                 parse_arg_function(optctx, opt);
@@ -507,7 +473,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
     return 0;
 }
 
-void dump_argument(const char *a)
+static void dump_argument(const char *a)
 {
     const unsigned char *p;
 
@@ -846,7 +812,7 @@ do {                                                                           \
                 if (optindex < argc) {
                     arg = argv[optindex++];
                 } else {
-                    arg = NULL;
+                    arg = "";
                 }
             } else if (po->flags & HAS_ARG) {
                 GET_ARG(arg);
@@ -890,8 +856,8 @@ do {                                                                           \
     }
 
     if (octx->cur_group.nb_opts || codec_opts || format_opts || resample_opts)
-        av_log(NULL, AV_LOG_WARNING, "Trailing option(s) found in the "
-               "command: may be ignored.\n");
+        av_log(NULL, AV_LOG_WARNING, "Trailing options were found on the "
+               "commandline.\n");
 
     av_log(NULL, AV_LOG_DEBUG, "Finished splitting the commandline.\n");
 
@@ -1017,12 +983,11 @@ static void expand_filename_template(AVBPrint *bp, const char *template,
     }
 }
 
-int init_report(const char *env)
+static int init_report(const char *env)
 {
     char *filename_template = NULL;
     char *key, *val;
     int ret, count = 0;
-    int prog_loglevel, envlevel = 0;
     time_t now;
     struct tm *tm;
     AVBPrint filename;
@@ -1054,7 +1019,6 @@ int init_report(const char *env)
                 av_log(NULL, AV_LOG_FATAL, "Invalid report file level\n");
                 exit_program(1);
             }
-            envlevel = 1;
         } else {
             av_log(NULL, AV_LOG_ERROR, "Unknown key '%s' in FFREPORT\n", key);
         }
@@ -1062,7 +1026,7 @@ int init_report(const char *env)
         av_free(key);
     }
 
-    av_bprint_init(&filename, 0, AV_BPRINT_SIZE_AUTOMATIC);
+    av_bprint_init(&filename, 0, 1);
     expand_filename_template(&filename,
                              av_x_if_null(filename_template, "%p-%t.log"), tm);
     av_free(filename_template);
@@ -1071,10 +1035,6 @@ int init_report(const char *env)
         return AVERROR(ENOMEM);
     }
 
-    prog_loglevel = av_log_get_level();
-    if (!envlevel)
-        report_file_level = FFMAX(report_file_level, prog_loglevel);
-
     report_file = fopen(filename.str, "w");
     if (!report_file) {
         int ret = AVERROR(errno);
@@ -1082,20 +1042,19 @@ int init_report(const char *env)
                filename.str, strerror(errno));
         return ret;
     }
-    av_log_set_callback(log_callback_report);
+    av_log_set_callback(mobileffmpeg_log_callback_function);
     av_log(NULL, AV_LOG_INFO,
            "%s started on %04d-%02d-%02d at %02d:%02d:%02d\n"
-           "Report written to \"%s\"\n"
-           "Log level: %d\n",
+           "Report written to \"%s\"\n",
            program_name,
            tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
            tm->tm_hour, tm->tm_min, tm->tm_sec,
-           filename.str, report_file_level);
+           filename.str);
     av_bprint_finalize(&filename, NULL);
     return 0;
 }
 
-int opt_report(void *optctx, const char *opt, const char *arg)
+int opt_report(const char *opt)
 {
     return init_report(NULL);
 }
@@ -1137,7 +1096,7 @@ void print_error(const char *filename, int err)
     av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
 }
 
-__thread int warned_cfg = 0;
+static int warned_cfg = 0;
 
 #define INDENT        1
 #define SHOW_VERSION  2
@@ -1237,6 +1196,7 @@ void show_banner(int argc, char **argv, const OptionDef *options)
 
 int show_version(void *optctx, const char *opt, const char *arg)
 {
+    av_log_set_callback(mobileffmpeg_log_callback_function);
     print_program_info (SHOW_COPYRIGHT, AV_LOG_INFO);
     print_all_libs_info(SHOW_VERSION, AV_LOG_INFO);
 
@@ -1245,6 +1205,7 @@ int show_version(void *optctx, const char *opt, const char *arg)
 
 int show_buildconf(void *optctx, const char *opt, const char *arg)
 {
+    av_log_set_callback(mobileffmpeg_log_callback_function);
     print_buildconf      (INDENT|0, AV_LOG_INFO);
 
     return 0;
@@ -1253,12 +1214,12 @@ int show_buildconf(void *optctx, const char *opt, const char *arg)
 int show_license(void *optctx, const char *opt, const char *arg)
 {
 #if CONFIG_NONFREE
-    av_log(NULL, AV_LOG_STDERR,
+    printf(
     "This version of %s has nonfree parts compiled in.\n"
     "Therefore it is not legally redistributable.\n",
     program_name );
 #elif CONFIG_GPLV3
-    av_log(NULL, AV_LOG_STDERR,
+    printf(
     "%s is free software; you can redistribute it and/or modify\n"
     "it under the terms of the GNU General Public License as published by\n"
     "the Free Software Foundation; either version 3 of the License, or\n"
@@ -1273,7 +1234,7 @@ int show_license(void *optctx, const char *opt, const char *arg)
     "along with %s.  If not, see <http://www.gnu.org/licenses/>.\n",
     program_name, program_name, program_name );
 #elif CONFIG_GPL
-    av_log(NULL, AV_LOG_STDERR,
+    printf(
     "%s is free software; you can redistribute it and/or modify\n"
     "it under the terms of the GNU General Public License as published by\n"
     "the Free Software Foundation; either version 2 of the License, or\n"
@@ -1289,7 +1250,7 @@ int show_license(void *optctx, const char *opt, const char *arg)
     "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n",
     program_name, program_name, program_name );
 #elif CONFIG_LGPLV3
-    av_log(NULL, AV_LOG_STDERR,
+    printf(
     "%s is free software; you can redistribute it and/or modify\n"
     "it under the terms of the GNU Lesser General Public License as published by\n"
     "the Free Software Foundation; either version 3 of the License, or\n"
@@ -1304,7 +1265,7 @@ int show_license(void *optctx, const char *opt, const char *arg)
     "along with %s.  If not, see <http://www.gnu.org/licenses/>.\n",
     program_name, program_name, program_name );
 #else
-    av_log(NULL, AV_LOG_STDERR,
+    printf(
     "%s is free software; you can redistribute it and/or\n"
     "modify it under the terms of the GNU Lesser General Public\n"
     "License as published by the Free Software Foundation; either\n"
@@ -1340,7 +1301,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
     const char *last_name;
     int is_dev;
 
-    av_log(NULL, AV_LOG_STDERR, "%s\n"
+    printf("%s\n"
            " D. = Demuxing supported\n"
            " .E = Muxing supported\n"
            " --\n", device_only ? "Devices:" : "File formats:");
@@ -1385,7 +1346,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
             break;
         last_name = name;
 
-        av_log(NULL, AV_LOG_STDERR, " %s%s %-15s %s\n",
+        printf(" %s%s %-15s %s\n",
                decode ? "D" : " ",
                encode ? "E" : " ",
                name,
@@ -1418,97 +1379,76 @@ int show_devices(void *optctx, const char *opt, const char *arg)
     if (codec->field) {                                                      \
         const type *p = codec->field;                                        \
                                                                              \
-        av_log(NULL, AV_LOG_STDERR, "    Supported " list_name ":");                              \
+        printf("    Supported " list_name ":");                              \
         while (*p != term) {                                                 \
             get_name(*p);                                                    \
-            av_log(NULL, AV_LOG_STDERR, " %s", name);                                             \
+            printf(" %s", name);                                             \
             p++;                                                             \
         }                                                                    \
-        av_log(NULL, AV_LOG_STDERR, "\n");                                                        \
+        printf("\n");                                                        \
     }                                                                        \
 
 static void print_codec(const AVCodec *c)
 {
     int encoder = av_codec_is_encoder(c);
 
-    av_log(NULL, AV_LOG_STDERR, "%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name,
+    printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name,
            c->long_name ? c->long_name : "");
 
-    av_log(NULL, AV_LOG_STDERR, "    General capabilities: ");
+    printf("    General capabilities: ");
     if (c->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)
-        av_log(NULL, AV_LOG_STDERR, "horizband ");
+        printf("horizband ");
     if (c->capabilities & AV_CODEC_CAP_DR1)
-        av_log(NULL, AV_LOG_STDERR, "dr1 ");
+        printf("dr1 ");
     if (c->capabilities & AV_CODEC_CAP_TRUNCATED)
-        av_log(NULL, AV_LOG_STDERR, "trunc ");
+        printf("trunc ");
     if (c->capabilities & AV_CODEC_CAP_DELAY)
-        av_log(NULL, AV_LOG_STDERR, "delay ");
+        printf("delay ");
     if (c->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)
-        av_log(NULL, AV_LOG_STDERR, "small ");
+        printf("small ");
     if (c->capabilities & AV_CODEC_CAP_SUBFRAMES)
-        av_log(NULL, AV_LOG_STDERR, "subframes ");
+        printf("subframes ");
     if (c->capabilities & AV_CODEC_CAP_EXPERIMENTAL)
-        av_log(NULL, AV_LOG_STDERR, "exp ");
+        printf("exp ");
     if (c->capabilities & AV_CODEC_CAP_CHANNEL_CONF)
-        av_log(NULL, AV_LOG_STDERR, "chconf ");
+        printf("chconf ");
     if (c->capabilities & AV_CODEC_CAP_PARAM_CHANGE)
-        av_log(NULL, AV_LOG_STDERR, "paramchange ");
+        printf("paramchange ");
     if (c->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
-        av_log(NULL, AV_LOG_STDERR, "variable ");
+        printf("variable ");
     if (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
                            AV_CODEC_CAP_SLICE_THREADS |
                            AV_CODEC_CAP_AUTO_THREADS))
-        av_log(NULL, AV_LOG_STDERR, "threads ");
-    if (c->capabilities & AV_CODEC_CAP_AVOID_PROBING)
-        av_log(NULL, AV_LOG_STDERR, "avoidprobe ");
-    if (c->capabilities & AV_CODEC_CAP_INTRA_ONLY)
-        av_log(NULL, AV_LOG_STDERR, "intraonly ");
-    if (c->capabilities & AV_CODEC_CAP_LOSSLESS)
-        av_log(NULL, AV_LOG_STDERR, "lossless ");
-    if (c->capabilities & AV_CODEC_CAP_HARDWARE)
-        av_log(NULL, AV_LOG_STDERR, "hardware ");
-    if (c->capabilities & AV_CODEC_CAP_HYBRID)
-        av_log(NULL, AV_LOG_STDERR, "hybrid ");
+        printf("threads ");
     if (!c->capabilities)
-        av_log(NULL, AV_LOG_STDERR, "none");
-    av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("none");
+    printf("\n");
 
     if (c->type == AVMEDIA_TYPE_VIDEO ||
         c->type == AVMEDIA_TYPE_AUDIO) {
-        av_log(NULL, AV_LOG_STDERR, "    Threading capabilities: ");
+        printf("    Threading capabilities: ");
         switch (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
                                    AV_CODEC_CAP_SLICE_THREADS |
                                    AV_CODEC_CAP_AUTO_THREADS)) {
         case AV_CODEC_CAP_FRAME_THREADS |
-             AV_CODEC_CAP_SLICE_THREADS: av_log(NULL, AV_LOG_STDERR, "frame and slice"); break;
-        case AV_CODEC_CAP_FRAME_THREADS: av_log(NULL, AV_LOG_STDERR, "frame");           break;
-        case AV_CODEC_CAP_SLICE_THREADS: av_log(NULL, AV_LOG_STDERR, "slice");           break;
-        case AV_CODEC_CAP_AUTO_THREADS : av_log(NULL, AV_LOG_STDERR, "auto");            break;
-        default:                         av_log(NULL, AV_LOG_STDERR, "none");            break;
+             AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
+        case AV_CODEC_CAP_FRAME_THREADS: printf("frame");           break;
+        case AV_CODEC_CAP_SLICE_THREADS: printf("slice");           break;
+        case AV_CODEC_CAP_AUTO_THREADS : printf("auto");            break;
+        default:                         printf("none");            break;
         }
-        av_log(NULL, AV_LOG_STDERR, "\n");
-    }
-
-    if (avcodec_get_hw_config(c, 0)) {
-        av_log(NULL, AV_LOG_STDERR, "    Supported hardware devices: ");
-        for (int i = 0;; i++) {
-            const AVCodecHWConfig *config = avcodec_get_hw_config(c, i);
-            if (!config)
-                break;
-            av_log(NULL, AV_LOG_STDERR, "%s ", av_hwdevice_get_type_name(config->device_type));
-        }
-        av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("\n");
     }
 
     if (c->supported_framerates) {
         const AVRational *fps = c->supported_framerates;
 
-        av_log(NULL, AV_LOG_STDERR, "    Supported framerates:");
+        printf("    Supported framerates:");
         while (fps->num) {
-            av_log(NULL, AV_LOG_STDERR, " %d/%d", fps->num, fps->den);
+            printf(" %d/%d", fps->num, fps->den);
             fps++;
         }
-        av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("\n");
     }
     PRINT_CODEC_SUPPORTED(c, pix_fmts, enum AVPixelFormat, "pixel formats",
                           AV_PIX_FMT_NONE, GET_PIX_FMT_NAME);
@@ -1583,12 +1523,12 @@ static void print_codecs_for_id(enum AVCodecID id, int encoder)
 {
     const AVCodec *codec = NULL;
 
-    av_log(NULL, AV_LOG_STDERR, " (%s: ", encoder ? "encoders" : "decoders");
+    printf(" (%s: ", encoder ? "encoders" : "decoders");
 
     while ((codec = next_codec_for_id(id, codec, encoder)))
-        av_log(NULL, AV_LOG_STDERR, "%s ", codec->name);
+        printf("%s ", codec->name);
 
-    av_log(NULL, AV_LOG_STDERR, ")");
+    printf(")");
 }
 
 int show_codecs(void *optctx, const char *opt, const char *arg)
@@ -1596,7 +1536,7 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
     const AVCodecDescriptor **codecs;
     unsigned i, nb_codecs = get_codecs_sorted(&codecs);
 
-    av_log(NULL, AV_LOG_STDERR, "Codecs:\n"
+    printf("Codecs:\n"
            " D..... = Decoding supported\n"
            " .E.... = Encoding supported\n"
            " ..V... = Video codec\n"
@@ -1613,16 +1553,16 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
         if (strstr(desc->name, "_deprecated"))
             continue;
 
-        av_log(NULL, AV_LOG_STDERR, " ");
-        av_log(NULL, AV_LOG_STDERR, avcodec_find_decoder(desc->id) ? "D" : ".");
-        av_log(NULL, AV_LOG_STDERR, avcodec_find_encoder(desc->id) ? "E" : ".");
+        printf(" ");
+        printf(avcodec_find_decoder(desc->id) ? "D" : ".");
+        printf(avcodec_find_encoder(desc->id) ? "E" : ".");
 
-        av_log(NULL, AV_LOG_STDERR, "%c", get_media_type_char(desc->type));
-        av_log(NULL, AV_LOG_STDERR, (desc->props & AV_CODEC_PROP_INTRA_ONLY) ? "I" : ".");
-        av_log(NULL, AV_LOG_STDERR, (desc->props & AV_CODEC_PROP_LOSSY)      ? "L" : ".");
-        av_log(NULL, AV_LOG_STDERR, (desc->props & AV_CODEC_PROP_LOSSLESS)   ? "S" : ".");
+        printf("%c", get_media_type_char(desc->type));
+        printf((desc->props & AV_CODEC_PROP_INTRA_ONLY) ? "I" : ".");
+        printf((desc->props & AV_CODEC_PROP_LOSSY)      ? "L" : ".");
+        printf((desc->props & AV_CODEC_PROP_LOSSLESS)   ? "S" : ".");
 
-        av_log(NULL, AV_LOG_STDERR, " %-20s %s", desc->name, desc->long_name ? desc->long_name : "");
+        printf(" %-20s %s", desc->name, desc->long_name ? desc->long_name : "");
 
         /* print decoders/encoders when there's more than one or their
          * names are different from codec name */
@@ -1640,7 +1580,7 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
             }
         }
 
-        av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("\n");
     }
     av_free(codecs);
     return 0;
@@ -1651,7 +1591,7 @@ static void print_codecs(int encoder)
     const AVCodecDescriptor **codecs;
     unsigned i, nb_codecs = get_codecs_sorted(&codecs);
 
-    av_log(NULL, AV_LOG_STDERR, "%s:\n"
+    printf("%s:\n"
            " V..... = Video\n"
            " A..... = Audio\n"
            " S..... = Subtitle\n"
@@ -1667,18 +1607,18 @@ static void print_codecs(int encoder)
         const AVCodec *codec = NULL;
 
         while ((codec = next_codec_for_id(desc->id, codec, encoder))) {
-            av_log(NULL, AV_LOG_STDERR, " %c", get_media_type_char(desc->type));
-            av_log(NULL, AV_LOG_STDERR, (codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) ? "F" : ".");
-            av_log(NULL, AV_LOG_STDERR, (codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) ? "S" : ".");
-            av_log(NULL, AV_LOG_STDERR, (codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL)  ? "X" : ".");
-            av_log(NULL, AV_LOG_STDERR, (codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)?"B" : ".");
-            av_log(NULL, AV_LOG_STDERR, (codec->capabilities & AV_CODEC_CAP_DR1)           ? "D" : ".");
+            printf(" %c", get_media_type_char(desc->type));
+            printf((codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) ? "F" : ".");
+            printf((codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) ? "S" : ".");
+            printf((codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL)  ? "X" : ".");
+            printf((codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)?"B" : ".");
+            printf((codec->capabilities & AV_CODEC_CAP_DR1)           ? "D" : ".");
 
-            av_log(NULL, AV_LOG_STDERR, " %-20s %s", codec->name, codec->long_name ? codec->long_name : "");
+            printf(" %-20s %s", codec->name, codec->long_name ? codec->long_name : "");
             if (strcmp(codec->name, desc->name))
-                av_log(NULL, AV_LOG_STDERR, " (codec %s)", desc->name);
+                printf(" (codec %s)", desc->name);
 
-            av_log(NULL, AV_LOG_STDERR, "\n");
+            printf("\n");
         }
     }
     av_free(codecs);
@@ -1701,10 +1641,10 @@ int show_bsfs(void *optctx, const char *opt, const char *arg)
     const AVBitStreamFilter *bsf = NULL;
     void *opaque = NULL;
 
-    av_log(NULL, AV_LOG_STDERR, "Bitstream filters:\n");
+    printf("Bitstream filters:\n");
     while ((bsf = av_bsf_iterate(&opaque)))
-        av_log(NULL, AV_LOG_STDERR, "%s\n", bsf->name);
-    av_log(NULL, AV_LOG_STDERR, "\n");
+        printf("%s\n", bsf->name);
+    printf("\n");
     return 0;
 }
 
@@ -1713,13 +1653,13 @@ int show_protocols(void *optctx, const char *opt, const char *arg)
     void *opaque = NULL;
     const char *name;
 
-    av_log(NULL, AV_LOG_STDERR, "Supported file protocols:\n"
+    printf("Supported file protocols:\n"
            "Input:\n");
     while ((name = avio_enum_protocols(&opaque, 0)))
-        av_log(NULL, AV_LOG_STDERR, "  %s\n", name);
-    av_log(NULL, AV_LOG_STDERR, "Output:\n");
+        printf("  %s\n", name);
+    printf("Output:\n");
     while ((name = avio_enum_protocols(&opaque, 1)))
-        av_log(NULL, AV_LOG_STDERR, "  %s\n", name);
+        printf("  %s\n", name);
     return 0;
 }
 
@@ -1732,7 +1672,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
     int i, j;
     const AVFilterPad *pad;
 
-    av_log(NULL, AV_LOG_STDERR, "Filters:\n"
+    printf("Filters:\n"
            "  T.. = Timeline support\n"
            "  .S. = Slice threading\n"
            "  ..C = Command support\n"
@@ -1758,14 +1698,14 @@ int show_filters(void *optctx, const char *opt, const char *arg)
                                   ( i && (filter->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS))) ? 'N' : '|';
         }
         *descr_cur = 0;
-        av_log(NULL, AV_LOG_STDERR, " %c%c%c %-17s %-10s %s\n",
+        printf(" %c%c%c %-17s %-10s %s\n",
                filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE ? 'T' : '.',
                filter->flags & AVFILTER_FLAG_SLICE_THREADS    ? 'S' : '.',
                filter->process_command                        ? 'C' : '.',
                filter->name, descr, filter->description);
     }
 #else
-    av_log(NULL, AV_LOG_STDERR, "No filters available: libavfilter disabled\n");
+    printf("No filters available: libavfilter disabled\n");
 #endif
     return 0;
 }
@@ -1776,10 +1716,10 @@ int show_colors(void *optctx, const char *opt, const char *arg)
     const uint8_t *rgb;
     int i;
 
-    av_log(NULL, AV_LOG_STDERR, "%-32s #RRGGBB\n", "name");
+    printf("%-32s #RRGGBB\n", "name");
 
     for (i = 0; (name = av_get_known_color_name(i, &rgb)); i++)
-        av_log(NULL, AV_LOG_STDERR, "%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
+        printf("%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
 
     return 0;
 }
@@ -1788,7 +1728,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg)
 {
     const AVPixFmtDescriptor *pix_desc = NULL;
 
-    av_log(NULL, AV_LOG_STDERR, "Pixel formats:\n"
+    printf("Pixel formats:\n"
            "I.... = Supported Input  format for conversion\n"
            ".O... = Supported Output format for conversion\n"
            "..H.. = Hardware accelerated format\n"
@@ -1804,7 +1744,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg)
 
     while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
         enum AVPixelFormat av_unused pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
-        av_log(NULL, AV_LOG_STDERR, "%c%c%c%c%c %-16s       %d            %2d\n",
+        printf("%c%c%c%c%c %-16s       %d            %2d\n",
                sws_isSupportedInput (pix_fmt)              ? 'I' : '.',
                sws_isSupportedOutput(pix_fmt)              ? 'O' : '.',
                pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL   ? 'H' : '.',
@@ -1823,24 +1763,24 @@ int show_layouts(void *optctx, const char *opt, const char *arg)
     uint64_t layout, j;
     const char *name, *descr;
 
-    av_log(NULL, AV_LOG_STDERR, "Individual channels:\n"
+    printf("Individual channels:\n"
            "NAME           DESCRIPTION\n");
     for (i = 0; i < 63; i++) {
         name = av_get_channel_name((uint64_t)1 << i);
         if (!name)
             continue;
         descr = av_get_channel_description((uint64_t)1 << i);
-        av_log(NULL, AV_LOG_STDERR, "%-14s %s\n", name, descr);
+        printf("%-14s %s\n", name, descr);
     }
-    av_log(NULL, AV_LOG_STDERR, "\nStandard channel layouts:\n"
+    printf("\nStandard channel layouts:\n"
            "NAME           DECOMPOSITION\n");
     for (i = 0; !av_get_standard_channel_layout(i, &layout, &name); i++) {
         if (name) {
-            av_log(NULL, AV_LOG_STDERR, "%-14s ", name);
+            printf("%-14s ", name);
             for (j = 1; j; j <<= 1)
                 if ((layout & j))
-                    av_log(NULL, AV_LOG_STDERR, "%s%s", (layout & (j - 1)) ? "+" : "", av_get_channel_name(j));
-            av_log(NULL, AV_LOG_STDERR, "\n");
+                    printf("%s%s", (layout & (j - 1)) ? "+" : "", av_get_channel_name(j));
+            printf("\n");
         }
     }
     return 0;
@@ -1851,7 +1791,7 @@ int show_sample_fmts(void *optctx, const char *opt, const char *arg)
     int i;
     char fmt_str[128];
     for (i = -1; i < AV_SAMPLE_FMT_NB; i++)
-        av_log(NULL, AV_LOG_STDERR, "%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
+        printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
     return 0;
 }
 
@@ -1899,10 +1839,10 @@ static void show_help_demuxer(const char *name)
         return;
     }
 
-    av_log(NULL, AV_LOG_STDERR, "Demuxer %s [%s]:\n", fmt->name, fmt->long_name);
+    printf("Demuxer %s [%s]:\n", fmt->name, fmt->long_name);
 
     if (fmt->extensions)
-        av_log(NULL, AV_LOG_STDERR, "    Common extensions: %s.\n", fmt->extensions);
+        printf("    Common extensions: %s.\n", fmt->extensions);
 
     if (fmt->priv_class)
         show_help_children(fmt->priv_class, AV_OPT_FLAG_DECODING_PARAM);
@@ -1918,23 +1858,23 @@ static void show_help_muxer(const char *name)
         return;
     }
 
-    av_log(NULL, AV_LOG_STDERR, "Muxer %s [%s]:\n", fmt->name, fmt->long_name);
+    printf("Muxer %s [%s]:\n", fmt->name, fmt->long_name);
 
     if (fmt->extensions)
-        av_log(NULL, AV_LOG_STDERR, "    Common extensions: %s.\n", fmt->extensions);
+        printf("    Common extensions: %s.\n", fmt->extensions);
     if (fmt->mime_type)
-        av_log(NULL, AV_LOG_STDERR, "    Mime type: %s.\n", fmt->mime_type);
+        printf("    Mime type: %s.\n", fmt->mime_type);
     if (fmt->video_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->video_codec))) {
-        av_log(NULL, AV_LOG_STDERR, "    Default video codec: %s.\n", desc->name);
+        printf("    Default video codec: %s.\n", desc->name);
     }
     if (fmt->audio_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->audio_codec))) {
-        av_log(NULL, AV_LOG_STDERR, "    Default audio codec: %s.\n", desc->name);
+        printf("    Default audio codec: %s.\n", desc->name);
     }
     if (fmt->subtitle_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->subtitle_codec))) {
-        av_log(NULL, AV_LOG_STDERR, "    Default subtitle codec: %s.\n", desc->name);
+        printf("    Default subtitle codec: %s.\n", desc->name);
     }
 
     if (fmt->priv_class)
@@ -1956,40 +1896,40 @@ static void show_help_filter(const char *name)
         return;
     }
 
-    av_log(NULL, AV_LOG_STDERR, "Filter %s\n", f->name);
+    printf("Filter %s\n", f->name);
     if (f->description)
-        av_log(NULL, AV_LOG_STDERR, "  %s\n", f->description);
+        printf("  %s\n", f->description);
 
     if (f->flags & AVFILTER_FLAG_SLICE_THREADS)
-        av_log(NULL, AV_LOG_STDERR, "    slice threading supported\n");
+        printf("    slice threading supported\n");
 
-    av_log(NULL, AV_LOG_STDERR, "    Inputs:\n");
+    printf("    Inputs:\n");
     count = avfilter_pad_count(f->inputs);
     for (i = 0; i < count; i++) {
-        av_log(NULL, AV_LOG_STDERR, "       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
+        printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
                media_type_string(avfilter_pad_get_type(f->inputs, i)));
     }
     if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)
-        av_log(NULL, AV_LOG_STDERR, "        dynamic (depending on the options)\n");
+        printf("        dynamic (depending on the options)\n");
     else if (!count)
-        av_log(NULL, AV_LOG_STDERR, "        none (source filter)\n");
+        printf("        none (source filter)\n");
 
-    av_log(NULL, AV_LOG_STDERR, "    Outputs:\n");
+    printf("    Outputs:\n");
     count = avfilter_pad_count(f->outputs);
     for (i = 0; i < count; i++) {
-        av_log(NULL, AV_LOG_STDERR, "       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
+        printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
                media_type_string(avfilter_pad_get_type(f->outputs, i)));
     }
     if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS)
-        av_log(NULL, AV_LOG_STDERR, "        dynamic (depending on the options)\n");
+        printf("        dynamic (depending on the options)\n");
     else if (!count)
-        av_log(NULL, AV_LOG_STDERR, "        none (sink filter)\n");
+        printf("        none (sink filter)\n");
 
     if (f->priv_class)
         show_help_children(f->priv_class, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM |
                                           AV_OPT_FLAG_AUDIO_PARAM);
     if (f->flags & AVFILTER_FLAG_SUPPORT_TIMELINE)
-        av_log(NULL, AV_LOG_STDERR, "This filter has support for timeline through the 'enable' option.\n");
+        printf("This filter has support for timeline through the 'enable' option.\n");
 #else
     av_log(NULL, AV_LOG_ERROR, "Build without libavfilter; "
            "can not to satisfy request\n");
@@ -2001,15 +1941,12 @@ static void show_help_bsf(const char *name)
 {
     const AVBitStreamFilter *bsf = av_bsf_get_by_name(name);
 
-    if (!name) {
-        av_log(NULL, AV_LOG_ERROR, "No bitstream filter name specified.\n");
-        return;
-    } else if (!bsf) {
+    if (!bsf) {
         av_log(NULL, AV_LOG_ERROR, "Unknown bit stream filter '%s'.\n", name);
         return;
     }
 
-    av_log(NULL, AV_LOG_STDERR, "Bit stream filter %s\n", bsf->name);
+    printf("Bit stream filter %s\n", bsf->name);
     PRINT_CODEC_SUPPORTED(bsf, codec_ids, enum AVCodecID, "codecs",
                           AV_CODEC_ID_NONE, GET_CODEC_NAME);
     if (bsf->priv_class)
@@ -2019,6 +1956,7 @@ static void show_help_bsf(const char *name)
 int show_help(void *optctx, const char *opt, const char *arg)
 {
     char *topic, *par;
+    av_log_set_callback(mobileffmpeg_log_callback_function);
 
     topic = av_strdup(arg ? arg : "");
     if (!topic)
@@ -2028,11 +1966,7 @@ int show_help(void *optctx, const char *opt, const char *arg)
         *par++ = 0;
 
     if (!*topic) {
-        if (program_name && !strcmp(program_name, "ffmpeg")) {
-            show_help_default_ffmpeg(topic, par);
-        } else {
-            show_help_default_ffprobe(topic, par);
-        }
+        show_help_default(topic, par);
     } else if (!strcmp(topic, "decoder")) {
         show_help_codec(par, 0);
     } else if (!strcmp(topic, "encoder")) {
@@ -2048,11 +1982,7 @@ int show_help(void *optctx, const char *opt, const char *arg)
     } else if (!strcmp(topic, "bsf")) {
         show_help_bsf(par);
     } else {
-        if (program_name && !strcmp(program_name, "ffmpeg")) {
-            show_help_default_ffmpeg(topic, par);
-        } else {
-            show_help_default_ffprobe(topic, par);
-        }
+        show_help_default(topic, par);
     }
 
     av_freep(&topic);
@@ -2084,7 +2014,7 @@ FILE *get_preset_file(char *filename, size_t filename_size,
         av_strlcpy(filename, preset_name, filename_size);
         f = fopen(filename, "r");
     } else {
-#if HAVE_GETMODULEHANDLE
+#ifdef _WIN32
         char datadir[MAX_PATH], *ls;
         base[2] = NULL;
 
@@ -2252,20 +2182,20 @@ static int print_device_sources(AVInputFormat *fmt, AVDictionary *opts)
     if (!fmt || !fmt->priv_class  || !AV_IS_INPUT_DEVICE(fmt->priv_class->category))
         return AVERROR(EINVAL);
 
-    av_log(NULL, AV_LOG_STDERR, "Auto-detected sources for %s:\n", fmt->name);
+    printf("Auto-detected sources for %s:\n", fmt->name);
     if (!fmt->get_device_list) {
         ret = AVERROR(ENOSYS);
-        av_log(NULL, AV_LOG_STDERR, "Cannot list sources. Not implemented.\n");
+        printf("Cannot list sources. Not implemented.\n");
         goto fail;
     }
 
     if ((ret = avdevice_list_input_sources(fmt, NULL, opts, &device_list)) < 0) {
-        av_log(NULL, AV_LOG_STDERR, "Cannot list sources.\n");
+        printf("Cannot list sources.\n");
         goto fail;
     }
 
     for (i = 0; i < device_list->nb_devices; i++) {
-        av_log(NULL, AV_LOG_STDERR, "%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
+        printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
                device_list->devices[i]->device_name, device_list->devices[i]->device_description);
     }
 
@@ -2282,20 +2212,20 @@ static int print_device_sinks(AVOutputFormat *fmt, AVDictionary *opts)
     if (!fmt || !fmt->priv_class  || !AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
         return AVERROR(EINVAL);
 
-    av_log(NULL, AV_LOG_STDERR, "Auto-detected sinks for %s:\n", fmt->name);
+    printf("Auto-detected sinks for %s:\n", fmt->name);
     if (!fmt->get_device_list) {
         ret = AVERROR(ENOSYS);
-        av_log(NULL, AV_LOG_STDERR, "Cannot list sinks. Not implemented.\n");
+        printf("Cannot list sinks. Not implemented.\n");
         goto fail;
     }
 
     if ((ret = avdevice_list_output_sinks(fmt, NULL, opts, &device_list)) < 0) {
-        av_log(NULL, AV_LOG_STDERR, "Cannot list sinks.\n");
+        printf("Cannot list sinks.\n");
         goto fail;
     }
 
     for (i = 0; i < device_list->nb_devices; i++) {
-        av_log(NULL, AV_LOG_STDERR, "%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
+        printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
                device_list->devices[i]->device_name, device_list->devices[i]->device_description);
     }
 
@@ -2321,7 +2251,7 @@ static int show_sinks_sources_parse_arg(const char *arg, char **dev, AVDictionar
             }
         }
     } else
-        av_log(NULL, AV_LOG_STDERR, "\nDevice name is not provided.\n"
+        printf("\nDevice name is not provided.\n"
                 "You can pass devicename[,opt1=val1[,opt2=val2...]] as an argument.\n\n");
     return 0;
 }

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

@@ -20,17 +20,6 @@
  */
 
 /*
- * CHANGES 01.2020
- * - ffprobe support changes
- * - AV_LOG_STDERR introduced
- *
- * CHANGES 12.2019
- * - Concurrent execution support
- *
- * CHANGES 03.2019
- * --------------------------------------------------------
- * - config.h include removed
- *
  * CHANGES 08.2018
  * --------------------------------------------------------
  * - fftools_ prefix added to file name and include guards
@@ -46,39 +35,32 @@
 
 #include <stdint.h>
 
+#include "config.h"
 #include "libavcodec/avcodec.h"
 #include "libavfilter/avfilter.h"
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
-#include "saf_wrapper.h"
-
 #ifdef _WIN32
 #undef main /* We don't want SDL to override our main() */
 #endif
 
-/**
- * Defines logs printed to stderr by ffmpeg. They are not filtered and always redirected.
- */
-#define AV_LOG_STDERR    -16
-
 /**
  * program name, defined by the program for show_version().
  */
-extern __thread char *program_name;
+extern const char program_name[];
 
 /**
  * program birth year, defined by the program for show_banner()
  */
-extern __thread int program_birth_year;
+extern const int program_birth_year;
 
-extern __thread AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
-extern __thread AVFormatContext *avformat_opts;
-extern __thread AVDictionary *sws_dict;
-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 AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
+extern AVFormatContext *avformat_opts;
+extern AVDictionary *sws_dict;
+extern AVDictionary *swr_opts;
+extern AVDictionary *format_opts, *codec_opts, *resample_opts;
+extern int hide_banner;
 
 /**
  * Register a program-specific cleanup routine.
@@ -128,7 +110,7 @@ int opt_default(void *optctx, const char *opt, const char *arg);
  */
 int opt_loglevel(void *optctx, const char *opt, const char *arg);
 
-int opt_report(void *optctx, const char *opt, const char *arg);
+int opt_report(const char *opt);
 
 int opt_max_alloc(void *optctx, const char *opt, const char *arg);
 
@@ -230,6 +212,47 @@ typedef struct OptionDef {
 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
                        int rej_flags, int alt_flags);
 
+#if CONFIG_AVDEVICE
+#define CMDUTILS_COMMON_OPTIONS_AVDEVICE                                                                                \
+    { "sources"    , OPT_EXIT | HAS_ARG, { .func_arg = show_sources },                                                  \
+      "list sources of the input device", "device" },                                                                   \
+    { "sinks"      , OPT_EXIT | HAS_ARG, { .func_arg = show_sinks },                                                    \
+      "list sinks of the output device", "device" },                                                                    \
+
+#else
+#define CMDUTILS_COMMON_OPTIONS_AVDEVICE
+#endif
+
+#define CMDUTILS_COMMON_OPTIONS                                                                                         \
+    { "L",           OPT_EXIT,             { .func_arg = show_license },     "show license" },                          \
+    { "h",           OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "?",           OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "help",        OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "-help",       OPT_EXIT,             { .func_arg = show_help },        "show help", "topic" },                    \
+    { "version",     OPT_EXIT,             { .func_arg = show_version },     "show version" },                          \
+    { "buildconf",   OPT_EXIT,             { .func_arg = show_buildconf },   "show build configuration" },              \
+    { "formats",     OPT_EXIT,             { .func_arg = show_formats },     "show available formats" },                \
+    { "muxers",      OPT_EXIT,             { .func_arg = show_muxers },      "show available muxers" },                 \
+    { "demuxers",    OPT_EXIT,             { .func_arg = show_demuxers },    "show available demuxers" },               \
+    { "devices",     OPT_EXIT,             { .func_arg = show_devices },     "show available devices" },                \
+    { "codecs",      OPT_EXIT,             { .func_arg = show_codecs },      "show available codecs" },                 \
+    { "decoders",    OPT_EXIT,             { .func_arg = show_decoders },    "show available decoders" },               \
+    { "encoders",    OPT_EXIT,             { .func_arg = show_encoders },    "show available encoders" },               \
+    { "bsfs",        OPT_EXIT,             { .func_arg = show_bsfs },        "show available bit stream filters" },     \
+    { "protocols",   OPT_EXIT,             { .func_arg = show_protocols },   "show available protocols" },              \
+    { "filters",     OPT_EXIT,             { .func_arg = show_filters },     "show available filters" },                \
+    { "pix_fmts",    OPT_EXIT,             { .func_arg = show_pix_fmts },    "show available pixel formats" },          \
+    { "layouts",     OPT_EXIT,             { .func_arg = show_layouts },     "show standard channel layouts" },         \
+    { "sample_fmts", OPT_EXIT,             { .func_arg = show_sample_fmts }, "show available audio sample formats" },   \
+    { "colors",      OPT_EXIT,             { .func_arg = show_colors },      "show available color names" },            \
+    { "loglevel",    HAS_ARG,              { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
+    { "v",           HAS_ARG,              { .func_arg = opt_loglevel },     "set logging level", "loglevel" },         \
+    { "report",      0,                    { (void*)opt_report },            "generate a report" },                     \
+    { "max_alloc",   HAS_ARG,              { .func_arg = opt_max_alloc },    "set maximum size of a single allocated block", "bytes" }, \
+    { "cpuflags",    HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags },     "force specific cpu flags", "flags" },     \
+    { "hide_banner", OPT_BOOL | OPT_EXPERT, {&hide_banner},     "do not show program banner", "hide_banner" },          \
+    CMDUTILS_COMMON_OPTIONS_AVDEVICE                                                                                    \
+
 /**
  * Show help for all options with given flags in class and all its
  * children.
@@ -237,11 +260,10 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
 void show_help_children(const AVClass *class, int flags);
 
 /**
- * Per-fftool specific help handlers. Implemented in each
+ * Per-fftool specific help handler. Implemented in each
  * fftool, called by show_help().
  */
-void show_help_default_ffmpeg(const char *opt, const char *arg);
-void show_help_default_ffprobe(const char *opt, const char *arg);
+void show_help_default(const char *opt, const char *arg);
 
 /**
  * Generic -h handler common to all fftools.
@@ -336,7 +358,6 @@ typedef struct OptionParseContext {
  * Parse an options group and write results into optctx.
  *
  * @param optctx an app-specific options context. NULL for global options group
- * @param g option group
  */
 int parse_optgroup(void *optctx, OptionGroup *g);
 

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

@@ -17,19 +17,6 @@
  */
 
 /*
- * CHANGES 06.2020
- * - cancel_operation() method signature updated with id
- *
- * CHANGES 01.2020
- * - ffprobe support changes
- *
- * CHANGES 12.2019
- * - Concurrent execution support
- *
- * CHANGES 03.2019
- * --------------------------------------------------------
- * - config.h include removed
- *
  * CHANGES 08.2018
  * --------------------------------------------------------
  * - fftools_ prefix added to file name and include guards
@@ -44,6 +31,8 @@
 #ifndef FFTOOLS_FFMPEG_H
 #define FFTOOLS_FFMPEG_H
 
+#include "config.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <signal.h>
@@ -95,7 +84,7 @@ typedef struct HWAccel {
 } HWAccel;
 
 typedef struct HWDevice {
-    const char *name;
+    char *name;
     enum AVHWDeviceType type;
     AVBufferRef *device_ref;
 } HWDevice;
@@ -507,7 +496,6 @@ typedef struct OutputStream {
     AVRational frame_aspect_ratio;
 
     /* forced key frames */
-    int64_t forced_kf_ref_pts;
     int64_t *forced_kf_pts;
     int forced_kf_count;
     int forced_kf_index;
@@ -587,61 +575,63 @@ typedef struct OutputFile {
     int header_written;
 } OutputFile;
 
-extern __thread InputStream **input_streams;
-extern __thread int        nb_input_streams;
-extern __thread InputFile   **input_files;
-extern __thread int        nb_input_files;
+extern InputStream **input_streams;
+extern int        nb_input_streams;
+extern InputFile   **input_files;
+extern int        nb_input_files;
 
-extern __thread OutputStream **output_streams;
-extern __thread int         nb_output_streams;
-extern __thread OutputFile   **output_files;
-extern __thread int         nb_output_files;
+extern OutputStream **output_streams;
+extern int         nb_output_streams;
+extern OutputFile   **output_files;
+extern int         nb_output_files;
 
-extern __thread FilterGraph **filtergraphs;
-extern __thread int        nb_filtergraphs;
+extern FilterGraph **filtergraphs;
+extern int        nb_filtergraphs;
 
-extern __thread char *vstats_filename;
-extern __thread char *sdp_filename;
+extern char *vstats_filename;
+extern char *sdp_filename;
 
-extern __thread float audio_drift_threshold;
-extern __thread float dts_delta_threshold;
-extern __thread float dts_error_threshold;
+extern float audio_drift_threshold;
+extern float dts_delta_threshold;
+extern float dts_error_threshold;
 
-extern __thread int audio_volume;
-extern __thread int audio_sync_method;
-extern __thread int video_sync_method;
-extern __thread float frame_drop_threshold;
-extern __thread int do_benchmark;
-extern __thread int do_benchmark_all;
-extern __thread int do_deinterlace;
-extern __thread int do_hex_dump;
-extern __thread int do_pkt_dump;
-extern __thread int copy_ts;
-extern __thread int start_at_zero;
-extern __thread int copy_tb;
-extern __thread int debug_ts;
-extern __thread int exit_on_error;
-extern __thread int abort_on_flags;
-extern __thread int print_stats;
-extern __thread int qp_hist;
-extern __thread int stdin_interaction;
-extern __thread int frame_bits_per_raw_sample;
-extern __thread AVIOContext *progress_avio;
-extern __thread float max_error_rate;
-extern __thread char *videotoolbox_pixfmt;
+extern int audio_volume;
+extern int audio_sync_method;
+extern int video_sync_method;
+extern float frame_drop_threshold;
+extern int do_benchmark;
+extern int do_benchmark_all;
+extern int do_deinterlace;
+extern int do_hex_dump;
+extern int do_pkt_dump;
+extern int copy_ts;
+extern int start_at_zero;
+extern int copy_tb;
+extern int debug_ts;
+extern int exit_on_error;
+extern int abort_on_flags;
+extern int print_stats;
+extern int qp_hist;
+extern int stdin_interaction;
+extern int frame_bits_per_raw_sample;
+extern AVIOContext *progress_avio;
+extern float max_error_rate;
+extern char *videotoolbox_pixfmt;
 
-extern __thread int filter_nbthreads;
-extern __thread int filter_complex_nbthreads;
-extern __thread int vstats_version;
+extern int filter_nbthreads;
+extern int filter_complex_nbthreads;
+extern int vstats_version;
 
-extern __thread const AVIOInterruptCB int_cb;
+extern const AVIOInterruptCB int_cb;
 
+extern const OptionDef options[];
 extern const HWAccel hwaccels[];
-extern __thread AVBufferRef *hw_device_ctx;
+extern AVBufferRef *hw_device_ctx;
 #if CONFIG_QSV
-extern __thread char *qsv_device;
+extern char *qsv_device;
 #endif
-extern __thread HWDevice *filter_hw_device;
+extern HWDevice *filter_hw_device;
+
 
 void term_init(void);
 void term_exit(void);
@@ -688,77 +678,6 @@ int hwaccel_decode_init(AVCodecContext *avctx);
 
 void set_report_callback(void (*callback)(int, float, float, int64_t, int, double, double));
 
-void cancel_operation(long id);
-
-int opt_map(void *optctx, const char *opt, const char *arg);
-int opt_map_channel(void *optctx, const char *opt, const char *arg);
-int opt_recording_timestamp(void *optctx, const char *opt, const char *arg);
-int opt_data_frames(void *optctx, const char *opt, const char *arg);
-int opt_progress(void *optctx, const char *opt, const char *arg);
-int opt_target(void *optctx, const char *opt, const char *arg);
-int opt_vsync(void *optctx, const char *opt, const char *arg);
-int opt_abort_on(void *optctx, const char *opt, const char *arg);
-int opt_qscale(void *optctx, const char *opt, const char *arg);
-int opt_profile(void *optctx, const char *opt, const char *arg);
-int opt_filter_complex(void *optctx, const char *opt, const char *arg);
-int opt_filter_complex_script(void *optctx, const char *opt, const char *arg);
-int opt_attach(void *optctx, const char *opt, const char *arg);
-int opt_video_frames(void *optctx, const char *opt, const char *arg);
-int opt_video_codec(void *optctx, const char *opt, const char *arg);
-int opt_sameq(void *optctx, const char *opt, const char *arg);
-int opt_timecode(void *optctx, const char *opt, const char *arg);
-
-int opt_vstats_file(void *optctx, const char *opt, const char *arg);
-int opt_vstats(void *optctx, const char *opt, const char *arg);
-int opt_video_frames(void *optctx, const char *opt, const char *arg);
-int opt_old2new(void *optctx, const char *opt, const char *arg);
-int opt_streamid(void *optctx, const char *opt, const char *arg);
-int opt_bitrate(void *optctx, const char *opt, const char *arg);
-int show_hwaccels(void *optctx, const char *opt, const char *arg);
-int opt_video_filters(void *optctx, const char *opt, const char *arg);
-int opt_audio_frames(void *optctx, const char *opt, const char *arg);
-int opt_audio_qscale(void *optctx, const char *opt, const char *arg);
-int opt_audio_codec(void *optctx, const char *opt, const char *arg);
-int opt_channel_layout(void *optctx, const char *opt, const char *arg);
-int opt_preset(void *optctx, const char *opt, const char *arg);
-int opt_audio_filters(void *optctx, const char *opt, const char *arg);
-int opt_subtitle_codec(void *optctx, const char *opt, const char *arg);
-int opt_video_channel(void *optctx, const char *opt, const char *arg);
-int opt_video_standard(void *optctx, const char *opt, const char *arg);
-int opt_sdp_file(void *optctx, const char *opt, const char *arg);
-int opt_data_codec(void *optctx, const char *opt, const char *arg);
-int opt_init_hw_device(void *optctx, const char *opt, const char *arg);
-int opt_filter_hw_device(void *optctx, const char *opt, const char *arg);
-void add_input_streams(OptionsContext *o, AVFormatContext *ic);
-void assert_file_overwrite(const char *filename);
-void dump_attachment(AVStream *st, const char *filename);
-uint8_t *get_line(AVIOContext *s);
-void uninit_options(OptionsContext *o);
-void init_options(OptionsContext *o);
-AVDictionary *strip_specifiers(AVDictionary *dict);
-void parse_meta_type(char *arg, char *type, int *index, const char **stream_spec);
-int fftools_copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o);
-AVCodec *find_codec_or_die(const char *name, enum AVMediaType type, int encoder);
-AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream *st);
-int open_input_file(OptionsContext *o, const char *filename);
-int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s);
-int choose_encoder(OptionsContext *o, AVFormatContext *s, OutputStream *ost);
-OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type, int source_index);
-void parse_matrix_coeffs(uint16_t *dest, const char *str);
-uint8_t *fftools_read_file(const char *filename);
-char *get_ost_filters(OptionsContext *o, AVFormatContext *oc, OutputStream *ost);
-void check_streamcopy_filters(OptionsContext *o, AVFormatContext *oc, const OutputStream *ost, enum AVMediaType type);
-OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-OutputStream *new_unknown_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, int source_index);
-int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata);
-void init_output_filter(OutputFilter *ofilter, OptionsContext *o, AVFormatContext *oc);
-int init_complex_filters(void);
-int open_output_file(OptionsContext *o, const char *filename);
-int opt_default_new(OptionsContext *o, const char *opt, const char *arg);
-int open_files(OptionGroupList *l, const char *inout, int (*open_file)(OptionsContext*, const char*));
+void cancel_operation();
 
 #endif /* FFTOOLS_FFMPEG_H */

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

@@ -73,7 +73,6 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCod
     if (codec && codec->pix_fmts) {
         const enum AVPixelFormat *p = codec->pix_fmts;
         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(target);
-        //FIXME: This should check for AV_PIX_FMT_FLAG_ALPHA after PAL8 pixel format without alpha is implemented
         int has_alpha = desc ? desc->nb_components % 2 == 0 : 0;
         enum AVPixelFormat best= AV_PIX_FMT_NONE;
 
@@ -301,17 +300,10 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
             exit_program(1);
         }
         ist = input_streams[input_files[file_idx]->ist_index + st->index];
-        if (ist->user_set_discard == AVDISCARD_ALL) {
-            av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s "
-                   "matches a disabled input stream.\n", p, fg->graph_desc);
-            exit_program(1);
-        }
     } else {
         /* find the first unused stream of corresponding type */
         for (i = 0; i < nb_input_streams; i++) {
             ist = input_streams[i];
-            if (ist->user_set_discard == AVDISCARD_ALL)
-                continue;
             if (ist->dec_ctx->codec_type == type && ist->discard)
                 break;
         }
@@ -747,7 +739,6 @@ static int sub2video_prepare(InputStream *ist, InputFilter *ifilter)
     if (!ist->sub2video.frame)
         return AVERROR(ENOMEM);
     ist->sub2video.last_pts = INT64_MIN;
-    ist->sub2video.end_pts  = INT64_MIN;
     return 0;
 }
 
@@ -791,7 +782,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
     sar = ifilter->sample_aspect_ratio;
     if(!sar.den)
         sar = (AVRational){0,1};
-    av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC);
+    av_bprint_init(&args, 0, 1);
     av_bprintf(&args,
              "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
              "pixel_aspect=%d/%d:sws_param=flags=%d",

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

@@ -17,9 +17,6 @@
  */
 
 /*
- * CHANGES 12.2019
- * - Concurrent execution support
- *
  * CHANGES 08.2018
  * --------------------------------------------------------
  * - fftools_ prefix added to file name and parent header
@@ -31,8 +28,8 @@
 
 #include "fftools_ffmpeg.h"
 
-__thread int nb_hw_devices;
-__thread HWDevice **hw_devices;
+static int nb_hw_devices;
+static HWDevice **hw_devices;
 
 static HWDevice *hw_device_get_by_type(enum AVHWDeviceType type)
 {
@@ -108,7 +105,7 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
     // -> av_hwdevice_ctx_create_derived()
 
     AVDictionary *options = NULL;
-    const char *type_name = NULL, *name = NULL, *device = NULL;
+    char *type_name = NULL, *name = NULL, *device = NULL;
     enum AVHWDeviceType type;
     HWDevice *dev, *src;
     AVBufferRef *device_ref = NULL;
@@ -164,13 +161,11 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
         ++p;
         q = strchr(p, ',');
         if (q) {
-            if (q - p > 0) {
             device = av_strndup(p, q - p);
             if (!device) {
                 err = AVERROR(ENOMEM);
                 goto fail;
             }
-            }
             err = av_dict_parse_string(&options, q + 1, "=", ",", 0);
             if (err < 0) {
                 errmsg = "failed to parse options";
@@ -179,8 +174,7 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out)
         }
 
         err = av_hwdevice_ctx_create(&device_ref, type,
-                                     q ? device : p[0] ? p : NULL,
-                                     options, 0);
+                                     device ? device : p, options, 0);
         if (err < 0)
             goto fail;
 

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

@@ -17,24 +17,28 @@
  * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+/*
+ * CHANGES 09.2018
+ * --------------------------------------------------------
+ * - Merged with mobileffmpeg_config
+ *
+ * CHANGES 08.2018
+ * --------------------------------------------------------
+ * - Copied methods with avutil_log_ prefix from libavutil/log.c
+ */
+
+#include <pthread.h>
 
-#include "config.h"
-#include "libavcodec/jni.h"
 #include "libavutil/bprint.h"
-#include "fftools_ffmpeg.h"
 #include "mobileffmpeg.h"
-#include "mobileffprobe.h"
+#include "fftools_ffmpeg.h"
 
 /** Callback data structure */
 struct CallbackData {
   int type;                 // 1 (log callback) or 2 (statistics callback)
-  long executionId;         // execution id
 
   int logLevel;             // log level
-  AVBPrint logData;         // log data
+  char *logData;            // log data
 
   int statisticsFrameNumber;        // statistics frame number
   float statisticsFps;              // statistics fps
@@ -47,19 +51,10 @@ struct CallbackData {
   struct CallbackData *next;
 };
 
-/** Execution map variables */
-const int EXECUTION_MAP_SIZE = 1000;
-static volatile int executionMap[EXECUTION_MAP_SIZE];
-static pthread_mutex_t executionMapMutex;
-
 /** Redirection control variables */
-static pthread_mutex_t lockMutex;
-static pthread_mutex_t monitorMutex;
-static pthread_cond_t monitorCondition;
-
-/** Last command output variables */
-static pthread_mutex_t logMutex;
-static AVBPrint lastCommandOutput;
+pthread_mutex_t lockMutex;
+pthread_mutex_t monitorMutex;
+pthread_cond_t monitorCondition;
 
 pthread_t callbackThread;
 int redirectionEnabled;
@@ -79,59 +74,33 @@ static jmethodID logMethod;
 /** Global reference of statistics redirection method in Java */
 static jmethodID statisticsMethod;
 
-/** Global reference of closeParcelFileDescriptor method in Java */
-static jmethodID closeParcelFileDescriptorMethod;
-
-/** Global reference of String class in Java */
-static jclass stringClass;
-
-/** Global reference of String constructor in Java */
-static jmethodID stringConstructor;
-
 /** Full name of the Config class */
 const char *configClassName = "com/arthenica/mobileffmpeg/Config";
 
-/** Full name of String class */
-const char *stringClassName = "java/lang/String";
-
-/** Fields that control the handling of SIGNALs */
-volatile int handleSIGQUIT = 1;
-volatile int handleSIGINT = 1;
-volatile int handleSIGTERM = 1;
-volatile int handleSIGXCPU = 1;
-volatile int handleSIGPIPE = 1;
-
-/** Holds the id of the current execution */
-__thread volatile long executionId = 0;
-
-/** Holds the default log level */
-int configuredLogLevel = AV_LOG_INFO;
-
 /** Prototypes of native functions defined by Config class. */
 JNINativeMethod configMethods[] = {
     {"enableNativeRedirection", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_enableNativeRedirection},
     {"disableNativeRedirection", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_disableNativeRedirection},
     {"setNativeLogLevel", "(I)V", (void*) Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel},
-    {"getNativeLogLevel", "()I", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel},
-    {"getNativeFFmpegVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpegVersion},
-    {"getNativeVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeVersion},
-    {"nativeFFmpegExecute", "(J[Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecute},
-    {"nativeFFmpegCancel", "(J)V", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegCancel},
-    {"nativeFFprobeExecute", "([Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeFFprobeExecute},
-    {"registerNewNativeFFmpegPipe", "(Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_registerNewNativeFFmpegPipe},
-    {"getNativeBuildDate", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeBuildDate},
-    {"setNativeEnvironmentVariable", "(Ljava/lang/String;Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_setNativeEnvironmentVariable},
-    {"getNativeLastCommandOutput", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeLastCommandOutput},
-    {"ignoreNativeSignal", "(I)V", (void*) Java_com_arthenica_mobileffmpeg_Config_ignoreNativeSignal}
+    {"getNativeLogLevel", "()I", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel}
+};
+
+/** Prototypes of native functions defined by FFmpeg class. */
+JNINativeMethod ffmpegMethods[] = {
+  {"getNativeFFmpegVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpegVersion},
+  {"getNativeVersion", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeVersion},
+  {"nativeExecute", "([Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeExecute},
+  {"nativeCancel", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeCancel}
 };
 
 /** Forward declaration for function defined in fftools_ffmpeg.c */
-int ffmpeg_execute(int argc, char **argv);
+int execute(int argc, char **argv);
+
+/** DEFINES LINE SIZE USED FOR LOGGING */
+#define LOG_LINE_SIZE 1024
 
 static const char *avutil_log_get_level_str(int level) {
     switch (level) {
-    case AV_LOG_STDERR:
-        return "stderr";
     case AV_LOG_QUIET:
         return "quiet";
     case AV_LOG_DEBUG:
@@ -218,26 +187,6 @@ void monitorInit() {
     pthread_condattr_destroy(&cattributes);
 }
 
-void logInit() {
-    pthread_mutexattr_t attributes;
-    pthread_mutexattr_init(&attributes);
-    pthread_mutexattr_settype(&attributes, PTHREAD_MUTEX_RECURSIVE_NP);
-
-    pthread_mutex_init(&logMutex, &attributes);
-    pthread_mutexattr_destroy(&attributes);
-
-    av_bprint_init(&lastCommandOutput, 0, AV_BPRINT_SIZE_UNLIMITED);
-}
-
-void executionMapLockInit() {
-    pthread_mutexattr_t attributes;
-    pthread_mutexattr_init(&attributes);
-    pthread_mutexattr_settype(&attributes, PTHREAD_MUTEX_RECURSIVE_NP);
-
-    pthread_mutex_init(&executionMapMutex, &attributes);
-    pthread_mutexattr_destroy(&attributes);
-}
-
 void mutexUnInit() {
     pthread_mutex_destroy(&lockMutex);
 }
@@ -247,54 +196,14 @@ void monitorUnInit() {
     pthread_cond_destroy(&monitorCondition);
 }
 
-void logUnInit() {
-    pthread_mutex_destroy(&logMutex);
-}
-
-void executionMapLockUnInit() {
-    pthread_mutex_destroy(&executionMapMutex);
-}
-
 void mutexLock() {
     pthread_mutex_lock(&lockMutex);
 }
 
-void lastCommandOutputLock() {
-    pthread_mutex_lock(&logMutex);
-}
-
-void executionMapLock() {
-    pthread_mutex_lock(&executionMapMutex);
-}
-
 void mutexUnlock() {
     pthread_mutex_unlock(&lockMutex);
 }
 
-void lastCommandOutputUnlock() {
-    pthread_mutex_unlock(&logMutex);
-}
-
-void executionMapUnlock() {
-    pthread_mutex_unlock(&executionMapMutex);
-}
-
-void clearLastCommandOutput() {
-    lastCommandOutputLock();
-    av_bprint_clear(&lastCommandOutput);
-    lastCommandOutputUnlock();
-}
-
-void appendLastCommandOutput(AVBPrint *logMessage) {
-    if (logMessage->len <= 0) {
-        return;
-    }
-
-    lastCommandOutputLock();
-    av_bprintf(&lastCommandOutput, "%s", logMessage->str);
-    lastCommandOutputUnlock();
-}
-
 void monitorWait(int milliSeconds) {
     struct timeval tp;
     struct timespec ts;
@@ -309,8 +218,6 @@ void monitorWait(int milliSeconds) {
     ts.tv_nsec = tp.tv_usec * 1000;
     ts.tv_sec += milliSeconds / 1000;
     ts.tv_nsec += (milliSeconds % 1000)*1000000;
-    ts.tv_sec += ts.tv_nsec / 1000000000L;
-    ts.tv_nsec = ts.tv_nsec % 1000000000L;
 
     pthread_mutex_lock(&monitorMutex);
     pthread_cond_timedwait(&monitorCondition, &monitorMutex, &ts);
@@ -325,19 +232,16 @@ void monitorNotify() {
 
 /**
  * Adds log data to the end of callback data list.
- *
- * @param level log level
- * @param data log data
  */
-void logCallbackDataAdd(int level, AVBPrint *data) {
+void logCallbackDataAdd(int level, const char *data) {
 
     // CREATE DATA STRUCT FIRST
-    struct CallbackData *newData = (struct CallbackData*)av_malloc(sizeof(struct CallbackData));
+    struct CallbackData *newData = (struct CallbackData*)malloc(sizeof(struct CallbackData));
     newData->type = 1;
-    newData->executionId = executionId;
     newData->logLevel = level;
-    av_bprint_init(&newData->logData, 0, AV_BPRINT_SIZE_UNLIMITED);
-    av_bprintf(&newData->logData, "%s", data->str);
+    size_t dataSize = strlen(data) + 1;
+    newData->logData = (char*)malloc(dataSize);
+    memcpy(newData->logData, data, dataSize);
     newData->next = NULL;
 
     mutexLock();
@@ -369,9 +273,8 @@ void logCallbackDataAdd(int level, AVBPrint *data) {
 void statisticsCallbackDataAdd(int frameNumber, float fps, float quality, int64_t size, int time, double bitrate, double speed) {
 
     // CREATE DATA STRUCT FIRST
-    struct CallbackData *newData = (struct CallbackData*)av_malloc(sizeof(struct CallbackData));
+    struct CallbackData *newData = (struct CallbackData*)malloc(sizeof(struct CallbackData));
     newData->type = 2;
-    newData->executionId = executionId;
     newData->statisticsFrameNumber = frameNumber;
     newData->statisticsFps = fps;
     newData->statisticsQuality = quality;
@@ -405,20 +308,6 @@ void statisticsCallbackDataAdd(int frameNumber, float fps, float quality, int64_
     monitorNotify();
 }
 
-/**
- * Adds an execution id to the execution map.
- *
- * @param id execution id
- */
-void addExecution(long id) {
-    executionMapLock();
-
-    int key = id % EXECUTION_MAP_SIZE;
-    executionMap[key] = 1;
-
-    executionMapUnlock();
-}
-
 /**
  * Removes head of callback data list.
  */
@@ -451,97 +340,48 @@ struct CallbackData *callbackDataRemove() {
     return currentData;
 }
 
-/**
- * Removes an execution id from the execution map.
- *
- * @param id execution id
- */
-void removeExecution(long id) {
-    executionMapLock();
-
-    int key = id % EXECUTION_MAP_SIZE;
-    executionMap[key] = 0;
-
-    executionMapUnlock();
-}
-
-/**
- * Checks whether a cancel request for the given execution id exists in the execution map.
- *
- * @param id execution id
- * @return 1 if exists, false otherwise
- */
-int cancelRequested(long id) {
-    int found = 0;
-
-    executionMapLock();
-
-    int key = id % EXECUTION_MAP_SIZE;
-    if (executionMap[key] == 0) {
-        found = 1;
-    }
-
-    executionMapUnlock();
-
-    return found;
-}
-
 /**
  * Callback function for FFmpeg logs.
  *
- * @param ptr pointer to AVClass struct
- * @param level log level
- * @param format format string
- * @param vargs arguments
+ * \param pointer to AVClass struct
+ * \param level
+ * \param format
+ * \param arguments
  */
 void mobileffmpeg_log_callback_function(void *ptr, int level, const char* format, va_list vargs) {
-    AVBPrint fullLine;
+    char line[LOG_LINE_SIZE];
     AVBPrint part[4];
     int print_prefix = 1;
 
     if (level >= 0) {
         level &= 0xff;
     }
-    int activeLogLevel = av_log_get_level();
-
-    // AV_LOG_STDERR logs are always redirected
-    if ((activeLogLevel == AV_LOG_QUIET && level != AV_LOG_STDERR) || (level > activeLogLevel)) {
-        return;
-    }
-
-    av_bprint_init(&fullLine, 0, AV_BPRINT_SIZE_UNLIMITED);
 
     avutil_log_format_line(ptr, level, format, vargs, part, &print_prefix);
+    snprintf(line, sizeof(line), "%s%s%s%s", part[0].str, part[1].str, part[2].str, part[3].str);
+
     avutil_log_sanitize(part[0].str);
+    logCallbackDataAdd(level, part[0].str);
     avutil_log_sanitize(part[1].str);
+    logCallbackDataAdd(level, part[1].str);
     avutil_log_sanitize(part[2].str);
+    logCallbackDataAdd(level, part[2].str);
     avutil_log_sanitize(part[3].str);
+    logCallbackDataAdd(level, part[3].str);
 
-    // COMBINE ALL 4 LOG PARTS
-    av_bprintf(&fullLine, "%s%s%s%s", part[0].str, part[1].str, part[2].str, part[3].str);
-
-    if (fullLine.len > 0) {
-        logCallbackDataAdd(level, &fullLine);
-        appendLastCommandOutput(&fullLine);
-    }
-
-    av_bprint_finalize(part, NULL);
-    av_bprint_finalize(part+1, NULL);
-    av_bprint_finalize(part+2, NULL);
     av_bprint_finalize(part+3, NULL);
-    av_bprint_finalize(&fullLine, NULL);
 }
 
 /**
  * Callback function for FFmpeg statistics.
  *
- * @param frameNumber last processed frame number
- * @param fps frames processed per second
- * @param quality quality of the output stream (video only)
- * @param size size in bytes
- * @param time processed output duration
- * @param bitrate output bit rate in kbits/s
- * @param speed processing speed = processed duration / operation duration
+ * \param frameNumber last processed frame number
+ * \param fps frames processed per second
+ * \param quality quality of the output stream (video only)
+ * \param size size in bytes
+ * \param time processed output duration
+ * \param bitrate output bit rate in kbits/s
+ * \param speed processing speed = processed duration / operation duration
  */
 void mobileffmpeg_statistics_callback_function(int frameNumber, float fps, float quality, int64_t size, int time, double bitrate, double speed) {
     statisticsCallbackDataAdd(frameNumber, fps, quality, size, time, bitrate, speed);
@@ -575,31 +415,31 @@ void *callbackThreadFunction() {
 
                 // LOG CALLBACK
 
-                int size = callbackData->logData.len;
+                size_t size = strlen(callbackData->logData);
 
                 jbyteArray byteArray = (jbyteArray) (*env)->NewByteArray(env, size);
-                (*env)->SetByteArrayRegion(env, byteArray, 0, size, callbackData->logData.str);
-                (*env)->CallStaticVoidMethod(env, configClass, logMethod, (jlong) callbackData->executionId, callbackData->logLevel, byteArray);
+                (*env)->SetByteArrayRegion(env, byteArray, 0, size, (jbyte *)callbackData->logData);
+                (*env)->CallStaticVoidMethod(env, configClass, logMethod, callbackData->logLevel, byteArray);
                 (*env)->DeleteLocalRef(env, byteArray);
 
                 // CLEAN LOG DATA
-                av_bprint_finalize(&callbackData->logData, NULL);
+                free(callbackData->logData);
 
             } else {
 
                 // STATISTICS CALLBACK
 
                 (*env)->CallStaticVoidMethod(env, configClass, statisticsMethod,
-                    (jlong) callbackData->executionId, callbackData->statisticsFrameNumber,
-                    callbackData->statisticsFps, callbackData->statisticsQuality,
-                    callbackData->statisticsSize, callbackData->statisticsTime,
-                    callbackData->statisticsBitrate, callbackData->statisticsSpeed);
+                    callbackData->statisticsFrameNumber, callbackData->statisticsFps,
+                    callbackData->statisticsQuality, callbackData->statisticsSize,
+                    callbackData->statisticsTime, callbackData->statisticsBitrate,
+                    callbackData->statisticsSpeed);
 
             }
 
             // CLEAN STRUCT
             callbackData->next = NULL;
-            av_free(callbackData);
+            free(callbackData);
 
         } else {
             monitorWait(100);
@@ -616,9 +456,9 @@ void *callbackThreadFunction() {
 /**
  * Called when 'mobileffmpeg' native library is loaded.
  *
- * @param vm pointer to the running virtual machine
- * @param reserved reserved
- * @return JNI version needed by 'mobileffmpeg' library
+ * \param vm pointer to the running virtual machine
+ * \param reserved reserved
+ * \return JNI version needed by 'mobileffmpeg' library
  */
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env;
@@ -633,61 +473,41 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_FALSE;
     }
 
-    if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 12) < 0) {
+    if ((*env)->RegisterNatives(env, localConfigClass, ffmpegMethods, 4) < 0) {
         LOGE("OnLoad failed to RegisterNatives for class %s.\n", configClassName);
         return JNI_FALSE;
     }
 
-    jclass localStringClass = (*env)->FindClass(env, stringClassName);
-    if (localStringClass == NULL) {
-        LOGE("OnLoad failed to FindClass %s.\n", stringClassName);
+    if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 4) < 0) {
+        LOGE("OnLoad failed to RegisterNatives for class %s.\n", configClassName);
         return JNI_FALSE;
     }
 
     (*env)->GetJavaVM(env, &globalVm);
 
-    logMethod = (*env)->GetStaticMethodID(env, localConfigClass, "log", "(JI[B)V");
+    logMethod = (*env)->GetStaticMethodID(env, localConfigClass, "log", "(I[B)V");
     if (logMethod == NULL) {
-        LOGE("OnLoad thread failed to GetStaticMethodID for %s.\n", "log");
+        LOGE("OnLoad thread failed to GetMethodID for %s.\n", "log");
+        (*globalVm)->DetachCurrentThread(globalVm);
         return JNI_FALSE;
     }
 
-    statisticsMethod = (*env)->GetStaticMethodID(env, localConfigClass, "statistics", "(JIFFJIDD)V");
+    statisticsMethod = (*env)->GetStaticMethodID(env, localConfigClass, "statistics", "(IFFJIDD)V");
     if (logMethod == NULL) {
-        LOGE("OnLoad thread failed to GetStaticMethodID for %s.\n", "statistics");
+        LOGE("OnLoad thread failed to GetMethodID for %s.\n", "statistics");
+        (*globalVm)->DetachCurrentThread(globalVm);
         return JNI_FALSE;
     }
 
-    closeParcelFileDescriptorMethod = (*env)->GetStaticMethodID(env, localConfigClass, "closeParcelFileDescriptor", "(I)V");
-    if (logMethod == NULL) {
-        LOGE("OnLoad thread failed to GetStaticMethodID for %s.\n", "closeParcelFileDescriptor");
-        return JNI_FALSE;
-    }
-
-    stringConstructor = (*env)->GetMethodID(env, localStringClass, "<init>", "([BLjava/lang/String;)V");
-    if (stringConstructor == NULL) {
-        LOGE("OnLoad thread failed to GetMethodID for %s.\n", "<init>");
-        return JNI_FALSE;
-    }
-
-    av_jni_set_java_vm(vm, NULL);
-
     configClass = (jclass) ((*env)->NewGlobalRef(env, localConfigClass));
-    stringClass = (jclass) ((*env)->NewGlobalRef(env, localStringClass));
 
     redirectionEnabled = 0;
 
     callbackDataHead = NULL;
     callbackDataTail = NULL;
-    
-    for(int i = 0; i<EXECUTION_MAP_SIZE; i++) {
-        executionMap[i] = 0;
-    }
-    
+
     mutexInit();
     monitorInit();
-    logInit();
-    executionMapLockInit();
 
     return JNI_VERSION_1_6;
 }
@@ -695,29 +515,29 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 /**
  * Sets log level.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param level log level
+ * \param env pointer to native method interface
+ * \param reference to the class on which this method is invoked
+ * \param log level
  */
-    JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel(JNIEnv *env, jclass object, jint level) {
-    configuredLogLevel = level;
+JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel(JNIEnv *env, jclass object, jint level) {
+    av_log_set_level(level);
 }
 
 /**
  * Returns current log level.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
+ * \param env pointer to native method interface
+ * \param reference to the class on which this method is invoked
  */
 JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel(JNIEnv *env, jclass object) {
-    return configuredLogLevel;
+    return av_log_get_level();
 }
 
 /**
  * Enables log and statistics redirection.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
+ * \param env pointer to native method interface
+ * \param reference to the class on which this method is invoked
  */
 JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_enableNativeRedirection(JNIEnv *env, jclass object) {
     mutexLock();
@@ -743,8 +563,8 @@ JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_enableNativeRedire
 /**
  * Disables log and statistics redirection.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
+ * \param env pointer to native method interface
+ * \param reference to the class on which this method is invoked
  */
 JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_disableNativeRedirection(JNIEnv *env, jclass object) {
 
@@ -767,9 +587,9 @@ JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_disableNativeRedir
 /**
  * Returns FFmpeg version bundled within the library natively.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return FFmpeg version string
+ * \param env pointer to native method interface
+ * \param object reference to the class on which this method is invoked
+ * \return FFmpeg version string
  */
 JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpegVersion(JNIEnv *env, jclass object) {
     return (*env)->NewStringUTF(env, FFMPEG_VERSION);
@@ -778,44 +598,40 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeFFmpeg
 /**
  * Returns MobileFFmpeg library version natively.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return MobileFFmpeg version string
+ * \param env pointer to native method interface
+ * \param object reference to the class on which this method is invoked
+ * \return MobileFFmpeg version string
  */
 JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeVersion(JNIEnv *env, jclass object) {
     return (*env)->NewStringUTF(env, MOBILE_FFMPEG_VERSION);
 }
 
 /**
- * Synchronously executes FFmpeg natively with arguments provided.
+ * Synchronously executes FFmpeg command natively with arguments provided.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param id execution id
- * @param stringArray reference to the object holding FFmpeg command arguments
- * @return zero on successful execution, non-zero on error
+ * \param env pointer to native method interface
+ * \param object reference to the class on which this method is invoked
+ * \param stringArray reference to the object holding FFmpeg command arguments
+ * \return zero on successful execution, non-zero on error
  */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecute(JNIEnv *env, jclass object, jlong id, jobjectArray stringArray) {
+JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIEnv *env, jclass object, jobjectArray stringArray) {
     jstring *tempArray = NULL;
     int argumentCount = 1;
     char **argv = NULL;
 
-    // SETS DEFAULT LOG LEVEL BEFORE STARTING A NEW EXECUTION
-    av_log_set_level(configuredLogLevel);
-
     if (stringArray != NULL) {
         int programArgumentCount = (*env)->GetArrayLength(env, stringArray);
         argumentCount = programArgumentCount + 1;
 
-        tempArray = (jstring *) av_malloc(sizeof(jstring) * programArgumentCount);
+        tempArray = (jstring *) malloc(sizeof(jstring) * programArgumentCount);
     }
 
     /* PRESERVE USAGE FORMAT
      *
      * ffmpeg <arguments>
      */
-    argv = (char **)av_malloc(sizeof(char*) * (argumentCount));
-    argv[0] = (char *)av_malloc(sizeof(char) * (strlen(LIB_NAME) + 1));
+    argv = (char **)malloc(sizeof(char*) * (argumentCount));
+    argv[0] = (char *)malloc(sizeof(char) * (strlen(LIB_NAME) + 1));
     strcpy(argv[0], LIB_NAME);
 
     // PREPARE
@@ -828,18 +644,8 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecut
         }
     }
 
-    // LAST COMMAND OUTPUT SHOULD BE CLEARED BEFORE STARTING A NEW EXECUTION
-    clearLastCommandOutput();
-
-    // REGISTER THE ID BEFORE STARTING EXECUTION
-    executionId = (long) id;
-    addExecution((long) id);
-
     // RUN
-    int retCode = ffmpeg_execute(argumentCount, argv);
-
-    // ALWAYS REMOVE THE ID FROM THE MAP
-    removeExecution((long) id);
+    int retCode = execute(argumentCount, argv);
 
     // CLEANUP
     if (tempArray != NULL) {
@@ -847,117 +653,20 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecut
             (*env)->ReleaseStringUTFChars(env, tempArray[i], argv[i + 1]);
         }
 
-        av_free(tempArray);
+        free(tempArray);
     }
-    av_free(argv[0]);
-    av_free(argv);
+    free(argv[0]);
+    free(argv);
 
     return retCode;
 }
 
 /**
- * Cancels an ongoing FFmpeg operation natively.
+ * Cancels an ongoing operation natively.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param id execution id
+ * \param env pointer to native method interface
+ * \param object reference to the class on which this method is invoked
  */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegCancel(JNIEnv *env, jclass object, jlong id) {
-    cancel_operation(id);
+JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *env, jclass object) {
+    cancel_operation();
 }
-
-/**
- * Creates natively a new named pipe to use in FFmpeg operations.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param ffmpegPipePath full path of ffmpeg pipe
- * @return zero on successful creation, non-zero on error
- */
-JNIEXPORT int JNICALL Java_com_arthenica_mobileffmpeg_Config_registerNewNativeFFmpegPipe(JNIEnv *env, jclass object, jstring ffmpegPipePath) {
-    const char *ffmpegPipePathString = (*env)->GetStringUTFChars(env, ffmpegPipePath, 0);
-
-    return mkfifo(ffmpegPipePathString, S_IRWXU | S_IRWXG | S_IROTH);
-}
-
-/**
- * Returns MobileFFmpeg library build date natively.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return MobileFFmpeg library build date
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeBuildDate(JNIEnv *env, jclass object) {
-    char buildDate[10];
-    sprintf(buildDate, "%d", MOBILE_FFMPEG_BUILD_DATE);
-    return (*env)->NewStringUTF(env, buildDate);
-}
-
-/**
- * Sets an environment variable natively
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param variableName environment variable name
- * @param variableValue environment variable value
- * @return zero on success, non-zero on error
- */
-JNIEXPORT int JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeEnvironmentVariable(JNIEnv *env, jclass object, jstring variableName, jstring variableValue) {
-    const char *variableNameString = (*env)->GetStringUTFChars(env, variableName, 0);
-    const char *variableValueString = (*env)->GetStringUTFChars(env, variableValue, 0);
-
-    int rc = setenv(variableNameString, variableValueString, 1);
-
-    (*env)->ReleaseStringUTFChars(env, variableName, variableNameString);
-    (*env)->ReleaseStringUTFChars(env, variableValue, variableValueString);
-    return rc;
-}
-
-/**
- * Returns log output of the last executed command natively.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return output of the last executed command
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeLastCommandOutput(JNIEnv *env, jclass object) {
-    int size = lastCommandOutput.len;
-    if (size > 0) {
-        jbyteArray byteArray = (*env)->NewByteArray(env, size);
-        (*env)->SetByteArrayRegion(env, byteArray, 0, size, lastCommandOutput.str);
-        jstring charsetName = (*env)->NewStringUTF(env, "UTF-8");
-        return (jstring) (*env)->NewObject(env, stringClass, stringConstructor, byteArray, charsetName);
-    }
-
-    return (*env)->NewStringUTF(env, "");
-}
-
-/**
- * Registers a new ignored signal. Ignored signals are not handled by the library.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param signum signal number
- */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_ignoreNativeSignal(JNIEnv *env, jclass object, jint signum) {
-    if (signum == SIGQUIT) {
-        handleSIGQUIT = 0;
-    } else if (signum == SIGINT) {
-        handleSIGINT = 0;
-    } else if (signum == SIGTERM) {
-        handleSIGTERM = 0;
-    } else if (signum == SIGXCPU) {
-        handleSIGXCPU = 0;
-    } else if (signum == SIGPIPE) {
-        handleSIGPIPE = 0;
-    }
-}
-
-/**
- * used by saf_wrapper; is expected to be called from a Java thread, therefore we don't need attach/detach
- */
-void closeParcelFileDescriptor(int fd) {
-    JNIEnv *env = NULL;
-    (*globalVm)->GetEnv(globalVm, (void**) &env, JNI_VERSION_1_6);
-    (*env)->CallStaticVoidMethod(env, configClass, closeParcelFileDescriptorMethod, fd);
-}

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

@@ -27,7 +27,7 @@
 #include "libavutil/ffversion.h"
 
 /** Library version string */
-#define MOBILE_FFMPEG_VERSION "4.4"
+#define MOBILE_FFMPEG_VERSION "2.2"
 
 /** Defines tag used for Android logging. */
 #define LIB_NAME "mobile-ffmpeg"
@@ -91,51 +91,16 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeVersio
 
 /*
  * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeFFmpegExecute
- * Signature: (J[Ljava/lang/String;)I
+ * Method:    nativeExecute
+ * Signature: ([Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecute(JNIEnv *, jclass, jlong id, jobjectArray);
+JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIEnv *, jclass, jobjectArray);
 
 /*
  * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeFFmpegCancel
- * Signature: (J)V
+ * Method:    nativeCancel
+ * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegCancel(JNIEnv *, jclass, jlong);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    registerNewNativeFFmpegPipe
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT int JNICALL Java_com_arthenica_mobileffmpeg_Config_registerNewNativeFFmpegPipe(JNIEnv *env, jclass object, jstring ffmpegPipePath);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    getNativeBuildDate
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeBuildDate(JNIEnv *env, jclass object);
-
-/**
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    setNativeEnvironmentVariable
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT int JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeEnvironmentVariable(JNIEnv *env, jclass object, jstring variableName, jstring variableValue);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    getNativeLastCommandOutput
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeLastCommandOutput(JNIEnv *env, jclass object);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    ignoreNativeSignal
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_ignoreNativeSignal(JNIEnv *env, jclass object, jint signum);
+JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *, jclass);
 
 #endif /* MOBILE_FFMPEG_H */

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

@@ -18,7 +18,6 @@
  */
 
 #include "cpu-features.h"
-#include "fftools_ffmpeg.h"
 #include "mobileffmpeg_abidetect.h"
 
 /** Full name of the Java class that owns native functions in this file. */
@@ -26,18 +25,15 @@ const char *abiDetectClassName = "com/arthenica/mobileffmpeg/AbiDetect";
 
 /** Prototypes of native functions defined by this file. */
 JNINativeMethod abiDetectMethods[] = {
-  {"getNativeAbi", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeAbi},
-  {"getNativeCpuAbi", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpuAbi},
-  {"isNativeLTSBuild", "()Z", (void*) Java_com_arthenica_mobileffmpeg_AbiDetect_isNativeLTSBuild},
-  {"getNativeBuildConf", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeBuildConf}
+  {"getAbi", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_AbiDetect_getAbi}
 };
 
 /**
  * Called when 'abidetect' native library is loaded.
  *
- * @param vm pointer to the running virtual machine
- * @param reserved reserved
- * @return JNI version needed by 'abidetect' library
+ * \param vm pointer to the running virtual machine
+ * \param reserved reserved
+ * \return JNI version needed by 'abidetect' library
  */
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env;
@@ -52,7 +48,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_FALSE;
     }
 
-    if ((*env)->RegisterNatives(env, abiDetectClass, abiDetectMethods, 4) < 0) {
+    if ((*env)->RegisterNatives(env, abiDetectClass, abiDetectMethods, 1) < 0) {
         LOGE("OnLoad failed to RegisterNatives for class %s.\n", abiDetectClassName);
         return JNI_FALSE;
     }
@@ -61,36 +57,13 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 }
 
 /**
- * Returns loaded ABI name.
+ * Returns running ABI name.
  *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return loaded ABI name as UTF string
+ * \param env pointer to native method interface
+ * \param object reference to the class on which this method is invoked
+ * \return running ABI name as UTF string
  */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeAbi(JNIEnv *env, jclass object) {
-
-#ifdef MOBILE_FFMPEG_ARM_V7A
-    return (*env)->NewStringUTF(env, "arm-v7a");
-#elif MOBILE_FFMPEG_ARM64_V8A
-    return (*env)->NewStringUTF(env, "arm64-v8a");
-#elif MOBILE_FFMPEG_X86
-    return (*env)->NewStringUTF(env, "x86");
-#elif MOBILE_FFMPEG_X86_64
-    return (*env)->NewStringUTF(env, "x86_64");
-#else
-    return (*env)->NewStringUTF(env, "unknown");
-#endif
-
-}
-
-/**
- * Returns ABI name of the running cpu.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return ABI name of the running cpu as UTF string
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpuAbi(JNIEnv *env, jclass object) {
+JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getAbi(JNIEnv *env, jclass object) {
     AndroidCpuFamily family = android_getCpuFamily();
 
     if (family == ANDROID_CPU_FAMILY_ARM) {
@@ -116,29 +89,3 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpu
         return (*env)->NewStringUTF(env, ABI_UNKNOWN);
     }
 }
-
-/**
- * Returns whether MobileFFmpeg release is a long term release or not.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return yes or no
- */
-JNIEXPORT jboolean JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_isNativeLTSBuild(JNIEnv *env, jclass object) {
-    #if defined(MOBILE_FFMPEG_LTS)
-        return JNI_TRUE;
-    #else
-        return JNI_FALSE;
-    #endif
-}
-
-/**
- * Returns build configuration for FFmpeg.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @return build configuration string
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeBuildConf(JNIEnv *env, jclass object) {
-    return (*env)->NewStringUTF(env, FFMPEG_CONFIGURATION);
-}

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

@@ -46,30 +46,9 @@
 
 /*
  * Class:     com_arthenica_mobileffmpeg_AbiDetect
- * Method:    getNativeAbi
+ * Method:    getAbi
  * Signature: ()Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeAbi(JNIEnv *, jclass);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_AbiDetect
- * Method:    getNativeCpuAbi
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpuAbi(JNIEnv *, jclass);
-
-/**
- * Class:     com_arthenica_mobileffmpeg_AbiDetect
- * Method:    isNativeLTSBuild
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_isNativeLTSBuild(JNIEnv *, jclass);
-
-/*
- * Class:     com_arthenica_mobileffmpeg_AbiDetect
- * Method:    getNativeBuildConf
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeBuildConf(JNIEnv *, jclass);
+JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getAbi(JNIEnv *, jclass);
 
 #endif /* MOBILE_FFMPEG_ABIDETECT_H */

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

@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2018 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 <stdio.h>
-#include <setjmp.h>
-
-/** Holds information to implement exception handling. */
-__thread jmp_buf ex_buf__;

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

@@ -24,6 +24,6 @@
 #include <setjmp.h>
 
 /** Holds information to implement exception handling. */
-extern __thread jmp_buf ex_buf__;
+jmp_buf ex_buf__;
 
 #endif // MOBILE_FFMPEG_EXCEPTION_H

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

@@ -1,96 +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 <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "config.h"
-#include "libavcodec/jni.h"
-#include "libavutil/bprint.h"
-#include "mobileffmpeg.h"
-
-/** Forward declaration for function defined in fftools_ffprobe.c */
-int ffprobe_execute(int argc, char **argv);
-
-/** Forward declaration for function defined in mobileffmpeg.c */
-void clearLastCommandOutput();
-
-extern int configuredLogLevel;
-
-/**
- * Synchronously executes FFprobe natively with arguments provided.
- *
- * @param env pointer to native method interface
- * @param object reference to the class on which this method is invoked
- * @param stringArray reference to the object holding FFprobe command arguments
- * @return zero on successful execution, non-zero on error
- */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFprobeExecute(JNIEnv *env, jclass object, jobjectArray stringArray) {
-    jstring *tempArray = NULL;
-    int argumentCount = 1;
-    char **argv = NULL;
-
-    // SETS DEFAULT LOG LEVEL BEFORE STARTING A NEW EXECUTION
-    av_log_set_level(configuredLogLevel);
-
-    if (stringArray != NULL) {
-        int programArgumentCount = (*env)->GetArrayLength(env, stringArray);
-        argumentCount = programArgumentCount + 1;
-
-        tempArray = (jstring *) av_malloc(sizeof(jstring) * programArgumentCount);
-    }
-
-    /* PRESERVE USAGE FORMAT
-     *
-     * ffprobe <arguments>
-     */
-    argv = (char **)av_malloc(sizeof(char*) * (argumentCount));
-    argv[0] = (char *)av_malloc(sizeof(char) * (strlen(LIB_NAME) + 1));
-    strcpy(argv[0], LIB_NAME);
-
-    // PREPARE
-    if (stringArray != NULL) {
-        for (int i = 0; i < (argumentCount - 1); i++) {
-            tempArray[i] = (jstring) (*env)->GetObjectArrayElement(env, stringArray, i);
-            if (tempArray[i] != NULL) {
-                argv[i + 1] = (char *) (*env)->GetStringUTFChars(env, tempArray[i], 0);
-            }
-        }
-    }
-
-    // LAST COMMAND OUTPUT SHOULD BE CLEARED BEFORE STARTING A NEW EXECUTION
-    clearLastCommandOutput();
-
-    // RUN
-    int retCode = ffprobe_execute(argumentCount, argv);
-
-    // CLEANUP
-    if (tempArray != NULL) {
-        for (int i = 0; i < (argumentCount - 1); i++) {
-            (*env)->ReleaseStringUTFChars(env, tempArray[i], argv[i + 1]);
-        }
-
-        av_free(tempArray);
-    }
-    av_free(argv[0]);
-    av_free(argv);
-
-    return retCode;
-}

android/app/src/main/cpp/mobileffprobe.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_FFPROBE_H
-#define MOBILE_FFPROBE_H
-
-#include <jni.h>
-
-/*
- * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeFFprobeExecute
- * Signature: ([Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFprobeExecute(JNIEnv *, jclass, jobjectArray);
-
-#endif /* MOBILE_FFPROBE_H */

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

@@ -1,134 +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 <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "libavformat/avformat.h"
-#include "libavutil/avstring.h"
-
-#include "saf_wrapper.h"
-
-/** JNI wrapper in mobileffmpeg.c */
-void closeParcelFileDescriptor(int fd);
-
-// in these wrappers, we call the original functions, so we remove the shadow defines
-#undef avio_closep
-#undef avformat_close_input
-#undef avio_open
-#undef avio_open2
-#undef avformat_open_input
-
-static int fd_read_packet(void* opaque, uint8_t* buf, int buf_size) {
-    int fd = (int)opaque;
-    return read(fd, buf, buf_size);
-}
-
-static int fd_write_packet(void* opaque, uint8_t* buf, int buf_size) {
-    int fd = (int)opaque;
-    return write(fd, buf, buf_size);
-}
-
-static int64_t fd_seek(void *opaque, int64_t offset, int whence) {
-    int fd = (int)opaque;
-
-    if (fd < 0) {
-        return AVERROR(EINVAL);
-    }
-
-    int64_t ret;
-    if (whence == AVSEEK_SIZE) {
-        struct stat st;
-        ret = fstat(fd, &st);
-        return ret < 0 ? AVERROR(errno) : (S_ISFIFO(st.st_mode) ? 0 : st.st_size);
-    }
-
-    ret = lseek(fd, offset, whence);
-
-    return ret < 0 ? AVERROR(errno) : ret;
-}
-
-/*
- * returns NULL if the filename is not of expected format (e.g. 'saf:72/video.md4')
- */
-static AVIOContext *create_fd_avio_context(const char *filename, int flags) {
-    union {int fd; void* opaque;} fdunion;
-    fdunion.fd = -1;
-    const char *fd_ptr = NULL;
-    if (av_strstart(filename, "saf:", &fd_ptr)) {
-        char *final;
-        fdunion.fd = strtol(fd_ptr, &final, 10);
-        if (fd_ptr == final) { /* No digits found */
-            fdunion.fd = -1;
-        }
-    }
-
-    if (fdunion.fd >= 0) {
-        int write_flag = flags & AVIO_FLAG_WRITE ? 1 : 0;
-        return avio_alloc_context(av_malloc(4096), 4096, write_flag, fdunion.opaque, fd_read_packet, write_flag ? fd_write_packet : NULL, fd_seek);
-    }
-    return NULL;
-}
-
-static void close_fd_avio_context(AVIOContext *ctx) {
-    if (fd_seek(ctx->opaque, 0, AVSEEK_SIZE) >= 0) {
-        int fd = (int)ctx->opaque;
-        closeParcelFileDescriptor(fd);
-    }
-    ctx->opaque = NULL;
-}
-
-int android_avformat_open_input(AVFormatContext **ps, const char *filename,
-                        ff_const59 AVInputFormat *fmt, AVDictionary **options) {
-    if (!(*ps) && !(*ps = avformat_alloc_context()))
-        return AVERROR(ENOMEM);
-
-    (*ps)->pb = create_fd_avio_context(filename, AVIO_FLAG_READ);
-
-    return avformat_open_input(ps, filename, fmt, options);
-}
-
-int android_avio_open2(AVIOContext **s, const char *filename, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options) {
-    AVIOContext *fd_context = create_fd_avio_context(filename, flags);
-
-    if (fd_context) {
-        *s = fd_context;
-        return 0;
-    }
-    return avio_open2(s, filename, flags, int_cb, options);
-}
-
-int android_avio_open(AVIOContext **s, const char *url, int flags) {
-    return android_avio_open2(s, url, flags, NULL, NULL);
-}
-
-int android_avio_closep(AVIOContext **s) {
-    close_fd_avio_context(*s);
-    return avio_closep(s);
-}
-
-void android_avformat_close_input(AVFormatContext **ps) {
-    if (*ps && (*ps)->pb) {
-        close_fd_avio_context((*ps)->pb);
-    }
-    avformat_close_input(ps);
-}

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

@@ -1,46 +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_FFMPEG_SAF_WRAPPER_H
-#define MOBILE_FFMPEG_SAF_WRAPPER_H
-
-/*
- *  These wrappers are intended to be used instead of the ffmpeg apis.
- *  You don't even need to change the source to call them.
- *  Instead, we redefine the public api names so that the wrapper be used.
- */
-
-int android_avio_closep(AVIOContext **s);
-#define avio_closep android_avio_closep
-
-void android_avformat_close_input(AVFormatContext **s);
-#define avformat_close_input android_avformat_close_input
-
-int android_avio_open(AVIOContext **s, const char *url, int flags);
-#define avio_open android_avio_open
-
-int android_avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-#define avio_open2 android_avio_open2
-
-int android_avformat_open_input(AVFormatContext **ps, const char *filename,
-                        ff_const59 AVInputFormat *fmt, AVDictionary **options);
-#define avformat_open_input android_avformat_open_input
-
-#endif //MOBILE_FFMPEG_SAF_WRAPPER_H

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Taner Sener
+ * Copyright (c) 2018 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -20,7 +20,8 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>This class is used to detect running ABI name using Google <code>cpu-features</code> library.
+ * <p>This class is used to detect running ABI name using Android's <code>cpufeatures</code>
+ * library.
  *
  * @author Taner Sener
  * @since v1.0
@@ -28,70 +29,24 @@ package com.arthenica.mobileffmpeg;
 public class AbiDetect {
 
     static {
-        armV7aNeonLoaded = false;
-
-        System.loadLibrary("mobileffmpeg_abidetect");
+        System.loadLibrary("mobileffmpeg-abidetect");
 
         /* ALL LIBRARIES LOADED AT STARTUP */
         Config.class.getName();
         FFmpeg.class.getName();
     }
 
-    static final String ARM_V7A = "arm-v7a";
-
-    static final String ARM_V7A_NEON = "arm-v7a-neon";
-
-    private static boolean armV7aNeonLoaded;
-
     /**
      * Default constructor hidden.
      */
     private AbiDetect() {
     }
 
-    static void setArmV7aNeonLoaded(final boolean armV7aNeonLoaded) {
-        AbiDetect.armV7aNeonLoaded = armV7aNeonLoaded;
-    }
-
     /**
-     * <p>Returns loaded ABI name.
+     * <p>Returns running ABI name.
      *
-     * @return loaded ABI name
+     * @return running ABI name
      */
-    public static String getAbi() {
-        if (armV7aNeonLoaded) {
-            return ARM_V7A_NEON;
-        } else {
-            return getNativeAbi();
-        }
-    }
-
-    /**
-     * <p>Returns loaded ABI name.
-     *
-     * @return loaded ABI name
-     */
-    public native static String getNativeAbi();
-
-    /**
-     * <p>Returns ABI name of the running cpu.
-     *
-     * @return ABI name of the running cpu
-     */
-    public native static String getNativeCpuAbi();
-
-    /**
-     * <p>Returns whether MobileFFmpeg release is a long term release or not.
-     *
-     * @return yes or no
-     */
-    native static boolean isNativeLTSBuild();
-
-    /**
-     * <p>Returns build configuration for <code>FFmpeg</code>.
-     *
-     * @return build configuration string
-     */
-    native static String getNativeBuildConf();
+    public native static String getAbi();
 
 }

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

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2018-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.os.AsyncTask;
-
-/**
- * <p>Utility class to execute an FFmpeg command asynchronously.
- *
- * @author Taner Sener
- */
-public class AsyncFFmpegExecuteTask extends AsyncTask<Void, Integer, Integer> {
-    private final String[] arguments;
-    private final ExecuteCallback executeCallback;
-    private final Long executionId;
-
-    public AsyncFFmpegExecuteTask(final String command, final ExecuteCallback executeCallback) {
-        this(FFmpeg.parseArguments(command), executeCallback);
-    }
-
-    public AsyncFFmpegExecuteTask(final String[] arguments, final ExecuteCallback executeCallback) {
-        this(FFmpeg.DEFAULT_EXECUTION_ID, arguments, executeCallback);
-    }
-
-    public AsyncFFmpegExecuteTask(final long executionId, final String command, final ExecuteCallback executeCallback) {
-        this(executionId, FFmpeg.parseArguments(command), executeCallback);
-    }
-
-    public AsyncFFmpegExecuteTask(final long executionId, final String[] arguments, final ExecuteCallback executeCallback) {
-        this.executionId = executionId;
-        this.arguments = arguments;
-        this.executeCallback = executeCallback;
-    }
-
-    @Override
-    protected Integer doInBackground(final Void... unused) {
-        return Config.ffmpegExecute(executionId, this.arguments);
-    }
-
-    @Override
-    protected void onPostExecute(final Integer rc) {
-        if (executeCallback != null) {
-            executeCallback.apply(executionId, rc);
-        }
-    }
-
-}

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

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2018-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.os.AsyncTask;
-
-/**
- * <p>Utility class to execute an FFprobe command asynchronously.
- *
- * @author Taner Sener
- */
-public class AsyncFFprobeExecuteTask extends AsyncTask<Void, Integer, Integer> {
-    private final String[] arguments;
-    private final ExecuteCallback ExecuteCallback;
-
-    public AsyncFFprobeExecuteTask(final String command, final ExecuteCallback executeCallback) {
-        this.arguments = FFmpeg.parseArguments(command);
-        this.ExecuteCallback = executeCallback;
-    }
-
-    public AsyncFFprobeExecuteTask(final String[] arguments, final ExecuteCallback executeCallback) {
-        this.arguments = arguments;
-        ExecuteCallback = executeCallback;
-    }
-
-    @Override
-    protected Integer doInBackground(final Void... unused) {
-        return FFprobe.execute(this.arguments);
-    }
-
-    @Override
-    protected void onPostExecute(final Integer rc) {
-        if (ExecuteCallback != null) {
-            ExecuteCallback.apply(FFmpeg.DEFAULT_EXECUTION_ID, rc);
-        }
-    }
-
-}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2018-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.os.AsyncTask;
-
-import com.arthenica.mobileffmpeg.FFprobe;
-import com.arthenica.mobileffmpeg.GetMediaInformationCallback;
-import com.arthenica.mobileffmpeg.MediaInformation;
-
-/**
- * <p>Utility class to get media information asynchronously.
- *
- * @author Taner Sener
- */
-public class AsyncGetMediaInformationTask extends AsyncTask<String, MediaInformation, MediaInformation> {
-    private final String path;
-    private final GetMediaInformationCallback getMediaInformationCallback;
-
-    public AsyncGetMediaInformationTask(final String path, final GetMediaInformationCallback getMediaInformationCallback) {
-        this.path = path;
-        this.getMediaInformationCallback = getMediaInformationCallback;
-    }
-
-    @Override
-    protected MediaInformation doInBackground(final String... arguments) {
-        return FFprobe.getMediaInformation(path);
-    }
-
-    @Override
-    protected void onPostExecute(final MediaInformation mediaInformation) {
-        if (getMediaInformationCallback != null) {
-            getMediaInformationCallback.apply(mediaInformation);
-        }
-    }
-
-}

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

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 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;
-
-import android.content.Context;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
-import android.os.Build;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.content.Context.CAMERA_SERVICE;
-import static com.arthenica.mobileffmpeg.Config.TAG;
-
-/**
- * Utility class for camera devices.
- *
- * @author Taner Sener
- */
-class CameraSupport {
-
-    /**
-     * <p>Compatibility method for extracting supported camera ids.
-     *
-     * @param context application context
-     * @return returns the list of supported camera ids
-     */
-    static List<String> extractSupportedCameraIds(final Context context) {
-        final List<String> detectedCameraIdList = new ArrayList<>();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            try {
-                final CameraManager manager = (CameraManager) context.getSystemService(CAMERA_SERVICE);
-                if (manager != null) {
-                    final String[] cameraIdList = manager.getCameraIdList();
-
-                    for (String cameraId : cameraIdList) {
-                        final CameraCharacteristics chars = manager.getCameraCharacteristics(cameraId);
-                        final Integer cameraSupport = chars.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
-
-                        if (cameraSupport != null && cameraSupport == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
-                            Log.d(TAG, "Detected camera with id " + cameraId + " has LEGACY hardware level which is not supported by Android Camera2 NDK API.");
-                        } else if (cameraSupport != null) {
-                            detectedCameraIdList.add(cameraId);
-                        }
-                    }
-                }
-            } catch (final CameraAccessException e) {
-                Log.w(TAG, "Detecting camera ids failed.", e);
-            }
-        }
-
-        return detectedCameraIdList;
-    }
-
-}

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.
  *
@@ -20,60 +20,49 @@
 package com.arthenica.mobileffmpeg;
 
 import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.ParcelFileDescriptor;
-import android.provider.DocumentsContract;
+import android.system.ErrnoException;
+import android.system.Os;
 import android.util.Log;
-import android.util.SparseArray;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.arthenica.mobileffmpeg.FFmpeg.getVersion;
+
 /**
  * <p>This class is used to configure MobileFFmpeg library utilities/tools.
  *
- * <p>1. {@link LogCallback}: This class redirects FFmpeg/FFprobe output to Logcat by default. As
- * an alternative, it is possible not to print messages to Logcat and pass them to a
- * {@link LogCallback} function. This function can decide whether to print these logs, show them
- * inside another container or ignore them.
+ * <p>1. {@link LogCallback}: By default this class redirects FFmpeg output to Logcat. As another
+ * option, it is possible not to print messages to Logcat and pass them to a {@link LogCallback}
+ * function. This function can decide whether to print these logs, show them inside another
+ * container or ignore them.
  *
- * <p>2. {@link #setLogLevel(Level)}/{@link #getLogLevel()}: Use this methods to set/get
- * FFmpeg/FFprobe log severity.
+ * <p>2. {@link #setLogLevel(Level)}/{@link #getLogLevel()}: Use this methods to see/control FFmpeg
+ * log severity.
  *
- * <p>3. {@link StatisticsCallback}: It is possible to receive statistics about an ongoing
- * operation by defining a {@link StatisticsCallback} function or by calling
- * {@link #getLastReceivedStatistics()} method.
+ * <p>3. {@link StatisticsCallback}: It is possible to receive statistics about ongoing operation by
+ * defining a {@link StatisticsCallback} function or by calling {@link #getLastReceivedStatistics()}
+ * method.
  *
  * <p>4. Font configuration: It is possible to register custom fonts with
  * {@link #setFontconfigConfigurationPath(String)} and
  * {@link #setFontDirectory(Context, String, Map)} methods.
  *
+ * <p>PS: This class is introduced in v2.1 as an enhanced version of older <code>Log</code> class.
+ *
  * @author Taner Sener
  * @since v2.1
  */
 public class Config {
 
-    public static final int RETURN_CODE_SUCCESS = 0;
-
-    public static final int RETURN_CODE_CANCEL = 255;
-
-    private static int lastReturnCode = 0;
-
     /**
      * Defines tag used for logging.
      */
     public static final String TAG = "mobile-ffmpeg";
 
-    public static final String MOBILE_FFMPEG_PIPE_PREFIX = "mf_pipe_";
-
     private static LogCallback logCallbackFunction;
 
     private static Level activeLogLevel;
@@ -82,89 +71,41 @@ public class Config {
 
     private static Statistics lastReceivedStatistics;
 
-    private static int lastCreatedPipeIndex;
-
-    private static final List<FFmpegExecution> executions;
-    private static SparseArray<ParcelFileDescriptor> pfdmap = new SparseArray<>();
-
     static {
 
         Log.i(Config.TAG, "Loading mobile-ffmpeg.");
 
-        boolean nativeFFmpegLoaded = false;
-        boolean nativeFFmpegTriedAndFailed = false;
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-
-            /* LOADING LIBRARIES MANUALLY ON API < 21 */
-            final List<String> externalLibrariesEnabled = getExternalLibraries();
-            if (externalLibrariesEnabled.contains("tesseract") || externalLibrariesEnabled.contains("x265") || externalLibrariesEnabled.contains("snappy") || externalLibrariesEnabled.contains("openh264") || externalLibrariesEnabled.contains("rubberband")) {
-                System.loadLibrary("c++_shared");
-            }
-
-            if (AbiDetect.ARM_V7A.equals(AbiDetect.getNativeAbi())) {
-                try {
-                    System.loadLibrary("avutil_neon");
-                    System.loadLibrary("swscale_neon");
-                    System.loadLibrary("swresample_neon");
-                    System.loadLibrary("avcodec_neon");
-                    System.loadLibrary("avformat_neon");
-                    System.loadLibrary("avfilter_neon");
-                    System.loadLibrary("avdevice_neon");
-                    nativeFFmpegLoaded = true;
-                } catch (final UnsatisfiedLinkError e) {
-                    Log.i(Config.TAG, "NEON supported armeabi-v7a ffmpeg library not found. Loading default armeabi-v7a library.", e);
-                    nativeFFmpegTriedAndFailed = true;
-                }
-            }
-
-            if (!nativeFFmpegLoaded) {
-                System.loadLibrary("avutil");
-                System.loadLibrary("swscale");
-                System.loadLibrary("swresample");
-                System.loadLibrary("avcodec");
-                System.loadLibrary("avformat");
-                System.loadLibrary("avfilter");
-                System.loadLibrary("avdevice");
-            }
-        }
-
-        /* ALL MOBILE-FFMPEG LIBRARIES LOADED AT STARTUP */
-        Abi.class.getName();
+        /* ALL LIBRARIES LOADED AT STARTUP */
+        String abiName = AbiDetect.getAbi();
+        Abi abi = Abi.from(abiName);
         FFmpeg.class.getName();
-        FFprobe.class.getName();
 
-        boolean nativeMobileFFmpegLoaded = false;
-        if (!nativeFFmpegTriedAndFailed && AbiDetect.ARM_V7A.equals(AbiDetect.getNativeAbi())) {
+        /*
+         * NEON supported arm-v7a library has a different name
+         */
+        boolean nativeLibraryLoaded = false;
+        if (abi == Abi.ABI_ARMV7A_NEON) {
             try {
-
-                /*
-                 * THE TRY TO LOAD ARM-V7A-NEON FIRST. IF NOT LOAD DEFAULT ARM-V7A
-                 */
-
-                System.loadLibrary("mobileffmpeg_armv7a_neon");
-                nativeMobileFFmpegLoaded = true;
-                AbiDetect.setArmV7aNeonLoaded(true);
+                System.loadLibrary("mobileffmpeg-armv7a-neon");
+                nativeLibraryLoaded = true;
             } catch (final UnsatisfiedLinkError e) {
-                Log.i(Config.TAG, "NEON supported armeabi-v7a mobileffmpeg library not found. Loading default armeabi-v7a library.", e);
+                Log.i(Config.TAG, "NEON supported armeabi-v7a library not found. Loading default armeabi-v7a library.", e);
+                abi = Abi.ABI_ARMV7A;
             }
         }
 
-        if (!nativeMobileFFmpegLoaded) {
+        if (!nativeLibraryLoaded) {
             System.loadLibrary("mobileffmpeg");
         }
 
-        Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s-%s-%s.", getPackageName(), AbiDetect.getAbi(), getVersion(), getBuildDate()));
+        Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s.", abi.getName(), getVersion()));
 
         /* NATIVE LOG LEVEL IS RECEIVED ONLY ON STARTUP */
         activeLogLevel = Level.from(getNativeLogLevel());
 
         lastReceivedStatistics = new Statistics();
 
-        enableRedirection();
-
-        lastCreatedPipeIndex = 0;
-
-        executions = Collections.synchronizedList(new ArrayList<FFmpegExecution>());
+        Config.enableRedirection();
     }
 
     /**
@@ -175,15 +116,14 @@ public class Config {
 
     /**
      * <p>Enables log and statistics redirection.
-     * <p>When redirection is not enabled FFmpeg/FFprobe logs are printed to stderr. By enabling
-     * redirection, they are routed to Logcat and can be routed further to a callback function.
-     * <p>Statistics redirection behaviour is similar. Statistics are not printed at all if
-     * redirection is not enabled. If it is enabled then it is possible to define a statistics
-     * callback function but if you don't, they are not printed anywhere and only saved as
-     * <code>lastReceivedStatistics</code> data which can be polled with
+     * <p>When redirection is not enabled FFmpeg logs are printed to stderr. By enabling redirection, they are routed
+     * to Logcat and can be routed further to a callback function.
+     * <p>Statistics redirection behaviour is similar. Statistics are not printed at all if redirection is not enabled.
+     * If it is enabled then it is possible to define a statistics callback function but if you don't, they are not
+     * printed anywhere and only saved as <code>lastReceivedStatistics</code> data which can be polled with
      * {@link #getLastReceivedStatistics()}.
-     * <p>Note that redirection is enabled by default. If you do not want to use its functionality
-     * please use {@link #disableRedirection()} to disable it.
+     * <p>Note that redirection is enabled by default. If you do not want to use its functionality please use
+     * {@link #disableRedirection()} to disable it.
      */
     public static void enableRedirection() {
         enableNativeRedirection();
@@ -218,7 +158,7 @@ public class Config {
     }
 
     /**
-     * <p>Sets a callback function to redirect FFmpeg/FFprobe logs.
+     * <p>Sets a callback function to redirect FFmpeg logs.
      *
      * @param newLogCallback new log callback function or NULL to disable a previously defined callback
      */
@@ -238,26 +178,20 @@ public class Config {
     /**
      * <p>Log redirection method called by JNI/native part.
      *
-     * @param executionId id of the execution that generated this log, 0 by default
-     * @param levelValue  log level as defined in {@link Level}
-     * @param logMessage  redirected log message
+     * @param levelValue log level as defined in {@link Level}
+     * @param logMessage redirected log message
      */
-    private static void log(final long executionId, final int levelValue, final byte[] logMessage) {
+    private static void log(final int levelValue, final byte[] logMessage) {
         final Level level = Level.from(levelValue);
         final String text = new String(logMessage);
 
-        // AV_LOG_STDERR logs are always redirected
-        if ((activeLogLevel == Level.AV_LOG_QUIET && levelValue != Level.AV_LOG_STDERR.getValue()) || levelValue > activeLogLevel.getValue()) {
+        if (activeLogLevel == Level.AV_LOG_QUIET || levelValue > activeLogLevel.getValue()) {
             // LOG NEITHER PRINTED NOR FORWARDED
             return;
         }
 
         if (logCallbackFunction != null) {
-            try {
-                logCallbackFunction.apply(new LogMessage(executionId, level, text));
-            } catch (final Exception e) {
-                Log.e(Config.TAG, "Exception thrown inside LogCallback block", e);
-            }
+            logCallbackFunction.apply(new LogMessage(level, text));
         } else {
             switch (level) {
                 case AV_LOG_QUIET: {
@@ -269,7 +203,6 @@ public class Config {
                     android.util.Log.d(TAG, text);
                 }
                 break;
-                case AV_LOG_STDERR:
                 case AV_LOG_VERBOSE: {
                     android.util.Log.v(TAG, text);
                 }
@@ -299,27 +232,22 @@ public class Config {
     /**
      * <p>Statistics redirection method called by JNI/native part.
      *
-     * @param executionId      id of the execution that generated this statistics, 0 by default
      * @param videoFrameNumber last processed frame number for videos
-     * @param videoFps         frames processed per second for videos
-     * @param videoQuality     quality of the video stream
-     * @param size             size in bytes
-     * @param time             processed duration in milliseconds
-     * @param bitrate          output bit rate in kbits/s
-     * @param speed            processing speed = processed duration / operation duration
+     * @param videoFps frames processed per second for videos
+     * @param videoQuality quality of the video stream
+     * @param size size in bytes
+     * @param time processed duration in milliseconds
+     * @param bitrate output bit rate in kbits/s
+     * @param speed processing speed = processed duration / operation duration
      */
-    private static void statistics(final long executionId, final int videoFrameNumber,
-                                   final float videoFps, final float videoQuality, final long size,
-                                   final int time, final double bitrate, final double speed) {
-        final Statistics newStatistics = new Statistics(executionId, videoFrameNumber, videoFps, videoQuality, size, time, bitrate, speed);
+    private static void statistics(final int videoFrameNumber, final float videoFps,
+                              final float videoQuality, final long size, final int time,
+                              final double bitrate, final double speed) {
+        final Statistics newStatistics = new Statistics(videoFrameNumber, videoFps, videoQuality, size, time, bitrate, speed);
         lastReceivedStatistics.update(newStatistics);
 
         if (statisticsCallbackFunction != null) {
-            try {
-                statisticsCallbackFunction.apply(lastReceivedStatistics);
-            } catch (final Exception e) {
-                Log.e(Config.TAG, "Exception thrown inside StatisticsCallback block", e);
-            }
+            statisticsCallbackFunction.apply(lastReceivedStatistics);
         }
     }
 
@@ -343,10 +271,10 @@ public class Config {
      * <p>Sets and overrides <code>fontconfig</code> configuration directory.
      *
      * @param path directory which contains fontconfig configuration (fonts.conf)
-     * @return zero on success, non-zero on error
+     * @throws ErrnoException if an error occurs
      */
-    public static int setFontconfigConfigurationPath(final String path) {
-        return setNativeEnvironmentVariable("FONTCONFIG_PATH", path);
+    public static void setFontconfigConfigurationPath(final String path) throws ErrnoException {
+        Os.setenv("FONTCONFIG_PATH", path, true);
     }
 
     /**
@@ -420,7 +348,7 @@ public class Config {
 
             Log.d(TAG, String.format("Font directory %s registered successfully.", fontDirectoryPath));
 
-        } catch (final IOException e) {
+        } catch (final ErrnoException | IOException e) {
             Log.e(TAG, String.format("Failed to set font directory: %s.", fontDirectoryPath), e);
         } finally {
             if (reference.get() != null) {
@@ -433,245 +361,6 @@ public class Config {
         }
     }
 
-    /**
-     * <p>Returns package name.
-     *
-     * @return guessed package name according to supported external libraries
-     * @since 3.0
-     */
-    public static String getPackageName() {
-        return Packages.getPackageName();
-    }
-
-    /**
-     * <p>Returns supported external libraries.
-     *
-     * @return list of supported external libraries
-     * @since 3.0
-     */
-    public static List<String> getExternalLibraries() {
-        return Packages.getExternalLibraries();
-    }
-
-    /**
-     * <p>Creates a new named pipe to use in <code>FFmpeg</code> operations.
-     *
-     * <p>Please note that creator is responsible of closing created pipes.
-     *
-     * @param context application context
-     * @return the full path of named pipe
-     */
-    public static String registerNewFFmpegPipe(final Context context) {
-
-        // PIPES ARE CREATED UNDER THE CACHE DIRECTORY
-        final File cacheDir = context.getCacheDir();
-
-        final String newFFmpegPipePath = cacheDir + File.separator + MOBILE_FFMPEG_PIPE_PREFIX + (++lastCreatedPipeIndex);
-
-        // FIRST CLOSE OLD PIPES WITH THE SAME NAME
-        closeFFmpegPipe(newFFmpegPipePath);
-
-        int rc = registerNewNativeFFmpegPipe(newFFmpegPipePath);
-        if (rc == 0) {
-            return newFFmpegPipePath;
-        } else {
-            Log.e(TAG, String.format("Failed to register new FFmpeg pipe %s. Operation failed with rc=%d.", newFFmpegPipePath, rc));
-            return null;
-        }
-    }
-
-    /**
-     * <p>Closes a previously created <code>FFmpeg</code> pipe.
-     *
-     * @param ffmpegPipePath full path of ffmpeg pipe
-     */
-    public static void closeFFmpegPipe(final String ffmpegPipePath) {
-        File file = new File(ffmpegPipePath);
-        if (file.exists()) {
-            file.delete();
-        }
-    }
-
-    /**
-     * Returns the list of camera ids supported.
-     *
-     * @param context application context
-     * @return the list of camera ids supported or an empty list if no supported camera is found
-     */
-    public static List<String> getSupportedCameraIds(final Context context) {
-        final List<String> detectedCameraIdList = new ArrayList<>();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            detectedCameraIdList.addAll(CameraSupport.extractSupportedCameraIds(context));
-        }
-
-        return detectedCameraIdList;
-    }
-
-    /**
-     * <p>Returns FFmpeg version bundled within the library.
-     *
-     * @return FFmpeg version
-     */
-    public static String getFFmpegVersion() {
-        return getNativeFFmpegVersion();
-    }
-
-    /**
-     * <p>Returns MobileFFmpeg library version.
-     *
-     * @return MobileFFmpeg version
-     */
-    public static String getVersion() {
-        if (isLTSBuild()) {
-            return String.format("%s-lts", getNativeVersion());
-        } else {
-            return getNativeVersion();
-        }
-    }
-
-    /**
-     * <p>Returns whether MobileFFmpeg release is a long term release or not.
-     *
-     * @return YES or NO
-     */
-    public static boolean isLTSBuild() {
-        return AbiDetect.isNativeLTSBuild();
-    }
-
-    /**
-     * <p>Returns MobileFFmpeg library build date.
-     *
-     * @return MobileFFmpeg library build date
-     */
-    public static String getBuildDate() {
-        return getNativeBuildDate();
-    }
-
-    /**
-     * <p>Returns return code of last executed command.
-     *
-     * @return return code of last executed command
-     * @since 3.0
-     */
-    public static int getLastReturnCode() {
-        return lastReturnCode;
-    }
-
-    /**
-     * <p>Returns log output of last executed single FFmpeg/FFprobe command.
-     *
-     * <p>This method does not support executing multiple concurrent commands. If you execute
-     * multiple commands at the same time, this method will return output from all executions.
-     *
-     * <p>Please note that disabling redirection using {@link Config#disableRedirection()} method
-     * also disables this functionality.
-     *
-     * @return output of the last executed command
-     * @since 3.0
-     */
-    public static String getLastCommandOutput() {
-        String nativeLastCommandOutput = getNativeLastCommandOutput();
-        if (nativeLastCommandOutput != null) {
-
-            // REPLACING CH(13) WITH CH(10)
-            nativeLastCommandOutput = nativeLastCommandOutput.replace('\r', '\n');
-        }
-        return nativeLastCommandOutput;
-    }
-
-    /**
-     * <p>Prints the output of the last executed FFmpeg/FFprobe command to the Logcat at the
-     * specified priority.
-     *
-     * <p>This method does not support executing multiple concurrent commands. If you execute
-     * multiple commands at the same time, this method will print output from all executions.
-     *
-     * @param logPriority one of {@link Log#VERBOSE}, {@link Log#DEBUG}, {@link Log#INFO},
-     *                    {@link Log#WARN}, {@link Log#ERROR}, {@link Log#ASSERT}
-     * @since 4.3
-     */
-    public static void printLastCommandOutput(int logPriority) {
-        final int LOGGER_ENTRY_MAX_LEN = 4 * 1000;
-
-        String buffer = getLastCommandOutput();
-        do {
-            if (buffer.length() <= LOGGER_ENTRY_MAX_LEN) {
-                Log.println(logPriority, Config.TAG, buffer);
-                buffer = "";
-            } else {
-                final int index = buffer.substring(0, LOGGER_ENTRY_MAX_LEN).lastIndexOf('\n');
-                if (index < 0) {
-                    Log.println(logPriority, Config.TAG, buffer.substring(0, LOGGER_ENTRY_MAX_LEN));
-                    buffer = buffer.substring(LOGGER_ENTRY_MAX_LEN);
-                } else {
-                    Log.println(logPriority, Config.TAG, buffer.substring(0, index));
-                    buffer = buffer.substring(index);
-                }
-            }
-        } while (buffer.length() > 0);
-    }
-
-    /**
-     * <p>Sets an environment variable.
-     *
-     * @param variableName  environment variable name
-     * @param variableValue environment variable value
-     * @return zero on success, non-zero on error
-     */
-    public static int setEnvironmentVariable(final String variableName, final String variableValue) {
-        return setNativeEnvironmentVariable(variableName, variableValue);
-    }
-
-    /**
-     * <p>Registers a new ignored signal. Ignored signals are not handled by the library.
-     *
-     * @param signal signal number to ignore
-     */
-    public static void ignoreSignal(final Signal signal) {
-        ignoreNativeSignal(signal.getValue());
-    }
-
-    /**
-     * <p>Synchronously executes FFmpeg with arguments provided.
-     *
-     * @param executionId id of the execution
-     * @param arguments   FFmpeg command options/arguments as string array
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
-     */
-    static int ffmpegExecute(final long executionId, final String[] arguments) {
-        final FFmpegExecution currentFFmpegExecution = new FFmpegExecution(executionId, arguments);
-        executions.add(currentFFmpegExecution);
-
-        try {
-            final int lastReturnCode = nativeFFmpegExecute(executionId, arguments);
-
-            Config.setLastReturnCode(lastReturnCode);
-
-            return lastReturnCode;
-        } finally {
-            executions.remove(currentFFmpegExecution);
-        }
-    }
-
-    /**
-     * Updates return code value for the last executed command.
-     *
-     * @param newLastReturnCode new last return code value
-     */
-    static void setLastReturnCode(int newLastReturnCode) {
-        lastReturnCode = newLastReturnCode;
-    }
-
-    /**
-     * <p>Lists ongoing FFmpeg executions.
-     *
-     * @return list of ongoing FFmpeg executions
-     */
-    static List<FFmpegExecution> listFFmpegExecutions() {
-        return new ArrayList<>(executions);
-    }
-
     /**
      * <p>Enables native redirection. Necessary for log and statistics callback functions.
      */
@@ -701,132 +390,28 @@ public class Config {
      *
      * @return FFmpeg version
      */
-    private native static String getNativeFFmpegVersion();
+    native static String getNativeFFmpegVersion();
 
     /**
      * <p>Returns MobileFFmpeg library version natively.
      *
      * @return MobileFFmpeg version
      */
-    private native static String getNativeVersion();
+    native static String getNativeVersion();
 
     /**
      * <p>Synchronously executes FFmpeg natively with arguments provided.
      *
-     * @param executionId id of the execution
-     * @param arguments   FFmpeg command options/arguments as string array
+     * @param arguments FFmpeg command options/arguments as string array
      * @return zero on successful execution, 255 on user cancel and non-zero on error
      */
-    private native static int nativeFFmpegExecute(final long executionId, final String[] arguments);
+    native static int nativeExecute(final String[] arguments);
 
     /**
-     * <p>Cancels an ongoing FFmpeg operation natively. This function does not wait for termination
-     * to complete and returns immediately.
+     * <p>Cancels an ongoing operation natively.
      *
-     * @param executionId id of the execution
+     * <p>This function does not wait for termination to complete and returns immediately.
      */
-    native static void nativeFFmpegCancel(final long executionId);
+    native static void nativeCancel();
 
-    /**
-     * <p>Synchronously executes FFprobe natively with arguments provided.
-     *
-     * @param arguments FFprobe command options/arguments as string array
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
-     */
-    native static int nativeFFprobeExecute(final String[] arguments);
-
-    /**
-     * <p>Creates natively a new named pipe to use in <code>FFmpeg</code> operations.
-     *
-     * <p>Please note that creator is responsible of closing created pipes.
-     *
-     * @param ffmpegPipePath full path of ffmpeg pipe
-     * @return zero on successful creation, non-zero on error
-     */
-    private native static int registerNewNativeFFmpegPipe(final String ffmpegPipePath);
-
-    /**
-     * <p>Returns MobileFFmpeg library build date natively.
-     *
-     * @return MobileFFmpeg library build date
-     */
-    private native static String getNativeBuildDate();
-
-    /**
-     * <p>Sets an environment variable natively.
-     *
-     * @param variableName  environment variable name
-     * @param variableValue environment variable value
-     * @return zero on success, non-zero on error
-     */
-    private native static int setNativeEnvironmentVariable(final String variableName, final String variableValue);
-
-    /**
-     * <p>Returns log output of the last executed single command natively.
-     *
-     * @return output of the last executed single command
-     */
-    private native static String getNativeLastCommandOutput();
-
-    /**
-     * <p>Registers a new ignored signal natively. Ignored signals are not handled by the library.
-     *
-     * @param signum signal number
-     */
-    private native static void ignoreNativeSignal(final int signum);
-
-    /**
-     * <p>Convert Structured Access Framework Uri (<code></code>"content:…"</code>) for MobileFfmpeg.
-     *
-     * @return String can be passed to FFmpeg or FFprobe
-     */
-    private static String getSafParameter(Context context, Uri uri, String openMode) {
-
-        String displayName = "unknown";
-        try (Cursor cursor = context.getContentResolver().query(uri, null, null, null, null)) {
-            if (cursor != null && cursor.moveToFirst()) {
-                displayName = cursor.getString(cursor.getColumnIndex(DocumentsContract.Document.COLUMN_DISPLAY_NAME));
-            }
-        } catch (Throwable ex) {
-            Log.e(TAG, "failed to get column", ex);
-        }
-
-        int fd = -1;
-        try {
-            ParcelFileDescriptor parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, openMode);
-            fd = parcelFileDescriptor.getFd();
-            pfdmap.put(fd, parcelFileDescriptor);
-        } catch (Throwable e) {
-            Log.e(TAG, "obtaining " + openMode + " ParcelFileDescriptor for " + uri, e);
-        }
-
-        // workaround for https://issuetracker.google.com/issues/162440528: ANDROID_CREATE_DOCUMENT generating file names like "transcode.mp3 (2)"
-        if (displayName.lastIndexOf('.') > 0 && displayName.lastIndexOf(' ') > displayName.lastIndexOf('.')) {
-            String extension = displayName.substring(displayName.lastIndexOf('.'), displayName.lastIndexOf(' '));
-            displayName += extension;
-        }
-        // spaces can break argument list parsing, see https://github.com/alexcohn/mobile-ffmpeg/pull/1#issuecomment-688643836
-        final char NBSP = (char)0xa0;
-        return "saf:" + fd + "/" + displayName.replace(' ', NBSP);
-    }
-
-    public static String getSafParameterForRead(Context context, Uri uri) {
-        return getSafParameter(context, uri, "r");
-    }
-
-    public static String getSafParameterForWrite(Context context, Uri uri) {
-        return getSafParameter(context, uri, "w");
-    }
-
-    private static void closeParcelFileDescriptor(int fd) {
-        try {
-            ParcelFileDescriptor pfd = pfdmap.get(fd);
-            if (pfd != null) {
-                pfd.close();
-                pfdmap.delete(fd);
-            }
-        } catch (Throwable e) {
-            Log.e(TAG, "closeParcelFileDescriptor " + fd, e);
-        }
-    }
 }

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

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2018-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;
-
-/**
- * <p>Represents a callback function to receive an asynchronous execution result.
- *
- * @author Taner Sener
- * @since v2.1
- */
-@FunctionalInterface
-public interface ExecuteCallback {
-
-    /**
-     * <p>Called when an asynchronous FFmpeg execution is completed.
-     *
-     * @param executionId id of the execution that completed
-     * @param returnCode  return code of the execution completed, 0 on successful completion, 255
-     *                    on user cancel, other non-zero codes on error
-     */
-    void apply(long executionId, int returnCode);
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Taner Sener
+ * Copyright (c) 2018 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -19,33 +19,22 @@
 
 package com.arthenica.mobileffmpeg;
 
-import android.os.AsyncTask;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
- * <p>Main class for FFmpeg operations. Supports synchronous {@link #execute(String...)} and
- * asynchronous {@link #executeAsync(String, ExecuteCallback)} methods to execute FFmpeg commands.
+ * <p>Main class for FFmpeg operations. Provides {@link #execute(String...)} method to execute
+ * FFmpeg commands.
  * <pre>
- *      int rc = FFmpeg.execute("-i file1.mp4 -c:v libxvid file1.avi");
+ *      int rc = FFmpeg.execute("-i", "file1.mp4", "-c:v", "libxvid", "file1.avi");
  *      Log.i(Config.TAG, String.format("Command execution %s.", (rc == 0?"completed successfully":"failed with rc=" + rc));
  * </pre>
- * <pre>
- *      long executionId = FFmpeg.executeAsync("-i file1.mp4 -c:v libxvid file1.avi", executeCallback);
- *      Log.i(Config.TAG, String.format("Asynchronous execution %d started.", executionId));
- * </pre>
  *
  * @author Taner Sener
  * @since v1.0
  */
 public class FFmpeg {
 
-    static final long DEFAULT_EXECUTION_ID = 0;
+    public static final int RETURN_CODE_SUCCESS = 0;
 
-    private static final AtomicLong executionIdCounter = new AtomicLong(3000);
+    public static final int RETURN_CODE_CANCEL = 255;
 
     static {
         AbiDetect.class.getName();
@@ -58,112 +47,42 @@ public class FFmpeg {
     private FFmpeg() {
     }
 
+    /**
+     * <p>Returns FFmpeg version bundled within the library.
+     *
+     * @return FFmpeg version
+     */
+    public static String getFFmpegVersion() {
+        return Config.getNativeFFmpegVersion();
+    }
+
+    /**
+     * <p>Returns MobileFFmpeg library version.
+     *
+     * @return MobileFFmpeg version
+     */
+    public static String getVersion() {
+        return Config.getNativeVersion();
+    }
+
     /**
      * <p>Synchronously executes FFmpeg with arguments provided.
      *
      * @param arguments FFmpeg command options/arguments as string array
-     * @return 0 on successful execution, 255 on user cancel, other non-zero codes on error
+     * @return zero on successful execution, 255 on user cancel and non-zero on error
      */
     public static int execute(final String[] arguments) {
-        return Config.ffmpegExecute(DEFAULT_EXECUTION_ID, arguments);
+        return Config.nativeExecute(arguments);
     }
 
     /**
-     * <p>Asynchronously executes FFmpeg with arguments provided.
+     * <p>Synchronously executes FFmpeg with arguments provided.
      *
-     * @param arguments       FFmpeg command options/arguments as string array
-     * @param executeCallback callback that will be notified when execution is completed
-     * @return returns a unique id that represents this execution
+     * @param arguments FFmpeg command options/arguments in one string
+     * @return zero on successful execution, 255 on user cancel and non-zero on error
      */
-    public static long executeAsync(final String[] arguments, final ExecuteCallback executeCallback) {
-        final long newExecutionId = executionIdCounter.incrementAndGet();
-
-        AsyncFFmpegExecuteTask asyncFFmpegExecuteTask = new AsyncFFmpegExecuteTask(newExecutionId, arguments, executeCallback);
-        asyncFFmpegExecuteTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-
-        return newExecutionId;
-    }
-
-    /**
-     * <p>Asynchronously executes FFmpeg with arguments provided.
-     *
-     * @param arguments       FFmpeg command options/arguments as string array
-     * @param executeCallback callback that will be notified when execution is completed
-     * @param executor        executor that will be used to run this asynchronous operation
-     * @return returns a unique id that represents this execution
-     */
-    public static long executeAsync(final String[] arguments, final ExecuteCallback executeCallback, final Executor executor) {
-        final long newExecutionId = executionIdCounter.incrementAndGet();
-
-        AsyncFFmpegExecuteTask asyncFFmpegExecuteTask = new AsyncFFmpegExecuteTask(newExecutionId, arguments, executeCallback);
-        asyncFFmpegExecuteTask.executeOnExecutor(executor);
-
-        return newExecutionId;
-    }
-
-    /**
-     * <p>Synchronously executes FFmpeg command provided. Command is split into arguments using
-     * provided delimiter character.
-     *
-     * @param command   FFmpeg command
-     * @param delimiter delimiter used to split arguments
-     * @return 0 on successful execution, 255 on user cancel, other non-zero codes on error
-     * @since 3.0
-     * @deprecated argument splitting mechanism used in this method is pretty simple and prone to
-     * errors. Consider using a more advanced method like {@link #execute(String)} or
-     * {@link #execute(String[])}
-     */
-    public static int execute(final String command, final String delimiter) {
-        return execute((command == null) ? new String[]{""} : command.split((delimiter == null) ? " " : delimiter));
-    }
-
-    /**
-     * <p>Synchronously executes FFmpeg command provided. Space character is used to split command
-     * into arguments. You can use single and double quote characters to specify arguments inside
-     * your command.
-     *
-     * @param command FFmpeg command
-     * @return 0 on successful execution, 255 on user cancel, other non-zero codes on error
-     */
-    public static int execute(final String command) {
-        return execute(parseArguments(command));
-    }
-
-    /**
-     * <p>Asynchronously executes FFmpeg command provided. Space character is used to split command
-     * into arguments. You can use single and double quote characters to specify arguments inside
-     * your command.
-     *
-     * @param command         FFmpeg command
-     * @param executeCallback callback that will be notified when execution is completed
-     * @return returns a unique id that represents this execution
-     */
-    public static long executeAsync(final String command, final ExecuteCallback executeCallback) {
-        final long newExecutionId = executionIdCounter.incrementAndGet();
-
-        AsyncFFmpegExecuteTask asyncFFmpegExecuteTask = new AsyncFFmpegExecuteTask(newExecutionId, command, executeCallback);
-        asyncFFmpegExecuteTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-
-        return newExecutionId;
-    }
-
-    /**
-     * <p>Asynchronously executes FFmpeg command provided. Space character is used to split command
-     * into arguments. You can use single and double quote characters to specify arguments inside
-     * your command.
-     *
-     * @param command         FFmpeg command
-     * @param executeCallback callback that will be notified when execution is completed
-     * @param executor        executor that will be used to run this asynchronous operation
-     * @return returns a unique id that represents this execution
-     */
-    public static long executeAsync(final String command, final ExecuteCallback executeCallback, final Executor executor) {
-        final long newExecutionId = executionIdCounter.incrementAndGet();
-
-        AsyncFFmpegExecuteTask asyncFFmpegExecuteTask = new AsyncFFmpegExecuteTask(newExecutionId, command, executeCallback);
-        asyncFFmpegExecuteTask.executeOnExecutor(executor);
-
-        return newExecutionId;
+    public static int execute(final String arguments) {
+        return execute((arguments == null) ? new String[]{""} : arguments.split(" "));
     }
 
     /**
@@ -172,106 +91,7 @@ public class FFmpeg {
      * <p>This function does not wait for termination to complete and returns immediately.
      */
     public static void cancel() {
-        Config.nativeFFmpegCancel(DEFAULT_EXECUTION_ID);
-    }
-
-    /**
-     * <p>Cancels an ongoing operation.
-     *
-     * <p>This function does not wait for termination to complete and returns immediately.
-     *
-     * @param executionId id of the execution
-     */
-    public static void cancel(final long executionId) {
-        Config.nativeFFmpegCancel(executionId);
-    }
-
-    /**
-     * <p>Lists ongoing executions.
-     *
-     * @return list of ongoing executions
-     */
-    public static List<FFmpegExecution> listExecutions() {
-        return Config.listFFmpegExecutions();
-    }
-
-    /**
-     * <p>Parses the given command into arguments.
-     *
-     * @param command string command
-     * @return array of arguments
-     */
-    static String[] parseArguments(final String command) {
-        final List<String> argumentList = new ArrayList<>();
-        StringBuilder currentArgument = new StringBuilder();
-
-        boolean singleQuoteStarted = false;
-        boolean doubleQuoteStarted = false;
-
-        for (int i = 0; i < command.length(); i++) {
-            final Character previousChar;
-            if (i > 0) {
-                previousChar = command.charAt(i - 1);
-            } else {
-                previousChar = null;
-            }
-            final char currentChar = command.charAt(i);
-
-            if (currentChar == ' ') {
-                if (singleQuoteStarted || doubleQuoteStarted) {
-                    currentArgument.append(currentChar);
-                } else if (currentArgument.length() > 0) {
-                    argumentList.add(currentArgument.toString());
-                    currentArgument = new StringBuilder();
-                }
-            } else if (currentChar == '\'' && (previousChar == null || previousChar != '\\')) {
-                if (singleQuoteStarted) {
-                    singleQuoteStarted = false;
-                } else if (doubleQuoteStarted) {
-                    currentArgument.append(currentChar);
-                } else {
-                    singleQuoteStarted = true;
-                }
-            } else if (currentChar == '\"' && (previousChar == null || previousChar != '\\')) {
-                if (doubleQuoteStarted) {
-                    doubleQuoteStarted = false;
-                } else if (singleQuoteStarted) {
-                    currentArgument.append(currentChar);
-                } else {
-                    doubleQuoteStarted = true;
-                }
-            } else {
-                currentArgument.append(currentChar);
-            }
-        }
-
-        if (currentArgument.length() > 0) {
-            argumentList.add(currentArgument.toString());
-        }
-
-        return argumentList.toArray(new String[0]);
-    }
-
-    /**
-     * <p>Combines arguments into a string.
-     *
-     * @param arguments arguments
-     * @return string containing all arguments
-     */
-    static String argumentsToString(final String[] arguments) {
-        if (arguments == null) {
-            return "null";
-        }
-
-        StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < arguments.length; i++) {
-            if (i > 0) {
-                stringBuilder.append(" ");
-            }
-            stringBuilder.append(arguments[i]);
-        }
-
-        return stringBuilder.toString();
+        Config.nativeCancel();
     }
 
 }

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

@@ -1,53 +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 java.util.Date;
-
-/**
- * <p>Represents an ongoing FFmpeg execution.
- *
- * @author Taner Sener
- * @since v4.4
- */
-public class FFmpegExecution {
-    private final Date startTime;
-    private final long executionId;
-    private final String command;
-
-    public FFmpegExecution(final long executionId, final String[] arguments) {
-        this.startTime = new Date();
-        this.executionId = executionId;
-        this.command = FFmpeg.argumentsToString(arguments);
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public long getExecutionId() {
-        return executionId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-}

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

@@ -1,133 +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.util.Log;
-
-/**
- * <p>Main class for FFprobe operations. Provides {@link #execute(String...)} method to execute
- * FFprobe commands.
- * <pre>
- *      int rc = FFprobe.execute("-hide_banner -v error -show_entries format=size -of default=noprint_wrappers=1 file1.mp4");
- *      Log.i(Config.TAG, String.format("Command execution %s.", (rc == 0?"completed successfully":"failed with rc=" + rc));
- * </pre>
- *
- * @author Taner Sener
- * @since v4.3.1
- */
-public class FFprobe {
-
-    static {
-        AbiDetect.class.getName();
-        Config.class.getName();
-    }
-
-    /**
-     * Default constructor hidden.
-     */
-    private FFprobe() {
-    }
-
-    /**
-     * <p>Synchronously executes FFprobe with arguments provided.
-     *
-     * @param arguments FFprobe 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) {
-        final int lastReturnCode = Config.nativeFFprobeExecute(arguments);
-
-        Config.setLastReturnCode(lastReturnCode);
-
-        return lastReturnCode;
-    }
-
-    /**
-     * <p>Synchronously executes FFprobe command provided. Space character is used to split command
-     * into arguments. You can use single and double quote characters to specify arguments inside
-     * your command.
-     *
-     * @param command FFprobe command
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
-     */
-    public static int execute(final String command) {
-        return execute(FFmpeg.parseArguments(command));
-    }
-
-    /**
-     * <p>Returns media information for the given file.
-     *
-     * <p>This method does not support executing multiple concurrent operations. If you execute
-     * multiple operations (execute or getMediaInformation) at the same time, the response of this
-     * method is not predictable.
-     *
-     * @param path path or uri of media file
-     * @return media information
-     * @since 3.0
-     */
-    public static MediaInformation getMediaInformation(final String path) {
-        return getMediaInformationFromCommandArguments(new String[]{"-v", "error", "-hide_banner", "-print_format", "json", "-show_format", "-show_streams", "-i", path});
-    }
-
-    /**
-     * <p>Returns media information for the given command.
-     *
-     * <p>This method does not support executing multiple concurrent operations. If you execute
-     * multiple operations (execute or getMediaInformation) at the same time, the response of this
-     * method is not predictable.
-     *
-     * @param command command to execute
-     * @return media information
-     * @since 4.3.3
-     */
-    public static MediaInformation getMediaInformationFromCommand(final String command) {
-        return getMediaInformationFromCommandArguments(FFmpeg.parseArguments(command));
-    }
-
-    /**
-     * <p>Returns media information for given file.
-     *
-     * <p>This method does not support executing multiple concurrent operations. If you execute
-     * multiple operations (execute or getMediaInformation) at the same time, the response of this
-     * method is not predictable.
-     *
-     * @param path    path or uri of media file
-     * @param timeout complete timeout
-     * @return media information
-     * @since 3.0
-     * @deprecated this method is deprecated since v4.3.1. You can still use this method but
-     * <code>timeout</code> parameter is not effective anymore.
-     */
-    public static MediaInformation getMediaInformation(final String path, final Long timeout) {
-        return getMediaInformation(path);
-    }
-
-    private static MediaInformation getMediaInformationFromCommandArguments(final String[] arguments) {
-        final int rc = execute(arguments);
-
-        if (rc == 0) {
-            return MediaInformationParser.from(Config.getLastCommandOutput());
-        } else {
-            Log.w(Config.TAG, Config.getLastCommandOutput());
-            return null;
-        }
-    }
-
-}

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2018-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;
-
-/**
- * <p>Represents a callback function to receive asynchronous getMediaInformation result.
- *
- * @author Taner Sener
- */
-@FunctionalInterface
-public interface GetMediaInformationCallback {
-
-    void apply(MediaInformation mediaInformation);
-
-}

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

@@ -27,14 +27,6 @@ package com.arthenica.mobileffmpeg;
  */
 public enum Level {
 
-    /**
-     * This log level is defined by MobileFFmpeg. It is used to specify logs printed to stderr by
-     * ffmpeg. Logs that has this level are not filtered and always redirected.
-     *
-     * @since 4.3.1
-     */
-    AV_LOG_STDERR(-16),
-
     /**
      * Print no output.
      */
@@ -93,9 +85,7 @@ public enum Level {
      * @return enumeration defined by value
      */
     public static Level from(final int value) {
-        if (value == AV_LOG_STDERR.getValue()) {
-            return AV_LOG_STDERR;
-        } else if (value == AV_LOG_QUIET.getValue()) {
+        if (value == AV_LOG_QUIET.getValue()) {
             return AV_LOG_QUIET;
         } else if (value == AV_LOG_PANIC.getValue()) {
             return AV_LOG_PANIC;

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

@@ -20,7 +20,7 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Represents a callback function to receive logs from running executions
+ * <p>Represents a callback function to redirect logs.
  *
  * @author Taner Sener
  * @since v2.1

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

@@ -20,27 +20,21 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Logs for running executions.
+ * <p>Represents a redirected log message.
  *
  * @author Taner Sener
  * @since v2.1
  */
 public class LogMessage {
 
-    private final long executionId;
     private final Level level;
     private final String text;
 
-    public LogMessage(final long executionId, final Level level, final String text) {
-        this.executionId = executionId;
+    public LogMessage(final Level level, final String text) {
         this.level = level;
         this.text = text;
     }
 
-    public long getExecutionId() {
-        return executionId;
-    }
-
     public Level getLevel() {
         return level;
     }
@@ -49,21 +43,4 @@ public class LogMessage {
         return text;
     }
 
-    @Override
-    public String toString() {
-        final StringBuilder stringBuilder = new StringBuilder();
-
-        stringBuilder.append("LogMessage{");
-        stringBuilder.append("executionId=");
-        stringBuilder.append(executionId);
-        stringBuilder.append(", level=");
-        stringBuilder.append(level);
-        stringBuilder.append(", text=");
-        stringBuilder.append("\'");
-        stringBuilder.append(text);
-        stringBuilder.append('\'');
-        stringBuilder.append('}');
-
-        return stringBuilder.toString();
-    }
 }

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

@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2018, 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 org.json.JSONObject;
-
-import java.util.List;
-
-/**
- * Media information class.
- *
- * @since 3.0
- */
-public class MediaInformation {
-
-    private static final String KEY_MEDIA_PROPERTIES = "format";
-    private static final String KEY_FILENAME = "filename";
-    private static final String KEY_FORMAT = "format_name";
-    private static final String KEY_FORMAT_LONG = "format_long_name";
-    private static final String KEY_START_TIME = "start_time";
-    private static final String KEY_DURATION = "duration";
-    private static final String KEY_SIZE = "size";
-    private static final String KEY_BIT_RATE = "bit_rate";
-    private static final String KEY_TAGS = "tags";
-
-    /**
-     * Stores all properties.
-     */
-    private final JSONObject jsonObject;
-
-    /**
-     * Stores streams.
-     */
-    private final List<StreamInformation> streams;
-
-    public MediaInformation(final JSONObject jsonObject, final List<StreamInformation> streams) {
-        this.jsonObject = jsonObject;
-        this.streams = streams;
-    }
-
-    /**
-     * Returns file name.
-     *
-     * @return media file name
-     */
-    public String getFilename() {
-        return getStringProperty(KEY_FILENAME);
-    }
-
-    /**
-     * Returns format.
-     *
-     * @return media format
-     */
-    public String getFormat() {
-        return getStringProperty(KEY_FORMAT);
-    }
-
-    /**
-     * Returns long format.
-     *
-     * @return media long format
-     */
-    public String getLongFormat() {
-        return getStringProperty(KEY_FORMAT_LONG);
-    }
-
-    /**
-     * Returns duration.
-     *
-     * @return media duration in milliseconds
-     */
-    public String getDuration() {
-        return getStringProperty(KEY_DURATION);
-    }
-
-    /**
-     * Returns start time.
-     *
-     * @return media start time in milliseconds
-     */
-    public String getStartTime() {
-        return getStringProperty(KEY_START_TIME);
-    }
-
-    /**
-     * Returns size.
-     *
-     * @return media size in bytes
-     */
-    public String getSize() {
-        return getStringProperty(KEY_SIZE);
-    }
-
-    /**
-     * Returns bitrate.
-     *
-     * @return media bitrate in kb/s
-     */
-    public String getBitrate() {
-        return getStringProperty(KEY_BIT_RATE);
-    }
-
-    /**
-     * Returns all tags.
-     *
-     * @return tags dictionary
-     */
-    public JSONObject getTags() {
-        return getProperties(KEY_TAGS);
-    }
-
-    /**
-     * Returns all streams.
-     *
-     * @return list of streams
-     */
-    public List<StreamInformation> getStreams() {
-        return streams;
-    }
-
-    /**
-     * Returns the media property associated with the key.
-     *
-     * @param key property key
-     * @return media property as string or null if the key is not found
-     */
-    public String getStringProperty(final String key) {
-        JSONObject mediaProperties = getMediaProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        if (mediaProperties.has(key)) {
-            return mediaProperties.optString(key);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the media property associated with the key.
-     *
-     * @param key property key
-     * @return media property as Long or null if the key is not found
-     */
-    public Long getNumberProperty(String key) {
-        JSONObject mediaProperties = getMediaProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        if (mediaProperties.has(key)) {
-            return mediaProperties.optLong(key);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the media properties associated with the key.
-     *
-     * @param key properties key
-     * @return media properties as a JSONObject or null if the key is not found
-     */
-    public JSONObject getProperties(String key) {
-        JSONObject mediaProperties = getMediaProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        return mediaProperties.optJSONObject(key);
-    }
-
-    /**
-     * Returns all media properties.
-     *
-     * @return all media properties as a JSONObject or null if no media properties are defined
-     */
-    public JSONObject getMediaProperties() {
-        return jsonObject.optJSONObject(KEY_MEDIA_PROPERTIES);
-    }
-
-    /**
-     * Returns all properties defined.
-     *
-     * @return all properties as a JSONObject or null if no properties are defined
-     */
-    public JSONObject getAllProperties() {
-        return jsonObject;
-    }
-
-}

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

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2018, 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.util.Log;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-/**
- * Helper class for parsing {@link MediaInformation}.
- *
- * @since 3.0
- */
-public class MediaInformationParser {
-
-    /**
-     * Extracts MediaInformation from the given ffprobe json output.
-     *
-     * @param ffprobeJsonOutput ffprobe json output
-     * @return created {@link MediaInformation} instance of null if a parsing error occurs
-     */
-    public static MediaInformation from(final String ffprobeJsonOutput) {
-        try {
-            return fromWithError(ffprobeJsonOutput);
-        } catch (JSONException e) {
-            Log.e(Config.TAG, "MediaInformation parsing failed.", e);
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Extracts MediaInformation from the given ffprobe json output.
-     *
-     * @param ffprobeJsonOutput ffprobe json output
-     * @return created {@link MediaInformation} instance
-     * @throws JSONException if a parsing error occurs
-     */
-    public static MediaInformation fromWithError(final String ffprobeJsonOutput) throws JSONException {
-        JSONObject jsonObject = new JSONObject(ffprobeJsonOutput);
-        JSONArray streamArray = jsonObject.optJSONArray("streams");
-
-        ArrayList<StreamInformation> arrayList = new ArrayList<>();
-        for (int i = 0; streamArray != null && i < streamArray.length(); i++) {
-            JSONObject streamObject = streamArray.optJSONObject(i);
-            if (streamObject != null) {
-                arrayList.add(new StreamInformation(streamObject));
-            }
-        }
-
-        return new MediaInformation(jsonObject, arrayList);
-    }
-
-}

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

@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2018 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Provides helper methods to extract binary package information.
- *
- * @since 3.0
- */
-class Packages {
-
-    private static final List<String> supportedExternalLibraries;
-
-    static {
-        supportedExternalLibraries = new ArrayList<>();
-        supportedExternalLibraries.add("fontconfig");
-        supportedExternalLibraries.add("freetype");
-        supportedExternalLibraries.add("fribidi");
-        supportedExternalLibraries.add("gmp");
-        supportedExternalLibraries.add("gnutls");
-        supportedExternalLibraries.add("kvazaar");
-        supportedExternalLibraries.add("mp3lame");
-        supportedExternalLibraries.add("libaom");
-        supportedExternalLibraries.add("libass");
-        supportedExternalLibraries.add("iconv");
-        supportedExternalLibraries.add("libilbc");
-        supportedExternalLibraries.add("libtheora");
-        supportedExternalLibraries.add("libvidstab");
-        supportedExternalLibraries.add("libvorbis");
-        supportedExternalLibraries.add("libvpx");
-        supportedExternalLibraries.add("libwebp");
-        supportedExternalLibraries.add("libxml2");
-        supportedExternalLibraries.add("opencore-amr");
-        supportedExternalLibraries.add("openh264");
-        supportedExternalLibraries.add("opus");
-        supportedExternalLibraries.add("rubberband");
-        supportedExternalLibraries.add("sdl2");
-        supportedExternalLibraries.add("shine");
-        supportedExternalLibraries.add("snappy");
-        supportedExternalLibraries.add("soxr");
-        supportedExternalLibraries.add("speex");
-        supportedExternalLibraries.add("tesseract");
-        supportedExternalLibraries.add("twolame");
-        supportedExternalLibraries.add("wavpack");
-        supportedExternalLibraries.add("x264");
-        supportedExternalLibraries.add("x265");
-        supportedExternalLibraries.add("xvid");
-    }
-
-    /**
-     * Returns enabled external libraries by FFmpeg.
-     *
-     * @return enabled external libraries
-     */
-    static List<String> getExternalLibraries() {
-        final String buildConfiguration = AbiDetect.getNativeBuildConf();
-
-        final List<String> enabledLibraryList = new ArrayList<>();
-        for (String supportedExternalLibrary : supportedExternalLibraries) {
-            if (buildConfiguration.contains("enable-" + supportedExternalLibrary) ||
-                    buildConfiguration.contains("enable-lib" + supportedExternalLibrary)) {
-                enabledLibraryList.add(supportedExternalLibrary);
-            }
-        }
-
-        Collections.sort(enabledLibraryList);
-
-        return enabledLibraryList;
-    }
-
-    /**
-     * Returns MobileFFmpeg binary package name.
-     *
-     * @return guessed MobileFFmpeg binary package name
-     */
-    static String getPackageName() {
-        final List<String> externalLibraryList = getExternalLibraries();
-        final boolean speex = externalLibraryList.contains("speex");
-        final boolean fribidi = externalLibraryList.contains("fribidi");
-        final boolean gnutls = externalLibraryList.contains("gnutls");
-        final boolean xvid = externalLibraryList.contains("xvid");
-
-        boolean minGpl = false;
-        boolean https = false;
-        boolean httpsGpl = false;
-        boolean audio = false;
-        boolean video = false;
-        boolean full = false;
-        boolean fullGpl = false;
-
-        if (speex && fribidi) {
-            if (xvid) {
-                fullGpl = true;
-            } else {
-                full = true;
-            }
-        } else if (speex) {
-            audio = true;
-        } else if (fribidi) {
-            video = true;
-        } else if (xvid) {
-            if (gnutls) {
-                httpsGpl = true;
-            } else {
-                minGpl = true;
-            }
-        } else {
-            if (gnutls) {
-                https = true;
-            }
-        }
-
-        if (fullGpl) {
-            if (externalLibraryList.contains("fontconfig") &&
-                    externalLibraryList.contains("freetype") &&
-                    externalLibraryList.contains("fribidi") &&
-                    externalLibraryList.contains("gmp") &&
-                    externalLibraryList.contains("gnutls") &&
-                    externalLibraryList.contains("kvazaar") &&
-                    externalLibraryList.contains("mp3lame") &&
-                    externalLibraryList.contains("libaom") &&
-                    externalLibraryList.contains("libass") &&
-                    externalLibraryList.contains("iconv") &&
-                    externalLibraryList.contains("libilbc") &&
-                    externalLibraryList.contains("libtheora") &&
-                    externalLibraryList.contains("libvidstab") &&
-                    externalLibraryList.contains("libvorbis") &&
-                    externalLibraryList.contains("libvpx") &&
-                    externalLibraryList.contains("libwebp") &&
-                    externalLibraryList.contains("libxml2") &&
-                    externalLibraryList.contains("opencore-amr") &&
-                    externalLibraryList.contains("opus") &&
-                    externalLibraryList.contains("shine") &&
-                    externalLibraryList.contains("snappy") &&
-                    externalLibraryList.contains("soxr") &&
-                    externalLibraryList.contains("speex") &&
-                    externalLibraryList.contains("twolame") &&
-                    externalLibraryList.contains("wavpack") &&
-                    externalLibraryList.contains("x264") &&
-                    externalLibraryList.contains("x265") &&
-                    externalLibraryList.contains("xvid")) {
-                return "full-gpl";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (full) {
-            if (externalLibraryList.contains("fontconfig") &&
-                    externalLibraryList.contains("freetype") &&
-                    externalLibraryList.contains("fribidi") &&
-                    externalLibraryList.contains("gmp") &&
-                    externalLibraryList.contains("gnutls") &&
-                    externalLibraryList.contains("kvazaar") &&
-                    externalLibraryList.contains("mp3lame") &&
-                    externalLibraryList.contains("libaom") &&
-                    externalLibraryList.contains("libass") &&
-                    externalLibraryList.contains("iconv") &&
-                    externalLibraryList.contains("libilbc") &&
-                    externalLibraryList.contains("libtheora") &&
-                    externalLibraryList.contains("libvorbis") &&
-                    externalLibraryList.contains("libvpx") &&
-                    externalLibraryList.contains("libwebp") &&
-                    externalLibraryList.contains("libxml2") &&
-                    externalLibraryList.contains("opencore-amr") &&
-                    externalLibraryList.contains("opus") &&
-                    externalLibraryList.contains("shine") &&
-                    externalLibraryList.contains("snappy") &&
-                    externalLibraryList.contains("soxr") &&
-                    externalLibraryList.contains("speex") &&
-                    externalLibraryList.contains("twolame") &&
-                    externalLibraryList.contains("wavpack")) {
-                return "full";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (video) {
-            if (externalLibraryList.contains("fontconfig") &&
-                    externalLibraryList.contains("freetype") &&
-                    externalLibraryList.contains("fribidi") &&
-                    externalLibraryList.contains("kvazaar") &&
-                    externalLibraryList.contains("libaom") &&
-                    externalLibraryList.contains("libass") &&
-                    externalLibraryList.contains("iconv") &&
-                    externalLibraryList.contains("libtheora") &&
-                    externalLibraryList.contains("libvpx") &&
-                    externalLibraryList.contains("libwebp") &&
-                    externalLibraryList.contains("snappy")) {
-                return "video";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (audio) {
-            if (externalLibraryList.contains("mp3lame") &&
-                    externalLibraryList.contains("libilbc") &&
-                    externalLibraryList.contains("libvorbis") &&
-                    externalLibraryList.contains("opencore-amr") &&
-                    externalLibraryList.contains("opus") &&
-                    externalLibraryList.contains("shine") &&
-                    externalLibraryList.contains("soxr") &&
-                    externalLibraryList.contains("speex") &&
-                    externalLibraryList.contains("twolame") &&
-                    externalLibraryList.contains("wavpack")) {
-                return "audio";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (httpsGpl) {
-            if (externalLibraryList.contains("gmp") &&
-                    externalLibraryList.contains("gnutls") &&
-                    externalLibraryList.contains("libvidstab") &&
-                    externalLibraryList.contains("x264") &&
-                    externalLibraryList.contains("x265") &&
-                    externalLibraryList.contains("xvid")) {
-                return "https-gpl";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (https) {
-            if (externalLibraryList.contains("gmp") &&
-                    externalLibraryList.contains("gnutls")) {
-                return "https";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (minGpl) {
-            if (externalLibraryList.contains("libvidstab") &&
-                    externalLibraryList.contains("x264") &&
-                    externalLibraryList.contains("x265") &&
-                    externalLibraryList.contains("xvid")) {
-                return "min-gpl";
-            } else {
-                return "custom";
-            }
-        }
-
-        if (externalLibraryList.size() == 0) {
-            return "min";
-        } else {
-            return "custom";
-        }
-    }
-
-}

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

@@ -1,46 +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;
-
-/**
- * <p>Lists signals handled by MobileFFmpeg library.
- *
- * @author Taner Sener
- * @since v4.4
- */
-public enum Signal {
-
-    SIGINT(2),
-    SIGQUIT(3),
-    SIGPIPE(13),
-    SIGTERM(15),
-    SIGXCPU(24);
-
-    private int value;
-
-    Signal(int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-}

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

@@ -20,14 +20,13 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Statistics for running executions.
+ * <p>Represents statistics data.
  *
  * @author Taner Sener
  * @since v2.1
  */
 public class Statistics {
 
-    private long executionId;
     private int videoFrameNumber;
     private float videoFps;
     private float videoQuality;
@@ -37,7 +36,6 @@ public class Statistics {
     private double speed;
 
     public Statistics() {
-        executionId = 0;
         videoFrameNumber = 0;
         videoFps = 0;
         videoQuality = 0;
@@ -47,8 +45,7 @@ public class Statistics {
         speed = 0;
     }
 
-    public Statistics(long executionId, int videoFrameNumber, float videoFps, float videoQuality, long size, int time, double bitrate, double speed) {
-        this.executionId = executionId;
+    public Statistics(int videoFrameNumber, float videoFps, float videoQuality, long size, int time, double bitrate, double speed) {
         this.videoFrameNumber = videoFrameNumber;
         this.videoFps = videoFps;
         this.videoQuality = videoQuality;
@@ -60,44 +57,35 @@ public class Statistics {
 
     public void update(final Statistics newStatistics) {
         if (newStatistics != null) {
-            this.executionId = newStatistics.getExecutionId();
             if (newStatistics.getVideoFrameNumber() > 0) {
                 this.videoFrameNumber = newStatistics.getVideoFrameNumber();
             }
-            if (newStatistics.getVideoFps() > 0) {
+            if (newStatistics.getVideoFps() > 0){
                 this.videoFps = newStatistics.getVideoFps();
             }
 
-            if (newStatistics.getVideoQuality() > 0) {
+            if (newStatistics.getVideoQuality() > 0){
                 this.videoQuality = newStatistics.getVideoQuality();
             }
 
-            if (newStatistics.getSize() > 0) {
+            if (newStatistics.getSize() > 0){
                 this.size = newStatistics.getSize();
             }
 
-            if (newStatistics.getTime() > 0) {
+            if (newStatistics.getTime() > 0){
                 this.time = newStatistics.getTime();
             }
 
-            if (newStatistics.getBitrate() > 0) {
+            if (newStatistics.getBitrate() > 0){
                 this.bitrate = newStatistics.getBitrate();
             }
 
-            if (newStatistics.getSpeed() > 0) {
+            if (newStatistics.getSpeed() > 0){
                 this.speed = newStatistics.getSpeed();
             }
         }
     }
 
-    public long getExecutionId() {
-        return executionId;
-    }
-
-    public void setExecutionId(long executionId) {
-        this.executionId = executionId;
-    }
-
     public int getVideoFrameNumber() {
         return videoFrameNumber;
     }
@@ -154,30 +142,4 @@ public class Statistics {
         this.speed = speed;
     }
 
-    @Override
-    public String toString() {
-        final StringBuilder stringBuilder = new StringBuilder();
-
-        stringBuilder.append("Statistics{");
-        stringBuilder.append("executionId=");
-        stringBuilder.append(executionId);
-        stringBuilder.append(", videoFrameNumber=");
-        stringBuilder.append(videoFrameNumber);
-        stringBuilder.append(", videoFps=");
-        stringBuilder.append(videoFps);
-        stringBuilder.append(", videoQuality=");
-        stringBuilder.append(videoQuality);
-        stringBuilder.append(", size=");
-        stringBuilder.append(size);
-        stringBuilder.append(", time=");
-        stringBuilder.append(time);
-        stringBuilder.append(", bitrate=");
-        stringBuilder.append(bitrate);
-        stringBuilder.append(", speed=");
-        stringBuilder.append(speed);
-        stringBuilder.append('}');
-
-        return stringBuilder.toString();
-    }
-
 }

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

@@ -20,7 +20,7 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Represents a callback function to receive statistics from running executions.
+ * <p>Represents a callback function to receive statistics of running operation.
  *
  * @author Taner Sener
  * @since v2.1

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

@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2018, 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 org.json.JSONObject;
-
-/**
- * Stream information class.
- *
- * @since 3.0
- */
-public class StreamInformation {
-
-    private static final String KEY_INDEX = "index";
-    private static final String KEY_TYPE = "codec_type";
-    private static final String KEY_CODEC = "codec_name";
-    private static final String KEY_CODEC_LONG = "codec_long_name";
-    private static final String KEY_FORMAT = "pix_fmt";
-    private static final String KEY_WIDTH = "width";
-    private static final String KEY_HEIGHT = "height";
-    private static final String KEY_BIT_RATE = "bit_rate";
-    private static final String KEY_SAMPLE_RATE = "sample_rate";
-    private static final String KEY_SAMPLE_FORMAT = "sample_fmt";
-    private static final String KEY_CHANNEL_LAYOUT = "channel_layout";
-    private static final String KEY_SAMPLE_ASPECT_RATIO = "sample_aspect_ratio";
-    private static final String KEY_DISPLAY_ASPECT_RATIO = "display_aspect_ratio";
-    private static final String KEY_AVERAGE_FRAME_RATE = "avg_frame_rate";
-    private static final String KEY_REAL_FRAME_RATE = "r_frame_rate";
-    private static final String KEY_TIME_BASE = "time_base";
-    private static final String KEY_CODEC_TIME_BASE = "codec_time_base";
-    private static final String KEY_TAGS = "tags";
-
-    /**
-     * Stores all properties.
-     */
-    private final JSONObject jsonObject;
-
-    public StreamInformation(final JSONObject jsonObject) {
-        this.jsonObject = jsonObject;
-    }
-
-    /**
-     * Returns stream index.
-     *
-     * @return stream index, starting from zero
-     */
-    public Long getIndex() {
-        return getNumberProperty(KEY_INDEX);
-    }
-
-    /**
-     * Returns stream type.
-     *
-     * @return stream type; audio or video
-     */
-    public String getType() {
-        return getStringProperty(KEY_TYPE);
-    }
-
-    /**
-     * Returns stream codec.
-     *
-     * @return stream codec
-     */
-    public String getCodec() {
-        return getStringProperty(KEY_CODEC);
-    }
-
-    /**
-     * Returns full stream codec.
-     *
-     * @return stream codec with additional profile and mode information
-     */
-    public String getFullCodec() {
-        return getStringProperty(KEY_CODEC_LONG);
-    }
-
-    /**
-     * Returns stream format.
-     *
-     * @return stream format
-     */
-    public String getFormat() {
-        return getStringProperty(KEY_FORMAT);
-    }
-
-    /**
-     * Returns width.
-     *
-     * @return width in pixels
-     */
-    public Long getWidth() {
-        return getNumberProperty(KEY_WIDTH);
-    }
-
-    /**
-     * Returns height.
-     *
-     * @return height in pixels
-     */
-    public Long getHeight() {
-        return getNumberProperty(KEY_HEIGHT);
-    }
-
-    /**
-     * Returns bitrate.
-     *
-     * @return bitrate in kb/s
-     */
-    public String getBitrate() {
-        return getStringProperty(KEY_BIT_RATE);
-    }
-
-    /**
-     * Returns sample rate.
-     *
-     * @return sample rate in hz
-     */
-    public String getSampleRate() {
-        return getStringProperty(KEY_SAMPLE_RATE);
-    }
-
-    /**
-     * Returns sample format.
-     *
-     * @return sample format
-     */
-    public String getSampleFormat() {
-        return getStringProperty(KEY_SAMPLE_FORMAT);
-    }
-
-    /**
-     * Returns channel layout.
-     *
-     * @return channel layout
-     */
-    public String getChannelLayout() {
-        return getStringProperty(KEY_CHANNEL_LAYOUT);
-    }
-
-    /**
-     * Returns sample aspect ratio.
-     *
-     * @return sample aspect ratio
-     */
-    public String getSampleAspectRatio() {
-        return getStringProperty(KEY_SAMPLE_ASPECT_RATIO);
-    }
-
-    /**
-     * Returns display aspect ratio.
-     *
-     * @return display aspect ratio
-     */
-    public String getDisplayAspectRatio() {
-        return getStringProperty(KEY_DISPLAY_ASPECT_RATIO);
-    }
-
-    /**
-     * Returns display aspect ratio.
-     *
-     * @return average frame rate in fps
-     */
-    public String getAverageFrameRate() {
-        return getStringProperty(KEY_AVERAGE_FRAME_RATE);
-    }
-
-    /**
-     * Returns real frame rate.
-     *
-     * @return real frame rate in tbr
-     */
-    public String getRealFrameRate() {
-        return getStringProperty(KEY_REAL_FRAME_RATE);
-    }
-
-    /**
-     * Returns time base.
-     *
-     * @return time base in tbn
-     */
-    public String getTimeBase() {
-        return getStringProperty(KEY_TIME_BASE);
-    }
-
-    /**
-     * Returns codec time base.
-     *
-     * @return codec time base in tbc
-     */
-    public String getCodecTimeBase() {
-        return getStringProperty(KEY_CODEC_TIME_BASE);
-    }
-
-    /**
-     * Returns all tags.
-     *
-     * @return tags dictionary
-     */
-    public JSONObject getTags() {
-        return getProperties(KEY_TAGS);
-    }
-
-    /**
-     * Returns the stream property associated with the key.
-     *
-     * @param key property key
-     * @return stream property as string or null if the key is not found
-     */
-    public String getStringProperty(final String key) {
-        JSONObject mediaProperties = getAllProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        if (mediaProperties.has(key)) {
-            return mediaProperties.optString(key);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the stream property associated with the key.
-     *
-     * @param key property key
-     * @return stream property as Long or null if the key is not found
-     */
-    public Long getNumberProperty(String key) {
-        JSONObject mediaProperties = getAllProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        if (mediaProperties.has(key)) {
-            return mediaProperties.optLong(key);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the stream properties associated with the key.
-     *
-     * @param key properties key
-     * @return stream properties as a JSONObject or null if the key is not found
-     */
-    public JSONObject getProperties(String key) {
-        JSONObject mediaProperties = getAllProperties();
-        if (mediaProperties == null) {
-            return null;
-        }
-
-        return mediaProperties.optJSONObject(key);
-    }
-
-    /**
-     * Returns all stream properties defined.
-     *
-     * @return all stream properties as a JSONObject or null if no properties are defined
-     */
-    public JSONObject getAllProperties() {
-        return jsonObject;
-    }
-
-}

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018 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;
-
-public class Pair<A, B> {
-
-    /**
-     * The first element of the pair.
-     */
-    protected A first;
-
-    /**
-     * The second element of the pair.
-     */
-    protected B second;
-
-    public Pair(final A first, final B second) {
-        this.first = first;
-        this.second = second;
-    }
-
-    public A getFirst() {
-        return first;
-    }
-
-    public B getSecond() {
-        return second;
-    }
-
-}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018 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;
+
+/**
+ * <p>Represents a callback function to receive run result.
+ *
+ * @author Taner Sener
+ * @since v2.1
+ */
+@FunctionalInterface
+public interface RunCallback {
+
+    void apply(final int returnCode);
+
+}

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2018 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;
-
-public class Trio<A, B, C> {
-
-    /**
-     * The first element of the trio.
-     */
-    protected final A first;
-
-    /**
-     * The second element of the trio.
-     */
-    protected final B second;
-
-    /**
-     * The third element of the trio.
-     */
-    protected final C third;
-
-    public Trio(final A first, final B second, final C third) {
-        this.first = first;
-        this.second = second;
-        this.third = third;
-    }
-
-    public A getFirst() {
-        return first;
-    }
-
-    public B getSecond() {
-        return second;
-    }
-
-    public C getThird() {
-        return third;
-    }
-
-}

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">MobileFFmpeg</string>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

android/app/src/test/java/com/arthenica/mobileffmpeg/ConfigTest.java

@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2018, 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 org.junit.Assert;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Tests for {@link Config} class.
- */
-public class ConfigTest {
-
-    private static final String externalLibrariesCommandOutput = "   configuration:\n" +
-            "                          --cross-prefix=i686-linux-android-\n" +
-            "                          --sysroot=/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot\n" +
-            "                          --prefix=/Users/taner/Projects/mobile-ffmpeg/prebuilt/android-x86/ffmpeg\n" +
-            "                          --pkg-config=/usr/local/bin/pkg-config --extra-cflags='-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -Wno-unused-function -fstrict-aliasing -fPIC -DANDROID -D__ANDROID__ -D__ANDROID_API__=21 -O2 -I/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/include -I/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/local/include'\n" +
-            "                          --extra-cxxflags='-std=c++11 -fno-exceptions -fno-rtti'\n" +
-            "                          --extra-ldflags='-march=i686 -Wl,--gc-sections,--icf=safe -lc -lm -ldl -llog -lc++_shared -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/i686-linux-android/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/sysroot/usr/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/toolchains/mobile-ffmpeg-i686/lib -L/Users/taner/Library/Android/sdk/ndk-bundle/platforms/android-21/arch-x86/usr/lib'\n" +
-            "                          --enable-version3\n" +
-            "                          --arch=i686\n" +
-            "                          --cpu=i686\n" +
-            "                          --target-os=android\n" +
-            "                          --disable-neon\n" +
-            "                          --disable-asm\n" +
-            "                          --disable-inline-asm\n" +
-            "                          --enable-cross-compile\n" +
-            "                          --enable-pic\n" +
-            "                          --enable-jni\n" +
-            "                          --enable-libvorbis\n" +
-            "                          --enable-optimizations\n" +
-            "                          --enable-swscale\n" +
-            "                          --enable-shared\n" +
-            "                          --enable-v4l2-m2m\n" +
-            "                          --enable-small\n" +
-            "                          --disable-openssl\n" +
-            "                          --disable-xmm-clobber-test\n" +
-            "                          --disable-debug\n" +
-            "                          --disable-neon-clobber-test\n" +
-            "                          --disable-programs\n" +
-            "                          --disable-postproc\n" +
-            "                          --disable-doc\n" +
-            "                          --disable-htmlpages\n" +
-            "                          --disable-manpages\n" +
-            "                          --disable-podpages\n" +
-            "                          --disable-txtpages\n" +
-            "                          --disable-static\n" +
-            "                          --disable-sndio\n" +
-            "                          --disable-schannel\n" +
-            "                          --disable-securetransport\n" +
-            "                          --disable-xlib\n" +
-            "                          --disable-cuda\n" +
-            "                          --disable-cuvid\n" +
-            "                          --disable-nvenc\n" +
-            "                          --disable-vaapi\n" +
-            "                          --disable-vdpau\n" +
-            "                          --disable-videotoolbox\n" +
-            "                          --disable-audiotoolbox\n" +
-            "                          --disable-appkit\n" +
-            "                          --disable-alsa\n" +
-            "                          --disable-cuda\n" +
-            "                          --disable-cuvid\n" +
-            "                          --disable-nvenc\n" +
-            "                          --disable-vaapi\n" +
-            "                          --disable-vdpau\n" +
-            "                          --disable-zlib\n";
-
-    @Test
-    public void getExternalLibraries() {
-
-        final List<String> supportedExternalLibraries = new ArrayList<>();
-        supportedExternalLibraries.add("chromaprint");
-        supportedExternalLibraries.add("fontconfig");
-        supportedExternalLibraries.add("freetype");
-        supportedExternalLibraries.add("fribidi");
-        supportedExternalLibraries.add("gmp");
-        supportedExternalLibraries.add("gnutls");
-        supportedExternalLibraries.add("kvazaar");
-        supportedExternalLibraries.add("lame");
-        supportedExternalLibraries.add("libaom");
-        supportedExternalLibraries.add("libass");
-        supportedExternalLibraries.add("libiconv");
-        supportedExternalLibraries.add("libilbc");
-        supportedExternalLibraries.add("libtheora");
-        supportedExternalLibraries.add("libvidstab");
-        supportedExternalLibraries.add("libvorbis");
-        supportedExternalLibraries.add("libvpx");
-        supportedExternalLibraries.add("libwebp");
-        supportedExternalLibraries.add("libxml2");
-        supportedExternalLibraries.add("opencore-amr");
-        supportedExternalLibraries.add("opus");
-        supportedExternalLibraries.add("shine");
-        supportedExternalLibraries.add("sdl");
-        supportedExternalLibraries.add("snappy");
-        supportedExternalLibraries.add("soxr");
-        supportedExternalLibraries.add("speex");
-        supportedExternalLibraries.add("tesseract");
-        supportedExternalLibraries.add("twolame");
-        supportedExternalLibraries.add("wavpack");
-        supportedExternalLibraries.add("x264");
-        supportedExternalLibraries.add("x265");
-        supportedExternalLibraries.add("xvidcore");
-        supportedExternalLibraries.add("android-zlib");
-        supportedExternalLibraries.add("android-media-codec");
-
-
-        final List<String> enabledList = new ArrayList<>();
-        for (String supportedExternalLibrary : supportedExternalLibraries) {
-            if (externalLibrariesCommandOutput.contains("enable-" + supportedExternalLibrary) ||
-                    externalLibrariesCommandOutput.contains("enable-lib" + supportedExternalLibrary)) {
-                enabledList.add(supportedExternalLibrary);
-            }
-        }
-
-        Collections.sort(enabledList);
-
-        Assert.assertNotNull(enabledList);
-        Assert.assertEquals(1, enabledList.size());
-    }
-
-    @Test
-    public void getPackageName() {
-        Assert.assertEquals("min", listToPackageName(Collections.singletonList("")));
-        Assert.assertEquals("min-gpl", listToPackageName(Collections.singletonList("xvidcore")));
-        Assert.assertEquals("full-gpl", listToPackageName(Arrays.asList("gnutls", "speex", "fribidi", "xvidcore")));
-        Assert.assertEquals("full", listToPackageName(Arrays.asList("fribidi", "speex")));
-        Assert.assertEquals("video", listToPackageName(Collections.singletonList("fribidi")));
-        Assert.assertEquals("audio", listToPackageName(Collections.singletonList("speex")));
-        Assert.assertEquals("https", listToPackageName(Collections.singletonList("gnutls")));
-        Assert.assertEquals("https-gpl", listToPackageName(Arrays.asList("gnutls", "xvidcore")));
-    }
-
-    private String listToPackageName(final List<String> externalLibraryList) {
-        boolean speex = externalLibraryList.contains("speex");
-        boolean fribidi = externalLibraryList.contains("fribidi");
-        boolean gnutls = externalLibraryList.contains("gnutls");
-        boolean xvidcore = externalLibraryList.contains("xvidcore");
-
-        if (speex && fribidi) {
-            if (xvidcore) {
-                return "full-gpl";
-            } else {
-                return "full";
-            }
-        } else if (speex) {
-            return "audio";
-        } else if (fribidi) {
-            return "video";
-        } else if (xvidcore) {
-            if (gnutls) {
-                return "https-gpl";
-            } else {
-                return "min-gpl";
-            }
-        } else {
-            if (gnutls) {
-                return "https";
-            } else {
-                return "min";
-            }
-        }
-    }
-
-}

android/app/src/test/java/com/arthenica/mobileffmpeg/ExampleUnitTest.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2018 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 org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

android/app/src/test/java/com/arthenica/mobileffmpeg/FFmpegTest.java

@@ -1,746 +0,0 @@
-/*
- * Copyright (c) 2018, 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 org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * <p>Tests for {@link FFmpeg} class.
- */
-public class FFmpegTest {
-
-    private static final String MEDIA_INFORMATION_MP3 =
-            "{\n" +
-                    "     \"streams\": [\n" +
-                    "         {\n" +
-                    "             \"index\": 0,\n" +
-                    "             \"codec_name\": \"mp3\",\n" +
-                    "             \"codec_long_name\": \"MP3 (MPEG audio layer 3)\",\n" +
-                    "             \"codec_type\": \"audio\",\n" +
-                    "             \"codec_time_base\": \"1/44100\",\n" +
-                    "             \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "             \"codec_tag\": \"0x0000\",\n" +
-                    "             \"sample_fmt\": \"fltp\",\n" +
-                    "             \"sample_rate\": \"44100\",\n" +
-                    "             \"channels\": 2,\n" +
-                    "             \"channel_layout\": \"stereo\",\n" +
-                    "             \"bits_per_sample\": 0,\n" +
-                    "             \"r_frame_rate\": \"0/0\",\n" +
-                    "             \"avg_frame_rate\": \"0/0\",\n" +
-                    "             \"time_base\": \"1/14112000\",\n" +
-                    "             \"start_pts\": 169280,\n" +
-                    "             \"start_time\": \"0.011995\",\n" +
-                    "             \"duration_ts\": 4622376960,\n" +
-                    "             \"duration\": \"327.549388\",\n" +
-                    "             \"bit_rate\": \"320000\",\n" +
-                    "             \"disposition\": {\n" +
-                    "                 \"default\": 0,\n" +
-                    "                 \"dub\": 0,\n" +
-                    "                 \"original\": 0,\n" +
-                    "                 \"comment\": 0,\n" +
-                    "                 \"lyrics\": 0,\n" +
-                    "                 \"karaoke\": 0,\n" +
-                    "                 \"forced\": 0,\n" +
-                    "                 \"hearing_impaired\": 0,\n" +
-                    "                 \"visual_impaired\": 0,\n" +
-                    "                 \"clean_effects\": 0,\n" +
-                    "                 \"attached_pic\": 0,\n" +
-                    "                 \"timed_thumbnails\": 0\n" +
-                    "             },\n" +
-                    "             \"tags\": {\n" +
-                    "                 \"encoder\": \"Lavf\"\n" +
-                    "             }\n" +
-                    "         }\n" +
-                    "     ],\n" +
-                    "     \"format\": {\n" +
-                    "         \"filename\": \"sample.mp3\",\n" +
-                    "         \"nb_streams\": 1,\n" +
-                    "         \"nb_programs\": 0,\n" +
-                    "         \"format_name\": \"mp3\",\n" +
-                    "         \"format_long_name\": \"MP2/3 (MPEG audio layer 2/3)\",\n" +
-                    "         \"start_time\": \"0.011995\",\n" +
-                    "         \"duration\": \"327.549388\",\n" +
-                    "         \"size\": \"13103064\",\n" +
-                    "         \"bit_rate\": \"320026\",\n" +
-                    "         \"probe_score\": 51,\n" +
-                    "         \"tags\": {\n" +
-                    "             \"encoder\": \"Lavf58.20.100\",\n" +
-                    "             \"album\": \"Impact\",\n" +
-                    "             \"artist\": \"Kevin MacLeod\",\n" +
-                    "             \"comment\": \"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit finito.\",\n" +
-                    "             \"genre\": \"Cinematic\",\n" +
-                    "             \"title\": \"Impact Moderato\"\n" +
-                    "         }\n" +
-                    "     }\n" +
-                    "}";
-
-    private static final String MEDIA_INFORMATION_JPG =
-            "{\n" +
-                    "     \"streams\": [\n" +
-                    "         {\n" +
-                    "             \"index\": 0,\n" +
-                    "             \"codec_name\": \"mjpeg\",\n" +
-                    "             \"codec_long_name\": \"Motion JPEG\",\n" +
-                    "             \"profile\": \"Baseline\",\n" +
-                    "             \"codec_type\": \"video\",\n" +
-                    "             \"codec_time_base\": \"0/1\",\n" +
-                    "             \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "             \"codec_tag\": \"0x0000\",\n" +
-                    "             \"width\": 1496,\n" +
-                    "             \"height\": 1729,\n" +
-                    "             \"coded_width\": 1496,\n" +
-                    "             \"coded_height\": 1729,\n" +
-                    "             \"has_b_frames\": 0,\n" +
-                    "             \"sample_aspect_ratio\": \"1:1\",\n" +
-                    "             \"display_aspect_ratio\": \"1496:1729\",\n" +
-                    "             \"pix_fmt\": \"yuvj444p\",\n" +
-                    "             \"level\": -99,\n" +
-                    "             \"color_range\": \"pc\",\n" +
-                    "             \"color_space\": \"bt470bg\",\n" +
-                    "             \"chroma_location\": \"center\",\n" +
-                    "             \"refs\": 1,\n" +
-                    "             \"r_frame_rate\": \"25/1\",\n" +
-                    "             \"avg_frame_rate\": \"0/0\",\n" +
-                    "             \"time_base\": \"1/25\",\n" +
-                    "             \"start_pts\": 0,\n" +
-                    "             \"start_time\": \"0.000000\",\n" +
-                    "             \"duration_ts\": 1,\n" +
-                    "             \"duration\": \"0.040000\",\n" +
-                    "             \"bits_per_raw_sample\": \"8\",\n" +
-                    "             \"disposition\": {\n" +
-                    "                 \"default\": 0,\n" +
-                    "                 \"dub\": 0,\n" +
-                    "                 \"original\": 0,\n" +
-                    "                 \"comment\": 0,\n" +
-                    "                 \"lyrics\": 0,\n" +
-                    "                 \"karaoke\": 0,\n" +
-                    "                 \"forced\": 0,\n" +
-                    "                 \"hearing_impaired\": 0,\n" +
-                    "                 \"visual_impaired\": 0,\n" +
-                    "                 \"clean_effects\": 0,\n" +
-                    "                 \"attached_pic\": 0,\n" +
-                    "                 \"timed_thumbnails\": 0\n" +
-                    "             }\n" +
-                    "         }\n" +
-                    "     ],\n" +
-                    "     \"format\": {\n" +
-                    "         \"filename\": \"sample.jpg\",\n" +
-                    "         \"nb_streams\": 1,\n" +
-                    "         \"nb_programs\": 0,\n" +
-                    "         \"format_name\": \"image2\",\n" +
-                    "         \"format_long_name\": \"image2 sequence\",\n" +
-                    "         \"start_time\": \"0.000000\",\n" +
-                    "         \"duration\": \"0.040000\",\n" +
-                    "         \"size\": \"1659050\",\n" +
-                    "         \"bit_rate\": \"331810000\",\n" +
-                    "         \"probe_score\": 50\n" +
-                    "     }\n" +
-                    "}";
-
-    private static final String MEDIA_INFORMATION_GIF =
-            "{\n" +
-                    "     \"streams\": [\n" +
-                    "         {\n" +
-                    "             \"index\": 0,\n" +
-                    "             \"codec_name\": \"gif\",\n" +
-                    "             \"codec_long_name\": \"CompuServe GIF (Graphics Interchange Format)\",\n" +
-                    "             \"codec_type\": \"video\",\n" +
-                    "             \"codec_time_base\": \"12/133\",\n" +
-                    "             \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "             \"codec_tag\": \"0x0000\",\n" +
-                    "             \"width\": 400,\n" +
-                    "             \"height\": 400,\n" +
-                    "             \"coded_width\": 400,\n" +
-                    "             \"coded_height\": 400,\n" +
-                    "             \"has_b_frames\": 0,\n" +
-                    "             \"pix_fmt\": \"bgra\",\n" +
-                    "             \"level\": -99,\n" +
-                    "             \"refs\": 1,\n" +
-                    "             \"r_frame_rate\": \"100/9\",\n" +
-                    "             \"avg_frame_rate\": \"133/12\",\n" +
-                    "             \"time_base\": \"1/100\",\n" +
-                    "             \"start_pts\": 0,\n" +
-                    "             \"start_time\": \"0.000000\",\n" +
-                    "             \"duration_ts\": 396,\n" +
-                    "             \"duration\": \"3.960000\",\n" +
-                    "             \"nb_frames\": \"44\",\n" +
-                    "             \"disposition\": {\n" +
-                    "                 \"default\": 0,\n" +
-                    "                 \"dub\": 0,\n" +
-                    "                 \"original\": 0,\n" +
-                    "                 \"comment\": 0,\n" +
-                    "                 \"lyrics\": 0,\n" +
-                    "                 \"karaoke\": 0,\n" +
-                    "                 \"forced\": 0,\n" +
-                    "                 \"hearing_impaired\": 0,\n" +
-                    "                 \"visual_impaired\": 0,\n" +
-                    "                 \"clean_effects\": 0,\n" +
-                    "                 \"attached_pic\": 0,\n" +
-                    "                 \"timed_thumbnails\": 0\n" +
-                    "             }\n" +
-                    "         }\n" +
-                    "     ],\n" +
-                    "     \"format\": {\n" +
-                    "         \"filename\": \"sample.gif\",\n" +
-                    "         \"nb_streams\": 1,\n" +
-                    "         \"nb_programs\": 0,\n" +
-                    "         \"format_name\": \"gif\",\n" +
-                    "         \"format_long_name\": \"CompuServe Graphics Interchange Format (GIF)\",\n" +
-                    "         \"start_time\": \"0.000000\",\n" +
-                    "         \"duration\": \"3.960000\",\n" +
-                    "         \"size\": \"1001718\",\n" +
-                    "         \"bit_rate\": \"2023672\",\n" +
-                    "         \"probe_score\": 100\n" +
-                    "     }\n" +
-                    "}";
-
-    private static final String MEDIA_INFORMATION_MP4 =
-            "{\n" +
-                    " \"streams\": [\n" +
-                    "      {\n" +
-                    "          \"index\": 0,\n" +
-                    "          \"codec_name\": \"h264\",\n" +
-                    "          \"codec_long_name\": \"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10\",\n" +
-                    "          \"profile\": \"Main\",\n" +
-                    "          \"codec_type\": \"video\",\n" +
-                    "          \"codec_time_base\": \"1/60\",\n" +
-                    "          \"codec_tag_string\": \"avc1\",\n" +
-                    "          \"codec_tag\": \"0x31637661\",\n" +
-                    "          \"width\": 1280,\n" +
-                    "          \"height\": 720,\n" +
-                    "          \"coded_width\": 1280,\n" +
-                    "          \"coded_height\": 720,\n" +
-                    "          \"has_b_frames\": 0,\n" +
-                    "          \"sample_aspect_ratio\": \"1:1\",\n" +
-                    "          \"display_aspect_ratio\": \"16:9\",\n" +
-                    "          \"pix_fmt\": \"yuv420p\",\n" +
-                    "          \"level\": 42,\n" +
-                    "          \"chroma_location\": \"left\",\n" +
-                    "          \"refs\": 1,\n" +
-                    "          \"is_avc\": \"true\",\n" +
-                    "          \"nal_length_size\": \"4\",\n" +
-                    "          \"r_frame_rate\": \"30/1\",\n" +
-                    "          \"avg_frame_rate\": \"30/1\",\n" +
-                    "          \"time_base\": \"1/15360\",\n" +
-                    "          \"start_pts\": 0,\n" +
-                    "          \"start_time\": \"0.000000\",\n" +
-                    "          \"duration_ts\": 215040,\n" +
-                    "          \"duration\": \"14.000000\",\n" +
-                    "          \"bit_rate\": \"9166570\",\n" +
-                    "          \"bits_per_raw_sample\": \"8\",\n" +
-                    "          \"nb_frames\": \"420\",\n" +
-                    "          \"disposition\": {\n" +
-                    "              \"default\": 1,\n" +
-                    "              \"dub\": 0,\n" +
-                    "              \"original\": 0,\n" +
-                    "              \"comment\": 0,\n" +
-                    "              \"lyrics\": 0,\n" +
-                    "              \"karaoke\": 0,\n" +
-                    "              \"forced\": 0,\n" +
-                    "              \"hearing_impaired\": 0,\n" +
-                    "              \"visual_impaired\": 0,\n" +
-                    "              \"clean_effects\": 0,\n" +
-                    "              \"attached_pic\": 0,\n" +
-                    "              \"timed_thumbnails\": 0\n" +
-                    "          },\n" +
-                    "          \"tags\": {\n" +
-                    "              \"language\": \"und\",\n" +
-                    "              \"handler_name\": \"VideoHandler\"\n" +
-                    "          }\n" +
-                    "      }\n" +
-                    "  ],\n" +
-                    "  \"format\": {\n" +
-                    "      \"filename\": \"sample.mp4\",\n" +
-                    "      \"nb_streams\": 1,\n" +
-                    "      \"nb_programs\": 0,\n" +
-                    "      \"format_name\": \"mov,mp4,m4a,3gp,3g2,mj2\",\n" +
-                    "      \"format_long_name\": \"QuickTime / MOV\",\n" +
-                    "      \"start_time\": \"0.000000\",\n" +
-                    "      \"duration\": \"14.000000\",\n" +
-                    "      \"size\": \"16044159\",\n" +
-                    "      \"bit_rate\": \"9168090\",\n" +
-                    "      \"probe_score\": 100,\n" +
-                    "      \"tags\": {\n" +
-                    "          \"major_brand\": \"isom\",\n" +
-                    "          \"minor_version\": \"512\",\n" +
-                    "          \"compatible_brands\": \"isomiso2avc1mp41\",\n" +
-                    "          \"encoder\": \"Lavf58.33.100\"\n" +
-                    "      }\n" +
-                    "  }\n" +
-                    "}";
-
-    private static final String MEDIA_INFORMATION_PNG =
-            "{\n" +
-                    "     \"streams\": [\n" +
-                    "         {\n" +
-                    "             \"index\": 0,\n" +
-                    "             \"codec_name\": \"png\",\n" +
-                    "             \"codec_long_name\": \"PNG (Portable Network Graphics) image\",\n" +
-                    "             \"codec_type\": \"video\",\n" +
-                    "             \"codec_time_base\": \"0/1\",\n" +
-                    "             \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "             \"codec_tag\": \"0x0000\",\n" +
-                    "             \"width\": 1198,\n" +
-                    "             \"height\": 1198,\n" +
-                    "             \"coded_width\": 1198,\n" +
-                    "             \"coded_height\": 1198,\n" +
-                    "             \"has_b_frames\": 0,\n" +
-                    "             \"sample_aspect_ratio\": \"1:1\",\n" +
-                    "             \"display_aspect_ratio\": \"1:1\",\n" +
-                    "             \"pix_fmt\": \"pal8\",\n" +
-                    "             \"level\": -99,\n" +
-                    "             \"color_range\": \"pc\",\n" +
-                    "             \"refs\": 1,\n" +
-                    "             \"r_frame_rate\": \"25/1\",\n" +
-                    "             \"avg_frame_rate\": \"0/0\",\n" +
-                    "             \"time_base\": \"1/25\",\n" +
-                    "             \"disposition\": {\n" +
-                    "                 \"default\": 0,\n" +
-                    "                 \"dub\": 0,\n" +
-                    "                 \"original\": 0,\n" +
-                    "                 \"comment\": 0,\n" +
-                    "                 \"lyrics\": 0,\n" +
-                    "                 \"karaoke\": 0,\n" +
-                    "                 \"forced\": 0,\n" +
-                    "                 \"hearing_impaired\": 0,\n" +
-                    "                 \"visual_impaired\": 0,\n" +
-                    "                 \"clean_effects\": 0,\n" +
-                    "                 \"attached_pic\": 0,\n" +
-                    "                 \"timed_thumbnails\": 0\n" +
-                    "             }\n" +
-                    "         }\n" +
-                    "     ],\n" +
-                    "     \"format\": {\n" +
-                    "         \"filename\": \"sample.png\",\n" +
-                    "         \"nb_streams\": 1,\n" +
-                    "         \"nb_programs\": 0,\n" +
-                    "         \"format_name\": \"png_pipe\",\n" +
-                    "         \"format_long_name\": \"piped png sequence\",\n" +
-                    "         \"size\": \"31533\",\n" +
-                    "         \"probe_score\": 99\n" +
-                    "     }\n" +
-                    "}";
-
-    private static final String MEDIA_INFORMATION_OGG =
-            "{\n" +
-                    "    \"streams\": [\n" +
-                    "        {\n" +
-                    "            \"index\": 0,\n" +
-                    "            \"codec_name\": \"theora\",\n" +
-                    "            \"codec_long_name\": \"Theora\",\n" +
-                    "            \"codec_type\": \"video\",\n" +
-                    "            \"codec_time_base\": \"1/25\",\n" +
-                    "            \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "            \"codec_tag\": \"0x0000\",\n" +
-                    "            \"width\": 1920,\n" +
-                    "            \"height\": 1080,\n" +
-                    "            \"coded_width\": 1920,\n" +
-                    "            \"coded_height\": 1088,\n" +
-                    "            \"has_b_frames\": 0,\n" +
-                    "            \"pix_fmt\": \"yuv420p\",\n" +
-                    "            \"level\": -99,\n" +
-                    "            \"color_space\": \"bt470bg\",\n" +
-                    "            \"color_transfer\": \"bt709\",\n" +
-                    "            \"color_primaries\": \"bt470bg\",\n" +
-                    "            \"chroma_location\": \"center\",\n" +
-                    "            \"refs\": 1,\n" +
-                    "            \"r_frame_rate\": \"25/1\",\n" +
-                    "            \"avg_frame_rate\": \"25/1\",\n" +
-                    "            \"time_base\": \"1/25\",\n" +
-                    "            \"start_pts\": 0,\n" +
-                    "            \"start_time\": \"0.000000\",\n" +
-                    "            \"duration_ts\": 813,\n" +
-                    "            \"duration\": \"32.520000\",\n" +
-                    "            \"disposition\": {\n" +
-                    "                \"default\": 0,\n" +
-                    "                \"dub\": 0,\n" +
-                    "                \"original\": 0,\n" +
-                    "                \"comment\": 0,\n" +
-                    "                \"lyrics\": 0,\n" +
-                    "                \"karaoke\": 0,\n" +
-                    "                \"forced\": 0,\n" +
-                    "                \"hearing_impaired\": 0,\n" +
-                    "                \"visual_impaired\": 0,\n" +
-                    "                \"clean_effects\": 0,\n" +
-                    "                \"attached_pic\": 0,\n" +
-                    "                \"timed_thumbnails\": 0\n" +
-                    "            },\n" +
-                    "            \"tags\": {\n" +
-                    "                \"ENCODER\": \"ffmpeg2theora 0.19\"\n" +
-                    "            }\n" +
-                    "        },\n" +
-                    "        {\n" +
-                    "            \"index\": 1,\n" +
-                    "            \"codec_name\": \"vorbis\",\n" +
-                    "            \"codec_long_name\": \"Vorbis\",\n" +
-                    "            \"codec_type\": \"audio\",\n" +
-                    "            \"codec_time_base\": \"1/48000\",\n" +
-                    "            \"codec_tag_string\": \"[0][0][0][0]\",\n" +
-                    "            \"codec_tag\": \"0x0000\",\n" +
-                    "            \"sample_fmt\": \"fltp\",\n" +
-                    "            \"sample_rate\": \"48000\",\n" +
-                    "            \"channels\": 2,\n" +
-                    "            \"channel_layout\": \"stereo\",\n" +
-                    "            \"bits_per_sample\": 0,\n" +
-                    "            \"r_frame_rate\": \"0/0\",\n" +
-                    "            \"avg_frame_rate\": \"0/0\",\n" +
-                    "            \"time_base\": \"1/48000\",\n" +
-                    "            \"start_pts\": 0,\n" +
-                    "            \"start_time\": \"0.000000\",\n" +
-                    "            \"duration_ts\": 1583850,\n" +
-                    "            \"duration\": \"32.996875\",\n" +
-                    "            \"bit_rate\": \"80000\",\n" +
-                    "            \"disposition\": {\n" +
-                    "                \"default\": 0,\n" +
-                    "                \"dub\": 0,\n" +
-                    "                \"original\": 0,\n" +
-                    "                \"comment\": 0,\n" +
-                    "                \"lyrics\": 0,\n" +
-                    "                \"karaoke\": 0,\n" +
-                    "                \"forced\": 0,\n" +
-                    "                \"hearing_impaired\": 0,\n" +
-                    "                \"visual_impaired\": 0,\n" +
-                    "                \"clean_effects\": 0,\n" +
-                    "                \"attached_pic\": 0,\n" +
-                    "                \"timed_thumbnails\": 0\n" +
-                    "            },\n" +
-                    "            \"tags\": {\n" +
-                    "                \"ENCODER\": \"ffmpeg2theora 0.19\"\n" +
-                    "            }\n" +
-                    "        }\n" +
-                    "    ],\n" +
-                    "    \"format\": {\n" +
-                    "        \"filename\": \"sample.ogg\",\n" +
-                    "        \"nb_streams\": 2,\n" +
-                    "        \"nb_programs\": 0,\n" +
-                    "        \"format_name\": \"ogg\",\n" +
-                    "        \"format_long_name\": \"Ogg\",\n" +
-                    "        \"start_time\": \"0.000000\",\n" +
-                    "        \"duration\": \"32.996875\",\n" +
-                    "        \"size\": \"27873937\",\n" +
-                    "        \"bit_rate\": \"6757958\",\n" +
-                    "        \"probe_score\": 100\n" +
-                    "    }\n" +
-                    "}";
-
-    @Test
-    public void mediaInformationMp3() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_MP3);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "mp3", "sample.mp3");
-        assertMediaDuration(mediaInformation, "327.549388", "0.011995", "320026");
-
-        assertTag(mediaInformation, "comment", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit finito.");
-        assertTag(mediaInformation, "album", "Impact");
-        assertTag(mediaInformation, "title", "Impact Moderato");
-        assertTag(mediaInformation, "artist", "Kevin MacLeod");
-
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(1, mediaInformation.getStreams().size());
-        assertAudioStream(mediaInformation.getStreams().get(0), 0L, "mp3", "MP3 (MPEG audio layer 3)", "44100", "stereo", "fltp", "320000");
-    }
-
-    @Test
-    public void mediaInformationJpg() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_JPG);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "image2", "sample.jpg");
-        assertMediaDuration(mediaInformation, "0.040000", "0.000000", "331810000");
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(1, mediaInformation.getStreams().size());
-        assertVideoStream(mediaInformation.getStreams().get(0), 0L, "mjpeg", "Motion JPEG", "yuvj444p", 1496L, 1729L, "1:1", "1496:1729", null, "0/0", "25/1", "1/25", "0/1");
-    }
-
-    @Test
-    public void mediaInformationGif() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_GIF);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "gif", "sample.gif");
-        assertMediaDuration(mediaInformation, "3.960000", "0.000000", "2023672");
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(1, mediaInformation.getStreams().size());
-        assertVideoStream(mediaInformation.getStreams().get(0), 0L, "gif", "CompuServe GIF (Graphics Interchange Format)", "bgra", 400L, 400L, null, null, null, "133/12", "100/9", "1/100", "12/133");
-    }
-
-    @Test
-    public void mediaInformationMp4() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_MP4);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "mov,mp4,m4a,3gp,3g2,mj2", "sample.mp4");
-        assertMediaDuration(mediaInformation, "14.000000", "0.000000", "9168090");
-
-        assertTag(mediaInformation, "major_brand", "isom");
-        assertTag(mediaInformation, "minor_version", "512");
-        assertTag(mediaInformation, "compatible_brands", "isomiso2avc1mp41");
-        assertTag(mediaInformation, "encoder", "Lavf58.33.100");
-
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(1, mediaInformation.getStreams().size());
-        assertVideoStream(mediaInformation.getStreams().get(0), 0L, "h264", "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10", "yuv420p", 1280L, 720L, "1:1", "16:9", "9166570", "30/1", "30/1", "1/15360", "1/60");
-
-        assertStreamTag(mediaInformation.getStreams().get(0), "language", "und");
-        assertStreamTag(mediaInformation.getStreams().get(0), "handler_name", "VideoHandler");
-    }
-
-    @Test
-    public void mediaInformationPng() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_PNG);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "png_pipe", "sample.png");
-        assertMediaDuration(mediaInformation, null, null, null);
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(1, mediaInformation.getStreams().size());
-        assertVideoStream(mediaInformation.getStreams().get(0), 0L, "png", "PNG (Portable Network Graphics) image", "pal8", 1198L, 1198L, "1:1", "1:1", null, "0/0", "25/1", "1/25", "0/1");
-    }
-
-    @Test
-    public void mediaInformationOgg() {
-        MediaInformation mediaInformation = MediaInformationParser.from(MEDIA_INFORMATION_OGG);
-
-        Assert.assertNotNull(mediaInformation);
-        assertMediaInput(mediaInformation, "ogg", "sample.ogg");
-        assertMediaDuration(mediaInformation, "32.996875", "0.000000", "6757958");
-        Assert.assertNotNull(mediaInformation.getStreams());
-        Assert.assertEquals(2, mediaInformation.getStreams().size());
-        assertVideoStream(mediaInformation.getStreams().get(0), 0L, "theora", "Theora", "yuv420p", 1920L, 1080L, null, null, null, "25/1", "25/1", "1/25", "1/25");
-        assertAudioStream(mediaInformation.getStreams().get(1), 1L, "vorbis", "Vorbis", "48000", "stereo", "fltp", "80000");
-
-        assertStreamTag(mediaInformation.getStreams().get(0), "ENCODER", "ffmpeg2theora 0.19");
-        assertStreamTag(mediaInformation.getStreams().get(1), "ENCODER", "ffmpeg2theora 0.19");
-    }
-
-    @Test
-    public void parseSimpleCommand() {
-        final String[] argumentArray = FFmpeg.parseArguments("-hide_banner -loop 1 -i file.jpg -filter_complex [0:v]setpts=PTS-STARTPTS[video] -map [video] -vsync 2 -async 1 video.mp4");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(14, argumentArray.length);
-
-        Assert.assertEquals("-hide_banner", argumentArray[0]);
-        Assert.assertEquals("-loop", argumentArray[1]);
-        Assert.assertEquals("1", argumentArray[2]);
-        Assert.assertEquals("-i", argumentArray[3]);
-        Assert.assertEquals("file.jpg", argumentArray[4]);
-        Assert.assertEquals("-filter_complex", argumentArray[5]);
-        Assert.assertEquals("[0:v]setpts=PTS-STARTPTS[video]", argumentArray[6]);
-        Assert.assertEquals("-map", argumentArray[7]);
-        Assert.assertEquals("[video]", argumentArray[8]);
-        Assert.assertEquals("-vsync", argumentArray[9]);
-        Assert.assertEquals("2", argumentArray[10]);
-        Assert.assertEquals("-async", argumentArray[11]);
-        Assert.assertEquals("1", argumentArray[12]);
-        Assert.assertEquals("video.mp4", argumentArray[13]);
-    }
-
-    @Test
-    public void parseSingleQuotesInCommand() {
-        String[] argumentArray = FFmpeg.parseArguments("-loop 1 'file one.jpg'  -filter_complex  '[0:v]setpts=PTS-STARTPTS[video]'  -map  [video]  video.mp4 ");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(8, argumentArray.length);
-
-        Assert.assertEquals("-loop", argumentArray[0]);
-        Assert.assertEquals("1", argumentArray[1]);
-        Assert.assertEquals("file one.jpg", argumentArray[2]);
-        Assert.assertEquals("-filter_complex", argumentArray[3]);
-        Assert.assertEquals("[0:v]setpts=PTS-STARTPTS[video]", argumentArray[4]);
-        Assert.assertEquals("-map", argumentArray[5]);
-        Assert.assertEquals("[video]", argumentArray[6]);
-        Assert.assertEquals("video.mp4", argumentArray[7]);
-    }
-
-    @Test
-    public void parseDoubleQuotesInCommand() {
-        String[] argumentArray = FFmpeg.parseArguments("-loop  1 \"file one.jpg\"   -filter_complex \"[0:v]setpts=PTS-STARTPTS[video]\"  -map  [video]  video.mp4 ");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(8, argumentArray.length);
-
-        Assert.assertEquals("-loop", argumentArray[0]);
-        Assert.assertEquals("1", argumentArray[1]);
-        Assert.assertEquals("file one.jpg", argumentArray[2]);
-        Assert.assertEquals("-filter_complex", argumentArray[3]);
-        Assert.assertEquals("[0:v]setpts=PTS-STARTPTS[video]", argumentArray[4]);
-        Assert.assertEquals("-map", argumentArray[5]);
-        Assert.assertEquals("[video]", argumentArray[6]);
-        Assert.assertEquals("video.mp4", argumentArray[7]);
-
-        argumentArray = FFmpeg.parseArguments(" -i   file:///tmp/input.mp4 -vcodec libx264 -vf \"scale=1024:1024,pad=width=1024:height=1024:x=0:y=0:color=black\"  -acodec copy  -q:v 0  -q:a   0 video.mp4");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(13, argumentArray.length);
-
-        Assert.assertEquals("-i", argumentArray[0]);
-        Assert.assertEquals("file:///tmp/input.mp4", argumentArray[1]);
-        Assert.assertEquals("-vcodec", argumentArray[2]);
-        Assert.assertEquals("libx264", argumentArray[3]);
-        Assert.assertEquals("-vf", argumentArray[4]);
-        Assert.assertEquals("scale=1024:1024,pad=width=1024:height=1024:x=0:y=0:color=black", argumentArray[5]);
-        Assert.assertEquals("-acodec", argumentArray[6]);
-        Assert.assertEquals("copy", argumentArray[7]);
-        Assert.assertEquals("-q:v", argumentArray[8]);
-        Assert.assertEquals("0", argumentArray[9]);
-        Assert.assertEquals("-q:a", argumentArray[10]);
-        Assert.assertEquals("0", argumentArray[11]);
-        Assert.assertEquals("video.mp4", argumentArray[12]);
-    }
-
-    @Test
-    public void parseDoubleQuotesAndEscapesInCommand() {
-        String[] argumentArray = FFmpeg.parseArguments("  -i   file:///tmp/input.mp4 -vf \"subtitles=file:///tmp/subtitles.srt:force_style=\'FontSize=16,PrimaryColour=&HFFFFFF&\'\" -vcodec libx264   -acodec copy  -q:v 0 -q:a  0  video.mp4");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(13, argumentArray.length);
-
-        Assert.assertEquals("-i", argumentArray[0]);
-        Assert.assertEquals("file:///tmp/input.mp4", argumentArray[1]);
-        Assert.assertEquals("-vf", argumentArray[2]);
-        Assert.assertEquals("subtitles=file:///tmp/subtitles.srt:force_style='FontSize=16,PrimaryColour=&HFFFFFF&'", argumentArray[3]);
-        Assert.assertEquals("-vcodec", argumentArray[4]);
-        Assert.assertEquals("libx264", argumentArray[5]);
-        Assert.assertEquals("-acodec", argumentArray[6]);
-        Assert.assertEquals("copy", argumentArray[7]);
-        Assert.assertEquals("-q:v", argumentArray[8]);
-        Assert.assertEquals("0", argumentArray[9]);
-        Assert.assertEquals("-q:a", argumentArray[10]);
-        Assert.assertEquals("0", argumentArray[11]);
-        Assert.assertEquals("video.mp4", argumentArray[12]);
-
-        argumentArray = FFmpeg.parseArguments("  -i   file:///tmp/input.mp4 -vf \"subtitles=file:///tmp/subtitles.srt:force_style=\\\"FontSize=16,PrimaryColour=&HFFFFFF&\\\"\" -vcodec libx264   -acodec copy  -q:v 0 -q:a  0  video.mp4");
-
-        Assert.assertNotNull(argumentArray);
-        Assert.assertEquals(13, argumentArray.length);
-
-        Assert.assertEquals("-i", argumentArray[0]);
-        Assert.assertEquals("file:///tmp/input.mp4", argumentArray[1]);
-        Assert.assertEquals("-vf", argumentArray[2]);
-        Assert.assertEquals("subtitles=file:///tmp/subtitles.srt:force_style=\\\"FontSize=16,PrimaryColour=&HFFFFFF&\\\"", argumentArray[3]);
-        Assert.assertEquals("-vcodec", argumentArray[4]);
-        Assert.assertEquals("libx264", argumentArray[5]);
-        Assert.assertEquals("-acodec", argumentArray[6]);
-        Assert.assertEquals("copy", argumentArray[7]);
-        Assert.assertEquals("-q:v", argumentArray[8]);
-        Assert.assertEquals("0", argumentArray[9]);
-        Assert.assertEquals("-q:a", argumentArray[10]);
-        Assert.assertEquals("0", argumentArray[11]);
-        Assert.assertEquals("video.mp4", argumentArray[12]);
-    }
-
-    @Test
-    public void argumentsToString() {
-        Assert.assertEquals("null", argumentsToString(null));
-        Assert.assertEquals("-i input.mp4 -vf filter -c:v mpeg4 output.mp4", argumentsToString(new String[]{"-i", "input.mp4", "-vf", "filter", "-c:v", "mpeg4", "output.mp4"}));
-    }
-
-    public String argumentsToString(final String[] arguments) {
-        return FFmpeg.argumentsToString(arguments);
-    }
-
-    private void assertMediaInput(MediaInformation mediaInformation, String format, String filename) {
-        Assert.assertEquals(format, mediaInformation.getFormat());
-        Assert.assertEquals(filename, mediaInformation.getFilename());
-    }
-
-    private void assertMediaDuration(MediaInformation mediaInformation, String duration, String startTime, String bitrate) {
-        Assert.assertEquals(duration, mediaInformation.getDuration());
-        Assert.assertEquals(startTime, mediaInformation.getStartTime());
-        Assert.assertEquals(bitrate, mediaInformation.getBitrate());
-    }
-
-    private void assertTag(MediaInformation mediaInformation, String expectedKey, String expectedValue) {
-        JSONObject tags = mediaInformation.getTags();
-        Assert.assertNotNull(tags);
-
-        try {
-            String value = tags.getString(expectedKey);
-            Assert.assertEquals(expectedValue, value);
-        } catch (JSONException e) {
-            e.printStackTrace();
-            Assert.fail(expectedKey + " not found");
-        }
-    }
-
-    private void assertStreamTag(StreamInformation streamInformation, String expectedKey, String expectedValue) {
-        JSONObject tags = streamInformation.getTags();
-        Assert.assertNotNull(tags);
-
-        try {
-            String value = tags.getString(expectedKey);
-            Assert.assertEquals(expectedValue, value);
-        } catch (JSONException e) {
-            e.printStackTrace();
-            Assert.fail(expectedKey + " not found");
-        }
-    }
-
-    private void assertStream(StreamInformation streamInformation, Long index, String type, String codec, String fullCodec, String bitrate) {
-        Assert.assertEquals(index, streamInformation.getIndex());
-        Assert.assertEquals(type, streamInformation.getType());
-
-        Assert.assertEquals(codec, streamInformation.getCodec());
-        Assert.assertEquals(fullCodec, streamInformation.getFullCodec());
-
-        Assert.assertEquals(bitrate, streamInformation.getBitrate());
-    }
-
-    private void assertAudioStream(StreamInformation streamInformation, Long index, String codec, String fullCodec, String sampleRate, String channelLayout, String sampleFormat, String bitrate) {
-        Assert.assertEquals(index, streamInformation.getIndex());
-        Assert.assertEquals("audio", streamInformation.getType());
-
-        Assert.assertEquals(codec, streamInformation.getCodec());
-        Assert.assertEquals(fullCodec, streamInformation.getFullCodec());
-
-        Assert.assertEquals(sampleRate, streamInformation.getSampleRate());
-        Assert.assertEquals(channelLayout, streamInformation.getChannelLayout());
-        Assert.assertEquals(sampleFormat, streamInformation.getSampleFormat());
-        Assert.assertEquals(bitrate, streamInformation.getBitrate());
-    }
-
-    private void assertVideoStream(StreamInformation streamInformation, Long index, String codec, String fullCodec, String format, Long width, Long height, String sar, String dar, String bitrate, String averageFrameRate, String realFrameRate, String timeBase, String codecTimeBase) {
-        Assert.assertEquals(index, streamInformation.getIndex());
-        Assert.assertEquals("video", streamInformation.getType());
-
-        Assert.assertEquals(codec, streamInformation.getCodec());
-        Assert.assertEquals(fullCodec, streamInformation.getFullCodec());
-
-        Assert.assertEquals(format, streamInformation.getFormat());
-
-        Assert.assertEquals(width, streamInformation.getWidth());
-        Assert.assertEquals(height, streamInformation.getHeight());
-        Assert.assertEquals(sar, streamInformation.getSampleAspectRatio());
-        Assert.assertEquals(dar, streamInformation.getDisplayAspectRatio());
-
-        Assert.assertEquals(bitrate, streamInformation.getBitrate());
-
-        Assert.assertEquals(averageFrameRate, streamInformation.getAverageFrameRate());
-        Assert.assertEquals(realFrameRate, streamInformation.getRealFrameRate());
-        Assert.assertEquals(timeBase, streamInformation.getTimeBase());
-        Assert.assertEquals(codecTimeBase, streamInformation.getCodecTimeBase());
-    }
-
-}

android/build.gradle

@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle.properties

@@ -9,8 +9,6 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-android.enableJetifier=true
-android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 30 09:25:25 BST 2020
+#Thu Mar 15 21:50:32 EET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

android/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -6,6 +6,42 @@
 ##
 ##############################################################################
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -24,46 +60,6 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -89,7 +85,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -154,19 +150,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

android/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,9 +46,10 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

android/jni/.gitignore

@@ -1,2 +1 @@
 /Application.mk
-/Android.mk.tmp

android/jni/Android.mk

@@ -1,105 +1,52 @@
-MY_LOCAL_PATH := $(call my-dir)
-$(call import-add-path, $(MY_LOCAL_PATH))
-
-MY_ARMV7 := false
-MY_ARMV7_NEON := false
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.armv7 && echo armv7)","armv7")
-        MY_ARMV7 := true
-    endif
-    ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.armv7neon && echo armv7neon)","armv7neon")
-        MY_ARMV7_NEON := true
-    endif
-endif
-ifeq ($(MY_ARMV7_NEON), true)
-    FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/android-$(TARGET_ARCH)/neon/ffmpeg/include
-else
-    FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include
-endif
+LOCAL_PATH := $(call my-dir)
+$(call import-add-path, $(LOCAL_PATH))
 
 MY_ARM_MODE := arm
-MY_ARM_NEON := false
-LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp
-
-# DEFINE ARCH FLAGS
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    MY_ARCH_FLAGS := ARM_V7A
-    MY_ARM_NEON := false
-endif
-ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
-    MY_ARCH_FLAGS := ARM64_V8A
-    MY_ARM_NEON := true
-endif
-ifeq ($(TARGET_ARCH_ABI), x86)
-    MY_ARCH_FLAGS := X86
-endif
-ifeq ($(TARGET_ARCH_ABI), x86_64)
-    MY_ARCH_FLAGS := X86_64
-endif
+MY_PATH := ../app/src/main/cpp
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_MODULE := mobileffmpeg_abidetect
-LOCAL_SRC_FILES := mobileffmpeg_abidetect.c
-LOCAL_CFLAGS := -Wall -Wextra -Werror -Wno-unused-parameter -DMOBILE_FFMPEG_${MY_ARCH_FLAGS}
-LOCAL_C_INCLUDES := $(FFMPEG_INCLUDES)
-LOCAL_LDLIBS := -llog -lz -landroid
-LOCAL_STATIC_LIBRARIES := cpu-features
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
+LOCAL_MODULE := cpufeatures
+LOCAL_SRC_FILES := $(NDK_ROOT)/sources/android/cpufeatures/cpu-features.c
+LOCAL_CFLAGS := -Wall -Wextra -Werror
+LOCAL_EXPORT_C_INCLUDES := $(NDK_ROOT)/sources/android/cpufeatures
+LOCAL_EXPORT_LDLIBS := -ldl
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module, cpu-features)
+include $(CLEAR_VARS)
+LOCAL_ARM_MODE := $(MY_ARM_MODE)
+LOCAL_MODULE := mobileffmpeg-abidetect
+LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg_abidetect.c
+LOCAL_CFLAGS := -Wall -Wextra -Werror -Wno-unused-parameter -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include -I$(NDK_ROOT)/sources/android/cpufeatures
+LOCAL_LDLIBS := -llog -lz -landroid
+LOCAL_SHARED_LIBRARIES := cpufeatures
+include $(BUILD_SHARED_LIBRARY)
 
-ifeq ($(TARGET_PLATFORM),android-16)
-    MY_SRC_FILES := mobileffmpeg.c mobileffprobe.c android_lts_support.c mobileffmpeg_exception.c fftools_cmdutils.c fftools_ffmpeg.c fftools_ffprobe.c fftools_ffmpeg_opt.c fftools_ffmpeg_hw.c fftools_ffmpeg_filter.c
-else ifeq ($(TARGET_PLATFORM),android-17)
-    MY_SRC_FILES := mobileffmpeg.c mobileffprobe.c android_lts_support.c mobileffmpeg_exception.c fftools_cmdutils.c fftools_ffmpeg.c fftools_ffprobe.c fftools_ffmpeg_opt.c fftools_ffmpeg_hw.c fftools_ffmpeg_filter.c
-else
-    MY_SRC_FILES := mobileffmpeg.c mobileffprobe.c mobileffmpeg_exception.c fftools_cmdutils.c fftools_ffmpeg.c fftools_ffprobe.c fftools_ffmpeg_opt.c fftools_ffmpeg_hw.c fftools_ffmpeg_filter.c
-endif
-MY_SRC_FILES += saf_wrapper.c
+include $(CLEAR_VARS)
+LOCAL_ARM_MODE := $(MY_ARM_MODE)
+LOCAL_MODULE := mobileffmpeg
+LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
+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
+include $(BUILD_SHARED_LIBRARY)
 
-MY_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare
-MY_LDLIBS := -llog -lz -landroid
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+    ifeq ("$(shell test -e $(LOCAL_PATH)/../build/.neon && echo neon)","neon")
 
-MY_BUILD_GENERIC_MOBILE_FFMPEG := true
+        include $(CLEAR_VARS)
+        LOCAL_ARM_MODE := $(MY_ARM_MODE)
+        LOCAL_MODULE := mobileffmpeg-armv7a-neon
+        LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/fftools_cmdutils.c $(MY_PATH)/fftools_ffmpeg.c $(MY_PATH)/fftools_ffmpeg_opt.c $(MY_PATH)/fftools_ffmpeg_hw.c $(MY_PATH)/fftools_ffmpeg_filter.c
+        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 libavcodec-neon libavfilter-neon libswscale-neon libavformat libavutil libswresample libavdevice
+        LOCAL_ARM_NEON := true
+        include $(BUILD_SHARED_LIBRARY)
 
-ifeq ($(MY_ARMV7_NEON), true)
-    include $(CLEAR_VARS)
-    LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp
-    LOCAL_ARM_MODE := $(MY_ARM_MODE)
-    LOCAL_MODULE := mobileffmpeg_armv7a_neon
-    LOCAL_SRC_FILES := $(MY_SRC_FILES)
-    LOCAL_CFLAGS := $(MY_CFLAGS)
-    LOCAL_LDLIBS := $(MY_LDLIBS)
-    LOCAL_SHARED_LIBRARIES := libavcodec_neon libavfilter_neon libswscale_neon libavformat_neon libavutil_neon libswresample_neon libavdevice_neon
-    ifeq ($(APP_STL), c++_shared)
-        LOCAL_SHARED_LIBRARIES += c++_shared # otherwise NDK will not add the library for packaging
-    endif
-    LOCAL_ARM_NEON := true
-    include $(BUILD_SHARED_LIBRARY)
+        $(call import-module, ffmpeg/neon)
 
-    $(call import-module, ffmpeg/neon)
-
-    ifneq ($(MY_ARMV7), true)
-        MY_BUILD_GENERIC_MOBILE_FFMPEG := false
     endif
 endif
 
-ifeq ($(MY_BUILD_GENERIC_MOBILE_FFMPEG), true)
-    include $(CLEAR_VARS)
-    LOCAL_PATH := $(MY_LOCAL_PATH)/../app/src/main/cpp
-    LOCAL_ARM_MODE := $(MY_ARM_MODE)
-    LOCAL_MODULE := mobileffmpeg
-    LOCAL_SRC_FILES := $(MY_SRC_FILES)
-    LOCAL_CFLAGS := $(MY_CFLAGS)
-    LOCAL_LDLIBS := $(MY_LDLIBS)
-    LOCAL_SHARED_LIBRARIES := libavfilter libavformat libavcodec libavutil libswresample libavdevice libswscale
-    ifeq ($(APP_STL), c++_shared)
-        LOCAL_SHARED_LIBRARIES += c++_shared # otherwise NDK will not add the library for packaging
-    endif
-    LOCAL_ARM_NEON := ${MY_ARM_NEON}
-    include $(BUILD_SHARED_LIBRARY)
-
-    $(call import-module, ffmpeg)
-endif
+$(call import-module, ffmpeg)

android/jni/cpu-features/Android.mk

@@ -1,12 +0,0 @@
-ifeq ($(MY_ARMV7_NEON), true)
-    LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/neon/cpu-features/lib
-else
-    LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/cpu-features/lib
-endif
-
-include $(CLEAR_VARS)
-LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_MODULE := cpu-features
-LOCAL_SRC_FILES := libndk_compat.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include/ndk_compat
-include $(PREBUILT_STATIC_LIBRARY)

android/jni/ffmpeg/Android.mk

@@ -1,46 +1,46 @@
-LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib
+LOCAL_PATH := $(call my-dir)
 
 MY_ARM_MODE := arm
+MY_FFMPEG_LIB := ../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavcodec
-LOCAL_SRC_FILES := libavcodec.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavcodec.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavfilter
-LOCAL_SRC_FILES := libavfilter.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavfilter.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavdevice
-LOCAL_SRC_FILES := libavdevice.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavdevice.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavformat
-LOCAL_SRC_FILES := libavformat.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavformat.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavutil
-LOCAL_SRC_FILES := libavutil.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavutil.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libswresample
-LOCAL_SRC_FILES := libswresample.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswresample.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libswscale
-LOCAL_SRC_FILES := libswscale.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswscale.so
 include $(PREBUILT_SHARED_LIBRARY)

android/jni/ffmpeg/neon/Android.mk

@@ -1,61 +1,53 @@
-LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)/neon/ffmpeg/lib
+LOCAL_PATH := $(call my-dir)
 
 MY_ARM_MODE := arm
-MY_ARM_NEON := true
+MY_FFMPEG_LIB := ../../../../prebuilt/android-$(TARGET_ARCH)/neon/ffmpeg/lib
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libavcodec_neon
+LOCAL_MODULE := libavcodec-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libavcodec_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavcodec.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libavfilter_neon
+LOCAL_MODULE := libavfilter-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libavfilter_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavfilter.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libavdevice_neon
+LOCAL_MODULE := libavdevice-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libavdevice_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavdevice.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libavformat_neon
+LOCAL_MODULE := libavformat-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libavformat_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavformat.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libavutil_neon
+LOCAL_MODULE := libavutil-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libavutil_neon.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavutil.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libswresample_neon
+LOCAL_MODULE := libswresample-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libswresample_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswresample.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-LOCAL_ARM_NEON := ${MY_ARM_NEON}
-LOCAL_MODULE := libswscale_neon
+LOCAL_MODULE := libswscale-neon
 LOCAL_MODULE_FILENAME := $(LOCAL_MODULE)
-LOCAL_SRC_FILES := libswscale_neon.so
+LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswscale.so
 include $(PREBUILT_SHARED_LIBRARY)

android/settings.gradle

@@ -1,4 +1 @@
 include ':app', ':test-app'
-include ':mobile-ffmpeg'
-project(':mobile-ffmpeg').projectDir = new File('..')
-rootProject.name='Mobile FFmpeg (android)'

android/test-app/.gitignore

@@ -0,0 +1,4 @@
+/build
+/.idea/
+/gradle/
+/local.properties

android/test-app/build.gradle

@@ -1,59 +1,31 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        localConfig {
-            keyAlias 'androiddebugkey'
-            storeFile file(System.getProperty("user.home") + '/.android/debug.keystore')
-            storePassword 'android'
-            keyPassword 'android'
-        }
-    }
-    compileSdkVersion 30
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.arthenica.mobileffmpeg.test"
-        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 160440
-        versionName "4.4.LTS"
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 22
+        versionName "2.2"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
-        debug {
+        release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.localConfig
-        }
-    }
-    splits {
-        abi {
-            enable true
-            reset()
-            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            universalApk false
-        }
-    }
-}
-
-ext.abiCodes = ['x86':1, 'x86_64':2, 'armeabi-v7a':3, 'arm64-v8a':4]
-
-import com.android.build.OutputFile
-
-android.applicationVariants.all { variant ->
-    variant.outputs.each {
-        output ->
-            def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
-            output.versionCodeOverride = baseAbiVersionCode + variant.versionCode
     }
 }
 
 dependencies {
-    implementation project(':app')
-    // implementation 'com.arthenica:mobile-ffmpeg-full:4.4.LTS'
-    implementation 'com.arthenica:smart-exception-java:0.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.arthenica:mobile-ffmpeg-full:2.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }

android/test-app/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

android/test-app/gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

android/test-app/proguard-rules.pro

@@ -4,3 +4,18 @@
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android/test-app/src/androidTest/java/com/arthenica/mobileffmpeg/test/ExampleInstrumentedTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 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.test;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.arthenica.mobileffmpeg.test", appContext.getPackageName());
+    }
+}

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

@@ -7,20 +7,18 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="true" />
 
     <application
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:largeHeap="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.arthenica.mobileffmpeg.test.MainActivity">
+        tools:replace="android:icon">
+        <activity android:name="com.arthenica.mobileffmpeg.test.MainActivity"
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

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

@@ -21,81 +21,91 @@ package com.arthenica.mobileffmpeg.test;
 
 import android.app.AlertDialog;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import com.arthenica.mobileffmpeg.Config;
 import com.arthenica.mobileffmpeg.FFmpeg;
 import com.arthenica.mobileffmpeg.LogCallback;
 import com.arthenica.mobileffmpeg.LogMessage;
-import com.arthenica.mobileffmpeg.util.DialogUtil;
-import com.arthenica.mobileffmpeg.ExecuteCallback;
+import com.arthenica.mobileffmpeg.util.RunCallback;
 
 import java.io.File;
 import java.util.concurrent.Callable;
 
-import static com.arthenica.mobileffmpeg.Config.RETURN_CODE_SUCCESS;
+import static com.arthenica.mobileffmpeg.FFmpeg.RETURN_CODE_SUCCESS;
 import static com.arthenica.mobileffmpeg.test.MainActivity.TAG;
 
 public class AudioTabFragment extends Fragment implements AdapterView.OnItemSelectedListener {
 
+    private MainActivity mainActivity;
     private AlertDialog progressDialog;
     private Button encodeButton;
     private TextView outputText;
     private String selectedCodec;
 
-    public AudioTabFragment() {
-        super(R.layout.fragment_audio_tab);
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_audio_tab, container, false);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        Spinner audioCodecSpinner = view.findViewById(R.id.audioCodecSpinner);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(requireContext(),
-                R.array.audio_codec, R.layout.spinner_item);
-        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-        audioCodecSpinner.setAdapter(adapter);
-        audioCodecSpinner.setOnItemSelectedListener(this);
+        if (getView() != null) {
+            Spinner audioCodecSpinner = getView().findViewById(R.id.audioCodecSpinner);
+            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mainActivity,
+                    R.array.audio_codec, R.layout.spinner_item);
+            adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+            audioCodecSpinner.setAdapter(adapter);
+            audioCodecSpinner.setOnItemSelectedListener(this);
 
-        encodeButton = view.findViewById(R.id.encodeButton);
-        encodeButton.setOnClickListener(new View.OnClickListener() {
+            encodeButton = getView().findViewById(R.id.encodeButton);
+            encodeButton.setOnClickListener(new View.OnClickListener() {
 
-            @Override
-            public void onClick(View v) {
-                encodeAudio();
-                // encodeChromaprint();
-            }
-        });
-        encodeButton.setEnabled(false);
+                @Override
+                public void onClick(View v) {
+                    encodeAudio();
+                }
+            });
+            encodeButton.setEnabled(false);
 
-        outputText = view.findViewById(R.id.outputText);
-        outputText.setMovementMethod(new ScrollingMovementMethod());
+            outputText = getView().findViewById(R.id.outputText);
+            outputText.setMovementMethod(new ScrollingMovementMethod());
+        }
 
-        progressDialog = DialogUtil.createProgressDialog(requireContext(), "Encoding audio");
+        progressDialog = mainActivity.createProgressDialog("Encoding audio");
 
         selectedCodec = getResources().getStringArray(R.array.audio_codec)[0];
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setActive();
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser) {
+            setActive();
+        }
     }
 
-    public static AudioTabFragment newInstance() {
-        return new AudioTabFragment();
+    public void setMainActivity(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+    }
+
+    public static AudioTabFragment newInstance(final MainActivity mainActivity) {
+        final AudioTabFragment fragment = new AudioTabFragment();
+        fragment.setMainActivity(mainActivity);
+        return fragment;
     }
 
     public void enableLogCallback() {
@@ -103,7 +113,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
             @Override
             public void apply(final LogMessage message) {
-                MainActivity.addUIAction(new Callable<Object>() {
+                MainActivity.addUIAction(new Callable() {
 
                     @Override
                     public Object call() {
@@ -145,26 +155,26 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
         clearLog();
 
-        android.util.Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'.", ffmpegCommand));
+        android.util.Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
 
-        MainActivity.executeAsync(new ExecuteCallback() {
+        MainActivity.executeAsync(new RunCallback() {
 
             @Override
-            public void apply(final long executionId, final int returnCode) {
-                android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d.", returnCode));
+            public void apply(final int returnCode) {
+                android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
 
                 hideProgressDialog();
 
-                MainActivity.addUIAction(new Callable<Object>() {
+                MainActivity.addUIAction(new Callable() {
 
                     @Override
                     public Object call() {
                         if (returnCode == RETURN_CODE_SUCCESS) {
-                            Popup.show(requireContext(), "Encode completed successfully.");
+                            Popup.show(mainActivity, "Encode completed successfully.");
                             android.util.Log.d(TAG, "Encode completed successfully.");
                         } else {
-                            Popup.show(requireContext(), "Encode failed. Please check log for the details.");
-                            android.util.Log.d(TAG, String.format("Encode failed with rc=%d.", returnCode));
+                            Popup.show(mainActivity, "Encode failed. Please check log for the details.");
+                            android.util.Log.d(TAG, String.format("Encode failed with rc=%d", returnCode));
                         }
 
                         return null;
@@ -174,20 +184,6 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         }, ffmpegCommand);
     }
 
-    protected void encodeChromaprint() {
-        File audioSampleFile = getAudioSampleFile();
-
-        Log.d(TAG, "Testing AUDIO encoding with 'chromaprint' muxer");
-
-        final String ffmpegCommand = String.format("-v quiet -i %s -f chromaprint -fp_format 2 -", audioSampleFile.getAbsolutePath());
-
-        Log.d(TAG, String.format("FFmpeg process started with arguments\n'%s'.", ffmpegCommand));
-
-        int returnCode = FFmpeg.execute(ffmpegCommand);
-
-        Log.d(TAG, String.format("FFmpeg process exited with rc %d.", returnCode));
-    }
-
     public void createAudioSample() {
         android.util.Log.d(TAG, "Creating AUDIO sample before the test.");
 
@@ -196,17 +192,17 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
             audioSampleFile.delete();
         }
 
-        String ffmpegCommand = String.format("-hide_banner -y -f lavfi -i sine=frequency=1000:duration=5 -c:a pcm_s16le %s", audioSampleFile.getAbsolutePath());
+        String ffmpegCommand = String.format("-y -f lavfi -i sine=frequency=1000:duration=5 -c:a pcm_s16le %s", audioSampleFile.getAbsolutePath());
 
-        android.util.Log.d(TAG, String.format("Creating audio sample with '%s'.", ffmpegCommand));
+        android.util.Log.d(TAG, String.format("Sample file is created with '%s'", ffmpegCommand));
 
         int result = FFmpeg.execute(ffmpegCommand);
         if (result == 0) {
             encodeButton.setEnabled(true);
             android.util.Log.d(TAG, "AUDIO sample created");
         } else {
-            android.util.Log.d(TAG, String.format("Creating AUDIO sample failed with rc=%d.", result));
-            Popup.show(requireContext(), "Creating AUDIO sample failed. Please check log for the details.");
+            android.util.Log.d(TAG, String.format("Creating AUDIO sample failed with rc=%d", result));
+            Popup.show(mainActivity, "Creating AUDIO sample failed. Please check log for the details.");
         }
     }
 
@@ -215,9 +211,6 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
         String extension;
         switch (audioCodec) {
-            case "mp2 (twolame)":
-                extension = "mpg";
-                break;
             case "mp3 (liblame)":
             case "mp3 (libshine)":
                 extension = "mp3";
@@ -228,10 +221,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
             case "opus":
                 extension = "opus";
                 break;
-            case "amr-nb":
-                extension = "amr";
-                break;
-            case "amr-wb":
+            case "amr":
                 extension = "amr";
                 break;
             case "ilbc":
@@ -251,11 +241,11 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         }
 
         final String audio = "audio." + extension;
-        return new File(requireContext().getFilesDir(), audio);
+        return new File(mainActivity.getFilesDir(), audio);
     }
 
     public File getAudioSampleFile() {
-        return new File(requireContext().getFilesDir(), "audio-sample.wav");
+        return new File(mainActivity.getFilesDir(), "audio-sample.wav");
     }
 
     public void setActive() {
@@ -263,7 +253,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         disableLogCallback();
         createAudioSample();
         enableLogCallback();
-        Popup.show(requireContext(), getString(R.string.audio_test_tooltip_text));
+        Popup.show(mainActivity, Tooltip.AUDIO_TEST_TOOLTIP_TEXT);
     }
 
     public void appendLog(final String logMessage) {
@@ -288,30 +278,26 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         String audioOutputFile = getAudioOutputFile().getAbsolutePath();
 
         switch (audioCodec) {
-            case "mp2 (twolame)":
-                return String.format("-hide_banner -y -i %s -c:a mp2 -b:a 192k %s", audioSampleFile, audioOutputFile);
             case "mp3 (liblame)":
-                return String.format("-hide_banner -y -i %s -c:a libmp3lame -qscale:a 2 %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a libmp3lame -qscale:a 2 %s", audioSampleFile, audioOutputFile);
             case "mp3 (libshine)":
-                return String.format("-hide_banner -y -i %s -c:a libshine -qscale:a 2 %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a libshine -qscale:a 2 %s", audioSampleFile, audioOutputFile);
             case "vorbis":
-                return String.format("-hide_banner -y -i %s -c:a libvorbis -b:a 64k %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a libvorbis -b:a 64k %s", audioSampleFile, audioOutputFile);
             case "opus":
-                return String.format("-hide_banner -y -i %s -c:a libopus -b:a 64k -vbr on -compression_level 10 %s", audioSampleFile, audioOutputFile);
-            case "amr-nb":
-                return String.format("-hide_banner -y -i %s -ar 8000 -ab 12.2k -c:a libopencore_amrnb %s", audioSampleFile, audioOutputFile);
-            case "amr-wb":
-                return String.format("-hide_banner -y -i %s -ar 8000 -ab 12.2k -c:a libvo_amrwbenc -strict experimental %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a libopus -b:a 64k -vbr on -compression_level 10 %s", audioSampleFile, audioOutputFile);
+            case "amr":
+                return String.format("-y -i %s -ar 8000 -ab 12.2k %s", audioSampleFile, audioOutputFile);
             case "ilbc":
-                return String.format("-hide_banner -y -i %s -c:a ilbc -ar 8000 -b:a 15200 %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a ilbc -ar 8000 -b:a 15200 %s", audioSampleFile, audioOutputFile);
             case "speex":
-                return String.format("-hide_banner -y -i %s -c:a libspeex -ar 16000 %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a libspeex -ar 16000 %s", audioSampleFile, audioOutputFile);
             case "wavpack":
-                return String.format("-hide_banner -y -i %s -c:a wavpack -b:a 64k %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -c:a wavpack -b:a 64k %s", audioSampleFile, audioOutputFile);
             default:
 
                 // soxr
-                return String.format("-hide_banner -y -i %s -af aresample=resampler=soxr -ar 44100 %s", audioSampleFile, audioOutputFile);
+                return String.format("-y -i %s -af aresample=resampler=soxr -ar 44100 %s", audioSampleFile, audioOutputFile);
         }
     }
 

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

@@ -20,72 +20,81 @@
 package com.arthenica.mobileffmpeg.test;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.text.method.ScrollingMovementMethod;
-import android.util.AndroidRuntimeException;
-import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import com.arthenica.mobileffmpeg.Config;
 import com.arthenica.mobileffmpeg.FFmpeg;
-import com.arthenica.mobileffmpeg.FFprobe;
 import com.arthenica.mobileffmpeg.LogCallback;
 import com.arthenica.mobileffmpeg.LogMessage;
+import com.arthenica.mobileffmpeg.util.RunCallback;
 
 import java.util.concurrent.Callable;
 
 public class CommandTabFragment extends Fragment {
 
+    private MainActivity mainActivity;
     private EditText commandText;
     private TextView outputText;
 
-    public CommandTabFragment() {
-        super(R.layout.fragment_command_tab);
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_command_tab, container, false);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        commandText = view.findViewById(R.id.commandText);
+        if (getView() != null) {
+            commandText = getView().findViewById(R.id.commandText);
 
-        View runFFmpegButton = view.findViewById(R.id.runFFmpegButton);
-        runFFmpegButton.setOnClickListener(new View.OnClickListener() {
+            View runButton = getView().findViewById(R.id.runButton);
+            runButton.setOnClickListener(new View.OnClickListener() {
 
-            @Override
-            public void onClick(View v) {
-                runFFmpeg();
-            }
-        });
+                @Override
+                public void onClick(View v) {
+                    runFFmpeg();
+                }
+            });
 
-        View runFFprobeButton = view.findViewById(R.id.runFFprobeButton);
-        runFFprobeButton.setOnClickListener(new View.OnClickListener() {
+            View runAsyncButton = getView().findViewById(R.id.runAsyncButton);
+            runAsyncButton.setOnClickListener(new View.OnClickListener() {
 
-            @Override
-            public void onClick(View v) {
-                runFFprobe();
-            }
-        });
+                @Override
+                public void onClick(View v) {
+                    runFFmpegAsync();
+                }
+            });
 
-        outputText = view.findViewById(R.id.outputText);
-        outputText.setMovementMethod(new ScrollingMovementMethod());
-
-        Log.d(MainActivity.TAG, "Last command output was: " + Config.getLastCommandOutput());
+            outputText = getView().findViewById(R.id.outputText);
+            outputText.setMovementMethod(new ScrollingMovementMethod());
+        }
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setActive();
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser) {
+            setActive();
+        }
     }
 
-    public static CommandTabFragment newInstance() {
-        return new CommandTabFragment();
+    public void setMainActivity(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+    }
+
+    public static CommandTabFragment newInstance(final MainActivity mainActivity) {
+        final CommandTabFragment fragment = new CommandTabFragment();
+        fragment.setMainActivity(mainActivity);
+        return fragment;
     }
 
     public void enableLogCallback() {
@@ -101,8 +110,6 @@ public class CommandTabFragment extends Fragment {
                         return null;
                     }
                 });
-
-                throw new AndroidRuntimeException("I am test exception thrown by test application");
             }
         });
     }
@@ -110,45 +117,55 @@ public class CommandTabFragment extends Fragment {
     public void runFFmpeg() {
         clearLog();
 
-        final String ffmpegCommand = String.format("%s", commandText.getText().toString());
+        final String ffmpegCommand = commandText.getText().toString();
 
-        android.util.Log.d(MainActivity.TAG, String.format("Current log level is %s.", Config.getLogLevel()));
-
-        android.util.Log.d(MainActivity.TAG, "Testing FFmpeg COMMAND synchronously.");
+        android.util.Log.d(MainActivity.TAG, "Testing COMMAND synchronously.");
 
         android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n\'%s\'", ffmpegCommand));
 
         int result = FFmpeg.execute(ffmpegCommand);
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d.", result));
+        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d", result));
 
         if (result != 0) {
-            Popup.show(requireContext(), "Command failed. Please check output for the details.");
+            Popup.show(mainActivity, "Command failed. Please check output for the details.");
         }
     }
 
-    public void runFFprobe() {
+    public void runFFmpegAsync() {
         clearLog();
 
-        final String ffprobeCommand = String.format("%s", commandText.getText().toString());
+        final String ffmpegCommand = commandText.getText().toString();
 
-        android.util.Log.d(MainActivity.TAG, "Testing FFprobe COMMAND synchronously.");
+        android.util.Log.d(MainActivity.TAG, "Testing COMMAND asynchronously.");
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFprobe process started with arguments\n\'%s\'", ffprobeCommand));
+        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n\'%s\'", ffmpegCommand));
 
-        int result = FFprobe.execute(ffprobeCommand);
+        MainActivity.executeAsync(new RunCallback() {
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFprobe process exited with rc %d.", result));
+            @Override
+            public void apply(int result) {
 
-        if (result != 0) {
-            Popup.show(requireContext(), "Command failed. Please check output for the details.");
-        }
+                android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d", result));
+
+                if (result != 0) {
+                    MainActivity.addUIAction(new Callable() {
+                        @Override
+                        public Object call() {
+                            Popup.show(mainActivity, "Command failed. Please check output for the details.");
+                            return null;
+                        }
+                    });
+                }
+
+            }
+        }, ffmpegCommand);
     }
 
-    private void setActive() {
-        Log.i(MainActivity.TAG, "Command Tab Activated");
+    public void setActive() {
+        android.util.Log.i(MainActivity.TAG, "Command Tab Activated");
         enableLogCallback();
-        Popup.show(requireContext(), getString(R.string.command_test_tooltip_text));
+        Popup.show(mainActivity, Tooltip.COMMAND_TEST_TOOLTIP_TEXT);
     }
 
     public void appendLog(final String logMessage) {

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

@@ -1,273 +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.test;
-
-import android.os.Bundle;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.arthenica.mobileffmpeg.Config;
-import com.arthenica.mobileffmpeg.ExecuteCallback;
-import com.arthenica.mobileffmpeg.FFmpeg;
-import com.arthenica.mobileffmpeg.FFmpegExecution;
-import com.arthenica.mobileffmpeg.LogCallback;
-import com.arthenica.mobileffmpeg.LogMessage;
-import com.arthenica.mobileffmpeg.util.ResourcesUtil;
-import com.arthenica.smartexception.java.Exceptions;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.Callable;
-
-import static com.arthenica.mobileffmpeg.Config.RETURN_CODE_CANCEL;
-import static com.arthenica.mobileffmpeg.test.MainActivity.TAG;
-
-public class ConcurrentExecutionTabFragment extends Fragment {
-
-    private TextView outputText;
-    private long executionId1;
-    private long executionId2;
-    private long executionId3;
-
-    public ConcurrentExecutionTabFragment() {
-        super(R.layout.fragment_concurrent_tab);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        View encodeButton1 = view.findViewById(R.id.encodeButton1);
-        if (encodeButton1 != null) {
-            encodeButton1.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    encodeVideo(1);
-                }
-            });
-        }
-
-        View encodeButton2 = view.findViewById(R.id.encodeButton2);
-        if (encodeButton2 != null) {
-            encodeButton2.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    encodeVideo(2);
-                }
-            });
-        }
-
-        View encodeButton3 = view.findViewById(R.id.encodeButton3);
-        if (encodeButton3 != null) {
-            encodeButton3.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    encodeVideo(3);
-                }
-            });
-        }
-
-        View cancelButton1 = view.findViewById(R.id.cancelButton1);
-        if (cancelButton1 != null) {
-            cancelButton1.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    cancel(1);
-                }
-            });
-        }
-
-        View cancelButton2 = view.findViewById(R.id.cancelButton2);
-        if (cancelButton2 != null) {
-            cancelButton2.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    cancel(2);
-                }
-            });
-        }
-
-        View cancelButton3 = view.findViewById(R.id.cancelButton3);
-        if (cancelButton3 != null) {
-            cancelButton3.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    cancel(3);
-                }
-            });
-        }
-
-        View cancelButtonAll = view.findViewById(R.id.cancelButtonAll);
-        if (cancelButtonAll != null) {
-            cancelButtonAll.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    cancel(0);
-                }
-            });
-        }
-
-        outputText = view.findViewById(R.id.outputText);
-        outputText.setMovementMethod(new ScrollingMovementMethod());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        setActive();
-    }
-
-    public static ConcurrentExecutionTabFragment newInstance() {
-        return new ConcurrentExecutionTabFragment();
-    }
-
-    public void enableLogCallback() {
-        Config.enableLogCallback(new LogCallback() {
-
-            @Override
-            public void apply(final LogMessage message) {
-                MainActivity.addUIAction(new Callable<Object>() {
-
-                    @Override
-                    public Object call() {
-                        appendLog(String.format(Locale.getDefault(), "%d:%s", message.getExecutionId(), message.getText()));
-                        return null;
-                    }
-                });
-            }
-        });
-    }
-
-    public void encodeVideo(final int buttonNumber) {
-        final File image1File = new File(requireContext().getCacheDir(), "colosseum.jpg");
-        final File image2File = new File(requireContext().getCacheDir(), "pyramid.jpg");
-        final File image3File = new File(requireContext().getCacheDir(), "tajmahal.jpg");
-        final File videoFile = new File(requireContext().getFilesDir(), String.format(Locale.getDefault(), "video%d.mp4", buttonNumber));
-
-        try {
-
-            Log.d(TAG, String.format("Testing CONCURRENT EXECUTION for button %d.", buttonNumber));
-
-            ResourcesUtil.resourceToFile(getResources(), R.drawable.colosseum, image1File);
-            ResourcesUtil.resourceToFile(getResources(), R.drawable.pyramid, image2File);
-            ResourcesUtil.resourceToFile(getResources(), R.drawable.tajmahal, image3File);
-
-            final String ffmpegCommand = Video.generateEncodeVideoScript(image1File.getAbsolutePath(), image2File.getAbsolutePath(), image3File.getAbsolutePath(), videoFile.getAbsolutePath(), "mpeg4", "");
-
-            Log.d(TAG, String.format("FFmpeg process starting for button %d with arguments\n'%s'.", buttonNumber, ffmpegCommand));
-
-            long executionId = FFmpeg.executeAsync(ffmpegCommand, new ExecuteCallback() {
-
-                @Override
-                public void apply(final long executionId, final int returnCode) {
-                    if (returnCode == RETURN_CODE_CANCEL) {
-                        Log.d(TAG, String.format("FFmpeg process ended with cancel for button %d with executionId %d.", buttonNumber, executionId));
-                    } else {
-                        Log.d(TAG, String.format("FFmpeg process ended with rc %d for button %d with executionId %d.", returnCode, buttonNumber, executionId));
-                    }
-                }
-            });
-
-            Log.d(TAG, String.format("Async FFmpeg process started for button %d with executionId %d.", buttonNumber, executionId));
-
-            switch (buttonNumber) {
-                case 1: {
-                    executionId1 = executionId;
-                }
-                break;
-                case 2: {
-                    executionId2 = executionId;
-                }
-                break;
-                default: {
-                    executionId3 = executionId;
-                }
-            }
-
-        } catch (IOException e) {
-            Log.e(TAG, String.format("Encode video failed %s.", Exceptions.getStackTraceString(e)));
-            Popup.show(requireContext(), "Encode video failed");
-        }
-
-        listFFmpegExecutions();
-    }
-
-    public void listFFmpegExecutions() {
-        final List<FFmpegExecution> ffmpegExecutions = FFmpeg.listExecutions();
-        Log.d(TAG, "Listing ongoing FFmpeg executions.");
-        for (int i = 0; i < ffmpegExecutions.size(); i++) {
-            FFmpegExecution execution = ffmpegExecutions.get(i);
-            Log.d(TAG, String.format("Execution %d = id:%d, startTime:%s, command:%s.", i, execution.getExecutionId(), execution.getStartTime(), execution.getCommand()));
-        }
-        Log.d(TAG, "Listed ongoing FFmpeg executions.");
-    }
-
-    public void cancel(final int buttonNumber) {
-        long executionId = 0;
-
-        switch (buttonNumber) {
-            case 1: {
-                executionId = executionId1;
-            }
-            break;
-            case 2: {
-                executionId = executionId2;
-            }
-            break;
-            case 3: {
-                executionId = executionId3;
-            }
-        }
-
-        Log.d(TAG, String.format("Cancelling FFmpeg process for button %d with executionId %d.", buttonNumber, executionId));
-
-        if (executionId == 0) {
-            FFmpeg.cancel();
-        } else {
-            FFmpeg.cancel(executionId);
-        }
-    }
-
-    public void setActive() {
-        Log.i(MainActivity.TAG, "Concurrent Execution Tab Activated");
-        enableLogCallback();
-        Popup.show(requireContext(), getString(R.string.concurrent_execution_test_tooltip_text));
-    }
-
-    public void appendLog(final String logMessage) {
-        outputText.append(logMessage);
-    }
-
-}

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

@@ -20,66 +20,73 @@
 package com.arthenica.mobileffmpeg.test;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import com.arthenica.mobileffmpeg.Config;
-import com.arthenica.mobileffmpeg.FFprobe;
+import com.arthenica.mobileffmpeg.FFmpeg;
 import com.arthenica.mobileffmpeg.LogCallback;
 import com.arthenica.mobileffmpeg.LogMessage;
-import com.arthenica.mobileffmpeg.MediaInformation;
-import com.arthenica.mobileffmpeg.StreamInformation;
 
-import org.json.JSONObject;
-
-import java.util.Iterator;
 import java.util.concurrent.Callable;
 
 public class HttpsTabFragment extends Fragment {
 
-    public static final String HTTPS_TEST_DEFAULT_URL = "https://download.blender.org/peach/trailer/trailer_1080p.ogg";
+    public static final String HTTPS_TEST_DEFAULT_URL = "https://download.blender.org/peach/trailer/trailer_400p.ogg";
 
+    private MainActivity mainActivity;
     private EditText urlText;
     private TextView outputText;
 
-    public HttpsTabFragment() {
-        super(R.layout.fragment_https_tab);
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_https_tab, container, false);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        urlText = view.findViewById(R.id.urlText);
+        if (getView() != null) {
+            urlText = getView().findViewById(R.id.urlText);
 
-        View getInfoButton = view.findViewById(R.id.getInfoButton);
-        getInfoButton.setOnClickListener(new View.OnClickListener() {
+            View getInfoButton = getView().findViewById(R.id.getInfoButton);
+            getInfoButton.setOnClickListener(new View.OnClickListener() {
 
-            @Override
-            public void onClick(View v) {
-                runGetMediaInformation();
-            }
-        });
+                @Override
+                public void onClick(View v) {
+                    getInfo();
+                }
+            });
 
-        outputText = view.findViewById(R.id.outputText);
-        outputText.setMovementMethod(new ScrollingMovementMethod());
+            outputText = getView().findViewById(R.id.outputText);
+            outputText.setMovementMethod(new ScrollingMovementMethod());
+        }
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setActive();
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser) {
+            setActive();
+        }
     }
 
-    public static HttpsTabFragment newInstance() {
-        return new HttpsTabFragment();
+    public void setMainActivity(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+    }
+
+    public static HttpsTabFragment newInstance(final MainActivity mainActivity) {
+        final HttpsTabFragment fragment = new HttpsTabFragment();
+        fragment.setMainActivity(mainActivity);
+        return fragment;
     }
 
     public void enableLogCallback() {
@@ -99,124 +106,33 @@ public class HttpsTabFragment extends Fragment {
         });
     }
 
-    public void runGetMediaInformation() {
+    public void getInfo() {
         clearLog();
 
         String testUrl = urlText.getText().toString();
         if (testUrl.isEmpty()) {
             testUrl = HTTPS_TEST_DEFAULT_URL;
             urlText.setText(testUrl);
-            android.util.Log.d(MainActivity.TAG, String.format("Testing HTTPS with default url '%s'.", testUrl));
+            android.util.Log.d(MainActivity.TAG, String.format("Testing HTTPS with default url '%s'", testUrl));
         } else {
-            android.util.Log.d(MainActivity.TAG, String.format("Testing HTTPS with url '%s'.", testUrl));
+            android.util.Log.d(MainActivity.TAG, String.format("Testing HTTPS with url '%s'", testUrl));
         }
 
         // HTTPS COMMAND ARGUMENTS
-        MediaInformation information = FFprobe.getMediaInformation(testUrl);
-        if (information == null) {
-            appendLog("Get media information failed\n");
-        } else {
-            appendLog("Media information for " + information.getFilename() + "\n");
+        final String ffmpegCommand = String.format("-hide_banner -i %s", testUrl);
 
-            if (information.getFormat() != null) {
-                appendLog("Format: " + information.getFormat() + "\n");
-            }
-            if (information.getBitrate() != null) {
-                appendLog("Bitrate: " + information.getBitrate() + "\n");
-            }
-            if (information.getDuration() != null) {
-                appendLog("Duration: " + information.getDuration() + "\n");
-            }
-            if (information.getStartTime() != null) {
-                appendLog("Start time: " + information.getStartTime() + "\n");
-            }
-            if (information.getTags() != null) {
-                JSONObject tags = information.getTags();
-                if (tags != null) {
-                    Iterator<String> keys = tags.keys();
-                    while (keys.hasNext()) {
-                        String next = keys.next();
-                        appendLog("Tag: " + next + ":" + tags.optString(next) + "\n");
-                    }
-                }
-            }
-            if (information.getStreams() != null) {
-                for (StreamInformation stream : information.getStreams()) {
-                    if (stream.getIndex() != null) {
-                        appendLog("Stream index: " + stream.getIndex() + "\n");
-                    }
-                    if (stream.getType() != null) {
-                        appendLog("Stream type: " + stream.getType() + "\n");
-                    }
-                    if (stream.getCodec() != null) {
-                        appendLog("Stream codec: " + stream.getCodec() + "\n");
-                    }
-                    if (stream.getFullCodec() != null) {
-                        appendLog("Stream full codec: " + stream.getFullCodec() + "\n");
-                    }
-                    if (stream.getFormat() != null) {
-                        appendLog("Stream format: " + stream.getFormat() + "\n");
-                    }
+        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
 
-                    if (stream.getWidth() != null) {
-                        appendLog("Stream width: " + stream.getWidth() + "\n");
-                    }
-                    if (stream.getHeight() != null) {
-                        appendLog("Stream height: " + stream.getHeight() + "\n");
-                    }
+        // EXECUTE
+        int result = FFmpeg.execute(ffmpegCommand);
 
-                    if (stream.getBitrate() != null) {
-                        appendLog("Stream bitrate: " + stream.getBitrate() + "\n");
-                    }
-                    if (stream.getSampleRate() != null) {
-                        appendLog("Stream sample rate: " + stream.getSampleRate() + "\n");
-                    }
-                    if (stream.getSampleFormat() != null) {
-                        appendLog("Stream sample format: " + stream.getSampleFormat() + "\n");
-                    }
-                    if (stream.getChannelLayout() != null) {
-                        appendLog("Stream channel layout: " + stream.getChannelLayout() + "\n");
-                    }
-
-                    if (stream.getSampleAspectRatio() != null) {
-                        appendLog("Stream sample aspect ratio: " + stream.getSampleAspectRatio() + "\n");
-                    }
-                    if (stream.getDisplayAspectRatio() != null) {
-                        appendLog("Stream display ascpect ratio: " + stream.getDisplayAspectRatio() + "\n");
-                        ;
-                    }
-                    if (stream.getAverageFrameRate() != null) {
-                        appendLog("Stream average frame rate: " + stream.getAverageFrameRate() + "\n");
-                    }
-                    if (stream.getRealFrameRate() != null) {
-                        appendLog("Stream real frame rate: " + stream.getRealFrameRate() + "\n");
-                    }
-                    if (stream.getTimeBase() != null) {
-                        appendLog("Stream time base: " + stream.getTimeBase() + "\n");
-                    }
-                    if (stream.getCodecTimeBase() != null) {
-                        appendLog("Stream codec time base: " + stream.getCodecTimeBase() + "\n");
-                    }
-
-                    if (stream.getTags() != null) {
-                        JSONObject tags = stream.getTags();
-                        if (tags != null) {
-                            Iterator<String> keys = tags.keys();
-                            while (keys.hasNext()) {
-                                String next = keys.next();
-                                appendLog(String.format("Stream tag: %s:%s\n", next, tags.optString(next)));
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d", result));
     }
 
     public void setActive() {
-        Log.i(MainActivity.TAG, "Https Tab Activated");
+        android.util.Log.i(MainActivity.TAG, "Https Tab Activated");
         enableLogCallback();
-        Popup.show(requireContext(), getString(R.string.https_test_tooltip_text));
+        Popup.show(mainActivity, Tooltip.HTTPS_TEST_TOOLTIP_TEXT);
     }
 
     public void appendLog(final String logMessage) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 Taner Sener
+ * Copyright (c) 2018 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -20,50 +20,53 @@
 package com.arthenica.mobileffmpeg.test;
 
 import android.Manifest;
+import android.app.ActionBar;
+import android.app.AlertDialog;
+import android.content.Context;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.view.PagerTabStrip;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.viewpager.widget.PagerTabStrip;
-import androidx.viewpager.widget.ViewPager;
-
-import com.arthenica.mobileffmpeg.AsyncFFmpegExecuteTask;
 import com.arthenica.mobileffmpeg.Config;
-import com.arthenica.mobileffmpeg.ExecuteCallback;
-import com.arthenica.mobileffmpeg.Level;
-import com.arthenica.mobileffmpeg.Signal;
-import com.arthenica.mobileffmpeg.util.ResourcesUtil;
-import com.arthenica.smartexception.java.Exceptions;
+import com.arthenica.mobileffmpeg.FFmpeg;
+import com.arthenica.mobileffmpeg.util.RunCallback;
+import com.arthenica.mobileffmpeg.util.AsynchronousTaskService;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Future;
 
 public class MainActivity extends AppCompatActivity {
 
     public static final String TAG = "mobile-ffmpeg-test";
 
     public static final int REQUEST_EXTERNAL_STORAGE = 1;
-    public static String[] PERMISSIONS_ALL = {
+    public static String[] PERMISSIONS_STORAGE = {
             Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.CAMERA
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
     };
 
-    static {
-        Exceptions.registerRootPackage("com.arthenica");
-    }
+    protected static final AsynchronousTaskService asynchronousTaskService = new AsynchronousTaskService();
 
-    protected static final Queue<Callable<Object>> actionQueue = new ConcurrentLinkedQueue<>();
+    protected static final Queue<Callable> actionQueue = new ConcurrentLinkedQueue<>();
 
     protected static final Handler handler = new Handler();
 
@@ -71,7 +74,7 @@ public class MainActivity extends AppCompatActivity {
 
         @Override
         public void run() {
-            Callable<Object> callable;
+            Callable callable;
 
             do {
                 callable = actionQueue.poll();
@@ -79,7 +82,7 @@ public class MainActivity extends AppCompatActivity {
                     try {
                         callable.call();
                     } catch (final Exception e) {
-                        android.util.Log.e(TAG, String.format("Running UI action received error.%s.", Exceptions.getStackTraceString(e)));
+                        android.util.Log.e(MainActivity.TAG, "Running UI action received error.", e);
                     }
                 }
             } while (callable != null);
@@ -94,6 +97,12 @@ public class MainActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_main);
 
+        android.support.v7.app.ActionBar supportActionBar = getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+            supportActionBar.setCustomView(R.layout.action_bar);
+        }
+
         PagerTabStrip pagerTabStrip = findViewById(R.id.pagerTabStrip);
         if (pagerTabStrip != null) {
             pagerTabStrip.setDrawFullUnderline(false);
@@ -102,7 +111,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         final ViewPager viewPager = findViewById(R.id.pager);
-        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), this));
+        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), this, 6));
 
         waitForUIAction();
 
@@ -110,19 +119,7 @@ public class MainActivity extends AppCompatActivity {
         int permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
         if (permission != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(this,
-                    PERMISSIONS_ALL,
-                    REQUEST_EXTERNAL_STORAGE);
-        }
-        permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
-        if (permission != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this,
-                    PERMISSIONS_ALL,
-                    REQUEST_EXTERNAL_STORAGE);
-        }
-        permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
-        if (permission != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this,
-                    PERMISSIONS_ALL,
+                    PERMISSIONS_STORAGE,
                     REQUEST_EXTERNAL_STORAGE);
         }
 
@@ -130,13 +127,8 @@ public class MainActivity extends AppCompatActivity {
             registerAppFont();
             Log.d(TAG, "Application fonts registered.");
         } catch (final IOException e) {
-            Log.e(TAG, String.format("Font registration failed.%s.", Exceptions.getStackTraceString(e)));
+            Log.e(TAG, "Font registration failed.", e);
         }
-
-        Log.d(TAG, "Listing supported camera ids.");
-        listSupportedCameraIds();
-        Config.ignoreSignal(Signal.SIGXCPU);
-        Config.setLogLevel(Level.AV_LOG_DEBUG);
     }
 
     @Override
@@ -147,46 +139,118 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * <p>Starts a new asynchronous FFmpeg operation with command provided.
+     * <p>Starts a new asynchronous FFmpeg operation with arguments provided.
      *
-     * @param ExecuteCallback callback function to receive result of this execution
-     * @param command         FFmpeg command
+     * @param runCallback callback function to receive result of this execution
+     * @param arguments   FFmpeg command options/arguments
+     * @return <code>Future</code> instance of asynchronous operation started
      */
-    public static void executeAsync(final ExecuteCallback ExecuteCallback, final String command) {
-        final AsyncFFmpegExecuteTask asyncCommandTask = new AsyncFFmpegExecuteTask(command, ExecuteCallback);
-        asyncCommandTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    public static Future executeAsync(final RunCallback runCallback, final String arguments) {
+        return asynchronousTaskService.runAsynchronously(new Callable<Integer>() {
+
+            @Override
+            public Integer call() {
+                int returnCode = FFmpeg.execute(arguments);
+                if (runCallback != null) {
+                    runCallback.apply(returnCode);
+                }
+
+                return returnCode;
+            }
+        });
     }
 
     public static void waitForUIAction() {
         handler.postDelayed(runnable, 250);
     }
 
-    public static void addUIAction(final Callable<Object> callable) {
+    public static void addUIAction(final Callable callable) {
         actionQueue.add(callable);
     }
 
+    public AlertDialog createProgressDialog(final String text) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        if (inflater != null) {
+            View dialogView = inflater.inflate(R.layout.progress_dialog_layout, null);
+            builder.setView(dialogView);
+
+            TextView textView = dialogView.findViewById(R.id.progressDialogText);
+            if (textView != null) {
+                textView.setText(text);
+            }
+        }
+        builder.setCancelable(false);
+        return builder.create();
+    }
+
+    public AlertDialog createCancellableProgressDialog(final String text, final View.OnClickListener onClickListener) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        if (inflater != null) {
+            View dialogView = inflater.inflate(R.layout.cancellable_progress_dialog_layout, null);
+            builder.setView(dialogView);
+
+            TextView textView = dialogView.findViewById(R.id.progressDialogText);
+            if (textView != null) {
+                textView.setText(text);
+            }
+            Button cancelButton = dialogView.findViewById(R.id.cancelButton);
+            if (cancelButton != null) {
+                cancelButton.setOnClickListener(onClickListener);
+            }
+        }
+        builder.setCancelable(false);
+        return builder.create();
+    }
+
+    protected void resourceToFile(final int resourceId, final File file) throws IOException {
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resourceId);
+
+        if (file.exists()) {
+            file.delete();
+        }
+
+        FileOutputStream outputStream = new FileOutputStream(file);
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
+        outputStream.flush();
+        outputStream.close();
+    }
+
+    protected void rawResourceToFile(final int resourceId, final File file) throws IOException {
+        final InputStream inputStream = getResources().openRawResource(resourceId);
+        if (file.exists()) {
+            file.delete();
+        }
+        final FileOutputStream outputStream = new FileOutputStream(file);
+
+        try {
+            final byte[] buffer = new byte[1024];
+            int readSize;
+
+            while ((readSize = inputStream.read(buffer)) > 0) {
+                outputStream.write(buffer, 0, readSize);
+            }
+        } catch (final IOException e) {
+            Log.e(TAG, "Saving raw resource failed.", e);
+        } finally {
+            inputStream.close();
+            outputStream.flush();
+            outputStream.close();
+        }
+    }
+
     protected void registerAppFont() throws IOException {
         final File cacheDirectory = getCacheDir();
 
         // SAVE FONTS
-        ResourcesUtil.rawResourceToFile(getResources(), R.raw.doppioone_regular, new File(cacheDirectory, "doppioone_regular.ttf"));
-        ResourcesUtil.rawResourceToFile(getResources(), R.raw.truenorg, new File(cacheDirectory, "truenorg.otf"));
+        rawResourceToFile(R.raw.doppioone_regular, new File(cacheDirectory, "doppioone_regular.ttf"));
+        rawResourceToFile(R.raw.truenorg, new File(cacheDirectory, "truenorg.otf"));
 
         final HashMap<String, String> fontNameMapping = new HashMap<>();
         fontNameMapping.put("MyFontName", "Doppio One");
         Config.setFontDirectory(this, cacheDirectory.getAbsolutePath(), fontNameMapping);
-        Config.setEnvironmentVariable("FFREPORT", String.format("file=%s", new File(cacheDirectory.getAbsolutePath(), "ffreport.txt").getAbsolutePath()));
-    }
-
-    protected void listSupportedCameraIds() {
-        final List<String> supportedCameraIds = Config.getSupportedCameraIds(this);
-        if (supportedCameraIds.size() == 0) {
-            android.util.Log.d(MainActivity.TAG, "No supported cameras found.");
-        } else {
-            for (String supportedCameraId : supportedCameraIds) {
-                android.util.Log.d(MainActivity.TAG, "Supported camera detected: " + supportedCameraId);
-            }
-        }
+        // Config.setFontDirectory(this, cacheDirectory.getAbsolutePath(), null);
     }
 
 }

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

@@ -19,51 +19,41 @@
 
 package com.arthenica.mobileffmpeg.test;
 
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
 
 public class PagerAdapter extends FragmentPagerAdapter {
-    private static final int NUMBER_OF_TABS = 9;
+    private final MainActivity mainActivity;
+    private int numberOfTabs;
 
-    private final Context context;
+    PagerAdapter(final FragmentManager fragmentManager, final MainActivity mainActivity, final int numberOfTabs) {
+        super(fragmentManager);
 
-    PagerAdapter(FragmentManager fragmentManager, Context context) {
-        super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-        this.context = context;
+        this.mainActivity = mainActivity;
+        this.numberOfTabs = numberOfTabs;
     }
 
     @Override
     public Fragment getItem(final int position) {
         switch (position) {
             case 0: {
-                return CommandTabFragment.newInstance();
+                return CommandTabFragment.newInstance(mainActivity);
             }
             case 1: {
-                return VideoTabFragment.newInstance();
+                return VideoTabFragment.newInstance(mainActivity);
             }
             case 2: {
-                return HttpsTabFragment.newInstance();
+                return HttpsTabFragment.newInstance(mainActivity);
             }
             case 3: {
-                return AudioTabFragment.newInstance();
+                return AudioTabFragment.newInstance(mainActivity);
             }
             case 4: {
-                return SubtitleTabFragment.newInstance();
+                return SubtitleTabFragment.newInstance(mainActivity);
             }
             case 5: {
-                return VidStabTabFragment.newInstance();
-            }
-            case 6: {
-                return PipeTabFragment.newInstance();
-            }
-            case 7: {
-                return ConcurrentExecutionTabFragment.newInstance();
-            }
-            case 8: {
-                return SafTabFragment.newInstance();
+                return VidStabTabFragment.newInstance(mainActivity);
             }
             default: {
                 return null;
@@ -73,38 +63,29 @@ public class PagerAdapter extends FragmentPagerAdapter {
 
     @Override
     public int getCount() {
-        return NUMBER_OF_TABS;
+        return numberOfTabs;
     }
 
     @Override
     public CharSequence getPageTitle(final int position) {
         switch (position) {
             case 0: {
-                return context.getString(R.string.command_tab);
+                return mainActivity.getString(R.string.command_tab);
             }
             case 1: {
-                return context.getString(R.string.video_tab);
+                return mainActivity.getString(R.string.video_tab);
             }
             case 2: {
-                return context.getString(R.string.https_tab);
+                return mainActivity.getString(R.string.https_tab);
             }
             case 3: {
-                return context.getString(R.string.audio_tab);
+                return mainActivity.getString(R.string.audio_tab);
             }
             case 4: {
-                return context.getString(R.string.subtitle_tab);
+                return mainActivity.getString(R.string.subtitle_tab);
             }
             case 5: {
-                return context.getString(R.string.vidstab_tab);
-            }
-            case 6: {
-                return context.getString(R.string.pipe_tab);
-            }
-            case 7: {
-                return context.getString(R.string.concurrent_tab);
-            }
-            case 8: {
-                return context.getString(R.string.saf_tab);
+                return mainActivity.getString(R.string.vidstab_tab);
             }
             default: {
                 return null;