eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-21 07:10:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

#187, dont pass palette to push, increase precision of some parameters, disable broken gmic filters, reduce gmic logging

Browse Source
This commit is contained in:
c0ntrol
2019-05-22 20:36:08 +02:00
parent ef6de8f810
commit 5cfe56eddd
19 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
veejay-current/plugin-packs/lvdgmic/plugins/Makefile.am
View File

@@ -18,11 +18,9 @@ lividoplugin_LTLIBRARIES = gmic_cartoon.la \
gmic_abstraction.la \
gmic_whirl.la \
gmic_posteredges.la \
gmic_posterhope.la \
gmic_kuwahara.la \
gmic_pendrawing.la \
gmic_oldscool8bits.la \
gmic_tetris.la \
gmic_shifttiles.la \
gmic_edges.la \
gmic_ditheredbw.la \
@@ -98,8 +96,8 @@ gmic_whirl_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
gmic_posteredges_la_SOURCES = gmic_posteredges.c
gmic_posteredges_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
gmic_posterhope_la_SOURCES = gmic_posterhope.c
gmic_posterhope_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
#gmic_posterhope_la_SOURCES = gmic_posterhope.c
#gmic_posterhope_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
gmic_kuwahara_la_SOURCES = gmic_kuwahara.c
gmic_kuwahara_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
@@ -113,8 +111,8 @@ gmic_oldscool8bits_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
#gmic_sponge_la_SOURCES = gmic_sponge.c
#gmic_sponge_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
gmic_tetris_la_SOURCES = gmic_tetris.c
gmic_tetris_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
#gmic_tetris_la_SOURCES = gmic_tetris.c
#gmic_tetris_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic
gmic_shifttiles_la_SOURCES = gmic_shifttiles.c
gmic_shifttiles_la_LIBADD = -L$(top_builddir)/liblvdgmic -llvdgmic

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_arrayfade.c
View File

@@ -72,7 +72,7 @@ livido_process_f process_instance( livido_port_t *my_instance, double timecode
snprintf(cmd,sizeof(cmd),"-array_fade %d,%d,%d,%d,%d,%d,%d,%d",
x_tiles,y_tiles,x_offset,y_offset,fade_start,fade_end,mirror,size);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_dices.c
View File

@@ -64,7 +64,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-gimp_dices %d,%d,%d", resolution, size, colormodel );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_freeform.c
View File

@@ -76,7 +76,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
sigma/100.0f
);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_kuwahara.c
View File

@@ -62,7 +62,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-kuwahara %d,%d", iterations, radius );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_lightrelief.c
View File

@@ -84,7 +84,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
p10,
p11);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_marble.c
View File

@@ -75,7 +75,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
cutlow, cuthigh
);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_pendrawing.c
View File

@@ -61,7 +61,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-drawing %d",amplitude );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_plasma.c
View File

@@ -62,7 +62,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
int scale = lvd_extract_param_index(my_instance, "in_parameters",2);
int seed = lvd_extract_param_index(my_instance, "in_parameters",3);
snprintf(cmd,sizeof(cmd),"-srand %d -plasma %f,%f,%d", seed,alpha/100.0f, beta/100.0f, scale );
snprintf(cmd,sizeof(cmd),"-srand %d -plasma %d,%d,%d", seed,alpha, beta, scale );
lvdgmic_push( gmic, w, h, 0, A, 0);

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_posteredges.c
View File

@@ -69,7 +69,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-poster_edges %d,%d,%d,%d,%d,%d,%d",
smoothness,threshold,shade,thickness,antialiasing,posterization_lvl,posterization_aa);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

12
veejay-current/plugin-packs/lvdgmic/plugins/gmic_posterhope.c
View File

@@ -61,9 +61,9 @@ int process_instance( livido_port_t *my_instance, double timecode )
int gamma = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int smoothness = lvd_extract_param_index( my_instance,"in_parameters", 1 );
snprintf(cmd,sizeof(cmd),"-poster_hope %f,%d", (float) gamma/100.0f, smoothness );
snprintf(cmd,sizeof(cmd),"-poster_hope %f,%f", (float) gamma * 0.01f, (float) smoothness * 0.01f );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );
@@ -134,8 +134,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Gamma" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", -300 );
livido_set_int_value( port, "max", 300 );
livido_set_int_value( port, "min", -3000 );
livido_set_int_value( port, "max", 3000 );
livido_set_int_value( port, "default", 0 );
livido_set_string_value( port, "description" ,"Gamma");
@@ -146,8 +146,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Smoothness" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 20 );
livido_set_int_value( port, "default", 3 );
livido_set_int_value( port, "max", 2000 );
livido_set_int_value( port, "default", 0 );
livido_set_string_value( port, "description" ,"Smoothness");
livido_set_portptr_array( filter, "in_parameter_templates",2, in_params );

16
veejay-current/plugin-packs/lvdgmic/plugins/gmic_shockwaves.c
View File

@@ -61,9 +61,9 @@ int process_instance( livido_port_t *my_instance, double timecode )
int lowfreq = lvd_extract_param_index( my_instance,"in_parameters", 1 );
int freqrange = lvd_extract_param_index(my_instance, "in_parameters",2);
snprintf(cmd,sizeof(cmd),"-gimp_shockwaves %d,%d,%d,%d", amplitude, lowfreq, freqrange );
snprintf(cmd,sizeof(cmd),"-gimp_shockwaves %f,%f,%f,%f", (float)amplitude *0.1f, (float)lowfreq*0.1f, (float)freqrange*0.1f );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );
@@ -138,8 +138,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Amplitude" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 100 );
livido_set_int_value( port, "default", 10 );
livido_set_int_value( port, "max", 1000 );
livido_set_int_value( port, "default", 100 );
livido_set_string_value( port, "description" ,"Amplitude");
@@ -149,8 +149,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Low frequency" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 100 );
livido_set_int_value( port, "default", 10 );
livido_set_int_value( port, "max", 1000 );
livido_set_int_value( port, "default", 100 );
livido_set_string_value( port, "description" ,"Low frequency");
in_params[2] = livido_port_new( LIVIDO_PORT_TYPE_PARAMETER_TEMPLATE );
@@ -159,8 +159,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Frequency range" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 100 );
livido_set_int_value( port, "default", 20 );
livido_set_int_value( port, "max", 1000 );
livido_set_int_value( port, "default", 200 );
livido_set_string_value( port, "description" ,"Frequency range");
//@ setup the nodes

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_sponge.c
View File

@@ -61,7 +61,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-gimp_sponge %d", size);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_spread.c
View File

@@ -63,7 +63,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-spread %d,%d,%d",dx,dy,dz);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_tetris.c
View File

@@ -61,7 +61,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-gimp_tetris %d", scale);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );

23
veejay-current/plugin-packs/lvdgmic/plugins/gmic_water.c
View File

@@ -61,10 +61,11 @@ int process_instance( livido_port_t *my_instance, double timecode )
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
int smoothness = lvd_extract_param_index( my_instance,"in_parameters", 1 );
int angle = lvd_extract_param_index( my_instance, "in_parameters", 2);
snprintf(cmd,sizeof(cmd),"-water %d,%f", amplitude, (float)smoothness/100.0f);
snprintf(cmd,sizeof(cmd),"-water %f,%f,%f", (float)amplitude * 0.1f, (float)smoothness * 0.01f, (float) angle * 0.1f);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );
@@ -79,7 +80,7 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
LIVIDO_IMPORT(list);
livido_port_t *port = NULL;
livido_port_t *in_params[2];
livido_port_t *in_params[3];
livido_port_t *in_chans[3];
livido_port_t *out_chans[1];
livido_port_t *info = NULL;
@@ -136,8 +137,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Amplitude" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 300 );
livido_set_int_value( port, "default", 30 );
livido_set_int_value( port, "max", 3000 );
livido_set_int_value( port, "default", 300 );
livido_set_string_value( port, "description" ,"Amplitude");
@@ -151,9 +152,19 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_int_value( port, "default", 150 );
livido_set_string_value( port, "description" ,"Smoothness");
in_params[2] = livido_port_new( LIVIDO_PORT_TYPE_PARAMETER_TEMPLATE );
port = in_params[2];
livido_set_string_value(port, "name", "Angle" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 1800 );
livido_set_int_value( port, "default", 450 );
livido_set_string_value( port, "description" ,"Angle");
//@ setup the nodes
livido_set_portptr_array( filter, "in_parameter_templates",2, in_params );
livido_set_portptr_array( filter, "in_parameter_templates",3, in_params );
livido_set_portptr_array( filter, "out_channel_templates", 1, out_chans );
livido_set_portptr_array( filter, "in_channel_templates",1, in_chans );

8
veejay-current/plugin-packs/lvdgmic/plugins/gmic_wave.c
View File

@@ -62,9 +62,9 @@ int process_instance( livido_port_t *my_instance, double timecode )
int x_center = lvd_extract_param_index(my_instance, "in_parameters",2);
int y_center = lvd_extract_param_index(my_instance, "in_parameters",3);
snprintf(cmd,sizeof(cmd),"-wave %d,%f,%d,%d", amplitude, (float)frequency/100.0f,x_center,y_center);
snprintf(cmd,sizeof(cmd),"-wave %f,%f,%d,%d", (float)amplitude * 0.1f, (float)frequency * 0.01f,x_center,y_center);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );
@@ -136,8 +136,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Amplitude" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 30 );
livido_set_int_value( port, "default", 10 );
livido_set_int_value( port, "max", 300 );
livido_set_int_value( port, "default", 100 );
livido_set_string_value( port, "description" ,"Amplitude");

8
veejay-current/plugin-packs/lvdgmic/plugins/gmic_whirl.c
View File

@@ -60,9 +60,9 @@ int process_instance( livido_port_t *my_instance, double timecode )
int amplitude = lvd_extract_param_index( my_instance,"in_parameters", 0 );
snprintf(cmd,sizeof(cmd),"-draw_whirl %d", amplitude );
snprintf(cmd,sizeof(cmd),"-draw_whirl %f", (float)amplitude * 0.1f );
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );
@@ -135,8 +135,8 @@ livido_port_t *livido_setup(livido_setup_t list[], int version)
livido_set_string_value(port, "name", "Amplitude" );
livido_set_string_value(port, "kind", "INDEX" );
livido_set_int_value( port, "min", 0 );
livido_set_int_value( port, "max", 100 );
livido_set_int_value( port, "default", 20 );
livido_set_int_value( port, "max", 1000 );
livido_set_int_value( port, "default", 200 );
livido_set_string_value( port, "description" ,"Amplitude");
livido_set_portptr_array( filter, "in_parameter_templates",1,in_params );

2
veejay-current/plugin-packs/lvdgmic/plugins/gmic_wind.c
View File

@@ -65,7 +65,7 @@ int process_instance( livido_port_t *my_instance, double timecode )
snprintf(cmd,sizeof(cmd),"-wind %d,%d,%f,%d,%d", amplitude, angle,(float)attenuation/100.0f,threshold,mode);
lvdgmic_push( gmic, w, h, palette, A, 0);
lvdgmic_push( gmic, w, h, 0, A, 0);
lvdgmic_gmic( gmic, cmd );