merge of previous commits

project/effect.cpp

@@ -27,6 +27,7 @@
 #include "effects/internal/paneffect.h"
 #include "effects/internal/shakeeffect.h"
 #include "effects/internal/cornerpineffect.h"
+#include "effects/internal/maskeffect.h"
 
 #include <QCheckBox>
 #include <QGridLayout>
@@ -59,6 +60,7 @@ Effect* create_effect(Clip* c, const EffectMeta* em) {
 		case EFFECT_INTERNAL_TONE: return new ToneEffect(c, em);
         case EFFECT_INTERNAL_SHAKE: return new ShakeEffect(c, em);
 		case EFFECT_INTERNAL_CORNERPIN: return new CornerPinEffect(c, em);
+        case EFFECT_INTERNAL_MASK: return new MaskEffect(c, em);
 		}
 	} else {
 		dout << "[ERROR] Invalid effect data";
@@ -107,8 +109,15 @@ void load_internal_effects() {
     effects.append(em);
 
     em.name = "Corner Pin";
-    em.category = "Distort";
     em.internal = EFFECT_INTERNAL_CORNERPIN;
+    effects.append(em);
+
+    em.name = "Mask";
+    em.internal = EFFECT_INTERNAL_MASK;
+    effects.append(em);
+
+    em.name = "Shake";
+    em.internal = EFFECT_INTERNAL_SHAKE;
     effects.append(em);
 
 	em.name = "Text";
@@ -117,20 +126,13 @@ void load_internal_effects() {
     effects.append(em);
 
     em.name = "Timecode";
-    em.category = "Render";
     em.internal = EFFECT_INTERNAL_TIMECODE;
     effects.append(em);
 
-	em.name = "Solid";
-	em.category = "Render";
+    em.name = "Solid";
 	em.internal = EFFECT_INTERNAL_SOLID;
     effects.append(em);
 
-	em.name = "Shake";
-	em.category = "Distort";
-	em.internal = EFFECT_INTERNAL_SHAKE;
-    effects.append(em);
-
 	// internal transitions
 	em.type = EFFECT_TYPE_TRANSITION;
 	em.category = "";
@@ -230,6 +232,7 @@ Effect::Effect(Clip* c, const EffectMeta *em) :
 	enable_shader(false),
 	enable_coords(false),
     enable_superimpose(false),
+    enable_image(false),
 	glslProgram(NULL),
     texture(NULL),
     isOpen(false),
@@ -767,9 +770,11 @@ void Effect::startEffect() {
 
 void Effect::endEffect() {
 	if (bound) glslProgram->release();
-	bound = false;
+    bound = false;
 }
 
+void Effect::process_image(double, uint8_t *, int) {}
+
 Effect* Effect::copy(Clip* c) {
 	Effect* copy = create_effect(c, meta);
     copy->set_enabled(is_enabled());

project/effect.h

@@ -62,7 +62,7 @@ extern QMutex effects_loaded;
 #define EFFECT_INTERNAL_TONE 6
 #define EFFECT_INTERNAL_SHAKE 7
 #define EFFECT_INTERNAL_TIMECODE 8
-
+#define EFFECT_INTERNAL_MASK 9
 
 
 #define EFFECT_INTERNAL_CORNERPIN 12
@@ -147,12 +147,14 @@ public:
 	bool enable_shader;
 	bool enable_coords;
     bool enable_superimpose;
+    bool enable_image;
 
 	int getIterations();
 	void setIterations(int i);
 
 	const char* ffmpeg_filter;
 
+    virtual void process_image(double timecode, uint8_t* data, int size);
 	virtual void process_shader(double timecode, GLTextureCoords&);
     virtual void process_coords(double timecode, GLTextureCoords& coords, int data);
 	virtual GLuint process_superimpose(double timecode);

project/effectgizmo.h

@@ -3,8 +3,10 @@
 
 #define GIZMO_TYPE_DOT 0
 #define GIZMO_TYPE_POLY 1
+#define GIZMO_TYPE_TARGET 2
 
 #define GIZMO_DOT_SIZE 2.5F
+#define GIZMO_TARGET_SIZE 5.0F
 
 #include <QString>
 #include <QRect>