diff --git a/joevideolib/libs/arm64-v8a/libavcodec.so b/joevideolib/libs/arm64-v8a/libavcodec.so index 10179ce..9c3e3f5 100644 Binary files a/joevideolib/libs/arm64-v8a/libavcodec.so and b/joevideolib/libs/arm64-v8a/libavcodec.so differ diff --git a/joevideolib/libs/arm64-v8a/libavdevice.so b/joevideolib/libs/arm64-v8a/libavdevice.so index f00ad0f..d096fac 100644 Binary files a/joevideolib/libs/arm64-v8a/libavdevice.so and b/joevideolib/libs/arm64-v8a/libavdevice.so differ diff --git a/joevideolib/libs/arm64-v8a/libavfilter.so b/joevideolib/libs/arm64-v8a/libavfilter.so index e536e01..4e472ec 100644 Binary files a/joevideolib/libs/arm64-v8a/libavfilter.so and b/joevideolib/libs/arm64-v8a/libavfilter.so differ diff --git a/joevideolib/libs/arm64-v8a/libavformat.so b/joevideolib/libs/arm64-v8a/libavformat.so index a608725..ce5aa4e 100644 Binary files a/joevideolib/libs/arm64-v8a/libavformat.so and b/joevideolib/libs/arm64-v8a/libavformat.so differ diff --git a/joevideolib/libs/arm64-v8a/libavutil.so b/joevideolib/libs/arm64-v8a/libavutil.so index 877b481..a95ee37 100644 Binary files a/joevideolib/libs/arm64-v8a/libavutil.so and b/joevideolib/libs/arm64-v8a/libavutil.so differ diff --git a/joevideolib/libs/arm64-v8a/libffmpeg.so b/joevideolib/libs/arm64-v8a/libffmpeg.so index 1cef022..4a096a2 100644 Binary files a/joevideolib/libs/arm64-v8a/libffmpeg.so and b/joevideolib/libs/arm64-v8a/libffmpeg.so differ diff --git a/joevideolib/libs/arm64-v8a/libpostproc.so b/joevideolib/libs/arm64-v8a/libpostproc.so index 4463a3e..12c08b1 100644 Binary files a/joevideolib/libs/arm64-v8a/libpostproc.so and b/joevideolib/libs/arm64-v8a/libpostproc.so differ diff --git a/joevideolib/libs/arm64-v8a/libswresample.so b/joevideolib/libs/arm64-v8a/libswresample.so index 5a1c029..7a7bfd4 100644 Binary files a/joevideolib/libs/arm64-v8a/libswresample.so and b/joevideolib/libs/arm64-v8a/libswresample.so differ diff --git a/joevideolib/libs/arm64-v8a/libswscale.so b/joevideolib/libs/arm64-v8a/libswscale.so index 2f52e31..4b00240 100644 Binary files a/joevideolib/libs/arm64-v8a/libswscale.so and b/joevideolib/libs/arm64-v8a/libswscale.so differ diff --git a/joevideolib/src/main/java/VideoHandle/EpEditor.java b/joevideolib/src/main/java/VideoHandle/EpEditor.java index fabb884..777c722 100644 --- a/joevideolib/src/main/java/VideoHandle/EpEditor.java +++ b/joevideolib/src/main/java/VideoHandle/EpEditor.java @@ -1,7 +1,5 @@ package VideoHandle; -import android.app.Activity; -import android.app.Application; import android.content.Context; import android.media.MediaExtractor; import android.media.MediaFormat; @@ -323,7 +321,8 @@ public static void music(String videoin, String audioin, String output, float vi } cmd.append(output); mediaExtractor.release(); - execCmd(cmd, 0, onEditorListener); + long d = VideoUitls.getDuration(videoin); + execCmd(cmd, d, onEditorListener); } /** @@ -346,7 +345,8 @@ public static void demuxer(String videoin, String out, Format format, OnEditorLi break; } cmd.append(out); - execCmd(cmd, 0, onEditorListener); + long d = VideoUitls.getDuration(videoin); + execCmd(cmd, d, onEditorListener); } /** @@ -565,9 +565,11 @@ public void onProgress(final float progress) { */ private static void execCmd(CmdList cmd, long duration, final OnEditorListener onEditorListener) { String[] cmds = cmd.toArray(new String[cmd.size()]); + String cmdLog = ""; for (String ss : cmds) { - Log.v("EpMediaF", "cmd:" + ss); + cmdLog += cmds; } + Log.v("EpMediaF", "cmd:" + cmdLog); FFmpegCmd.exec(cmds, duration, new OnEditorListener() { @Override public void onSuccess() {