Merge branch 'main' into development-flutter

Author: suencooper

.github/pull_request_template.md

@@ -8,7 +8,7 @@ Please also include the context and motivation about the changes introduced.
 - Documentation
 
 ## Checks
-- [ ] Changes support all platforms (`Android`, `iOS`, `Linux`, macOS`, `tvOS`)
+- [ ] Changes support all platforms (`Android`, `iOS`, `Linux`, `macOS`, `tvOS`)
 - [ ] Breaks existing functionality
 - [ ] Implementation is completed, not half-done 
 - [ ] Is there another PR already created for this feature/bug fix

.github/workflows/android-build-scripts.yml

@@ -27,7 +27,7 @@ on:
 jobs:
   build-main-on-linux:
     name: android main on linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux', 'r24-linux', 'r25b-linux' ]
@@ -36,11 +36,11 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: set up android ndk
         run: |
           curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
@@ -56,7 +56,7 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-lts-on-linux:
     name: android lts on linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux' ]
@@ -65,11 +65,11 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: set up android ndk
         run: |
           curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
@@ -94,11 +94,11 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: set up android ndk
         run: |
           curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
@@ -123,11 +123,11 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: set up android ndk
         run: |
           curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip
@@ -143,7 +143,7 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-main-without-ffmpeg-kit-protocols-on-linux:
     name: build without ffmpeg-kit protocols
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ndk-version: [ 'r22b-linux-x86_64' ]
@@ -152,11 +152,11 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: set up android ndk
         run: |
           curl -s "https://dl.google.com/android/repository/android-ndk-${{ matrix.ndk-version }}.zip" -o ndk.zip

.github/workflows/linux-build-scripts.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: prerequisites
-        run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
+        run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script
         run: ./linux.sh -d
       - name: print build logs
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: prerequisites
-        run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
+        run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
       - name: run the build script
         run: ./linux.sh -d --lts
       - name: print build logs

.github/workflows/periodic-builds-android.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build-android-main-on-linux:
     name: android main on linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux', 'r24-linux', 'r25b-linux' ]
@@ -19,13 +19,13 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branches }}
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: prerequisites
-        run: sudo apt-get install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget autopoint meson ninja-build ragel
+        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-6
       - name: upgrade meson
         run: pip install meson --upgrade
       - name: set up android ndk
@@ -43,7 +43,7 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-android-lts-on-linux:
     name: android lts on linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux' ]
@@ -55,13 +55,13 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branches }}
-      - name: set up adopt jdk 11
+      - name: set up adopt jdk 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: prerequisites
-        run: sudo apt-get install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget autopoint meson ninja-build ragel
+        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-6
       - name: upgrade meson
         run: pip install meson --upgrade
       - name: set up android ndk

.github/workflows/periodic-builds-apple.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
@@ -46,7 +46,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
@@ -72,7 +72,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
@@ -98,7 +98,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
@@ -124,7 +124,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
@@ -150,7 +150,7 @@ jobs:
         with:
           ref: ${{ matrix.branches }}
       - name: prerequisites
-        run: brew install autoconf automake libtool pkg-config curl git cmake gcc gperf texinfo yasm nasm bison autogen wget meson ninja ragel --overwrite
+        run: brew install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget gettext meson ninja ragel groff gtk-doc-tools libtasn1 --overwrite
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script

README.md

@@ -1,4 +1,4 @@
-# FFmpegKit ![GitHub release](https://img.shields.io/badge/release-v5.1-blue.svg) ![Maven Central](https://img.shields.io/maven-central/v/com.arthenica/ffmpeg-kit-min) ![CocoaPods](https://img.shields.io/cocoapods/v/ffmpeg-kit-ios-min) ![pub](https://img.shields.io/pub/v/ffmpeg_kit_flutter.svg) ![npm](https://img.shields.io/npm/v/ffmpeg-kit-react-native.svg)
+# FFmpegKit ![GitHub release](https://img.shields.io/badge/release-v6.0-blue.svg) ![Maven Central](https://img.shields.io/maven-central/v/com.arthenica/ffmpeg-kit-min) ![CocoaPods](https://img.shields.io/cocoapods/v/ffmpeg-kit-ios-min) ![pub](https://img.shields.io/pub/v/ffmpeg_kit_flutter.svg) ![npm](https://img.shields.io/npm/v/ffmpeg-kit-react-native.svg)
 
 <img src="https://github.com/arthenica/ffmpeg-kit/blob/main/docs/assets/ffmpeg-kit-icon-v9.png" width="240">
 
@@ -124,20 +124,21 @@ the same `FFmpeg` release branch.
 `dev` part in the version string indicates that `FFmpeg` source code is cloned from the `FFmpeg` `master` branch and
 the exact version number of `FFmpeg` is obtained using the `git describe --tags` command.
 
-|    Platforms     |                                 FFmpegKit Version                                  | FFmpeg Version | Release Date |
-|:----------------:|:----------------------------------------------------------------------------------:|:--------------:|:------------:|
-|     Flutter      |   [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v5.1.0)    |     5.1.2      | Oct 02, 2022 |
-|     Android      |         [5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v5.1)          |     5.1.2      | Sep 29, 2022 |
-|      Apple       |    [5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v5.1)               |     5.1.2      | Sep 29, 2022 |
-|   React Native   | [4.5.2](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.2) |  4.5-dev-3393  | May 25, 2022 |
-|     Flutter      |   [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v4.5.1)    |  4.5-dev-3393  | Jan 02, 2022 |
-|   React Native   | [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.1) |  4.5-dev-3393  | Jan 02, 2022 |
-|     Android      |       [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5.1)        |  4.5-dev-3393  | Jan 01, 2022 |
-|      Apple       |       [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5.1)        |  4.5-dev-3393  | Dec 30, 2021 |
-|     Flutter      |   [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v4.5.0)    |  4.5-dev-2008  | Oct 05, 2021 |
-|   React Native   | [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.0) |  4.5-dev-2008  | Oct 01, 2021 |
-| Android<br>Apple |         [4.5](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5)          |  4.5-dev-2008  | Sep 18, 2021 |
-| Android<br>Apple |         [4.4](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.4)          |  4.4-dev-3015  | Mar 03, 2021 |
+|    Platforms     |                                  FFmpegKit Version                                  | FFmpeg Version | Release Date |
+|:----------------:|:-----------------------------------------------------------------------------------:|:--------------:|:------------:|
+|      Android<br>Apple       |          [6.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/v6.0)           |      6.0       | Aug 21, 2023 |
+|   React Native   |  [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v5.1.0)  |     5.1.2      | Oct 02, 2022 |
+|     Flutter      |    [5.1.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v5.1.0)     |     5.1.2      | Oct 02, 2022 |
+|     Android<br>Apple      |          [5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v5.1)           |     5.1.2      | Sep 29, 2022 |
+|   React Native   |  [4.5.2](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.2)  |  4.5-dev-3393  | May 25, 2022 |
+|     Flutter      |    [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v4.5.1)     |  4.5-dev-3393  | Jan 02, 2022 |
+|   React Native   |  [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.1)  |  4.5-dev-3393  | Jan 02, 2022 |
+|     Android      |        [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5.1)         |  4.5-dev-3393  | Jan 01, 2022 |
+|      Apple       |        [4.5.1](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5.1)         |  4.5-dev-3393  | Dec 30, 2021 |
+|     Flutter      |    [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/flutter.v4.5.0)     |  4.5-dev-2008  | Oct 05, 2021 |
+|   React Native   |  [4.5.0](https://github.com/arthenica/ffmpeg-kit/releases/tag/react.native.v4.5.0)  |  4.5-dev-2008  | Oct 01, 2021 |
+| Android<br>Apple |          [4.5](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.5)           |  4.5-dev-2008  | Sep 18, 2021 |
+| Android<br>Apple |          [4.4](https://github.com/arthenica/ffmpeg-kit/releases/tag/v4.4)           |  4.4-dev-3015  | Mar 03, 2021 |
 
 ### 11. LTS Releases
 

android/README.md

@@ -22,14 +22,14 @@ external libraries enabled.
 
 ##### 2.1.1 Android Tools
    - Android SDK Build Tools
-   - Android NDK r22b or later with LLDB and CMake (See [#292](https://github.com/arthenica/ffmpeg-kit/issues/292) if you want to use NDK r23b)
+   - Android NDK r22b or later with LLDB and CMake (See [#292](https://github.com/arthenica/ffmpeg-kit/issues/292) if you want to use NDK r23b or later)
 
 ##### 2.1.2 Packages
 
 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 git wget autopoint meson ninja
+autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja ragel groff gtk-doc-tools libtasn1
 ```
 
 ##### 2.1.3 Environment Variables 
@@ -77,7 +77,7 @@ All libraries created by `android.sh` can be found under the `prebuilt` director
     }
 
     dependencies {
-        implementation 'com.arthenica:ffmpeg-kit-full:5.1'
+        implementation 'com.arthenica:ffmpeg-kit-full:6.0'
     }
     ```
 

android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
 }
 

android/ffmpeg-kit-android-lib/Doxyfile

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

android/ffmpeg-kit-android-lib/build.gradle

@@ -1,15 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    namespace 'com.arthenica.ffmpegkit'
-    compileSdk 31
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.arthenica.ffmpegkit'
+    }
+    compileSdk 33
     ndkVersion "22.1.7171670"
 
     defaultConfig {
         minSdk 24
-        targetSdk 31
-        versionCode 240510
-        versionName "5.1"
+        targetSdk 33
+        versionCode 240600
+        versionName "6.0"
         project.archivesBaseName = "ffmpeg-kit"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -38,19 +40,17 @@ android {
             systemProperty 'enable.ffmpeg.kit.test.mode', 'true'
         }
     }
-}
 
-task javadoc(type: Javadoc) {
-    title = 'FFmpegKit'
-    destinationDir = file("${projectDir}/../../docs/android/javadoc")
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    source = android.sourceSets.main.java.srcDirs
-    configurations.implementation.setCanBeResolved(true)
-    classpath += configurations.implementation
+    publishing {
+        singleVariant('release') {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {
     api 'com.arthenica:smart-exception-java:0.2.1'
-    testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation 'org.json:json:20220320'
+    testImplementation "androidx.test.ext:junit:1.1.5"
+    testImplementation 'org.json:json:20230618'
 }

android/ffmpeg-kit-android-lib/consumer-rules.pro

@@ -1,7 +1,7 @@
 -keep class com.arthenica.ffmpegkit.FFmpegKitConfig {
     native <methods>;
     void log(long, int, byte[]);
-    void statistics(long, int, float, float, long , int, double, double);
+    void statistics(long, int, float, float, long , double, double, double);
     int safOpen(int);
     int safClose(int);
 }