X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=97ad5266bb3b0c9942f39dd3a2964aceedf848c1;hp=9f4e320cb6926f1f21d8fc98b2a9c66669ecb6da;hb=9580d67514ec138e65496aa1170c63b53f657207;hpb=358df88f77e4f8ae2ead71a06dc36bf5402d9b5d

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 9f4e320..97ad526 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -5,7 +5,7 @@
 // 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>
 
@@ -13,27 +13,11 @@
 #include "effect_chain.h"
 #include "image_format.h"
 #include "input.h"
+#include "ycbcr.h"
 
-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;
+namespace movit {
 
-	// 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 ResourcePool;
 
 class YCbCrInput : public Input {
 public:
@@ -44,11 +28,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; }
 
@@ -61,6 +40,7 @@ public:
 	unsigned get_height() const { return height; }
 	Colorspace get_color_space() const { return image_format.color_space; }
 	GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
+	virtual bool can_supply_mipmaps() const { return false; }
 
 	// 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
@@ -85,6 +65,7 @@ public:
 	void set_pitch(unsigned channel, unsigned pitch) {
 		assert(channel >= 0 && channel < 3);
 		this->pitch[channel] = pitch;
+		invalidate_pixel_data();
 	}
 
 	virtual void inform_added(EffectChain *chain)
@@ -92,13 +73,12 @@ public:
 		resource_pool = chain->get_resource_pool();
 	}
 
+	bool set_int(const std::string& key, int value);
+
 private:
 	ImageFormat image_format;
 	YCbCrFormat ycbcr_format;
 	GLuint pbos[3], texture_num[3];
-	bool finalized;
-
-	int needs_mipmaps;
 
 	unsigned width, height, widths[3], heights[3];
 	const unsigned char *pixel_data[3];
@@ -106,4 +86,6 @@ private:
 	ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_YCBCR_INPUT_H)