X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=3aed51b3b19a90d9e0b0e03e6cfdc16fcfab726f;hp=97ad5266bb3b0c9942f39dd3a2964aceedf848c1;hb=34776d3ed2565ee834405e575bf3bfc7f7933e36;hpb=ba60914d4e5eda7b28af700bf43e9699b7aa720d

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 97ad526..3aed51b 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -19,11 +19,28 @@ namespace movit {
 
 class ResourcePool;
 
+// Whether the data is fully planar (Y', Cb and Cr in one texture each)
+// or not. Note that this input does currently not support fully interleaved
+// data (Y', Cb and Cr next to each other), as 4:4:4 interleaved Y'CbCr seems
+// to be rare; however, YCbCr422InterleavedInput supports the important special
+// case of 4:2:2 interleaved.
+enum YCbCrInputSplitting {
+	// The standard, default case; Y', Cb and Cr in one texture each.
+	YCBCR_INPUT_PLANAR,
+
+	// Y' in one texture, and then Cb and Cr interleaved in one texture.
+	// In particular, this is a superset of the relatively popular NV12 mode.
+	// If you specify this mode, the “Cr” pointer texture will be unused
+	// (the ”Cb” texture contains both).
+	YCBCR_INPUT_SPLIT_Y_AND_CBCR,
+};
+
 class YCbCrInput : public Input {
 public:
 	YCbCrInput(const ImageFormat &image_format,
 	           const YCbCrFormat &ycbcr_format,
-	           unsigned width, unsigned height);
+	           unsigned width, unsigned height,
+	           YCbCrInputSplitting ycbcr_input_splitting = YCBCR_INPUT_PLANAR);
 	~YCbCrInput();
 
 	virtual std::string effect_type_id() const { return "YCbCrInput"; }
@@ -54,7 +71,7 @@ public:
 	// 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);
+		assert(channel >= 0 && channel < num_channels);
 		this->pixel_data[channel] = pixel_data;
 		this->pbos[channel] = pbo;
 		invalidate_pixel_data();
@@ -62,12 +79,47 @@ public:
 
 	void invalidate_pixel_data();
 
-	void set_pitch(unsigned channel, unsigned pitch) {
-		assert(channel >= 0 && channel < 3);
+	// Note: Sets pitch to width, so even if your pitch is unchanged,
+	// you will need to re-set it after this call.
+	void set_width(unsigned width)
+	{
+		this->width = width;
+
+		assert(width % ycbcr_format.chroma_subsampling_x == 0);
+		pitch[0] = widths[0] = width;
+		pitch[1] = widths[1] = width / ycbcr_format.chroma_subsampling_x;
+		pitch[2] = widths[2] = width / ycbcr_format.chroma_subsampling_x;
+		invalidate_pixel_data();
+	}
+
+	void set_height(unsigned height)
+	{
+		this->height = height;
+
+		assert(height % ycbcr_format.chroma_subsampling_y == 0);
+		heights[0] = height;
+		heights[1] = height / ycbcr_format.chroma_subsampling_y;
+		heights[2] = height / ycbcr_format.chroma_subsampling_y;
+		invalidate_pixel_data();
+	}
+
+	void set_pitch(unsigned channel, unsigned pitch)
+	{
+		assert(channel >= 0 && channel < num_channels);
 		this->pitch[channel] = pitch;
 		invalidate_pixel_data();
 	}
 
+	// Tells the input to use the specific OpenGL texture as pixel data for the given
+	// channel. The comments on FlatInput::set_texture_num() also apply here, except
+	// that this input generally does not use mipmaps.
+	void set_texture_num(unsigned channel, GLuint texture_num)
+	{
+		possibly_release_texture(channel);
+		this->texture_num[channel] = texture_num;
+		this->owns_texture[channel] = false;
+	}
+
 	virtual void inform_added(EffectChain *chain)
 	{
 		resource_pool = chain->get_resource_pool();
@@ -76,13 +128,20 @@ public:
 	bool set_int(const std::string& key, int value);
 
 private:
+	// Release the texture in the given channel if we have any, and it is owned by us.
+	void possibly_release_texture(unsigned channel);
+
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
+	GLuint num_channels;
+	YCbCrInputSplitting ycbcr_input_splitting;
 	GLuint pbos[3], texture_num[3];
+	GLint uniform_tex_y, uniform_tex_cb, uniform_tex_cr;
 
 	unsigned width, height, widths[3], heights[3];
 	const unsigned char *pixel_data[3];
 	unsigned pitch[3];
+	bool owns_texture[3];
 	ResourcePool *resource_pool;
 };