diff --git a/ijkplayer/src/main/jniLibs/arm64-v8a/libijkffmpeg.so b/app/src/main/jniLibs/arm64-v8a/libffmpeg.so similarity index 62% rename from ijkplayer/src/main/jniLibs/arm64-v8a/libijkffmpeg.so rename to app/src/main/jniLibs/arm64-v8a/libffmpeg.so index b5b7e5960..a38b9ba52 100644 Binary files a/ijkplayer/src/main/jniLibs/arm64-v8a/libijkffmpeg.so and b/app/src/main/jniLibs/arm64-v8a/libffmpeg.so differ diff --git a/ijkplayer/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so b/app/src/main/jniLibs/armeabi-v7a/libffmpeg.so similarity index 61% rename from ijkplayer/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so rename to app/src/main/jniLibs/armeabi-v7a/libffmpeg.so index e625c7f0b..6a6c44177 100644 Binary files a/ijkplayer/src/main/jniLibs/armeabi-v7a/libijkffmpeg.so and b/app/src/main/jniLibs/armeabi-v7a/libffmpeg.so differ diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index dc8bc8bd0..51440a90f 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -177,9 +177,9 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { synchronized (IjkMediaPlayer.class) { if (!mIsLibLoaded) { if (libLoader == null) libLoader = sLocalLibLoader; - libLoader.loadLibrary("ijkffmpeg"); + libLoader.loadLibrary("ffmpeg"); libLoader.loadLibrary("ijksdl"); - libLoader.loadLibrary("player"); + libLoader.loadLibrary("ijkplayer"); mIsLibLoaded = true; } } @@ -818,8 +818,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { player.notifyOnInfo(msg.arg1, msg.arg2); return; case MEDIA_TIMED_TEXT: - player.notifyOnTimedText(msg.obj == null ? null : IjkTimedText.create(msg.obj.toString())); - //player.notifyOnTimedText(IjkTimedText.create((msg.arg1 >= 2 || msg.obj == null) ? "" : msg.obj.toString())); + player.notifyOnTimedText(IjkTimedText.create((msg.arg1 >= 2 || msg.obj == null) ? "" : msg.obj.toString())); return; case MEDIA_NOP: // interface test message - ignore break; diff --git a/ijkplayer/src/main/jniLibs/arm64-v8a/libijkplayer.so b/ijkplayer/src/main/jniLibs/arm64-v8a/libijkplayer.so new file mode 100644 index 000000000..3c1d5999b Binary files /dev/null and b/ijkplayer/src/main/jniLibs/arm64-v8a/libijkplayer.so differ diff --git a/ijkplayer/src/main/jniLibs/arm64-v8a/libijksdl.so b/ijkplayer/src/main/jniLibs/arm64-v8a/libijksdl.so index 7573607c0..e33742110 100644 Binary files a/ijkplayer/src/main/jniLibs/arm64-v8a/libijksdl.so and b/ijkplayer/src/main/jniLibs/arm64-v8a/libijksdl.so differ diff --git a/ijkplayer/src/main/jniLibs/arm64-v8a/libplayer.so b/ijkplayer/src/main/jniLibs/arm64-v8a/libplayer.so deleted file mode 100644 index 3629904f3..000000000 Binary files a/ijkplayer/src/main/jniLibs/arm64-v8a/libplayer.so and /dev/null differ diff --git a/ijkplayer/src/main/jniLibs/armeabi-v7a/libijkplayer.so b/ijkplayer/src/main/jniLibs/armeabi-v7a/libijkplayer.so new file mode 100644 index 000000000..36f27de13 Binary files /dev/null and b/ijkplayer/src/main/jniLibs/armeabi-v7a/libijkplayer.so differ diff --git a/ijkplayer/src/main/jniLibs/armeabi-v7a/libijksdl.so b/ijkplayer/src/main/jniLibs/armeabi-v7a/libijksdl.so index 9de892f7b..972cc368e 100644 Binary files a/ijkplayer/src/main/jniLibs/armeabi-v7a/libijksdl.so and b/ijkplayer/src/main/jniLibs/armeabi-v7a/libijksdl.so differ diff --git a/ijkplayer/src/main/jniLibs/armeabi-v7a/libplayer.so b/ijkplayer/src/main/jniLibs/armeabi-v7a/libplayer.so deleted file mode 100644 index 3a67de1ce..000000000 Binary files a/ijkplayer/src/main/jniLibs/armeabi-v7a/libplayer.so and /dev/null differ