From a650bbee13c53d6a6799ff30c183fd76eca74f6e Mon Sep 17 00:00:00 2001
From: "[d.j.a.y] Jerome Blanchi" <d.j.a.y@free.fr>
Date: Sat, 30 Jul 2016 11:06:46 +0200
Subject: [PATCH] Libvje / refactor : alphablend

* w,h
* clean headers
---
 .../veejay-server/libvje/effects/alphablend.c          | 10 +++-------
 .../veejay-server/libvje/effects/alphablend.h          |  7 +------
 veejay-current/veejay-server/libvje/internal.h         |  2 +-
 veejay-current/veejay-server/libvje/vj-effman.c        |  2 +-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/veejay-current/veejay-server/libvje/effects/alphablend.c b/veejay-current/veejay-server/libvje/effects/alphablend.c
index 6376ae9a..fd0c2142 100644
--- a/veejay-current/veejay-server/libvje/effects/alphablend.c
+++ b/veejay-current/veejay-server/libvje/effects/alphablend.c
@@ -17,14 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 , USA.
  */
-    	
-#include <config.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
+
+#include "common.h"
 #include <libvjmem/vjmem.h>
 #include "alphablend.h"
-#include "common.h"
 
 vj_effect *alphablend_init(int w, int h)
 {
@@ -51,7 +47,7 @@ static	inline int blend_plane( uint8_t *dst, uint8_t *A, uint8_t *B, uint8_t *aA
     return 0;
 }
 
-void alphablend_apply( VJFrame *frame, VJFrame *frame2, int width,int height)
+void alphablend_apply( VJFrame *frame, VJFrame *frame2)
 {
 	size_t uv_len = (frame->ssm ? frame->len : frame->uv_len );
 	blend_plane( frame->data[0], frame->data[0], frame2->data[0], frame2->data[3], frame->len );
diff --git a/veejay-current/veejay-server/libvje/effects/alphablend.h b/veejay-current/veejay-server/libvje/effects/alphablend.h
index 43bd8d75..10067d40 100644
--- a/veejay-current/veejay-server/libvje/effects/alphablend.h
+++ b/veejay-current/veejay-server/libvje/effects/alphablend.h
@@ -20,11 +20,6 @@
 
 #ifndef ALPHABLEND_H
 #define ALPHABLEND_H
-#include <libvje/vje.h>
-#include <sys/types.h>
-#include <stdint.h>
-
 vj_effect *alphablend_init(int w, int h);
-void alphablend_apply( VJFrame *frame, VJFrame *frame2, int width,int height);
-
+void alphablend_apply( VJFrame *frame, VJFrame *frame2);
 #endif
diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h
index f0f4b19f..536562a7 100644
--- a/veejay-current/veejay-server/libvje/internal.h
+++ b/veejay-current/veejay-server/libvje/internal.h
@@ -519,7 +519,7 @@ extern void travelmatte_apply( VJFrame *frame, VJFrame *frame2, int mode);
 extern void feathermask_apply( VJFrame *frame );
 extern void alphaselect_apply( VJFrame *frame, int i_angle, int r, int g,int b, int swap);
 extern void alphaselect2_apply( VJFrame *frame, int tola, int r, int g,int b, int tolb,int alpha);
-extern void alphablend_apply( VJFrame *frame, VJFrame *frame2, int width,int height);
+extern void alphablend_apply( VJFrame *frame, VJFrame *frame2);
 extern void lumakeyalpha_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int type, int opacity );
 extern void chromamagickalpha_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int type, int opacity );
 extern void overlaymagicalpha_apply( VJFrame *frame, VJFrame *frame2, int width, int height, int type, int mode );
diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c
index 18a79aae..26f1a77a 100644
--- a/veejay-current/veejay-server/libvje/vj-effman.c
+++ b/veejay-current/veejay-server/libvje/vj-effman.c
@@ -625,7 +625,7 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in
 		travelmatte_apply(frames[0],frames[1],arg[0]);
 		break;
 	case VJ_VIDEO_EFFECT_ALPHABLEND:
-		alphablend_apply(frames[0],frames[1],frames[0]->width,frames[0]->height);
+		alphablend_apply(frames[0],frames[1]);
 		break;
 	case VJ_VIDEO_EFFECT_PORTERDUFF:
 		porterduff_apply(frames[0], frames[1], arg[0]);