Skip to content

Commit

Permalink
Merge pull request #233 from ksvc/v4.3.3-15893
Browse files Browse the repository at this point in the history
update to v4.3.3-15893
  • Loading branch information
chriszeng87 authored Aug 23, 2017
2 parents 0a2cead + 4b29f32 commit 2020af1
Show file tree
Hide file tree
Showing 213 changed files with 24,716 additions and 579 deletions.
Binary file added demo/assets/KSYResource/14_amatorka.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/15_elegance_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/amaro_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/blackboard_1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/blowout_1977.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/brannan_blowout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/brannan_contrast.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/brannan_luma.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/brannan_process.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/brannan_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/early_bird_curves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/earlybird_blowout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/earlybird_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/earlybird_overlay_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/edge_burn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hefe_gradient_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hefe_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hefe_metal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hefe_soft_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hudson_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/hudson_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/inkwell_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/kelvin_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/lomo_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/map_1977.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added demo/assets/KSYResource/nashville_map.png
Binary file added demo/assets/KSYResource/nashwi.png
Binary file added demo/assets/KSYResource/overlay_map.png
Binary file added demo/assets/KSYResource/rise_map.png
Binary file added demo/assets/KSYResource/sierra_map.png
Binary file added demo/assets/KSYResource/sierra_vignette.png
Binary file added demo/assets/KSYResource/soft_light.png
Binary file added demo/assets/KSYResource/sutro_curves.png
Binary file added demo/assets/KSYResource/sutro_edge_burn.png
Binary file added demo/assets/KSYResource/sutro_metal.png
Binary file added demo/assets/KSYResource/toaster_color_shift.png
Binary file added demo/assets/KSYResource/toaster_curves.png
Binary file added demo/assets/KSYResource/toaster_metal.png
Binary file added demo/assets/KSYResource/toaster_soft_light.png
Binary file added demo/assets/KSYResource/valencia_gradient_map.png
Binary file added demo/assets/KSYResource/valencia_map.png
Binary file added demo/assets/KSYResource/vignette_map.png
Binary file added demo/assets/KSYResource/walden_map.png
Binary file added demo/assets/KSYResource/xpro_map.png
Binary file modified demo/libs/arm64-v8a/libksylive.so
Binary file not shown.
Binary file modified demo/libs/armeabi-v7a/libksylive.so
Binary file not shown.
Binary file modified demo/libs/armeabi/libksylive.so
Binary file not shown.
Binary file modified demo/libs/ksylive.jar
Binary file not shown.
Binary file modified demo/libs/x86/libksylive.so
Binary file not shown.
18 changes: 17 additions & 1 deletion demo/src/com/ksyun/media/streamer/demo/CameraActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,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);
Expand Down Expand Up @@ -492,6 +494,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()) {
Expand Down
10 changes: 8 additions & 2 deletions docs/assets/navtree_data.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2020af1

Please sign in to comment.