added adaptive threshold external

svn path=/trunk/externals/pdp_opencv/; revision=12000

4 files changed, 375 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 46fbdd7..ef21ecc 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ endif
 
 .SUFFIXES = $(EXTENSION)
 
-SOURCES = pdp_opencv_threshold.c pdp_opencv_edge.c pdp_opencv_distrans.c pdp_opencv_laplace.c pdp_opencv_motempl.c pdp_opencv_morphology.c pdp_opencv_haarcascade.c pdp_opencv_contours_convexity.c pdp_opencv_contours_boundingrect.c pdp_opencv_bgsubstract.c pdp_opencv_lk.c pdp_opencv_floodfill.c pdp_opencv_hist_compare.c pdp_opencv_dft.c pdp_opencv_knear.cc pdp_opencv_hu_moments.c pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_surf.cc
+SOURCES = pdp_opencv_threshold.c pdp_opencv_edge.c pdp_opencv_distrans.c pdp_opencv_laplace.c pdp_opencv_motempl.c pdp_opencv_morphology.c pdp_opencv_haarcascade.c pdp_opencv_contours_convexity.c pdp_opencv_contours_boundingrect.c pdp_opencv_bgsubstract.c pdp_opencv_lk.c pdp_opencv_floodfill.c pdp_opencv_hist_compare.c pdp_opencv_dft.c pdp_opencv_knear.cc pdp_opencv_hu_moments.c pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_surf.cc pdp_opencv_athreshold.c
 
 all: $(SOURCES:.c=.$(EXTENSION)) $(SOURCES:.cc=.$(EXTENSION))
 
diff --git a/TODO b/TODO
index c66f708..1031b23 100644
--- a/TODO
+++ b/TODO
@@ -154,8 +154,6 @@ simple edge ... http://www.hci.iastate.edu/575x/doku.php?id=code_samples:edge_de
 http://www.cs.iit.edu/~agam/cs512/lect-notes/opencv-intro/opencv-intro.html#SECTION00053000000000000000
 
 ############################# sevy ++
-SURF ( remarkable points )
-adaptive threshold
 hough lines/circles
 camshift ( very greedy )
 one day : stereo calibration ( need two cams and a chessboard )
diff --git a/pdp_opencv_athreshold-help.pd b/pdp_opencv_athreshold-help.pd
new file mode 100644
index 0000000..39319ed
--- /dev/null
+++ b/pdp_opencv_athreshold-help.pd
@@ -0,0 +1,97 @@
+#N canvas 15 96 1039 729 10;
+#X obj 11 -57 cnv 15 750 250 empty empty empty 20 12 0 14 -260097 -66577
+0;
+#X obj 251 -17 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X obj 251 10 metro 40;
+#X msg 341 37 close;
+#X obj 271 108 pdp_v4l;
+#X msg 328 5 open /dev/video0;
+#X obj 440 -22 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X obj 440 5 metro 40;
+#X msg 521 24 close;
+#X msg 517 0 open /dev/video0;
+#X obj 461 104 pdp_v4l2;
+#X msg 526 79 format \$1;
+#X obj 527 57 hradio 15 1 0 4 empty empty empty 0 -8 0 10 -262144 -1
+-1 0;
+#X obj 41 158 pdp_qt;
+#X obj 74 94 metro 40;
+#X msg 74 66 bang;
+#X msg 115 66 stop;
+#X obj 41 -3 openpanel;
+#X msg 41 22 open \$1;
+#X msg 41 -31 bang;
+#X msg 75 121 loop \$1;
+#X obj 155 121 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 155 39 loadbang;
+#X text 84 -28 playing a video file;
+#X text 281 -19 Camera input;
+#X obj 101 159 hsl 128 15 0 500 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 12 201 cnv 15 750 300 empty empty empty 20 12 0 14 -258113 -66577
+0;
+#X obj 55 527 pdp_xv;
+#X floatatom 230 447 5 0 0 0 - - -;
+#X msg 198 321 mode \$1;
+#X floatatom 175 419 5 0 0 0 - - -;
+#X text 175 402 Max value used in some modes;
+#X msg 233 280 0;
+#X msg 263 300 1;
+#X text 249 321 thresholding mode ( default 0 );
+#X text 14 -120 pdp_opencv_threshold : adaptive thresholding;
+#X text 13 -74 written by Yves Degoyon ( ydegoyon@gmail.com );
+#X text 13 -109 use the average of pixels in the block of pixels to
+filter only the pixels above or below that threshold \, depending on
+the mode BINARY or BINARY:INVERTED;
+#X obj 55 458 pdp_opencv_athreshold;
+#X text 265 278 CV_THRESH_BINARY : pixel >= threshold;
+#X text 293 300 CV_THRESH_BINARY_INV :pixel <= threshold;
+#X text 228 433 blocksize ( 1 \, 3 \, 5 \, 7 \, ... );
+#X text 263 447 ( default 3 );
+#X msg 248 215 0;
+#X msg 280 230 1;
+#X msg 215 252 method \$1;
+#X text 279 251 thresholding method ( default 0 );
+#X text 280 213 CV_ADAPTIVE_THRESH_MEAN_C : mean value;
+#X text 312 230 CV_ADAPTIVE_THRESH_GAUSSIAN_C : gaussian mask;
+#X msg 185 364 dim \$1;
+#X floatatom 236 367 5 0 0 0 - - -;
+#X text 276 365 value to correct the theshold;
+#X connect 1 0 2 0;
+#X connect 2 0 4 0;
+#X connect 3 0 4 0;
+#X connect 4 0 38 0;
+#X connect 5 0 4 0;
+#X connect 6 0 7 0;
+#X connect 7 0 10 0;
+#X connect 8 0 10 0;
+#X connect 9 0 10 0;
+#X connect 10 0 38 0;
+#X connect 11 0 10 0;
+#X connect 12 0 11 0;
+#X connect 13 0 38 0;
+#X connect 14 0 13 0;
+#X connect 15 0 14 0;
+#X connect 16 0 14 0;
+#X connect 17 0 18 0;
+#X connect 18 0 13 0;
+#X connect 19 0 17 0;
+#X connect 20 0 13 0;
+#X connect 21 0 20 0;
+#X connect 22 0 21 0;
+#X connect 22 0 15 0;
+#X connect 25 0 13 1;
+#X connect 28 0 38 2;
+#X connect 29 0 38 0;
+#X connect 30 0 38 1;
+#X connect 32 0 29 0;
+#X connect 33 0 29 0;
+#X connect 38 0 27 0;
+#X connect 43 0 45 0;
+#X connect 44 0 45 0;
+#X connect 45 0 38 0;
+#X connect 49 0 38 0;
+#X connect 50 0 49 0;
diff --git a/pdp_opencv_athreshold.c b/pdp_opencv_athreshold.c
new file mode 100644
index 0000000..ac7c9c2
--- /dev/null
+++ b/pdp_opencv_athreshold.c
@@ -0,0 +1,277 @@
+/*
+ *   Pure Data Packet module.
+ *   Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org>
+ *
+ *   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <limits.h>
+#include <dlfcn.h>
+
+#include "pdp.h"
+
+#ifndef _EiC
+#include "cv.h"
+#endif
+
+
+
+typedef struct pdp_opencv_athreshold_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 max_value;
+    int x_threshold_mode;
+    int x_threshold_method;
+    int x_blocksize;
+    int x_dim;
+    IplImage *image, *gray;
+
+    
+} t_pdp_opencv_athreshold;
+
+static void pdp_opencv_athreshold_process_rgb(t_pdp_opencv_athreshold *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); 
+
+    if ((x->x_width != (t_int)header->info.image.width) || 
+        (x->x_height != (t_int)header->info.image.height)) 
+    {
+
+    	post("pdp_opencv_athreshold :: resizing plugins");
+	
+    	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->gray);
+    
+	//create the orig image with new size
+        x->image = cvCreateImage(cvSize(x->x_width,x->x_height), IPL_DEPTH_8U, 3);
+
+    	// Create the output images with new sizes
+    	x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1);
+    
+    }
+    
+    newheader->info.image.encoding = header->info.image.encoding;
+    newheader->info.image.width = x->x_width;
+    newheader->info.image.height = x->x_height;
+
+    memcpy( newdata, data, x->x_size*3 );
+    
+    memcpy( x->image->imageData, data, x->x_size*3 );
+    
+    // Convert to grayscale
+    cvCvtColor(x->image, x->gray, CV_BGR2GRAY);
+  
+    // Applies fixed-level thresholding to single-channel array.
+    switch(x->x_threshold_mode) {
+    	case 0:
+	   cvAdaptiveThreshold(x->gray, x->gray, (float)x->max_value, x->x_threshold_method, CV_THRESH_BINARY, x->x_blocksize, x->x_dim);
+	   break;
+    	case 1:
+	   cvAdaptiveThreshold(x->gray, x->gray, (float)x->max_value, x->x_threshold_method, CV_THRESH_BINARY_INV, x->x_blocksize, x->x_dim);
+	   break;
+    }
+  
+    cvCvtColor(x->gray, x->image, CV_GRAY2BGR);
+    memcpy( newdata, x->image->imageData, x->x_size*3 );
+ 
+    return;
+}
+
+static void pdp_opencv_athreshold_max(t_pdp_opencv_athreshold *x, t_floatarg f)
+{
+    if ( (int)f>0 ) x->max_value = (int)f;
+}
+
+static void pdp_opencv_athreshold_mode(t_pdp_opencv_athreshold *x, t_floatarg f)
+{
+    if ( ( (int)f==0 ) || ( (int)f==1 ) ) x->x_threshold_mode = (int)f;
+}
+
+static void pdp_opencv_athreshold_method(t_pdp_opencv_athreshold *x, t_floatarg f)
+{
+    if ( (int)f==CV_ADAPTIVE_THRESH_MEAN_C ) x->x_threshold_method = CV_ADAPTIVE_THRESH_MEAN_C;
+    if ( (int)f==CV_ADAPTIVE_THRESH_GAUSSIAN_C ) x->x_threshold_method = CV_ADAPTIVE_THRESH_GAUSSIAN_C;
+}
+
+static void pdp_opencv_athreshold_blocksize(t_pdp_opencv_athreshold *x, t_floatarg f)
+{
+    if ( ( (int)f>=3 ) && ( (int)(f+1)%2 == 0 ) )
+    {
+       x->x_blocksize = (int)f;
+    }
+}
+
+static void pdp_opencv_athreshold_dim(t_pdp_opencv_athreshold *x, t_floatarg f)
+{
+    x->x_dim = (int)f;
+}
+
+static void pdp_opencv_athreshold_sendpacket(t_pdp_opencv_athreshold *x)
+{
+    /* 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);
+}
+
+static void pdp_opencv_athreshold_process(t_pdp_opencv_athreshold *x)
+{
+   int encoding;
+   t_pdp *header = 0;
+   char *parname;
+   unsigned pi;
+   int partype;
+   float pardefault;
+   t_atom plist[2];
+   t_atom tlist[2];
+   t_atom vlist[2];
+
+   /* check if image data packets are compatible */
+   if ( (header = pdp_packet_header(x->x_packet0))
+	&& (PDP_BITMAP == header->type)){
+    
+	/* pdp_opencv_athreshold_process inputs and write into active inlet */
+	switch(pdp_packet_header(x->x_packet0)->info.image.encoding){
+
+	case PDP_BITMAP_RGB:
+            x->x_packet1 = pdp_packet_clone_rw(x->x_packet0);
+            pdp_queue_add(x, pdp_opencv_athreshold_process_rgb, pdp_opencv_athreshold_sendpacket, &x->x_queue_id);
+	    break;
+
+	default:
+	    /* don't know the type, so dont pdp_opencv_athreshold_process */
+	    break;
+	    
+	}
+    }
+
+}
+
+static void pdp_opencv_athreshold_input_0(t_pdp_opencv_athreshold *x, t_symbol *s, t_floatarg f)
+{
+    /* if this is a register_ro message or register_rw message, register with packet factory */
+
+    if (s == gensym("register_rw")) 
+       x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("bitmap/rgb/*") );
+
+    if ((s == gensym("process")) && (-1 != x->x_packet0) && (!x->x_dropped))
+    {
+        /* add the process method and callback to the process queue */
+        pdp_opencv_athreshold_process(x);
+    }
+}
+
+static void pdp_opencv_athreshold_free(t_pdp_opencv_athreshold *x)
+{
+  int i;
+
+    pdp_queue_finish(x->x_queue_id);
+    pdp_packet_mark_unused(x->x_packet0);
+    
+    //Destroy cv_images
+    cvReleaseImage(&x->image);
+    cvReleaseImage(&x->gray);
+}
+
+t_class *pdp_opencv_athreshold_class;
+
+void *pdp_opencv_athreshold_new(t_floatarg f)
+{
+    int i;
+
+    t_pdp_opencv_athreshold *x = (t_pdp_opencv_athreshold *)pd_new(pdp_opencv_athreshold_class);
+    inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("max_value"));
+    inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("blocksize"));
+
+    x->x_outlet0 = outlet_new(&x->x_obj, &s_anything); 
+
+    x->x_packet0 = -1;
+    x->x_packet1 = -1;
+    x->x_queue_id = -1;
+
+    x->x_width  = 320;
+    x->x_height = 240;
+    x->x_size   = x->x_width * x->x_height;
+
+    x->x_infosok = 0;
+
+    x->max_value = 255;
+    x->x_threshold_mode  = 0;
+    x->x_threshold_method  = CV_ADAPTIVE_THRESH_MEAN_C;
+    x->x_blocksize  = 3;
+    x->x_dim = 0;
+
+    x->image = cvCreateImage(cvSize(x->x_width,x->x_height), IPL_DEPTH_8U, 3);
+    x->gray = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1);
+
+    return (void *)x;
+}
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+void pdp_opencv_athreshold_setup(void)
+{
+
+    post( "		pdp_opencv_athreshold");
+    pdp_opencv_athreshold_class = class_new(gensym("pdp_opencv_athreshold"), (t_newmethod)pdp_opencv_athreshold_new,
+    	(t_method)pdp_opencv_athreshold_free, sizeof(t_pdp_opencv_athreshold), 0, A_DEFFLOAT, A_NULL);
+
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_input_0, gensym("pdp"),  A_SYMBOL, A_DEFFLOAT, A_NULL);
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_max, gensym("max_value"),  A_FLOAT, A_NULL );   
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_mode, gensym("mode"),  A_FLOAT, A_NULL );   
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_method, gensym("method"),  A_FLOAT, A_NULL );   
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_blocksize, gensym("blocksize"),  A_FLOAT, A_NULL );   
+    class_addmethod(pdp_opencv_athreshold_class, (t_method)pdp_opencv_athreshold_dim, gensym("dim"),  A_FLOAT, A_NULL );   
+
+
+}
+
+#ifdef __cplusplus
+}
+#endif