X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Finterpolatevideo%2Finterpolatevideo.C;h=169bf6e8e0b34910346138bf7c1ab8b5ccb9c2b9;hb=HEAD;hp=017be8d51811fbb0d1d229efded3c6dd124d4540;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C b/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
index 017be8d5..169bf6e8 100644
--- a/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
+++ b/cinelerra-5.1/plugins/interpolatevideo/interpolatevideo.C
@@ -24,7 +24,7 @@
 #include "interpolatevideo.h"
 #include "interpolatewindow.h"
 #include "language.h"
-#include "motionscan.h"
+#include "motionscan-hv.h"
 #include "opticflow.h"
 #include "transportque.inc"
 #include <unistd.h>
@@ -326,6 +326,11 @@ void InterpolateVideo::create_macroblocks()
 // Get macroblock size
 	x_macroblocks = frames[0]->get_w() / config.macroblock_size;
 	y_macroblocks = frames[0]->get_h() / config.macroblock_size;
+// printf("InterpolateVideo::create_macroblocks %d %d %d %d\n", 
+// __LINE__, 
+// config.macroblock_size,
+// x_macroblocks,
+// y_macroblocks);
 
 	if(config.macroblock_size * x_macroblocks < frames[0]->get_w())
 	{
@@ -772,12 +777,8 @@ int InterpolateVideo::process_buffer(VFrame *frame,
 	{
 		for(int i = 0; i < 2; i++)
 		{
-			frames[i] = new VFrame(0,
-				-1,
-				frame->get_w(),
-				frame->get_h(),
-				frame->get_color_model(),
-				-1);
+			frames[i] = new VFrame(frame->get_w(), frame->get_h(),
+				frame->get_color_model(), 0);
 		}
 	}
 //printf("InterpolateVideo::process_buffer 1 %lld %lld\n", range_start, range_end);
@@ -845,7 +846,7 @@ int InterpolateVideo::process_buffer(VFrame *frame,
 
 
 NEW_WINDOW_MACRO(InterpolateVideo, InterpolateVideoWindow)
-const char* InterpolateVideo::plugin_title() { return _("Interpolate Video"); }
+const char* InterpolateVideo::plugin_title() { return N_("Interpolate Video"); }
 int InterpolateVideo::is_realtime() { return 1; }
 
 int InterpolateVideo::load_configuration()
@@ -948,7 +949,7 @@ void InterpolateVideo::save_data(KeyFrame *keyframe)
 	FileXML output;
 
 // cause data to be stored directly in text
-	output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
+	output.set_shared_output(keyframe->xbuf);
 	output.tag.set_title("INTERPOLATEVIDEO");
 	output.tag.set_property("INPUT_RATE", config.input_rate);
 	output.tag.set_property("USE_KEYFRAMES", config.use_keyframes);
@@ -967,7 +968,7 @@ void InterpolateVideo::read_data(KeyFrame *keyframe)
 {
 	FileXML input;
 
-	input.set_shared_input(keyframe->get_data(), strlen(keyframe->get_data()));
+	input.set_shared_input(keyframe->xbuf);
 
 	while(!input.read_tag())
 	{