X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=7db5375c187cc4c035aab31cdc0065f4551aefcd;hp=4c7b3e9a2b6bd8282976f8a759c0061a16c2fb7b;hb=d2050acb601e0d16bb33b1c1e7cf443dce2d3c93;hpb=772ea97db9042d4357814b834563036217d548b9

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 4c7b3e9..7db5375 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -13,30 +13,12 @@
 #include "effect_chain.h"
 #include "image_format.h"
 #include "input.h"
+#include "ycbcr.h"
 
 namespace movit {
 
 class ResourcePool;
 
-struct YCbCrFormat {
-	// Which formula for Y' to use.
-	YCbCrLumaCoefficients luma_coefficients;
-
-	// If true, assume Y'CbCr coefficients are full-range, ie. go from 0 to 255
-	// instead of the limited 220/225 steps in classic MPEG. For instance,
-	// JPEG uses the Rec. 601 luma coefficients, but full range.
-	bool full_range;
-
-	// Sampling factors for chroma components. For no subsampling (4:4:4),
-	// set both to 1.
-	unsigned chroma_subsampling_x, chroma_subsampling_y;
-
-	// 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 cb_x_position, cb_y_position;
-	float cr_x_position, cr_y_position;
-};
-
 class YCbCrInput : public Input {
 public:
 	YCbCrInput(const ImageFormat &image_format,
@@ -97,6 +79,7 @@ private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
 	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];