X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=492230febf4abd92edc8c7a322a967a32f7866dd;hp=fd9db273d52ba1a049c0ff98411f507a97ccc723;hb=fc55857d9ccf1edcc141fa0853a8bf2d6b40b4dc;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/ycbcr_input.h b/ycbcr_input.h
index fd9db27..492230f 100644
--- 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,9 @@ public:
 	YCbCrInput(const ImageFormat &image_format,
 	           const YCbCrFormat &ycbcr_format,
 	           unsigned width, unsigned height);
+	~YCbCrInput();
+
+	virtual std::string effect_type_id() const { return "YCbCrInput"; }
 
 	// Create the texture itself. We cannot do this in the constructor,
 	// because we don't necessarily know all the settings (sRGB texture,
@@ -37,13 +41,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
@@ -62,28 +69,19 @@ 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(!finalized);
-		assert(channel >= 0 && channel < 3);
-		this->pitch[channel] = pitch;
-	}
-
-	unsigned get_pitch(unsigned channel) {
 		assert(channel >= 0 && channel < 3);
-		return pitch[channel];
+		if (this->pitch[channel] != pitch) {
+			this->pitch[channel] = pitch;
+			needs_pbo_recreate = true;
+		}
 	}
 
 private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
 	GLuint pbos[3], texture_num[3];
-	bool needs_update, finalized;
+	bool needs_update, needs_pbo_recreate, finalized;
 
 	int needs_mipmaps;