X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=0d24a409342de2e4fbadc2d60f429b801e7620fb;hp=31ba42bcbbacb9daa9e3fd1cadd9a80b6dee4a19;hb=f0c77209245aa206996c7ef5395888e2859ff4bf;hpb=98f458e22ce732e6c50a9856d7fd636dca49b4c3

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 31ba42b..0d24a40 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -9,12 +9,14 @@
 //   * 8-bit semiplanar Y'CbCr (Y' in one plane, CbCr in another),
 //     possibly subsampled.
 //   * 8-bit interleaved (chunked) Y'CbCr, no subsampling (4:4:4 only).
+//   * All of the above in 10- and 12-bit versions, where each sample is
+//     stored in a 16-bit int (so the 6 or 4 top bits are wasted).
 //   * 10-bit interleaved (chunked) Y'CbCr packed into 32-bit words
 //     (10:10:10:2), no subsampling (4:4:4 only).
 //
-// For the former case, it upsamples planes as needed, using the default linear
-// upsampling OpenGL gives you. Note that YCbCr422InterleavedInput supports the
-// important special case of 8-bit 4:2:2 interleaved.
+// For the planar and semiplanar cases, it upsamples planes as needed, using
+// the default linear upsampling OpenGL gives you. Note that YCbCr422InterleavedInput
+// supports the important special case of 8-bit 4:2:2 interleaved.
 
 #include <epoxy/gl.h>
 #include <assert.h>
@@ -49,7 +51,8 @@ enum YCbCrInputSplitting {
 
 class YCbCrInput : public Input {
 public:
-	// Type can be GL_UNSIGNED_BYTE for 8-bit, or GL_UNSIGNED_INT_2_10_10_10_REV
+	// Type can be GL_UNSIGNED_BYTE for 8-bit, GL_UNSIGNED_SHORT for 10- or 12-bit
+	// (or 8-bit, although that's a bit useless), or GL_UNSIGNED_INT_2_10_10_10_REV
 	// for 10-bit (YCBCR_INPUT_INTERLEAVED only).
 	YCbCrInput(const ImageFormat &image_format,
 	           const YCbCrFormat &ycbcr_format,
@@ -58,21 +61,22 @@ public:
 	           GLenum type = GL_UNSIGNED_BYTE);
 	~YCbCrInput();
 
-	virtual std::string effect_type_id() const { return "YCbCrInput"; }
+	std::string effect_type_id() const override { return "YCbCrInput"; }
 
-	virtual bool can_output_linear_gamma() const { return false; }
-	virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; }
+	bool can_output_linear_gamma() const override { return false; }
+	AlphaHandling alpha_handling() const override { return OUTPUT_BLANK_ALPHA; }
 
-	std::string output_fragment_shader();
+	std::string output_fragment_shader() override;
 
 	// Uploads the texture if it has changed since last time.
-	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
+	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) override;
 
-	unsigned get_width() const { return width; }
-	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; }
+	unsigned get_width() const override { return width; }
+	unsigned get_height() const override { return height; }
+	Colorspace get_color_space() const override { return image_format.color_space; }
+	GammaCurve get_gamma_curve() const override { return image_format.gamma_curve; }
+	bool can_supply_mipmaps() const override { return ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED; }
+	bool is_single_texture() const override { return ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED; }
 
 	// 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
@@ -93,6 +97,15 @@ public:
 		invalidate_pixel_data();
 	}
 
+	void set_pixel_data(unsigned channel, const uint16_t *pixel_data, GLuint pbo = 0)
+	{
+		assert(type == GL_UNSIGNED_SHORT);
+		assert(channel >= 0 && channel < num_channels);
+		this->pixel_data[channel] = reinterpret_cast<const unsigned char *>(pixel_data);
+		this->pbos[channel] = pbo;
+		invalidate_pixel_data();
+	}
+
 	void set_pixel_data(unsigned channel, const uint32_t *pixel_data, GLuint pbo = 0)
 	{
 		assert(type == GL_UNSIGNED_INT_2_10_10_10_REV);
@@ -148,12 +161,22 @@ public:
 		this->owns_texture[channel] = false;
 	}
 
-	virtual void inform_added(EffectChain *chain)
+	// You can change the Y'CbCr format freely, also after finalize,
+	// although with one limitation: If Cb and Cr come from the same
+	// texture and their offsets offsets are the same (ie., within 1e-6)
+	// when finalizing, they most continue to be so forever, as this
+	// optimization is compiled into the shader.
+	//
+	// If you change subsampling parameters, you'll need to call
+	// set_width() / set_height() again after this.
+	void change_ycbcr_format(const YCbCrFormat &ycbcr_format);
+
+	void inform_added(EffectChain *chain) override
 	{
 		resource_pool = chain->get_resource_pool();
 	}
 
-	bool set_int(const std::string& key, int value);
+	bool set_int(const std::string& key, int value) override;
 
 private:
 	// Release the texture in the given channel if we have any, and it is owned by us.
@@ -163,9 +186,14 @@ private:
 	YCbCrFormat ycbcr_format;
 	GLuint num_channels;
 	YCbCrInputSplitting ycbcr_input_splitting;
+	int needs_mipmaps;  // Only allowed if ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED.
 	GLenum type;
 	GLuint pbos[3], texture_num[3];
 	GLint uniform_tex_y, uniform_tex_cb, uniform_tex_cr;
+	Eigen::Matrix3d uniform_ycbcr_matrix;
+	float uniform_offset[3];
+	Point2D uniform_cb_offset, uniform_cr_offset;
+	bool cb_cr_offsets_equal;
 
 	unsigned width, height, widths[3], heights[3];
 	const unsigned char *pixel_data[3];