Merge pull request #64 from ksvc/v2.4.3-15893

update to v2.4.3-15893
ksvc · Aug 23, 2017 · 10fa92f · 10fa92f
2 parents 553f5ab + e5415f2
commit 10fa92f
Show file tree

Hide file tree

Showing 51 changed files with 17 additions and 1 deletion.
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/14_amatorka.png b/KSYLiveDemo/app/src/main/assets/KSYResource/14_amatorka.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/15_elegance_1.png b/KSYLiveDemo/app/src/main/assets/KSYResource/15_elegance_1.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/amaro_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/amaro_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/blackboard_1024.png b/KSYLiveDemo/app/src/main/assets/KSYResource/blackboard_1024.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/blowout_1977.png b/KSYLiveDemo/app/src/main/assets/KSYResource/blowout_1977.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_blowout.png b/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_blowout.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_contrast.png b/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_contrast.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_luma.png b/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_luma.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_process.png b/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_process.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_screen.png b/KSYLiveDemo/app/src/main/assets/KSYResource/brannan_screen.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/early_bird_curves.png b/KSYLiveDemo/app/src/main/assets/KSYResource/early_bird_curves.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_blowout.png b/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_blowout.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_overlay_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/earlybird_overlay_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/edge_burn.png b/KSYLiveDemo/app/src/main/assets/KSYResource/edge_burn.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_gradient_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_gradient_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_metal.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_metal.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_soft_light.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hefe_soft_light.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hudson_background.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hudson_background.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/hudson_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/hudson_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/inkwell_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/inkwell_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/kelvin_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/kelvin_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/lomo_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/lomo_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/map_1977.png b/KSYLiveDemo/app/src/main/assets/KSYResource/map_1977.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/nashville_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/nashville_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/nashwi.png b/KSYLiveDemo/app/src/main/assets/KSYResource/nashwi.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/overlay_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/overlay_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/rise_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/rise_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/sierra_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/sierra_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/sierra_vignette.png b/KSYLiveDemo/app/src/main/assets/KSYResource/sierra_vignette.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/soft_light.png b/KSYLiveDemo/app/src/main/assets/KSYResource/soft_light.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_curves.png b/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_curves.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_edge_burn.png b/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_edge_burn.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_metal.png b/KSYLiveDemo/app/src/main/assets/KSYResource/sutro_metal.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_color_shift.png b/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_color_shift.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_curves.png b/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_curves.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_metal.png b/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_metal.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_overlay_map_warm.png b/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_overlay_map_warm.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_soft_light.png b/KSYLiveDemo/app/src/main/assets/KSYResource/toaster_soft_light.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/valencia_gradient_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/valencia_gradient_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/valencia_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/valencia_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/vignette_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/vignette_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/walden_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/walden_map.png
diff --git a/KSYLiveDemo/app/src/main/assets/KSYResource/xpro_map.png b/KSYLiveDemo/app/src/main/assets/KSYResource/xpro_map.png
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java
@@ -434,7 +434,9 @@ public void onError(ImgTexFilterBase filter, int errno) {
     private void initBeautyUI() {
         String[] items = new String[]{"DISABLE", "BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION",
                 "BEAUTY_DENOISE", "BEAUTY_SMOOTH", "BEAUTY_PRO", "BEAUTY_PRO2", "BEAUTY_PRO3",
-                "BEAUTY_PRO4", "DEMO_FILTER", "GROUP_FILTER", "ToneCurve", "复古", "胶片"};
+                "BEAUTY_PRO4", "DEMO_FILTER", "GROUP_FILTER", "ToneCurve", "复古", "胶片","Amatorka",
+                "ELEGANCE","1977","Amaro","Brannan","EarlyBird","Hefe","Hudson","ink",
+                "Lomo","LordKelvin","Nash","Rise","Sierra","Sutro","Toaster","Valencia","Walden","XproII"};
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
                 android.R.layout.simple_spinner_item, items);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -493,6 +495,20 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
                             CameraActivity.this.getResources().openRawResource(R.raw.jiaopian));
 
                     mStreamer.getImgTexFilterMgt().setFilter(acvFilter);
+                }else if (position == 15) {
+                    ImgBeautySpecialEffectsFilter acvFilter= new ImgBeautySpecialEffectsFilter(mStreamer.getGLRender(),
+                            CameraActivity.this,
+                            ImgBeautySpecialEffectsFilter.KSY_SPECIAL_EFFECT_AMATORKA);
+                    mStreamer.getImgTexFilterMgt().setFilter(acvFilter);
+                }else if (position == 16){
+                    ImgBeautySpecialEffectsFilter acvFilter= new ImgBeautySpecialEffectsFilter(mStreamer.getGLRender(),
+                            CameraActivity.this,
+                            ImgBeautySpecialEffectsFilter.KSY_SPECIAL_EFFECT_ELEGANCE);
+                    mStreamer.getImgTexFilterMgt().setFilter(acvFilter);
+                }else if (position >= 17 && position <= 33){
+                    int diff = position - 17;
+                    mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                            ImgTexFilterMgt.KSY_FILTER_BEAUTY_1977 + diff);
                 }
                 List<ImgFilterBase> filters = mStreamer.getImgTexFilterMgt().getFilter();
                 if (filters != null && !filters.isEmpty()) {

diff --git a/KSYLiveDemo/libksylive/libs/arm64-v8a/libksylive.so b/KSYLiveDemo/libksylive/libs/arm64-v8a/libksylive.so
diff --git a/KSYLiveDemo/libksylive/libs/armeabi-v7a/libksylive.so b/KSYLiveDemo/libksylive/libs/armeabi-v7a/libksylive.so
diff --git a/KSYLiveDemo/libksylive/libs/armeabi/libksylive.so b/KSYLiveDemo/libksylive/libs/armeabi/libksylive.so
diff --git a/KSYLiveDemo/libksylive/libs/ksylive.jar b/KSYLiveDemo/libksylive/libs/ksylive.jar
diff --git a/KSYLiveDemo/libksylive/libs/x86/libksylive.so b/KSYLiveDemo/libksylive/libs/x86/libksylive.so