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

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 76afc3aa676edc43579d4da21fed51c828de0740..492230febf4abd92edc8c7a322a967a32f7866dd 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -22,7 +22,8 @@ struct YCbCrFormat {
 
        // Positioning of the chroma samples. MPEG-1 and JPEG is (0.5, 0.5);
        // MPEG-2 and newer typically are (0.0, 0.5).
-       float chroma_x_position, chroma_y_position;
+       float cb_x_position, cb_y_position;
+       float cr_x_position, cr_y_position;
 };
 
 class YCbCrInput : public Input {
@@ -40,6 +41,7 @@ public:
        void finalize();
 
        virtual bool can_output_linear_gamma() const { return false; }
+       virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; }
 
        std::string output_fragment_shader();
 
@@ -48,7 +50,7 @@ public:
 
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
-       ColorSpace get_color_space() const { return image_format.color_space; }
+       Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change