Merge pull request #54 from ksvc/3.3.3.0

add 3.3.3.0
fpzeng · Sep 20, 2016 · ef80b4b · ef80b4b
2 parents 7153121 + 4882d79
commit ef80b4b
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 6 deletions.
diff --git a/demo/libs/armeabi-v7a/libksyplayer.so b/demo/libs/armeabi-v7a/libksyplayer.so
diff --git a/demo/libs/armeabi-v7a/libksystreamer.so b/demo/libs/armeabi-v7a/libksystreamer.so
diff --git a/demo/libs/ksylive3.0.jar b/demo/libs/ksylive3.0.jar
diff --git a/demo/libs/libksyplayer.jar b/demo/libs/libksyplayer.jar
diff --git a/demo/src/com/ksy/recordlib/demo/CameraActivity.java b/demo/src/com/ksy/recordlib/demo/CameraActivity.java
@@ -611,17 +611,17 @@ private void hideWaterMark() {
     private void showChooseFilter() {
         AlertDialog alertDialog;
         alertDialog = new AlertDialog.Builder(this).setTitle("请选择美颜滤镜").setSingleChoiceItems(
-                new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE", "DEMOFILTER", "SPLIT_E/P_FILTER", "GROUP_FILTER"}, -1, new DialogInterface.OnClickListener() {
+                new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE", "SHAPER", "DEMOFILTER", "SPLIT_E/P_FILTER", "GROUP_FILTER"}, -1, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (which < 4) {
+                        if (which < 5) {
                             mStreamer.setBeautyFilter(which + 16);
-                        } else if (which == 4) {
-
                         } else if (which == 5) {
+
+                        } else if (which == 6) {
                             mStreamer.setBeautyFilter(new DEMOFILTER(), RecorderConstants.FILTER_USAGE_ENCODE);
                             mStreamer.setBeautyFilter(new DEMOFILTER2(), RecorderConstants.FILTER_USAGE_PREVIEW);
-                        } else if (which == 6) {
+                        } else if (which == 7) {
                             mStreamer.setBeautyFilter(new GroupFilterDemo());
                         }
                         dialog.dismiss();

diff --git a/libs/arm64-v8a/libksyplayer.so b/libs/arm64-v8a/libksyplayer.so
diff --git a/libs/arm64-v8a/libksystreamer.so b/libs/arm64-v8a/libksystreamer.so
diff --git a/libs/armeabi-v7a/libksyplayer.so b/libs/armeabi-v7a/libksyplayer.so
diff --git a/libs/armeabi-v7a/libksystreamer.so b/libs/armeabi-v7a/libksystreamer.so
diff --git a/libs/ksylive3.0.jar b/libs/ksylive3.0.jar
diff --git a/libs/libksyplayer.jar b/libs/libksyplayer.jar
diff --git a/libs/x86/libksyplayer.so b/libs/x86/libksyplayer.so
diff --git a/libs/x86/libksystreamer.so b/libs/x86/libksystreamer.so
diff --git a/release_note.txt b/release_note.txt
@@ -235,4 +235,10 @@
 121. 修复魅族pro5 5.1.9.0A版本固件上预览黑屏的bug
 122. 修复软编偶现crash问题
 123. 特殊情况下，音视频不同步时上报给APP
-124. 升级libksyplayer.jar为1.5.0版本
+124. 升级libksyplayer.jar为1.5.0版本
+
+2016-09-13 3.3.3.0
+125. 修复软编推流开始前接口isFrontCamera返回错误问题
+126. 增加sharpen滤镜
+127. 特殊情况下，音视频不同步时上报给APP(硬编部分)
+128. 升级libksyplayer.jar为1.5.1版本