From 7372c2efaf6ac2f68d1fa34d1859b76fb360e259 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Mon, 9 Nov 2009 17:30:27 +0000 Subject: added pdp_opencv_smooth ( just a test ) svn path=/trunk/externals/pdp_opencv/; revision=12731 --- Makefile | 6 +- Makefile.in | 2 +- pdp_opencv_smooth-help.pd | 83 ++++++++++++++ pdp_opencv_smooth.cc | 270 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 357 insertions(+), 4 deletions(-) create mode 100755 pdp_opencv_smooth-help.pd create mode 100755 pdp_opencv_smooth.cc diff --git a/Makefile b/Makefile index 1679f56..7d286a1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PD_DIR = /Software/pd-svn/trunk/pd -PDP_DIR = /Software/pd-svn/trunk/externals/pdp +PD_DIR = /usr/local/pd +PDP_DIR = /usr/local/pd/pdp GEM_OPENCV_VERSION = 0.2 @@ -26,7 +26,7 @@ endif .SUFFIXES = $(EXTENSION) -SOURCES = pdp_opencv_threshold.cc pdp_opencv_edge.cc pdp_opencv_distrans.cc pdp_opencv_laplace.cc pdp_opencv_motempl.cc pdp_opencv_morphology.cc pdp_opencv_haarcascade.cc pdp_opencv_contours_convexity.cc pdp_opencv_contours_boundingrect.cc pdp_opencv_bgsubstract.cc pdp_opencv_lk.cc pdp_opencv_floodfill.cc pdp_opencv_hist_compare.cc pdp_opencv_dft.cc pdp_opencv_knear.cc pdp_opencv_hu_moments.cc pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_athreshold.cc pdp_opencv_hough_lines.cc pdp_opencv_channels.cc pdp_opencv_hough_circles.cc pdp_opencv_camshift.cc pdp_opencv_colorfilt.cc pdp_opencv_contours_convexhull.cc pdp_opencv_of_bm.cc pdp_opencv_of_hs.cc pdp_opencv_of_lk.cc +SOURCES = pdp_opencv_threshold.cc pdp_opencv_edge.cc pdp_opencv_distrans.cc pdp_opencv_laplace.cc pdp_opencv_motempl.cc pdp_opencv_morphology.cc pdp_opencv_haarcascade.cc pdp_opencv_contours_convexity.cc pdp_opencv_contours_boundingrect.cc pdp_opencv_bgsubstract.cc pdp_opencv_lk.cc pdp_opencv_floodfill.cc pdp_opencv_hist_compare.cc pdp_opencv_dft.cc pdp_opencv_knear.cc pdp_opencv_hu_moments.cc pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_athreshold.cc pdp_opencv_hough_lines.cc pdp_opencv_channels.cc pdp_opencv_hough_circles.cc pdp_opencv_camshift.cc pdp_opencv_colorfilt.cc pdp_opencv_contours_convexhull.cc pdp_opencv_of_bm.cc pdp_opencv_of_hs.cc pdp_opencv_of_lk.cc pdp_opencv_smooth.cc SOURCES_OPT = pdp_opencv_surf.cc all: $(SOURCES:.c=.$(EXTENSION)) $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.c=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) diff --git a/Makefile.in b/Makefile.in index 753a170..a838040 100755 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,7 @@ endif .SUFFIXES = $(EXTENSION) -SOURCES = pdp_opencv_threshold.cc pdp_opencv_edge.cc pdp_opencv_distrans.cc pdp_opencv_laplace.cc pdp_opencv_motempl.cc pdp_opencv_morphology.cc pdp_opencv_haarcascade.cc pdp_opencv_contours_convexity.cc pdp_opencv_contours_boundingrect.cc pdp_opencv_bgsubstract.cc pdp_opencv_lk.cc pdp_opencv_floodfill.cc pdp_opencv_hist_compare.cc pdp_opencv_dft.cc pdp_opencv_knear.cc pdp_opencv_hu_moments.cc pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_athreshold.cc pdp_opencv_hough_lines.cc pdp_opencv_channels.cc pdp_opencv_hough_circles.cc pdp_opencv_camshift.cc pdp_opencv_colorfilt.cc pdp_opencv_contours_convexhull.cc pdp_opencv_of_bm.cc pdp_opencv_of_hs.cc pdp_opencv_of_lk.cc +SOURCES = pdp_opencv_threshold.cc pdp_opencv_edge.cc pdp_opencv_distrans.cc pdp_opencv_laplace.cc pdp_opencv_motempl.cc pdp_opencv_morphology.cc pdp_opencv_haarcascade.cc pdp_opencv_contours_convexity.cc pdp_opencv_contours_boundingrect.cc pdp_opencv_bgsubstract.cc pdp_opencv_lk.cc pdp_opencv_floodfill.cc pdp_opencv_hist_compare.cc pdp_opencv_dft.cc pdp_opencv_knear.cc pdp_opencv_hu_moments.cc pdp_opencv_hu_compare.cc pdp_opencv_pgh_compare.cc pdp_opencv_bgstats.cc pdp_opencv_athreshold.cc pdp_opencv_hough_lines.cc pdp_opencv_channels.cc pdp_opencv_hough_circles.cc pdp_opencv_camshift.cc pdp_opencv_colorfilt.cc pdp_opencv_contours_convexhull.cc pdp_opencv_of_bm.cc pdp_opencv_of_hs.cc pdp_opencv_of_lk.cc pdp_opencv_smooth.cc SOURCES_OPT = @SOURCES_OPT@ all: $(SOURCES:.c=.$(EXTENSION)) $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.c=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) diff --git a/pdp_opencv_smooth-help.pd b/pdp_opencv_smooth-help.pd new file mode 100755 index 0000000..b412b58 --- /dev/null +++ b/pdp_opencv_smooth-help.pd @@ -0,0 +1,83 @@ +#N canvas 383 108 786 603 10; +#X obj -195 -148 cnv 15 621 250 empty empty empty 20 12 0 14 -260097 +-66577 0; +#X obj 45 -109 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 45 -81 metro 40; +#X msg 135 -54 close; +#X obj 65 17 pdp_v4l; +#X msg 122 -86 open /dev/video0; +#X obj 246 -106 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 +0 1; +#X obj 246 -79 metro 40; +#X msg 327 -60 close; +#X msg 323 -84 open /dev/video0; +#X obj 266 19 pdp_v4l2; +#X msg 332 -5 format \$1; +#X obj 333 -27 hradio 15 1 0 4 empty empty empty 0 -8 0 10 -262144 +-1 -1 0; +#X obj -165 67 pdp_qt; +#X obj -132 3 metro 40; +#X msg -132 -25 bang; +#X msg -91 -25 stop; +#X obj -165 -94 openpanel; +#X msg -165 -69 open \$1; +#X msg -165 -122 bang; +#X msg -131 30 loop \$1; +#X obj -51 30 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +1; +#X obj -51 -52 loadbang; +#X text -122 -119 playing a video file; +#X text 75 -110 Camera input; +#X obj -194 110 cnv 15 621 200 empty empty empty 20 12 0 14 -258113 +-66577 0; +#X obj -169 336 pdp_xv; +#X text -196 -170 comments to ydegoyon@gmail.com.; +#X text -195 -184 pdp_opencv_smooth : smoothing and noise removal filter. +; +#X obj -169 262 pdp_opencv_smooth; +#X msg -130 134 mode \$1; +#X obj -60 126 vradio 15 1 0 5 empty empty empty 0 -8 0 10 -262144 +-1 -1 0; +#X text -132 112 smoothing mode ( default CV_GAUSSIAN ); +#X text -33 126 CV_BLUR_NO_SCALE : simple blur with no scaling; +#X text -33 140 CV_BLUR : simple blur; +#X text -32 157 CV_GAUSSIAN : gaussian blur; +#X text -32 171 CV_MEDIAN : median blur; +#X text -33 188 CV_BILATERAL : bilateral filter; +#X msg -52 214 param1 \$1; +#X floatatom 16 215 5 0 0 0 - - -; +#X text 56 215 param1 : see cvSmooth ( default : 3 ); +#X msg -38 235 param1 \$1; +#X floatatom 30 236 5 0 0 0 - - -; +#X text 70 236 param2 : see cvSmooth ( default : 0 ); +#X connect 1 0 2 0; +#X connect 2 0 4 0; +#X connect 3 0 4 0; +#X connect 4 0 29 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 29 0; +#X connect 11 0 10 0; +#X connect 12 0 11 0; +#X connect 13 0 29 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 29 0 26 0; +#X connect 30 0 29 0; +#X connect 31 0 30 0; +#X connect 38 0 29 0; +#X connect 39 0 38 0; +#X connect 41 0 29 0; +#X connect 42 0 41 0; diff --git a/pdp_opencv_smooth.cc b/pdp_opencv_smooth.cc new file mode 100755 index 0000000..221ac47 --- /dev/null +++ b/pdp_opencv_smooth.cc @@ -0,0 +1,270 @@ +/* + * Pure Data Packet module. + * Copyright (c) by Tom Schouten + * + * 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 +#include +#include +#include +#include +#include + +#include "pdp.h" + +#ifndef _EiC +#include "cv.h" +#endif + + +typedef struct pdp_opencv_smooth_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_mode; + int x_param1; + int x_param2; + + IplImage *image, *oimage, *grey; + + +} t_pdp_opencv_smooth; + + +static void pdp_opencv_smooth_process_rgb(t_pdp_opencv_smooth *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_smooth :: resizing buffers"); + + 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->oimage); + cvReleaseImage(&x->grey); + + //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->oimage = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 3); + x->grey = 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( x->image->imageData, data, x->x_size*3 ); + + if ( x->x_mode==CV_BLUR_NO_SCALE ) // operate on the gray scale image + { + cvCvtColor(x->image, x->grey, CV_BGR2GRAY); + cvSmooth( x->grey, x->grey, x->x_mode, x->x_param1, x->x_param2, 0, 0 ); + cvCvtColor(x->grey, x->oimage, CV_GRAY2BGR); + } + else + { + cvSmooth( x->image, x->oimage, x->x_mode, x->x_param1, x->x_param2, 0, 0 ); + } + + //memory copy again, now from x->oimage->imageData to the new data pdp packet + memcpy( newdata, x->oimage->imageData, x->x_size*3 ); + + return; +} + +static void pdp_opencv_smooth_mode(t_pdp_opencv_smooth *x, t_floatarg fmode) +{ + if ((int)fmode==CV_BLUR_NO_SCALE ) + { + x->x_mode=CV_BLUR_NO_SCALE; + } + if ((int)fmode==CV_BLUR ) + { + x->x_mode=CV_BLUR; + } + if ((int)fmode==CV_GAUSSIAN ) + { + x->x_mode=CV_GAUSSIAN; + } + if ((int)fmode==CV_MEDIAN ) + { + x->x_mode=CV_MEDIAN; + } + if ((int)fmode==CV_BILATERAL ) + { + x->x_mode=CV_BILATERAL; + } +} + +static void pdp_opencv_smooth_param1(t_pdp_opencv_smooth *x, t_floatarg fparam1) +{ + if ((int)fparam1>0 && ((int)fparam1%2==1) ) x->x_param1 = (int)fparam1; +} + +static void pdp_opencv_smooth_param2(t_pdp_opencv_smooth *x, t_floatarg fparam2) +{ + if ((int)fparam2>0 && ((int)fparam2%2==1) ) x->x_param2 = (int)fparam2; +} + +static void pdp_opencv_smooth_sendpacket(t_pdp_opencv_smooth *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_smooth_process(t_pdp_opencv_smooth *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_smooth_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, (void*)pdp_opencv_smooth_process_rgb, (void*)pdp_opencv_smooth_sendpacket, &x->x_queue_id); + break; + + default: + /* don't know the type, so dont pdp_opencv_smooth_process */ + break; + + } + } + +} + +static void pdp_opencv_smooth_input_0(t_pdp_opencv_smooth *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((char*)"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_smooth_process(x); + } +} + +static void pdp_opencv_smooth_free(t_pdp_opencv_smooth *x) +{ + pdp_queue_finish(x->x_queue_id); + pdp_packet_mark_unused(x->x_packet0); + + //Destroy cv_images + cvReleaseImage(&x->image); + cvReleaseImage(&x->oimage); + cvReleaseImage(&x->grey); +} + +t_class *pdp_opencv_smooth_class; + +void *pdp_opencv_smooth_new(t_floatarg f) +{ + int i; + + t_pdp_opencv_smooth *x = (t_pdp_opencv_smooth *)pd_new(pdp_opencv_smooth_class); + + 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_mode = CV_GAUSSIAN; + x->x_param1 = 3; + x->x_param2 = 0; + + // Create the open cv images + x->image = cvCreateImage(cvSize(x->x_width,x->x_height), IPL_DEPTH_8U, 3); + x->oimage = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 3); + x->grey = cvCreateImage(cvSize(x->image->width,x->image->height), IPL_DEPTH_8U, 1); + + return (void *)x; +} + + +#ifdef __cplusplus +extern "C" +{ +#endif + + +void pdp_opencv_smooth_setup(void) +{ + + post( " pdp_opencv_smooth"); + pdp_opencv_smooth_class = class_new(gensym("pdp_opencv_smooth"), (t_newmethod)pdp_opencv_smooth_new, + (t_method)pdp_opencv_smooth_free, sizeof(t_pdp_opencv_smooth), 0, A_DEFFLOAT, A_NULL); + + class_addmethod(pdp_opencv_smooth_class, (t_method)pdp_opencv_smooth_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); + class_addmethod(pdp_opencv_smooth_class, (t_method)pdp_opencv_smooth_mode, gensym("mode"), A_FLOAT, A_NULL ); + class_addmethod(pdp_opencv_smooth_class, (t_method)pdp_opencv_smooth_param1, gensym("param1"), A_FLOAT, A_NULL ); + class_addmethod(pdp_opencv_smooth_class, (t_method)pdp_opencv_smooth_param2, gensym("param2"), A_FLOAT, A_NULL ); + + +} + +#ifdef __cplusplus +} +#endif -- cgit v1.2.1