X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.h;h=bfe52c0dc6ddaf41d590557b984aabf2effa7d4a;hb=2322070a3dbeb6b46b39cca07a0fbf20e95f5468;hp=f0138a99d48bd5a6783f6357229f37fa3d5b03d7;hpb=c8ddccde29b5dd2c207cc67fa8af2707904557d8;p=movit

diff --git a/effect_chain.h b/effect_chain.h
index f0138a9..bfe52c0 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -9,7 +9,7 @@
 #include "input.h"
 
 class EffectChain;
-class Phase;
+struct Phase;
 
 // For internal use within Node.
 enum AlphaType {
@@ -72,7 +72,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 +148,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.