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

issue #42, add mean filter, constrain bg subtraction filters to 1 instance

Browse Source
This commit is contained in:
c0ntrol
2016-04-02 16:34:44 +02:00
parent 81da37e5f0
commit a2db1d5501
21 changed files with 493 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
veejay-current/veejay-server/libstream/vj-tag.c
View File

@@ -1277,7 +1277,7 @@ int vj_tag_del(int id)
break;
}
vj_tag_chain_free( tag->id );
vj_tag_chain_free( tag->id,1 );
if(tag->encoder_active)
vj_tag_stop_encoder( tag->id );
@@ -1952,7 +1952,7 @@ int vj_tag_chain_malloc(int t1)
return sum;
}
int vj_tag_chain_free(int t1)
int vj_tag_chain_free(int t1, int global)
{
vj_tag *tag = vj_tag_get(t1);
int i=0;
@@ -1966,7 +1966,7 @@ int vj_tag_chain_free(int t1)
{
if(vj_effect_initialized(e_id, tag->effect_chain[i]->fx_instance) )
{
vj_effect_deactivate(e_id, tag->effect_chain[i]->fx_instance);
vj_effect_deactivate(e_id, tag->effect_chain[i]->fx_instance, global);
tag->effect_chain[i]->fx_instance = NULL;
tag->effect_chain[i]->clear = 1;
if(tag->effect_chain[i]->kf)
@@ -1974,11 +1974,12 @@ int vj_tag_chain_free(int t1)
tag->effect_chain[i]->kf = vpn(VEVO_ANONYMOUS_PORT );
sum++;
}
if( tag->effect_chain[i]->source_type == 1 &&
vj_tag_get_active( tag->effect_chain[i]->channel ) &&
vj_tag_get_type( tag->effect_chain[i]->channel ) == VJ_TAG_TYPE_NET ) {
vj_tag_disable( tag->effect_chain[i]->channel );
if( tag->effect_chain[i]->source_type == 1 &&
vj_tag_get_active( tag->effect_chain[i]->channel ) &&
vj_tag_get_type( tag->effect_chain[i]->channel ) == VJ_TAG_TYPE_NET ) {
vj_tag_disable( tag->effect_chain[i]->channel );
}
}
}
@@ -2098,6 +2099,9 @@ int vj_tag_set_effect(int t1, int position, int effect_id)
if (position < 0 || position >= SAMPLE_MAX_EFFECTS)
return 0;
if( vj_effect_single_instance( effect_id ))
return 0;
if( tag->effect_chain[position]->effect_id != -1 && tag->effect_chain[position]->effect_id != effect_id )
{
//verify if the effect should be discarded
@@ -2112,13 +2116,13 @@ int vj_tag_set_effect(int t1, int position, int effect_id)
frm = 0;
}
if( frm == 1 ) {
vj_effect_deactivate( tag->effect_chain[position]->effect_id, tag->effect_chain[position]->fx_instance );
vj_effect_deactivate( tag->effect_chain[position]->effect_id, tag->effect_chain[position]->fx_instance,1 );
tag->effect_chain[position]->fx_instance = NULL;
tag->effect_chain[position]->clear = 1;
}
}
else {
vj_effect_deactivate( tag->effect_chain[position]->effect_id, tag->effect_chain[position]->fx_instance );
vj_effect_deactivate( tag->effect_chain[position]->effect_id, tag->effect_chain[position]->fx_instance,1 );
tag->effect_chain[position]->fx_instance = NULL;
tag->effect_chain[position]->clear = 1;
}
@@ -2671,7 +2675,7 @@ int vj_tag_chain_remove(int t1, int index)
{
if( vj_effect_initialized( tag->effect_chain[index]->effect_id, tag->effect_chain[index]->fx_instance ) && vj_tag_chain_can_delete( tag, index, tag->effect_chain[index]->effect_id ) )
{
vj_effect_deactivate( tag->effect_chain[index]->effect_id, tag->effect_chain[index]->fx_instance );
vj_effect_deactivate( tag->effect_chain[index]->effect_id, tag->effect_chain[index]->fx_instance,1 );
tag->effect_chain[index]->fx_instance = NULL;
tag->effect_chain[index]->clear = 1;
}

2
veejay-current/veejay-server/libstream/vj-tag.h
View File

@@ -144,7 +144,7 @@ void *vj_tag_get_dict( int id );
int vj_tag_set_composite(void *compiz,int id, int n);
int vj_tag_get_composite(int t1);
int vj_tag_chain_malloc(int e);
int vj_tag_chain_free(int e);
int vj_tag_chain_free(int e,int global);
int vj_tag_get_v4l_properties(int t1, int *arr );
int vj_tag_init(int w, int h, int pix_fmt, int driver);
int vj_tag_get_n_frames(int t1);