X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fdeinterlace%2Fdeinterlace.C;h=27a5c5959758a0d82478c33a95ed5a6a51e26e5b;hp=7d1d41d79fa34ad144012b9f38404d8d738a18bc;hb=723142d62d61cde588e961426440f839ca9dcda9;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;ds=sidebyside

diff --git a/cinelerra-5.1/plugins/deinterlace/deinterlace.C b/cinelerra-5.1/plugins/deinterlace/deinterlace.C
index 7d1d41d7..27a5c595 100644
--- a/cinelerra-5.1/plugins/deinterlace/deinterlace.C
+++ b/cinelerra-5.1/plugins/deinterlace/deinterlace.C
@@ -28,23 +28,12 @@
 #include "language.h"
 #include "vframe.h"
 
-
-
-
-
-
-
-
-
 #include <stdint.h>
 #include <string.h>
 
 
 REGISTER_PLUGIN(DeInterlaceMain)
 
-
-
-
 DeInterlaceConfig::DeInterlaceConfig()
 {
 	mode = DEINTERLACE_EVEN;
@@ -92,7 +81,7 @@ DeInterlaceMain::~DeInterlaceMain()
 //	if(temp) delete temp;
 }
 
-const char* DeInterlaceMain::plugin_title() { return _("Deinterlace"); }
+const char* DeInterlaceMain::plugin_title() { return N_("Deinterlace"); }
 int DeInterlaceMain::is_realtime() { return 1; }
 
 
@@ -378,10 +367,8 @@ int DeInterlaceMain::process_buffer(VFrame *frame,
 	temp = frame;
 
 // 	if(!temp)
-// 		temp = new VFrame(0,
-// 			frame->get_w(),
-// 			frame->get_h(),
-// 			frame->get_color_model());
+// 		temp = new VFrame(frame->get_w(), frame->get_h(),
+// 			frame->get_color_model(), 0);
 
 	switch(config.mode)
 	{
@@ -458,63 +445,62 @@ int DeInterlaceMain::handle_opengl()
 	get_output()->enable_opengl();
 	get_output()->init_screen();
 
-	const char *shader_stack[] = { 0, 0, 0 };
-	shader_stack[0] = head_frag;
+	if( config.mode != DEINTERLACE_NONE ) {
+		const char *shader_stack[16];
+		memset(shader_stack,0, sizeof(shader_stack));
+		int current_shader = 0;
 
-	float double_line_h = 2.0 / get_output()->get_texture_h();
-	float line_h = 1.0 / get_output()->get_texture_h();
-	float y_offset = 0.0;
-	switch(config.mode)
-	{
+		shader_stack[current_shader++] = head_frag;
+
+		float double_line_h = 2.0 / get_output()->get_texture_h();
+		float line_h = 1.0 / get_output()->get_texture_h();
+		float y_offset = 0.0;
+		const char *shader_frag = 0;
+
+		switch(config.mode) {
 		case DEINTERLACE_EVEN:
-			shader_stack[1] = line_double_frag;
+			shader_frag = line_double_frag;
 			break;
 		case DEINTERLACE_ODD:
-			shader_stack[1] = line_double_frag;
+			shader_frag = line_double_frag;
 			y_offset += 1.0;
 			break;
 
 		case DEINTERLACE_AVG:
-			shader_stack[1] = line_avg_frag;
+			shader_frag = line_avg_frag;
 			break;
 
 		case DEINTERLACE_AVG_EVEN:
-			shader_stack[1] = field_avg_frag;
+			shader_frag = field_avg_frag;
 			break;
 
 		case DEINTERLACE_AVG_ODD:
-			shader_stack[1] = field_avg_frag;
+			shader_frag = field_avg_frag;
 			y_offset += 1.0;
 			break;
 
 		case DEINTERLACE_SWAP_EVEN:
-			shader_stack[1] = line_swap_frag;
+			shader_frag = line_swap_frag;
 			break;
 
 		case DEINTERLACE_SWAP_ODD:
-			shader_stack[1] = line_swap_frag;
+			shader_frag = line_swap_frag;
 			y_offset += 1.0;
 			break;
-	}
-
-	y_offset /= get_output()->get_texture_h();
-
-	shader_stack[2] = tail_frag;
-
-	if(config.mode != DEINTERLACE_NONE)
-	{
-		unsigned int frag = VFrame::make_shader(0,
-			shader_stack[0],
-			shader_stack[1],
-			shader_stack[2],
-			0);
-		if(frag)
-		{
-			glUseProgram(frag);
-			glUniform1i(glGetUniformLocation(frag, "tex"), 0);
-			glUniform1f(glGetUniformLocation(frag, "line_h"), line_h);
-			glUniform1f(glGetUniformLocation(frag, "double_line_h"), double_line_h);
-			glUniform1f(glGetUniformLocation(frag, "y_offset"), y_offset);
+		}
+		if( shader_frag )
+			shader_stack[current_shader++] = shader_frag;
+
+		shader_stack[current_shader++] = tail_frag;
+		shader_stack[current_shader] = 0;
+		unsigned int shader = VFrame::make_shader(shader_stack);
+		if( shader > 0 ) {
+			y_offset /= get_output()->get_texture_h();
+			glUseProgram(shader);
+			glUniform1i(glGetUniformLocation(shader, "tex"), 0);
+			glUniform1f(glGetUniformLocation(shader, "line_h"), line_h);
+			glUniform1f(glGetUniformLocation(shader, "double_line_h"), double_line_h);
+			glUniform1f(glGetUniformLocation(shader, "y_offset"), y_offset);
 		}
 	}