X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=925bf2a11b2a89032b0d6f20f56110ceced0aa8f;hp=7f58f3fa019d66fa6ac95115f0985463786e85d0;hb=f99a1a6295d7809703f6b0dfb7ab4360916b002e;hpb=ae634b4c9fd1a8275b36458862ada71a44063108

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 7f58f3f..925bf2a 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -19,10 +19,13 @@ namespace movit {
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
                        unsigned width, unsigned height,
-                       YCbCrInputSplitting ycbcr_input_splitting)
+                       YCbCrInputSplitting ycbcr_input_splitting,
+                       GLenum type)
 	: image_format(image_format),
 	  ycbcr_format(ycbcr_format),
 	  ycbcr_input_splitting(ycbcr_input_splitting),
+	  needs_mipmaps(false),
+	  type(type),
 	  width(width),
 	  height(height),
 	  resource_pool(NULL)
@@ -30,21 +33,19 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	pbos[0] = pbos[1] = pbos[2] = 0;
 	texture_num[0] = texture_num[1] = texture_num[2] = 0;
 
-	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;
-
-	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;
+	set_width(width);
+	set_height(height);
 
 	pixel_data[0] = pixel_data[1] = pixel_data[2] = NULL;
+	owns_texture[0] = owns_texture[1] = owns_texture[2] = false;
 
 	register_uniform_sampler2d("tex_y", &uniform_tex_y);
 
-	if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+	if (ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED) {
+		num_channels = 1;
+		assert(ycbcr_format.chroma_subsampling_x == 1);
+		assert(ycbcr_format.chroma_subsampling_y == 1);
+	} else if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
 		num_channels = 2;
 		register_uniform_sampler2d("tex_cbcr", &uniform_tex_cb);
 	} else {
@@ -53,14 +54,14 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 		register_uniform_sampler2d("tex_cb", &uniform_tex_cb);
 		register_uniform_sampler2d("tex_cr", &uniform_tex_cr);
 	}
+
+	register_int("needs_mipmaps", &needs_mipmaps);
 }
 
 YCbCrInput::~YCbCrInput()
 {
 	for (unsigned channel = 0; channel < num_channels; ++channel) {
-		if (texture_num[channel] != 0) {
-			resource_pool->release_2d_texture(texture_num[channel]);
-		}
+		possibly_release_texture(channel);
 	}
 }
 
@@ -70,21 +71,43 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 		glActiveTexture(GL_TEXTURE0 + *sampler_num + channel);
 		check_error();
 
-		if (texture_num[channel] == 0) {
+		if (texture_num[channel] == 0 && (pbos[channel] != 0 || pixel_data[channel] != NULL)) {
 			GLenum format, internal_format;
-			if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+			if (channel == 0 && ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED) {
+				if (type == GL_UNSIGNED_INT_2_10_10_10_REV) {
+					format = GL_RGBA;
+					internal_format = GL_RGB10_A2;
+				} else if (type == GL_UNSIGNED_SHORT) {
+					format = GL_RGB;
+					internal_format = GL_RGB16;
+				} else {
+					assert(type == GL_UNSIGNED_BYTE);
+					format = GL_RGB;
+					internal_format = GL_RGB8;
+				}
+			} else if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
 				format = GL_RG;
-				internal_format = GL_RG8;
+				if (type == GL_UNSIGNED_SHORT) {
+					internal_format = GL_RG16;
+				} else {
+					assert(type == GL_UNSIGNED_BYTE);
+					internal_format = GL_RG8;
+				}
 			} else {
 				format = GL_RED;
-				internal_format = GL_R8;
+				if (type == GL_UNSIGNED_SHORT) {
+					internal_format = GL_R16;
+				} else {
+					assert(type == GL_UNSIGNED_BYTE);
+					internal_format = GL_R8;
+				}
 			}
 
 			// (Re-)upload the texture.
 			texture_num[channel] = resource_pool->create_2d_texture(internal_format, widths[channel], heights[channel]);
 			glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 			check_error();
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
 			check_error();
 			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
 			check_error();
@@ -92,14 +115,19 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 			check_error();
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
 			check_error();
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, GL_UNSIGNED_BYTE, pixel_data[channel]);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, type, pixel_data[channel]);
 			check_error();
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 			check_error();
+			if (needs_mipmaps) {
+				glGenerateMipmap(GL_TEXTURE_2D);
+				check_error();
+			}
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			check_error();
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			check_error();
+			owns_texture[channel] = true;
 		} else {
 			glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 			check_error();
@@ -111,7 +139,9 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 
 	// Bind samplers.
 	uniform_tex_y = *sampler_num + 0;
-	uniform_tex_cb = *sampler_num + 1;
+	if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED) {
+		uniform_tex_cb = *sampler_num + 1;
+	}
 	if (ycbcr_input_splitting == YCBCR_INPUT_PLANAR) {
 		uniform_tex_cr = *sampler_num + 2;
 	}
@@ -123,7 +153,7 @@ string YCbCrInput::output_fragment_shader()
 {
 	float offset[3];
 	Matrix3d ycbcr_to_rgb;
-	compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb);
+	compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb, type);
 
 	string frag_shader;
 
@@ -142,13 +172,18 @@ string YCbCrInput::output_fragment_shader()
 		ycbcr_format.cr_y_position, ycbcr_format.chroma_subsampling_y, heights[2]);
 	frag_shader += output_glsl_vec2("PREFIX(cr_offset)", cr_offset_x, cr_offset_y);
 
-	if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+	if (ycbcr_input_splitting == YCBCR_INPUT_INTERLEAVED) {
+		frag_shader += "#define Y_CB_CR_SAME_TEXTURE 1\n";
+	} else if (ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+		bool cb_cr_offsets_equal =
+			(fabs(ycbcr_format.cb_x_position - ycbcr_format.cr_x_position) < 1e-6) &&
+			(fabs(ycbcr_format.cb_y_position - ycbcr_format.cr_y_position) < 1e-6);
 		char buf[256];
-		snprintf(buf, sizeof(buf), "#define CB_CR_SAME_TEXTURE 1\n#define CB_CR_OFFSETS_EQUAL %d\n",
-			(fabs(ycbcr_format.cb_x_position - ycbcr_format.cr_x_position) < 1e-6));
+		snprintf(buf, sizeof(buf), "#define Y_CB_CR_SAME_TEXTURE 0\n#define CB_CR_SAME_TEXTURE 1\n#define CB_CR_OFFSETS_EQUAL %d\n",
+			cb_cr_offsets_equal);
 		frag_shader += buf;
 	} else {
-		frag_shader += "#define CB_CR_SAME_TEXTURE 0\n";
+		frag_shader += "#define Y_CB_CR_SAME_TEXTURE 0\n#define CB_CR_SAME_TEXTURE 0\n";
 	}
 
 	frag_shader += read_file("ycbcr_input.frag");
@@ -158,20 +193,28 @@ string YCbCrInput::output_fragment_shader()
 void YCbCrInput::invalidate_pixel_data()
 {
 	for (unsigned channel = 0; channel < 3; ++channel) {
-		if (texture_num[channel] != 0) {
-			resource_pool->release_2d_texture(texture_num[channel]);
-			texture_num[channel] = 0;
-		}
+		possibly_release_texture(channel);
 	}
 }
 
 bool YCbCrInput::set_int(const std::string& key, int value)
 {
 	if (key == "needs_mipmaps") {
-		// We currently do not support this.
-		return (value == 0);
+		if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED && value != 0) {
+			// We do not currently support this.
+			return false;
+		}
 	}
 	return Effect::set_int(key, value);
 }
 
+void YCbCrInput::possibly_release_texture(unsigned channel)
+{
+	if (texture_num[channel] != 0 && owns_texture[channel]) {
+		resource_pool->release_2d_texture(texture_num[channel]);
+		texture_num[channel] = 0;
+		owns_texture[channel] = false;
+	}
+}
+
 }  // namespace movit