Merge branch 'dev'

# Conflicts:
#	ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so
#	ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so
#	ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so
#	ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so

Author: AnJoiner

.gitignore

@@ -12,3 +12,7 @@
 /captures
 .externalNativeBuild
 .cxx
+.idea/shelf/Uncommitted_changes_before_Checkout_at_2023_11_9,_13_44_\[Changes\]/libffmpeg-org.so
+.idea/shelf/Uncommitted_changes_before_Checkout_at_2023_11_9,_13_44_\[Changes\]/libffmpeg-org1.so
+.idea/shelf/Uncommitted_changes_before_Checkout_at_2023_11_9,_13_44_\[Changes\]/shelved.patch
+.idea/shelf/Uncommitted_changes_before_Checkout_at_2023_11_9__13_44__Changes_.xml

README-CN.md

@@ -23,7 +23,7 @@
 如果访问不了全部信息，请跳转[【国内镜像】](https://gitee.com/anjoiner/FFmpegCommand)
 
 ## 交叉编译
-* Macos 13.2 + GCC + Cmake + NDK 21
+* Macos 13.2 + Clang + Cmake + NDK 21
 
 | 第三方库       | 版本                 | 下载地址                                                                                                 |
 |------------|--------------------|------------------------------------------------------------------------------------------------------|

README.md

@@ -22,7 +22,7 @@ In our development, audio and video related content is often used, generally we
 If you can’t access all the information, please go to[【国内镜像】](https://gitee.com/anjoiner/FFmpegCommand)
 
 ## Cross Compile
-* Macos 13.2 + GCC + Cmake + NDK 21 (支持MediaCodec 编解码)
+* Macos 13.2 + Clang + Cmake + NDK 21 (支持MediaCodec 编解码)
 
 | 第三方库       | 版本                 | 下载地址                                                                                                 |
 |------------|--------------------|------------------------------------------------------------------------------------------------------|

app/build.gradle

@@ -23,7 +23,7 @@ android {
     compileSdkVersion 31
     defaultConfig {
         applicationId "com.coder.ffmpegtest"
-        minSdkVersion 15
+        minSdkVersion 21
         targetSdkVersion 31
         versionCode 4
         versionName "1.2.3"
@@ -51,6 +51,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures{
+        viewBinding true
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -47,6 +47,9 @@
 
         <activity android:name=".ui.TestCodecActivity"
             android:screenOrientation="portrait"/>
+        <!--添加文字、字幕-->
+        <activity android:name=".ui.KFFmpegFontActivity"
+            android:screenOrientation="portrait" />
 
         <service android:name=".service.FFmpegCommandService" />
         <service android:name=".service.FFmpegCommandService2" android:process=":ffmpegCommand2" />