fix: 修复因为16kb申请内存造成的OOM (#63)

Related to #63

Author: AnJoiner

app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "com.coder.ffmpegcommand"
         minSdk 21
         targetSdk 33
-        versionCode 7
-        versionName "1.3.5"
+        versionCode 8
+        versionName "1.3.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/outputs/release/app-release.apk

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 7,
-      "versionName": "1.3.5",
+      "versionCode": 8,
+      "versionName": "1.3.6",
       "outputFile": "app-release.apk"
     }
   ],

app/outputs/release/output-metadata.json

@@ -16,6 +16,7 @@
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
+        android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <activity android:name="com.coder.ffmpegcommand.ui.MainActivity"

app/src/main/AndroidManifest.xml

@@ -13,6 +13,8 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
+
+        buildConfigField "String", "MODULE_NAME", "\"ffmpeg-lite\""
     }
 
     buildTypes {
@@ -25,6 +27,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        buildConfig true
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }

ffmpeg-lite/build.gradle

@@ -7,7 +7,7 @@ ext {
                     release(MavenPublication) {
                         groupId = 'com.github.AnJoiner.FFmpegCommand'
                         artifactId = project.name
-                        version = '1.3.5'
+                        version = '1.3.6'
 
                         // 指定要发布的 artifact
                         from project.components.release

ffmpeg-lite/config.gradle

@@ -1,6 +1,7 @@
 package com.coder.ffmpeg.jni
 
 import android.content.Context
+import com.coder.ffmpeg.BuildConfig
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -15,25 +16,53 @@ class FFmpegConfig {
         init {
             System.loadLibrary("ffmpeg-org")
             System.loadLibrary("ffmpeg-command")
+
+            nativeInit()
         }
 
+        /**
+         * native Init, for basic config
+         */
+        private external fun nativeInit()
+
+        /**
+         * Whether to enable debugging mode
+         * @param debug true or false
+         */
+        private external fun nativeSetDebug(debug: Boolean)
+
         /**
          * Whether to enable debugging mode
          * @param debug true or false
          */
-        external fun setDebug(debug: Boolean)
+        @JvmStatic
+        fun setDebug(debug: Boolean) {
+            nativeSetDebug(debug)
+        }
 
         /**
          * Set the env of native
          * @param name env name
          * @param value env value
          */
-        private external fun setNativeEnv(name: String, value: String)
+        private external fun nativeSetNativeEnv(name: String, value: String)
+
+        /**
+         * Set the env of native
+         * @param name env name
+         * @param value env value
+         */
+        @JvmStatic
+        private fun setNativeEnv(name: String, value: String) {
+            nativeSetNativeEnv(name, value)
+        }
+
         /**
          * Set font config dir for fontconfig
          * Note：It's a config dir not font dir
          * @param configPath the font config dir
          */
+        @JvmStatic
         fun setFontConfigPath(configPath: String) {
             setNativeEnv("FONTCONFIG_PATH", configPath)
         }
@@ -43,6 +72,7 @@ class FFmpegConfig {
          * Note：It's a config file not font file
          * @param configFile the font config file
          */
+        @JvmStatic
         fun setFontConfigFile(configFile: String) {
             setNativeEnv("FONTCONFIG_FILE", configFile)
         }
@@ -53,6 +83,7 @@ class FFmpegConfig {
          * @param fontDir the font dir contain fonts (.ttf and .otf files)
          * @param fontNameMapping
          */
+        @JvmStatic
         fun setFontDir(context: Context, fontDir:String, fontNameMapping: Map<String, String>){
             setFontDirList(context, Collections.singletonList(fontDir),fontNameMapping)
         }
@@ -61,6 +92,7 @@ class FFmpegConfig {
          * @param context context for application
          * @param fontDirList list of directories that contain fonts (.ttf and .otf files)
          */
+        @JvmStatic
         fun setFontDirList(context: Context, fontDirList: List<String>, fontNameMapping: Map<String, String>) {
             var validFontNameMappingCount = 0
             val cacheDir = context.cacheDir
@@ -121,8 +153,9 @@ class FFmpegConfig {
             }
         }
 
+        @JvmStatic
         fun getRepo():String {
-            return "ffmpeg-lite"
+            return BuildConfig.MODULE_NAME
         }
     }
 }

ffmpeg-lite/src/main/java/com/coder/ffmpeg/jni/FFmpegConfig.kt

@@ -13,6 +13,8 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        buildConfigField "String", "MODULE_NAME", "\"ffmpeg\""
     }
 
     buildTypes {
@@ -25,6 +27,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures {
+        buildConfig true
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }