音频处理|波形图：支持各声道分开画波形；解决一个编译警告

Qiming · Qiming · commit dd45dd5aa271 · 2022-11-03T12:45:35.000+08:00
diff --git a/AndroidMedia/build.gradle b/AndroidMedia/build.gradle
@@ -1,8 +1,8 @@
 
 apply plugin: 'com.android.library'
 //apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
diff --git a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.kt b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.kt
@@ -261,7 +261,7 @@ class AudioHandleActivity : BaseActivity() {
             12 -> { // audio waveform
                 outputPath = PATH + File.separator + "waveform.png"
                 val resolution = "1280x720"
-                commandLine = FFmpegUtil.showAudioWaveform(srcFile, resolution, outputPath)
+                commandLine = FFmpegUtil.showAudioWaveform(srcFile, resolution, 1, outputPath)
             }
             13 -> { //audio encode
                 val pcmFile = PATH + File.separator + "raw.pcm"
diff --git a/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java b/app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java
@@ -870,9 +870,9 @@ public static String[] trimVideo(String inputPath, int start1, int end1, int sta
         return insert(trimCmd.split(" "), 2, inputPath, outputPath);
     }
 
-    public static String[] showAudioWaveform(String inputPath, String resolution, String outputPath) {
-        String waveformCmd = "ffmpeg -i -filter_complex showwavespic=s=%s";
-        waveformCmd = String.format(Locale.getDefault(), waveformCmd, resolution);
+    public static String[] showAudioWaveform(String inputPath, String resolution, int splitChannels, String outputPath) {
+        String waveformCmd = "ffmpeg -i -filter_complex showwavespic=s=%s:split_channels=%d";
+        waveformCmd = String.format(Locale.getDefault(), waveformCmd, resolution, splitChannels);
         return insert(waveformCmd.split(" "), 2, inputPath, outputPath);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ class AudioHandleActivity : BaseActivity() {`
`261`	`261`	`12 -> { // audio waveform`
`262`	`262`	`outputPath = PATH + File.separator + "waveform.png"`
`263`	`263`	`val resolution = "1280x720"`
`264`		`- commandLine = FFmpegUtil.showAudioWaveform(srcFile, resolution, outputPath)`
	`264`	`+ commandLine = FFmpegUtil.showAudioWaveform(srcFile, resolution, 1, outputPath)`
`265`	`265`	`}`
`266`	`266`	`13 -> { //audio encode`
`267`	`267`	`val pcmFile = PATH + File.separator + "raw.pcm"`
Original file line number	Diff line number	Diff line change
`@@ -870,9 +870,9 @@ public static String[] trimVideo(String inputPath, int start1, int end1, int sta`
`870`	`870`	`return insert(trimCmd.split(" "), 2, inputPath, outputPath);`
`871`	`871`	`}`
`872`	`872`
`873`		`- public static String[] showAudioWaveform(String inputPath, String resolution, String outputPath) {`
`874`		`- String waveformCmd = "ffmpeg -i -filter_complex showwavespic=s=%s";`
`875`		`- waveformCmd = String.format(Locale.getDefault(), waveformCmd, resolution);`
	`873`	`+ public static String[] showAudioWaveform(String inputPath, String resolution, int splitChannels, String outputPath) {`
	`874`	`+ String waveformCmd = "ffmpeg -i -filter_complex showwavespic=s=%s:split_channels=%d";`
	`875`	`+ waveformCmd = String.format(Locale.getDefault(), waveformCmd, resolution, splitChannels);`
`876`	`876`	`return insert(waveformCmd.split(" "), 2, inputPath, outputPath);`
`877`	`877`	`}`
`878`	`878`