aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pdp_opencv_lk-help.pd108
-rw-r--r--pdp_opencv_lk.c492
-rw-r--r--pdp_opencv_motempl.c2
3 files changed, 407 insertions, 195 deletions
diff --git a/pdp_opencv_lk-help.pd b/pdp_opencv_lk-help.pd
index f3a66d8..6ae1682 100644
--- a/pdp_opencv_lk-help.pd
+++ b/pdp_opencv_lk-help.pd
@@ -1,18 +1,92 @@
-#N canvas 0 0 521 599 10;
-#X obj 101 158 pdp_xv;
-#X floatatom 256 100 5 0 0 0 - - -;
-#X msg 101 -138 open /dev/video0;
-#X obj 101 57 pdp_v4l2;
-#X text 295 101 threshold value;
-#X msg 186 61 mode \$1;
-#X floatatom 255 61 5 0 0 0 - - -;
-#X text 301 60 mode \, 0 \, 1 \, 2 \, 3 \, 4;
-#X floatatom 257 80 5 0 0 0 - - -;
-#X text 298 80 Max value used in some modes;
-#X obj 101 99 pdp_opencv_lk;
-#X connect 2 0 3 0;
-#X connect 3 0 10 0;
-#X connect 5 0 10 0;
+#N canvas 479 193 718 599 10;
+#X obj 109 285 pdp_xv;
+#X msg 22 -157 open /dev/video0;
+#X obj 96 -26 pdp_v4l2;
+#X floatatom 230 99 5 0 0 0 - - -;
+#X obj 109 242 pdp_opencv_lk;
+#X obj 96 -74 metro 40;
+#X msg 96 -105 bang;
+#X msg 137 -106 stop;
+#X text 265 98 window size;
+#X obj 285 77 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X msg 200 75 nightmode \$1;
+#X text 304 78 set nightmode;
+#X text 107 370 pdp_opencv_lk : contour point marker using pyramid
+segmentation;
+#X msg 195 49 quality \$1;
+#X floatatom 270 50 5 0 0 0 - - -;
+#X floatatom 278 25 5 0 0 0 - - -;
+#X msg 181 24 mindistance \$1;
+#X text 319 23 set distance ( default 10 );
+#X msg 174 -4 init;
+#X text 212 -4 init point detections;
+#X obj 265 -49 pdp_xv;
+#X obj 264 -76 pdp_opencv_edge;
+#X floatatom 373 -73 5 0 0 0 - - -;
+#X text 410 -75 edge threshold;
+#X floatatom 363 50 5 0 0 0 - - -;
+#X obj 174 -27 t b;
+#X obj 308 48 / 1000;
+#X msg 160 285 cursor 1;
+#X obj 109 311 route press;
+#X msg 231 125 mark \$1 \$2;
+#X msg 242 151 delete \$1;
+#X text 107 395 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org
+) and Yves Degoyon ( ydegoyon@gmail.com );
+#X text 313 151 delete a marker;
+#X msg 253 177 clear;
+#X text 301 178 delete all markers;
+#X msg 260 204 maxmove \$1;
+#X text 374 204 max movement of a marker ( default 5 pisels );
+#X floatatom 336 206 5 0 0 0 - - -;
+#X text 495 49 set quality ( default 100 );
+#X msg 403 48 100;
+#X obj 436 48 loadbang;
+#X text 310 126 mark %x %y : mark a point to track ( max points : 10
+);
+#X obj 273 296 unpack f f;
+#X floatatom 274 321 5 0 0 0 - - -;
+#X floatatom 332 322 5 0 0 0 - - -;
+#X text 275 337 X;
+#X text 330 338 Y;
+#X obj 272 270 route 1 2 3 4 5 6 7 8 9 10;
+#X obj 380 -41 / 2;
+#X connect 0 0 28 0;
+#X connect 1 0 2 0;
+#X connect 2 0 4 0;
+#X connect 2 0 21 0;
+#X connect 3 0 4 1;
+#X connect 4 0 0 0;
+#X connect 4 0 27 0;
+#X connect 4 1 47 0;
+#X connect 5 0 2 0;
#X connect 6 0 5 0;
-#X connect 8 0 10 1;
-#X connect 10 0 0 0;
+#X connect 7 0 5 0;
+#X connect 9 0 10 0;
+#X connect 10 0 4 0;
+#X connect 13 0 4 0;
+#X connect 14 0 13 0;
+#X connect 15 0 16 0;
+#X connect 16 0 4 0;
+#X connect 18 0 4 0;
+#X connect 21 0 20 0;
+#X connect 22 0 21 1;
+#X connect 24 0 26 0;
+#X connect 24 0 25 0;
+#X connect 24 0 48 0;
+#X connect 25 0 18 0;
+#X connect 26 0 14 0;
+#X connect 27 0 0 0;
+#X connect 28 0 29 0;
+#X connect 29 0 4 0;
+#X connect 30 0 4 0;
+#X connect 33 0 4 0;
+#X connect 35 0 4 0;
+#X connect 37 0 35 0;
+#X connect 39 0 24 0;
+#X connect 40 0 39 0;
+#X connect 42 0 43 0;
+#X connect 42 1 44 0;
+#X connect 47 0 42 0;
+#X connect 48 0 22 0;
diff --git a/pdp_opencv_lk.c b/pdp_opencv_lk.c
index 32a7488..fa8e8db 100644
--- a/pdp_opencv_lk.c
+++ b/pdp_opencv_lk.c
@@ -32,82 +32,89 @@
#include "cv.h"
#endif
+#define MAX_MARKERS 10
const int MAX_COUNT = 500;
typedef struct pdp_opencv_lk_struct
{
- t_object x_obj;
- t_float x_f;
-
- t_outlet *x_outlet0;
- int x_packet0;
- int x_packet1;
- int x_dropped;
- int x_queue_id;
-
- int x_width;
- int x_height;
- int x_size;
-
- int x_infosok;
-
- int win_size;
-
- // The output and temporary images
- IplImage *image, *grey, *prev_grey, *pyramid, *prev_pyramid, *swap_temp;
-
- CvPoint2D32f* points[2], *swap_points;
- char* status;
- int count;
- int need_to_init;
- int night_mode;
- int flags;
- int add_remove_pt;
- CvPoint pt;
-
+ t_object x_obj;
+ t_float x_f;
+
+ t_outlet *x_outlet0;
+ t_outlet *x_outlet1;
+ t_atom x_list[3];
+
+ int x_packet0;
+ int x_packet1;
+ int x_dropped;
+ int x_queue_id;
+
+ int x_width;
+ int x_height;
+ int x_size;
+
+ int x_infosok;
+
+ int win_size;
+ double quality;
+ int min_distance;
+ int x_maxmove;
+ int x_xmark[MAX_MARKERS];
+ int x_ymark[MAX_MARKERS];
+ int x_found[MAX_MARKERS];
+
+ // The output and temporary images
+ IplImage *image, *grey, *prev_grey, *pyramid, *prev_pyramid, *swap_temp;
+
+ CvPoint2D32f* points[2], *swap_points;
+ char* status;
+ int count;
+ int need_to_init;
+ int night_mode;
+ int flags;
+ int add_remove_pt;
+ CvPoint pt;
+ CvFont font;
} t_pdp_opencv_lk;
-
-
static void pdp_opencv_lk_process_rgb(t_pdp_opencv_lk *x)
{
t_pdp *header = pdp_packet_header(x->x_packet0);
short int *data = (short int *)pdp_packet_data(x->x_packet0);
t_pdp *newheader = pdp_packet_header(x->x_packet1);
short int *newdata = (short int *)pdp_packet_data(x->x_packet1);
- int i,j,k;
-
+ int i,j,k,im;
if ((x->x_width != (t_int)header->info.image.width) ||
(x->x_height != (t_int)header->info.image.height) || (!x->image))
{
- post("pdp_opencv_lk :: resizing plugins");
-
- //cv_freeplugins(x);
+ post("pdp_opencv_lk :: resizing plugins");
+
+ //cv_freeplugins(x);
- x->x_width = header->info.image.width;
- x->x_height = header->info.image.height;
- x->x_size = x->x_width*x->x_height;
+ x->x_width = header->info.image.width;
+ x->x_height = header->info.image.height;
+ x->x_size = x->x_width*x->x_height;
- //Destroy cv_images
- cvReleaseImage( &x->image );
- cvReleaseImage( &x->grey );
- cvReleaseImage( &x->prev_grey );
- cvReleaseImage( &x->pyramid );
- cvReleaseImage( &x->prev_pyramid );
+ //Destroy cv_images
+ cvReleaseImage( &x->image );
+ cvReleaseImage( &x->grey );
+ cvReleaseImage( &x->prev_grey );
+ cvReleaseImage( &x->pyramid );
+ cvReleaseImage( &x->prev_pyramid );
- //Create cv_images
- x->image = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 3 );
- x->grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->prev_grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->prev_pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->points[0] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
- x->points[1] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
- x->status = (char*)cvAlloc(MAX_COUNT);
+ //Create cv_images
+ x->image = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 3 );
+ x->grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->prev_grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->prev_pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->points[0] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
+ x->points[1] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
+ x->status = (char*)cvAlloc(MAX_COUNT);
}
newheader->info.image.encoding = header->info.image.encoding;
@@ -116,97 +123,210 @@ static void pdp_opencv_lk_process_rgb(t_pdp_opencv_lk *x)
memcpy( newdata, data, x->x_size*3 );
-
- // FEM UNA COPIA DEL PACKET A x->grey->imageData ... http://www.cs.iit.edu/~agam/cs512/lect-notes/opencv-intro/opencv-intro.html aqui veiem la estructura de IplImage
memcpy( x->image->imageData, data, x->x_size*3 );
- cvCvtColor( x->image, x->grey, CV_BGR2GRAY );
+ cvCvtColor( x->image, x->grey, CV_BGR2GRAY );
- if( x->night_mode )
- cvZero( x->image );
+ if( x->night_mode )
+ cvZero( x->image );
- if( x->need_to_init )
- {
- /* automatic initialization */
- IplImage* eig = cvCreateImage( cvSize(x->grey->width,x->grey->height), 32, 1 );
- IplImage* temp = cvCreateImage( cvSize(x->grey->width,x->grey->height), 32, 1 );
- double quality = 0.01;
- double min_distance = 10;
-
- x->count = MAX_COUNT;
- cvGoodFeaturesToTrack( x->grey, eig, temp, x->points[1], &x->count,
- quality, min_distance, 0, 3, 0, 0.04 );
- cvFindCornerSubPix( x->grey, x->points[1], x->count,
- cvSize(x->win_size,x->win_size), cvSize(-1,-1),
- cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03));
- cvReleaseImage( &eig );
- cvReleaseImage( &temp );
-
- x->add_remove_pt = 0;
- }
- else if( x->count > 0 )
+ for ( im=0; im<MAX_MARKERS; im++ )
+ {
+ x->x_found[im] = 0;
+ }
+
+ if( x->need_to_init )
+ {
+ /* automatic initialization */
+ IplImage* eig = cvCreateImage( cvSize(x->grey->width,x->grey->height), 32, 1 );
+ IplImage* temp = cvCreateImage( cvSize(x->grey->width,x->grey->height), 32, 1 );
+
+ x->count = MAX_COUNT;
+ cvGoodFeaturesToTrack( x->grey, eig, temp, x->points[1], &x->count,
+ x->quality, x->min_distance, 0, 3, 0, 0.04 );
+ cvFindCornerSubPix( x->grey, x->points[1], x->count,
+ cvSize(x->win_size,x->win_size), cvSize(-1,-1),
+ cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03));
+ cvReleaseImage( &eig );
+ cvReleaseImage( &temp );
+
+ x->add_remove_pt = 0;
+ }
+ else if( x->count > 0 )
+ {
+ cvCalcOpticalFlowPyrLK( x->prev_grey, x->grey, x->prev_pyramid, x->pyramid,
+ x->points[0], x->points[1], x->count, cvSize(x->win_size,x->win_size), 3, x->status, 0,
+ cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03), x->flags );
+ x->flags |= CV_LKFLOW_PYR_A_READY;
+ for( i = k = 0; i < x->count; i++ )
{
- cvCalcOpticalFlowPyrLK( x->prev_grey, x->grey, x->prev_pyramid, x->pyramid,
- x->points[0], x->points[1], x->count, cvSize(x->win_size,x->win_size), 3, x->status, 0,
- cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03), x->flags );
- x->flags |= CV_LKFLOW_PYR_A_READY;
- for( i = k = 0; i < x->count; i++ )
- {
- if( x->add_remove_pt )
- {
- double dx = x->pt.x - x->points[1][i].x;
- double dy = x->pt.y - x->points[1][i].y;
-
- if( dx*dx + dy*dy <= 25 )
- {
- x->add_remove_pt = 0;
- continue;
- }
- }
+ if( x->add_remove_pt )
+ {
+ double dx = x->pt.x - x->points[1][i].x;
+ double dy = x->pt.y - x->points[1][i].y;
+
+ if( dx*dx + dy*dy <= 25 )
+ {
+ x->add_remove_pt = 0;
+ continue;
+ }
+ }
- if( !x->status[i] )
- continue;
+ if( !x->status[i] )
+ continue;
- x->points[1][k++] = x->points[1][i];
- cvCircle( x->image, cvPointFrom32f(x->points[1][i]), 3, CV_RGB(0,255,0), -1, 8,0);
+ x->points[1][k++] = x->points[1][i];
+ cvCircle( x->image, cvPointFrom32f(x->points[1][i]), 3, CV_RGB(0,255,0), -1, 8,0);
+
+ for ( im=0; im<MAX_MARKERS; im++ )
+ {
+ // first marking
+ if ( x->x_xmark[im] != -1.0 )
+ {
+ if ( ( abs( x->points[1][i].x - x->x_xmark[im] ) <= x->x_maxmove ) && ( abs( x->points[1][i].y - x->x_ymark[im] ) <= x->x_maxmove ) )
+ {
+ char tindex[4];
+ sprintf( tindex, "%d", im+1 );
+ cvPutText( x->image, tindex, cvPointFrom32f(x->points[1][i]), &x->font, CV_RGB(255,255,255));
+ x->x_xmark[im]=x->points[1][i].x;
+ x->x_ymark[im]=x->points[1][i].y;
+ x->x_found[im]=1;
+ SETFLOAT(&x->x_list[0], im+1);
+ SETFLOAT(&x->x_list[1], x->x_xmark[im]);
+ SETFLOAT(&x->x_list[2], x->x_ymark[im]);
+ outlet_list( x->x_outlet1, 0, 3, x->x_list );
}
- x->count = k;
+ }
+ }
}
+ x->count = k;
+ }
- if( x->add_remove_pt && x->count < MAX_COUNT )
+ for ( im=0; im<MAX_MARKERS; im++ )
+ {
+ if ( (x->x_xmark[im] != -1.0 ) && !x->x_found[im] )
{
- x->points[1][x->count++] = cvPointTo32f(x->pt);
- cvFindCornerSubPix( x->grey, x->points[1] + x->count - 1, 1,
- cvSize(x->win_size,x->win_size), cvSize(-1,-1),
- cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03));
- x->add_remove_pt = 0;
+ x->x_xmark[im]=-1.0;
+ x->x_ymark[im]=-1.0;
+ SETFLOAT(&x->x_list[0], im+1);
+ SETFLOAT(&x->x_list[1], x->x_xmark[im]);
+ SETFLOAT(&x->x_list[2], x->x_ymark[im]);
+ // send a lost point message to the patch
+ outlet_list( x->x_outlet1, 0, 3, x->x_list );
+ post( "pdp_opencv_lk : lost point %d", im+1 );
}
+ }
+
+ if( x->add_remove_pt && x->count < MAX_COUNT )
+ {
+ x->points[1][x->count++] = cvPointTo32f(x->pt);
+ cvFindCornerSubPix( x->grey, x->points[1] + x->count - 1, 1,
+ cvSize(x->win_size,x->win_size), cvSize(-1,-1),
+ cvTermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS,20,0.03));
+ x->add_remove_pt = 0;
+ }
- CV_SWAP( x->prev_grey, x->grey, x->swap_temp );
- CV_SWAP( x->prev_pyramid, x->pyramid, x->swap_temp );
- CV_SWAP( x->points[0], x->points[1], x->swap_points );
- x->need_to_init = 0;
+ CV_SWAP( x->prev_grey, x->grey, x->swap_temp );
+ CV_SWAP( x->prev_pyramid, x->pyramid, x->swap_temp );
+ CV_SWAP( x->points[0], x->points[1], x->swap_points );
+ x->need_to_init = 0;
memcpy( newdata, x->image->imageData, x->x_size*3 );
-
-
return;
}
-static void pdp_opencv_lk_thresh(t_pdp_opencv_lk *x, t_floatarg f)
+static void pdp_opencv_lk_winsize(t_pdp_opencv_lk *x, t_floatarg f)
+{
+ if (f>1.0) x->win_size = (int)f;
+}
+
+static void pdp_opencv_lk_nightmode(t_pdp_opencv_lk *x, t_floatarg f)
+{
+ if ((f==0.0)||(f==1.0)) x->night_mode = (int)f;
+}
+
+static void pdp_opencv_lk_quality(t_pdp_opencv_lk *x, t_floatarg f)
+{
+ if (f>0.0) x->quality = f;
+}
+
+static void pdp_opencv_lk_mindistance(t_pdp_opencv_lk *x, t_floatarg f)
+{
+ if (f>1.0) x->min_distance = (int)f;
+}
+
+static void pdp_opencv_lk_maxmove(t_pdp_opencv_lk *x, t_floatarg f)
+{
+ // has to be more than the size of a point
+ if (f>=3.0) x->x_maxmove = (int)f;
+}
+
+static void pdp_opencv_lk_init(t_pdp_opencv_lk *x)
{
- if ((f==1)||(f==3)||(f==5)||(f==7)) x->win_size = (int)f;
+ x->need_to_init = 1;
+}
+
+static void pdp_opencv_lk_mark(t_pdp_opencv_lk *x, t_floatarg fperx, t_floatarg fpery )
+{
+ int i;
+ int inserted;
+
+ if ( ( fperx < 0.0 ) || ( fperx > 1.0 ) || ( fpery < 0.0 ) || ( fpery > 1.0 ) )
+ {
+ return;
+ }
+
+ inserted = 0;
+ for ( i=0; i<MAX_MARKERS; i++)
+ {
+ if ( x->x_xmark[i] == -1 )
+ {
+ x->x_xmark[i] = (int)(fperx*x->x_width);
+ x->x_ymark[i] = (int)(fpery*x->x_height);
+ post( "pdp_opencv_lk : inserted point (%d,%d)", x->x_xmark[i], x->x_ymark[i] );
+ inserted = 1;
+ break;
+ }
+ }
+ if ( !inserted )
+ {
+ post( "pdp_opencv_lk : max markers reached" );
+ }
+}
+
+static void pdp_opencv_lk_delete(t_pdp_opencv_lk *x, t_floatarg findex )
+{
+ int i;
+
+ if ( ( findex < 1.0 ) || ( findex > 10 ) )
+ {
+ return;
+ }
+
+ x->x_xmark[(int)findex-1] = -1;
+ x->x_ymark[(int)findex-1] = -1;
+}
+
+static void pdp_opencv_lk_clear(t_pdp_opencv_lk *x )
+{
+ int i;
+
+ for ( i=0; i<MAX_MARKERS; i++)
+ {
+ x->x_xmark[i] = -1;
+ x->x_ymark[i] = -1;
+ }
}
static void pdp_opencv_lk_sendpacket(t_pdp_opencv_lk *x)
{
- /* release the packet */
- pdp_packet_mark_unused(x->x_packet0);
- x->x_packet0 = -1;
+ /* release the packet */
+ pdp_packet_mark_unused(x->x_packet0);
+ x->x_packet0 = -1;
- /* unregister and propagate if valid dest packet */
- pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet1);
+ /* unregister and propagate if valid dest packet */
+ pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet1);
}
static void pdp_opencv_lk_process(t_pdp_opencv_lk *x)
@@ -223,21 +343,21 @@ static void pdp_opencv_lk_process(t_pdp_opencv_lk *x)
/* check if image data packets are compatible */
if ( (header = pdp_packet_header(x->x_packet0))
- && (PDP_BITMAP == header->type)){
+ && (PDP_BITMAP == header->type)){
- /* pdp_opencv_lk_process inputs and write into active inlet */
- switch(pdp_packet_header(x->x_packet0)->info.image.encoding){
+ /* pdp_opencv_lk_process inputs and write into active inlet */
+ switch(pdp_packet_header(x->x_packet0)->info.image.encoding){
- case PDP_BITMAP_RGB:
+ case PDP_BITMAP_RGB:
x->x_packet1 = pdp_packet_clone_rw(x->x_packet0);
pdp_queue_add(x, pdp_opencv_lk_process_rgb, pdp_opencv_lk_sendpacket, &x->x_queue_id);
- break;
+ break;
- default:
- /* don't know the type, so dont pdp_opencv_lk_process */
- break;
-
- }
+ default:
+ /* don't know the type, so dont pdp_opencv_lk_process */
+ break;
+
+ }
}
}
@@ -264,12 +384,12 @@ static void pdp_opencv_lk_free(t_pdp_opencv_lk *x)
pdp_packet_mark_unused(x->x_packet0);
//cv_freeplugins(x);
- //Destroy cv_images
- cvReleaseImage( &x->image );
- cvReleaseImage( &x->grey );
- cvReleaseImage( &x->prev_grey );
- cvReleaseImage( &x->pyramid );
- cvReleaseImage( &x->prev_pyramid );
+ //Destroy cv_images
+ cvReleaseImage( &x->image );
+ cvReleaseImage( &x->grey );
+ cvReleaseImage( &x->prev_grey );
+ cvReleaseImage( &x->pyramid );
+ cvReleaseImage( &x->prev_pyramid );
}
t_class *pdp_opencv_lk_class;
@@ -277,48 +397,58 @@ t_class *pdp_opencv_lk_class;
void *pdp_opencv_lk_new(t_floatarg f)
{
- int i;
-
- t_pdp_opencv_lk *x = (t_pdp_opencv_lk *)pd_new(pdp_opencv_lk_class);
- inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("win_size"));
-
- x->x_outlet0 = outlet_new(&x->x_obj, &s_anything);
-
- x->x_packet0 = -1;
- x->x_packet1 = -1;
- x->x_queue_id = -1;
+ int i;
- x->x_width = 320;
- x->x_height = 240;
- x->x_size = x->x_width * x->x_height;
+ t_pdp_opencv_lk *x = (t_pdp_opencv_lk *)pd_new(pdp_opencv_lk_class);
+ inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("win_size"));
- x->x_infosok = 0;
+ x->x_outlet0 = outlet_new(&x->x_obj, &s_anything);
+ x->x_outlet1 = outlet_new(&x->x_obj, &s_anything);
- x->win_size = 10;
-
- IplImage *image = 0, *grey = 0, *prev_grey = 0, *pyramid = 0, *prev_pyramid = 0, *swap_temp;
+ x->x_packet0 = -1;
+ x->x_packet1 = -1;
+ x->x_queue_id = -1;
- x->points [0] = 0;
- x->points [1] = 0;
- x->status = 0;
- x->count = 0;
- x->need_to_init = 1;
- x->night_mode = 0;
- x->flags = 0;
- x->add_remove_pt = 0;
+ x->x_width = 320;
+ x->x_height = 240;
+ x->x_size = x->x_width * x->x_height;
+ x->x_infosok = 0;
+ x->win_size = 10;
+
+ IplImage *image = 0, *grey = 0, *prev_grey = 0, *pyramid = 0, *prev_pyramid = 0, *swap_temp;
+
+ x->points [0] = 0;
+ x->points [1] = 0;
+ x->status = 0;
+ x->count = 0;
+ x->need_to_init = 1;
+ x->night_mode = 0;
+ x->flags = 0;
+ x->add_remove_pt = 0;
+ x->quality = 0.1;
+ x->min_distance = 10;
+ x->x_maxmove = 8;
+
+ for ( i=0; i<MAX_MARKERS; i++ )
+ {
+ x->x_xmark[i] = -1;
+ x->x_ymark[i] = -1;
+ }
+
+ // initialize font
+ cvInitFont( &x->font, CV_FONT_HERSHEY_PLAIN, 1.0, 1.0, 0, 1, 8 );
- x->image = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 3 );
- x->grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->prev_grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->prev_pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
- x->points[0] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
- x->points[1] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
- x->status = (char*)cvAlloc(MAX_COUNT);
-
-
- return (void *)x;
+ x->image = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 3 );
+ x->grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->prev_grey = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->prev_pyramid = cvCreateImage( cvSize(x->x_width, x->x_height), 8, 1 );
+ x->points[0] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
+ x->points[1] = (CvPoint2D32f*)cvAlloc(MAX_COUNT*sizeof(x->points[0][0]));
+ x->status = (char*)cvAlloc(MAX_COUNT);
+
+ return (void *)x;
}
@@ -331,12 +461,20 @@ extern "C"
void pdp_opencv_lk_setup(void)
{
- post( " pdp_opencv_lk");
+ post( " pdp_opencv_lk");
pdp_opencv_lk_class = class_new(gensym("pdp_opencv_lk"), (t_newmethod)pdp_opencv_lk_new,
- (t_method)pdp_opencv_lk_free, sizeof(t_pdp_opencv_lk), 0, A_DEFFLOAT, A_NULL);
-
- class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL);
- class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_thresh, gensym("win_size"), A_FLOAT, A_NULL );
+ (t_method)pdp_opencv_lk_free, sizeof(t_pdp_opencv_lk), 0, A_DEFFLOAT, A_NULL);
+
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL);
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_winsize, gensym("win_size"), A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_nightmode, gensym("nightmode"), A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_quality, gensym("quality"), A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_init, gensym("init"), A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_mark, gensym("mark"), A_FLOAT, A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_delete, gensym("delete"), A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_clear, gensym("clear"), A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_mindistance, gensym("mindistance"), A_FLOAT, A_NULL );
+ class_addmethod(pdp_opencv_lk_class, (t_method)pdp_opencv_lk_maxmove, gensym("maxmove"), A_FLOAT, A_NULL );
}
diff --git a/pdp_opencv_motempl.c b/pdp_opencv_motempl.c
index e9989c0..00b95ac 100644
--- a/pdp_opencv_motempl.c
+++ b/pdp_opencv_motempl.c
@@ -206,7 +206,7 @@ void pdp_opencv_motempl_update_mhi( t_pdp_opencv_motempl *x, IplImage* img, Ipl
SETFLOAT(&x->rlist[3], comp_rect.width);
SETFLOAT(&x->rlist[4], comp_rect.height);
SETFLOAT(&x->rlist[5], angle);
- outlet_list( x->x_dataout, 0, 6, x->rlist );
+ outlet_list( x->x_dataout, 0, 6, x->rlist );
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 11:25:09 +0000