X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=0f868a8a4ee4fdfc67cfd35a36bb8cb5fb7d3821;hp=492230febf4abd92edc8c7a322a967a32f7866dd;hb=9cf78e3b5a801b7841133011f74fc7962861705d;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 492230f..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 {
@@ -57,10 +63,17 @@ 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();
 	}
 
@@ -71,17 +84,14 @@ 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;
 	}
 
 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;
 
@@ -90,4 +100,4 @@ private:
 	unsigned pitch[3];
 };
 
-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)