X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=f41e7e4a5e72966a9dd0a56255aca32cf6a3449b;hp=666df9e5738b4de515b80a3e67452356f55b6d67;hb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/effect_chain.h b/effect_chain.h
index 666df9e..f41e7e4 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,15 +1,18 @@
-#ifndef _EFFECT_CHAIN_H
-#define _EFFECT_CHAIN_H 1
+#ifndef _MOVIT_EFFECT_CHAIN_H
+#define _MOVIT_EFFECT_CHAIN_H 1
 
+#include <GL/glew.h>
+#include <stdio.h>
+#include <map>
 #include <set>
+#include <string>
 #include <vector>
 
-#include "effect.h"
 #include "image_format.h"
-#include "input.h"
 
-class EffectChain;
-class Phase;
+class Effect;
+class Input;
+struct Phase;
 
 // For internal use within Node.
 enum AlphaType {
@@ -22,8 +25,8 @@ enum AlphaType {
 // Whether you want pre- or postmultiplied alpha in the output
 // (see effect.h for a discussion of pre- versus postmultiplied alpha).
 enum OutputAlphaFormat {
-	OUTPUT_ALPHA_PREMULTIPLIED,
-	OUTPUT_ALPHA_POSTMULTIPLIED,
+	OUTPUT_ALPHA_FORMAT_PREMULTIPLIED,
+	OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED,
 };
 
 // A node in the graph; basically an effect and some associated information.
@@ -72,7 +75,7 @@ struct Phase {
 	std::vector<Node *> inputs;
 
 	std::vector<Node *> effects;  // In order.
-	unsigned output_width, output_height;
+	unsigned output_width, output_height, virtual_output_width, virtual_output_height;
 };
 
 class EffectChain {
@@ -148,9 +151,10 @@ public:
 	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);
+	// Make sure the output rectangle is at least large enough to hold
+	// the given input rectangle in both dimensions, and is of the
+	// current aspect ratio (aspect_nom/aspect_denom).
+	void size_rectangle_to_fit(unsigned width, unsigned height, unsigned *output_width, unsigned *output_height);
 
 	// Compute the input sizes for all inputs for all effects in a given phase,
 	// and inform the effects about the results.	
@@ -175,12 +179,26 @@ private:
 	// Output the current graph to the given file in a Graphviz-compatible format;
 	// only useful for debugging.
 	void output_dot(const char *filename);
+	std::vector<std::string> get_labels_for_edge(const Node *from, const Node *to);
+	void output_dot_edge(FILE *fp,
+	                     const std::string &from_node_id,
+	                     const std::string &to_node_id,
+			     const std::vector<std::string> &labels);
 
 	// 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);
+	void sort_all_nodes_topologically();
+
+	// Do the actual topological sort. <nodes> must be a connected, acyclic subgraph;
+	// links that go to nodes not in the set will be ignored.
+	std::vector<Node *> topological_sort(const std::vector<Node *> &nodes);
+
+	// Utility function used by topological_sort() to do a depth-first search.
+	// The reason why we store nodes left to visit instead of a more conventional
+	// list of nodes to visit is that we want to be able to limit ourselves to
+	// a subgraph instead of all nodes. The set thus serves a dual purpose.
+	void topological_sort_visit_node(Node *node, std::set<Node *> *nodes_left_to_visit, std::vector<Node *> *sorted_list);
 
 	// Used during finalize().
 	void find_color_spaces_for_inputs();
@@ -215,9 +233,8 @@ private:
 	GLuint fbo;
 	std::vector<Phase *> phases;
 
-	GLenum format;
-	unsigned bytes_per_pixel, num_dither_bits;
+	unsigned num_dither_bits;
 	bool finalized;
 };
 
-#endif // !defined(_EFFECT_CHAIN_H)
+#endif // !defined(_MOVIT_EFFECT_CHAIN_H)