X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=dcfb7a13667759c502d9860f9aca456a5ce641d9;hp=f521e9c40c083667d58e1aa795a615dc841c4700;hb=3d1f6c11c53cd9d3d5c1fb60f4accf050b7f135e;hpb=5058b68995b5d39042df42df06d55559ee535d38

diff --git a/effect_chain.h b/effect_chain.h
index f521e9c..dcfb7a1 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,32 +1,12 @@
 #ifndef _EFFECT_CHAIN_H
 #define _EFFECT_CHAIN_H 1
 
+#include <set>
 #include <vector>
 
 #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:
@@ -35,24 +15,27 @@ public:
 	// User API:
 	// input, effects, output, finalize need to come in that specific order.
 
-	void add_input(const ImageFormat &format);
+	// EffectChain takes ownership of the given input.
+	// input is returned back for convenience.
+	Input *add_input(Input *input);
 
-	// The returned pointer is owned by EffectChain.
-	Effect *add_effect(EffectId effect) {
-		return add_effect(effect, get_last_added_effect());
+	// EffectChain takes ownership of the given effect.
+	// effect is returned back for convenience.
+	Effect *add_effect(Effect *effect) {
+		return add_effect(effect, last_added_effect());
 	}
-	Effect *add_effect(EffectId effect, Effect *input) {
+	Effect *add_effect(Effect *effect, Effect *input) {
 		std::vector<Effect *> inputs;
 		inputs.push_back(input);
 		return add_effect(effect, inputs);
 	}
-	Effect *add_effect(EffectId effect, Effect *input1, Effect *input2) {
+	Effect *add_effect(Effect *effect, Effect *input1, Effect *input2) {
 		std::vector<Effect *> inputs;
 		inputs.push_back(input1);
 		inputs.push_back(input2);
 		return add_effect(effect, inputs);
 	}
-	Effect *add_effect(EffectId effect, const std::vector<Effect *> &inputs);
+	Effect *add_effect(Effect *effect, const std::vector<Effect *> &inputs);
 
 	// Similar to add_effect, but:
 	//
@@ -68,39 +51,60 @@ 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:
 	struct Phase {
 		GLint glsl_program_num;
 		bool input_needs_mipmaps;
-		unsigned start, end;
+		std::vector<Effect *> inputs;   // Only from other phases; input textures are not counted here.
+		std::vector<Effect *> effects;  // In order.
+		unsigned output_width, output_height;
 	};
 
+	// Determine the preferred output size of a given phase.
+	// Requires that all input phases (if any) already have output sizes set.
+	void find_output_size(Phase *phase);
+
+	void find_all_nonlinear_inputs(Effect *effect,
+	                               std::vector<Input *> *nonlinear_inputs,
+	                               std::vector<Effect *> *intermediates);
 	Effect *normalize_to_linear_gamma(Effect *input);
 	Effect *normalize_to_srgb(Effect *input);
 
-	// Create a GLSL program computing effects [start, end>.
-	Phase compile_glsl_program(unsigned start_index, unsigned end_index);
+	void draw_vertex(float x, float y, const std::vector<Effect *> &inputs);
+
+	// Create a GLSL program computing the given effects in order.
+	Phase *compile_glsl_program(const std::vector<Effect *> &inputs, const std::vector<Effect *> &effects);
+
+	// Create all GLSL programs needed to compute the given effect, and all outputs
+	// that depends on it (whenever possible).
+	void construct_glsl_programs(Effect *output);
 
 	unsigned width, height;
-	ImageFormat input_format, output_format;
+	ImageFormat output_format;
 	std::vector<Effect *> effects;
-	std::multimap<Effect *, Effect *> outgoing_links;
-	std::multimap<Effect *, Effect *> incoming_links;
-	Effect *last_added_effect;
-
-	GLuint source_image_num;
-	bool use_srgb_texture_format;
+	std::vector<Input *> inputs;  // Also contained in effects.
+	std::map<Effect *, std::string> effect_ids;
+	std::map<Effect *, GLuint> effect_output_textures;
+	std::map<Effect *, std::pair<GLuint, GLuint> > effect_output_texture_sizes;
+	std::map<Effect *, std::vector<Effect *> > outgoing_links;
+	std::map<Effect *, std::vector<Effect *> > incoming_links;
 
 	GLuint fbo;
-	GLuint temp_textures[2];
+	std::vector<Phase *> phases;
 
-	std::vector<Phase> phases;
+	// This is a bit ugly; we should probably fix so that Phase takes other phases
+	// as inputs, instead of Effect.
+	std::map<Effect *, Phase *> output_effects_to_phase;
 
 	GLenum format, bytes_per_pixel;
 	bool finalized;