Make the blur use the resize functionality, which also unbreaks the in-between sampli...

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 5b8ddbca45295f54a2bc4db4b132b1eeaa1efbb4..dcfb7a13667759c502d9860f9aca456a5ce641d9 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,68 +1,117 @@
 #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:
        EffectChain(unsigned width, unsigned height);
 
+       // User API:
        // input, effects, output, finalize need to come in that specific order.
 
-       void add_input(const ImageFormat &format);
-
-       // The returned pointer is owned by EffectChain.
-       Effect *add_effect(EffectId effect);
+       // EffectChain takes ownership of the given input.
+       // input is returned back for convenience.
+       Input *add_input(Input *input);
+
+       // 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(Effect *effect, Effect *input) {
+               std::vector<Effect *> inputs;
+               inputs.push_back(input);
+               return add_effect(effect, inputs);
+       }
+       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(Effect *effect, const std::vector<Effect *> &inputs);
+
+       // Similar to add_effect, but:
+       //
+       //  * Does not insert any normalizing effects.
+       //  * Does not ask the effect to insert itself, so it won't work
+       //    with meta-effects.
+       //
+       // We should really separate out these two “sides” of Effect in the
+       // type system soon.
+       void add_effect_raw(Effect *effect, const std::vector<Effect *> &inputs);
 
        void add_output(const ImageFormat &format);
        void finalize();
 
        //void render(unsigned char *src, unsigned char *dst);
-       void render_to_screen(unsigned char *src);
+       void render_to_screen();
+
+       Effect *last_added_effect() {
+               if (effects.empty()) {
+                       return NULL;
+               } else {
+                       return effects.back();
+               }       
+       }
 
 private:
-       void normalize_to_linear_gamma();
-       void normalize_to_srgb();
+       struct Phase {
+               GLint glsl_program_num;
+               bool input_needs_mipmaps;
+               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);
+
+       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::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;
+       std::vector<Phase *> phases;
 
-       GLuint source_image_num;
-       bool use_srgb_texture_format;
+       // 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;
 
-       GLint glsl_program_num;
        GLenum format, bytes_per_pixel;
        bool finalized;
 
        // Used during the building of the effect chain.
-       ColorSpace current_color_space;
-       GammaCurve current_gamma_curve; 
+       std::map<Effect *, ColorSpace> output_color_space;
+       std::map<Effect *, GammaCurve> output_gamma_curve;      
 };