diff --git a/README.md b/README.md index 476ee43..40d906c 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Language: [English](README_EN.md) | mp3lame | √ | 支持MP3音频编解码 | | fdk-aac | √ | 支持AAC音频编解码 | | 格式转换 | √ | 如: avi > mp4 > avi; mp3 > aac > mp3 等 | -| https | × | 【已列入到 3.1.0 版本计划中...】 | +| https | × | version >= 3.1.0 支持 https | | [常用命令](preview/docs/cmd.md) | √ | 持续更新 [点击查看](preview/docs/cmd.md) | @@ -84,7 +84,7 @@ allprojects { ```groovy dependencies { - implementation 'com.github.microshow:RxFFmpeg:3.0.0' + implementation 'com.github.microshow:RxFFmpeg:3.1.0' } ``` diff --git a/app/build.gradle b/app/build.gradle index 022b3ea..a1bb0ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,5 +94,5 @@ dependencies { implementation project(path: ':rxffmpeg') -// implementation 'com.github.microshow:RxFFmpeg:3.0.0' +// implementation 'com.github.microshow:RxFFmpeg:3.1.0' } diff --git a/configs.gradle b/configs.gradle index e81867a..a6f055d 100644 --- a/configs.gradle +++ b/configs.gradle @@ -11,8 +11,8 @@ ext { //支持包版本 supportLibValue = "28.0.0" //应用 versionCode - versionCodeValue = 300 + versionCodeValue = 310 //应用 version 名称,更多设置里显示的 - versionNameValue = "3.0.0" + versionNameValue = "3.1.0" } \ No newline at end of file diff --git a/preview/app-release.apk b/preview/app-release.apk index 032fa0b..3ad387b 100644 Binary files a/preview/app-release.apk and b/preview/app-release.apk differ diff --git a/preview/docs/cmd.md b/preview/docs/cmd.md index 1ebe722..62d243c 100644 --- a/preview/docs/cmd.md +++ b/preview/docs/cmd.md @@ -162,6 +162,16 @@ ffmpeg -y -i null.ape -ar 44100 -ac 2 -ab 16k -vol 50 -f mp3 null.mp3 -vol <百分比> 设定音量 +# 在线视频处理(支持 http / https / rtmp / hls / m3u8...等等) + +* 下载rtmp(湖南卫视)直播流的10秒视频转成mp4,并保存到本地 + +```java + +ffmpeg -y -i rtmp://58.200.131.2:1935/livetv/hunantv -t 10 -preset superfast /storage/emulated/0/1/result.mp4 + +``` + # 高级用法 diff --git a/rxffmpeg/libs/arm64-v8a/librxffmpeg-core.so b/rxffmpeg/libs/arm64-v8a/librxffmpeg-core.so index 47a32ae..43eede1 100644 Binary files a/rxffmpeg/libs/arm64-v8a/librxffmpeg-core.so and b/rxffmpeg/libs/arm64-v8a/librxffmpeg-core.so differ diff --git a/rxffmpeg/libs/arm64-v8a/librxffmpeg-invoke.so b/rxffmpeg/libs/arm64-v8a/librxffmpeg-invoke.so index cbcf35f..2940e30 100644 Binary files a/rxffmpeg/libs/arm64-v8a/librxffmpeg-invoke.so and b/rxffmpeg/libs/arm64-v8a/librxffmpeg-invoke.so differ diff --git a/rxffmpeg/libs/armeabi-v7a/librxffmpeg-core.so b/rxffmpeg/libs/armeabi-v7a/librxffmpeg-core.so index 52b2234..8e63230 100644 Binary files a/rxffmpeg/libs/armeabi-v7a/librxffmpeg-core.so and b/rxffmpeg/libs/armeabi-v7a/librxffmpeg-core.so differ diff --git a/rxffmpeg/libs/armeabi-v7a/librxffmpeg-invoke.so b/rxffmpeg/libs/armeabi-v7a/librxffmpeg-invoke.so index ad50511..d7e2b81 100644 Binary files a/rxffmpeg/libs/armeabi-v7a/librxffmpeg-invoke.so and b/rxffmpeg/libs/armeabi-v7a/librxffmpeg-invoke.so differ diff --git a/rxffmpeg/libs/x86/librxffmpeg-core.so b/rxffmpeg/libs/x86/librxffmpeg-core.so index 115524d..ebc6766 100644 Binary files a/rxffmpeg/libs/x86/librxffmpeg-core.so and b/rxffmpeg/libs/x86/librxffmpeg-core.so differ diff --git a/rxffmpeg/libs/x86/librxffmpeg-invoke.so b/rxffmpeg/libs/x86/librxffmpeg-invoke.so index 2a888e9..bbc8ff7 100644 Binary files a/rxffmpeg/libs/x86/librxffmpeg-invoke.so and b/rxffmpeg/libs/x86/librxffmpeg-invoke.so differ diff --git a/rxffmpeg/libs/x86_64/librxffmpeg-core.so b/rxffmpeg/libs/x86_64/librxffmpeg-core.so index aee585a..0bc9cfa 100644 Binary files a/rxffmpeg/libs/x86_64/librxffmpeg-core.so and b/rxffmpeg/libs/x86_64/librxffmpeg-core.so differ diff --git a/rxffmpeg/libs/x86_64/librxffmpeg-invoke.so b/rxffmpeg/libs/x86_64/librxffmpeg-invoke.so index 13aa46e..7d7eee9 100644 Binary files a/rxffmpeg/libs/x86_64/librxffmpeg-invoke.so and b/rxffmpeg/libs/x86_64/librxffmpeg-invoke.so differ