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

diff --git a/ycbcr_input.h b/ycbcr_input.h
index ed0c6ee..eb8d0ec 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,12 +1,21 @@
-#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 "effect_chain.h"
+#include "image_format.h"
 #include "input.h"
 
+class ResourcePool;
+
 struct YCbCrFormat {
 	// Which formula for Y' to use.
 	YCbCrLumaCoefficients luma_coefficients;
@@ -22,7 +31,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 +40,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 +50,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,17 +59,24 @@ 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
 	// 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();
 	}
 
@@ -68,23 +87,26 @@ public:
 
 	void set_pitch(unsigned channel, unsigned pitch) {
 		assert(channel >= 0 && channel < 3);
-		if (this->pitch[channel] != pitch) {
-			this->pitch[channel] = pitch;
-			needs_pbo_recreate = true;
-		}
+		this->pitch[channel] = pitch;
+	}
+
+	virtual void inform_added(EffectChain *chain)
+	{
+		resource_pool = chain->get_resource_pool();
 	}
 
 private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
 	GLuint pbos[3], texture_num[3];
-	bool needs_update, needs_pbo_recreate, finalized;
+	bool needs_update, finalized;
 
 	int needs_mipmaps;
 
 	unsigned width, height, widths[3], heights[3];
 	const unsigned char *pixel_data[3];
 	unsigned pitch[3];
+	ResourcePool *resource_pool;
 };
 
-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)