X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvmodule.C;h=6d69dc3c454acad0f656caed4f423ecd79da85f2;hb=361dbd9de4e6e4143ea0cac5daa89b30685a4c70;hp=fd9d557e44c9f1566368e1c89a57cd0796b794f3;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vmodule.C b/cinelerra-5.1/cinelerra/vmodule.C
index fd9d557e..6d69dc3c 100644
--- a/cinelerra-5.1/cinelerra/vmodule.C
+++ b/cinelerra-5.1/cinelerra/vmodule.C
@@ -50,6 +50,7 @@
 #include "vedit.h"
 #include "vframe.h"
 #include "videodevice.h"
+#include "virtualvconsole.h"
 #include "vmodule.h"
 #include "vrender.h"
 #include "vplugin.h"
@@ -452,7 +453,8 @@ int VModule::import_frame(VFrame *output,
 //			current_edit->asset->interlace_fixmethod);
 
 			// Determine the interlacing method to use.
-			int interlace_fixmethod = ilaceautofixmethod2(get_edl()->session->interlace_mode,
+			int interlace_fixmethod = !current_edit->asset ? BC_ILACE_FIXMETHOD_NONE :
+				 ilaceautofixmethod2(get_edl()->session->interlace_mode,
 					current_edit->asset->interlace_autofixoption,
 					current_edit->asset->interlace_mode,
 					current_edit->asset->interlace_fixmethod);
@@ -1082,21 +1084,34 @@ int VModule::render(VFrame *output,
 			use_opengl);
 	}
 
-	int64_t mask_position = !renderengine ? start_position :
-		renderengine->vrender->current_position;
 	Auto *current = 0;
 	MaskAutos *keyframe_set =
 		(MaskAutos*)track->automation->autos[AUTOMATION_MASK];
-        MaskAuto *keyframe =
+	int64_t mask_position = !renderengine ? start_position :
+		renderengine->vrender->current_position;
+       	MaskAuto *keyframe =
 		(MaskAuto*)keyframe_set->get_prev_auto(mask_position, direction, current);
+
 	if( keyframe->apply_before_plugins ) {
-		if( !masker ) {
-			int cpus = renderengine ?
-				renderengine->preferences->processors :
-				plugin_array->mwindow->preferences->processors;
-			masker = new MaskEngine(cpus);
+		VDeviceX11 *x11_device = 0;
+		if(use_opengl && renderengine && renderengine->video) {
+			x11_device = (VDeviceX11*)renderengine->video->get_output_base();
+			if( !x11_device->can_mask(mask_position, keyframe_set) )
+				use_opengl = 0;
+		}
+		if( use_opengl && x11_device ) {
+			x11_device->do_mask(output, mask_position, keyframe_set,
+					keyframe, keyframe);
+		}
+		else {
+			if( !masker ) {
+				int cpus = renderengine ?
+					renderengine->preferences->processors :
+					plugin_array->mwindow->preferences->processors;
+				masker = new MaskEngine(cpus);
+			}
+			masker->do_mask(output, mask_position, keyframe_set, keyframe, keyframe);
 		}
-		masker->do_mask(output, mask_position, keyframe_set, keyframe, keyframe);
 	}
 
 	return result;