From 8f286bc485d66a9476497f8be521f23d0c2c5b4f Mon Sep 17 00:00:00 2001 From: "[d.j.a.y] Jerome Blanchi" Date: Thu, 21 Apr 2016 18:23:23 +0200 Subject: [PATCH] Libvje / refactor : solarize * frame->width, frame->height --- veejay-current/veejay-server/libvje/effects/solarize.c | 7 +++---- veejay-current/veejay-server/libvje/effects/solarize.h | 3 +-- veejay-current/veejay-server/libvje/internal.h | 4 +--- veejay-current/veejay-server/libvje/vj-effman.c | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/veejay-current/veejay-server/libvje/effects/solarize.c b/veejay-current/veejay-server/libvje/effects/solarize.c index 97c27d6f..b5f04cac 100644 --- a/veejay-current/veejay-server/libvje/effects/solarize.c +++ b/veejay-current/veejay-server/libvje/effects/solarize.c @@ -43,20 +43,19 @@ vj_effect *solarize_init(int w,int h) return ve; } -void solarize_apply( VJFrame *frame, int width, int height, int threshold) +void solarize_apply( VJFrame *frame, int threshold) { - int i, len; + int i, len= frame->len; uint8_t val; uint8_t *Y = frame->data[0]; uint8_t *Cb= frame->data[1]; uint8_t *Cr= frame->data[2]; - len = frame->len; for (i = 0; i < len; i++) { val = Y[i]; if (val > threshold) { Y[i] = 255 - val; - Cb[i] = 255 - Cb[i]; + Cb[i] = 255 - Cb[i]; Cr[i] = 255 - Cr[i]; } } diff --git a/veejay-current/veejay-server/libvje/effects/solarize.h b/veejay-current/veejay-server/libvje/effects/solarize.h index 86aac281..4dc90960 100644 --- a/veejay-current/veejay-server/libvje/effects/solarize.h +++ b/veejay-current/veejay-server/libvje/effects/solarize.h @@ -25,7 +25,6 @@ #include vj_effect *solarize_init(); -void solarize_apply(VJFrame *frame, int width, int height, - int threshold); +void solarize_apply(VJFrame *frame, int threshold); void solarize_free(); #endif diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index 12f35336..a0359ce3 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -357,9 +357,7 @@ extern void rgbkey_apply( VJFrame *frame, VJFrame *frame2, int i_angle, int i_noise, int r, int g, int b, int min, int max, int op); extern void gamma_apply( VJFrame *frame, int val); - -extern void solarize_apply(VJFrame *frame, int width, int height, - int threshold); +extern void solarize_apply(VJFrame *frame, int threshold); extern void dummy_apply(VJFrame *frame, int width, int height, int color_num); extern void rotozoom_apply(VJFrame *frame, int width, int height, int a, diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index 99771f7e..21a685d8 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -165,7 +165,7 @@ static void vj_effman_apply_image_effect( enhancemask_apply(frames[0],frames[0]->width,frames[0]->height,arg); break; case VJ_IMAGE_EFFECT_SOLARIZE: - solarize_apply(frames[0], frames[0]->width, frames[0]->height, arg[0]); + solarize_apply(frames[0], arg[0]); break; case VJ_IMAGE_EFFECT_DISTORTION: distortion_apply(frames[0], arg[0],arg[1],arg[2],arg[3],arg[4],arg[5] );