Prefix include guards with _MOVIT to avoid clashes with external files.

[movit] / ycbcr_input.h

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 76afc3aa676edc43579d4da21fed51c828de0740..1225d6e912d16b9bbf68bd4f135ac170beac7c2d 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,10 +1,16 @@
-#ifndef _YCBCR_INPUT_H
-#define _YCBCR_INPUT_H 1
+#ifndef _MOVIT_YCBCR_INPUT_H
+#define _MOVIT_YCBCR_INPUT_H 1
 
 // YCbCrInput is for handling planar 8-bit Y'CbCr (also sometimes, usually rather
 // imprecisely, called “YUV”), which is typically what you get from a video decoder.
 // It upsamples planes as needed, using the default linear upsampling OpenGL gives you.
 
+#include <GL/glew.h>
+#include <assert.h>
+#include <string>
+
+#include "effect.h"
+#include "image_format.h"
 #include "input.h"
 
 struct YCbCrFormat {
@@ -22,7 +28,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 +47,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 +56,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
@@ -88,4 +96,4 @@ private:
        unsigned pitch[3];
 };
 
-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)