X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=bf6d800eeb0c918c1b535bd2f6bf2c65c0bfa354;hp=1225d6e912d16b9bbf68bd4f135ac170beac7c2d;hb=refs%2Fheads%2Fepoxy;hpb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 1225d6e..bf6d800 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -5,14 +5,19 @@
 // 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 <epoxy/gl.h>
 #include <assert.h>
 #include <string>
 
 #include "effect.h"
+#include "effect_chain.h"
 #include "image_format.h"
 #include "input.h"
 
+namespace movit {
+
+class ResourcePool;
+
 struct YCbCrFormat {
 	// Which formula for Y' to use.
 	YCbCrLumaCoefficients luma_coefficients;
@@ -41,11 +46,6 @@ public:
 
 	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,
-	// mipmap generation) at that point.
-	void finalize();
-
 	virtual bool can_output_linear_gamma() const { return false; }
 	virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; }
 
@@ -63,37 +63,46 @@ public:
 	// 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();
 	}
 
-	void invalidate_pixel_data()
-	{
-		needs_update = true;
-	}
+	void invalidate_pixel_data();
 
 	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;
+		invalidate_pixel_data();
+	}
+
+	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;
 
 	int needs_mipmaps;
 
 	unsigned width, height, widths[3], heights[3];
 	const unsigned char *pixel_data[3];
 	unsigned pitch[3];
+	ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_YCBCR_INPUT_H)