Factorize the code to compute sampling points for bilinear sampling into a shared...

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index ed0c6ee1b786c5535ca9782b9c2b75912689f04d..fba558888ac20c3dcd8616882825eff39ae53e85 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 {
@@ -30,6 +31,7 @@ public:
        YCbCrInput(const ImageFormat &image_format,
                   const YCbCrFormat &ycbcr_format,
                   unsigned width, unsigned height);
+       ~YCbCrInput();
 
        virtual std::string effect_type_id() const { return "YCbCrInput"; }
 
@@ -47,7 +49,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