From dd45dd5aa271ed62810c46f088fc1abc693b331c Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 3 Nov 2022 12:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E9=A2=91=E5=A4=84=E7=90=86|=E6=B3=A2?= =?UTF-8?q?=E5=BD=A2=E5=9B=BE=EF=BC=9A=E6=94=AF=E6=8C=81=E5=90=84=E5=A3=B0?= =?UTF-8?q?=E9=81=93=E5=88=86=E5=BC=80=E7=94=BB=E6=B3=A2=E5=BD=A2=EF=BC=9B?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=AA=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidMedia/build.gradle | 2 +- app/build.gradle | 2 +- .../java/com/frank/ffmpeg/activity/AudioHandleActivity.kt | 2 +- app/src/main/java/com/frank/ffmpeg/util/FFmpegUtil.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidMedia/build.gradle b/AndroidMedia/build.gradle index 181e8fa..81872ac 100644 --- 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 index 8d259e3..a880e40 100644 --- 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 index 36e3688..1a82b79 100644 --- 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 index 7262420..f592cc7 100644 --- 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 class FFmpegUtil { 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); }