Merge pull request #175 from Johnny1994/dev

Release v3.1.1
pili-engineering · Feb 7, 2020 · e22ea43 · e22ea43
2 parents 50b683b + ae0aeaf
commit e22ea43
Show file tree

Hide file tree

Showing 85 changed files with 39 additions and 4 deletions.
diff --git a/PLDroidShortVideoDemo/app/build.gradle b/PLDroidShortVideoDemo/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.qiniu.pili.droid.shortvideo.demo"
         minSdkVersion 18
         targetSdkVersion 26
-        versionCode 28
-        versionName "3.1.0"
+        versionCode 29
+        versionName "3.1.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
@@ -33,7 +33,7 @@ android {
 
 dependencies {
     implementation 'com.qiniu:qiniu-android-sdk:7.3.11'
-    implementation files('libs/pldroid-shortvideo-3.1.0.jar')
+    implementation files('libs/pldroid-shortvideo-3.1.1.jar')
     implementation files('libs/pldroid-player-2.1.8.jar')
     implementation files('libs/EasyAR.jar')
     implementation files('libs/EasyAR3D.jar')

diff --git a/...emo/app/libs/pldroid-shortvideo-3.1.0.jar → ...emo/app/libs/pldroid-shortvideo-3.1.1.jar b/...emo/app/libs/pldroid-shortvideo-3.1.0.jar → ...emo/app/libs/pldroid-shortvideo-3.1.1.jar
diff --git a/PLDroidShortVideoDemo/app/proguard-rules.pro b/PLDroidShortVideoDemo/app/proguard-rules.pro
@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-keep class com.qiniu.pili.droid.**{*;}
+-keep class com.pili.pldroid.player.**{*;}
+-keep class com.qiniu.qplayer.mediaEngine.MediaPlayer{*;}
diff --git a/ReleaseNotes/release-notes-3.0.1.md b/ReleaseNotes/release-notes-3.0.1.md
@@ -1,4 +1,4 @@
-# PLDroidShortVideo Release Notes for 3.0.0
+# PLDroidShortVideo Release Notes for 3.0.1
 
 ### 简介
 

diff --git a/ReleaseNotes/release-notes-3.1.1.md b/ReleaseNotes/release-notes-3.1.1.md
@@ -0,0 +1,32 @@
+# PLDroidShortVideo Release Notes for 3.1.1
+
+### 简介
+
+PLDroidShortVideo 是七牛推出的一款适用于 Android 平台的短视频 SDK，提供了包括美颜、滤镜、水印、断点录制、分段回删、视频编辑、混音特效、本地/云端存储在内的多种功能，支持高度定制以及二次开发。
+
+### 版本
+
+* 发布 pldroid-shortvideo-3.1.1.jar
+* 更新 libpldroid_shortvideo_core.so
+* 更新 libpldroid_amix.so
+
+### 缺陷
+
+* 升级 FFmpeg 版本，修复版本漏洞问题
+
+### 注意事项
+
+* 从 v3.1.0 版本开始，需要在 Application 中初始化 sdk：
+
+```java
+PLShortVideoEnv.init(getApplicationContext());
+```
+
+* 七牛短视频 SDK 自 v3.0.0 版本起, 划分为精简版、基础版、进阶版、专业版。不同版本 SDK 可以使用的功能点数量有差别，请按照购买的 License 版本使用对应的短视频 SDK 版本。
+* 上传 SDK 的依赖需要更新到如下版本：
+
+```java
+compile 'com.qiniu:qiniu-android-sdk:7.3.11'
+```
+
+
diff --git a/releases/releases_advanced/arm64-v8a/libpldroid_amix.so b/releases/releases_advanced/arm64-v8a/libpldroid_amix.so
diff --git a/releases/releases_advanced/arm64-v8a/libpldroid_beauty.so b/releases/releases_advanced/arm64-v8a/libpldroid_beauty.so
diff --git a/releases/releases_advanced/arm64-v8a/libpldroid_crash.so b/releases/releases_advanced/arm64-v8a/libpldroid_crash.so
diff --git a/releases/releases_advanced/arm64-v8a/libpldroid_encoder.so b/releases/releases_advanced/arm64-v8a/libpldroid_encoder.so
diff --git a/releases/releases_advanced/arm64-v8a/libpldroid_shortvideo_core.so b/releases/releases_advanced/arm64-v8a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_advanced/armeabi-v7a/libpldroid_amix.so b/releases/releases_advanced/armeabi-v7a/libpldroid_amix.so
diff --git a/releases/releases_advanced/armeabi-v7a/libpldroid_beauty.so b/releases/releases_advanced/armeabi-v7a/libpldroid_beauty.so
diff --git a/releases/releases_advanced/armeabi-v7a/libpldroid_crash.so b/releases/releases_advanced/armeabi-v7a/libpldroid_crash.so
diff --git a/releases/releases_advanced/armeabi-v7a/libpldroid_encoder.so b/releases/releases_advanced/armeabi-v7a/libpldroid_encoder.so
diff --git a/releases/releases_advanced/armeabi-v7a/libpldroid_shortvideo_core.so b/releases/releases_advanced/armeabi-v7a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_advanced/armeabi/libpldroid_amix.so b/releases/releases_advanced/armeabi/libpldroid_amix.so
diff --git a/releases/releases_advanced/armeabi/libpldroid_beauty.so b/releases/releases_advanced/armeabi/libpldroid_beauty.so
diff --git a/releases/releases_advanced/armeabi/libpldroid_crash.so b/releases/releases_advanced/armeabi/libpldroid_crash.so
diff --git a/releases/releases_advanced/armeabi/libpldroid_encoder.so b/releases/releases_advanced/armeabi/libpldroid_encoder.so
diff --git a/releases/releases_advanced/armeabi/libpldroid_shortvideo_core.so b/releases/releases_advanced/armeabi/libpldroid_shortvideo_core.so
diff --git a/...ses_advanced/pldroid-shortvideo-3.1.0.jar → ...ses_advanced/pldroid-shortvideo-3.1.1.jar b/...ses_advanced/pldroid-shortvideo-3.1.0.jar → ...ses_advanced/pldroid-shortvideo-3.1.1.jar
diff --git a/releases/releases_advanced/x86/libpldroid_amix.so b/releases/releases_advanced/x86/libpldroid_amix.so
diff --git a/releases/releases_advanced/x86/libpldroid_beauty.so b/releases/releases_advanced/x86/libpldroid_beauty.so
diff --git a/releases/releases_advanced/x86/libpldroid_crash.so b/releases/releases_advanced/x86/libpldroid_crash.so
diff --git a/releases/releases_advanced/x86/libpldroid_encoder.so b/releases/releases_advanced/x86/libpldroid_encoder.so
diff --git a/releases/releases_advanced/x86/libpldroid_shortvideo_core.so b/releases/releases_advanced/x86/libpldroid_shortvideo_core.so
diff --git a/releases/releases_basic/arm64-v8a/libpldroid_amix.so b/releases/releases_basic/arm64-v8a/libpldroid_amix.so
diff --git a/releases/releases_basic/arm64-v8a/libpldroid_beauty.so b/releases/releases_basic/arm64-v8a/libpldroid_beauty.so
diff --git a/releases/releases_basic/arm64-v8a/libpldroid_crash.so b/releases/releases_basic/arm64-v8a/libpldroid_crash.so
diff --git a/releases/releases_basic/arm64-v8a/libpldroid_encoder.so b/releases/releases_basic/arm64-v8a/libpldroid_encoder.so
diff --git a/releases/releases_basic/arm64-v8a/libpldroid_shortvideo_core.so b/releases/releases_basic/arm64-v8a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_basic/armeabi-v7a/libpldroid_amix.so b/releases/releases_basic/armeabi-v7a/libpldroid_amix.so
diff --git a/releases/releases_basic/armeabi-v7a/libpldroid_beauty.so b/releases/releases_basic/armeabi-v7a/libpldroid_beauty.so
diff --git a/releases/releases_basic/armeabi-v7a/libpldroid_crash.so b/releases/releases_basic/armeabi-v7a/libpldroid_crash.so
diff --git a/releases/releases_basic/armeabi-v7a/libpldroid_encoder.so b/releases/releases_basic/armeabi-v7a/libpldroid_encoder.so
diff --git a/releases/releases_basic/armeabi-v7a/libpldroid_shortvideo_core.so b/releases/releases_basic/armeabi-v7a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_basic/armeabi/libpldroid_amix.so b/releases/releases_basic/armeabi/libpldroid_amix.so
diff --git a/releases/releases_basic/armeabi/libpldroid_beauty.so b/releases/releases_basic/armeabi/libpldroid_beauty.so
diff --git a/releases/releases_basic/armeabi/libpldroid_crash.so b/releases/releases_basic/armeabi/libpldroid_crash.so
diff --git a/releases/releases_basic/armeabi/libpldroid_encoder.so b/releases/releases_basic/armeabi/libpldroid_encoder.so
diff --git a/releases/releases_basic/armeabi/libpldroid_shortvideo_core.so b/releases/releases_basic/armeabi/libpldroid_shortvideo_core.so
diff --git a/...leases_basic/pldroid-shortvideo-3.1.0.jar → ...leases_basic/pldroid-shortvideo-3.1.1.jar b/...leases_basic/pldroid-shortvideo-3.1.0.jar → ...leases_basic/pldroid-shortvideo-3.1.1.jar
diff --git a/releases/releases_basic/x86/libpldroid_amix.so b/releases/releases_basic/x86/libpldroid_amix.so
diff --git a/releases/releases_basic/x86/libpldroid_beauty.so b/releases/releases_basic/x86/libpldroid_beauty.so
diff --git a/releases/releases_basic/x86/libpldroid_crash.so b/releases/releases_basic/x86/libpldroid_crash.so
diff --git a/releases/releases_basic/x86/libpldroid_encoder.so b/releases/releases_basic/x86/libpldroid_encoder.so
diff --git a/releases/releases_basic/x86/libpldroid_shortvideo_core.so b/releases/releases_basic/x86/libpldroid_shortvideo_core.so
diff --git a/releases/releases_professional/arm64-v8a/libpldroid_amix.so b/releases/releases_professional/arm64-v8a/libpldroid_amix.so
diff --git a/releases/releases_professional/arm64-v8a/libpldroid_beauty.so b/releases/releases_professional/arm64-v8a/libpldroid_beauty.so
diff --git a/releases/releases_professional/arm64-v8a/libpldroid_crash.so b/releases/releases_professional/arm64-v8a/libpldroid_crash.so
diff --git a/releases/releases_professional/arm64-v8a/libpldroid_encoder.so b/releases/releases_professional/arm64-v8a/libpldroid_encoder.so
diff --git a/releases/releases_professional/arm64-v8a/libpldroid_shortvideo_core.so b/releases/releases_professional/arm64-v8a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_professional/armeabi-v7a/libpldroid_amix.so b/releases/releases_professional/armeabi-v7a/libpldroid_amix.so
diff --git a/releases/releases_professional/armeabi-v7a/libpldroid_beauty.so b/releases/releases_professional/armeabi-v7a/libpldroid_beauty.so
diff --git a/releases/releases_professional/armeabi-v7a/libpldroid_crash.so b/releases/releases_professional/armeabi-v7a/libpldroid_crash.so
diff --git a/releases/releases_professional/armeabi-v7a/libpldroid_encoder.so b/releases/releases_professional/armeabi-v7a/libpldroid_encoder.so
diff --git a/releases/releases_professional/armeabi-v7a/libpldroid_shortvideo_core.so b/releases/releases_professional/armeabi-v7a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_professional/armeabi/libpldroid_amix.so b/releases/releases_professional/armeabi/libpldroid_amix.so
diff --git a/releases/releases_professional/armeabi/libpldroid_beauty.so b/releases/releases_professional/armeabi/libpldroid_beauty.so
diff --git a/releases/releases_professional/armeabi/libpldroid_crash.so b/releases/releases_professional/armeabi/libpldroid_crash.so
diff --git a/releases/releases_professional/armeabi/libpldroid_encoder.so b/releases/releases_professional/armeabi/libpldroid_encoder.so
diff --git a/releases/releases_professional/armeabi/libpldroid_shortvideo_core.so b/releases/releases_professional/armeabi/libpldroid_shortvideo_core.so
diff --git a/...professional/pldroid-shortvideo-3.1.0.jar → ...professional/pldroid-shortvideo-3.1.1.jar b/...professional/pldroid-shortvideo-3.1.0.jar → ...professional/pldroid-shortvideo-3.1.1.jar
diff --git a/releases/releases_professional/x86/libpldroid_amix.so b/releases/releases_professional/x86/libpldroid_amix.so
diff --git a/releases/releases_professional/x86/libpldroid_beauty.so b/releases/releases_professional/x86/libpldroid_beauty.so
diff --git a/releases/releases_professional/x86/libpldroid_crash.so b/releases/releases_professional/x86/libpldroid_crash.so
diff --git a/releases/releases_professional/x86/libpldroid_encoder.so b/releases/releases_professional/x86/libpldroid_encoder.so
diff --git a/releases/releases_professional/x86/libpldroid_shortvideo_core.so b/releases/releases_professional/x86/libpldroid_shortvideo_core.so
diff --git a/releases/releases_smart/arm64-v8a/libpldroid_beauty.so b/releases/releases_smart/arm64-v8a/libpldroid_beauty.so
diff --git a/releases/releases_smart/arm64-v8a/libpldroid_crash.so b/releases/releases_smart/arm64-v8a/libpldroid_crash.so
diff --git a/releases/releases_smart/arm64-v8a/libpldroid_encoder.so b/releases/releases_smart/arm64-v8a/libpldroid_encoder.so
diff --git a/releases/releases_smart/arm64-v8a/libpldroid_shortvideo_core.so b/releases/releases_smart/arm64-v8a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_smart/armeabi-v7a/libpldroid_beauty.so b/releases/releases_smart/armeabi-v7a/libpldroid_beauty.so
diff --git a/releases/releases_smart/armeabi-v7a/libpldroid_crash.so b/releases/releases_smart/armeabi-v7a/libpldroid_crash.so
diff --git a/releases/releases_smart/armeabi-v7a/libpldroid_encoder.so b/releases/releases_smart/armeabi-v7a/libpldroid_encoder.so
diff --git a/releases/releases_smart/armeabi-v7a/libpldroid_shortvideo_core.so b/releases/releases_smart/armeabi-v7a/libpldroid_shortvideo_core.so
diff --git a/releases/releases_smart/armeabi/libpldroid_beauty.so b/releases/releases_smart/armeabi/libpldroid_beauty.so
diff --git a/releases/releases_smart/armeabi/libpldroid_crash.so b/releases/releases_smart/armeabi/libpldroid_crash.so
diff --git a/releases/releases_smart/armeabi/libpldroid_encoder.so b/releases/releases_smart/armeabi/libpldroid_encoder.so
diff --git a/releases/releases_smart/armeabi/libpldroid_shortvideo_core.so b/releases/releases_smart/armeabi/libpldroid_shortvideo_core.so
diff --git a/...leases_smart/pldroid-shortvideo-3.1.0.jar → ...leases_smart/pldroid-shortvideo-3.1.1.jar b/...leases_smart/pldroid-shortvideo-3.1.0.jar → ...leases_smart/pldroid-shortvideo-3.1.1.jar
diff --git a/releases/releases_smart/x86/libpldroid_beauty.so b/releases/releases_smart/x86/libpldroid_beauty.so
diff --git a/releases/releases_smart/x86/libpldroid_crash.so b/releases/releases_smart/x86/libpldroid_crash.so
diff --git a/releases/releases_smart/x86/libpldroid_encoder.so b/releases/releases_smart/x86/libpldroid_encoder.so
diff --git a/releases/releases_smart/x86/libpldroid_shortvideo_core.so b/releases/releases_smart/x86/libpldroid_shortvideo_core.so