diff --git a/app/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java b/app/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java index 06d38e882..02d2b62ae 100755 --- a/app/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java +++ b/app/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java @@ -8,29 +8,24 @@ import com.arthenica.smartexception.java.Exceptions; import java.util.Collections; import java.util.List; -import ru.vtosters.lite.utils.AndroidUtils; - public class NativeLoader { static final String[] FFMPEG_LIBRARIES = {"avutil", "swresample", "avcodec", "avformat", "avfilter", "avdevice"}; private static void loadLibrary(String libraryName) { - String path = AndroidUtils.getGlobalContext().getFilesDir() + "/lib" + libraryName + ".so"; - System.load(path); + System.loadLibrary(libraryName); } private static List loadExternalLibraries() { - // return Packages.getExternalLibraries(); + //return Packages.getExternalLibraries(); return Collections.emptyList(); } private static String loadNativeAbi() { - // return AbiDetect.getNativeAbi(); - return Abi.ABI_ARMV7A_NEON.getName(); + return AbiDetect.getNativeAbi(); } static String loadAbi() { - // return AbiDetect.getAbi(); - return Abi.ABI_ARMV7A_NEON.getName(); + return AbiDetect.getAbi(); } static String loadPackageName() { diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java index af71f6e5e..88697bb91 100644 --- a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java +++ b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java @@ -28,8 +28,6 @@ public class FFMpeg { * @return True if success, else false */ public static boolean convert(File in, String out, MusicTrack track) { - checkFFMpegLibs(); - // convert .ts file to .mp3 file via ffmpeg var sb = new StringBuilder(); diff --git a/smali/lib/arm64-v8a/libavcodec.so b/smali/lib/arm64-v8a/libavcodec.so new file mode 100644 index 000000000..70de4d869 Binary files /dev/null and b/smali/lib/arm64-v8a/libavcodec.so differ diff --git a/smali/lib/arm64-v8a/libavdevice.so b/smali/lib/arm64-v8a/libavdevice.so new file mode 100644 index 000000000..1a7a6594f Binary files /dev/null and b/smali/lib/arm64-v8a/libavdevice.so differ diff --git a/smali/lib/arm64-v8a/libavfilter.so b/smali/lib/arm64-v8a/libavfilter.so new file mode 100644 index 000000000..886471e2d Binary files /dev/null and b/smali/lib/arm64-v8a/libavfilter.so differ diff --git a/smali/lib/arm64-v8a/libavformat.so b/smali/lib/arm64-v8a/libavformat.so new file mode 100644 index 000000000..b838dca9d Binary files /dev/null and b/smali/lib/arm64-v8a/libavformat.so differ diff --git a/smali/lib/arm64-v8a/libavutil.so b/smali/lib/arm64-v8a/libavutil.so new file mode 100644 index 000000000..870c3351d Binary files /dev/null and b/smali/lib/arm64-v8a/libavutil.so differ diff --git a/smali/lib/arm64-v8a/libffmpegkit.so b/smali/lib/arm64-v8a/libffmpegkit.so new file mode 100644 index 000000000..4e7c0a231 Binary files /dev/null and b/smali/lib/arm64-v8a/libffmpegkit.so differ diff --git a/smali/lib/arm64-v8a/libffmpegkit_abidetect.so b/smali/lib/arm64-v8a/libffmpegkit_abidetect.so new file mode 100644 index 000000000..81f18c93f Binary files /dev/null and b/smali/lib/arm64-v8a/libffmpegkit_abidetect.so differ diff --git a/smali/lib/arm64-v8a/libswresample.so b/smali/lib/arm64-v8a/libswresample.so new file mode 100644 index 000000000..3cdd06fe3 Binary files /dev/null and b/smali/lib/arm64-v8a/libswresample.so differ diff --git a/smali/lib/armeabi-v7a/libavcodec.so b/smali/lib/armeabi-v7a/libavcodec.so new file mode 100644 index 000000000..ff38b729c Binary files /dev/null and b/smali/lib/armeabi-v7a/libavcodec.so differ diff --git a/smali/lib/armeabi-v7a/libavdevice.so b/smali/lib/armeabi-v7a/libavdevice.so new file mode 100644 index 000000000..89a0bcaa1 Binary files /dev/null and b/smali/lib/armeabi-v7a/libavdevice.so differ diff --git a/smali/lib/armeabi-v7a/libavfilter.so b/smali/lib/armeabi-v7a/libavfilter.so new file mode 100644 index 000000000..905974b00 Binary files /dev/null and b/smali/lib/armeabi-v7a/libavfilter.so differ diff --git a/smali/lib/armeabi-v7a/libavformat.so b/smali/lib/armeabi-v7a/libavformat.so new file mode 100644 index 000000000..84db581b6 Binary files /dev/null and b/smali/lib/armeabi-v7a/libavformat.so differ diff --git a/smali/lib/armeabi-v7a/libavutil.so b/smali/lib/armeabi-v7a/libavutil.so new file mode 100644 index 000000000..2e57c62b0 Binary files /dev/null and b/smali/lib/armeabi-v7a/libavutil.so differ diff --git a/smali/lib/armeabi-v7a/libffmpegkit.so b/smali/lib/armeabi-v7a/libffmpegkit.so new file mode 100644 index 000000000..363269fa2 Binary files /dev/null and b/smali/lib/armeabi-v7a/libffmpegkit.so differ diff --git a/smali/lib/armeabi-v7a/libffmpegkit_abidetect.so b/smali/lib/armeabi-v7a/libffmpegkit_abidetect.so new file mode 100644 index 000000000..b69cd76bf Binary files /dev/null and b/smali/lib/armeabi-v7a/libffmpegkit_abidetect.so differ diff --git a/smali/lib/armeabi-v7a/libswresample.so b/smali/lib/armeabi-v7a/libswresample.so new file mode 100644 index 000000000..d2a3efd34 Binary files /dev/null and b/smali/lib/armeabi-v7a/libswresample.so differ