新增对hevc支持，修复BUG

yangjie10930 · Mar 2, 2018 · 052e5f5 · 052e5f5
1 parent c85991f
commit 052e5f5
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 5 deletions.
diff --git a/joevideolib/libs/arm64-v8a/libavcodec.so b/joevideolib/libs/arm64-v8a/libavcodec.so
diff --git a/joevideolib/libs/arm64-v8a/libavdevice.so b/joevideolib/libs/arm64-v8a/libavdevice.so
diff --git a/joevideolib/libs/arm64-v8a/libavfilter.so b/joevideolib/libs/arm64-v8a/libavfilter.so
diff --git a/joevideolib/libs/arm64-v8a/libavformat.so b/joevideolib/libs/arm64-v8a/libavformat.so
diff --git a/joevideolib/libs/arm64-v8a/libavutil.so b/joevideolib/libs/arm64-v8a/libavutil.so
diff --git a/joevideolib/libs/arm64-v8a/libffmpeg.so b/joevideolib/libs/arm64-v8a/libffmpeg.so
diff --git a/joevideolib/libs/arm64-v8a/libpostproc.so b/joevideolib/libs/arm64-v8a/libpostproc.so
diff --git a/joevideolib/libs/arm64-v8a/libswresample.so b/joevideolib/libs/arm64-v8a/libswresample.so
diff --git a/joevideolib/libs/arm64-v8a/libswscale.so b/joevideolib/libs/arm64-v8a/libswscale.so
diff --git 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() {