X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fmotion%2Fmotion.h;h=493aeeef0f735a1f913ab8404181bd7ffe033d51;hb=d684013dedfefefcb8ca4bbea527382c91521532;hp=e0011d751171bc8707ee32361650a65692c25a47;hpb=475fa6dfcef9891664bb055b4e93e7f2f8a7cf3b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/motion/motion.h b/cinelerra-5.1/plugins/motion/motion.h
index e0011d75..493aeeef 100644
--- a/cinelerra-5.1/plugins/motion/motion.h
+++ b/cinelerra-5.1/plugins/motion/motion.h
@@ -43,8 +43,6 @@ class MotionWindow;
 class RotateScan;
 
 
-
-
 // Limits of global range in percent
 #define MIN_RADIUS 1
 #define MAX_RADIUS 100
@@ -64,7 +62,7 @@ class RotateScan;
 // Precision of rotation
 #define MIN_ANGLE 0.0001
 
-#define ROTATION_FILE "/tmp/r"
+#define TRACKING_FILE "/tmp/motion"
 
 class MotionConfig
 {
@@ -73,13 +71,9 @@ public:
 
 	int equivalent(MotionConfig &that);
 	void copy_from(MotionConfig &that);
-	void interpolate(MotionConfig &prev,
-		MotionConfig &next,
-		int64_t prev_frame,
-		int64_t next_frame,
-		int64_t current_frame);
+	void interpolate(MotionConfig &prev, MotionConfig &next,
+		int64_t prev_frame, int64_t next_frame, int64_t current_frame);
 	void boundaries();
-	void set_cpus(int cpus);
 
 	int block_count;
 	int global_range_w;
@@ -110,6 +104,7 @@ public:
 	int global;
 	int rotate;
 	int addtrackedframeoffset;
+	char tracking_file[BCTEXTLEN];
 // Track or stabilize, single pixel, scan only, or nothing
 	int action_type;
 // Recalculate, no calculate, save, or load coordinates from disk
@@ -117,28 +112,6 @@ public:
 // Track a single frame, previous frame, or previous frame same block
 	int tracking_object;
 
-#if 0
-	enum
-	{
-// action_type
-		TRACK,
-		STABILIZE,
-		TRACK_PIXEL,
-		STABILIZE_PIXEL,
-		NOTHING,
-// mode2
-		RECALCULATE,
-		SAVE,
-		LOAD,
-		NO_CALCULATE,
-// tracking_object
-		TRACK_SINGLE,
-		TRACK_PREVIOUS,
-		PREVIOUS_SAME_BLOCK
-	};
-#endif
-
-
 // Number of single frame to track relative to timeline start
 	int64_t track_frame;
 // Master layer
@@ -146,17 +119,13 @@ public:
 };
 
 
-
-
 class MotionMain : public PluginVClient
 {
 public:
 	MotionMain(PluginServer *server);
 	~MotionMain();
 
-	int process_buffer(VFrame **frame,
-		int64_t start_position,
-		double frame_rate);
+	int process_buffer(VFrame **frame, int64_t start_position, double frame_rate);
 	void process_global();
 	void process_rotation();
 	void draw_vectors(VFrame *frame);
@@ -171,7 +140,6 @@ public:
 
 	PLUGIN_CLASS_MEMBERS2(MotionConfig)
 
-
 	static void draw_pixel(VFrame *frame, int x, int y);
 	static void draw_line(VFrame *frame, int x1, int y1, int x2, int y2);
 	void draw_arrow(VFrame *frame, int x1, int y1, int x2, int y2);
@@ -199,7 +167,25 @@ public:
 	int current_dy;
 	float current_angle;
 
-
+	char cache_file[BCTEXTLEN];
+	FILE *cache_fp, *active_fp;
+	void reset_cache_file();
+	int open_cache_file();
+	void close_cache_file();
+	int load_cache_line();
+	int locate_cache_line(int64_t key);
+	int get_cache_line(int64_t key);
+	int put_cache_line(const char *line);
+	char cache_line[BCSTRLEN];
+	int64_t cache_key, active_key;
+// add constant frame offset values
+	int dx_offset, dy_offset;
+	int64_t tracking_frame;
+// save/load result values
+	int load_ok;
+	int save_dx, load_dx;
+	int save_dy, load_dy;
+	float save_dt, load_dt;
 
 // Oversampled current frame for motion estimation
 	int32_t *search_area;
@@ -239,28 +225,6 @@ public:
 };
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class RotateScanPackage : public LoadPackage
 {
 public:
@@ -349,13 +313,4 @@ private:
 	Mutex *cache_lock;
 };
 
-
-
-
 #endif
-
-
-
-
-
-