X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=071ce134833151b33bbb9cce800c1971143106dc;hp=091880fdade7f0dd2ee778b9bc74366dc668a637;hb=244117563f4c74686ba8f47d1942850e601545f2;hpb=ba60914d4e5eda7b28af700bf43e9699b7aa720d

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 091880f..071ce13 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -18,9 +18,11 @@ namespace movit {
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
-                       unsigned width, unsigned height)
+                       unsigned width, unsigned height,
+                       YCbCrInputSplitting ycbcr_input_splitting)
 	: image_format(image_format),
 	  ycbcr_format(ycbcr_format),
+	  ycbcr_input_splitting(ycbcr_input_splitting),
 	  width(width),
 	  height(height),
 	  resource_pool(NULL)
@@ -28,37 +30,50 @@ 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) {
+		num_channels = 2;
+		register_uniform_sampler2d("tex_cbcr", &uniform_tex_cb);
+	} else {
+		assert(ycbcr_input_splitting == YCBCR_INPUT_PLANAR);
+		num_channels = 3;
+		register_uniform_sampler2d("tex_cb", &uniform_tex_cb);
+		register_uniform_sampler2d("tex_cr", &uniform_tex_cr);
+	}
 }
 
 YCbCrInput::~YCbCrInput()
 {
-	for (unsigned channel = 0; channel < 3; ++channel) {
-		if (texture_num[channel] != 0) {
-			resource_pool->release_2d_texture(texture_num[channel]);
-		}
+	for (unsigned channel = 0; channel < num_channels; ++channel) {
+		possibly_release_texture(channel);
 	}
 }
 
 void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
-	for (unsigned channel = 0; channel < 3; ++channel) {
+	for (unsigned channel = 0; channel < num_channels; ++channel) {
 		glActiveTexture(GL_TEXTURE0 + *sampler_num + channel);
 		check_error();
 
 		if (texture_num[channel] == 0) {
+			GLenum format, internal_format;
+			if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
+				format = GL_RG;
+				internal_format = GL_RG8;
+			} else {
+				format = GL_RED;
+				internal_format = GL_R8;
+			}
+
 			// (Re-)upload the texture.
-			texture_num[channel] = resource_pool->create_2d_texture(GL_R8, widths[channel], heights[channel]);
+			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);
@@ -69,7 +84,7 @@ 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], GL_RED, GL_UNSIGNED_BYTE, pixel_data[channel]);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], format, GL_UNSIGNED_BYTE, pixel_data[channel]);
 			check_error();
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 			check_error();
@@ -77,6 +92,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 			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();
@@ -87,11 +103,13 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 	check_error();
 
 	// Bind samplers.
-	set_uniform_int(glsl_program_num, prefix, "tex_y", *sampler_num + 0);
-	set_uniform_int(glsl_program_num, prefix, "tex_cb", *sampler_num + 1);
-	set_uniform_int(glsl_program_num, prefix, "tex_cr", *sampler_num + 2);
+	uniform_tex_y = *sampler_num + 0;
+	uniform_tex_cb = *sampler_num + 1;
+	if (ycbcr_input_splitting == YCBCR_INPUT_PLANAR) {
+		uniform_tex_cr = *sampler_num + 2;
+	}
 
-	*sampler_num += 3;
+	*sampler_num += num_channels;
 }
 
 string YCbCrInput::output_fragment_shader()
@@ -117,6 +135,15 @@ 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) {
+		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));
+		frag_shader += buf;
+	} else {
+		frag_shader += "#define CB_CR_SAME_TEXTURE 0\n";
+	}
+
 	frag_shader += read_file("ycbcr_input.frag");
 	return frag_shader;
 }
@@ -124,10 +151,7 @@ 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);
 	}
 }
 
@@ -140,4 +164,13 @@ bool YCbCrInput::set_int(const std::string& key, int value)
 	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