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

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 43d1f1d..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,13 +47,16 @@ 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();
 
 	// Uploads the texture if it has changed since last time.
 	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
 
-	ColorSpace get_color_space() const { return image_format.color_space; }
+	unsigned get_width() const { return width; }
+	unsigned get_height() const { return height; }
+	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
@@ -64,12 +75,6 @@ public:
 		needs_update = true;
 	}
 
-	const unsigned char *get_pixel_data(unsigned channel) const
-	{
-		assert(channel >= 0 && channel < 3);
-		return pixel_data[channel];
-	}
-
 	void set_pitch(unsigned channel, unsigned pitch) {
 		assert(channel >= 0 && channel < 3);
 		if (this->pitch[channel] != pitch) {
@@ -78,11 +83,6 @@ public:
 		}
 	}
 
-	unsigned get_pitch(unsigned channel) {
-		assert(channel >= 0 && channel < 3);
-		return pitch[channel];
-	}
-
 private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;