X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Fmotion-cv%2Fmotion-cv.h;h=99de4b25cfac301e454a655b195a1a0000ecc011;hb=26f3c4335351a3938db78303c57a2ba6551a2a10;hp=c8788a024c7edc6f71db38e98062414b9bda2968;hpb=1e154071bd323f756625f8172ef67133a561450a;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/motion-cv/motion-cv.h b/cinelerra-5.1/plugins/motion-cv/motion-cv.h
index c8788a02..99de4b25 100644
--- a/cinelerra-5.1/plugins/motion-cv/motion-cv.h
+++ b/cinelerra-5.1/plugins/motion-cv/motion-cv.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef MOTION_H
@@ -64,7 +64,7 @@ class RotateCVScan;
 // Precision of rotation
 #define MIN_ANGLE 0.0001
 
-#define TRACKING_FILE "/tmp/motion"
+#define TRACKING_FILE "/tmp/motion-cv"
 
 class MotionCVConfig
 {
@@ -73,7 +73,7 @@ public:
 
 	int equivalent(MotionCVConfig &that);
 	void copy_from(MotionCVConfig &that);
-	void interpolate(MotionCVConfig &prev, MotionCVConfig &next, 
+	void interpolate(MotionCVConfig &prev, MotionCVConfig &next,
 		int64_t prev_frame, int64_t next_frame, int64_t current_frame);
 	void boundaries();
 
@@ -174,8 +174,8 @@ public:
 		int sub_x,
 		int sub_y);
 
-	static void clamp_scan(int w, 
-		int h, 
+	static void clamp_scan(int w,
+		int h,
 		int *block_x1,
 		int *block_y1,
 		int *block_x2,
@@ -212,17 +212,25 @@ public:
 	int current_dy;
 	float current_angle;
 
-	FILE *active_fp;
-	char active_file[BCTEXTLEN];
-	int get_line_key(const char *filename, int64_t key, char *line, int len);
+	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;
 	int search_size;
@@ -262,6 +270,14 @@ public:
 
 
 
+class MotionCvVVFrame : public VFrame
+{
+public:
+	MotionCvVVFrame(VFrame *vfrm, int n);
+	int draw_pixel(int x, int y);
+	int n;
+};
+
 
 
 
@@ -333,8 +349,8 @@ public:
 class MotionCVScan : public LoadServer
 {
 public:
-	MotionCVScan(MotionCVMain *plugin, 
-		int total_clients, 
+	MotionCVScan(MotionCVMain *plugin,
+		int total_clients,
 		int total_packages);
 	~MotionCVScan();
 
@@ -352,7 +368,7 @@ public:
 	int64_t get_cache(int x, int y);
 	void put_cache(int x, int y, int64_t difference);
 
-// Change between previous frame and current frame multiplied by 
+// Change between previous frame and current frame multiplied by
 // OVERSAMPLE
 	int dx_result;
 	int dy_result;
@@ -427,8 +443,8 @@ public:
 class RotateCVScan : public LoadServer
 {
 public:
-	RotateCVScan(MotionCVMain *plugin, 
-		int total_clients, 
+	RotateCVScan(MotionCVMain *plugin,
+		int total_clients,
 		int total_packages);
 	~RotateCVScan();