diff --git a/veejay-current/veejay-server/libvje/effects/median.c b/veejay-current/veejay-server/libvje/effects/median.c index c71cd91e..09c3a2b4 100644 --- a/veejay-current/veejay-server/libvje/effects/median.c +++ b/veejay-current/veejay-server/libvje/effects/median.c @@ -43,7 +43,7 @@ vj_effect *medianfilter_init(int w, int h) return ve; } -void medianfilter_apply( VJFrame *frame, int width, int height, int val) +void medianfilter_apply( VJFrame *frame, int val) { uint8_t *Y = frame->data[0]; uint8_t *Cb = frame->data[1]; @@ -52,15 +52,15 @@ void medianfilter_apply( VJFrame *frame, int width, int height, int val) if( val == 0 ) return; - uint8_t *buffer = (uint8_t*) vj_malloc(sizeof(uint8_t)*width*height*3); - veejay_memset( buffer,0, width*height*3); - ctmf( Y, buffer, width,height,width,width,val,1,1024*1024*8); - ctmf( Cb,buffer + (width*height), width,height/2,width,width,val,1,512*1024); - ctmf( Cr,buffer + (width*height*2),width,height/2,width,width,val,1,512*1024); + uint8_t *buffer = (uint8_t*) vj_malloc(sizeof(uint8_t)*frame->width*frame->height*3); + veejay_memset( buffer,0, frame->width*frame->height*3); + ctmf( Y, buffer, frame->width,frame->height,frame->width,frame->width,val,1,1024*1024*8); + ctmf( Cb,buffer + (frame->width*frame->height), frame->width,frame->height/2,frame->width,frame->width,val,1,512*1024); + ctmf( Cr,buffer + (frame->width*frame->height*2), frame->width,frame->height/2,frame->width,frame->width,val,1,512*1024); - veejay_memcpy( Y, buffer, width*height); - veejay_memcpy( Cb,buffer + (width*height), width*height); - veejay_memcpy( Cr,buffer + (width*height*2), width*height); + veejay_memcpy( Y, buffer, frame->width*frame->height); + veejay_memcpy( Cb,buffer + (frame->width*frame->height), frame->width*frame->height); + veejay_memcpy( Cr,buffer + (frame->width*frame->height*2), frame->width*frame->height); free(buffer); diff --git a/veejay-current/veejay-server/libvje/effects/median.h b/veejay-current/veejay-server/libvje/effects/median.h index 772c6a9c..9bae1f33 100644 --- a/veejay-current/veejay-server/libvje/effects/median.h +++ b/veejay-current/veejay-server/libvje/effects/median.h @@ -25,5 +25,5 @@ #include vj_effect *medianfilter_init(int w, int h); -void medianfilter_apply( VJFrame *frame, int width, int height, int val); +void medianfilter_apply( VJFrame *frame, int val); #endif diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index e96cc196..052f3415 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -316,7 +316,7 @@ extern void overlaymagic_apply(VJFrame *frame, VJFrame *frame2, int n, int m); extern void mirrors_apply( VJFrame *frame, int type, int factor); extern void mirrors2_apply( VJFrame *frame, int type); extern void negation_apply( VJFrame *frame, int val); -extern void medianfilter_apply( VJFrame *frame, int width, int height,int val); +extern void medianfilter_apply( VJFrame *frame, int val); extern void negatechannel_apply( VJFrame *frame, int width, int height,int chan, int val); extern void colormap_apply( VJFrame *frame, int width, int height, diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index cb122e22..5f57b2b0 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -280,7 +280,7 @@ static void vj_effman_apply_image_effect( negation_apply(frames[0], arg[0]); break; case VJ_IMAGE_EFFECT_MEDIANFILTER: - medianfilter_apply(frames[0],frames[0]->width,frames[0]->height,arg[0]); + medianfilter_apply(frames[0], arg[0]); break; case VJ_IMAGE_EFFECT_NEGATECHANNEL: negatechannel_apply(frames[0], frames[0]->width, frames[0]->height, arg[0],arg[1]);