From 65e10d3ff3dea7cace4adc20a8fd7cd9a72c0a24 Mon Sep 17 00:00:00 2001 From: xufulong <839789740@qq.com> Date: Tue, 5 Jan 2021 00:29:54 +0800 Subject: [PATCH] update shell of building FFmpeg --- .../frank/ffmpeg/activity/AudioHandleActivity.java | 14 ++++---------- .../main/java/com/frank/ffmpeg/util/FileUtil.java | 4 +++- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- shell/ffmpeg/build_ffmpeg_mp3.sh | 4 ++-- shell/ffmpeg/build_ffmpeg_one.sh | 4 ++-- shell/ffmpeg/build_ffmpeg_x264.sh | 4 ++-- 7 files changed, 15 insertions(+), 19 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 91a67e1..435d71b 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/AudioHandleActivity.java @@ -163,12 +163,6 @@ public class AudioHandleActivity extends BaseActivity { if (!FileUtil.checkFileExist(appendFile)) { return; } -// List fileList = new ArrayList<>(); -// fileList.add(srcFile); -// fileList.add(appendFile); -// String concatFile = PATH + File.separator + "concat.mp3"; -// commandLine = FFmpegUtil.concatAudio(fileList, concatFile); -// break; concatAudio(srcFile); return; case R.id.btn_mix://mix audio @@ -189,12 +183,12 @@ public class AudioHandleActivity extends BaseActivity { new Thread(() -> new AudioPlayer().playAudio(srcFile)).start(); return; case R.id.btn_audio_encode://audio encode - String pcmFile = PATH + File.separator + "concat.pcm"; - String wavFile = PATH + File.separator + "new.wav"; + String pcmFile = PATH + File.separator + "raw.pcm"; + String wavFile = PATH + File.separator + "convert.mp3"; //sample rate, normal is 8000/16000/44100 - int sampleRate = 8000; + int sampleRate = 44100; //channel num of pcm - int channel = 1; + int channel = 2; commandLine = FFmpegUtil.encodeAudio(pcmFile, wavFile, sampleRate, channel); break; case R.id.btn_pcm_concat://concat PCM streams diff --git a/app/src/main/java/com/frank/ffmpeg/util/FileUtil.java b/app/src/main/java/com/frank/ffmpeg/util/FileUtil.java index 71a9e43..c6b1e03 100644 --- a/app/src/main/java/com/frank/ffmpeg/util/FileUtil.java +++ b/app/src/main/java/com/frank/ffmpeg/util/FileUtil.java @@ -25,6 +25,7 @@ public class FileUtil { private final static String TYPE_WAV = "wav"; private final static String TYPE_OGG = "ogg"; private final static String TYPE_AC3 = "ac3"; + private final static String TYPE_RAW = "pcm"; public final static String TYPE_MP4 = "mp4"; private final static String TYPE_MKV = "mkv"; @@ -119,7 +120,8 @@ public class FileUtil { || path.endsWith(TYPE_WMA) || path.endsWith(TYPE_WAV) || path.endsWith(TYPE_OGG) - || path.endsWith(TYPE_AC3); + || path.endsWith(TYPE_AC3) + || path.endsWith(TYPE_RAW); } public static boolean isVideo(String path) { diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index aa5d066..0ba7f4b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -6,7 +6,7 @@ Audio mix AudioTrack play OpenSL play - Audio encode + PCM encode PCM concat Audio speed Audio effect diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a46c94b..6ae293f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ 音频混合 音频解码AudioTrack播放 音频解码OpenSL播放 - 音频编码 + PCM编码 PCM合并 音频速度 音乐均衡器 diff --git a/shell/ffmpeg/build_ffmpeg_mp3.sh b/shell/ffmpeg/build_ffmpeg_mp3.sh index b15d59f..e6445b1 100644 --- a/shell/ffmpeg/build_ffmpeg_mp3.sh +++ b/shell/ffmpeg/build_ffmpeg_mp3.sh @@ -94,8 +94,8 @@ mp3float,mp3,mp3_at,mp3adufloat,mp3adu,mp3on4float,mp3on4,aac_fixed,aac_at,aac_l --disable-demuxers \ --enable-demuxer=aac,ac3,amr,amrnb,amrwb,ape,asf,asf_o,ast,avi,caf,cavsvideo,codec2,concat,data,dnxhd,flac,flv,g722,g729,\ gif,gif_pipe,h264,hevc,hls,image2,image2pipe,ingenient,jpeg_pipe,lavfi,lrc,m4v,matroska,webm,mjpeg,mov,mp4,m4a,3gp,mp3,mpeg,\ -mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,s16be,s16le,s24be,s24le,s32be,s32le,sdp,srt,swf,u16be,u16le,u24be,u24le,u32be,u32le,\ -vc1,wav,webm_dash,manifest,xmv,f32be,f32le,f64be,f64le \ +mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,pcm_s16be,pcm_s16le,pcm_s32be,pcm_s32le,sdp,srt,swf,\ +vc1,wav,webm_dash,manifest,xmv,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,mpegvideo,mulaw,sami,srt \ $ADDITIONAL_CONFIGURE_FLAG make make install diff --git a/shell/ffmpeg/build_ffmpeg_one.sh b/shell/ffmpeg/build_ffmpeg_one.sh index 516e51e..c8365b2 100644 --- a/shell/ffmpeg/build_ffmpeg_one.sh +++ b/shell/ffmpeg/build_ffmpeg_one.sh @@ -99,8 +99,8 @@ pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc,pcm_zork,ad --disable-demuxers \ --enable-demuxer=aac,ac3,alaw,amr,amrnb,amrwb,ape,asf,asf_o,avi,cavsvideo,codec2,concat,dnxhd,eac3,flac,flv,\ gif,gif_pipe,h263,h264,hevc,hls,image2,image2pipe,jpeg_pipe,lrc,m4v,matroska,webm,mjpeg,mov,mp4,m4a,3gp,mp3,mpeg,\ -mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,s16be,s16le,s24be,s24le,s32be,s32le,sdp,srt,swf,u16be,u16le,u24be,\ -u24le,u32be,u32le,vc1,wav,webm_dash,manifest,xmv,f32be,f32le,f64be,f64le,mpegvideo,mulaw,sami,srt \ +mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,pcm_s16be,pcm_s16le,pcm_s32be,pcm_s32le,sdp,srt,swf,\ +vc1,wav,webm_dash,manifest,xmv,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,mpegvideo,mulaw,sami,srt \ $ADDITIONAL_CONFIGURE_FLAG make make install diff --git a/shell/ffmpeg/build_ffmpeg_x264.sh b/shell/ffmpeg/build_ffmpeg_x264.sh index 1a7a972..b8f51cd 100644 --- a/shell/ffmpeg/build_ffmpeg_x264.sh +++ b/shell/ffmpeg/build_ffmpeg_x264.sh @@ -95,8 +95,8 @@ mp3float,mp3,mp3_at,mp3adufloat,mp3adu,mp3on4float,mp3on4,aac_fixed,aac_at,aac_l --disable-demuxers \ --enable-demuxer=aac,ac3,amr,amrnb,amrwb,ape,asf,asf_o,ast,avi,caf,cavsvideo,codec2,concat,data,dnxhd,flac,flv,g722,g729,\ gif,gif_pipe,h264,hevc,hls,image2,image2pipe,ingenient,jpeg_pipe,lavfi,lrc,m4v,matroska,webm,mjpeg,mov,mp4,m4a,3gp,mp3,mpeg,\ -mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,s16be,s16le,s24be,s24le,s32be,s32le,sdp,srt,swf,u16be,u16le,u24be,u24le,u32be,u32le,\ -vc1,wav,webm_dash,manifest,xmv,f32be,f32le,f64be,f64le \ +mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,pcm_s16be,pcm_s16le,pcm_s32be,pcm_s32le,sdp,srt,swf,\ +vc1,wav,webm_dash,manifest,xmv,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,mpegvideo,mulaw,sami,srt \ $ADDITIONAL_CONFIGURE_FLAG make make install