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

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index f748f1c..925bf2a 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -24,6 +24,7 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	: image_format(image_format),
 	  ycbcr_format(ycbcr_format),
 	  ycbcr_input_splitting(ycbcr_input_splitting),
+	  needs_mipmaps(false),
 	  type(type),
 	  width(width),
 	  height(height),
@@ -53,6 +54,8 @@ 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()
@@ -104,7 +107,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 			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();
@@ -116,6 +119,10 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 			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);
@@ -132,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;
 	}
@@ -144,20 +153,7 @@ string YCbCrInput::output_fragment_shader()
 {
 	float offset[3];
 	Matrix3d ycbcr_to_rgb;
-	compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb);
-
-	if (type == GL_UNSIGNED_SHORT) {
-		// For 10-bit or 12-bit packed into 16-bit, we need to scale the values
-		// so that the max value goes from 1023 (or 4095) to 65535. We do this
-		// by folding the scaling into the conversion matrix, so it comes essentially
-		// for free. However, the offset is before the scaling (and thus assumes
-		// correctly scaled values), so we need to adjust that the other way.
-		double scale = 65535.0 / (ycbcr_format.num_levels - 1);
-		offset[0] /= scale;
-		offset[1] /= scale;
-		offset[2] /= scale;
-		ycbcr_to_rgb *= scale;
-	}
+	compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb, type);
 
 	string frag_shader;
 
@@ -179,9 +175,12 @@ string YCbCrInput::output_fragment_shader()
 	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 Y_CB_CR_SAME_TEXTURE 0\n#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));
+			cb_cr_offsets_equal);
 		frag_shader += buf;
 	} else {
 		frag_shader += "#define Y_CB_CR_SAME_TEXTURE 0\n#define CB_CR_SAME_TEXTURE 0\n";
@@ -201,8 +200,10 @@ void YCbCrInput::invalidate_pixel_data()
 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);
 }