From c78bf7689ea957af510bd3a7c477300e5174c549 Mon Sep 17 00:00:00 2001 From: "[d.j.a.y] Jerome Blanchi" Date: Wed, 11 May 2016 01:17:59 +0200 Subject: [PATCH] Libvje / refactor : enhancemask * frame->h , frame->w --- veejay-current/veejay-server/libvje/effects/enhancemask.c | 7 +++++-- veejay-current/veejay-server/libvje/effects/enhancemask.h | 2 +- veejay-current/veejay-server/libvje/internal.h | 3 +-- veejay-current/veejay-server/libvje/vj-effman.c | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.c b/veejay-current/veejay-server/libvje/effects/enhancemask.c index a1498901..3170028b 100644 --- a/veejay-current/veejay-server/libvje/effects/enhancemask.c +++ b/veejay-current/veejay-server/libvje/effects/enhancemask.c @@ -47,11 +47,14 @@ vj_effect *enhancemask_init(int width, int height) return ve; } -void enhancemask_apply(VJFrame *frame, int width, int height, int *s ) { +void enhancemask_apply(VJFrame *frame, int *s ) +{ //int s[9]= { 1, 0, -1, 2, 0, -2, 1 , 0 , -1}; unsigned int r; - const unsigned int len = (width*height)-width-1; + const int width = frame->width; + const int height = frame->height; + const unsigned int len = (frame->len)-width-1; uint8_t *Y = frame->data[0]; /* int sum=0; diff --git a/veejay-current/veejay-server/libvje/effects/enhancemask.h b/veejay-current/veejay-server/libvje/effects/enhancemask.h index 03e31d87..05915bb1 100644 --- a/veejay-current/veejay-server/libvje/effects/enhancemask.h +++ b/veejay-current/veejay-server/libvje/effects/enhancemask.h @@ -27,7 +27,7 @@ vj_effect *enhancemask_init(int w, int h); -void enhancemask_apply(VJFrame *frame, int w, int h, int *t); +void enhancemask_apply(VJFrame *frame, int *t); void enhancemask_free(); #endif diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index e7313381..b1c7a733 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -401,8 +401,7 @@ extern void complexsaturation_apply(VJFrame *frame, int angle, int r, int g, int extern void complexthreshold_apply(VJFrame *frame, VJFrame *frame2, int angle, int r, int g, int b, int level, int threshold); extern void complexsync_apply(VJFrame *frame, VJFrame *frame2, int val ); - -extern void enhancemask_apply(VJFrame *frame,int w, int h, int *t); +extern void enhancemask_apply(VJFrame *frame, int *t); extern void contrast_apply(VJFrame *frame, int w, int h, int *t); diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index 8ba255df..edc47e9b 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -160,7 +160,7 @@ static void vj_effman_apply_image_effect( contrast_apply(frames[0], frames[0]->width, frames[0]->height,arg); break; case VJ_IMAGE_EFFECT_ENHANCEMASK: - enhancemask_apply(frames[0],frames[0]->width,frames[0]->height,arg); + enhancemask_apply(frames[0],arg); break; case VJ_IMAGE_EFFECT_SOLARIZE: solarize_apply(frames[0], arg[0]);