Typo fix.

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 0abd51805793a2d40b4b9fd0f5394a056bad7dc0..48b60872173b283e6eba59c4ad97a2ba782566e3 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -15,6 +15,7 @@ class Phase;
 class Node {
 public:
        Effect *effect;
+       bool disabled;
 
        // Edges in the graph (forward and backward).
        std::vector<Node *> outgoing_links;
@@ -25,7 +26,7 @@ private:
        std::string effect_id;
 
        // If output goes to RTT (otherwise, none of these are set).
-       // The Phsae pointer is a but ugly; we should probably fix so
+       // The Phase pointer is a but ugly; we should probably fix so
        // that Phase takes other phases as inputs, instead of Node.
        GLuint output_texture;
        unsigned output_texture_width, output_texture_height;
@@ -53,7 +54,7 @@ struct Phase {
 
 class EffectChain {
 public:
-       EffectChain(unsigned width, unsigned height);
+       EffectChain(float aspect_nom, float aspect_denom);  // E.g., 16.0f, 9.0f for 16:9.
 
        // User API:
        // input, effects, output, finalize need to come in that specific order.
@@ -80,16 +81,6 @@ public:
        }
        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();
 
@@ -104,16 +95,29 @@ public:
                }       
        }
 
+       // API for manipulating the graph directly. Intended to be used from
+       // effects and by EffectChain itself.
+       //
+       // Note that for nodes with multiple inputs, the order of calls to
+       // connect_nodes() will matter.
+       Node *add_node(Effect *effect);
+       void connect_nodes(Node *sender, Node *receiver);
+       void replace_receiver(Node *old_receiver, Node *new_receiver);
+       void replace_sender(Node *new_sender, Node *receiver);
+       void insert_node_between(Node *sender, Node *middle, Node *receiver);
+
 private:
+       // Fits a rectangle of the given size to the current aspect ratio
+       // (aspect_nom/aspect_denom) and returns the new width and height.
+       unsigned fit_rectangle_to_aspect(unsigned width, unsigned 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(Node *effect,
-                                      std::vector<Node *> *nonlinear_inputs,
-                                      std::vector<Node *> *intermediates);
-       Node *normalize_to_linear_gamma(Node *input);
-       Node *normalize_to_srgb(Node *input);
+       // Find all inputs eventually feeding into this effect that have
+       // output gamma different from GAMMA_LINEAR.
+       void find_all_nonlinear_inputs(Node *effect, std::vector<Node *> *nonlinear_inputs);
 
        // Create a GLSL program computing the given effects in order.
        Phase *compile_glsl_program(const std::vector<Node *> &inputs,
@@ -127,7 +131,26 @@ private:
        // only useful for debugging.
        void output_dot(const char *filename);
 
-       unsigned width, height;
+       // Some of the graph algorithms assume that the nodes array is sorted
+       // topologically (inputs are always before outputs), but some operations
+       // (like graph rewriting) can change that. This function restores that order.
+       void sort_nodes_topologically();
+       void topological_sort_visit_node(Node *node, std::set<Node *> *visited_nodes, std::vector<Node *> *sorted_list);
+
+       // Used during finalize().
+       void propagate_gamma_and_color_space();
+       Node *find_output_node();
+
+       bool node_needs_colorspace_fix(Node *node);
+       void fix_internal_color_spaces();
+       void fix_output_color_space();
+
+       bool node_needs_gamma_fix(Node *node);
+       void fix_internal_gamma_by_asking_inputs(unsigned step);
+       void fix_internal_gamma_by_inserting_nodes(unsigned step);
+       void fix_output_gamma();
+
+       float aspect_nom, aspect_denom;
        ImageFormat output_format;
 
        std::vector<Node *> nodes;