Fix a bug where intermediate phase outputs could get too low height.

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index f0d0003e9c87bf0fcfc83da512c6a6dbd2f62998..4b277b38d8d8eab6b221dd651a52d2889564cec7 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -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.    
@@ -229,8 +230,7 @@ private:
        GLuint fbo;
        std::vector<Phase *> phases;
 
-       GLenum format;
-       unsigned bytes_per_pixel, num_dither_bits;
+       unsigned num_dither_bits;
        bool finalized;
 };