Merge pull request #690 from alexcohn/bugfix/#634_fdsan

fixing #634

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/issue-template.md

@@ -17,7 +17,7 @@ What happened.
 If applicable, add screenshots to help explain your problem.
 
 **Logs**
-Post logs here or paste them to [Ghostbin](https://ghostbin.com) and insert the link here.
+Post logs here or paste them to [Ghostbin](https://ghostbin.co) and insert the link here.
 
 **Environment**
  - Platform: [e.g. Android/IOS]

.github/workflows/stale.yml

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,174 @@
+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,26 +1,29 @@
-# 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-v4.2-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v4.2-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v4.2-blue.svg)
+# 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)
 
-FFmpeg for Android and IOS
+FFmpeg for Android, iOS and tvOS
 
-<img src="https://github.com/tanersener/mobile-ffmpeg/blob/dev-v3.x/docs/assets/mobile-ffmpeg-logo-v7.png" width="320">
+<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/mobile-ffmpeg-logo-v7.png" width="320">
 
 ### 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
-    - Both Android and IOS
-    - FFmpeg `v3.4.x`, `v4.0.x`, `v4.1` and `v4.2-dev` releases
-    - 27 external libraries
+    - 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
     
-        `chromaprint`, `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `twolame`, `wavpack`
+        `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`
     
-    - 4 external libraries with GPL license
+    - 5 external libraries with GPL license
     
-        `vid.stab`, `x264`, `x265`, `xvidcore`
+        `rubberband`, `vid.stab`, `x264`, `x265`, `xvidcore`
+
+    - Concurrent execution
 
 - Exposes both FFmpeg library and MobileFFmpeg wrapper library capabilities
-- Includes cross-compile instructions for 43 open-source libraries
+- Includes cross-compile instructions for 47 open-source libraries
     
-    `chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `leptonica`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libsndfile`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `tiff`, `twolame`, `vid.stab`, `wavpack`, `x264`, `x265`, `xvidcore`
+    `chromaprint`, `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `leptonica`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libsamplerate`, `libsndfile`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `openh264`, `opus`, `rubberband`, `sdl`, `shine`, `snappy`, `soxr`, `speex`, `tesseract`, `tiff`, `twolame`, `vid.stab`, `vo-amrwbenc`, `wavpack`, `x264`, `x265`, `xvidcore`
 
 - Licensed under LGPL 3.0, can be customized to support GPL v3.0
 
@@ -30,36 +33,49 @@ FFmpeg for Android and IOS
 - Camera access on [supported devices](https://developer.android.com/ndk/guides/stable_apis#camera)
 - Builds shared native libraries (.so)
 - Creates Android archive with .aar extension
+- Supports `API Level 16+`
 
-#### 1.2 IOS
-- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386` and `x86_64` architectures
-- Supports `bzip2`, `zlib` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
+#### 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
 - `ARC` enabled library
 - Built with `-fembed-bitcode` flag
-- Creates static framework and static universal (fat) library (.a) 
-- Supports Xcode 7.3.1 or later
+- 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
 
 ### 2. Using
-Binaries 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 binary packages. Below you can see which system libraries and external libraries are enabled in each of them.
+#### 2.1 Packages
+
+There are eight different `mobile-ffmpeg` packages. Below you can see which system libraries and external libraries are enabled in each of them. 
+
+Please remember that some parts of `FFmpeg` are licensed under the `GPL` and only `GPL` licensed `mobile-ffmpeg` packages include them.
 
 <table>
 <thead>
 <tr>
 <th align="center"></th>
-<th align="center">min</th>
-<th align="center">min-gpl</th>
-<th align="center">https</th>
-<th align="center">https-gpl</th>
-<th align="center">audio</th>
-<th align="center">video</th>
-<th align="center">full</th>
-<th align="center">full-gpl</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>
@@ -69,10 +85,10 @@ There are eight different binary packages. Below you can see which system librar
 <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>wavpack</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>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>wavpack</sup><br><sup>x264</sup><br><sup>x265</sup><br><sup>xvidcore</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>
@@ -80,7 +96,11 @@ There are eight different binary packages. Below you can see which system librar
 </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>CoreImage</sup><br><sup>VideoToolbox</sup><br><sup>bzip2</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>
@@ -91,59 +111,111 @@ There are eight different binary packages. Below you can see which system librar
 
  - `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`, `CoreImage`, `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
+ - `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`
 
-#### 2.1 Android
-1. Add MobileFFmpeg dependency from `jcenter()`
+ - 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.
     ```
     dependencies {
-        implementation 'com.arthenica:mobile-ffmpeg-full:4.2'
+        implementation 'com.arthenica:mobile-ffmpeg-full:4.4'
     }
     ```
 
-2. Execute commands.
+2. Execute synchronous FFmpeg commands.
     ```
+    import com.arthenica.mobileffmpeg.Config;
     import com.arthenica.mobileffmpeg.FFmpeg;
 
-    FFmpeg.execute("-i file1.mp4 -c:v mpeg4 file2.mp4");
+    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);
+    }
     ```
 
-3. Check execution output.
+3. Execute asynchronous FFmpeg commands.
     ```
-    int rc = FFmpeg.getLastReturnCode();
-    String output = FFmpeg.getLastCommandOutput();
+    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));
+            }
+        }
+    });
+    ```
+
+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 output=%s.", rc, output));
+        Log.i(Config.TAG, String.format("Command execution failed with rc=%d and the output below.", rc));
+        Config.printLastCommandOutput(Log.INFO);
     }
     ```
 
-4. Stop an ongoing operation.
+6. Stop ongoing FFmpeg operations.
+    - Stop all executions
+        ```
+        FFmpeg.cancel();
+        ```
+    - Stop a specific execution
+        ```
+        FFmpeg.cancel(executionId);
+        ```
+
+7. Get media information for a file.
     ```
-    FFmpeg.cancel();
+    MediaInformation info = FFprobe.getMediaInformation("<file path or uri>");
     ```
 
-5. Get media information for a file.
-    ```
-    MediaInformation info = FFmpeg.getMediaInformation("<file path or uri>");
-    ```
-
-6. Record video and audio using Android camera.
+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>");
     ```
 
-7. List enabled external libraries.
-    ```
-    List<String> externalLibraries = Config.getExternalLibraries();
-    ```
-
-8. Enable log callback.
+9. Enable log callback.
     ```
     Config.enableLogCallback(new LogCallback() {
         public void apply(LogMessage message) {
@@ -152,7 +224,7 @@ There are eight different binary packages. Below you can see which system librar
     });
     ```
 
-9. Enable statistics callback.
+10. Enable statistics callback.
     ```
     Config.enableStatisticsCallback(new StatisticsCallback() {
         public void apply(Statistics newStatistics) {
@@ -160,34 +232,97 @@ There are eight different binary packages. Below you can see which system librar
         }
     });
     ```
+11. Ignore the handling of a signal.
+    ```
+    Config.ignoreSignal(Signal.SIGXCPU);
+    ```
 
-10. Set log level.
+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.
     ```
     Config.setLogLevel(Level.AV_LOG_FATAL);
     ```
 
-11. Register custom fonts directory.
+14. Register custom fonts directory.
     ```
     Config.setFontDirectory(this, "<folder with fonts>", Collections.EMPTY_MAP);
     ```
 
-#### 2.2 IOS
-1. Add MobileFFmpeg pod to your `Podfile`
+#### 2.3 iOS / tvOS
+1. Add MobileFFmpeg dependency to your `Podfile` in `mobile-ffmpeg-<package name>` pattern.
+
+    - iOS
     ```
-    pod 'mobile-ffmpeg-full', '~> 4.2'
+    pod 'mobile-ffmpeg-full', '~> 4.4'
     ```
 
-2. Execute commands.
+    - tvOS
     ```
+    pod 'mobile-ffmpeg-tvos-full', '~> 4.4'
+    ```
+
+2. Execute synchronous FFmpeg commands.
+    ```
+    #import <mobileffmpeg/MobileFFmpegConfig.h>
     #import <mobileffmpeg/MobileFFmpeg.h>
 
-    [MobileFFmpeg execute: @"-i file1.mp4 -c:v mpeg4 file2.mp4"];
+    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]);
+    }
     ```
     
-3. Check execution output.
+5. Check execution output later.
     ```
-    int rc = [MobileFFmpeg getLastReturnCode];
-    NSString *output = [MobileFFmpeg getLastCommandOutput];
+    int rc = [MobileFFmpegConfig getLastReturnCode];
+    NSString *output = [MobileFFmpegConfig getLastCommandOutput];
 
     if (rc == RETURN_CODE_SUCCESS) {
         NSLog(@"Command execution completed successfully.\n");
@@ -198,39 +333,40 @@ There are eight different binary packages. Below you can see which system librar
     }
     ```
 
-4. Stop an ongoing operation.
+6. Stop ongoing FFmpeg operations.
+    - Stop all executions
+        ```
+        [MobileFFmpeg cancel];
+
+        ```
+    - Stop a specific execution
+        ```
+        [MobileFFmpeg cancel:executionId];
+        ```
+
+7. Get media information for a file.
     ```
-    [MobileFFmpeg cancel];
+    MediaInformation *mediaInformation = [MobileFFprobe getMediaInformation:@"<file path or uri>"];
     ```
 
-5. Get media information for a file.
-    ```
-    MediaInformation *mediaInformation = [MobileFFmpeg getMediaInformation:@"<file path or uri>"];
-    ```
-
-6. Record video and audio using IOS camera
+8. Record video and audio using iOS camera. This operation is not supported on `tvOS` since `AVFoundation` is not available on `tvOS`.
 
     ```
     [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];
     ```
 
-7. List enabled external libraries.
-    ```
-    NSArray *externalLibraries = [MobileFFmpegConfig getExternalLibraries];
-    ```
-
-8. Enable log callback.
+9. Enable log callback.
     ```
     [MobileFFmpegConfig setLogDelegate:self];
 
-    - (void)logCallback: (int)level :(NSString*)message {
+    - (void)logCallback:(long)executionId :(int)level :(NSString*)message {
         dispatch_async(dispatch_get_main_queue(), ^{
             NSLog(@"%@", message);
         });
     }
     ```
 
-9. Enable statistics callback.
+10. Enable statistics callback.
     ```
     [MobileFFmpegConfig setStatisticsDelegate:self];
 
@@ -241,133 +377,282 @@ There are eight different binary packages. Below you can see which system librar
     }
     ```
 
-10. Set log level.
+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.
     ```
     [MobileFFmpegConfig setLogLevel:AV_LOG_FATAL];
     ```
 
-11. Register custom fonts directory.
+14. Register custom fonts directory.
     ```
     [MobileFFmpegConfig setFontDirectory:@"<folder with fonts>" with:nil];
     ```
-    
-#### 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 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.
 
-<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/ios_test_app.gif" width="240">
+#### 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
+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. 
+
+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">
 
 ### 3. Versions
 
-`MobileFFmpeg` uses the same version number as `FFmpeg` since `v4.2`. Before that, `MobileFFmpeg` version of a release and `FFmpeg` version included in that release was different, as shown in the following table. 
+`MobileFFmpeg` version number is aligned with `FFmpeg` since version `4.2`. 
 
-|        | v1.0 | v1.1 | v1.2 | v2.0 | v2.1 | v2.2 | v3.0 | v3.1 | v4.2 |
-| :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: |
-| FFmpeg | 3.4.2 | 3.4.2 | 3.4.4 | 4.0.1 | 4.0.2 | 4.0.3 | 4.1-dev-1517 | v4.1-10 | v4.2-dev-480 |
-| packages | min<br/>full | min<br/>min-gpl<br/>https<br/>https-gpl<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>audio<br/>video<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>audio<br/>video<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>audio<br/>video<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>audio<br/>video<br/>full<br/>full-gpl | min<br/>min-gpl<br/>https<br/>https-gpl<br/>audio<br/>video<br/>full<br/>full-gpl |
+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 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
+- Main releases include complete functionality of the library and support the latest SDK/API features.
 
-- LTS releases are customized to support a wide range of devices. They are built using older API/SDK versions, so some features are not available for them
+- 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 | 21 | 
-| Android Camera Access | x | - |
-| Android Architectures | arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64</br> | arm-v7a<br/>arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64</br> |
-| IOS SDK | 12.1 | 9.3 |
+| 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 Architectures | arm64<br/>arm64e<br/>x86-64</br> | armv7<br/>arm64<br/>i386<br/>x86-64</br> |
+| 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
 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
+    autoconf automake libtool pkg-config curl cmake gcc gperf texinfo yasm nasm bison autogen patch git
     ```
 Some of these packages are not mandatory for the default build.
-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.
+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.
 
 2. Android builds require these additional packages.
-    - **Android SDK 5.0 Lollipop (API Level 21)** or later
-    - **Android NDK r17c** or later with LLDB and CMake
+    - **Android SDK 4.1 Jelly Bean (API Level 16)** or later
+    - **Android NDK r21** or later with LLDB and CMake
 
-3. IOS builds need these extra packages and tools.
-    - **IOS SDK 8.0.x** or later
+3. iOS builds need these extra packages and tools.
     - **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**
 
 #### 5.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.
+Use `android.sh`, `ios.sh` and `tvos.sh` to build MobileFFmpeg for each platform. 
 
-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.
+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 
 ```
+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
+##### 5.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 Building LTS Binaries
+##### 5.2.3 tvOS
+```
+./tvos.sh
+```
+
+<img src="https://github.com/tanersener/mobile-ffmpeg/blob/master/docs/assets/tvos_custom.gif" width="600">
+
+
+##### 5.2.4 Building LTS Binaries
 
 Use `--lts` option to build lts binaries for each platform.
 
-#### 5.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.
+#### 5.3 Build Output
 
-#### 5.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.
+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
 
 A more detailed documentation is available at [Wiki](https://github.com/tanersener/mobile-ffmpeg/wiki).
 
-### 7. License
+### 7. 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.
+#### 7.1 Code Contributors
 
-Source code of FFmpeg and external libraries is included in compliance with their individual licenses.
+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>
 
-`strip-frameworks.sh` script included and distributed is published under the [Apache License version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
+#### 7.2 Financial Contributors
 
-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.
+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.
 
 Please visit [License](https://github.com/tanersener/mobile-ffmpeg/wiki/License) page for the details.
 
-### 8. Contributing
+### 9. Patents
 
-If you have any recommendations or ideas to improve it, please feel free to submit issues or pull requests. Any help is appreciated.
+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).
 
-### 9. See Also
+`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
 
 - [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,12 +1,13 @@
 *.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+.gradle/
+local.properties
 .DS_Store
-/build
-/captures
-.externalNativeBuild
-/.idea/
+/build/
+/app/build/
+/test-app/build/
+/app/.cxx/
+captures
+.externalNativeBuild/
+.idea/
 /obj/
 /libs/

android/app/.gitignore

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

android/app/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.14
+# Doxyfile 1.8.18
 
 # 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 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
+# 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
 # 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.2
+PROJECT_NUMBER         = 4.4
 
 # 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,6 +93,14 @@ 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.
@@ -189,6 +197,16 @@ 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
@@ -238,15 +256,13 @@ 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
@@ -275,17 +291,26 @@ 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,
-# 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.
+# 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.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -296,7 +321,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 http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://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.
@@ -308,7 +333,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: 0.
+# Minimum value: 0, maximum value: 99, default value: 5.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
@@ -444,6 +469,12 @@ 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.
@@ -498,8 +529,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -522,7 +553,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
-# and Mac users are advised to set this option to NO.
+# (including Cygwin) ands Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -754,7 +785,8 @@ 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.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -813,8 +845,10 @@ 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, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+# *.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.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -889,7 +923,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       = cmdutils.* ffmpeg.* ffmpeg_*
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1011,7 +1045,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -1048,7 +1082,7 @@ SOURCE_TOOLTIPS        = YES
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1226,9 +1260,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.
@@ -1258,13 +1292,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/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/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/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1303,7 +1337,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: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: https://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
@@ -1379,7 +1413,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: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# (see: https://doc.qt.io/archives/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.
 
@@ -1387,7 +1421,8 @@ 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: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1395,21 +1430,23 @@ 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: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/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: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/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:
-# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1493,6 +1530,17 @@ 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
@@ -1513,8 +1561,14 @@ 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
@@ -1542,7 +1596,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://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@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/
@@ -1584,7 +1638,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
@@ -1668,21 +1722,35 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# 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.
+# 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.
 # 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.
@@ -1817,6 +1885,14 @@ 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
 #---------------------------------------------------------------------------
@@ -1856,9 +1932,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# 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.
+# 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.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1867,8 +1943,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration 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    =
@@ -1954,6 +2030,13 @@ 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
 #---------------------------------------------------------------------------
@@ -2155,12 +2238,6 @@ 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
 #---------------------------------------------------------------------------
@@ -2174,15 +2251,6 @@ PERL_PATH              = /usr/bin/perl
 
 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,15 +1,16 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
+    ndkVersion "21.3.6528147"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 27
-        versionCode 240420
-        versionName "4.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 30
+        versionCode 240440
+        versionName "4.4"
         project.archivesBaseName = "mobile-ffmpeg"
+        consumerProguardFiles 'proguard-rules.pro'
     }
 
     buildTypes {
@@ -28,33 +29,13 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
-
-    libraryVariants.all { variant ->
-        variant.outputs.all { output ->
-            if (outputFile != null && outputFileName.endsWith('.aar')) {
-                outputFileName = "${archivesBaseName}-${android.defaultConfig.versionName}.aar"
-            }
-        }
-    }
-}
-
-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
-}
-
-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'
+    testImplementation "androidx.test.ext:junit:1.1.1"
+    testImplementation "org.json:json:20190722"
+}
+
+if (System.properties.containsKey('releaseMobileFFmpeg')) {
+    apply from: "${rootProject.projectDir}/../tools/release/android/release.template.gradle"
 }

android/app/proguard-rules.pro

@@ -5,17 +5,13 @@
 # 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 *;
-#}
+-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);
+}
 
-# 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
+-keep class com.arthenica.mobileffmpeg.AbiDetect {
+    native <methods>;
+}

android/app/release.template.gradle

@@ -1,180 +0,0 @@
-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.2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
-}
-
-android {
-    compileSdkVersion Integer.parseInt(releaseTargetSdk)
-    defaultConfig {
-        minSdkVersion Integer.parseInt(releaseMinSdk)
-        targetSdkVersion Integer.parseInt(releaseTargetSdk)
-        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

@@ -1,45 +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 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,11 +1,4 @@
 <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

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

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

@@ -0,0 +1,69 @@
+/*
+ * 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,6 +20,14 @@
  */
 
 /*
+ * 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
@@ -85,15 +93,19 @@
 
 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);
 
-AVDictionary *sws_dict;
-AVDictionary *swr_opts;
-AVDictionary *format_opts, *codec_opts, *resample_opts;
+__thread char *program_name;
+__thread int program_birth_year;
 
-static FILE *report_file;
-static int report_file_level = AV_LOG_DEBUG;
-int hide_banner = 0;
-int longjmp_value = 0;
+__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;
 
 enum show_muxdemuxers {
     SHOW_DEFAULT,
@@ -115,9 +127,29 @@ 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)
 {
-#ifdef _WIN32
+#if HAVE_SETDLLDIRECTORY
     /* 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("");
@@ -191,7 +223,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
             continue;
 
         if (first) {
-            printf("%s\n", msg);
+            av_log(NULL, AV_LOG_STDERR, "%s\n", msg);
             first = 0;
         }
         av_strlcpy(buf, po->name, sizeof(buf));
@@ -199,9 +231,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));
         }
-        printf("-%-17s  %s\n", buf, po->help);
+        av_log(NULL, AV_LOG_STDERR, "-%-17s  %s\n", buf, po->help);
     }
-    printf("\n");
+    av_log(NULL, AV_LOG_STDERR, "\n");
 }
 
 void show_help_children(const AVClass *class, int flags)
@@ -209,7 +241,7 @@ void show_help_children(const AVClass *class, int flags)
     const AVClass *child = NULL;
     if (class->option) {
         av_opt_show2(&class, NULL, flags, 0);
-        printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "\n");
     }
 
     while ((child = av_opt_child_class_next(class, child)))
@@ -401,12 +433,14 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
                 continue;
             }
             opt++;
-
-            if (optindex < argc) {
+            if (optindex >= argc) {
+                if ((ret = parse_option(optctx, opt, NULL, options)) < 0)
+                    exit_program(1);
+            } else {
                 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);
@@ -473,7 +507,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
     return 0;
 }
 
-static void dump_argument(const char *a)
+void dump_argument(const char *a)
 {
     const unsigned char *p;
 
@@ -812,7 +846,7 @@ do {                                                                           \
                 if (optindex < argc) {
                     arg = argv[optindex++];
                 } else {
-                    arg = "";
+                    arg = NULL;
                 }
             } else if (po->flags & HAS_ARG) {
                 GET_ARG(arg);
@@ -856,8 +890,8 @@ do {                                                                           \
     }
 
     if (octx->cur_group.nb_opts || codec_opts || format_opts || resample_opts)
-        av_log(NULL, AV_LOG_WARNING, "Trailing options were found on the "
-               "commandline.\n");
+        av_log(NULL, AV_LOG_WARNING, "Trailing option(s) found in the "
+               "command: may be ignored.\n");
 
     av_log(NULL, AV_LOG_DEBUG, "Finished splitting the commandline.\n");
 
@@ -983,11 +1017,12 @@ static void expand_filename_template(AVBPrint *bp, const char *template,
     }
 }
 
-static int init_report(const char *env)
+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;
@@ -1019,6 +1054,7 @@ static 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);
         }
@@ -1035,6 +1071,10 @@ static 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);
@@ -1042,19 +1082,20 @@ static int init_report(const char *env)
                filename.str, strerror(errno));
         return ret;
     }
-    av_log_set_callback(mobileffmpeg_log_callback_function);
+    av_log_set_callback(log_callback_report);
     av_log(NULL, AV_LOG_INFO,
            "%s started on %04d-%02d-%02d at %02d:%02d:%02d\n"
-           "Report written to \"%s\"\n",
+           "Report written to \"%s\"\n"
+           "Log level: %d\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);
+           filename.str, report_file_level);
     av_bprint_finalize(&filename, NULL);
     return 0;
 }
 
-int opt_report(const char *opt)
+int opt_report(void *optctx, const char *opt, const char *arg)
 {
     return init_report(NULL);
 }
@@ -1096,7 +1137,7 @@ void print_error(const char *filename, int err)
     av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
 }
 
-static int warned_cfg = 0;
+__thread int warned_cfg = 0;
 
 #define INDENT        1
 #define SHOW_VERSION  2
@@ -1196,7 +1237,6 @@ 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);
 
@@ -1205,7 +1245,6 @@ 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;
@@ -1214,12 +1253,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
-    printf(
+    av_log(NULL, AV_LOG_STDERR,
     "This version of %s has nonfree parts compiled in.\n"
     "Therefore it is not legally redistributable.\n",
     program_name );
 #elif CONFIG_GPLV3
-    printf(
+    av_log(NULL, AV_LOG_STDERR,
     "%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"
@@ -1234,7 +1273,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
-    printf(
+    av_log(NULL, AV_LOG_STDERR,
     "%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"
@@ -1250,7 +1289,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
-    printf(
+    av_log(NULL, AV_LOG_STDERR,
     "%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"
@@ -1265,7 +1304,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
-    printf(
+    av_log(NULL, AV_LOG_STDERR,
     "%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"
@@ -1301,7 +1340,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
     const char *last_name;
     int is_dev;
 
-    printf("%s\n"
+    av_log(NULL, AV_LOG_STDERR, "%s\n"
            " D. = Demuxing supported\n"
            " .E = Muxing supported\n"
            " --\n", device_only ? "Devices:" : "File formats:");
@@ -1346,7 +1385,7 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
             break;
         last_name = name;
 
-        printf(" %s%s %-15s %s\n",
+        av_log(NULL, AV_LOG_STDERR, " %s%s %-15s %s\n",
                decode ? "D" : " ",
                encode ? "E" : " ",
                name,
@@ -1379,97 +1418,97 @@ int show_devices(void *optctx, const char *opt, const char *arg)
     if (codec->field) {                                                      \
         const type *p = codec->field;                                        \
                                                                              \
-        printf("    Supported " list_name ":");                              \
+        av_log(NULL, AV_LOG_STDERR, "    Supported " list_name ":");                              \
         while (*p != term) {                                                 \
             get_name(*p);                                                    \
-            printf(" %s", name);                                             \
+            av_log(NULL, AV_LOG_STDERR, " %s", name);                                             \
             p++;                                                             \
         }                                                                    \
-        printf("\n");                                                        \
+        av_log(NULL, AV_LOG_STDERR, "\n");                                                        \
     }                                                                        \
 
 static void print_codec(const AVCodec *c)
 {
     int encoder = av_codec_is_encoder(c);
 
-    printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name,
+    av_log(NULL, AV_LOG_STDERR, "%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name,
            c->long_name ? c->long_name : "");
 
-    printf("    General capabilities: ");
+    av_log(NULL, AV_LOG_STDERR, "    General capabilities: ");
     if (c->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)
-        printf("horizband ");
+        av_log(NULL, AV_LOG_STDERR, "horizband ");
     if (c->capabilities & AV_CODEC_CAP_DR1)
-        printf("dr1 ");
+        av_log(NULL, AV_LOG_STDERR, "dr1 ");
     if (c->capabilities & AV_CODEC_CAP_TRUNCATED)
-        printf("trunc ");
+        av_log(NULL, AV_LOG_STDERR, "trunc ");
     if (c->capabilities & AV_CODEC_CAP_DELAY)
-        printf("delay ");
+        av_log(NULL, AV_LOG_STDERR, "delay ");
     if (c->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)
-        printf("small ");
+        av_log(NULL, AV_LOG_STDERR, "small ");
     if (c->capabilities & AV_CODEC_CAP_SUBFRAMES)
-        printf("subframes ");
+        av_log(NULL, AV_LOG_STDERR, "subframes ");
     if (c->capabilities & AV_CODEC_CAP_EXPERIMENTAL)
-        printf("exp ");
+        av_log(NULL, AV_LOG_STDERR, "exp ");
     if (c->capabilities & AV_CODEC_CAP_CHANNEL_CONF)
-        printf("chconf ");
+        av_log(NULL, AV_LOG_STDERR, "chconf ");
     if (c->capabilities & AV_CODEC_CAP_PARAM_CHANGE)
-        printf("paramchange ");
+        av_log(NULL, AV_LOG_STDERR, "paramchange ");
     if (c->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
-        printf("variable ");
+        av_log(NULL, AV_LOG_STDERR, "variable ");
     if (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
                            AV_CODEC_CAP_SLICE_THREADS |
                            AV_CODEC_CAP_AUTO_THREADS))
-        printf("threads ");
+        av_log(NULL, AV_LOG_STDERR, "threads ");
     if (c->capabilities & AV_CODEC_CAP_AVOID_PROBING)
-        printf("avoidprobe ");
+        av_log(NULL, AV_LOG_STDERR, "avoidprobe ");
     if (c->capabilities & AV_CODEC_CAP_INTRA_ONLY)
-        printf("intraonly ");
+        av_log(NULL, AV_LOG_STDERR, "intraonly ");
     if (c->capabilities & AV_CODEC_CAP_LOSSLESS)
-        printf("lossless ");
+        av_log(NULL, AV_LOG_STDERR, "lossless ");
     if (c->capabilities & AV_CODEC_CAP_HARDWARE)
-        printf("hardware ");
+        av_log(NULL, AV_LOG_STDERR, "hardware ");
     if (c->capabilities & AV_CODEC_CAP_HYBRID)
-        printf("hybrid ");
+        av_log(NULL, AV_LOG_STDERR, "hybrid ");
     if (!c->capabilities)
-        printf("none");
-    printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "none");
+    av_log(NULL, AV_LOG_STDERR, "\n");
 
     if (c->type == AVMEDIA_TYPE_VIDEO ||
         c->type == AVMEDIA_TYPE_AUDIO) {
-        printf("    Threading capabilities: ");
+        av_log(NULL, AV_LOG_STDERR, "    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: 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_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;
         }
-        printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "\n");
     }
 
     if (avcodec_get_hw_config(c, 0)) {
-        printf("    Supported hardware devices: ");
+        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;
-            printf("%s ", av_hwdevice_get_type_name(config->device_type));
+            av_log(NULL, AV_LOG_STDERR, "%s ", av_hwdevice_get_type_name(config->device_type));
         }
-        printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "\n");
     }
 
     if (c->supported_framerates) {
         const AVRational *fps = c->supported_framerates;
 
-        printf("    Supported framerates:");
+        av_log(NULL, AV_LOG_STDERR, "    Supported framerates:");
         while (fps->num) {
-            printf(" %d/%d", fps->num, fps->den);
+            av_log(NULL, AV_LOG_STDERR, " %d/%d", fps->num, fps->den);
             fps++;
         }
-        printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "\n");
     }
     PRINT_CODEC_SUPPORTED(c, pix_fmts, enum AVPixelFormat, "pixel formats",
                           AV_PIX_FMT_NONE, GET_PIX_FMT_NAME);
@@ -1544,12 +1583,12 @@ static void print_codecs_for_id(enum AVCodecID id, int encoder)
 {
     const AVCodec *codec = NULL;
 
-    printf(" (%s: ", encoder ? "encoders" : "decoders");
+    av_log(NULL, AV_LOG_STDERR, " (%s: ", encoder ? "encoders" : "decoders");
 
     while ((codec = next_codec_for_id(id, codec, encoder)))
-        printf("%s ", codec->name);
+        av_log(NULL, AV_LOG_STDERR, "%s ", codec->name);
 
-    printf(")");
+    av_log(NULL, AV_LOG_STDERR, ")");
 }
 
 int show_codecs(void *optctx, const char *opt, const char *arg)
@@ -1557,7 +1596,7 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
     const AVCodecDescriptor **codecs;
     unsigned i, nb_codecs = get_codecs_sorted(&codecs);
 
-    printf("Codecs:\n"
+    av_log(NULL, AV_LOG_STDERR, "Codecs:\n"
            " D..... = Decoding supported\n"
            " .E.... = Encoding supported\n"
            " ..V... = Video codec\n"
@@ -1574,16 +1613,16 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
         if (strstr(desc->name, "_deprecated"))
             continue;
 
-        printf(" ");
-        printf(avcodec_find_decoder(desc->id) ? "D" : ".");
-        printf(avcodec_find_encoder(desc->id) ? "E" : ".");
+        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("%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, "%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(" %-20s %s", desc->name, desc->long_name ? desc->long_name : "");
+        av_log(NULL, AV_LOG_STDERR, " %-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 */
@@ -1601,7 +1640,7 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
             }
         }
 
-        printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "\n");
     }
     av_free(codecs);
     return 0;
@@ -1612,7 +1651,7 @@ static void print_codecs(int encoder)
     const AVCodecDescriptor **codecs;
     unsigned i, nb_codecs = get_codecs_sorted(&codecs);
 
-    printf("%s:\n"
+    av_log(NULL, AV_LOG_STDERR, "%s:\n"
            " V..... = Video\n"
            " A..... = Audio\n"
            " S..... = Subtitle\n"
@@ -1628,18 +1667,18 @@ static void print_codecs(int encoder)
         const AVCodec *codec = NULL;
 
         while ((codec = next_codec_for_id(desc->id, codec, encoder))) {
-            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, " %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(" %-20s %s", codec->name, codec->long_name ? codec->long_name : "");
+            av_log(NULL, AV_LOG_STDERR, " %-20s %s", codec->name, codec->long_name ? codec->long_name : "");
             if (strcmp(codec->name, desc->name))
-                printf(" (codec %s)", desc->name);
+                av_log(NULL, AV_LOG_STDERR, " (codec %s)", desc->name);
 
-            printf("\n");
+            av_log(NULL, AV_LOG_STDERR, "\n");
         }
     }
     av_free(codecs);
@@ -1662,10 +1701,10 @@ int show_bsfs(void *optctx, const char *opt, const char *arg)
     const AVBitStreamFilter *bsf = NULL;
     void *opaque = NULL;
 
-    printf("Bitstream filters:\n");
+    av_log(NULL, AV_LOG_STDERR, "Bitstream filters:\n");
     while ((bsf = av_bsf_iterate(&opaque)))
-        printf("%s\n", bsf->name);
-    printf("\n");
+        av_log(NULL, AV_LOG_STDERR, "%s\n", bsf->name);
+    av_log(NULL, AV_LOG_STDERR, "\n");
     return 0;
 }
 
@@ -1674,13 +1713,13 @@ int show_protocols(void *optctx, const char *opt, const char *arg)
     void *opaque = NULL;
     const char *name;
 
-    printf("Supported file protocols:\n"
+    av_log(NULL, AV_LOG_STDERR, "Supported file protocols:\n"
            "Input:\n");
     while ((name = avio_enum_protocols(&opaque, 0)))
-        printf("  %s\n", name);
-    printf("Output:\n");
+        av_log(NULL, AV_LOG_STDERR, "  %s\n", name);
+    av_log(NULL, AV_LOG_STDERR, "Output:\n");
     while ((name = avio_enum_protocols(&opaque, 1)))
-        printf("  %s\n", name);
+        av_log(NULL, AV_LOG_STDERR, "  %s\n", name);
     return 0;
 }
 
@@ -1693,7 +1732,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
     int i, j;
     const AVFilterPad *pad;
 
-    printf("Filters:\n"
+    av_log(NULL, AV_LOG_STDERR, "Filters:\n"
            "  T.. = Timeline support\n"
            "  .S. = Slice threading\n"
            "  ..C = Command support\n"
@@ -1719,14 +1758,14 @@ int show_filters(void *optctx, const char *opt, const char *arg)
                                   ( i && (filter->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS))) ? 'N' : '|';
         }
         *descr_cur = 0;
-        printf(" %c%c%c %-17s %-10s %s\n",
+        av_log(NULL, AV_LOG_STDERR, " %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
-    printf("No filters available: libavfilter disabled\n");
+    av_log(NULL, AV_LOG_STDERR, "No filters available: libavfilter disabled\n");
 #endif
     return 0;
 }
@@ -1737,10 +1776,10 @@ int show_colors(void *optctx, const char *opt, const char *arg)
     const uint8_t *rgb;
     int i;
 
-    printf("%-32s #RRGGBB\n", "name");
+    av_log(NULL, AV_LOG_STDERR, "%-32s #RRGGBB\n", "name");
 
     for (i = 0; (name = av_get_known_color_name(i, &rgb)); i++)
-        printf("%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
+        av_log(NULL, AV_LOG_STDERR, "%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
 
     return 0;
 }
@@ -1749,7 +1788,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg)
 {
     const AVPixFmtDescriptor *pix_desc = NULL;
 
-    printf("Pixel formats:\n"
+    av_log(NULL, AV_LOG_STDERR, "Pixel formats:\n"
            "I.... = Supported Input  format for conversion\n"
            ".O... = Supported Output format for conversion\n"
            "..H.. = Hardware accelerated format\n"
@@ -1765,7 +1804,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);
-        printf("%c%c%c%c%c %-16s       %d            %2d\n",
+        av_log(NULL, AV_LOG_STDERR, "%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' : '.',
@@ -1784,24 +1823,24 @@ int show_layouts(void *optctx, const char *opt, const char *arg)
     uint64_t layout, j;
     const char *name, *descr;
 
-    printf("Individual channels:\n"
+    av_log(NULL, AV_LOG_STDERR, "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);
-        printf("%-14s %s\n", name, descr);
+        av_log(NULL, AV_LOG_STDERR, "%-14s %s\n", name, descr);
     }
-    printf("\nStandard channel layouts:\n"
+    av_log(NULL, AV_LOG_STDERR, "\nStandard channel layouts:\n"
            "NAME           DECOMPOSITION\n");
     for (i = 0; !av_get_standard_channel_layout(i, &layout, &name); i++) {
         if (name) {
-            printf("%-14s ", name);
+            av_log(NULL, AV_LOG_STDERR, "%-14s ", name);
             for (j = 1; j; j <<= 1)
                 if ((layout & j))
-                    printf("%s%s", (layout & (j - 1)) ? "+" : "", av_get_channel_name(j));
-            printf("\n");
+                    av_log(NULL, AV_LOG_STDERR, "%s%s", (layout & (j - 1)) ? "+" : "", av_get_channel_name(j));
+            av_log(NULL, AV_LOG_STDERR, "\n");
         }
     }
     return 0;
@@ -1812,7 +1851,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++)
-        printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
+        av_log(NULL, AV_LOG_STDERR, "%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i));
     return 0;
 }
 
@@ -1860,10 +1899,10 @@ static void show_help_demuxer(const char *name)
         return;
     }
 
-    printf("Demuxer %s [%s]:\n", fmt->name, fmt->long_name);
+    av_log(NULL, AV_LOG_STDERR, "Demuxer %s [%s]:\n", fmt->name, fmt->long_name);
 
     if (fmt->extensions)
-        printf("    Common extensions: %s.\n", fmt->extensions);
+        av_log(NULL, AV_LOG_STDERR, "    Common extensions: %s.\n", fmt->extensions);
 
     if (fmt->priv_class)
         show_help_children(fmt->priv_class, AV_OPT_FLAG_DECODING_PARAM);
@@ -1879,23 +1918,23 @@ static void show_help_muxer(const char *name)
         return;
     }
 
-    printf("Muxer %s [%s]:\n", fmt->name, fmt->long_name);
+    av_log(NULL, AV_LOG_STDERR, "Muxer %s [%s]:\n", fmt->name, fmt->long_name);
 
     if (fmt->extensions)
-        printf("    Common extensions: %s.\n", fmt->extensions);
+        av_log(NULL, AV_LOG_STDERR, "    Common extensions: %s.\n", fmt->extensions);
     if (fmt->mime_type)
-        printf("    Mime type: %s.\n", fmt->mime_type);
+        av_log(NULL, AV_LOG_STDERR, "    Mime type: %s.\n", fmt->mime_type);
     if (fmt->video_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->video_codec))) {
-        printf("    Default video codec: %s.\n", desc->name);
+        av_log(NULL, AV_LOG_STDERR, "    Default video codec: %s.\n", desc->name);
     }
     if (fmt->audio_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->audio_codec))) {
-        printf("    Default audio codec: %s.\n", desc->name);
+        av_log(NULL, AV_LOG_STDERR, "    Default audio codec: %s.\n", desc->name);
     }
     if (fmt->subtitle_codec != AV_CODEC_ID_NONE &&
         (desc = avcodec_descriptor_get(fmt->subtitle_codec))) {
-        printf("    Default subtitle codec: %s.\n", desc->name);
+        av_log(NULL, AV_LOG_STDERR, "    Default subtitle codec: %s.\n", desc->name);
     }
 
     if (fmt->priv_class)
@@ -1917,40 +1956,40 @@ static void show_help_filter(const char *name)
         return;
     }
 
-    printf("Filter %s\n", f->name);
+    av_log(NULL, AV_LOG_STDERR, "Filter %s\n", f->name);
     if (f->description)
-        printf("  %s\n", f->description);
+        av_log(NULL, AV_LOG_STDERR, "  %s\n", f->description);
 
     if (f->flags & AVFILTER_FLAG_SLICE_THREADS)
-        printf("    slice threading supported\n");
+        av_log(NULL, AV_LOG_STDERR, "    slice threading supported\n");
 
-    printf("    Inputs:\n");
+    av_log(NULL, AV_LOG_STDERR, "    Inputs:\n");
     count = avfilter_pad_count(f->inputs);
     for (i = 0; i < count; i++) {
-        printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
+        av_log(NULL, AV_LOG_STDERR, "       #%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)
-        printf("        dynamic (depending on the options)\n");
+        av_log(NULL, AV_LOG_STDERR, "        dynamic (depending on the options)\n");
     else if (!count)
-        printf("        none (source filter)\n");
+        av_log(NULL, AV_LOG_STDERR, "        none (source filter)\n");
 
-    printf("    Outputs:\n");
+    av_log(NULL, AV_LOG_STDERR, "    Outputs:\n");
     count = avfilter_pad_count(f->outputs);
     for (i = 0; i < count; i++) {
-        printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
+        av_log(NULL, AV_LOG_STDERR, "       #%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)
-        printf("        dynamic (depending on the options)\n");
+        av_log(NULL, AV_LOG_STDERR, "        dynamic (depending on the options)\n");
     else if (!count)
-        printf("        none (sink filter)\n");
+        av_log(NULL, AV_LOG_STDERR, "        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)
-        printf("This filter has support for timeline through the 'enable' option.\n");
+        av_log(NULL, AV_LOG_STDERR, "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");
@@ -1970,7 +2009,7 @@ static void show_help_bsf(const char *name)
         return;
     }
 
-    printf("Bit stream filter %s\n", bsf->name);
+    av_log(NULL, AV_LOG_STDERR, "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)
@@ -1980,7 +2019,6 @@ 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)
@@ -1990,7 +2028,11 @@ int show_help(void *optctx, const char *opt, const char *arg)
         *par++ = 0;
 
     if (!*topic) {
-        show_help_default(topic, par);
+        if (program_name && !strcmp(program_name, "ffmpeg")) {
+            show_help_default_ffmpeg(topic, par);
+        } else {
+            show_help_default_ffprobe(topic, par);
+        }
     } else if (!strcmp(topic, "decoder")) {
         show_help_codec(par, 0);
     } else if (!strcmp(topic, "encoder")) {
@@ -2006,7 +2048,11 @@ int show_help(void *optctx, const char *opt, const char *arg)
     } else if (!strcmp(topic, "bsf")) {
         show_help_bsf(par);
     } else {
-        show_help_default(topic, par);
+        if (program_name && !strcmp(program_name, "ffmpeg")) {
+            show_help_default_ffmpeg(topic, par);
+        } else {
+            show_help_default_ffprobe(topic, par);
+        }
     }
 
     av_freep(&topic);
@@ -2038,7 +2084,7 @@ FILE *get_preset_file(char *filename, size_t filename_size,
         av_strlcpy(filename, preset_name, filename_size);
         f = fopen(filename, "r");
     } else {
-#ifdef _WIN32
+#if HAVE_GETMODULEHANDLE
         char datadir[MAX_PATH], *ls;
         base[2] = NULL;
 
@@ -2206,20 +2252,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);
 
-    printf("Auto-detected sources for %s:\n", fmt->name);
+    av_log(NULL, AV_LOG_STDERR, "Auto-detected sources for %s:\n", fmt->name);
     if (!fmt->get_device_list) {
         ret = AVERROR(ENOSYS);
-        printf("Cannot list sources. Not implemented.\n");
+        av_log(NULL, AV_LOG_STDERR, "Cannot list sources. Not implemented.\n");
         goto fail;
     }
 
     if ((ret = avdevice_list_input_sources(fmt, NULL, opts, &device_list)) < 0) {
-        printf("Cannot list sources.\n");
+        av_log(NULL, AV_LOG_STDERR, "Cannot list sources.\n");
         goto fail;
     }
 
     for (i = 0; i < device_list->nb_devices; i++) {
-        printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
+        av_log(NULL, AV_LOG_STDERR, "%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
                device_list->devices[i]->device_name, device_list->devices[i]->device_description);
     }
 
@@ -2236,20 +2282,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);
 
-    printf("Auto-detected sinks for %s:\n", fmt->name);
+    av_log(NULL, AV_LOG_STDERR, "Auto-detected sinks for %s:\n", fmt->name);
     if (!fmt->get_device_list) {
         ret = AVERROR(ENOSYS);
-        printf("Cannot list sinks. Not implemented.\n");
+        av_log(NULL, AV_LOG_STDERR, "Cannot list sinks. Not implemented.\n");
         goto fail;
     }
 
     if ((ret = avdevice_list_output_sinks(fmt, NULL, opts, &device_list)) < 0) {
-        printf("Cannot list sinks.\n");
+        av_log(NULL, AV_LOG_STDERR, "Cannot list sinks.\n");
         goto fail;
     }
 
     for (i = 0; i < device_list->nb_devices; i++) {
-        printf("%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
+        av_log(NULL, AV_LOG_STDERR, "%s %s [%s]\n", device_list->default_device == i ? "*" : " ",
                device_list->devices[i]->device_name, device_list->devices[i]->device_description);
     }
 
@@ -2275,7 +2321,7 @@ static int show_sinks_sources_parse_arg(const char *arg, char **dev, AVDictionar
             }
         }
     } else
-        printf("\nDevice name is not provided.\n"
+        av_log(NULL, AV_LOG_STDERR, "\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,6 +20,17 @@
  */
 
 /*
+ * 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
@@ -35,32 +46,39 @@
 
 #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 const char program_name[];
+extern __thread char *program_name;
 
 /**
  * program birth year, defined by the program for show_banner()
  */
-extern const int program_birth_year;
+extern __thread int program_birth_year;
 
-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;
+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;
 
 /**
  * Register a program-specific cleanup routine.
@@ -110,7 +128,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(const char *opt);
+int opt_report(void *optctx, const char *opt, const char *arg);
 
 int opt_max_alloc(void *optctx, const char *opt, const char *arg);
 
@@ -212,47 +230,6 @@ 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.
@@ -260,10 +237,11 @@ 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 handler. Implemented in each
+ * Per-fftool specific help handlers. Implemented in each
  * fftool, called by show_help().
  */
-void show_help_default(const char *opt, const char *arg);
+void show_help_default_ffmpeg(const char *opt, const char *arg);
+void show_help_default_ffprobe(const char *opt, const char *arg);
 
 /**
  * Generic -h handler common to all fftools.
@@ -358,6 +336,7 @@ 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.c

@@ -24,6 +24,17 @@
  */
 
 /*
+ * CHANGES 06.2020
+ * - ignoring signals implemented
+ * - cancel_operation() method signature updated with id
+ * - cancel by execution id implemented
+ *
+ * CHANGES 01.2020
+ * - ffprobe support changes
+ *
+ * CHANGES 12.2019
+ * - concurrent execution support
+ *
  * CHANGES 08.2018
  * --------------------------------------------------------
  * - fftools_ prefix added to file name and parent headers
@@ -35,10 +46,10 @@
  *
  * CHANGES 07.2018
  * --------------------------------------------------------
- * - main() function renamed as execute()
+ * - main() function renamed as ffmpeg_execute()
  * - exit_program() implemented with setjmp
  * - extern longjmp_value added to access exit code stored in exit_program()
- * - cleanup() method added
+ * - ffmpeg_var_cleanup() method added
  */
 
 #include "config.h"
@@ -126,9 +137,6 @@
 
 #include "libavutil/avassert.h"
 
-const char program_name[] = "ffmpeg";
-const int program_birth_year = 2000;
-
 static FILE *vstats_file;
 
 const char *const forced_keyframes_const_names[] = {
@@ -151,45 +159,101 @@ static BenchmarkTimeStamps get_benchmark_time_stamps(void);
 static int64_t getmaxrss(void);
 static int ifilter_has_all_input_formats(FilterGraph *fg);
 
-static int run_as_daemon  = 0;
-static int nb_frames_dup = 0;
-static unsigned dup_warning = 1000;
-static int nb_frames_drop = 0;
-static int64_t decode_error_stat[2];
+__thread int run_as_daemon  = 0;
+__thread int nb_frames_dup = 0;
+__thread unsigned dup_warning = 1000;
+__thread int nb_frames_drop = 0;
+__thread int64_t decode_error_stat[2];
 
-static int want_sdp = 1;
+__thread int want_sdp = 1;
 
-static BenchmarkTimeStamps current_time;
-AVIOContext *progress_avio = NULL;
+__thread BenchmarkTimeStamps current_time;
+__thread AVIOContext *progress_avio = NULL;
 
-static uint8_t *subtitle_out;
+__thread uint8_t *subtitle_out;
 
-InputStream **input_streams = NULL;
-int        nb_input_streams = 0;
-InputFile   **input_files   = NULL;
-int        nb_input_files   = 0;
+__thread InputStream **input_streams = NULL;
+__thread int        nb_input_streams = 0;
+__thread InputFile   **input_files   = NULL;
+__thread int        nb_input_files   = 0;
 
-OutputStream **output_streams = NULL;
-int         nb_output_streams = 0;
-OutputFile   **output_files   = NULL;
-int         nb_output_files   = 0;
+__thread OutputStream **output_streams = NULL;
+__thread int         nb_output_streams = 0;
+__thread OutputFile   **output_files   = NULL;
+__thread int         nb_output_files   = 0;
 
-FilterGraph **filtergraphs;
-int        nb_filtergraphs;
+__thread FilterGraph **filtergraphs;
+__thread int        nb_filtergraphs;
 
-static void (*report_callback)(int, float, float, int64_t, int, double, double) = NULL;
+void (*report_callback)(int, float, float, int64_t, int, double, double) = NULL;
+
+extern __thread int file_overwrite;
+extern __thread int no_file_overwrite;
+extern __thread int ignore_unknown_streams;
+extern __thread int copy_unknown_streams;
+extern int opt_map(void *optctx, const char *opt, const char *arg);
+extern int opt_map_channel(void *optctx, const char *opt, const char *arg);
+extern int opt_recording_timestamp(void *optctx, const char *opt, const char *arg);
+extern int opt_data_frames(void *optctx, const char *opt, const char *arg);
+extern int opt_progress(void *optctx, const char *opt, const char *arg);
+extern int opt_target(void *optctx, const char *opt, const char *arg);
+extern int opt_vsync(void *optctx, const char *opt, const char *arg);
+extern int opt_abort_on(void *optctx, const char *opt, const char *arg);
+extern int opt_qscale(void *optctx, const char *opt, const char *arg);
+extern int opt_profile(void *optctx, const char *opt, const char *arg);
+extern int opt_filter_complex(void *optctx, const char *opt, const char *arg);
+extern int opt_filter_complex_script(void *optctx, const char *opt, const char *arg);
+extern int opt_attach(void *optctx, const char *opt, const char *arg);
+extern int opt_video_frames(void *optctx, const char *opt, const char *arg);
+extern __thread int intra_only;
+extern int opt_video_codec(void *optctx, const char *opt, const char *arg);
+extern int opt_sameq(void *optctx, const char *opt, const char *arg);
+extern int opt_timecode(void *optctx, const char *opt, const char *arg);
+extern __thread int do_psnr;
+extern int opt_vstats_file(void *optctx, const char *opt, const char *arg);
+extern int opt_vstats(void *optctx, const char *opt, const char *arg);
+extern int opt_video_frames(void *optctx, const char *opt, const char *arg);
+extern int opt_old2new(void *optctx, const char *opt, const char *arg);
+extern int opt_streamid(void *optctx, const char *opt, const char *arg);
+extern int opt_bitrate(void *optctx, const char *opt, const char *arg);
+extern int show_hwaccels(void *optctx, const char *opt, const char *arg);
+extern int opt_video_filters(void *optctx, const char *opt, const char *arg);
+extern int opt_audio_frames(void *optctx, const char *opt, const char *arg);
+extern int opt_audio_qscale(void *optctx, const char *opt, const char *arg);
+extern int opt_audio_codec(void *optctx, const char *opt, const char *arg);
+extern int opt_channel_layout(void *optctx, const char *opt, const char *arg);
+extern int opt_preset(void *optctx, const char *opt, const char *arg);
+extern int opt_audio_filters(void *optctx, const char *opt, const char *arg);
+extern int opt_subtitle_codec(void *optctx, const char *opt, const char *arg);
+extern int opt_video_channel(void *optctx, const char *opt, const char *arg);
+extern int opt_video_standard(void *optctx, const char *opt, const char *arg);
+extern int opt_sdp_file(void *optctx, const char *opt, const char *arg);
+extern int opt_data_codec(void *optctx, const char *opt, const char *arg);
+extern int opt_init_hw_device(void *optctx, const char *opt, const char *arg);
+extern int opt_filter_hw_device(void *optctx, const char *opt, const char *arg);
+extern __thread int input_sync;
 
 #if HAVE_TERMIOS_H
 
 /* init terminal so that we can grab keys */
-static struct termios oldtty;
-static int restore_tty;
+__thread struct termios oldtty;
+__thread int restore_tty;
 #endif
 
 #if HAVE_THREADS
 static void free_input_threads(void);
 #endif
 
+extern volatile int handleSIGQUIT;
+extern volatile int handleSIGINT;
+extern volatile int handleSIGTERM;
+extern volatile int handleSIGXCPU;
+extern volatile int handleSIGPIPE;
+
+extern __thread volatile long executionId;
+extern void removeExecution(long id);
+extern int cancelRequested(long id);
+
 /* sub2video hack:
    Convert subtitles to video with alpha to insert them in filter graphs.
    This is a temporary solution until libavfilter gets real subtitles support.
@@ -355,10 +419,10 @@ void term_exit(void)
 
 static volatile int received_sigterm = 0;
 static volatile int received_nb_signals = 0;
-static atomic_int transcode_init_done = ATOMIC_VAR_INIT(0);
-static volatile int ffmpeg_exited = 0;
-static int main_return_code = 0;
-extern int longjmp_value;
+__thread atomic_int transcode_init_done = ATOMIC_VAR_INIT(0);
+__thread volatile int ffmpeg_exited = 0;
+__thread volatile int main_ffmpeg_return_code = 0;
+extern __thread volatile int longjmp_value;
 
 static void
 sigterm_handler(int sig)
@@ -427,17 +491,27 @@ void term_init(void)
 
             tcsetattr (0, TCSANOW, &tty);
         }
-        signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
+        if (handleSIGQUIT == 1) {
+            signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
+        }
     }
 #endif
 
-    signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
-    signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
+    if (handleSIGINT == 1) {
+        signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).    */
+    }
+    if (handleSIGTERM == 1) {
+        signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
+    }
 #ifdef SIGXCPU
-    signal(SIGXCPU, sigterm_handler);
+    if (handleSIGXCPU == 1) {
+        signal(SIGXCPU, sigterm_handler);
+    }
 #endif
 #ifdef SIGPIPE
-    signal(SIGPIPE, SIG_IGN); /* Broken pipe (POSIX). */
+    if (handleSIGPIPE == 1) {
+        signal(SIGPIPE, SIG_IGN); /* Broken pipe (POSIX). */
+    }
 #endif
 #if HAVE_SETCONSOLECTRLHANDLER
     SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE);
@@ -496,12 +570,14 @@ static int read_key(void)
     return -1;
 }
 
-static int decode_interrupt_cb(void *ctx)
+int decode_interrupt_cb(void *ctx);
+
+int decode_interrupt_cb(void *ctx)
 {
     return received_nb_signals > atomic_load(&transcode_init_done);
 }
 
-const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
+__thread const AVIOInterruptCB int_cb = { decode_interrupt_cb, NULL };
 
 static void ffmpeg_cleanup(int ret)
 {
@@ -590,6 +666,7 @@ static void ffmpeg_cleanup(int ret)
         ost->audio_channels_mapped = 0;
 
         av_dict_free(&ost->sws_dict);
+        av_dict_free(&ost->swr_opts);
 
         avcodec_free_context(&ost->enc_ctx);
         avcodec_parameters_free(&ost->ref_par);
@@ -649,6 +726,8 @@ static void ffmpeg_cleanup(int ret)
     if (received_sigterm) {
         av_log(NULL, AV_LOG_INFO, "Exiting normally, received signal %d.\n",
                (int) received_sigterm);
+    } else if (cancelRequested(executionId)) {
+        av_log(NULL, AV_LOG_INFO, "Exiting normally, received cancel signal.\n");
     } else if (ret && atomic_load(&transcode_init_done)) {
         av_log(NULL, AV_LOG_INFO, "Conversion failed!\n");
     }
@@ -838,7 +917,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
     ret = av_interleaved_write_frame(s, pkt);
     if (ret < 0) {
         print_error("av_interleaved_write_frame()", ret);
-        main_return_code = 1;
+        main_ffmpeg_return_code = 1;
         close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
     }
     av_packet_unref(pkt);
@@ -1102,6 +1181,7 @@ static void do_video_out(OutputFile *of,
 
     if (!ost->filters_script &&
         !ost->filters &&
+        (nb_filtergraphs == 0 || !filtergraphs[0]->graph_desc) &&
         next_picture &&
         ist &&
         lrintf(next_picture->pkt_duration * av_q2d(ist->st->time_base) / av_q2d(enc->time_base)) > 0) {
@@ -1219,6 +1299,8 @@ static void do_video_out(OutputFile *of,
   /* duplicates frame if needed */
   for (i = 0; i < nb_frames; i++) {
     AVFrame *in_picture;
+        int forced_keyframe = 0;
+        double pts_time;
     av_init_packet(&pkt);
     pkt.data = NULL;
     pkt.size = 0;
@@ -1233,17 +1315,9 @@ static void do_video_out(OutputFile *of,
 
     in_picture->pts = ost->sync_opts;
 
-#if 1
     if (!check_recording_time(ost))
-#else
-    if (ost->frame_number >= ost->max_frames)
-#endif
         return;
 
-    {
-        int forced_keyframe = 0;
-        double pts_time;
-
         if (enc->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
             ost->top_field_first >= 0)
             in_picture->top_field_first = !!ost->top_field_first;
@@ -1315,6 +1389,8 @@ static void do_video_out(OutputFile *of,
         ret = avcodec_send_frame(enc, in_picture);
         if (ret < 0)
             goto error;
+        // Make sure Closed Captions will not be duplicated
+        av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC);
 
         while (1) {
             ret = avcodec_receive_packet(enc, &pkt);
@@ -1351,7 +1427,6 @@ static void do_video_out(OutputFile *of,
                 fprintf(ost->logfile, "%s", enc->stats_out);
             }
         }
-    }
     ost->sync_opts++;
     /*
      * For video, number of frames in == number of packets out.
@@ -1515,8 +1590,6 @@ static int reap_filters(int flush)
                     av_rescale_q(filtered_frame->pts, filter_tb, enc->time_base) -
                     av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
             }
-            //if (ost->source_index >= 0)
-            //    *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold
 
             switch (av_buffersink_get_type(filter)) {
             case AVMEDIA_TYPE_VIDEO:
@@ -2109,12 +2182,13 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
     InputFile   *f = input_files [ist->file_index];
     int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
     int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase);
-    AVPacket opkt = { 0 };
-
-    av_init_packet(&opkt);
+    AVPacket opkt;
 
     // EOF: flush output bitstream filters.
     if (!pkt) {
+        av_init_packet(&opkt);
+        opkt.data = NULL;
+        opkt.size = 0;
         output_packet(of, &opkt, ost, 1);
         return;
     }
@@ -2153,10 +2227,11 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
     if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO)
         ost->sync_opts++;
 
+    if (av_packet_ref(&opkt, pkt) < 0)
+        exit_program(1);
+
     if (pkt->pts != AV_NOPTS_VALUE)
         opkt.pts = av_rescale_q(pkt->pts, ist->st->time_base, ost->mux_timebase) - ost_tb_start_time;
-    else
-        opkt.pts = AV_NOPTS_VALUE;
 
     if (pkt->dts == AV_NOPTS_VALUE)
         opkt.dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ost->mux_timebase);
@@ -2175,18 +2250,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
 
     opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->mux_timebase);
 
-    opkt.flags    = pkt->flags;
-
-    if (pkt->buf) {
-        opkt.buf = av_buffer_ref(pkt->buf);
-        if (!opkt.buf)
-            exit_program(1);
-    }
-    opkt.data = pkt->data;
-    opkt.size = pkt->size;
-
-    av_copy_packet_side_data(&opkt, pkt);
-
     output_packet(of, &opkt, ost, 0);
 }
 
@@ -2247,9 +2310,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
 
     /* determine if the parameters for this input changed */
     need_reinit = ifilter->format != frame->format;
-    if (!!ifilter->hw_frames_ctx != !!frame->hw_frames_ctx ||
-        (ifilter->hw_frames_ctx && ifilter->hw_frames_ctx->data != frame->hw_frames_ctx->data))
-        need_reinit = 1;
 
     switch (ifilter->ist->st->codecpar->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
@@ -2263,6 +2323,13 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
         break;
     }
 
+    if (!ifilter->ist->reinit_filters && fg->graph)
+        need_reinit = 0;
+
+    if (!!ifilter->hw_frames_ctx != !!frame->hw_frames_ctx ||
+        (ifilter->hw_frames_ctx && ifilter->hw_frames_ctx->data != frame->hw_frames_ctx->data))
+        need_reinit = 1;
+
     if (need_reinit) {
         ret = ifilter_parameters_from_frame(ifilter, frame);
         if (ret < 0)
@@ -2322,7 +2389,7 @@ static int ifilter_send_eof(InputFilter *ifilter, int64_t pts)
     if (ifilter->filter) {
 
         /* THIS VALIDATION IS REQUIRED TO COMPLETE CANCELLATION */
-        if (!received_sigterm) {
+        if (!received_sigterm && !cancelRequested(executionId)) {
             ret = av_buffersrc_close(ifilter->filter, pts, AV_BUFFERSRC_FLAG_PUSH);
         }
         if (ret < 0)
@@ -2427,14 +2494,12 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
     ist->samples_decoded += decoded_frame->nb_samples;
     ist->frames_decoded++;
 
-#if 1
     /* increment next_dts to use for the case where the input stream does not
        have timestamps or there are multiple frames in the packet */
     ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                      avctx->sample_rate;
     ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                      avctx->sample_rate;
-#endif
 
     if (decoded_frame->pts != AV_NOPTS_VALUE) {
         decoded_frame_tb   = ist->st->time_base;
@@ -2894,7 +2959,7 @@ static void print_sdp(void)
     av_sdp_create(avc, j, sdp, sizeof(sdp));
 
     if (!sdp_filename) {
-        printf("SDP:\n%s\n", sdp);
+        av_log(NULL, AV_LOG_STDERR, "SDP:\n%s\n", sdp);
         fflush(stdout);
     } else {
         if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
@@ -3457,7 +3522,7 @@ static int init_output_stream_encode(OutputStream *ost)
                    "if you want a different framerate.\n",
                    ost->file_index, ost->index);
         }
-//      ost->frame_rate = ist->st->avg_frame_rate.num ? ist->st->avg_frame_rate : (AVRational){25, 1};
+
         if (ost->enc->supported_framerates && !ost->force_fps) {
             int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
             ost->frame_rate = ost->enc->supported_framerates[idx];
@@ -3991,7 +4056,9 @@ static OutputStream *choose_output(void)
                        av_rescale_q(ost->st->cur_dts, ost->st->time_base,
                                     AV_TIME_BASE_Q);
         if (ost->st->cur_dts == AV_NOPTS_VALUE)
-            av_log(NULL, AV_LOG_DEBUG, "cur_dts is invalid (this is harmless if it occurs once at the start per stream)\n");
+            av_log(NULL, AV_LOG_DEBUG,
+                "cur_dts is invalid st:%d (%d) [init:%d i_done:%d finish:%d] (this is harmless if it occurs once at the start per stream)\n",
+                ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished);
 
         if (!ost->initialized && !ost->inputs_done)
             return ost;
@@ -4309,7 +4376,7 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is)
     int i, ret, has_audio = 0;
     int64_t duration = 0;
 
-    ret = av_seek_frame(is, -1, is->start_time, 0);
+    ret = avformat_seek_file(is, -1, INT64_MIN, is->start_time, is->start_time, 0);
     if (ret < 0)
         return ret;
 
@@ -4588,7 +4655,10 @@ static int process_input(int file_index)
                 pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) {
                 ifile->ts_offset -= delta;
                 av_log(NULL, AV_LOG_DEBUG,
-                       "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",
+                       "timestamp discontinuity for stream #%d:%d "
+                       "(id=%d, type=%s): %"PRId64", new offset= %"PRId64"\n",
+                       ist->file_index, ist->st->index, ist->st->id,
+                       av_get_media_type_string(ist->dec_ctx->codec_type),
                        delta, ifile->ts_offset);
                 pkt.dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base);
                 if (pkt.pts != AV_NOPTS_VALUE)
@@ -4786,7 +4856,7 @@ static int transcode(void)
         goto fail;
 #endif
 
-    while (!received_sigterm) {
+    while (!received_sigterm && !cancelRequested(executionId)) {
         int64_t cur_time= av_gettime_relative();
 
         /* if 'q' pressed, exits */
@@ -4951,8 +5021,8 @@ static void log_callback_null(void *ptr, int level, const char *fmt, va_list vl)
 {
 }
 
-void cleanup() {
-    main_return_code = 0;
+void ffmpeg_var_cleanup() {
+    main_ffmpeg_return_code = 0;
     longjmp_value = 0;
     received_sigterm = 0;
     received_nb_signals = 0;
@@ -4986,20 +5056,458 @@ void set_report_callback(void (*callback)(int, float, float, int64_t, int, doubl
     report_callback = callback;
 }
 
-void cancel_operation()
+void cancel_operation(long id)
 {
-    sigterm_handler(SIGINT);
+    if (id == 0) {
+        sigterm_handler(SIGINT);
+    } else {
+        removeExecution(id);
+    }
 }
 
-int execute(int argc, char **argv)
+__thread OptionDef *ffmpeg_options = NULL;
+
+int ffmpeg_execute(int argc, char **argv)
 {
+    char _program_name[] = "ffmpeg";
+    program_name = (char*)&_program_name;
+    program_birth_year = 2000;
+
+    #define OFFSET(x) offsetof(OptionsContext, x)
+    OptionDef options[] = {
+
+        /* main 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,                    { .func_arg = 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" },
+
+        #if CONFIG_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" },
+        #endif
+
+        { "f",              HAS_ARG | OPT_STRING | OPT_OFFSET |
+                            OPT_INPUT | OPT_OUTPUT,                      { .off       = OFFSET(format) },
+            "force format", "fmt" },
+        { "y",              OPT_BOOL,                                    {              &file_overwrite },
+            "overwrite output files" },
+        { "n",              OPT_BOOL,                                    {              &no_file_overwrite },
+            "never overwrite output files" },
+        { "ignore_unknown", OPT_BOOL,                                    {              &ignore_unknown_streams },
+            "Ignore unknown stream types" },
+        { "copy_unknown",   OPT_BOOL | OPT_EXPERT,                       {              &copy_unknown_streams },
+            "Copy unknown stream types" },
+        { "c",              HAS_ARG | OPT_STRING | OPT_SPEC |
+                            OPT_INPUT | OPT_OUTPUT,                      { .off       = OFFSET(codec_names) },
+            "codec name", "codec" },
+        { "codec",          HAS_ARG | OPT_STRING | OPT_SPEC |
+                            OPT_INPUT | OPT_OUTPUT,                      { .off       = OFFSET(codec_names) },
+            "codec name", "codec" },
+        { "pre",            HAS_ARG | OPT_STRING | OPT_SPEC |
+                            OPT_OUTPUT,                                  { .off       = OFFSET(presets) },
+            "preset name", "preset" },
+        { "map",            HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+                            OPT_OUTPUT,                                  { .func_arg = opt_map },
+            "set input stream mapping",
+            "[-]input_file_id[:stream_specifier][,sync_file_id[:stream_specifier]]" },
+        { "map_channel",    HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_map_channel },
+            "map an audio channel from one stream to another", "file.stream.channel[:syncfile.syncstream]" },
+        { "map_metadata",   HAS_ARG | OPT_STRING | OPT_SPEC |
+                            OPT_OUTPUT,                                  { .off       = OFFSET(metadata_map) },
+            "set metadata information of outfile from infile",
+            "outfile[,metadata]:infile[,metadata]" },
+        { "map_chapters",   HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET |
+                            OPT_OUTPUT,                                  { .off = OFFSET(chapters_input_file) },
+            "set chapters mapping", "input_file_index" },
+        { "t",              HAS_ARG | OPT_TIME | OPT_OFFSET |
+                            OPT_INPUT | OPT_OUTPUT,                      { .off = OFFSET(recording_time) },
+            "record or transcode \"duration\" seconds of audio/video",
+            "duration" },
+        { "to",             HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT,  { .off = OFFSET(stop_time) },
+            "record or transcode stop time", "time_stop" },
+        { "fs",             HAS_ARG | OPT_INT64 | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(limit_filesize) },
+            "set the limit file size in bytes", "limit_size" },
+        { "ss",             HAS_ARG | OPT_TIME | OPT_OFFSET |
+                            OPT_INPUT | OPT_OUTPUT,                      { .off = OFFSET(start_time) },
+            "set the start time offset", "time_off" },
+        { "sseof",          HAS_ARG | OPT_TIME | OPT_OFFSET |
+                            OPT_INPUT,                                   { .off = OFFSET(start_time_eof) },
+            "set the start time offset relative to EOF", "time_off" },
+        { "seek_timestamp", HAS_ARG | OPT_INT | OPT_OFFSET |
+                            OPT_INPUT,                                   { .off = OFFSET(seek_timestamp) },
+            "enable/disable seeking by timestamp with -ss" },
+        { "accurate_seek",  OPT_BOOL | OPT_OFFSET | OPT_EXPERT |
+                            OPT_INPUT,                                   { .off = OFFSET(accurate_seek) },
+            "enable/disable accurate seeking with -ss" },
+        { "itsoffset",      HAS_ARG | OPT_TIME | OPT_OFFSET |
+                            OPT_EXPERT | OPT_INPUT,                      { .off = OFFSET(input_ts_offset) },
+            "set the input ts offset", "time_off" },
+        { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC |
+                            OPT_EXPERT | OPT_INPUT,                      { .off = OFFSET(ts_scale) },
+            "set the input ts scale", "scale" },
+        { "timestamp",      HAS_ARG | OPT_PERFILE | OPT_OUTPUT,          { .func_arg = opt_recording_timestamp },
+            "set the recording timestamp ('now' to set the current time)", "time" },
+        { "metadata",       HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata) },
+            "add metadata", "string=string" },
+        { "program",        HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(program) },
+            "add program with specified streams", "title=string:st=number..." },
+        { "dframes",        HAS_ARG | OPT_PERFILE | OPT_EXPERT |
+                            OPT_OUTPUT,                                  { .func_arg = opt_data_frames },
+            "set the number of data frames to output", "number" },
+        { "benchmark",      OPT_BOOL | OPT_EXPERT,                       { &do_benchmark },
+            "add timings for benchmarking" },
+        { "benchmark_all",  OPT_BOOL | OPT_EXPERT,                       { &do_benchmark_all },
+          "add timings for each task" },
+        { "progress",       HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_progress },
+          "write program-readable progress information", "url" },
+        { "stdin",          OPT_BOOL | OPT_EXPERT,                       { &stdin_interaction },
+          "enable or disable interaction on standard input" },
+        { "timelimit",      HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_timelimit },
+            "set max runtime in seconds in CPU user time", "limit" },
+        { "dump",           OPT_BOOL | OPT_EXPERT,                       { &do_pkt_dump },
+            "dump each input packet" },
+        { "hex",            OPT_BOOL | OPT_EXPERT,                       { &do_hex_dump },
+            "when dumping packets, also dump the payload" },
+        { "re",             OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+                            OPT_INPUT,                                   { .off = OFFSET(rate_emu) },
+            "read input at native frame rate", "" },
+        { "target",         HAS_ARG | OPT_PERFILE | OPT_OUTPUT,          { .func_arg = opt_target },
+            "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\" or \"dv50\" "
+            "with optional prefixes \"pal-\", \"ntsc-\" or \"film-\")", "type" },
+        { "vsync",          HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_vsync },
+            "video sync method", "" },
+        { "frame_drop_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,      { &frame_drop_threshold },
+            "frame drop threshold", "" },
+        { "async",          HAS_ARG | OPT_INT | OPT_EXPERT,              { &audio_sync_method },
+            "audio sync method", "" },
+        { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,          { &audio_drift_threshold },
+            "audio drift threshold", "threshold" },
+        { "copyts",         OPT_BOOL | OPT_EXPERT,                       { &copy_ts },
+            "copy timestamps" },
+        { "start_at_zero",  OPT_BOOL | OPT_EXPERT,                       { &start_at_zero },
+            "shift input timestamps to start at 0 when using copyts" },
+        { "copytb",         HAS_ARG | OPT_INT | OPT_EXPERT,              { &copy_tb },
+            "copy input stream time base when stream copying", "mode" },
+        { "shortest",       OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+                            OPT_OUTPUT,                                  { .off = OFFSET(shortest) },
+            "finish encoding within shortest input" },
+        { "bitexact",       OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
+                            OPT_OUTPUT | OPT_INPUT,                      { .off = OFFSET(bitexact) },
+            "bitexact mode" },
+        { "apad",           OPT_STRING | HAS_ARG | OPT_SPEC |
+                            OPT_OUTPUT,                                  { .off = OFFSET(apad) },
+            "audio pad", "" },
+        { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_delta_threshold },
+            "timestamp discontinuity delta threshold", "threshold" },
+        { "dts_error_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_error_threshold },
+            "timestamp error delta threshold", "threshold" },
+        { "xerror",         OPT_BOOL | OPT_EXPERT,                       { &exit_on_error },
+            "exit on error", "error" },
+        { "abort_on",       HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_abort_on },
+            "abort on the specified condition flags", "flags" },
+        { "copyinkf",       OPT_BOOL | OPT_EXPERT | OPT_SPEC |
+                            OPT_OUTPUT,                                  { .off = OFFSET(copy_initial_nonkeyframes) },
+            "copy initial non-keyframes" },
+        { "copypriorss",    OPT_INT | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT,   { .off = OFFSET(copy_prior_start) },
+            "copy or discard frames before start time" },
+        { "frames",         OPT_INT64 | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(max_frames) },
+            "set the number of frames to output", "number" },
+        { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC |
+                            OPT_EXPERT | OPT_OUTPUT | OPT_INPUT,         { .off = OFFSET(codec_tags) },
+            "force codec tag/fourcc", "fourcc/tag" },
+        { "q",              HAS_ARG | OPT_EXPERT | OPT_DOUBLE |
+                            OPT_SPEC | OPT_OUTPUT,                       { .off = OFFSET(qscale) },
+            "use fixed quality scale (VBR)", "q" },
+        { "qscale",         HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+                            OPT_OUTPUT,                                  { .func_arg = opt_qscale },
+            "use fixed quality scale (VBR)", "q" },
+        { "profile",        HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_profile },
+            "set profile", "profile" },
+        { "filter",         HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filters) },
+            "set stream filtergraph", "filter_graph" },
+        { "filter_threads",  HAS_ARG | OPT_INT,                          { &filter_nbthreads },
+            "number of non-complex filter threads" },
+        { "filter_script",  HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filter_scripts) },
+            "read stream filtergraph description from a file", "filename" },
+        { "reinit_filter",  HAS_ARG | OPT_INT | OPT_SPEC | OPT_INPUT,    { .off = OFFSET(reinit_filters) },
+            "reinit filtergraph on input parameter changes", "" },
+        { "filter_complex", HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_filter_complex },
+            "create a complex filtergraph", "graph_description" },
+        { "filter_complex_threads", HAS_ARG | OPT_INT,                   { &filter_complex_nbthreads },
+            "number of threads for -filter_complex" },
+        { "lavfi",          HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_filter_complex },
+            "create a complex filtergraph", "graph_description" },
+        { "filter_complex_script", HAS_ARG | OPT_EXPERT,                 { .func_arg = opt_filter_complex_script },
+            "read complex filtergraph description from a file", "filename" },
+        { "stats",          OPT_BOOL,                                    { &print_stats },
+            "print progress report during encoding", },
+        { "attach",         HAS_ARG | OPT_PERFILE | OPT_EXPERT |
+                            OPT_OUTPUT,                                  { .func_arg = opt_attach },
+            "add an attachment to the output file", "filename" },
+        { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |
+                             OPT_EXPERT | OPT_INPUT,                     { .off = OFFSET(dump_attachment) },
+            "extract an attachment into a file", "filename" },
+        { "stream_loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT |
+                            OPT_OFFSET,                                  { .off = OFFSET(loop) }, "set number of times input stream shall be looped", "loop count" },
+        { "debug_ts",       OPT_BOOL | OPT_EXPERT,                       { &debug_ts },
+            "print timestamp debugging info" },
+        { "max_error_rate",  HAS_ARG | OPT_FLOAT,                        { &max_error_rate },
+            "ratio of errors (0.0: no errors, 1.0: 100% errors) above which ffmpeg returns an error instead of success.", "maximum error rate" },
+        { "discard",        OPT_STRING | HAS_ARG | OPT_SPEC |
+                            OPT_INPUT,                                   { .off = OFFSET(discard) },
+            "discard", "" },
+        { "disposition",    OPT_STRING | HAS_ARG | OPT_SPEC |
+                            OPT_OUTPUT,                                  { .off = OFFSET(disposition) },
+            "disposition", "" },
+        { "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT,
+                                                                         { .off = OFFSET(thread_queue_size) },
+            "set the maximum number of queued packets from the demuxer" },
+        { "find_stream_info", OPT_BOOL | OPT_PERFILE | OPT_INPUT | OPT_EXPERT, { &find_stream_info },
+            "read and decode the streams to fill missing information with heuristics" },
+
+        /* video options */
+        { "vframes",      OPT_VIDEO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_video_frames },
+            "set the number of video frames to output", "number" },
+        { "r",            OPT_VIDEO | HAS_ARG  | OPT_STRING | OPT_SPEC |
+                          OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(frame_rates) },
+            "set frame rate (Hz value, fraction or abbreviation)", "rate" },
+        { "s",            OPT_VIDEO | HAS_ARG | OPT_SUBTITLE | OPT_STRING | OPT_SPEC |
+                          OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(frame_sizes) },
+            "set frame size (WxH or abbreviation)", "size" },
+        { "aspect",       OPT_VIDEO | HAS_ARG  | OPT_STRING | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(frame_aspect_ratios) },
+            "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
+        { "pix_fmt",      OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                          OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(frame_pix_fmts) },
+            "set pixel format", "format" },
+        { "bits_per_raw_sample", OPT_VIDEO | OPT_INT | HAS_ARG,                      { &frame_bits_per_raw_sample },
+            "set the number of bits per raw sample", "number" },
+        { "intra",        OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &intra_only },
+            "deprecated use -g 1" },
+        { "vn",           OPT_VIDEO | OPT_BOOL  | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT,{ .off = OFFSET(video_disable) },
+            "disable video" },
+        { "rc_override",  OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(rc_overrides) },
+            "rate control override for specific intervals", "override" },
+        { "vcodec",       OPT_VIDEO | HAS_ARG  | OPT_PERFILE | OPT_INPUT |
+                          OPT_OUTPUT,                                                { .func_arg = opt_video_codec },
+            "force video codec ('copy' to copy stream)", "codec" },
+        { "sameq",        OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_sameq },
+            "Removed" },
+        { "same_quant",   OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_sameq },
+            "Removed" },
+        { "timecode",     OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT,            { .func_arg = opt_timecode },
+            "set initial TimeCode value.", "hh:mm:ss[:;.]ff" },
+        { "pass",         OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT | OPT_OUTPUT,     { .off = OFFSET(pass) },
+            "select the pass number (1 to 3)", "n" },
+        { "passlogfile",  OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(passlogfiles) },
+            "select two pass log file name prefix", "prefix" },
+        { "deinterlace",  OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &do_deinterlace },
+            "this option is deprecated, use the yadif filter instead" },
+        { "psnr",         OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &do_psnr },
+            "calculate PSNR of compressed frames" },
+        { "vstats",       OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_vstats },
+            "dump video coding statistics to file" },
+        { "vstats_file",  OPT_VIDEO | HAS_ARG | OPT_EXPERT ,                         { .func_arg = opt_vstats_file },
+            "dump video coding statistics to file", "file" },
+        { "vstats_version",  OPT_VIDEO | OPT_INT | HAS_ARG | OPT_EXPERT ,            { &vstats_version },
+            "Version of the vstats format to use."},
+        { "vf",           OPT_VIDEO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_video_filters },
+            "set video filters", "filter_graph" },
+        { "intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(intra_matrices) },
+            "specify intra matrix coeffs", "matrix" },
+        { "inter_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(inter_matrices) },
+            "specify inter matrix coeffs", "matrix" },
+        { "chroma_intra_matrix", OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_STRING | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(chroma_intra_matrices) },
+            "specify intra matrix coeffs", "matrix" },
+        { "top",          OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_INT| OPT_SPEC |
+                          OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(top_field_first) },
+            "top=1/bottom=0/auto=-1 field first", "" },
+        { "vtag",         OPT_VIDEO | HAS_ARG | OPT_EXPERT  | OPT_PERFILE |
+                          OPT_INPUT | OPT_OUTPUT,                                    { .func_arg = opt_old2new },
+            "force video tag/fourcc", "fourcc/tag" },
+        { "qphist",       OPT_VIDEO | OPT_BOOL | OPT_EXPERT ,                        { &qp_hist },
+            "show QP histogram" },
+        { "force_fps",    OPT_VIDEO | OPT_BOOL | OPT_EXPERT  | OPT_SPEC |
+                          OPT_OUTPUT,                                                { .off = OFFSET(force_fps) },
+            "force the selected framerate, disable the best supported framerate selection" },
+        { "streamid",     OPT_VIDEO | HAS_ARG | OPT_EXPERT | OPT_PERFILE |
+                          OPT_OUTPUT,                                                { .func_arg = opt_streamid },
+            "set the value of an outfile streamid", "streamIndex:value" },
+        { "force_key_frames", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                              OPT_SPEC | OPT_OUTPUT,                                 { .off = OFFSET(forced_key_frames) },
+            "force key frames at specified timestamps", "timestamps" },
+        { "ab",           OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT,            { .func_arg = opt_bitrate },
+            "audio bitrate (please use -b:a)", "bitrate" },
+        { "b",            OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT,            { .func_arg = opt_bitrate },
+            "video bitrate (please use -b:v)", "bitrate" },
+        { "hwaccel",          OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                              OPT_SPEC | OPT_INPUT,                                  { .off = OFFSET(hwaccels) },
+            "use HW accelerated decoding", "hwaccel name" },
+        { "hwaccel_device",   OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                              OPT_SPEC | OPT_INPUT,                                  { .off = OFFSET(hwaccel_devices) },
+            "select a device for HW acceleration", "devicename" },
+        { "hwaccel_output_format", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT |
+                              OPT_SPEC | OPT_INPUT,                                  { .off = OFFSET(hwaccel_output_formats) },
+            "select output format used with HW accelerated decoding", "format" },
+    #if CONFIG_VIDEOTOOLBOX
+        { "videotoolbox_pixfmt", HAS_ARG | OPT_STRING | OPT_EXPERT, { &videotoolbox_pixfmt}, "" },
+    #endif
+        { "hwaccels",         OPT_EXIT,                                              { .func_arg = show_hwaccels },
+            "show available HW acceleration methods" },
+        { "autorotate",       HAS_ARG | OPT_BOOL | OPT_SPEC |
+                              OPT_EXPERT | OPT_INPUT,                                { .off = OFFSET(autorotate) },
+            "automatically insert correct rotate filters" },
+
+        /* audio options */
+        { "aframes",        OPT_AUDIO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_audio_frames },
+            "set the number of audio frames to output", "number" },
+        { "aq",             OPT_AUDIO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_audio_qscale },
+            "set audio quality (codec-specific)", "quality", },
+        { "ar",             OPT_AUDIO | HAS_ARG  | OPT_INT | OPT_SPEC |
+                            OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(audio_sample_rate) },
+            "set audio sampling rate (in Hz)", "rate" },
+        { "ac",             OPT_AUDIO | HAS_ARG  | OPT_INT | OPT_SPEC |
+                            OPT_INPUT | OPT_OUTPUT,                                    { .off = OFFSET(audio_channels) },
+            "set number of audio channels", "channels" },
+        { "an",             OPT_AUDIO | OPT_BOOL | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT,{ .off = OFFSET(audio_disable) },
+            "disable audio" },
+        { "acodec",         OPT_AUDIO | HAS_ARG  | OPT_PERFILE |
+                            OPT_INPUT | OPT_OUTPUT,                                    { .func_arg = opt_audio_codec },
+            "force audio codec ('copy' to copy stream)", "codec" },
+        { "atag",           OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_PERFILE |
+                            OPT_OUTPUT,                                                { .func_arg = opt_old2new },
+            "force audio tag/fourcc", "fourcc/tag" },
+        { "vol",            OPT_AUDIO | HAS_ARG  | OPT_INT,                            { &audio_volume },
+            "change audio volume (256=normal)" , "volume" },
+        { "sample_fmt",     OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_SPEC |
+                            OPT_STRING | OPT_INPUT | OPT_OUTPUT,                       { .off = OFFSET(sample_fmts) },
+            "set sample format", "format" },
+        { "channel_layout", OPT_AUDIO | HAS_ARG  | OPT_EXPERT | OPT_PERFILE |
+                            OPT_INPUT | OPT_OUTPUT,                                    { .func_arg = opt_channel_layout },
+            "set channel layout", "layout" },
+        { "af",             OPT_AUDIO | HAS_ARG  | OPT_PERFILE | OPT_OUTPUT,           { .func_arg = opt_audio_filters },
+            "set audio filters", "filter_graph" },
+        { "guess_layout_max", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(guess_layout_max) },
+          "set the maximum number of channels to try to guess the channel layout" },
+
+        /* subtitle options */
+        { "sn",     OPT_SUBTITLE | OPT_BOOL | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(subtitle_disable) },
+            "disable subtitle" },
+        { "scodec", OPT_SUBTITLE | HAS_ARG  | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_subtitle_codec },
+            "force subtitle codec ('copy' to copy stream)", "codec" },
+        { "stag",   OPT_SUBTITLE | HAS_ARG  | OPT_EXPERT  | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new }
+            , "force subtitle tag/fourcc", "fourcc/tag" },
+        { "fix_sub_duration", OPT_BOOL | OPT_EXPERT | OPT_SUBTITLE | OPT_SPEC | OPT_INPUT, { .off = OFFSET(fix_sub_duration) },
+            "fix subtitles duration" },
+        { "canvas_size", OPT_SUBTITLE | HAS_ARG | OPT_STRING | OPT_SPEC | OPT_INPUT, { .off = OFFSET(canvas_sizes) },
+            "set canvas size (WxH or abbreviation)", "size" },
+
+        /* grab options */
+        { "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_video_channel },
+            "deprecated, use -channel", "channel" },
+        { "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_video_standard },
+            "deprecated, use -standard", "standard" },
+        { "isync", OPT_BOOL | OPT_EXPERT, { &input_sync }, "this option is deprecated and does nothing", "" },
+
+        /* muxer options */
+        { "muxdelay",   OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(mux_max_delay) },
+            "set the maximum demux-decode delay", "seconds" },
+        { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(mux_preload) },
+            "set the initial demux-decode delay", "seconds" },
+        { "sdp_file", HAS_ARG | OPT_EXPERT | OPT_OUTPUT, { .func_arg = opt_sdp_file },
+            "specify a file in which to print sdp information", "file" },
+
+        { "time_base", HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(time_bases) },
+            "set the desired time base hint for output stream (1:24, 1:48000 or 0.04166, 2.0833e-5)", "ratio" },
+        { "enc_time_base", HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(enc_time_bases) },
+            "set the desired time base for the encoder (1:24, 1:48000 or 0.04166, 2.0833e-5). "
+            "two special values are defined - "
+            "0 = use frame rate (video) or sample rate (audio),"
+            "-1 = match source time base", "ratio" },
+
+        { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(bitstream_filters) },
+            "A comma-separated list of bitstream filters", "bitstream_filters" },
+        { "absf", HAS_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new },
+            "deprecated", "audio bitstream_filters" },
+        { "vbsf", OPT_VIDEO | HAS_ARG | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new },
+            "deprecated", "video bitstream_filters" },
+
+        { "apre", HAS_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT,    { .func_arg = opt_preset },
+            "set the audio options to the indicated preset", "preset" },
+        { "vpre", OPT_VIDEO | HAS_ARG | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT,    { .func_arg = opt_preset },
+            "set the video options to the indicated preset", "preset" },
+        { "spre", HAS_ARG | OPT_SUBTITLE | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_preset },
+            "set the subtitle options to the indicated preset", "preset" },
+        { "fpre", HAS_ARG | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT,                { .func_arg = opt_preset },
+            "set options from indicated preset file", "filename" },
+
+        { "max_muxing_queue_size", HAS_ARG | OPT_INT | OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(max_muxing_queue_size) },
+            "maximum number of packets that can be buffered while waiting for all streams to initialize", "packets" },
+
+        /* data codec support */
+        { "dcodec", HAS_ARG | OPT_DATA | OPT_PERFILE | OPT_EXPERT | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_data_codec },
+            "force data codec ('copy' to copy stream)", "codec" },
+        { "dn", OPT_BOOL | OPT_VIDEO | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(data_disable) },
+            "disable data" },
+
+    #if CONFIG_VAAPI
+        { "vaapi_device", HAS_ARG | OPT_EXPERT, { .func_arg = opt_vaapi_device },
+            "set VAAPI hardware device (DRM path or X11 display name)", "device" },
+    #endif
+
+    #if CONFIG_QSV
+        { "qsv_device", HAS_ARG | OPT_STRING | OPT_EXPERT, { &qsv_device },
+            "set QSV hardware device (DirectX adapter index, DRM path or X11 display name)", "device"},
+    #endif
+
+        { "init_hw_device", HAS_ARG | OPT_EXPERT, { .func_arg = opt_init_hw_device },
+            "initialise hardware device", "args" },
+        { "filter_hw_device", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_hw_device },
+            "set hardware device used when filtering", "device" },
+
+        { NULL, },
+    };
+
+    ffmpeg_options = options;
+
     int i, ret;
     BenchmarkTimeStamps ti;
 
     int savedCode = setjmp(ex_buf__);
     if (savedCode == 0) {
 
-        cleanup();
+        ffmpeg_var_cleanup();
 
         init_dynload();
 
@@ -5041,11 +5549,6 @@ int execute(int argc, char **argv)
             exit_program(1);
         }
 
-    //     if (nb_input_files == 0) {
-    //         av_log(NULL, AV_LOG_FATAL, "At least one input file must be specified\n");
-    //         exit_program(1);
-    //     }
-
         for (i = 0; i < nb_output_files; i++) {
             if (strcmp(output_files[i]->ctx->oformat->name, "rtp"))
                 want_sdp = 0;
@@ -5069,11 +5572,11 @@ int execute(int argc, char **argv)
         if ((decode_error_stat[0] + decode_error_stat[1]) * max_error_rate < decode_error_stat[1])
             exit_program(69);
 
-        exit_program(received_nb_signals ? 255 : main_return_code);
+        exit_program((received_nb_signals || cancelRequested(executionId))? 255 : main_ffmpeg_return_code);
 
     } else {
-        main_return_code = longjmp_value;
+        main_ffmpeg_return_code = (received_nb_signals || cancelRequested(executionId)) ? 255 : longjmp_value;
     }
 
-    return main_return_code;
+    return main_ffmpeg_return_code;
 }

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

@@ -17,6 +17,19 @@
  */
 
 /*
+ * 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
@@ -31,8 +44,6 @@
 #ifndef FFTOOLS_FFMPEG_H
 #define FFTOOLS_FFMPEG_H
 
-#include "config.h"
-
 #include <stdint.h>
 #include <stdio.h>
 #include <signal.h>
@@ -84,7 +95,7 @@ typedef struct HWAccel {
 } HWAccel;
 
 typedef struct HWDevice {
-    char *name;
+    const char *name;
     enum AVHWDeviceType type;
     AVBufferRef *device_ref;
 } HWDevice;
@@ -576,63 +587,61 @@ typedef struct OutputFile {
     int header_written;
 } OutputFile;
 
-extern InputStream **input_streams;
-extern int        nb_input_streams;
-extern InputFile   **input_files;
-extern int        nb_input_files;
+extern __thread InputStream **input_streams;
+extern __thread int        nb_input_streams;
+extern __thread InputFile   **input_files;
+extern __thread int        nb_input_files;
 
-extern OutputStream **output_streams;
-extern int         nb_output_streams;
-extern OutputFile   **output_files;
-extern int         nb_output_files;
+extern __thread OutputStream **output_streams;
+extern __thread int         nb_output_streams;
+extern __thread OutputFile   **output_files;
+extern __thread int         nb_output_files;
 
-extern FilterGraph **filtergraphs;
-extern int        nb_filtergraphs;
+extern __thread FilterGraph **filtergraphs;
+extern __thread int        nb_filtergraphs;
 
-extern char *vstats_filename;
-extern char *sdp_filename;
+extern __thread char *vstats_filename;
+extern __thread char *sdp_filename;
 
-extern float audio_drift_threshold;
-extern float dts_delta_threshold;
-extern float dts_error_threshold;
+extern __thread float audio_drift_threshold;
+extern __thread float dts_delta_threshold;
+extern __thread float dts_error_threshold;
 
-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 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 filter_nbthreads;
-extern int filter_complex_nbthreads;
-extern int vstats_version;
+extern __thread int filter_nbthreads;
+extern __thread int filter_complex_nbthreads;
+extern __thread int vstats_version;
 
-extern const AVIOInterruptCB int_cb;
+extern __thread const AVIOInterruptCB int_cb;
 
-extern const OptionDef options[];
 extern const HWAccel hwaccels[];
-extern AVBufferRef *hw_device_ctx;
+extern __thread AVBufferRef *hw_device_ctx;
 #if CONFIG_QSV
-extern char *qsv_device;
+extern __thread char *qsv_device;
 #endif
-extern HWDevice *filter_hw_device;
-
+extern __thread HWDevice *filter_hw_device;
 
 void term_init(void);
 void term_exit(void);
@@ -679,6 +688,77 @@ int hwaccel_decode_init(AVCodecContext *avctx);
 
 void set_report_callback(void (*callback)(int, float, float, int64_t, int, double, double));
 
-void cancel_operation();
+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*));
 
 #endif /* FFTOOLS_FFMPEG_H */

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

@@ -301,10 +301,17 @@ 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;
         }
@@ -740,6 +747,7 @@ 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;
 }
 

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

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

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

@@ -17,33 +17,24 @@
  * along with MobileFFmpeg.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * CHANGES 10.2018
- * --------------------------------------------------------
- * - getBuildConf method added
- *
- * CHANGES 09.2018
- * --------------------------------------------------------
- * - Merged with mobileffmpeg_config
- *
- * CHANGES 08.2018
- * --------------------------------------------------------
- * - Copied methods with avutil_log_ prefix from libavutil/log.c
- */
-
 #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"
 #include "fftools_ffmpeg.h"
+#include "mobileffmpeg.h"
+#include "mobileffprobe.h"
 
 /** Callback data structure */
 struct CallbackData {
   int type;                 // 1 (log callback) or 2 (statistics callback)
+  long executionId;         // execution id
 
   int logLevel;             // log level
-  char *logData;            // log data
+  AVBPrint logData;         // log data
 
   int statisticsFrameNumber;        // statistics frame number
   float statisticsFps;              // statistics fps
@@ -56,10 +47,19 @@ 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 */
-pthread_mutex_t lockMutex;
-pthread_mutex_t monitorMutex;
-pthread_cond_t monitorCondition;
+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_t callbackThread;
 int redirectionEnabled;
@@ -79,9 +79,34 @@ 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},
@@ -90,19 +115,23 @@ JNINativeMethod configMethods[] = {
     {"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},
-    {"nativeExecute", "([Ljava/lang/String;)I", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeExecute},
-    {"nativeCancel", "()V", (void*) Java_com_arthenica_mobileffmpeg_Config_nativeCancel},
-    {"getNativeBuildConf", "()Ljava/lang/String;", (void*) Java_com_arthenica_mobileffmpeg_Config_getNativeBuildConf}
+    {"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}
 };
 
 /** Forward declaration for function defined in fftools_ffmpeg.c */
-int execute(int argc, char **argv);
-
-/** DEFINES LINE SIZE USED FOR LOGGING */
-#define LOG_LINE_SIZE 1024
+int ffmpeg_execute(int argc, char **argv);
 
 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:
@@ -189,6 +218,26 @@ 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);
 }
@@ -198,14 +247,54 @@ 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;
@@ -220,6 +309,8 @@ 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);
@@ -234,16 +325,19 @@ void monitorNotify() {
 
 /**
  * Adds log data to the end of callback data list.
+ *
+ * @param level log level
+ * @param data log data
  */
-void logCallbackDataAdd(int level, const char *data) {
+void logCallbackDataAdd(int level, AVBPrint *data) {
 
     // CREATE DATA STRUCT FIRST
-    struct CallbackData *newData = (struct CallbackData*)malloc(sizeof(struct CallbackData));
+    struct CallbackData *newData = (struct CallbackData*)av_malloc(sizeof(struct CallbackData));
     newData->type = 1;
+    newData->executionId = executionId;
     newData->logLevel = level;
-    size_t dataSize = strlen(data) + 1;
-    newData->logData = (char*)malloc(dataSize);
-    memcpy(newData->logData, data, dataSize);
+    av_bprint_init(&newData->logData, 0, AV_BPRINT_SIZE_UNLIMITED);
+    av_bprintf(&newData->logData, "%s", data->str);
     newData->next = NULL;
 
     mutexLock();
@@ -275,8 +369,9 @@ void logCallbackDataAdd(int level, const char *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*)malloc(sizeof(struct CallbackData));
+    struct CallbackData *newData = (struct CallbackData*)av_malloc(sizeof(struct CallbackData));
     newData->type = 2;
+    newData->executionId = executionId;
     newData->statisticsFrameNumber = frameNumber;
     newData->statisticsFps = fps;
     newData->statisticsQuality = quality;
@@ -310,6 +405,20 @@ 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.
  */
@@ -342,16 +451,51 @@ 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 pointer to AVClass struct
- * \param level
- * \param format
- * \param arguments
+ * @param ptr pointer to AVClass struct
+ * @param level log level
+ * @param format format string
+ * @param vargs arguments
  */
 void mobileffmpeg_log_callback_function(void *ptr, int level, const char* format, va_list vargs) {
-    char line[LOG_LINE_SIZE];
+    AVBPrint fullLine;
     AVBPrint part[4];
     int print_prefix = 1;
 
@@ -359,35 +503,45 @@ void mobileffmpeg_log_callback_function(void *ptr, int level, const char* format
         level &= 0xff;
     }
     int activeLogLevel = av_log_get_level();
-    if ((activeLogLevel == AV_LOG_QUIET) || (level > activeLogLevel)) {
+
+    // 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);
@@ -421,31 +575,31 @@ void *callbackThreadFunction() {
 
                 // LOG CALLBACK
 
-                size_t size = strlen(callbackData->logData);
+                int size = callbackData->logData.len;
 
                 jbyteArray byteArray = (jbyteArray) (*env)->NewByteArray(env, size);
-                (*env)->SetByteArrayRegion(env, byteArray, 0, size, (jbyte *)callbackData->logData);
-                (*env)->CallStaticVoidMethod(env, configClass, logMethod, callbackData->logLevel, byteArray);
+                (*env)->SetByteArrayRegion(env, byteArray, 0, size, callbackData->logData.str);
+                (*env)->CallStaticVoidMethod(env, configClass, logMethod, (jlong) callbackData->executionId, callbackData->logLevel, byteArray);
                 (*env)->DeleteLocalRef(env, byteArray);
 
                 // CLEAN LOG DATA
-                free(callbackData->logData);
+                av_bprint_finalize(&callbackData->logData, NULL);
 
             } else {
 
                 // STATISTICS CALLBACK
 
                 (*env)->CallStaticVoidMethod(env, configClass, statisticsMethod,
-                    callbackData->statisticsFrameNumber, callbackData->statisticsFps,
-                    callbackData->statisticsQuality, callbackData->statisticsSize,
-                    callbackData->statisticsTime, callbackData->statisticsBitrate,
-                    callbackData->statisticsSpeed);
+                    (jlong) callbackData->executionId, callbackData->statisticsFrameNumber,
+                    callbackData->statisticsFps, callbackData->statisticsQuality,
+                    callbackData->statisticsSize, callbackData->statisticsTime,
+                    callbackData->statisticsBitrate, callbackData->statisticsSpeed);
 
             }
 
             // CLEAN STRUCT
             callbackData->next = NULL;
-            free(callbackData);
+            av_free(callbackData);
 
         } else {
             monitorWait(100);
@@ -462,9 +616,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;
@@ -479,36 +633,61 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_FALSE;
     }
 
-    if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 9) < 0) {
+    if ((*env)->RegisterNatives(env, localConfigClass, configMethods, 12) < 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);
+        return JNI_FALSE;
+    }
+
     (*env)->GetJavaVM(env, &globalVm);
 
-    logMethod = (*env)->GetStaticMethodID(env, localConfigClass, "log", "(I[B)V");
+    logMethod = (*env)->GetStaticMethodID(env, localConfigClass, "log", "(JI[B)V");
     if (logMethod == NULL) {
-        LOGE("OnLoad thread failed to GetMethodID for %s.\n", "log");
-        (*globalVm)->DetachCurrentThread(globalVm);
+        LOGE("OnLoad thread failed to GetStaticMethodID for %s.\n", "log");
         return JNI_FALSE;
     }
 
-    statisticsMethod = (*env)->GetStaticMethodID(env, localConfigClass, "statistics", "(IFFJIDD)V");
+    statisticsMethod = (*env)->GetStaticMethodID(env, localConfigClass, "statistics", "(JIFFJIDD)V");
     if (logMethod == NULL) {
-        LOGE("OnLoad thread failed to GetMethodID for %s.\n", "statistics");
-        (*globalVm)->DetachCurrentThread(globalVm);
+        LOGE("OnLoad thread failed to GetStaticMethodID for %s.\n", "statistics");
         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;
 }
@@ -516,29 +695,29 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 /**
  * Sets log level.
  *
- * \param env pointer to native method interface
- * \param reference to the class on which this method is invoked
- * \param 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
  */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel(JNIEnv *env, jclass object, jint level) {
-    av_log_set_level(level);
+    JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_setNativeLogLevel(JNIEnv *env, jclass object, jint level) {
+    configuredLogLevel = level;
 }
 
 /**
  * Returns current log level.
  *
- * \param env pointer to native method interface
- * \param reference to the class on which this method is invoked
+ * @param env pointer to native method interface
+ * @param object reference to the class on which this method is invoked
  */
 JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeLogLevel(JNIEnv *env, jclass object) {
-    return av_log_get_level();
+    return configuredLogLevel;
 }
 
 /**
  * Enables log and statistics redirection.
  *
- * \param env pointer to native method interface
- * \param reference to the class on which this method is invoked
+ * @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_enableNativeRedirection(JNIEnv *env, jclass object) {
     mutexLock();
@@ -564,8 +743,8 @@ JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_enableNativeRedire
 /**
  * Disables log and statistics redirection.
  *
- * \param env pointer to native method interface
- * \param reference to the class on which this method is invoked
+ * @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_disableNativeRedirection(JNIEnv *env, jclass object) {
 
@@ -588,9 +767,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);
@@ -599,40 +778,44 @@ 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 command natively with arguments provided.
+ * Synchronously executes FFmpeg 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 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 id execution id
+ * @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_nativeExecute(JNIEnv *env, jclass object, jobjectArray stringArray) {
+JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecute(JNIEnv *env, jclass object, jlong id, 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 *) malloc(sizeof(jstring) * programArgumentCount);
+        tempArray = (jstring *) av_malloc(sizeof(jstring) * programArgumentCount);
     }
 
     /* PRESERVE USAGE FORMAT
      *
      * ffmpeg <arguments>
      */
-    argv = (char **)malloc(sizeof(char*) * (argumentCount));
-    argv[0] = (char *)malloc(sizeof(char) * (strlen(LIB_NAME) + 1));
+    argv = (char **)av_malloc(sizeof(char*) * (argumentCount));
+    argv[0] = (char *)av_malloc(sizeof(char) * (strlen(LIB_NAME) + 1));
     strcpy(argv[0], LIB_NAME);
 
     // PREPARE
@@ -645,8 +828,18 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIE
         }
     }
 
+    // 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 = execute(argumentCount, argv);
+    int retCode = ffmpeg_execute(argumentCount, argv);
+
+    // ALWAYS REMOVE THE ID FROM THE MAP
+    removeExecution((long) id);
 
     // CLEANUP
     if (tempArray != NULL) {
@@ -654,31 +847,117 @@ JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIE
             (*env)->ReleaseStringUTFChars(env, tempArray[i], argv[i + 1]);
         }
 
-        free(tempArray);
+        av_free(tempArray);
     }
-    free(argv[0]);
-    free(argv);
+    av_free(argv[0]);
+    av_free(argv);
 
     return retCode;
 }
 
 /**
- * Cancels an ongoing operation natively.
+ * Cancels an ongoing FFmpeg operation natively.
  *
- * \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 object reference to the class on which this method is invoked
+ * @param id execution id
  */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *env, jclass object) {
-    cancel_operation();
+JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegCancel(JNIEnv *env, jclass object, jlong id) {
+    cancel_operation(id);
 }
 
 /**
- * Returns build configuration for FFmpeg.
+ * 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
- * \return build configuration string
+ * @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 jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeBuildConf(JNIEnv *env, jclass object) {
-    return (*env)->NewStringUTF(env, FFMPEG_CONFIGURATION);
+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.2"
+#define MOBILE_FFMPEG_VERSION "4.4"
 
 /** Defines tag used for Android logging. */
 #define LIB_NAME "mobile-ffmpeg"
@@ -91,23 +91,51 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_Config_getNativeVersio
 
 /*
  * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeExecute
- * Signature: ([Ljava/lang/String;)I
+ * Method:    nativeFFmpegExecute
+ * Signature: (J[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeExecute(JNIEnv *, jclass, jobjectArray);
+JNIEXPORT jint JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegExecute(JNIEnv *, jclass, jlong id, jobjectArray);
 
 /*
  * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    nativeCancel
- * Signature: ()V
+ * Method:    nativeFFmpegCancel
+ * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeCancel(JNIEnv *, jclass);
+JNIEXPORT void JNICALL Java_com_arthenica_mobileffmpeg_Config_nativeFFmpegCancel(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     com_arthenica_mobileffmpeg_Config
- * Method:    getNativeBuildConf
+ * 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_getNativeBuildConf(JNIEnv *, jclass);
+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);
 
 #endif /* MOBILE_FFMPEG_H */

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

@@ -18,6 +18,7 @@
  */
 
 #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,15 +27,17 @@ 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}
+  {"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}
 };
 
 /**
  * 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;
@@ -49,7 +52,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_FALSE;
     }
 
-    if ((*env)->RegisterNatives(env, abiDetectClass, abiDetectMethods, 2) < 0) {
+    if ((*env)->RegisterNatives(env, abiDetectClass, abiDetectMethods, 4) < 0) {
         LOGE("OnLoad failed to RegisterNatives for class %s.\n", abiDetectClassName);
         return JNI_FALSE;
     }
@@ -60,9 +63,9 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 /**
  * Returns loaded 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 loaded ABI name as UTF string
  */
 JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeAbi(JNIEnv *env, jclass object) {
 
@@ -83,9 +86,9 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeAbi
 /**
  * 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
+ * @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) {
     AndroidCpuFamily family = android_getCpuFamily();
@@ -117,9 +120,9 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpu
 /**
  * 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
+ * @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)
@@ -128,3 +131,14 @@ JNIEXPORT jboolean JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_isNativeLTS
         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

@@ -65,4 +65,11 @@ JNIEXPORT jstring JNICALL Java_com_arthenica_mobileffmpeg_AbiDetect_getNativeCpu
  */
 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);
+
 #endif /* MOBILE_FFMPEG_ABIDETECT_H */

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

@@ -0,0 +1,24 @@
+/*
+ * 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. */
-jmp_buf ex_buf__;
+extern __thread jmp_buf ex_buf__;
 
 #endif // MOBILE_FFMPEG_EXCEPTION_H

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

@@ -0,0 +1,96 @@
+/*
+ * 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

@@ -0,0 +1,32 @@
+/*
+ * 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

@@ -0,0 +1,134 @@
+/*
+ * 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

@@ -0,0 +1,46 @@
+/*
+ * 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 Taner Sener
+ * Copyright (c) 2018-2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -20,8 +20,7 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>This class is used to detect running ABI name using Android's <code>cpufeatures</code>
- * library.
+ * <p>This class is used to detect running ABI name using Google <code>cpu-features</code> library.
  *
  * @author Taner Sener
  * @since v1.0
@@ -30,13 +29,18 @@ 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;
 
     /**
@@ -56,7 +60,7 @@ public class AbiDetect {
      */
     public static String getAbi() {
         if (armV7aNeonLoaded) {
-            return "arm-v7a-neon";
+            return ARM_V7A_NEON;
         } else {
             return getNativeAbi();
         }
@@ -67,7 +71,7 @@ public class AbiDetect {
      *
      * @return loaded ABI name
      */
-    private native static String getNativeAbi();
+    public native static String getNativeAbi();
 
     /**
      * <p>Returns ABI name of the running cpu.
@@ -79,8 +83,15 @@ public class AbiDetect {
     /**
      * <p>Returns whether MobileFFmpeg release is a long term release or not.
      *
-     * @return YES or NO
+     * @return yes or no
      */
     native static boolean isNativeLTSBuild();
 
+    /**
+     * <p>Returns build configuration for <code>FFmpeg</code>.
+     *
+     * @return build configuration string
+     */
+    native static String getNativeBuildConf();
+
 }

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

@@ -0,0 +1,64 @@
+/*
+ * 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

@@ -0,0 +1,55 @@
+/*
+ * 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

@@ -0,0 +1,54 @@
+/*
+ * 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

@@ -0,0 +1,77 @@
+/*
+ * 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 Taner Sener
+ * Copyright (c) 2018-2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -20,50 +20,60 @@
 package com.arthenica.mobileffmpeg;
 
 import android.content.Context;
-import android.system.ErrnoException;
-import android.system.Os;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.provider.DocumentsContract;
 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}: 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>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>2. {@link #setLogLevel(Level)}/{@link #getLogLevel()}: Use this methods to see/control FFmpeg
- * log severity.
+ * <p>2. {@link #setLogLevel(Level)}/{@link #getLogLevel()}: Use this methods to set/get
+ * FFmpeg/FFprobe log severity.
  *
- * <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>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>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;
@@ -72,58 +82,89 @@ public class Config {
 
     private static Statistics lastReceivedStatistics;
 
-    private static final AtomicReference<StringBuffer> systemCommandOutputReference;
+    private static int lastCreatedPipeIndex;
 
-    private static boolean runningSystemCommand;
+    private static final List<FFmpegExecution> executions;
+    private static SparseArray<ParcelFileDescriptor> pfdmap = new SparseArray<>();
 
     static {
 
         Log.i(Config.TAG, "Loading mobile-ffmpeg.");
 
-        /* ALL LIBRARIES LOADED AT STARTUP */
-        Abi cpuAbi = Abi.from(AbiDetect.getNativeCpuAbi());
-        FFmpeg.class.getName();
+        boolean nativeFFmpegLoaded = false;
+        boolean nativeFFmpegTriedAndFailed = false;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
 
-        /*
-         * NEON supported arm-v7a library has a different name
-         */
-        boolean nativeLibraryLoaded = false;
-        if (cpuAbi == Abi.ABI_ARMV7A_NEON) {
-            if (AbiDetect.isNativeLTSBuild()) {
-
-                /*
-                 * IF CPU SUPPORTS ARM-V7A-NEON THE TRY TO LOAD IT FIRST. IF NOT LOAD DEFAULT ARM-V7A
-                 */
+            /* 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("mobileffmpeg-armv7a-neon");
-                    nativeLibraryLoaded = true;
-                    AbiDetect.setArmV7aNeonLoaded(true);
+                    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 library not found. Loading default armeabi-v7a library.", e);
+                    Log.i(Config.TAG, "NEON supported armeabi-v7a ffmpeg library not found. Loading default armeabi-v7a library.", e);
+                    nativeFFmpegTriedAndFailed = true;
                 }
-            } else {
-                AbiDetect.setArmV7aNeonLoaded(true);
+            }
+
+            if (!nativeFFmpegLoaded) {
+                System.loadLibrary("avutil");
+                System.loadLibrary("swscale");
+                System.loadLibrary("swresample");
+                System.loadLibrary("avcodec");
+                System.loadLibrary("avformat");
+                System.loadLibrary("avfilter");
+                System.loadLibrary("avdevice");
             }
         }
 
-        if (!nativeLibraryLoaded) {
+        /* ALL MOBILE-FFMPEG LIBRARIES LOADED AT STARTUP */
+        Abi.class.getName();
+        FFmpeg.class.getName();
+        FFprobe.class.getName();
+
+        boolean nativeMobileFFmpegLoaded = false;
+        if (!nativeFFmpegTriedAndFailed && AbiDetect.ARM_V7A.equals(AbiDetect.getNativeAbi())) {
+            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);
+            } catch (final UnsatisfiedLinkError e) {
+                Log.i(Config.TAG, "NEON supported armeabi-v7a mobileffmpeg library not found. Loading default armeabi-v7a library.", e);
+            }
+        }
+
+        if (!nativeMobileFFmpegLoaded) {
             System.loadLibrary("mobileffmpeg");
         }
 
-        Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s-%s.", getPackageName(), AbiDetect.getAbi(), getVersion()));
+        Log.i(Config.TAG, String.format("Loaded mobile-ffmpeg-%s-%s-%s-%s.", getPackageName(), AbiDetect.getAbi(), getVersion(), getBuildDate()));
 
         /* NATIVE LOG LEVEL IS RECEIVED ONLY ON STARTUP */
         activeLogLevel = Level.from(getNativeLogLevel());
 
         lastReceivedStatistics = new Statistics();
 
-        Config.enableRedirection();
+        enableRedirection();
 
-        systemCommandOutputReference = new AtomicReference<>();
-        systemCommandOutputReference.set(new StringBuffer());
+        lastCreatedPipeIndex = 0;
 
-        runningSystemCommand = false;
+        executions = Collections.synchronizedList(new ArrayList<FFmpegExecution>());
     }
 
     /**
@@ -134,14 +175,15 @@ public class Config {
 
     /**
      * <p>Enables log and statistics redirection.
-     * <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
+     * <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
      * {@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();
@@ -176,7 +218,7 @@ public class Config {
     }
 
     /**
-     * <p>Sets a callback function to redirect FFmpeg logs.
+     * <p>Sets a callback function to redirect FFmpeg/FFprobe logs.
      *
      * @param newLogCallback new log callback function or NULL to disable a previously defined callback
      */
@@ -196,32 +238,26 @@ public class Config {
     /**
      * <p>Log redirection method called by JNI/native part.
      *
-     * @param levelValue log level as defined in {@link Level}
-     * @param logMessage redirected log message
+     * @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
      */
-    private static void log(final int levelValue, final byte[] logMessage) {
+    private static void log(final long executionId, final int levelValue, final byte[] logMessage) {
         final Level level = Level.from(levelValue);
         final String text = new String(logMessage);
 
-        if (runningSystemCommand) {
-
-            // REDIRECT SYSTEM OUTPUT
-            if (activeLogLevel != Level.AV_LOG_QUIET && levelValue <= activeLogLevel.getValue()) {
-                systemCommandOutputReference.get().append(text);
-            }
-            return;
-        }
-
-        if (activeLogLevel == Level.AV_LOG_QUIET || levelValue > activeLogLevel.getValue()) {
+        // AV_LOG_STDERR logs are always redirected
+        if ((activeLogLevel == Level.AV_LOG_QUIET && levelValue != Level.AV_LOG_STDERR.getValue()) || levelValue > activeLogLevel.getValue()) {
             // LOG NEITHER PRINTED NOR FORWARDED
             return;
         }
 
-        // ALWAYS REDIRECT COMMAND OUTPUT
-        FFmpeg.appendCommandOutput(text);
-
         if (logCallbackFunction != null) {
-            logCallbackFunction.apply(new LogMessage(level, text));
+            try {
+                logCallbackFunction.apply(new LogMessage(executionId, level, text));
+            } catch (final Exception e) {
+                Log.e(Config.TAG, "Exception thrown inside LogCallback block", e);
+            }
         } else {
             switch (level) {
                 case AV_LOG_QUIET: {
@@ -233,6 +269,7 @@ public class Config {
                     android.util.Log.d(TAG, text);
                 }
                 break;
+                case AV_LOG_STDERR:
                 case AV_LOG_VERBOSE: {
                     android.util.Log.v(TAG, text);
                 }
@@ -262,6 +299,7 @@ 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
@@ -270,14 +308,18 @@ public class Config {
      * @param bitrate          output bit rate in kbits/s
      * @param speed            processing speed = processed duration / operation duration
      */
-    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);
+    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);
         lastReceivedStatistics.update(newStatistics);
 
         if (statisticsCallbackFunction != null) {
-            statisticsCallbackFunction.apply(lastReceivedStatistics);
+            try {
+                statisticsCallbackFunction.apply(lastReceivedStatistics);
+            } catch (final Exception e) {
+                Log.e(Config.TAG, "Exception thrown inside StatisticsCallback block", e);
+            }
         }
     }
 
@@ -301,10 +343,10 @@ public class Config {
      * <p>Sets and overrides <code>fontconfig</code> configuration directory.
      *
      * @param path directory which contains fontconfig configuration (fonts.conf)
-     * @throws ErrnoException if an error occurs
+     * @return zero on success, non-zero on error
      */
-    public static void setFontconfigConfigurationPath(final String path) throws ErrnoException {
-        Os.setenv("FONTCONFIG_PATH", path, true);
+    public static int setFontconfigConfigurationPath(final String path) {
+        return setNativeEnvironmentVariable("FONTCONFIG_PATH", path);
     }
 
     /**
@@ -378,7 +420,7 @@ public class Config {
 
             Log.d(TAG, String.format("Font directory %s registered successfully.", fontDirectoryPath));
 
-        } catch (final ErrnoException | IOException e) {
+        } catch (final IOException e) {
             Log.e(TAG, String.format("Failed to set font directory: %s.", fontDirectoryPath), e);
         } finally {
             if (reference.get() != null) {
@@ -412,57 +454,222 @@ public class Config {
     }
 
     /**
-     * Executes system command. System command is not logged to output.
+     * <p>Creates a new named pipe to use in <code>FFmpeg</code> operations.
      *
-     * @param arguments                   command arguments
-     * @param commandOutputEndPatternList list of patterns which will indicate that operation has ended
-     * @param timeout                     execution timeout
-     * @return return code
+     * <p>Please note that creator is responsible of closing created pipes.
+     *
+     * @param context application context
+     * @return the full path of named pipe
      */
-    static int systemExecute(final String[] arguments, final List<String> commandOutputEndPatternList, final long timeout) {
-        systemCommandOutputReference.set(new StringBuffer());
-        runningSystemCommand = true;
+    public static String registerNewFFmpegPipe(final Context context) {
 
-        int rc = Config.nativeExecute(arguments);
+        // PIPES ARE CREATED UNDER THE CACHE DIRECTORY
+        final File cacheDir = context.getCacheDir();
 
-        long totalWaitTime = 0;
+        final String newFFmpegPipePath = cacheDir + File.separator + MOBILE_FFMPEG_PIPE_PREFIX + (++lastCreatedPipeIndex);
 
-        try {
-            while (!systemCommandOutputContainsPattern(commandOutputEndPatternList) && (totalWaitTime < timeout)) {
-                synchronized (systemCommandOutputReference) {
-                    systemCommandOutputReference.wait(20);
-                }
-                totalWaitTime += 20;
-            }
-        } catch (final InterruptedException e) {
-            Log.w(TAG, "systemExecute operation interrupted.", e);
+        // 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;
         }
-
-        runningSystemCommand = false;
-
-        nativeCancel();
-
-        return rc;
-    }
-
-    private static boolean systemCommandOutputContainsPattern(final List<String> patternList) {
-        String string = systemCommandOutputReference.get().toString();
-        for (String pattern : patternList) {
-            if (string.contains(pattern)) {
-                return true;
-            }
-        }
-
-        return false;
     }
 
     /**
-     * Returns output of last executed system command.
+     * <p>Closes a previously created <code>FFmpeg</code> pipe.
      *
-     * @return output of last executed system command
+     * @param ffmpegPipePath full path of ffmpeg pipe
      */
-    static String getSystemCommandOutput() {
-        return systemCommandOutputReference.get().toString();
+    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);
     }
 
     /**
@@ -494,34 +701,132 @@ public class Config {
      *
      * @return FFmpeg version
      */
-    native static String getNativeFFmpegVersion();
+    private native static String getNativeFFmpegVersion();
 
     /**
      * <p>Returns MobileFFmpeg library version natively.
      *
      * @return MobileFFmpeg version
      */
-    native static String getNativeVersion();
+    private native static String getNativeVersion();
 
     /**
      * <p>Synchronously executes FFmpeg natively with arguments provided.
      *
-     * @param arguments FFmpeg command options/arguments as string array
+     * @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
      */
-    native static int nativeExecute(final String[] arguments);
+    private native static int nativeFFmpegExecute(final long executionId, final String[] arguments);
 
     /**
-     * <p>Cancels an ongoing operation natively. This function does not wait for termination to
-     * complete and returns immediately.
-     */
-    native static void nativeCancel();
-
-    /**
-     * <p>Returns build configuration for <code>FFmpeg</code>.
+     * <p>Cancels an ongoing FFmpeg operation natively. This function does not wait for termination
+     * to complete and returns immediately.
      *
-     * @return build configuration string
+     * @param executionId id of the execution
      */
-    native static String getNativeBuildConf();
+    native static void nativeFFmpegCancel(final long executionId);
 
+    /**
+     * <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

@@ -0,0 +1,40 @@
+/*
+ * 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 Taner Sener
+ * Copyright (c) 2018-2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -19,30 +19,33 @@
 
 package com.arthenica.mobileffmpeg;
 
-import android.util.Log;
+import android.os.AsyncTask;
 
-import java.util.Arrays;
+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. Provides {@link #execute(String...)} method to execute
- * FFmpeg commands.
+ * <p>Main class for FFmpeg operations. Supports synchronous {@link #execute(String...)} and
+ * asynchronous {@link #executeAsync(String, ExecuteCallback)} methods 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 {
 
-    public static final int RETURN_CODE_SUCCESS = 0;
+    static final long DEFAULT_EXECUTION_ID = 0;
 
-    public static final int RETURN_CODE_CANCEL = 255;
-
-    private static int lastReturnCode = 0;
-
-    private static StringBuffer lastCommandOutput = new StringBuffer();
+    private static final AtomicLong executionIdCounter = new AtomicLong(3000);
 
     static {
         AbiDetect.class.getName();
@@ -55,59 +58,60 @@ public class FFmpeg {
     private FFmpeg() {
     }
 
-    /**
-     * <p>Appends given log output to the last command output.
-     *
-     * @param output log output
-     */
-    static void appendCommandOutput(final String output) {
-        lastCommandOutput.append(output);
-    }
-
-    /**
-     * <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() {
-        if (AbiDetect.isNativeLTSBuild()) {
-            return String.format("%s-lts", Config.getNativeVersion());
-        } else {
-            return Config.getNativeVersion();
-        }
-    }
-
     /**
      * <p>Synchronously executes FFmpeg with arguments provided.
      *
      * @param arguments FFmpeg command options/arguments as string array
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
+     * @return 0 on successful execution, 255 on user cancel, other non-zero codes on error
      */
     public static int execute(final String[] arguments) {
-        lastCommandOutput = new StringBuffer();
+        return Config.ffmpegExecute(DEFAULT_EXECUTION_ID, arguments);
+    }
 
-        lastReturnCode = Config.nativeExecute(arguments);
+    /**
+     * <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
+     * @return returns a unique id that represents this execution
+     */
+    public static long executeAsync(final String[] arguments, final ExecuteCallback executeCallback) {
+        final long newExecutionId = executionIdCounter.incrementAndGet();
 
-        return lastReturnCode;
+        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.
+     * provided delimiter character.
      *
      * @param command   FFmpeg command
-     * @param delimiter delimiter used between arguments
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
+     * @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));
@@ -115,81 +119,159 @@ public class FFmpeg {
 
     /**
      * <p>Synchronously executes FFmpeg command provided. Space character is used to split command
-     * into arguments.
+     * into arguments. You can use single and double quote characters to specify arguments inside
+     * your command.
      *
      * @param command FFmpeg command
-     * @return zero on successful execution, 255 on user cancel and non-zero on error
+     * @return 0 on successful execution, 255 on user cancel, other non-zero codes on error
      */
     public static int execute(final String command) {
-        return execute(command, " ");
+        return execute(parseArguments(command));
     }
 
     /**
-     * <p>Cancels an ongoing operation. This function does not wait for termination to complete and
-     * returns immediately.
+     * <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;
+    }
+
+    /**
+     * <p>Cancels an ongoing operation.
+     *
+     * <p>This function does not wait for termination to complete and returns immediately.
      */
     public static void cancel() {
-        Config.nativeCancel();
+        Config.nativeFFmpegCancel(DEFAULT_EXECUTION_ID);
     }
 
     /**
-     * <p>Returns return code of last executed command.
+     * <p>Cancels an ongoing operation.
      *
-     * @return return code of last executed command
-     * @since 3.0
+     * <p>This function does not wait for termination to complete and returns immediately.
+     *
+     * @param executionId id of the execution
      */
-    public static int getLastReturnCode() {
-        return lastReturnCode;
+    public static void cancel(final long executionId) {
+        Config.nativeFFmpegCancel(executionId);
     }
 
     /**
-     * <p>Returns log output of last executed command. Please note that disabling redirection using
-     * {@link Config#disableRedirection()} method also disables this functionality.
+     * <p>Lists ongoing executions.
      *
-     * @return output of last executed command
-     * @since 3.0
+     * @return list of ongoing executions
      */
-    public static String getLastCommandOutput() {
-        return lastCommandOutput.toString();
+    public static List<FFmpegExecution> listExecutions() {
+        return Config.listFFmpegExecutions();
     }
 
     /**
-     * <p>Returns media information for given file.
+     * <p>Parses the given command into arguments.
      *
-     * @param path path or uri of media file
-     * @return media information
-     * @since 3.0
+     * @param command string command
+     * @return array of arguments
      */
-    public static MediaInformation getMediaInformation(final String path) {
-        return getMediaInformation(path, 10000L);
-    }
+    static String[] parseArguments(final String command) {
+        final List<String> argumentList = new ArrayList<>();
+        StringBuilder currentArgument = new StringBuilder();
 
-    /**
-     * <p>Returns media information for given file.
-     *
-     * @param path    path or uri of media file
-     * @param timeout complete timeout
-     * @return media information
-     * @since 3.0
-     */
-    public static MediaInformation getMediaInformation(final String path, final Long timeout) {
-        int rc = Config.systemExecute(new String[]{"-v", "info", "-hide_banner", "-i", path, "-f", "null", "-"}, Arrays.asList("Press [q] to stop, [?] for help", "No such file or directory", "Input/output error", "Conversion failed"), timeout);
+        boolean singleQuoteStarted = false;
+        boolean doubleQuoteStarted = false;
 
-        if (rc == 0) {
-            return MediaInformationParser.from(Config.getSystemCommandOutput());
-        } else {
-            Log.i(Config.TAG, Config.getSystemCommandOutput());
-            return null;
+        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>Returns whether MobileFFmpeg release is a long term release or not.
+     * <p>Combines arguments into a string.
      *
-     * @return YES or NO
+     * @param arguments arguments
+     * @return string containing all arguments
      */
-    public static boolean isLTSBuild() {
-        return AbiDetect.isNativeLTSBuild();
+    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();
     }
 
 }

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

@@ -0,0 +1,53 @@
+/*
+ * 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

@@ -0,0 +1,133 @@
+/*
+ * 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

@@ -0,0 +1,32 @@
+/*
+ * 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,6 +27,14 @@ 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.
      */
@@ -85,7 +93,9 @@ public enum Level {
      * @return enumeration defined by value
      */
     public static Level from(final int value) {
-        if (value == AV_LOG_QUIET.getValue()) {
+        if (value == AV_LOG_STDERR.getValue()) {
+            return AV_LOG_STDERR;
+        } else 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 redirect logs.
+ * <p>Represents a callback function to receive logs from running executions
  *
  * @author Taner Sener
  * @since v2.1

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

@@ -20,21 +20,27 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Represents a redirected log message.
+ * <p>Logs for running executions.
  *
  * @author Taner Sener
  * @since v2.1
  */
 public class LogMessage {
 
+    private final long executionId;
     private final Level level;
     private final String text;
 
-    public LogMessage(final Level level, final String text) {
+    public LogMessage(final long executionId, final Level level, final String text) {
+        this.executionId = executionId;
         this.level = level;
         this.text = text;
     }
 
+    public long getExecutionId() {
+        return executionId;
+    }
+
     public Level getLevel() {
         return level;
     }
@@ -43,4 +49,21 @@ 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,5 +1,5 @@
 /*
- * Copyright (c) 2018 Taner Sener
+ * Copyright (c) 2018, 2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -19,11 +19,9 @@
 
 package com.arthenica.mobileffmpeg;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import org.json.JSONObject;
+
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Media information class.
@@ -32,49 +30,38 @@ import java.util.Set;
  */
 public class MediaInformation {
 
-    /**
-     * Format
-     */
-    private String format;
+    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";
 
     /**
-     * Path
+     * Stores all properties.
      */
-    private String path;
+    private final JSONObject jsonObject;
 
     /**
-     * Duration, in milliseconds
+     * Stores streams.
      */
-    private Long duration;
+    private final List<StreamInformation> streams;
+
+    public MediaInformation(final JSONObject jsonObject, final List<StreamInformation> streams) {
+        this.jsonObject = jsonObject;
+        this.streams = streams;
+    }
 
     /**
-     * Start time, in milliseconds
+     * Returns file name.
+     *
+     * @return media file name
      */
-    private Long startTime;
-
-    /**
-     * Bitrate, kb/s
-     */
-    private Long bitrate;
-
-    /**
-     * Metadata map
-     */
-    private Map<String, String> metadata;
-
-    /**
-     * List of streams
-     */
-    private List<StreamInformation> streams;
-
-    /**
-     * Raw unparsed media information
-     */
-    private String rawInformation;
-
-    public MediaInformation() {
-        this.metadata = new HashMap<>();
-        this.streams = new ArrayList<>();
+    public String getFilename() {
+        return getStringProperty(KEY_FILENAME);
     }
 
     /**
@@ -83,34 +70,16 @@ public class MediaInformation {
      * @return media format
      */
     public String getFormat() {
-        return format;
+        return getStringProperty(KEY_FORMAT);
     }
 
     /**
-     * Sets media format.
+     * Returns long format.
      *
-     * @param format media format
+     * @return media long format
      */
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    /**
-     * Returns path.
-     *
-     * @return media path
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Sets path.
-     *
-     * @param path media path
-     */
-    public void setPath(String path) {
-        this.path = path;
+    public String getLongFormat() {
+        return getStringProperty(KEY_FORMAT_LONG);
     }
 
     /**
@@ -118,17 +87,8 @@ public class MediaInformation {
      *
      * @return media duration in milliseconds
      */
-    public Long getDuration() {
-        return duration;
-    }
-
-    /**
-     * Sets duration.
-     *
-     * @param duration media duration in milliseconds
-     */
-    public void setDuration(Long duration) {
-        this.duration = duration;
+    public String getDuration() {
+        return getStringProperty(KEY_DURATION);
     }
 
     /**
@@ -136,17 +96,17 @@ public class MediaInformation {
      *
      * @return media start time in milliseconds
      */
-    public Long getStartTime() {
-        return startTime;
+    public String getStartTime() {
+        return getStringProperty(KEY_START_TIME);
     }
 
     /**
-     * Sets start time.
+     * Returns size.
      *
-     * @param startTime media start time in milliseconds
+     * @return media size in bytes
      */
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
+    public String getSize() {
+        return getStringProperty(KEY_SIZE);
     }
 
     /**
@@ -154,63 +114,17 @@ public class MediaInformation {
      *
      * @return media bitrate in kb/s
      */
-    public Long getBitrate() {
-        return bitrate;
+    public String getBitrate() {
+        return getStringProperty(KEY_BIT_RATE);
     }
 
     /**
-     * Sets bitrate.
+     * Returns all tags.
      *
-     * @param bitrate media bitrate in kb/s
+     * @return tags dictionary
      */
-    public void setBitrate(Long bitrate) {
-        this.bitrate = bitrate;
-    }
-
-    /**
-     * Returns unparsed media information.
-     *
-     * @return unparsed media information data
-     */
-    public String getRawInformation() {
-        return rawInformation;
-    }
-
-    /**
-     * Sets unparsed media information.
-     *
-     * @param rawInformation unparsed media information data
-     */
-    public void setRawInformation(String rawInformation) {
-        this.rawInformation = rawInformation;
-    }
-
-    /**
-     * Adds metadata.
-     *
-     * @param key metadata key
-     * @param value metadata value
-     */
-    public void addMetadata(String key, String value) {
-        this.metadata.put(key, value);
-    }
-
-    /**
-     * Returns all metadata entries.
-     *
-     * @return set of metadata entries
-     */
-    public Set<Map.Entry<String, String>> getMetadataEntries() {
-        return this.metadata.entrySet();
-    }
-
-    /**
-     * Adds new stream.
-     *
-     * @param stream new stream information
-     */
-    public void addStream(StreamInformation stream) {
-        this.streams.add(stream);
+    public JSONObject getTags() {
+        return getProperties(KEY_TAGS);
     }
 
     /**
@@ -222,4 +136,75 @@ public class MediaInformation {
         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,5 +1,5 @@
 /*
- * Copyright (c) 2018 Taner Sener
+ * Copyright (c) 2018, 2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -21,481 +21,55 @@ package com.arthenica.mobileffmpeg;
 
 import android.util.Log;
 
-import com.arthenica.mobileffmpeg.util.Pair;
-import com.arthenica.mobileffmpeg.util.Trio;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
+import java.util.ArrayList;
 
 /**
- * Helper class for {@link MediaInformation}.
+ * Helper class for parsing {@link MediaInformation}.
  *
  * @since 3.0
  */
 public class MediaInformationParser {
 
-    public static SimpleDateFormat DURATION_FORMAT;
-
-    public static Date REFERENCE_DURATION;
-
-    static {
+    /**
+     * 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 {
-            DURATION_FORMAT = new SimpleDateFormat("kk:mm:ss", Locale.getDefault());
-            REFERENCE_DURATION = DURATION_FORMAT.parse("00:00:00");
-        } catch (final ParseException e) {
-            Log.i(Config.TAG, "Preparing duration reference failed.", e);
-            DURATION_FORMAT = null;
-            REFERENCE_DURATION = null;
+            return fromWithError(ffprobeJsonOutput);
+        } catch (JSONException e) {
+            Log.e(Config.TAG, "MediaInformation parsing failed.", e);
+            e.printStackTrace();
+            return null;
         }
     }
 
     /**
-     * Parses media information command output and builds a {@link MediaInformation} instance.
+     * Extracts MediaInformation from the given ffprobe json output.
      *
-     * @param rawCommandOutput media information command output
-     * @return parsed instance of null if a parsing error occurs
+     * @param ffprobeJsonOutput ffprobe json output
+     * @return created {@link MediaInformation} instance
+     * @throws JSONException if a parsing error occurs
      */
-    public static MediaInformation from(final String rawCommandOutput) {
-        final MediaInformation mediaInformation = new MediaInformation();
+    public static MediaInformation fromWithError(final String ffprobeJsonOutput) throws JSONException {
+        JSONObject jsonObject = new JSONObject(ffprobeJsonOutput);
+        JSONArray streamArray = jsonObject.optJSONArray("streams");
 
-        if (rawCommandOutput != null) {
-            final String[] split = rawCommandOutput.split("\n");
-            boolean metadata = false;
-            StreamInformation lastCreatedStream = null;
-            final StringBuilder rawInformation = new StringBuilder();
-
-            for (final String outputLine : split) {
-                if (outputLine.startsWith("[")) {
-                    metadata = false;
-                    continue;
-                }
-
-                final String trimmedLine = outputLine.trim();
-
-                if (trimmedLine.startsWith("Input")) {
-                    metadata = false;
-                    lastCreatedStream = null;
-                    Pair<String, String> pair = parseInputBlock(trimmedLine);
-                    mediaInformation.setFormat(pair.getFirst());
-                    mediaInformation.setPath(pair.getSecond());
-                } else if (trimmedLine.startsWith("Duration")) {
-                    metadata = false;
-                    lastCreatedStream = null;
-                    Trio<Long, Long, Long> trio = parseDurationBlock(trimmedLine);
-                    mediaInformation.setDuration(trio.getFirst());
-                    mediaInformation.setStartTime(trio.getSecond());
-                    mediaInformation.setBitrate(trio.getThird());
-                } else if (trimmedLine.startsWith("Metadata")) {
-                    metadata = true;
-                } else if (trimmedLine.startsWith("Stream mapping") || trimmedLine.startsWith("Press [q] to stop") || trimmedLine.startsWith("Output")) {
-                    break;
-                } else if (trimmedLine.startsWith("Stream")) {
-                    metadata = false;
-                    lastCreatedStream = MediaInformationParser.parseStreamBlock(trimmedLine);
-                    mediaInformation.addStream(lastCreatedStream);
-                } else if (metadata) {
-                    Pair<String, String> pair = parseMetadataBlock(trimmedLine);
-
-                    if (pair.getFirst() != null && pair.getSecond() != null) {
-                        if (lastCreatedStream != null) {
-                            lastCreatedStream.addMetadata(pair.getFirst(), pair.getSecond());
-                        } else {
-                            mediaInformation.addMetadata(pair.getFirst(), pair.getSecond());
-                        }
-                    }
-                }
-
-                rawInformation.append(outputLine);
-                rawInformation.append("\n");
-            }
-
-            mediaInformation.setRawInformation(rawInformation.toString());
-        }
-
-        return mediaInformation;
-    }
-
-    static Pair<String, String> parseInputBlock(final String input) {
-        String format = substring(input, ",", ", from", Collections.<String>emptyList());
-        String path = substring(input, "\'", "\'", Collections.<String>emptyList());
-
-        return new Pair<>(format, path);
-    }
-
-    static Trio<Long, Long, Long> parseDurationBlock(final String line) {
-        Long duration = parseDuration(substring(line, "Duration:", ",", Collections.singletonList("uration:")));
-        Long start = parseStartTime(substring(line, "start:", ",", Collections.singletonList("tart:")));
-        Long bitrate = toLongObject(substring(line, "bitrate:", Arrays.asList("itrate:", "kb/s")));
-
-        return new Trio<>(duration, start, bitrate);
-    }
-
-    static Pair<String, String> parseMetadataBlock(final String metadata) {
-        String key = null;
-        String value = null;
-
-        if (metadata != null) {
-            int index = metadata.indexOf(':');
-            if (index > -1) {
-                key = metadata.substring(0, index).trim();
-                value = metadata.substring(index + 1).trim();
+        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 Pair<>(key, value);
-    }
-
-    static StreamInformation parseStreamBlock(final String input) {
-        final StreamInformation streamInformation = new StreamInformation();
-
-        if (input != null) {
-            streamInformation.setIndex(parseStreamIndex(input));
-
-            int typeBlockStartIndex = index(input, ":", 0, 2);
-            if (typeBlockStartIndex > -1 && (typeBlockStartIndex < input.length())) {
-                String[] parts = input.substring(typeBlockStartIndex + 1).split(",");
-                String typePart = safeGet(parts, 0);
-
-                final String type = parseStreamType(typePart);
-                streamInformation.setType(type);
-                streamInformation.setCodec(parseStreamCodec(typePart));
-                streamInformation.setFullCodec(parseStreamFullCodec(typePart));
-
-                String part2 = safeGet(parts, 1);
-                String part3 = safeGet(parts, 2);
-                String part4 = safeGet(parts, 3);
-                String part5 = safeGet(parts, 4);
-                if ("video".equals(type)) {
-                    int lastUsedPart = 1;
-
-                    if (part2 != null) {
-                        int pStart = count(part2, "(");
-                        int pEnd = count(part2, ")");
-
-                        while (pStart != pEnd) {
-                            lastUsedPart++;
-                            String newPart = safeGet(parts, lastUsedPart);
-                            if (newPart == null) {
-                                break;
-                            }
-                            part2 = String.format("%s,%s", part2, newPart);
-                            pStart = count(part2, "(");
-                            pEnd = count(part2, ")");
-                        }
-
-                        streamInformation.setFullFormat(part2.toLowerCase().trim());
-                        streamInformation.setFormat(part2.replaceAll("\\(.*\\)", "").toLowerCase().trim());
-                    }
-
-                    lastUsedPart++;
-                    String videoDimensionPart = safeGet(parts, lastUsedPart);
-                    if (videoDimensionPart != null) {
-                        String videoLayout = videoDimensionPart.toLowerCase().trim();
-                        Pair<Long, Long> dimensions = parseVideoDimensions(videoLayout);
-                        streamInformation.setWidth(dimensions.getFirst());
-                        streamInformation.setHeight(dimensions.getSecond());
-                        streamInformation.setSampleAspectRatio(parseVideoStreamSampleAspectRatio(videoLayout));
-                        streamInformation.setDisplayAspectRatio(parseVideoStreamDisplayAspectRatio(videoLayout));
-                    }
-
-                    for (int i = lastUsedPart + 1; i < parts.length; i++) {
-                        String part = parts[i].replaceAll("\\(.*\\)", "").toLowerCase();
-
-                        if (part.contains("kb/s")) {
-                            streamInformation.setBitrate(toLongObject(part.replaceAll("kb/s", "").trim()));
-                        } else if (part.contains("fps")) {
-                            streamInformation.setAverageFrameRate(part.replaceAll("fps", "").trim());
-                        } else if (part.contains("tbr")) {
-                            streamInformation.setRealFrameRate(part.replaceAll("tbr", "").trim());
-                        } else if (part.contains("tbn")) {
-                            streamInformation.setTimeBase(part.replaceAll("tbn", "").trim());
-                        } else if (part.contains("tbc")) {
-                            streamInformation.setCodecTimeBase(part.replaceAll("tbc", "").trim());
-                        }
-                    }
-                }
-                if ("audio".equals(type)) {
-                    if (part2 != null) {
-                        streamInformation.setSampleRate(parseAudioStreamSampleRate(part2));
-                    }
-                    if (part3 != null) {
-                        streamInformation.setChannelLayout(part3.toLowerCase().trim());
-                    }
-                    if (part4 != null) {
-                        streamInformation.setSampleFormat(part4.toLowerCase().trim());
-                    }
-                    if (part5 != null) {
-                        streamInformation.setBitrate(toLongObject(part5.toLowerCase().replaceAll("\\(.*\\)", "").replaceAll("kb/s", "").trim()));
-                    }
-                }
-            }
-        }
-
-        return streamInformation;
-    }
-
-    static Pair<Long, Long> parseVideoDimensions(final String input) {
-        Long width = null;
-        Long height = null;
-
-        if (input != null) {
-            final String[] dimensions = input.toLowerCase().replaceAll("\\[.*\\]", "").trim().split("x");
-            width = toLongObject(safeGet(dimensions, 0));
-            height = toLongObject(safeGet(dimensions, 1));
-        }
-
-        return new Pair<>(width, height);
-    }
-
-    static String parseVideoStreamSampleAspectRatio(final String input) {
-        if (input != null) {
-            String[] parts = input.replaceAll("\\[", "").replaceAll("\\]", "").split(" ");
-            for (int i = 0; i < parts.length; i++) {
-                if (parts[i].toLowerCase().equals("sar")) {
-                    return safeGet(parts, i + 1);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    static String parseVideoStreamDisplayAspectRatio(final String input) {
-        if (input != null) {
-            String[] parts = input.replaceAll("\\[", "").replaceAll("\\]", "").split(" ");
-            for (int i = 0; i < parts.length; i++) {
-                if (parts[i].toLowerCase().equals("dar")) {
-                    return safeGet(parts, i + 1);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    static Long parseAudioStreamSampleRate(final String input) {
-        if (input != null) {
-            boolean khz = false;
-            boolean mhz = false;
-
-            String lowerCase = input.toLowerCase();
-            if (lowerCase.contains("khz")) {
-                khz = true;
-            }
-            if (lowerCase.contains("mhz")) {
-                mhz = true;
-            }
-
-            String sampleRate = lowerCase
-                    .replaceAll("khz", "")
-                    .replaceAll("mhz", "")
-                    .replaceAll("hz", "")
-                    .trim();
-
-            if (khz) {
-                return 1000 * toLong(sampleRate);
-            } else if (mhz) {
-                return 1000000 * toLong(sampleRate);
-            } else {
-                return toLong(sampleRate);
-            }
-        }
-
-        return null;
-    }
-
-    static String parseStreamType(final String input) {
-        if (input != null) {
-            if (input.toLowerCase().contains("audio:")) {
-                return "audio";
-            } else if (input.toLowerCase().contains("video:")) {
-                return "video";
-            }
-        }
-
-        return null;
-    }
-
-    static String parseStreamCodec(final String input) {
-        if (input != null) {
-            return input.toLowerCase()
-                    .replaceAll("\\(.*\\)", "")
-                    .replaceAll("video:", "")
-                    .replaceAll("audio:", "")
-                    .trim();
-        }
-
-        return null;
-    }
-
-    static String parseStreamFullCodec(final String input) {
-        if (input != null) {
-            return input.toLowerCase()
-                    .replaceAll("video:", "")
-                    .replaceAll("audio:", "")
-                    .trim();
-        }
-
-        return null;
-    }
-
-    static Long parseStreamIndex(final String input) {
-        String substring = substring(input, "Stream #0:", ":", Collections.singletonList("tream #0"));
-        if (substring != null) {
-
-            // DISCARD PARANTHESIS
-            return toLongObject(substring
-                    .replace(":", "")
-                    .replaceAll("\\(.*\\)", ""));
-        }
-
-        return null;
-    }
-
-    static Long parseDuration(final String duration) {
-        if (duration == null || duration.equals("N/A")) {
-            return null;
-        }
-
-        try {
-            final Date calculated = DURATION_FORMAT.parse(duration);
-
-            long secondsPartInMilliseconds = calculated.getTime() - REFERENCE_DURATION.getTime();
-
-            int index = duration.indexOf('.');
-            if (index > -1) {
-                Long centiSeconds = toLong(duration.substring(index + 1));
-                secondsPartInMilliseconds += 10 * centiSeconds;
-            }
-
-            return secondsPartInMilliseconds;
-
-        } catch (final ParseException e) {
-            Log.d(Config.TAG, String.format("Parsing duration: %s failed.", duration), e);
-            return null;
-        }
-    }
-
-    static Long parseStartTime(final String startTime) {
-        if (startTime == null || startTime.equals("N/A")) {
-            return null;
-        }
-
-        try {
-            BigDecimal bigDecimal = new BigDecimal(startTime);
-            bigDecimal = bigDecimal.setScale(3, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(1000));
-            return bigDecimal.longValue();
-        } catch (NumberFormatException e) {
-            Log.d(Config.TAG, String.format("Parsing startTime: %s failed.", startTime), e);
-            return null;
-        }
-    }
-
-    public static String substring(final String string, final String start, final String end, final List<String> ignoredTokens) {
-        String extractedSubstring = null;
-
-        if (string != null) {
-            int formatStart = string.indexOf(start);
-            if (formatStart > -1) {
-
-                int formatEnd = string.indexOf(end, formatStart + start.length());
-                if (formatEnd > -1) {
-                    extractedSubstring = string.substring(formatStart + start.length(), formatEnd);
-                }
-            }
-        }
-
-        if ((ignoredTokens != null) && (extractedSubstring != null)) {
-            for (String token : ignoredTokens) {
-                extractedSubstring = extractedSubstring.replaceAll(token, "");
-            }
-        }
-
-        return (extractedSubstring == null) ? null : extractedSubstring.trim();
-    }
-
-    public static String substring(final String string, final String start, final List<String> ignoredTokens) {
-        String extractedSubstring = null;
-
-        if (string != null) {
-            int formatStart = string.indexOf(start);
-            if (formatStart > -1) {
-                extractedSubstring = string.substring(formatStart + 1);
-            }
-        }
-
-        if ((ignoredTokens != null) && (extractedSubstring != null)) {
-            for (String token : ignoredTokens) {
-                extractedSubstring = extractedSubstring.replaceAll(token, "");
-            }
-        }
-
-        return (extractedSubstring == null) ? null : extractedSubstring.trim();
-    }
-
-    public static int index(final String string, String substring, int startIndex, int n) {
-        int count = 1;
-
-        while (count <= n) {
-            startIndex = string.indexOf(substring, startIndex + substring.length());
-            count++;
-        }
-
-        return startIndex;
-    }
-
-    public static int count(final String string, String substring) {
-        int count = 0;
-        int index = 0;
-
-        do {
-            index = string.indexOf(substring, index);
-            if (index >= 0) {
-                count++;
-                index = index + substring.length();
-            }
-        } while (index >= 0);
-
-        return count;
-    }
-
-    private static <K> K safeGet(final K[] array, final int index) {
-        if (array == null) {
-            return null;
-        }
-
-        try {
-            final int size = array.length;
-            if (size > index) {
-                return array[index];
-            } else {
-                return null;
-            }
-        } catch (final ArrayIndexOutOfBoundsException e) {
-            return null;
-        }
-    }
-
-    private static long toLong(final String value) {
-        try {
-            return Long.parseLong(value);
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    static Long toLongObject(final String value) {
-        try {
-            return Long.parseLong(value);
-        } catch (NumberFormatException e) {
-            return null;
-        }
+        return new MediaInformation(jsonObject, arrayList);
     }
 
 }

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

@@ -52,11 +52,15 @@ class Packages {
         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");
@@ -70,7 +74,7 @@ class Packages {
      * @return enabled external libraries
      */
     static List<String> getExternalLibraries() {
-        final String buildConfiguration = Config.getNativeBuildConf();
+        final String buildConfiguration = AbiDetect.getNativeBuildConf();
 
         final List<String> enabledLibraryList = new ArrayList<>();
         for (String supportedExternalLibrary : supportedExternalLibraries) {
@@ -97,7 +101,6 @@ class Packages {
         final boolean gnutls = externalLibraryList.contains("gnutls");
         final boolean xvid = externalLibraryList.contains("xvid");
 
-        boolean min = false;
         boolean minGpl = false;
         boolean https = false;
         boolean httpsGpl = false;
@@ -125,8 +128,6 @@ class Packages {
         } else {
             if (gnutls) {
                 https = true;
-            } else {
-                min = true;
             }
         }
 
@@ -264,7 +265,11 @@ class Packages {
             }
         }
 
-        return "min";
+        if (externalLibraryList.size() == 0) {
+            return "min";
+        } else {
+            return "custom";
+        }
     }
 
 }

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

@@ -0,0 +1,46 @@
+/*
+ * 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,13 +20,14 @@
 package com.arthenica.mobileffmpeg;
 
 /**
- * <p>Represents statistics data.
+ * <p>Statistics for running executions.
  *
  * @author Taner Sener
  * @since v2.1
  */
 public class Statistics {
 
+    private long executionId;
     private int videoFrameNumber;
     private float videoFps;
     private float videoQuality;
@@ -36,6 +37,7 @@ public class Statistics {
     private double speed;
 
     public Statistics() {
+        executionId = 0;
         videoFrameNumber = 0;
         videoFps = 0;
         videoQuality = 0;
@@ -45,7 +47,8 @@ public class Statistics {
         speed = 0;
     }
 
-    public Statistics(int videoFrameNumber, float videoFps, float videoQuality, long size, int time, double bitrate, double speed) {
+    public Statistics(long executionId, int videoFrameNumber, float videoFps, float videoQuality, long size, int time, double bitrate, double speed) {
+        this.executionId = executionId;
         this.videoFrameNumber = videoFrameNumber;
         this.videoFps = videoFps;
         this.videoQuality = videoQuality;
@@ -57,35 +60,44 @@ 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;
     }
@@ -142,4 +154,30 @@ 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 of running operation.
+ * <p>Represents a callback function to receive statistics from running executions.
  *
  * @author Taner Sener
  * @since v2.1

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Taner Sener
+ * Copyright (c) 2018, 2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -19,9 +19,7 @@
 
 package com.arthenica.mobileffmpeg;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import org.json.JSONObject;
 
 /**
  * Stream information class.
@@ -30,62 +28,32 @@ import java.util.Set;
  */
 public class StreamInformation {
 
-    /**
-     * Stream index
-     */
-    private Long index;
-
-    private String type;
-    private String codec;
-    private String fullCodec;
-    private String format;
-    private String fullFormat;
-
-    private Long width;
-    private Long height;
-
-    private Long bitrate;
-    private Long sampleRate;
-    private String sampleFormat;
-    private String channelLayout;
+    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";
 
     /**
-     * SAR
+     * Stores all properties.
      */
-    private String sampleAspectRatio;
+    private final JSONObject jsonObject;
 
-    /**
-     * DAR
-     */
-    private String displayAspectRatio;
-
-    /**
-     * fps
-     */
-    private String averageFrameRate;
-
-    /**
-     * tbr
-     */
-    private String realFrameRate;
-
-    /**
-     * tbn
-     */
-    private String timeBase;
-
-    /**
-     * tbc
-     */
-    private String codecTimeBase;
-
-    /**
-     * Metadata map
-     */
-    private final Map<String, String> metadata;
-
-    public StreamInformation() {
-        this.metadata = new HashMap<>();
+    public StreamInformation(final JSONObject jsonObject) {
+        this.jsonObject = jsonObject;
     }
 
     /**
@@ -94,16 +62,7 @@ public class StreamInformation {
      * @return stream index, starting from zero
      */
     public Long getIndex() {
-        return index;
-    }
-
-    /**
-     * Sets stream index.
-     *
-     * @param index stream index, starting from zero
-     */
-    public void setIndex(Long index) {
-        this.index = index;
+        return getNumberProperty(KEY_INDEX);
     }
 
     /**
@@ -112,16 +71,7 @@ public class StreamInformation {
      * @return stream type; audio or video
      */
     public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets stream type.
-     *
-     * @param type stream type; audio or video
-     */
-    public void setType(String type) {
-        this.type = type;
+        return getStringProperty(KEY_TYPE);
     }
 
     /**
@@ -130,16 +80,7 @@ public class StreamInformation {
      * @return stream codec
      */
     public String getCodec() {
-        return codec;
-    }
-
-    /**
-     * Sets stream codec.
-     *
-     * @param codec stream codec
-     */
-    public void setCodec(String codec) {
-        this.codec = codec;
+        return getStringProperty(KEY_CODEC);
     }
 
     /**
@@ -148,16 +89,7 @@ public class StreamInformation {
      * @return stream codec with additional profile and mode information
      */
     public String getFullCodec() {
-        return fullCodec;
-    }
-
-    /**
-     * Sets full stream codec.
-     *
-     * @param fullCodec stream codec with additional profile and mode information
-     */
-    public void setFullCodec(String fullCodec) {
-        this.fullCodec = fullCodec;
+        return getStringProperty(KEY_CODEC_LONG);
     }
 
     /**
@@ -166,34 +98,7 @@ public class StreamInformation {
      * @return stream format
      */
     public String getFormat() {
-        return format;
-    }
-
-    /**
-     * Sets stream format.
-     *
-     * @param format stream format
-     */
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    /**
-     * Returns full stream format.
-     *
-     * @return stream format with
-     */
-    public String getFullFormat() {
-        return fullFormat;
-    }
-
-    /**
-     * Sets full stream format.
-     *
-     * @param fullFormat stream format with
-     */
-    public void setFullFormat(String fullFormat) {
-        this.fullFormat = fullFormat;
+        return getStringProperty(KEY_FORMAT);
     }
 
     /**
@@ -202,16 +107,7 @@ public class StreamInformation {
      * @return width in pixels
      */
     public Long getWidth() {
-        return width;
-    }
-
-    /**
-     * Sets width.
-     *
-     * @param width width in pixels
-     */
-    public void setWidth(Long width) {
-        this.width = width;
+        return getNumberProperty(KEY_WIDTH);
     }
 
     /**
@@ -220,16 +116,7 @@ public class StreamInformation {
      * @return height in pixels
      */
     public Long getHeight() {
-        return height;
-    }
-
-    /**
-     * Sets height.
-     *
-     * @param height height in pixels
-     */
-    public void setHeight(Long height) {
-        this.height = height;
+        return getNumberProperty(KEY_HEIGHT);
     }
 
     /**
@@ -237,17 +124,8 @@ public class StreamInformation {
      *
      * @return bitrate in kb/s
      */
-    public Long getBitrate() {
-        return bitrate;
-    }
-
-    /**
-     * Sets bitrate.
-     *
-     * @param bitrate bitrate in kb/s
-     */
-    public void setBitrate(Long bitrate) {
-        this.bitrate = bitrate;
+    public String getBitrate() {
+        return getStringProperty(KEY_BIT_RATE);
     }
 
     /**
@@ -255,17 +133,8 @@ public class StreamInformation {
      *
      * @return sample rate in hz
      */
-    public Long getSampleRate() {
-        return sampleRate;
-    }
-
-    /**
-     * Sets sample rate.
-     *
-     * @param sampleRate sample rate in hz
-     */
-    public void setSampleRate(Long sampleRate) {
-        this.sampleRate = sampleRate;
+    public String getSampleRate() {
+        return getStringProperty(KEY_SAMPLE_RATE);
     }
 
     /**
@@ -274,16 +143,7 @@ public class StreamInformation {
      * @return sample format
      */
     public String getSampleFormat() {
-        return sampleFormat;
-    }
-
-    /**
-     * Sets sample format.
-     *
-     * @param sampleFormat sample format
-     */
-    public void setSampleFormat(String sampleFormat) {
-        this.sampleFormat = sampleFormat;
+        return getStringProperty(KEY_SAMPLE_FORMAT);
     }
 
     /**
@@ -292,16 +152,7 @@ public class StreamInformation {
      * @return channel layout
      */
     public String getChannelLayout() {
-        return channelLayout;
-    }
-
-    /**
-     * Sets channel layout.
-     *
-     * @param channelLayout channel layout
-     */
-    public void setChannelLayout(String channelLayout) {
-        this.channelLayout = channelLayout;
+        return getStringProperty(KEY_CHANNEL_LAYOUT);
     }
 
     /**
@@ -310,16 +161,7 @@ public class StreamInformation {
      * @return sample aspect ratio
      */
     public String getSampleAspectRatio() {
-        return sampleAspectRatio;
-    }
-
-    /**
-     * Sets sample aspect ratio.
-     *
-     * @param sampleAspectRatio sample aspect ratio
-     */
-    public void setSampleAspectRatio(String sampleAspectRatio) {
-        this.sampleAspectRatio = sampleAspectRatio;
+        return getStringProperty(KEY_SAMPLE_ASPECT_RATIO);
     }
 
     /**
@@ -328,16 +170,7 @@ public class StreamInformation {
      * @return display aspect ratio
      */
     public String getDisplayAspectRatio() {
-        return displayAspectRatio;
-    }
-
-    /**
-     * Sets display aspect ratio.
-     *
-     * @param displayAspectRatio display aspect ratio
-     */
-    public void setDisplayAspectRatio(String displayAspectRatio) {
-        this.displayAspectRatio = displayAspectRatio;
+        return getStringProperty(KEY_DISPLAY_ASPECT_RATIO);
     }
 
     /**
@@ -346,16 +179,7 @@ public class StreamInformation {
      * @return average frame rate in fps
      */
     public String getAverageFrameRate() {
-        return averageFrameRate;
-    }
-
-    /**
-     * Sets average frame rate.
-     *
-     * @param averageFrameRate average frame rate in fps
-     */
-    public void setAverageFrameRate(String averageFrameRate) {
-        this.averageFrameRate = averageFrameRate;
+        return getStringProperty(KEY_AVERAGE_FRAME_RATE);
     }
 
     /**
@@ -364,16 +188,7 @@ public class StreamInformation {
      * @return real frame rate in tbr
      */
     public String getRealFrameRate() {
-        return realFrameRate;
-    }
-
-    /**
-     * Sets real frame rate.
-     *
-     * @param realFrameRate real frame rate in tbr
-     */
-    public void setRealFrameRate(String realFrameRate) {
-        this.realFrameRate = realFrameRate;
+        return getStringProperty(KEY_REAL_FRAME_RATE);
     }
 
     /**
@@ -382,16 +197,7 @@ public class StreamInformation {
      * @return time base in tbn
      */
     public String getTimeBase() {
-        return timeBase;
-    }
-
-    /**
-     * Sets time base.
-     *
-     * @param timeBase time base in tbn
-     */
-    public void setTimeBase(String timeBase) {
-        this.timeBase = timeBase;
+        return getStringProperty(KEY_TIME_BASE);
     }
 
     /**
@@ -400,35 +206,78 @@ public class StreamInformation {
      * @return codec time base in tbc
      */
     public String getCodecTimeBase() {
-        return codecTimeBase;
+        return getStringProperty(KEY_CODEC_TIME_BASE);
     }
 
     /**
-     * Sets codec time base.
+     * Returns all tags.
      *
-     * @param codecTimeBase codec time base in tbc
+     * @return tags dictionary
      */
-    public void setCodecTimeBase(String codecTimeBase) {
-        this.codecTimeBase = codecTimeBase;
+    public JSONObject getTags() {
+        return getProperties(KEY_TAGS);
     }
 
     /**
-     * Adds metadata.
+     * Returns the stream property associated with the key.
      *
-     * @param key metadata key
-     * @param value metadata value
+     * @param key property key
+     * @return stream property as string or null if the key is not found
      */
-    public void addMetadata(String key, String value) {
-        this.metadata.put(key, value);
+    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 all metadata entries.
+     * Returns the stream property associated with the key.
      *
-     * @return set of metadata entries
+     * @param key property key
+     * @return stream property as Long or null if the key is not found
      */
-    public Set<Map.Entry<String, String>> getMetadataEntries() {
-        return this.metadata.entrySet();
+    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/RunCallback.java

@@ -1,33 +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;
-
-/**
- * <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/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>

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

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

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

@@ -1,11 +0,0 @@
-<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,5 +1,5 @@
 /*
- * Copyright (c) 2018 Taner Sener
+ * Copyright (c) 2018, 2020 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -19,8 +19,7 @@
 
 package com.arthenica.mobileffmpeg;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -138,7 +137,7 @@ public class ConfigTest {
         Collections.sort(enabledList);
 
         Assert.assertNotNull(enabledList);
-        Assert.assertTrue(enabledList.size() == 1);
+        Assert.assertEquals(1, enabledList.size());
     }
 
     @Test

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

@@ -1,300 +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 com.arthenica.mobileffmpeg.util.Pair;
-import com.arthenica.mobileffmpeg.util.Trio;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-public class MediaInformationTest {
-
-    @Test
-    public void parseVideoStream() {
-        parseVideoStreamBlock("     Stream #0:0: Video: mjpeg, yuvj420p(pc, bt470bg/unknown/unknown), 2560x1708 [SAR 1:1 DAR 640:427], 25 tbr, 25 tbn, 25 tbc", 0L, "mjpeg", "mjpeg", "yuvj420p", "yuvj420p(pc, bt470bg/unknown/unknown)", 2560L, 1708L, "1:1", "640:427", null, null, "25", "25", "25");
-        parseVideoStreamBlock("     Stream #0:0: Video: gif, bgra, 420x236, 6 fps, 6 tbr, 100 tbn, 100 tbc", 0L, "gif",
-                "gif", "bgra", "bgra", 420L, 236L, null, null, null, "6", "6", "100", "100");
-        parseVideoStreamBlock("     Stream #0:0(und): Video: h264 (Main) (avc1 / 0x31637661), yuv420p, 1280x720 [SAR 1:1 DAR 16:9], 7762 kb/s, 25 fps, 30 tbr, 15360 tbn, 60 tbc (default)", 0L, "h264", "h264 (main) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1280L, 720L, "1:1", "16:9", 7762L, "25", "30", "15360", "60");
-        parseVideoStreamBlock("     Stream #0:0: Video: png, rgba(pc), 544x184, 25 tbr, 25 tbn, 25 tbc", 0L, "png", "png", "rgba", "rgba(pc)", 544L, 184L, null, null, null, null, "25", "25", "25");
-        parseVideoStreamBlock("     Stream #0:0: Video: h264 (Main), yuv420p(tv, bt709, progressive), 1920x1080, 25 fps, 25 tbr, 1200k tbn, 50 tbc", 0L, "h264", "h264 (main)", "yuv420p", "yuv420p(tv, bt709, progressive)", 1920L, 1080L, null, null, null, "25", "25", "1200k", "50");
-        parseVideoStreamBlock("     Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 3840x4320 [SAR 1:1 DAR 8:9], 9902 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)", 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 3840L, 4320L, "1:1", "8:9", 9902L, "30", "30", "30k", "60");
-        parseVideoStreamBlock("     Stream #0:0(und): Video: h264 (High) (avc1 / 0x31637661), yuv420p, 1920x1080 [SAR 1:1 DAR 16:9], 3992 kb/s, 30 fps, 30 tbr, 30k tbn, 60 tbc (default)", 0L, "h264", "h264 (high) (avc1 / 0x31637661)", "yuv420p", "yuv420p", 1920L, 1080L, "1:1", "16:9", 3992L, "30", "30", "30k", "60");
-        parseVideoStreamBlock("     Stream #0:0: Video: theora, yuv420p(bt470bg/bt470bg/bt709), 720x400, 25 fps, 25 tbr, 25 tbn, 25 tbc", 0L, "theora", "theora", "yuv420p", "yuv420p(bt470bg/bt470bg/bt709)", 720L, 400L, null, null, null, "25", "25", "25", "25");
-    }
-
-    @Test
-    public void parseAudioStream() {
-        parseAudioStreamBlock("Stream #0:0: Audio: adpcm_ms ([2][0][0][0] / 0x0002), 22050 Hz, stereo, s16, 176 kb/s", 0L, "adpcm_ms", "adpcm_ms ([2][0][0][0] / 0x0002)", 22050L, "stereo", "s16", 176L);
-        parseAudioStreamBlock("Stream #0:0: Audio: pcm_s16le ([1][0][0][0] / 0x0001), 44100 Hz, mono, s16, 705 kb/s", 0L, "pcm_s16le", "pcm_s16le ([1][0][0][0] / 0x0001)", 44100L, "mono", "s16", 705L);
-        parseAudioStreamBlock("Stream #0:0: Audio: pcm_s24le ([1][0][0][0] / 0x0001), 48000 Hz, mono, s32 (24 bit), 1152 kb/s", 0L, "pcm_s24le", "pcm_s24le ([1][0][0][0] / 0x0001)", 48000L, "mono", "s32 (24 bit)", 1152L);
-        parseAudioStreamBlock("Stream #0:0: Audio: mp3, 48000 Hz, stereo, fltp, 192 kb/s", 0L, "mp3", "mp3", 48000L, "stereo", "fltp", 192L);
-        parseAudioStreamBlock("Stream #0:0: Audio: vorbis, 44100 Hz, stereo, fltp, 128 kb/s", 0L, "vorbis", "vorbis", 44100L, "stereo", "fltp", 128L);
-        parseAudioStreamBlock("Stream #0:0: Audio: pcm_u8 ([1][0][0][0] / 0x0001), 44100 Hz, stereo, u8, 705 kb/s", 0L, "pcm_u8", "pcm_u8 ([1][0][0][0] / 0x0001)", 44100L, "stereo", "u8", 705L);
-        parseAudioStreamBlock("Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)", 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
-        parseAudioStreamBlock("Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)", 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
-        parseAudioStreamBlock("Stream #0:1(und): Audio: mp3 (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 160 kb/s (default)", 1L, "mp3", "mp3 (mp4a / 0x6134706d)", 48000L, "stereo", "fltp", 160L);
-        parseAudioStreamBlock("Stream #0:2(und): Audio: ac3 (ac-3 / 0x332D6361), 48000 Hz, 5.1(side), fltp, 320 kb/s (default)", 2L, "ac3", "ac3 (ac-3 / 0x332d6361)", 48000L, "5.1(side)", "fltp", 320L);
-    }
-
-    @Test
-    public void index() {
-        Assert.assertEquals(7, MediaInformationParser.index("one:two:three:", ":", 0, 2));
-        Assert.assertEquals(13, MediaInformationParser.index("one:two:three:", ":", 0, 3));
-        Assert.assertEquals(8, MediaInformationParser.index("one::two::three::", "::", 0, 2));
-    }
-
-    @Test
-    public void count() {
-        Assert.assertEquals(3, MediaInformationParser.count("one:two:three:", ":"));
-        Assert.assertEquals(2, MediaInformationParser.count("one,two:three,four", ","));
-    }
-
-    @Test
-    public void parseAverageFrameRate() {
-        Assert.assertEquals("24", "24 fps".replaceAll("fps", "").trim());
-        Assert.assertEquals("30", "30 fps".replaceAll("fps", "").trim());
-    }
-
-    @Test
-    public void parseBitrate() {
-        Assert.assertEquals((Long) 3992L, MediaInformationParser.toLongObject("3992 kb/s".replaceAll("kb/s", "").trim()));
-        Assert.assertEquals((Long) 7762L, MediaInformationParser.toLongObject("7762 kb/s".replaceAll("kb/s", "").trim()));
-    }
-
-    @Test
-    public void parseVideoStreamDisplayAspectRatio() {
-        Assert.assertEquals(null, MediaInformationParser.parseVideoStreamDisplayAspectRatio(""));
-        Assert.assertEquals(null, MediaInformationParser.parseVideoStreamDisplayAspectRatio("544x184"));
-        Assert.assertEquals("640:427", MediaInformationParser.parseVideoStreamDisplayAspectRatio("2560x1708 [SAR 1:1 DAR 640:427]"));
-        Assert.assertEquals("8:9", MediaInformationParser.parseVideoStreamDisplayAspectRatio("3840x4320 [SAR 1:1 DAR 8:9]"));
-    }
-
-    @Test
-    public void parseVideoStreamSampleAspectRatio() {
-        Assert.assertEquals(null, MediaInformationParser.parseVideoStreamSampleAspectRatio(""));
-        Assert.assertEquals(null, MediaInformationParser.parseVideoStreamSampleAspectRatio("544x184"));
-        Assert.assertEquals("1:1", MediaInformationParser.parseVideoStreamSampleAspectRatio("2560x1708 [SAR 1:1 DAR 640:427]"));
-        Assert.assertEquals("1:1", MediaInformationParser.parseVideoStreamSampleAspectRatio("3840x4320 [SAR 1:1 DAR 8:9]"));
-    }
-
-    @Test
-    public void parseVideoDimensions() {
-        parseVideoDimensions("", null, null);
-        parseVideoDimensions("544x184", 544L, 184L);
-        parseVideoDimensions("720x400", 720L, 400L);
-        parseVideoDimensions("2560x1708 [SAR 1:1 DAR 640:427]", 2560L, 1708L);
-        parseVideoDimensions("3840x4320 [SAR 1:1 DAR 8:9]", 3840L, 4320L);
-    }
-
-    @Test
-    public void parseAudioSampleRate() {
-        Assert.assertEquals((Long) 44000L, MediaInformationParser.parseAudioStreamSampleRate("44000"));
-        Assert.assertEquals((Long) 44000L, MediaInformationParser.parseAudioStreamSampleRate("44 khz"));
-        Assert.assertEquals((Long) 44100L, MediaInformationParser.parseAudioStreamSampleRate("44100"));
-        Assert.assertEquals((Long) 5000000L, MediaInformationParser.parseAudioStreamSampleRate("5 mhz"));
-    }
-
-    @Test
-    public void parseAudioStreamType() {
-        Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: theora"));
-        Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: png"));
-        Assert.assertEquals("video", MediaInformationParser.parseStreamType("Video: h264 (Main)"));
-        Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
-        Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: mp3 (mp4a / 0x6134706D)"));
-        Assert.assertEquals("audio", MediaInformationParser.parseStreamType("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
-    }
-
-    @Test
-    public void parseStreamCodec() {
-        Assert.assertEquals("theora", MediaInformationParser.parseStreamCodec("Video: theora"));
-        Assert.assertEquals("png", MediaInformationParser.parseStreamCodec("Video: png"));
-        Assert.assertEquals("h264", MediaInformationParser.parseStreamCodec("Video: h264 (Main)"));
-        Assert.assertEquals("adpcm_ms", MediaInformationParser.parseStreamCodec("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
-        Assert.assertEquals("mp3", MediaInformationParser.parseStreamCodec("Audio: mp3 (mp4a / 0x6134706D)"));
-        Assert.assertEquals("pcm_u8", MediaInformationParser.parseStreamCodec("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
-    }
-
-    @Test
-    public void parseStreamFullCodec() {
-        Assert.assertEquals("theora", MediaInformationParser.parseStreamFullCodec("Video: theora"));
-        Assert.assertEquals("png", MediaInformationParser.parseStreamFullCodec("Video: png"));
-        Assert.assertEquals("h264 (main)", MediaInformationParser.parseStreamFullCodec("Video: h264 (Main)"));
-        Assert.assertEquals("adpcm_ms ([2][0][0][0] / 0x0002)", MediaInformationParser.parseStreamFullCodec("Audio: adpcm_ms ([2][0][0][0] / 0x0002)"));
-        Assert.assertEquals("mp3 (mp4a / 0x6134706d)", MediaInformationParser.parseStreamFullCodec("Audio: mp3 (mp4a / 0x6134706D)"));
-        Assert.assertEquals("pcm_u8 ([1][0][0][0] / 0x0001)", MediaInformationParser.parseStreamFullCodec("Audio: pcm_u8 ([1][0][0][0] / 0x0001)"));
-    }
-
-    @Test
-    public void parseStreamIndex() {
-        Assert.assertEquals((Long) 0L, MediaInformationParser.parseStreamIndex("Stream #0:0(und): Audio"));
-        Assert.assertEquals((Long) 1L, MediaInformationParser.parseStreamIndex("Stream #0:1(und): Video"));
-        Assert.assertEquals((Long) 2L, MediaInformationParser.parseStreamIndex("Stream #0:2(und): Audio"));
-        Assert.assertEquals((Long) 0L, MediaInformationParser.parseStreamIndex("Stream #0:0: Video"));
-        Assert.assertEquals((Long) 1L, MediaInformationParser.parseStreamIndex("Stream #0:1: Audio"));
-        Assert.assertEquals((Long) 2L, MediaInformationParser.parseStreamIndex("Stream #0:2: Video"));
-    }
-
-    @Test
-    public void parseDuration() {
-        parseDuration(null, null);
-        parseDuration("", null);
-        parseDuration("N/A", null);
-        parseDuration("00:03:33.24", 213240L);
-        parseDuration("00:10:34.53", 634530L);
-        parseDuration("00:00:00.04", 40L);
-        parseDuration("00:00:15.00", 15000L);
-    }
-
-    @Test
-    public void parseStartTime() {
-        parseStartTime(null, null);
-        parseStartTime("", null);
-        parseStartTime("N/A", null);
-        parseStartTime("0.000000", 0L);
-        parseStartTime("10.003000", 10003L);
-        parseStartTime("324.000000", 324000L);
-        parseStartTime("-4.000000", -4000L);
-        parseStartTime("14.00030", 14001L);
-        parseStartTime("14.00080", 14001L);
-    }
-
-    @Test
-    public void parseDurationBlock() {
-        parseDurationBlock("  Duration: 00:03:33.24, start: 0.000000, bitrate: 320 kb/s", 213240L, 0L, 320L);
-        parseDurationBlock("  Duration: 00:00:00.04, start: 0.000000, bitrate: 391187 kb/s", 40L, 0L, 391187L);
-        parseDurationBlock("  Duration: N/A, bitrate: N/A", null, null, null);
-        parseDurationBlock("  Duration: 00:00:15.00, start: 0.000000, bitrate: 7764 kb/s", 15000L, 0L, 7764L);
-        parseDurationBlock("  Duration: 00:10:34.53, start: 0.000000, bitrate: 4474 kb/s", 634530L, 0L, 4474L);
-    }
-
-    @Test
-    public void parseInputBlock() {
-        parseInputBlock("Input #0,", null, null);
-        parseInputBlock("Input #0, ogg, from 'trailer_400p.ogg':", "ogg", "trailer_400p.ogg");
-        parseInputBlock("Input #0, mp3, from 'beethoven_-_symphony_no_9.mp3':", "mp3", "beethoven_-_symphony_no_9.mp3");
-        parseInputBlock("Input #0, image2, from '/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg':", "image2", "/data/user/0/com.arthenica.mobileffmpeg.test/cache/colosseum.jpg");
-        parseInputBlock("Input #0, gif, from 'advanced_zoom_in_and_pan_with_fade_in_out.gif':", "gif", "advanced_zoom_in_and_pan_with_fade_in_out.gif");
-        parseInputBlock("Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'transition_rotate.mp4':", "mov,mp4,m4a,3gp,3g2,mj2", "transition_rotate.mp4");
-        parseInputBlock("Input #0, png_pipe, from 'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png':", "png_pipe", "https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png");
-    }
-
-    @Test
-    public void parseMetadataBlock() {
-        parseMetadataBlock("      ENCODER:", "ENCODER", "");
-        parseMetadataBlock("      ENCODER:ffmpeg2theora 0.19", "ENCODER", "ffmpeg2theora 0.19");
-        parseMetadataBlock("      ENCODER         : ffmpeg2theora 0.19", "ENCODER", "ffmpeg2theora 0.19");
-        parseMetadataBlock("      creation_time   : 2013-12-16T17:50:04.000000Z", "creation_time", "2013-12-16T17:50:04.000000Z");
-        parseMetadataBlock("      handler_name    : GPAC ISO Audio Handler", "handler_name", "GPAC ISO Audio Handler");
-        parseMetadataBlock("    comment         : Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net", "comment", "Creative Commons Attribution 3.0 - http://bbb3d.renderfarming.net");
-        parseMetadataBlock("    minor_version   : 1", "minor_version", "1");
-        parseMetadataBlock("    encoder         : Lavf58.12.100", "encoder", "Lavf58.12.100");
-        parseMetadataBlock("    title           : Planet X", "title", "Planet X");
-        parseMetadataBlock("    compatible_brands: isomiso2avc1mp41", "compatible_brands", "isomiso2avc1mp41");
-    }
-
-    private void parseVideoStreamBlock(String input, Long index, String codec, String fullCodec, String format, String fullFormat, Long width, Long height, String sampleAspectRatio, String displayAspectRatio, Long bitrate, String averageFrameRate, String realFrameRate, String timeBase, String codecTimeBase) {
-        StreamInformation stream = MediaInformationParser.parseStreamBlock(input);
-
-        Assert.assertNotNull(stream);
-        Assert.assertEquals(index, stream.getIndex());
-        Assert.assertEquals("video", stream.getType());
-        Assert.assertEquals(codec, stream.getCodec());
-        Assert.assertEquals(fullCodec, stream.getFullCodec());
-
-        Assert.assertEquals(format, stream.getFormat());
-        Assert.assertEquals(fullFormat, stream.getFullFormat());
-
-        Assert.assertEquals(width, stream.getWidth());
-        Assert.assertEquals(height, stream.getHeight());
-        Assert.assertEquals(sampleAspectRatio, stream.getSampleAspectRatio());
-        Assert.assertEquals(displayAspectRatio, stream.getDisplayAspectRatio());
-
-        Assert.assertEquals(bitrate, stream.getBitrate());
-
-        Assert.assertEquals(averageFrameRate, stream.getAverageFrameRate());
-        Assert.assertEquals(realFrameRate, stream.getRealFrameRate());
-        Assert.assertEquals(timeBase, stream.getTimeBase());
-        Assert.assertEquals(codecTimeBase, stream.getCodecTimeBase());
-    }
-
-    private void parseAudioStreamBlock(String input, Long index, String codec, String fullCodec, Long sampleRate, String channelLayout, String sampleFormat, Long bitrate) {
-        StreamInformation stream = MediaInformationParser.parseStreamBlock(input);
-
-        Assert.assertNotNull(stream);
-        Assert.assertEquals(index, stream.getIndex());
-        Assert.assertEquals("audio", stream.getType());
-        Assert.assertEquals(codec, stream.getCodec());
-        Assert.assertEquals(fullCodec, stream.getFullCodec());
-        Assert.assertEquals(sampleRate, stream.getSampleRate());
-        Assert.assertEquals(channelLayout, stream.getChannelLayout());
-        Assert.assertEquals(sampleFormat, stream.getSampleFormat());
-        Assert.assertEquals(bitrate, stream.getBitrate());
-    }
-
-    private void parseVideoDimensions(String value, Long width, Long height) {
-        Pair<Long, Long> videoDimensions = MediaInformationParser.parseVideoDimensions(value);
-
-        Assert.assertNotNull(videoDimensions);
-        Assert.assertEquals(width, videoDimensions.getFirst());
-        Assert.assertEquals(height, videoDimensions.getSecond());
-    }
-
-    private void parseDuration(String value, Long expected) {
-        Long duration = MediaInformationParser.parseDuration(value);
-
-        Assert.assertEquals(expected, duration);
-    }
-
-    private void parseStartTime(String value, Long expected) {
-        Long duration = MediaInformationParser.parseStartTime(value);
-
-        Assert.assertEquals(expected, duration);
-    }
-
-    private void parseDurationBlock(String value, Long first, Long second, Long third) {
-        Trio<Long, Long, Long> pair = MediaInformationParser.parseDurationBlock(value);
-
-        Assert.assertNotNull(pair);
-        Assert.assertEquals(first, pair.getFirst());
-        Assert.assertEquals(second, pair.getSecond());
-        Assert.assertEquals(third, pair.getThird());
-    }
-
-    private void parseInputBlock(String value, String first, String second) {
-        Pair<String, String> pair = MediaInformationParser.parseInputBlock(value);
-
-        Assert.assertNotNull(pair);
-        Assert.assertEquals(first, pair.getFirst());
-        Assert.assertEquals(second, pair.getSecond());
-    }
-
-    private void parseMetadataBlock(String value, String first, String second) {
-        Pair<String, String> pair = MediaInformationParser.parseMetadataBlock(value);
-
-        Assert.assertNotNull(pair);
-        Assert.assertNotNull(pair.getFirst());
-        Assert.assertNotNull(pair.getSecond());
-        Assert.assertEquals(first, pair.getFirst());
-        Assert.assertEquals(second, pair.getSecond());
-    }
-
-}

android/build.gradle

@@ -1,14 +1,12 @@
 // 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:3.2.1'
-
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle.properties

@@ -9,6 +9,8 @@
 
 # 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,5 +1,6 @@
+#Thu Jul 30 09:25:25 BST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

android/gradlew

@@ -28,7 +28,7 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

android/gradlew.bat

@@ -14,7 +14,7 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

android/jni/.gitignore

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

android/jni/Android.mk

@@ -1,15 +1,34 @@
-LOCAL_PATH := $(call my-dir)
-$(call import-add-path, $(LOCAL_PATH))
+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
 
 MY_ARM_MODE := arm
-MY_PATH := ../app/src/main/cpp
+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
@@ -20,47 +39,67 @@ endif
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
-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)
-
-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 -DMOBILE_FFMPEG_${MY_ARCH_FLAGS}
+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_SHARED_LIBRARIES := cpufeatures
+LOCAL_STATIC_LIBRARIES := cpu-features
+LOCAL_ARM_NEON := ${MY_ARM_NEON}
 include $(BUILD_SHARED_LIBRARY)
 
-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)
+$(call import-module, cpu-features)
 
-ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
-    ifeq ("$(shell test -e $(LOCAL_PATH)/../build/.neon && echo neon)","neon")
+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-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)
+MY_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare
+MY_LDLIBS := -llog -lz -landroid
 
-        $(call import-module, ffmpeg/neon)
+MY_BUILD_GENERIC_MOBILE_FFMPEG := true
 
+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)
+
+    ifneq ($(MY_ARMV7), true)
+        MY_BUILD_GENERIC_MOBILE_FFMPEG := false
     endif
 endif
 
-$(call import-module, ffmpeg)
+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

android/jni/cpu-features/Android.mk

@@ -0,0 +1,12 @@
+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)
+LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib
 
 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 := $(MY_FFMPEG_LIB)/libavcodec.so
+LOCAL_SRC_FILES := libavcodec.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavfilter
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavfilter.so
+LOCAL_SRC_FILES := libavfilter.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavdevice
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavdevice.so
+LOCAL_SRC_FILES := libavdevice.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavformat
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavformat.so
+LOCAL_SRC_FILES := libavformat.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libavutil
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libavutil.so
+LOCAL_SRC_FILES := libavutil.so
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libswresample
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswresample.so
+LOCAL_SRC_FILES := libswresample.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_ARM_MODE := $(MY_ARM_MODE)
 LOCAL_MODULE := libswscale
-LOCAL_SRC_FILES := $(MY_FFMPEG_LIB)/libswscale.so
+LOCAL_SRC_FILES := libswscale.so
 include $(PREBUILT_SHARED_LIBRARY)

android/jni/ffmpeg/neon/Android.mk

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

android/settings.gradle

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

android/test-app/.gitignore

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

android/test-app/build.gradle

@@ -1,20 +1,32 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    signingConfigs {
+        localConfig {
+            keyAlias 'androiddebugkey'
+            storeFile file(System.getProperty("user.home") + '/.android/debug.keystore')
+            storePassword 'android'
+            keyPassword 'android'
+        }
+    }
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.arthenica.mobileffmpeg.test"
-        minSdkVersion 24
-        targetSdkVersion 27
-        versionCode 240420
-        versionName "4.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 160440
+        versionName "4.4.LTS"
     }
     buildTypes {
-        release {
+        debug {
             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 {
@@ -39,13 +51,9 @@ android.applicationVariants.all { variant ->
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.arthenica:mobile-ffmpeg-full:4.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'
+    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'
 }

android/test-app/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

android/test-app/gradlew

@@ -28,7 +28,7 @@ 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=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

android/test-app/gradlew.bat

@@ -14,7 +14,7 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

android/test-app/proguard-rules.pro

@@ -4,18 +4,3 @@
 #
 # 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

@@ -1,45 +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.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

@@ -12,16 +12,15 @@
     <uses-feature android:name="android.hardware.camera" android:required="true" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         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:replace="android:icon">
-        <activity android:name="com.arthenica.mobileffmpeg.test.MainActivity"
-            android:theme="@style/AppTheme">
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.arthenica.mobileffmpeg.test.MainActivity">
             <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,93 +21,81 @@ 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.RunCallback;
+import com.arthenica.mobileffmpeg.util.DialogUtil;
+import com.arthenica.mobileffmpeg.ExecuteCallback;
 
 import java.io.File;
 import java.util.concurrent.Callable;
 
-import static com.arthenica.mobileffmpeg.FFmpeg.RETURN_CODE_SUCCESS;
+import static com.arthenica.mobileffmpeg.Config.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;
 
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_audio_tab, container, false);
+    public AudioTabFragment() {
+        super(R.layout.fragment_audio_tab);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        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);
+        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);
 
-            encodeButton = getView().findViewById(R.id.encodeButton);
-            encodeButton.setOnClickListener(new View.OnClickListener() {
+        encodeButton = view.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();
+                // encodeChromaprint();
+            }
+        });
+        encodeButton.setEnabled(false);
 
-            outputText = getView().findViewById(R.id.outputText);
-            outputText.setMovementMethod(new ScrollingMovementMethod());
-        }
+        outputText = view.findViewById(R.id.outputText);
+        outputText.setMovementMethod(new ScrollingMovementMethod());
 
-        progressDialog = mainActivity.createProgressDialog("Encoding audio");
+        progressDialog = DialogUtil.createProgressDialog(requireContext(), "Encoding audio");
 
         selectedCodec = getResources().getStringArray(R.array.audio_codec)[0];
     }
 
     @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) {
-            setActive();
-        }
+    public void onResume() {
+        super.onResume();
+        setActive();
     }
 
-    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 static AudioTabFragment newInstance() {
+        return new AudioTabFragment();
     }
 
     public void enableLogCallback() {
@@ -115,7 +103,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
             @Override
             public void apply(final LogMessage message) {
-                MainActivity.addUIAction(new Callable() {
+                MainActivity.addUIAction(new Callable<Object>() {
 
                     @Override
                     public Object call() {
@@ -157,26 +145,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 RunCallback() {
+        MainActivity.executeAsync(new ExecuteCallback() {
 
             @Override
-            public void apply(final int returnCode) {
-                android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d", returnCode));
+            public void apply(final long executionId, final int returnCode) {
+                android.util.Log.d(TAG, String.format("FFmpeg process exited with rc %d.", returnCode));
 
                 hideProgressDialog();
 
-                MainActivity.addUIAction(new Callable() {
+                MainActivity.addUIAction(new Callable<Object>() {
 
                     @Override
                     public Object call() {
                         if (returnCode == RETURN_CODE_SUCCESS) {
-                            Popup.show(mainActivity, "Encode completed successfully.");
+                            Popup.show(requireContext(), "Encode completed successfully.");
                             android.util.Log.d(TAG, "Encode completed successfully.");
                         } else {
-                            Popup.show(mainActivity, "Encode failed. Please check log for the details.");
-                            android.util.Log.d(TAG, String.format("Encode failed with rc=%d", returnCode));
+                            Popup.show(requireContext(), "Encode failed. Please check log for the details.");
+                            android.util.Log.d(TAG, String.format("Encode failed with rc=%d.", returnCode));
                         }
 
                         return null;
@@ -193,11 +181,11 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
         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));
+        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));
+        Log.d(TAG, String.format("FFmpeg process exited with rc %d.", returnCode));
     }
 
     public void createAudioSample() {
@@ -210,15 +198,15 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
 
         String ffmpegCommand = String.format("-hide_banner -y -f lavfi -i sine=frequency=1000:duration=5 -c:a pcm_s16le %s", audioSampleFile.getAbsolutePath());
 
-        android.util.Log.d(TAG, String.format("Sample file is created with '%s'", ffmpegCommand));
+        android.util.Log.d(TAG, String.format("Creating audio sample 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(mainActivity, "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(requireContext(), "Creating AUDIO sample failed. Please check log for the details.");
         }
     }
 
@@ -240,7 +228,10 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
             case "opus":
                 extension = "opus";
                 break;
-            case "amr":
+            case "amr-nb":
+                extension = "amr";
+                break;
+            case "amr-wb":
                 extension = "amr";
                 break;
             case "ilbc":
@@ -260,11 +251,11 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         }
 
         final String audio = "audio." + extension;
-        return new File(mainActivity.getFilesDir(), audio);
+        return new File(requireContext().getFilesDir(), audio);
     }
 
     public File getAudioSampleFile() {
-        return new File(mainActivity.getFilesDir(), "audio-sample.wav");
+        return new File(requireContext().getFilesDir(), "audio-sample.wav");
     }
 
     public void setActive() {
@@ -272,7 +263,7 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
         disableLogCallback();
         createAudioSample();
         enableLogCallback();
-        Popup.show(mainActivity, Tooltip.AUDIO_TEST_TOOLTIP_TEXT);
+        Popup.show(requireContext(), getString(R.string.audio_test_tooltip_text));
     }
 
     public void appendLog(final String logMessage) {
@@ -307,8 +298,10 @@ public class AudioTabFragment extends Fragment implements AdapterView.OnItemSele
                 return String.format("-hide_banner -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":
+            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);
             case "ilbc":
                 return String.format("-hide_banner -y -i %s -c:a ilbc -ar 8000 -b:a 15200 %s", audioSampleFile, audioOutputFile);
             case "speex":

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

@@ -20,81 +20,72 @@
 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.view.LayoutInflater;
+import android.util.AndroidRuntimeException;
+import android.util.Log;
 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;
 
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_command_tab, container, false);
+    public CommandTabFragment() {
+        super(R.layout.fragment_command_tab);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        if (getView() != null) {
-            commandText = getView().findViewById(R.id.commandText);
+        commandText = view.findViewById(R.id.commandText);
 
-            View runButton = getView().findViewById(R.id.runButton);
-            runButton.setOnClickListener(new View.OnClickListener() {
+        View runFFmpegButton = view.findViewById(R.id.runFFmpegButton);
+        runFFmpegButton.setOnClickListener(new View.OnClickListener() {
 
-                @Override
-                public void onClick(View v) {
-                    runFFmpeg();
-                }
-            });
+            @Override
+            public void onClick(View v) {
+                runFFmpeg();
+            }
+        });
 
-            View runAsyncButton = getView().findViewById(R.id.runAsyncButton);
-            runAsyncButton.setOnClickListener(new View.OnClickListener() {
+        View runFFprobeButton = view.findViewById(R.id.runFFprobeButton);
+        runFFprobeButton.setOnClickListener(new View.OnClickListener() {
 
-                @Override
-                public void onClick(View v) {
-                    runFFmpegAsync();
-                }
-            });
+            @Override
+            public void onClick(View v) {
+                runFFprobe();
+            }
+        });
 
-            outputText = getView().findViewById(R.id.outputText);
-            outputText.setMovementMethod(new ScrollingMovementMethod());
-        }
+        outputText = view.findViewById(R.id.outputText);
+        outputText.setMovementMethod(new ScrollingMovementMethod());
+
+        Log.d(MainActivity.TAG, "Last command output was: " + Config.getLastCommandOutput());
     }
 
     @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) {
-            setActive();
-        }
+    public void onResume() {
+        super.onResume();
+        setActive();
     }
 
-    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 static CommandTabFragment newInstance() {
+        return new CommandTabFragment();
     }
 
     public void enableLogCallback() {
@@ -110,6 +101,8 @@ public class CommandTabFragment extends Fragment {
                         return null;
                     }
                 });
+
+                throw new AndroidRuntimeException("I am test exception thrown by test application");
             }
         });
     }
@@ -117,55 +110,45 @@ public class CommandTabFragment extends Fragment {
     public void runFFmpeg() {
         clearLog();
 
-        final String ffmpegCommand = String.format("-hide_banner %s", commandText.getText().toString());
+        final String ffmpegCommand = String.format("%s", commandText.getText().toString());
 
-        android.util.Log.d(MainActivity.TAG, "Testing COMMAND synchronously.");
+        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, String.format("FFmpeg process started with arguments\n\'%s\'", ffmpegCommand));
 
-        int result = FFmpeg.execute(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(mainActivity, "Command failed. Please check output for the details.");
+            Popup.show(requireContext(), "Command failed. Please check output for the details.");
         }
     }
 
-    public void runFFmpegAsync() {
+    public void runFFprobe() {
         clearLog();
 
-        final String ffmpegCommand = String.format("-hide_banner %s", commandText.getText().toString());
+        final String ffprobeCommand = String.format("%s", commandText.getText().toString());
 
-        android.util.Log.d(MainActivity.TAG, "Testing COMMAND asynchronously.");
+        android.util.Log.d(MainActivity.TAG, "Testing FFprobe COMMAND synchronously.");
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n\'%s\'", ffmpegCommand));
+        android.util.Log.d(MainActivity.TAG, String.format("FFprobe process started with arguments\n\'%s\'", ffprobeCommand));
 
-        MainActivity.executeAsync(new RunCallback() {
+        int result = FFprobe.execute(ffprobeCommand);
 
-            @Override
-            public void apply(int result) {
+        android.util.Log.d(MainActivity.TAG, String.format("FFprobe process exited with rc %d.", result));
 
-                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);
+        if (result != 0) {
+            Popup.show(requireContext(), "Command failed. Please check output for the details.");
+        }
     }
 
-    public void setActive() {
-        android.util.Log.i(MainActivity.TAG, "Command Tab Activated");
+    private void setActive() {
+        Log.i(MainActivity.TAG, "Command Tab Activated");
         enableLogCallback();
-        Popup.show(mainActivity, Tooltip.COMMAND_TEST_TOOLTIP_TEXT);
+        Popup.show(requireContext(), getString(R.string.command_test_tooltip_text));
     }
 
     public void appendLog(final String logMessage) {

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

@@ -0,0 +1,273 @@
+/*
+ * 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,73 +20,66 @@
 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.view.LayoutInflater;
+import android.util.Log;
 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.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://upload.wikimedia.org/wikipedia/commons/thumb/4/4b/FFmpeg-Logo.svg/568px-FFmpeg-Logo.svg.png";
+    public static final String HTTPS_TEST_DEFAULT_URL = "https://download.blender.org/peach/trailer/trailer_1080p.ogg";
 
-    private MainActivity mainActivity;
     private EditText urlText;
     private TextView outputText;
 
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_https_tab, container, false);
+    public HttpsTabFragment() {
+        super(R.layout.fragment_https_tab);
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        if (getView() != null) {
-            urlText = getView().findViewById(R.id.urlText);
+        urlText = view.findViewById(R.id.urlText);
 
-            View getInfoButton = getView().findViewById(R.id.getInfoButton);
-            getInfoButton.setOnClickListener(new View.OnClickListener() {
+        View getInfoButton = view.findViewById(R.id.getInfoButton);
+        getInfoButton.setOnClickListener(new View.OnClickListener() {
 
-                @Override
-                public void onClick(View v) {
-                    getInfo();
-                }
-            });
+            @Override
+            public void onClick(View v) {
+                runGetMediaInformation();
+            }
+        });
 
-            outputText = getView().findViewById(R.id.outputText);
-            outputText.setMovementMethod(new ScrollingMovementMethod());
-        }
+        outputText = view.findViewById(R.id.outputText);
+        outputText.setMovementMethod(new ScrollingMovementMethod());
     }
 
     @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) {
-            setActive();
-        }
+    public void onResume() {
+        super.onResume();
+        setActive();
     }
 
-    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 static HttpsTabFragment newInstance() {
+        return new HttpsTabFragment();
     }
 
     public void enableLogCallback() {
@@ -106,33 +99,124 @@ public class HttpsTabFragment extends Fragment {
         });
     }
 
-    public void getInfo() {
+    public void runGetMediaInformation() {
         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
-        final String ffmpegCommand = String.format("-hide_banner -i %s -f null -", testUrl);
+        MediaInformation information = FFprobe.getMediaInformation(testUrl);
+        if (information == null) {
+            appendLog("Get media information failed\n");
+        } else {
+            appendLog("Media information for " + information.getFilename() + "\n");
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process started with arguments\n'%s'", ffmpegCommand));
+            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");
+                    }
 
-        // EXECUTE
-        int result = FFmpeg.execute(ffmpegCommand);
+                    if (stream.getWidth() != null) {
+                        appendLog("Stream width: " + stream.getWidth() + "\n");
+                    }
+                    if (stream.getHeight() != null) {
+                        appendLog("Stream height: " + stream.getHeight() + "\n");
+                    }
 
-        android.util.Log.d(MainActivity.TAG, String.format("FFmpeg process exited with rc %d", result));
+                    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)));
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
     public void setActive() {
-        android.util.Log.i(MainActivity.TAG, "Https Tab Activated");
+        Log.i(MainActivity.TAG, "Https Tab Activated");
         enableLogCallback();
-        Popup.show(mainActivity, Tooltip.HTTPS_TEST_TOOLTIP_TEXT);
+        Popup.show(requireContext(), getString(R.string.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 Taner Sener
+ * Copyright (c) 2018-2019 Taner Sener
  *
  * This file is part of MobileFFmpeg.
  *
@@ -20,40 +20,33 @@
 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.FFmpeg;
-import com.arthenica.mobileffmpeg.util.RunCallback;
-import com.arthenica.mobileffmpeg.util.AsynchronousTaskService;
-import com.arthenica.mobileffmpeg.util.RunCallback;
+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 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 {
 
@@ -66,9 +59,11 @@ public class MainActivity extends AppCompatActivity {
             Manifest.permission.CAMERA
     };
 
-    protected static final AsynchronousTaskService asynchronousTaskService = new AsynchronousTaskService();
+    static {
+        Exceptions.registerRootPackage("com.arthenica");
+    }
 
-    protected static final Queue<Callable> actionQueue = new ConcurrentLinkedQueue<>();
+    protected static final Queue<Callable<Object>> actionQueue = new ConcurrentLinkedQueue<>();
 
     protected static final Handler handler = new Handler();
 
@@ -76,7 +71,7 @@ public class MainActivity extends AppCompatActivity {
 
         @Override
         public void run() {
-            Callable callable;
+            Callable<Object> callable;
 
             do {
                 callable = actionQueue.poll();
@@ -84,7 +79,7 @@ public class MainActivity extends AppCompatActivity {
                     try {
                         callable.call();
                     } catch (final Exception e) {
-                        android.util.Log.e(MainActivity.TAG, "Running UI action received error.", e);
+                        android.util.Log.e(TAG, String.format("Running UI action received error.%s.", Exceptions.getStackTraceString(e)));
                     }
                 }
             } while (callable != null);
@@ -99,12 +94,6 @@ 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);
@@ -113,7 +102,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         final ViewPager viewPager = findViewById(R.id.pager);
-        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), this, 6));
+        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), this));
 
         waitForUIAction();
 
@@ -141,8 +130,13 @@ public class MainActivity extends AppCompatActivity {
             registerAppFont();
             Log.d(TAG, "Application fonts registered.");
         } catch (final IOException e) {
-            Log.e(TAG, "Font registration failed.", e);
+            Log.e(TAG, String.format("Font registration failed.%s.", Exceptions.getStackTraceString(e)));
         }
+
+        Log.d(TAG, "Listing supported camera ids.");
+        listSupportedCameraIds();
+        Config.ignoreSignal(Signal.SIGXCPU);
+        Config.setLogLevel(Level.AV_LOG_DEBUG);
     }
 
     @Override
@@ -153,118 +147,46 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * <p>Starts a new asynchronous FFmpeg operation with arguments provided.
+     * <p>Starts a new asynchronous FFmpeg operation with command provided.
      *
-     * @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
+     * @param ExecuteCallback callback function to receive result of this execution
+     * @param command         FFmpeg command
      */
-    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 executeAsync(final ExecuteCallback ExecuteCallback, final String command) {
+        final AsyncFFmpegExecuteTask asyncCommandTask = new AsyncFFmpegExecuteTask(command, ExecuteCallback);
+        asyncCommandTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     public static void waitForUIAction() {
         handler.postDelayed(runnable, 250);
     }
 
-    public static void addUIAction(final Callable callable) {
+    public static void addUIAction(final Callable<Object> 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
-        rawResourceToFile(R.raw.doppioone_regular, new File(cacheDirectory, "doppioone_regular.ttf"));
-        rawResourceToFile(R.raw.truenorg, new File(cacheDirectory, "truenorg.otf"));
+        ResourcesUtil.rawResourceToFile(getResources(), R.raw.doppioone_regular, new File(cacheDirectory, "doppioone_regular.ttf"));
+        ResourcesUtil.rawResourceToFile(getResources(), 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.setFontDirectory(this, cacheDirectory.getAbsolutePath(), null);
+        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);
+            }
+        }
     }
 
 }

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

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