X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=2220f5d1ebd9392730f98439cbe3d98a7e6d8c30;hp=ed0c6ee1b786c5535ca9782b9c2b75912689f04d;hb=af82a6c84f57851d16939b86188afb5fb80819d0;hpb=89da3437c862c15acb870fbe3175b9e4a0a8244a

diff --git a/ycbcr_input.h b/ycbcr_input.h
index ed0c6ee..2220f5d 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -5,6 +5,12 @@
 // 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 {
@@ -30,6 +37,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"; }
 
@@ -39,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();
 
@@ -47,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