初始化使用主线程

Author: VeiZhang

FFmpeg-java/build.gradle

@@ -10,9 +10,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation libs["appcompat-v7"]
 
-    implementation libs["rxjava2"]
-    implementation libs["rxandroid2"]
-
     // api libs["exec"]
     api 'com.excellence:exec:1.1.2'
 }

FFmpeg-java/src/main/java/com/excellence/ffmpeg/FFmpeg.java

@@ -15,9 +15,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import io.reactivex.Observable;
-import io.reactivex.schedulers.Schedulers;
-
 /**
  * <pre>
  *     author : VeiZhang
@@ -35,7 +32,6 @@ public class FFmpeg {
     private static FFmpeg mInstance = null;
 
     private Context mContext = null;
-    private String mFfmpeg = "";
 
     public static void init(Context context) {
         init(context, null);
@@ -57,7 +53,7 @@ public static void init(Context context, boolean initialized, CommanderOptions o
         }
         mInstance = new FFmpeg(context.getApplicationContext());
         if (initialized) {
-            mInstance.initFFmpeg().subscribe();
+            mInstance.initFFmpeg();
         }
     }
 
@@ -69,21 +65,17 @@ private FFmpeg(Context context) {
      * 默认初始化，每次启动应用时，删除旧的ffmpeg文件
      * @return
      */
-    public Observable<String> initFFmpeg() {
+    public void initFFmpeg() {
         File ffmpegFile = new File(mInstance.mContext.getFilesDir(), FFMPEG);
 
-        return Observable.just(ffmpegFile).subscribeOn(Schedulers.io())
-                .map(file -> {
-                    /**
-                     * ffmpeg文件有更新，无法判断，因此每次都更新
-                     */
-                    if (ffmpegFile.exists()) {
-                        boolean success = ffmpegFile.delete();
-                        Log.e(TAG, "checkFFmpeg: delete old ffmpeg file success:" + success);
-                    }
-                    mFfmpeg = checkFFmpeg();
-                    return mFfmpeg;
-                });
+        /**
+         * ffmpeg文件有更新，无法判断，因此每次都更新
+         */
+        if (ffmpegFile.exists()) {
+            boolean success = ffmpegFile.delete();
+            Log.e(TAG, "checkFFmpeg: delete old ffmpeg file success:" + success);
+        }
+        checkFFmpeg();
     }
 
     /**
@@ -95,9 +87,10 @@ public Observable<String> initFFmpeg() {
      */
     @Deprecated
     public static CommandTask addTask(@NonNull List<String> command, IListener listener) {
+        String ffmpeg = checkFFmpeg();
         List<String> cmd = new ArrayList<>(command);
-        if (!command.contains(mInstance.mFfmpeg)) {
-            cmd.add(0, mInstance.mFfmpeg);
+        if (!command.contains(ffmpeg)) {
+            cmd.add(0, ffmpeg);
         }
         return Commander.addTask(cmd, listener);
     }