X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=5e3b93dc15a82a391d6b8344908d84607ed75f12;hp=dc52d3e4a3655ee14a7c3b03c248228d3e573ab9;hb=fe785e6f62ab58ef05972850d9275005794505b7;hpb=b0f2d8f7604bfb4c8a9824a3a022d32ef26e12cc

diff --git a/effect_chain.h b/effect_chain.h
index dc52d3e..5e3b93d 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -6,28 +6,8 @@
 
 #include "effect.h"
 #include "effect_id.h"
-
-enum PixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA };
-
-enum ColorSpace {
-	COLORSPACE_sRGB = 0,
-	COLORSPACE_REC_709 = 0,  // Same as sRGB.
-	COLORSPACE_REC_601_525 = 1,
-	COLORSPACE_REC_601_625 = 2,
-};
-
-enum GammaCurve {
-	GAMMA_LINEAR = 0,
-	GAMMA_sRGB = 1,
-	GAMMA_REC_601 = 2,
-	GAMMA_REC_709 = 2,  // Same as Rec. 601.
-};
-
-struct ImageFormat {
-	PixelFormat pixel_format;
-	ColorSpace color_space;
-	GammaCurve gamma_curve;
-};
+#include "image_format.h"
+#include "input.h"
 
 class EffectChain {
 public:
@@ -36,11 +16,11 @@ public:
 	// User API:
 	// input, effects, output, finalize need to come in that specific order.
 
-	void add_input(const ImageFormat &format);
+	Input *add_input(const ImageFormat &format);
 
 	// The returned pointer is owned by EffectChain.
 	Effect *add_effect(EffectId effect) {
-		return add_effect(effect, get_last_added_effect());
+		return add_effect(effect, last_added_effect());
 	}
 	Effect *add_effect(EffectId effect, Effect *input) {
 		std::vector<Effect *> inputs;
@@ -69,10 +49,14 @@ public:
 	void finalize();
 
 	//void render(unsigned char *src, unsigned char *dst);
-	void render_to_screen(unsigned char *src);
-
-	Effect *get_last_added_effect() { 
-		return last_added_effect;
+	void render_to_screen();
+
+	Effect *last_added_effect() {
+		if (effects.empty()) {
+			return NULL;
+		} else {
+			return effects.back();
+		}	
 	}
 
 private:
@@ -102,10 +86,6 @@ private:
 	std::map<Effect *, GLuint> effect_output_textures;
 	std::map<Effect *, std::vector<Effect *> > outgoing_links;
 	std::map<Effect *, std::vector<Effect *> > incoming_links;
-	Effect *last_added_effect;
-
-	GLuint source_image_num;
-	bool use_srgb_texture_format;
 
 	GLuint fbo;
 	std::vector<Phase> phases;