Upgraded ffmpeg to n7.0.2 and deleted built-in third-party. (#6)

Author: domchen

.gitmodules

@@ -0,0 +1,5 @@
+
+[submodule "third_party/ffmpeg"]
+	path = third_party/ffmpeg
+	url = https://github.com/FFmpeg/FFmpeg.git
+	branch = release/7.0

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 project(ffavc)
 
 # Options for building ffavc

README.md

@@ -3,23 +3,31 @@
 ffavc is a video decoder built on ffmpeg which allows libpag to use ffmpeg as its software decoder
 for h264 decoding.
 
+## Dependency management
+
+Go to the root directory of ffavc project, use the following command to pull the third-party library：
+
+```
+git submodule update --init
+```
+
 ## Build ffmpeg
 
 First, make sure you have built the ffmpeg vendor libraries.
 
 ### Windows platform
 
-1.Install Visual Studio 2019.
+1. Install Visual Studio 2019.
 
-2.Install [<font color=blue>mysy2</font>](https://www.msys2.org/)
+2. Install [<font color=blue>mysy2</font>](https://www.msys2.org/)
 
-3.Install some dependencies
+3. Install some dependencies
 
 ```
 pacman -S make gcc diffutils mingw-w64-{i686,x86_64}-pkg-config mingw-w64-i686-nasm mingw-w64-i686-yasm
 ```
 
-4.Rename msys64/usr/bin/link.exe to msys64/usr/bin/link.bak, to avoid conflict with MSVC's link.exe
+4. Rename msys64/usr/bin/link.exe to msys64/usr/bin/link.bak, to avoid conflict with MSVC's link.exe
 
 5. Run "VS2019 x86 Native Tools Command Prompt" (Run "VS2019 x86_x64 Native Tools Command Prompt"
    for 64-bit.)

android/app/build.gradle

@@ -6,7 +6,7 @@ android {
     buildToolsVersion '33.0.2'
     defaultConfig {
         applicationId "org.libpag.pagviewer"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         kotlinVersion = '1.6.21'
         supportLibVersion = '28.0.0'
         junitVersion="4.12"
-        agpVersion = '8.0.0'
+        agpVersion = '8.3.1'
         appcompatVersion = '1.4.2' // after this version, compileSdkVersion must large than 31
     }
     repositories {

android/ffavc/build.gradle

@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
 
         externalNativeBuild {
             cmake {

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Dec 06 23:21:17 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build_ffmpeg.sh

@@ -38,8 +38,8 @@ if [[ $(uname) == 'Darwin' ]]; then
   rm -rf $OUT_DIR/ios
   make_dir $OUT_DIR/include
   cp -r $SOURCE_DIR/out/ios/include/. $OUT_DIR/include
-  make_dir $OUT_DIR/ios/arm
-  cp -r $SOURCE_DIR/out/ios/armv7/lib/*.a $OUT_DIR/ios/arm
+#  make_dir $OUT_DIR/ios/arm
+#  cp -r $SOURCE_DIR/out/ios/armv7/lib/*.a $OUT_DIR/ios/arm
   make_dir $OUT_DIR/ios/arm64
   cp -r $SOURCE_DIR/out/ios/arm64/lib/*.a $OUT_DIR/ios/arm64
   make_dir $OUT_DIR/ios/x64
@@ -59,8 +59,10 @@ if [[ $(uname) == 'Darwin' ]]; then
   APPLE_DIR=$OUT_DIR/apple
   rm -rf $APPLE_DIR
   make_dir $APPLE_DIR/ios
-  lipo -create $OUT_DIR/ios/arm64/libavcodec.a $OUT_DIR/ios/arm/libavcodec.a -o $APPLE_DIR/ios/libavcodec.a
-  lipo -create $OUT_DIR/ios/arm64/libavutil.a $OUT_DIR/ios/arm/libavutil.a -o $APPLE_DIR/ios/libavutil.a
+#  lipo -create $OUT_DIR/ios/arm64/libavcodec.a $OUT_DIR/ios/arm/libavcodec.a -o $APPLE_DIR/ios/libavcodec.a
+#  lipo -create $OUT_DIR/ios/arm64/libavutil.a $OUT_DIR/ios/arm/libavutil.a -o $APPLE_DIR/ios/libavutil.a
+  lipo -create $OUT_DIR/ios/arm64/libavcodec.a -o $APPLE_DIR/ios/libavcodec.a
+  lipo -create $OUT_DIR/ios/arm64/libavutil.a -o $APPLE_DIR/ios/libavutil.a
   mkdir -p $APPLE_DIR/simulator
   lipo -create $OUT_DIR/ios/x64/libavcodec.a $OUT_DIR/ios/arm64-simulator/libavcodec.a -o $APPLE_DIR/simulator/libavcodec.a
   lipo -create $OUT_DIR/ios/x64/libavutil.a $OUT_DIR/ios/arm64-simulator/libavutil.a -o $APPLE_DIR/simulator/libavutil.a

ffavc.podspec

@@ -2,7 +2,7 @@ PAG_ROOT = __dir__
 
 Pod::Spec.new do |s|
   s.name     = 'ffavc'
-  s.version  = '1.0.0'
+  s.version  = '1.0.3'
   s.ios.deployment_target   = '9.0'
   s.osx.deployment_target   = '10.13'
   s.summary  = 'ffavc is a video decoder built on ffmpeg which allows libpag to use ffmpeg as its software decoder for h264 decoding.'

scripts/build_ffmpeg_android.sh

@@ -62,7 +62,7 @@ build_arch
 
 # build armv7
 ARCH="x86_64"
-CPU="x86_64"
+CPU="x86-64"
 CROSS_PREFIX=$TOOLCHAIN/bin/llvm-
 CC=$TOOLCHAIN/bin/x86_64-linux-android21-clang
 build_arch