From a6cfd1a331eb88bc419dfcf5a63de912a59ab8bd Mon Sep 17 00:00:00 2001 From: xufulong <839789740@qq.com> Date: Fri, 13 Dec 2019 01:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加非空判断 --- .../ffmpeg/activity/AudioHandleActivity.java | 16 ++++++++++------ .../ffmpeg/activity/VideoHandleActivity.java | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java index afabc78..67793a5 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java @@ -114,14 +114,18 @@ public class AudioHandleActivity extends BaseActivity { } switch (viewId) { case R.id.btn_transform://转码 - String transformFile; if (useFFmpeg) { //使用FFmpeg转码 - transformFile = PATH + File.separator + "transformAudio.mp3"; + String transformFile = PATH + File.separator + "transformAudio.mp3"; commandLine = FFmpegUtil.transformAudio(srcFile, transformFile); } else { //使用MediaCodec与mp3lame转mp3 - transformFile = PATH + File.separator + "transformAudio.mp3"; - Mp3Converter mp3Converter = new Mp3Converter(); - mp3Converter.convertToMp3(srcFile, transformFile); + new Thread(new Runnable() { + @Override + public void run() { + String transformInput = PATH + File.separator + "transformAudio.mp3"; + Mp3Converter mp3Converter = new Mp3Converter(); + mp3Converter.convertToMp3(srcFile, transformInput); + } + }).start(); } break; case R.id.btn_cut://剪切(注意原文件与剪切文件格式一致,文件绝对路径最好不包含中文、特殊字符) @@ -191,7 +195,7 @@ public class AudioHandleActivity extends BaseActivity { default: break; } - if (ffmpegHandler != null) { + if (ffmpegHandler != null && commandLine != null) { ffmpegHandler.executeFFmpegCmd(commandLine); } } diff --git a/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java index d301a73..ddb5434 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java @@ -253,7 +253,7 @@ public class VideoHandleActivity extends BaseActivity { default: break; } - if (ffmpegHandler != null) { + if (ffmpegHandler != null && commandLine != null) { ffmpegHandler.executeFFmpegCmd(commandLine); } } @@ -264,7 +264,7 @@ public class VideoHandleActivity extends BaseActivity { private void handlePhoto() { // 图片所在路径,图片命名格式img+number.jpg // 这里指定目录为根目录下img文件夹 - String picturePath = PATH + "/frame/"; + String picturePath = PATH + "/img/"; if (!FileUtil.checkFileExist(picturePath)) { return; }