X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=0f868a8a4ee4fdfc67cfd35a36bb8cb5fb7d3821;hp=fd9db273d52ba1a049c0ff98411f507a97ccc723;hb=99d570aa1e5e72e6c2adcb8401b1451738e7dec2;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/ycbcr_input.h b/ycbcr_input.h
index fd9db27..0f868a8 100644
--- 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 {
@@ -30,6 +37,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,23 +47,33 @@ 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
 	// this data, you must either call set_pixel_data() again (using the same pointer
 	// is fine), or invalidate_pixel_data(). Otherwise, the texture won't be re-uploaded
 	// on subsequent frames.
-	void set_pixel_data(unsigned channel, const unsigned char *pixel_data)
+	//
+	// The data can either be a regular pointer (if pbo==0), or a byte offset
+	// into a PBO. The latter will allow you to start uploading the texture data
+	// asynchronously to the GPU, if you have any CPU-intensive work between the
+	// call to set_pixel_data() and the actual rendering. In either case,
+	// the pointer (and PBO, if set) has to be valid at the time of the render call.
+	void set_pixel_data(unsigned channel, const unsigned char *pixel_data, GLuint pbo = 0)
 	{
 		assert(channel >= 0 && channel < 3);
 		this->pixel_data[channel] = pixel_data;
+		this->pbos[channel] = pbo;
 		invalidate_pixel_data();
 	}
 
@@ -62,23 +82,11 @@ 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];
-	}
-
 private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
@@ -92,4 +100,4 @@ private:
 	unsigned pitch[3];
 };
 
-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)