Fix for Android 10

Author: 1nikolas

FFmpegAndroid/assets/armeabi-v7a/ffmpeg renamed to FFmpegAndroid/libs/armeabi-v7a/libffmpeg.so

@@ -1,5 +1,9 @@
-<manifest package="com.github.hiteshsondhi88.libffmpeg">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    package="com.github.hiteshsondhi88.libffmpeg"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application />
+    <application
+        android:extractNativeLibs = "true"
+        tools:targetApi="m" />
 
 </manifest>

FFmpegAndroid/libs/armeabi/libffmpeg.so

@@ -20,27 +20,9 @@ class FFmpegLoadLibraryAsyncTask extends AsyncTask<Void, Void, Boolean> {
     @Override
     protected Boolean doInBackground(Void... params) {
         File ffmpegFile = new File(FileUtils.getFFmpeg(context));
-        if (ffmpegFile.exists() && isDeviceFFmpegVersionOld() && !ffmpegFile.delete()) {
-            return false;
-        }
-        if (!ffmpegFile.exists()) {
-            boolean isFileCopied = FileUtils.copyBinaryFromAssetsToData(context,
-                    cpuArchNameFromAssets + File.separator + FileUtils.ffmpegFileName,
-                    FileUtils.ffmpegFileName);
-
-            // make file executable
-            if (isFileCopied) {
-                if(!ffmpegFile.canExecute()) {
-                    Log.d("FFmpeg is not executable, trying to make it executable ...");
-                    if (ffmpegFile.setExecutable(true)) {
-                        return true;
-                    }
-                } else {
-                    Log.d("FFmpeg is executable");
-                    return true;
-                }
-            }
-        }
+
+
+
         return ffmpegFile.exists() && ffmpegFile.canExecute();
     }
 
@@ -57,7 +39,4 @@ protected void onPostExecute(Boolean isSuccess) {
         }
     }
 
-    private boolean isDeviceFFmpegVersionOld() {
-        return CpuArch.fromString(FileUtils.SHA1(FileUtils.getFFmpeg(context))).equals(CpuArch.NONE);
-    }
 }

FFmpegAndroid/assets/x86/ffmpeg renamed to FFmpegAndroid/libs/x86/libffmpeg.so

@@ -15,10 +15,11 @@
 
 class FileUtils {
 
-    static final String ffmpegFileName = "ffmpeg";
+    static final String ffmpegFileName = "libffmpeg.so";
     private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
     private static final int EOF = -1;
 
+    /*
     static boolean copyBinaryFromAssetsToData(Context context, String fileNameFromAssets, String outputFileName) {
 		
 		// create files directory under /data/data/package name
@@ -45,14 +46,19 @@ static boolean copyBinaryFromAssetsToData(Context context, String fileNameFromAs
 		}
         return false;
 	}
-
-	static File getFilesDirectory(Context context) {
-		// creates files directory under data/data/package name
-        return context.getFilesDir();
-	}
+	*/
 
     static String getFFmpeg(Context context) {
-        return getFilesDirectory(context).getAbsolutePath() + File.separator + FileUtils.ffmpegFileName;
+
+        String archFolder = "";
+
+        if (CpuArchHelper.getCpuArch() == CpuArch.x86){
+            archFolder = "x86";
+        } else if (CpuArchHelper.getCpuArch() == CpuArch.ARMv7){
+            archFolder = "arm";
+        }
+
+        return context.getPackageResourcePath().replaceAll("/([^/]+)$", "/lib/") + archFolder + "/" + ffmpegFileName;
     }
 
     static String getFFmpeg(Context context, Map<String,String> environmentVars) {

FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java

@@ -21,9 +21,9 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 22
-    buildToolsVersion = '22.0.1'
-    targetSdkVersion = 22
+    compileSdkVersion = 26
+    buildToolsVersion = '26.0.3'
+    targetSdkVersion = 26
     minSdkVersion = 16
     versionCode = 28
     versionName = "0.3.2"