更新影魔ff4;完善一次提交

app/src/main/java/com/github/tvbox/osc/util/thunder/Thunder.java

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.github.tvbox.osc.base.App;
 import com.github.tvbox.osc.util.FileUtils;
 import com.xunlei.downloadlib.XLDownloadManager;
 import com.xunlei.downloadlib.XLTaskHelper;
@@ -273,13 +274,14 @@ public class Thunder {
             return true;
         }
         if (isEd2k(url) || isFtp(url)) {
+            if(threadPool==null){
+                init(App.getInstance());
+                threadPool = Executors.newSingleThreadExecutor();
+            }
             if (currentTask > 0) {
                 XLTaskHelper.instance().stopTask(currentTask);
                 currentTask = 0L;
             }
-            if(threadPool==null){
-                threadPool = Executors.newSingleThreadExecutor();
-            }
             task_url=url;
             name = XLTaskHelper.instance().getFileName(task_url);
             localPath = (new File(cacheRoot+File.separator+"temp",FileUtils.getFileNameWithoutExt(name)))+"/";

player/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java

@@ -187,6 +187,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
             if (!mIsLibLoaded) {
                 if (libLoader == null)
                     libLoader = sLocalLibLoader;
+                //ff4
                 try {
                     libLoader.loadLibrary("ijkffmpeg");
                     libLoader.loadLibrary("ijksdl");

player/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java

@@ -24,6 +24,16 @@ public final class IjkTimedText {
 
     private Rect mTextBounds = null;
     private String mTextChars = null;
+    /**
+     * int planeWidth = bitmapData[0];
+     * int planeHeight = bitmapData[1];
+     * int bitmapX = bitmapData[2];
+     * int bitmapY = bitmapData[3];
+     * int bitmapWidth = bitmapData[4];
+     * int bitmapHeight = bitmapData[5];
+     * Bitmap bitmap = Bitmap.createBitmap(bitmapData, 6, bitmapWidth, bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
+     */
+    private int[] mBitmapData = null;
 
     public IjkTimedText(Rect bounds, String text) {
         mTextBounds = bounds;
@@ -38,6 +48,10 @@ public final class IjkTimedText {
     }
 
 
+    public int[] getBitmapData() {
+        return mBitmapData;
+    }
+
     public String getText() {
         return mTextChars;
     }