更新到ffmpeg4.2.2，添加x86_64的支持

alpheus55 · May 22, 2020 · c49f40f · c49f40f
1 parent c2915c3
commit c49f40f
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 12 deletions.
diff --git a/joevideolib/build.gradle b/joevideolib/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -26,11 +26,12 @@ android {
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
+
         }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-annotations:25.1.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api 'com.android.support:support-annotations:25.1.1'
 }
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/libs/armeabi-v7a/libavcodec.so b/joevideolib/libs/armeabi-v7a/libavcodec.so
diff --git a/joevideolib/libs/armeabi-v7a/libavdevice.so b/joevideolib/libs/armeabi-v7a/libavdevice.so
diff --git a/joevideolib/libs/armeabi-v7a/libavfilter.so b/joevideolib/libs/armeabi-v7a/libavfilter.so
diff --git a/joevideolib/libs/armeabi-v7a/libavformat.so b/joevideolib/libs/armeabi-v7a/libavformat.so
diff --git a/joevideolib/libs/armeabi-v7a/libavutil.so b/joevideolib/libs/armeabi-v7a/libavutil.so
diff --git a/joevideolib/libs/armeabi-v7a/libffmpeg.so b/joevideolib/libs/armeabi-v7a/libffmpeg.so
diff --git a/joevideolib/libs/armeabi-v7a/libpostproc.so b/joevideolib/libs/armeabi-v7a/libpostproc.so
diff --git a/joevideolib/libs/armeabi-v7a/libswresample.so b/joevideolib/libs/armeabi-v7a/libswresample.so
diff --git a/joevideolib/libs/armeabi-v7a/libswscale.so b/joevideolib/libs/armeabi-v7a/libswscale.so
diff --git a/joevideolib/libs/armeabi/libavcodec.so b/joevideolib/libs/armeabi/libavcodec.so
diff --git a/joevideolib/libs/armeabi/libavdevice.so b/joevideolib/libs/armeabi/libavdevice.so
diff --git a/joevideolib/libs/armeabi/libavfilter.so b/joevideolib/libs/armeabi/libavfilter.so
diff --git a/joevideolib/libs/armeabi/libavformat.so b/joevideolib/libs/armeabi/libavformat.so
diff --git a/joevideolib/libs/armeabi/libavutil.so b/joevideolib/libs/armeabi/libavutil.so
diff --git a/joevideolib/libs/armeabi/libffmpeg.so b/joevideolib/libs/armeabi/libffmpeg.so
diff --git a/joevideolib/libs/armeabi/libpostproc.so b/joevideolib/libs/armeabi/libpostproc.so
diff --git a/joevideolib/libs/armeabi/libswresample.so b/joevideolib/libs/armeabi/libswresample.so
diff --git a/joevideolib/libs/armeabi/libswscale.so b/joevideolib/libs/armeabi/libswscale.so
diff --git a/joevideolib/src/main/java/Jni/FFmpegCmd.java b/joevideolib/src/main/java/Jni/FFmpegCmd.java
@@ -1,6 +1,7 @@
 package Jni;
 
 import android.support.annotation.Keep;
+import android.support.annotation.VisibleForTesting;
 
 import VideoHandle.OnEditorListener;
 
@@ -21,7 +22,7 @@ public class FFmpegCmd {
 		System.loadLibrary("swscale");
 		System.loadLibrary("avfilter");
 		System.loadLibrary("avdevice");
-		System.loadLibrary("ffmpeg");
+		System.loadLibrary("ffmpeg-exec");
 	}
 
 	private static OnEditorListener listener;
@@ -38,6 +39,7 @@ public class FFmpegCmd {
 	public static native int exec(int argc, String[] argv);
 
 	@Keep
+	@VisibleForTesting
 	public static native void exit();
 
 	@Keep

diff --git a/joevideolib/src/main/java/Jni/TrackUtils.java b/joevideolib/src/main/java/Jni/TrackUtils.java
@@ -10,6 +10,9 @@
 
 public class TrackUtils {
 
+	private TrackUtils() {
+	}
+
 	private static final String TAG = "TrackUtils";
 
 	/**

diff --git a/joevideolib/src/main/java/Jni/VideoUitls.java b/joevideolib/src/main/java/Jni/VideoUitls.java
@@ -4,7 +4,7 @@
 import android.media.MediaFormat;
 
 /**
- * Created by 杨杰 on 2017/3/21.
+ * Created by Yj on 2017/3/21.
  * 获取音频或视频的信息
  */
 
@@ -17,16 +17,16 @@ private VideoUitls() {
 	 * 获取视频信息
 	 *
 	 * @param url
-	 * @return	视频时长（单位微秒）
+	 * @return 视频时长（单位微秒）
 	 */
 	public static long getDuration(String url) {
 		try {
 			MediaExtractor mediaExtractor = new MediaExtractor();
 			mediaExtractor.setDataSource(url);
 			int videoExt = TrackUtils.selectVideoTrack(mediaExtractor);
-			if(videoExt == -1){
+			if (videoExt == -1) {
 				videoExt = TrackUtils.selectAudioTrack(mediaExtractor);
-				if(videoExt == -1){
+				if (videoExt == -1) {
 					return 0;
 				}
 			}
@@ -38,4 +38,27 @@ public static long getDuration(String url) {
 			return 0;
 		}
 	}
+
+	/**
+	 * 获取音轨数量
+	 *
+	 * @param url
+	 * @return
+	 */
+	public static int getChannelCount(String url) {
+		try {
+			MediaExtractor mediaExtractor = new MediaExtractor();
+			mediaExtractor.setDataSource(url);
+			int audioExt = TrackUtils.selectAudioTrack(mediaExtractor);
+			if (audioExt == -1) {
+				return 0;
+			}
+			MediaFormat mediaFormat = mediaExtractor.getTrackFormat(audioExt);
+			int channel = mediaFormat.containsKey(MediaFormat.KEY_CHANNEL_COUNT) ? mediaFormat.getInteger(MediaFormat.KEY_CHANNEL_COUNT) : 1;
+			mediaExtractor.release();
+			return channel;
+		} catch (Exception e) {
+			return 0;
+		}
+	}
 }
diff --git a/joevideolib/src/main/java/VideoHandle/AudioOptions.java b/joevideolib/src/main/java/VideoHandle/AudioOptions.java
@@ -0,0 +1,40 @@
+package VideoHandle;
+
+public class AudioOptions {
+	private int sampleRates = 44100;//采样率
+	private float volume = 1.0f;
+	private String startTime;
+	private String duration;
+
+	public int getSampleRates() {
+		return sampleRates;
+	}
+
+	public void setSampleRates(int sampleRates) {
+		this.sampleRates = sampleRates;
+	}
+
+	public float getVolume() {
+		return volume;
+	}
+
+	public void setVolume(float volume) {
+		this.volume = volume;
+	}
+
+	public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+	public String getDuration() {
+		return duration;
+	}
+
+	public void setDuration(String duration) {
+		this.duration = duration;
+	}
+}
diff --git a/joevideolib/src/main/java/VideoHandle/EpEditor.java b/joevideolib/src/main/java/VideoHandle/EpEditor.java
@@ -265,7 +265,7 @@ public static void merge(List<EpVideo> epVideos, OutputOption outputOption, OnEd
 	 * @param onEditorListener 回调监听
 	 */
 	public static void mergeByLc(Context context, List<EpVideo> epVideos, OutputOption outputOption, final OnEditorListener onEditorListener) {
-		String appDir = context.getFilesDir().getAbsolutePath() + "/EpVideos/";
+		String appDir = context.getCacheDir().getAbsolutePath() + "/EpVideos/";
 		String fileName = "ffmpeg_concat.txt";
 		List<String> videos = new ArrayList<>();
 		for (EpVideo e : epVideos) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,9 @@ @@
     public class TrackUtils {
+    	private TrackUtils() {
+    	}
     	private static final String TAG = "TrackUtils";
     	/**
@@ Expand Down @@