X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.h;h=712035ce3444927faac0e7d7209e7ebe9e3db389;hp=22208e006209de2430ab5a8ae0b4874ac74a7085;hb=930a54d9a25ad48c2e014cd270797917db51793f;hpb=cdbed3b89528ee2f640613219fa3c77a0ad8fef5

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 22208e0..712035c 100644
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,10 +1,22 @@
 #ifndef _MOVIT_YCBCR_INPUT_H
 #define _MOVIT_YCBCR_INPUT_H 1
 
-// YCbCrInput is for handling planar or 4:4:4 interleaved 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.
+// YCbCrInput is for handling Y'CbCr (also sometimes, usually rather
+// imprecisely, called “YUV”), which is typically what you get from a video
+// decoder. It supports these formats:
+//
+//   * 8-bit planar Y'CbCr, possibly subsampled (e.g. 4:2:0).
+//   * 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 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>
@@ -20,9 +32,7 @@ namespace movit {
 
 class ResourcePool;
 
-// Whether the data is planar (Y', Cb and Cr in one texture each)
-// or not. Note that YCbCr422InterleavedInput supports the important special
-// case of 4:2:2 interleaved.
+// Whether the data is planar (Y', Cb and Cr in one texture each) or not.
 enum YCbCrInputSplitting {
 	// The standard, default case; Y', Cb and Cr in one texture each.
 	YCBCR_INPUT_PLANAR,
@@ -41,10 +51,14 @@ enum YCbCrInputSplitting {
 
 class YCbCrInput : public Input {
 public:
+	// 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,
 	           unsigned width, unsigned height,
-	           YCbCrInputSplitting ycbcr_input_splitting = YCBCR_INPUT_PLANAR);
+	           YCbCrInputSplitting ycbcr_input_splitting = YCBCR_INPUT_PLANAR,
+	           GLenum type = GL_UNSIGNED_BYTE);
 	~YCbCrInput();
 
 	virtual std::string effect_type_id() const { return "YCbCrInput"; }
@@ -61,7 +75,8 @@ 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; }
+	virtual bool can_supply_mipmaps() const { return ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED; }
+	virtual bool is_single_texture() const { 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
@@ -75,12 +90,31 @@ 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(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_2_10_10_10_REV);
 		assert(channel >= 0 && channel < num_channels);
 		this->pixel_data[channel] = pixel_data;
 		this->pbos[channel] = pbo;
 		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);
+		assert(channel == 0);
+		this->pixel_data[channel] = reinterpret_cast<const unsigned char *>(pixel_data);
+		this->pbos[channel] = pbo;
+		invalidate_pixel_data();
+	}
+
 	void invalidate_pixel_data();
 
 	// Note: Sets pitch to width, so even if your pitch is unchanged,
@@ -142,6 +176,7 @@ private:
 	YCbCrFormat ycbcr_format;
 	GLuint num_channels;
 	YCbCrInputSplitting ycbcr_input_splitting;
+	GLenum type;
 	GLuint pbos[3], texture_num[3];
 	GLint uniform_tex_y, uniform_tex_cb, uniform_tex_cr;