Pd-cvs December 2005

pd-cvs@lists.iem.at

13 participants
490 discussions

externals/tb/sndfiler/src sndfiler.c,1.3,1.4
by Tim Blechmann 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/tb/sndfiler/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9029 Modified Files: sndfiler.c Log Message: using a semaphore instead of a condion variable for synchronization Index: sndfiler.c =================================================================== RCS file: /cvsroot/pure-data/externals/tb/sndfiler/src/sndfiler.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sndfiler.c 29 Nov 2005 18:34:32 -0000 1.3 --- sndfiler.c 16 Dec 2005 08:34:10 -0000 1.4 *************** *** 46,49 **** --- 46,50 ---- #include "m_fifo.h" #include "pthread.h" + #include "semaphore.h" #endif /* USE_PD_MAIN */ *************** *** 90,94 **** } if (!template_find_field(_template, gensym("z"), ! &zonset, &ztype, &zarraytype)) { error("array: template %s has no 'z' field", templatesym->s_name); --- 91,95 ---- } if (!template_find_field(_template, gensym("z"), ! &zonset, &ztype, &zarraytype)) { error("array: template %s has no 'z' field", templatesym->s_name); *************** *** 98,102 **** { error("array: template %s, 'z' field is not an array", ! templatesym->s_name); return (0); } --- 99,103 ---- { error("array: template %s, 'z' field is not an array", ! templatesym->s_name); return (0); } *************** *** 129,135 **** { t_fifo* x_jobs; ! ! pthread_mutex_t mutex; ! pthread_cond_t cond; } t_sfqueue; --- 130,134 ---- { t_fifo* x_jobs; ! sem_t sem; } t_sfqueue; *************** *** 159,164 **** { t_sfprocess * me; ! pthread_cond_wait(&sndfiler_queue.cond, &sndfiler_queue.mutex); ! while (me = (t_sfprocess *)fifo_get(sndfiler_queue.x_jobs)) { --- 158,163 ---- { t_sfprocess * me; ! sem_wait(&sndfiler_queue.sem); ! while (me = (t_sfprocess *)fifo_get(sndfiler_queue.x_jobs)) { *************** *** 180,186 **** //initialize queue sndfiler_queue.x_jobs = fifo_init(); ! pthread_mutex_init (&sndfiler_queue.mutex,NULL); ! pthread_cond_init (&sndfiler_queue.cond,NULL); ! // initialize thread pthread_attr_init(&sf_attr); --- 179,184 ---- //initialize queue sndfiler_queue.x_jobs = fifo_init(); ! sem_init (&sndfiler_queue.sem,0,0); ! // initialize thread pthread_attr_init(&sf_attr); *************** *** 199,203 **** //start thread status = pthread_create(&sf_thread_id, &sf_attr, ! (void *) sndfiler_thread,NULL); if (status != 0) --- 197,201 ---- //start thread status = pthread_create(&sf_thread_id, &sf_attr, ! (void *) sndfiler_thread,NULL); if (status != 0) *************** *** 205,209 **** else post("Global sndfiler thread launched, priority: %d", ! sf_param.sched_priority); } --- 203,207 ---- else post("Global sndfiler thread launched, priority: %d", ! sf_param.sched_priority); } *************** *** 227,231 **** fifo_put(sndfiler_queue.x_jobs, process); ! pthread_cond_signal(&sndfiler_queue.cond); } --- 225,229 ---- fifo_put(sndfiler_queue.x_jobs, process); ! sem_post(&sndfiler_queue.sem); } *************** *** 248,267 **** // parse flags while (argc > 0 && argv->a_type == A_SYMBOL && ! *argv->a_w.w_symbol->s_name == '-') { char *flag = argv->a_w.w_symbol->s_name + 1; ! if (!strcmp(flag, "resize")) ! { ! resize = 1; ! argc -= 1; argv += 1; ! } ! else if (!strcmp(flag, "skip")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((seek = argv[1].a_w.w_float) == 0)) ! goto usage; ! argc -= 2; argv += 2; ! } ! else goto usage; } --- 246,265 ---- // parse flags while (argc > 0 && argv->a_type == A_SYMBOL && ! *argv->a_w.w_symbol->s_name == '-') { char *flag = argv->a_w.w_symbol->s_name + 1; ! if (!strcmp(flag, "resize")) ! { ! resize = 1; ! argc -= 1; argv += 1; ! } ! else if (!strcmp(flag, "skip")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((seek = argv[1].a_w.w_float) == 0)) ! goto usage; ! argc -= 2; argv += 2; ! } ! else goto usage; } *************** *** 278,307 **** { t_float *dummy; ! int size; t_garray *array; if(!(array = (t_garray *)pd_findbyclass( ! atom_getsymbolarg(i+1, argc, argv), garray_class))) ! { ! pd_error(x, "%s: no such array", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! if(garray_getfloatarray(array, &size, &dummy)) ! arrays[i] = array; ! else ! { ! pd_error(x, "%s: bad template for sndfiler", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! // in multichannel mode: check if arrays have different length ! if (arraysize && arraysize != size && !resize) ! { ! post("sndfiler: arrays have different lengths, resizing to last one ..."); ! } ! arraysize = size; } --- 276,305 ---- { t_float *dummy; ! int size; t_garray *array; if(!(array = (t_garray *)pd_findbyclass( ! atom_getsymbolarg(i+1, argc, argv), garray_class))) ! { ! pd_error(x, "%s: no such array", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! if(garray_getfloatarray(array, &size, &dummy)) ! arrays[i] = array; ! else ! { ! pd_error(x, "%s: bad template for sndfiler", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! // in multichannel mode: check if arrays have different length ! if (arraysize && arraysize != size && !resize) ! { ! post("sndfiler: arrays have different lengths, resizing to last one ..."); ! } ! arraysize = size; } *************** *** 312,316 **** int pos = 0; int maxchannels = (channel_count < info.channels) ? ! channel_count : info.channels; t_float * item = alloca(maxchannels * sizeof(t_float)); --- 310,314 ---- int pos = 0; int maxchannels = (channel_count < info.channels) ? ! channel_count : info.channels; t_float * item = alloca(maxchannels * sizeof(t_float)); *************** *** 318,344 **** t_int ** syncdata = getbytes(sizeof(t_int*) * 5); ! // negative seek: offset from the end of the file ! if(seek<0) ! { ! pos = sf_seek(sndfile, seek, SEEK_END); ! } ! if(seek>0) ! { ! pos = sf_seek(sndfile, seek, SEEK_SET); ! } ! if(pos == -1) ! { ! pd_error(x, "invalid seek in soundfile"); ! return; ! } ! if(resize) ! { ! writesize = (info.frames-pos); ! arraysize = writesize; ! } ! else ! writesize = (arraysize>(info.frames-pos)) ? ! info.frames-pos : arraysize; #if (_POSIX_MEMLOCK - 0) >= 200112L --- 316,342 ---- t_int ** syncdata = getbytes(sizeof(t_int*) * 5); ! // negative seek: offset from the end of the file ! if(seek<0) ! { ! pos = sf_seek(sndfile, seek, SEEK_END); ! } ! if(seek>0) ! { ! pos = sf_seek(sndfile, seek, SEEK_SET); ! } ! if(pos == -1) ! { ! pd_error(x, "invalid seek in soundfile"); ! return; ! } ! if(resize) ! { ! writesize = (info.frames-pos); ! arraysize = writesize; ! } ! else ! writesize = (arraysize>(info.frames-pos)) ? ! info.frames-pos : arraysize; #if (_POSIX_MEMLOCK - 0) >= 200112L *************** *** 364,381 **** } ! // fill remaining elements with zero ! if(!resize && (arraysize>(info.frames-pos))) ! { ! for (i = writesize; i != arraysize; ++i) ! { ! for (j = 0; j != info.channels; ++j) ! { ! if (j < channel_count) ! { ! helper_arrays[j][i] = 0; ! } ! } ! } ! } #if (_POSIX_MEMLOCK - 0) >= 200112L --- 362,379 ---- } ! // fill remaining elements with zero ! if(!resize && (arraysize>(info.frames-pos))) ! { ! for (i = writesize; i != arraysize; ++i) ! { ! for (j = 0; j != info.channels; ++j) ! { ! if (j < channel_count) ! { ! helper_arrays[j][i] = 0; ! } ! } ! } ! } #if (_POSIX_MEMLOCK - 0) >= 200112L *************** *** 392,406 **** sys_callback(sndfiler_synchonize, (t_int*)syncdata, 5); ! return; } else { pd_error(x, "Error opening file"); ! return; } ! usage: pd_error(x, "usage: read [flags] filename array1 array2 ..."); ! post("flags: -skip <n> -resize "); } --- 390,404 ---- sys_callback(sndfiler_synchonize, (t_int*)syncdata, 5); ! return; } else { pd_error(x, "Error opening file"); ! return; } ! usage: pd_error(x, "usage: read [flags] filename array1 array2 ..."); ! post("flags: -skip <n> -resize "); } *************** *** 427,431 **** { vmess(&gl->gl_pd, gensym("bounds"), "ffff", 0., gl->gl_y1, ! (double)(frames > 1 ? frames-1 : 1), gl->gl_y2); /* close any dialogs that might have the wrong info now... */ --- 425,429 ---- { vmess(&gl->gl_pd, gensym("bounds"), "ffff", 0., gl->gl_y1, ! (double)(frames > 1 ? frames-1 : 1), gl->gl_y2); /* close any dialogs that might have the wrong info now... */ *************** *** 462,466 **** fifo_put(sndfiler_queue.x_jobs, process); ! pthread_cond_signal(&sndfiler_queue.cond); } --- 460,464 ---- fifo_put(sndfiler_queue.x_jobs, process); ! sem_post(&sndfiler_queue.sem); } *************** *** 562,567 **** return; ! usage: ! pd_error(x, "usage: resize tablename size"); } --- 560,565 ---- return; ! usage: ! pd_error(x, "usage: resize tablename size"); } *************** *** 569,579 **** { sndfiler_class = class_new(gensym("sndfiler"), ! (t_newmethod)sndfiler_new, 0, ! sizeof(t_sndfiler), 0, 0); class_addmethod(sndfiler_class, (t_method)sndfiler_read, ! gensym("read"), A_GIMME, 0); class_addmethod(sndfiler_class, (t_method)sndfiler_resize, ! gensym("resize"), A_GIMME, 0); #ifdef USE_PD_MAIN --- 567,577 ---- { sndfiler_class = class_new(gensym("sndfiler"), ! (t_newmethod)sndfiler_new, 0, ! sizeof(t_sndfiler), 0, 0); class_addmethod(sndfiler_class, (t_method)sndfiler_read, ! gensym("read"), A_GIMME, 0); class_addmethod(sndfiler_class, (t_method)sndfiler_resize, ! gensym("resize"), A_GIMME, 0); #ifdef USE_PD_MAIN

1 0

externals/motex noisegate~-help.pd,1.1,NONE
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/motex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28919/motex Removed Files: noisegate~-help.pd Log Message: - added PDP to the build system, started with creb, pidip, pmpd. - fixed random bugs --- noisegate~-help.pd DELETED ---

1 0

externals Makefile,1.21,1.22
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28919 Modified Files: Makefile Log Message: - added PDP to the build system, started with creb, pidip, pmpd. - fixed random bugs Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile 14 Dec 2005 00:32:04 -0000 1.21 --- Makefile 16 Dec 2005 07:28:01 -0000 1.22 *************** *** 49,53 **** LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib LIBS += -lc ! STRIP = echo else ifeq ($(OS_NAME),win) --- 49,53 ---- LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib LIBS += -lc ! STRIP = strip -x else ifeq ($(OS_NAME),win) *************** *** 71,77 **** --- 71,85 ---- endif + CXXFLAGS = $(CFLAGS) + %.o: %.c $(CC) $(CFLAGS) -o "$*.o" -c "$*.c" + %.o: %.cpp + $(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cpp" + + %.o: %.cc + $(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cc" + %.$(EXTENSION): %.o $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) \ *************** *** 91,95 **** #$(patsubst %, %_install,$(TARGETS)) ! BUILDSRC_OBJECTS = $(wildcard $(externals_src)/build/src/*.c) all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \ creb cxc cyclone ext13 freeverb \ --- 99,103 ---- #$(patsubst %, %_install,$(TARGETS)) ! BUILDSRC_OBJECTS := $(wildcard $(externals_src)/build/src/*.c) all: pre_all_$(OS_NAME) $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) \ creb cxc cyclone ext13 freeverb \ *************** *** 116,121 **** iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \ markex_install maxlib_install mjlib_install motex_install pddp_install \ ! pdp_install pmpd_install toxy_install unauthorized_install vbap_install \ ! zexy_install @echo " " @echo "externals install succeeded!" --- 124,129 ---- iemabs_install iemabs_install iemlib_install iemmatrix_install loaders_install \ markex_install maxlib_install mjlib_install motex_install pddp_install \ ! pdp_install pidip_install pmpd_install toxy_install unauthorized_install \ ! vbap_install zexy_install @echo " " @echo "externals install succeeded!" *************** *** 187,191 **** # TEMPLATE TEMPLATE_NAME=template ! TEMPLATE_OBJECTS = $(wildcard $(externals_src)/template/*.c) template: $(TEMPLATE_OBJECTS:.c=.$(EXTENSION)) --- 195,199 ---- # TEMPLATE TEMPLATE_NAME=template ! TEMPLATE_OBJECTS := $(wildcard $(externals_src)/template/*.c) template: $(TEMPLATE_OBJECTS:.c=.$(EXTENSION)) *************** *** 218,221 **** --- 226,232 ---- # CREB CREB_NAME=creb + #CREB_OBJECTS := $(wildcard $(externals_src)/creb/modules/*.c) + #CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/*.cc) + #creb: $(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) $(CREB_OBJECTS:.c=.$(EXTENSION)) creb: *************** *** 240,244 **** # CXC CXC_NAME=cxc ! CXC_OBJECTS = $(wildcard $(externals_src)/cxc/???*.c) cxc: $(CXC_OBJECTS:.c=.$(EXTENSION)) --- 251,255 ---- # CXC CXC_NAME=cxc ! CXC_OBJECTS := $(wildcard $(externals_src)/cxc/???*.c) cxc: $(CXC_OBJECTS:.c=.$(EXTENSION)) *************** *** 304,310 **** # EXT13 EXT13_NAME=ext13 ! # sfread.c doesn't compile, so exclude it ! EXT13_OBJECTS = $(wildcard $(externals_src)/ext13/???????*.c) \ ! $(externals_src)/ext13/ftos.c $(externals_src)/ext13/send13.c ext13: $(EXT13_OBJECTS:.c=.$(EXTENSION)) --- 315,324 ---- # EXT13 EXT13_NAME=ext13 ! # openpatch and sfread.c doesn't compile, so exclude them ! EXT13_FILES = catch13~.c kalashnikov.c ossmixer.c receive13~.c sfwrite13~.c \ ! wavinfo.c cdplayer.c mandelbrot.c piperead~.c scramble~.c streamin13~.c \ ! mandelbrot~.c pipewrite~.c send13.c streamout13~.c filesize.c messages.c \ ! promiscous~.c send13~.c strippath.c ftos.c receive13.c throw13~.c ! EXT13_OBJECTS = $(patsubst %,$(externals_src)/ext13/%,$(EXT13_FILES)) ext13: $(EXT13_OBJECTS:.c=.$(EXTENSION)) *************** *** 338,342 **** FRANKENSTEIN_NAME=frankenstein # exclude test.c since it is not used ! FRANKENSTEIN_OBJECTS = $(wildcard $(externals_src)/frankenstein/*.c) frankenstein: $(FRANKENSTEIN_OBJECTS:.c=.$(EXTENSION)) --- 352,356 ---- FRANKENSTEIN_NAME=frankenstein # exclude test.c since it is not used ! FRANKENSTEIN_OBJECTS := $(wildcard $(externals_src)/frankenstein/*.c) frankenstein: $(FRANKENSTEIN_OBJECTS:.c=.$(EXTENSION)) *************** *** 370,374 **** # FREEVERB FREEVERB_NAME=freeverb ! FREEVERB_OBJECTS = $(wildcard $(externals_src)/freeverb~/*.c) freeverb: $(FREEVERB_OBJECTS:.c=.$(EXTENSION)) --- 384,388 ---- # FREEVERB FREEVERB_NAME=freeverb ! FREEVERB_OBJECTS := $(wildcard $(externals_src)/freeverb~/*.c) freeverb: $(FREEVERB_OBJECTS:.c=.$(EXTENSION)) *************** *** 405,409 **** # this build method doesn't work yet <hans(a)at.or.at> ! HID_OBJECTS = $(wildcard $(externals_src)/hcs/hid/*.c) hid: # $(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION)) --- 419,423 ---- # this build method doesn't work yet <hans(a)at.or.at> ! HID_OBJECTS := $(wildcard $(externals_src)/hcs/hid/*.c) hid: # $(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION)) *************** *** 500,504 **** # LOADERS LOADERS_NAME= ! LOADERS_OBJECTS = $(wildcard $(externals_src)/loaders/*.c) loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION)) --- 514,518 ---- # LOADERS LOADERS_NAME= ! LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c) loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION)) *************** *** 522,526 **** # MARKEX MARKEX_NAME=markex ! MARKEX_OBJECTS = $(wildcard $(externals_src)/markex/*.c) markex: $(MARKEX_OBJECTS:.c=.$(EXTENSION)) --- 536,540 ---- # MARKEX MARKEX_NAME=markex ! MARKEX_OBJECTS := $(wildcard $(externals_src)/markex/*.c) markex: $(MARKEX_OBJECTS:.c=.$(EXTENSION)) *************** *** 548,552 **** # MAXLIB MAXLIB_NAME=maxlib ! MAXLIB_OBJECTS = $(wildcard $(externals_src)/maxlib/src/*.c) maxlib: $(MAXLIB_OBJECTS:.c=.$(EXTENSION)) --- 562,566 ---- # MAXLIB MAXLIB_NAME=maxlib ! MAXLIB_OBJECTS := $(wildcard $(externals_src)/maxlib/src/*.c) maxlib: $(MAXLIB_OBJECTS:.c=.$(EXTENSION)) *************** *** 577,581 **** MJLIB_NAME=mjlib # exclude the library file mjLib.c ! MJLIB_OBJECTS = $(wildcard $(externals_src)/mjlib/[a-z]?[a-z]*.c) mjlib: $(MJLIB_OBJECTS:.c=.$(EXTENSION)) --- 591,595 ---- MJLIB_NAME=mjlib # exclude the library file mjLib.c ! MJLIB_OBJECTS := $(wildcard $(externals_src)/mjlib/[a-z]?[a-z]*.c) mjlib: $(MJLIB_OBJECTS:.c=.$(EXTENSION)) *************** *** 604,608 **** # MOTEX MOTEX_NAME=motex ! MOTEX_OBJECTS = $(wildcard $(externals_src)/motex/*.c) motex: $(MOTEX_OBJECTS:.c=.$(EXTENSION)) --- 618,622 ---- # MOTEX MOTEX_NAME=motex ! MOTEX_OBJECTS := $(wildcard $(externals_src)/motex/*.c) motex: $(MOTEX_OBJECTS:.c=.$(EXTENSION)) *************** *** 677,687 **** #------------------------------------------------------------------------------# # PDP PDP_NAME=pdp ! pdp: ! # cd $(externals_src)/pdp && ./configure && $(MAKE) ! #TODO: compile pidip here ! #TODO: compile gem2pdp here pdp_install: pdp --- 691,706 ---- + #------------------------------------------------------------------------------# # PDP PDP_NAME=pdp ! $(externals_src)/pdp/configure: $(externals_src)/pdp/configure.ac ! cd $(externals_src)/pdp && autoconf ! ! $(externals_src)/pdp/Makefile.config: $(externals_src)/pdp/Makefile.config.in ! cd $(externals_src)/pdp && ./configure ! ! pdp: $(externals_src)/pdp/configure $(externals_src)/pdp/Makefile.config ! -make -C $(externals_src)/pdp pdp_install: pdp *************** *** 692,696 **** --license "GNU GPL" -install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME) - -install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME) install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME) install -d $(helpdir)/$(PDP_NAME) --- 711,714 ---- *************** *** 704,715 **** $(examplesdir)/$(PDP_NAME) #------------------------------------------------------------------------------# # PIDIP PIDIP_NAME=pidip ! pidip: ! # cd $(externals_src)/pidip && ./configure && $(MAKE) ! pidip_install: pidip install -d $(objectsdir)/$(PIDIP_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \ --- 722,746 ---- $(examplesdir)/$(PDP_NAME) + pdp_clean: + -rm -f -- $(externals_src)/pdp/*.$(EXTENSION) + -find $(externals_src)/pdp -name '*.o' -delete + -rm -f -- $(externals_src)/pdp/*.bak + -rm -f -- $(externals_src)/pdp/Makefile.config + -rm -f -- $(externals_src)/pdp/configure + #------------------------------------------------------------------------------# # PIDIP PIDIP_NAME=pidip ! $(externals_src)/pidip/configure: $(externals_src)/pidip/configure.ac ! cd $(externals_src)/pidip && autoconf ! $(externals_src)/pidip/Makefile: $(externals_src)/pidip/Makefile.in ! cd $(externals_src)/pidip && ./configure --with-pd=../../pd --with-pdp=../pdp ! ! pidip: $(externals_src)/pidip/configure $(externals_src)/pidip/Makefile ! make -C $(externals_src)/pidip ! ! pidip_install: install -d $(objectsdir)/$(PIDIP_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \ *************** *** 721,724 **** --- 752,758 ---- install -d $(examplesdir)/$(PIDIP_NAME) install -p $(externals_src)/pidip/patches/*.* $(examplesdir)/$(PIDIP_NAME) + install -d $(manualsdir)/$(PIDIP_NAME) + install -p $(externals_src)/pidip/README \ + $(manualsdir)/$(PIDIP_NAME)/README.txt install -d $(examplesdir)/$(PIDIP_NAME)/images install -p $(externals_src)/pidip/patches/images/*.* \ *************** *** 728,742 **** $(examplesdir)/$(PIDIP_NAME)/morphology #------------------------------------------------------------------------------# # PMPD PMPD_NAME=pmpd ! pmpd: ! pmpd_install: pmpd ! # install -d $(objectsdir)/$(PMPD_NAME) install -d $(helpdir)/$(PMPD_NAME) install -p $(externals_src)/pmpd/help/*.pd $(helpdir) install -d $(manualsdir)/$(PMPD_NAME) install -d $(manualsdir)/$(PMPD_NAME) --- 762,788 ---- $(examplesdir)/$(PIDIP_NAME)/morphology + pidip_clean: + -rm -f -- $(externals_src)/pidip/*.$(EXTENSION) + -find $(externals_src)/pidip -name '*.o' -delete + -rm -f -- $(externals_src)/pidip/*.bak + -rm -f -- $(externals_src)/pidip/Makefile + -rm -f -- $(externals_src)/pidip/configure + #------------------------------------------------------------------------------# # PMPD PMPD_NAME=pmpd ! PMPD_OBJECTS := $(wildcard $(externals_src)/pmpd/src/[a-lq-z]*.c) ! pmpd: $(PMPD_OBJECTS:.c=.$(EXTENSION)) pmpd_install: pmpd ! install -d $(objectsdir)/$(PMPD_NAME) ! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PMPD_NAME) \ ! --author "Cyrille Henry" \ ! --description "Physical Modelling for Pd" ! -install -p $(externals_src)/pmpd/*.$(EXTENSION) $(objectsdir)/$(PMPD_NAME) install -d $(helpdir)/$(PMPD_NAME) install -p $(externals_src)/pmpd/help/*.pd $(helpdir) + install -p $(externals_src)/pmpd/help/*.pd $(helpdir)/$(PMPD_NAME) install -d $(manualsdir)/$(PMPD_NAME) install -d $(manualsdir)/$(PMPD_NAME) *************** *** 747,750 **** --- 793,802 ---- $(examplesdir)/$(PMPD_NAME) + pmpd_clean: + -rm -f -- $(PMPD_OBJECTS:.c=.$(EXTENSION)) + -find $(externals_src)/pmpd -name '*.o' -delete + -find $(externals_src)/pmpd -name '*.bak' -delete + -find $(externals_src)/pmpd -name '*~' -delete + #------------------------------------------------------------------------------# *************** *** 752,756 **** SMLIB_NAME=smlib # exclude SMlib.c since its just for the compiled library ! SMLIB_OBJECTS = $(wildcard $(externals_src)/smlib/source/[a-z]*.c) smlib: $(SMLIB_OBJECTS:.c=.$(EXTENSION)) --- 804,808 ---- SMLIB_NAME=smlib # exclude SMlib.c since its just for the compiled library ! SMLIB_OBJECTS := $(wildcard $(externals_src)/smlib/source/[a-z]*.c) smlib: $(SMLIB_OBJECTS:.c=.$(EXTENSION)) *************** *** 814,819 **** bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c ! UNAUTHORIZED_OBJECTS = $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c) ! # [vocoder~] to be built separately UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \ --- 866,871 ---- bash $(externals_src)/unauthorized/tk2c.bash < $*.tk > $*.tk2c ! UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c) ! # [vocoder~] is built separately since its made from a number of files UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \ *************** *** 871,875 **** # Zexy ZEXY_NAME = zexy ! ZEXY_OBJECTS = $(wildcard $(externals_src)/zexy/src/[a-y]*.c) ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) --- 923,927 ---- # Zexy ZEXY_NAME = zexy ! ZEXY_OBJECTS := $(wildcard $(externals_src)/zexy/src/[a-y]*.c) ZEXY_VERSION := $(shell grep VERSION $(externals_src)/zexy/src/zexy.h | \ grep -v _VERSION | cut -d ' ' -f 3 | cut -d '"' -f 2) *************** *** 878,882 **** zexy_install: zexy install -d $(objectsdir)/$(ZEXY_NAME) ! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(UNAUTHORIZED_NAME) \ --author "iohannes m zmoelnig <zmoelnig(a)iem.kug.ac.at>" \ --license "GNU GPL" \ --- 930,934 ---- zexy_install: zexy install -d $(objectsdir)/$(ZEXY_NAME) ! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(ZEXY_NAME) \ --author "iohannes m zmoelnig <zmoelnig(a)iem.kug.ac.at>" \ --license "GNU GPL" \ *************** *** 939,943 **** # the destination-specific clean targets are in Makefile.buildlayout ! clean: creb_clean cxc_clean cyclone_clean ext13_clean frankenstein_clean freeverb_clean hid_clean loaders_clean markex_clean mjlib_clean motex_clean oscx_clean pddp_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean -rm -f -- $(BUILDSRC_OBJECTS:.c=.o) -rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION)) --- 991,995 ---- # the destination-specific clean targets are in Makefile.buildlayout ! clean: creb_clean cxc_clean cyclone_clean ext13_clean frankenstein_clean freeverb_clean hid_clean loaders_clean markex_clean mjlib_clean motex_clean oscx_clean pddp_clean pdp_clean pidip_clean smlib_clean toxy_clean unauthorized_clean zexy_clean install_clean -rm -f -- $(BUILDSRC_OBJECTS:.c=.o) -rm -f -- $(BUILDSRC_OBJECTS:.c=.$(EXTENSION))

1 0

externals/pdp/include pdp_net.h,1.3,1.4
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23887/include Modified Files: pdp_net.h Log Message: added a couple tweaks to build with the standard dev layout, and on Mac OS X Index: pdp_net.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_net.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_net.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_net.h 16 Dec 2005 02:55:15 -0000 1.4 *************** *** 40,43 **** --- 40,44 ---- */ + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h>

1 0

externals/pdp configure,1.3,1.4 configure.ac,1.4,1.5
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23887 Modified Files: configure configure.ac Log Message: added a couple tweaks to build with the standard dev layout, and on Mac OS X Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 16 Dec 2005 00:51:02 -0000 1.4 --- configure.ac 16 Dec 2005 02:55:14 -0000 1.5 *************** *** 43,48 **** ! ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch" dnl -Werror -Wshadow --- 43,48 ---- ! PWD=`pwd` ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src" dnl -Werror -Wshadow *************** *** 76,80 **** dnl check in $prefix/pd/src then ../pd/src dnl if this fails we trust it is in the standard include path - PWD=`pwd` if test -f $prefix/pd/src/m_pd.h; then --- 76,79 ---- *************** *** 84,87 **** --- 83,89 ---- then PD_CPPFLAGS="-I$prefix/src/pd/src" + elif test -f $PWD/../../pd/src/m_pd.h; + then + PD_CPPFLAGS="-I$PWD/../../pd/src" elif test -f $PWD/../pd/src/m_pd.h; then *************** *** 126,130 **** if test $ARCH == Darwin then ! PD_EXECUTABLE=$prefix/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" --- 128,132 ---- if test $ARCH == Darwin then ! PD_EXECUTABLE=$PWD/../../pd/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure 16 Dec 2005 00:51:02 -0000 1.3 --- configure 16 Dec 2005 02:55:14 -0000 1.4 *************** *** 2642,2647 **** ! ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch" --- 2642,2647 ---- ! PWD=`pwd` ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src" *************** *** 2681,2685 **** - PWD=`pwd` if test -f $prefix/pd/src/m_pd.h; then --- 2681,2684 ---- *************** *** 2689,2692 **** --- 2688,2694 ---- then PD_CPPFLAGS="-I$prefix/src/pd/src" + elif test -f $PWD/../../pd/src/m_pd.h; + then + PD_CPPFLAGS="-I$PWD/../../pd/src" elif test -f $PWD/../pd/src/m_pd.h; then *************** *** 2989,2993 **** if test $ARCH == Darwin then ! PD_EXECUTABLE=$prefix/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" --- 2991,2995 ---- if test $ARCH == Darwin then ! PD_EXECUTABLE=$PWD/../../pd/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" *************** *** 3628,3634 **** if test $enable_sdl == yes then ! echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5 ! echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6 ! if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else --- 3630,3636 ---- if test $enable_sdl == yes then ! echo "$as_me:$LINENO: checking for SDL_GL_GetAttribute in -lSDL" >&5 ! echo $ECHO_N "checking for SDL_GL_GetAttribute in -lSDL... $ECHO_C" >&6 ! if test "${ac_cv_lib_SDL_SDL_GL_GetAttribute+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else *************** *** 3649,3657 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char SDL_Init (); int main () { ! SDL_Init (); ; return 0; --- 3651,3659 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ ! char SDL_GL_GetAttribute (); int main () { ! SDL_GL_GetAttribute (); ; return 0; *************** *** 3670,3686 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_SDL_SDL_Init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_SDL_SDL_Init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5 ! echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6 ! if test $ac_cv_lib_SDL_SDL_Init = yes; then PDP_OPTMOD="$PDP_OPTMOD pdp_sdl.o" LIBS="$LIBS -lSDL" --- 3672,3688 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_SDL_SDL_GL_GetAttribute=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_SDL_SDL_GL_GetAttribute=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_GL_GetAttribute" >&5 ! echo "${ECHO_T}$ac_cv_lib_SDL_SDL_GL_GetAttribute" >&6 ! if test $ac_cv_lib_SDL_SDL_GL_GetAttribute = yes; then PDP_OPTMOD="$PDP_OPTMOD pdp_sdl.o" LIBS="$LIBS -lSDL"

1 0

externals/pdp/system/type Makefile, 1.2, 1.3 pdp_bitmap.c, 1.2, 1.3 pdp_image.c, 1.2, 1.3 pdp_matrix.c, 1.2, 1.3
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/system/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6756/system/type Added Files: Makefile pdp_bitmap.c pdp_image.c pdp_matrix.c Log Message: checking in pdp 0.12.4 from http://zwizwa.fartit.com/pd/pdp/pdp-0.12.4.tar.gz --- NEW FILE: pdp_image.c --- /* * Pure Data Packet system implementation. : 16 bit image packet implementation * Copyright (c) by Tom Schouten <pdp(a)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. * */ /* This file contains methods for the image packets pdp_packet_new_* methods are several image packet constructors pdp_type_* are image type checkers & converters */ #include <string.h> #include <stdio.h> #include "pdp_internals.h" #include "pdp_packet.h" #include "pdp_imageproc.h" #include "pdp_resample.h" #include "pdp_list.h" #include "pdp_post.h" #include "pdp_type.h" /* the class object */ static t_pdp_class* image_class; /* check dimensions */ static void _checkdim(u32 width, u32 height){ if ((pdp_imageproc_legalwidth(width) != width) || (pdp_imageproc_legalheight(height) != height)){ pdp_post("WARNING: request to create image packet with illegal dimensions %d x %d", width, height); } } /* image packet constructors */ int pdp_packet_new_image_YCrCb(u32 w, u32 h) { t_pdp *header; t_image *image; int packet; u32 size = w*h; u32 totalnbpixels = size + (size >> 1); u32 packet_size = totalnbpixels << 1; _checkdim(w,h); packet = pdp_packet_new(PDP_IMAGE, packet_size); header = pdp_packet_header(packet); image = pdp_packet_image_info(packet); if (!header) return -1; image->encoding = PDP_IMAGE_YV12; image->width = w; image->height = h; header->desc = pdp_packet_image_get_description(packet); header->theclass = image_class; return packet; } int pdp_packet_new_image_grey(u32 w, u32 h) { t_pdp *header; t_image *image; int packet; u32 size = w*h; u32 totalnbpixels = size; u32 packet_size = totalnbpixels << 1; _checkdim(w,h); packet = pdp_packet_new(PDP_IMAGE, packet_size); header = pdp_packet_header(packet); image = pdp_packet_image_info(packet); if (!header) return -1; image->encoding = PDP_IMAGE_GREY; image->width = w; image->height = h; header->desc = pdp_packet_image_get_description(packet); header->theclass = image_class; return packet; } int pdp_packet_new_image_mchp(u32 w, u32 h, u32 d) { t_pdp *header; t_image *image; int packet; u32 size = w*h*d; u32 totalnbpixels = size; u32 packet_size = totalnbpixels << 1; _checkdim(w,h); packet = pdp_packet_new(PDP_IMAGE, packet_size); header = pdp_packet_header(packet); image = pdp_packet_image_info(packet); if (!header) return -1; image->encoding = PDP_IMAGE_MCHP; image->width = w; image->height = h; image->depth = d; header->desc = pdp_packet_image_get_description(packet); header->theclass = image_class; return packet; } int pdp_packet_new_image(u32 type, u32 w, u32 h) { switch (type){ case PDP_IMAGE_YV12: return pdp_packet_new_image_YCrCb(w,h); case PDP_IMAGE_GREY: return pdp_packet_new_image_grey(w,h); default: return -1; } } /****************** packet type checking and conversion methods ********************/ /* check if two image packets are allocated and of the same type */ int pdp_packet_image_compat(int packet0, int packet1) { t_pdp *header0 = pdp_packet_header(packet0); t_pdp *header1 = pdp_packet_header(packet1); t_image *image0 = pdp_packet_image_info(packet0); t_image *image1 = pdp_packet_image_info(packet1); if (!(pdp_packet_compat(packet0, packet1))) return 0; if (header0->type != PDP_IMAGE){ //pdp_post("pdp_type_compat_image: not a PDP_IMAGE"); return 0; } if (image0->encoding != image1->encoding){ //pdp_post("pdp_type_compat_image: encodings differ"); return 0; } if (image0->width != image1->width){ //pdp_post("pdp_type_compat_image: image withs differ"); return 0; } if (image0->height != image1->height){ //pdp_post("pdp_type_compat_image: image heights differ"); return 0; } return 1; } /* check if packet is a valid image packet */ int pdp_packet_image_isvalid(int packet) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); if (!header) return 0; if (PDP_IMAGE != header->type) return 0; if ((PDP_IMAGE_YV12 != image->encoding) && (PDP_IMAGE_GREY != image->encoding) && (PDP_IMAGE_MCHP != image->encoding)) return 0; return 1; } /* set the channel mask for the image */ void pdp_packet_image_set_chanmask(int packet, unsigned int chanmask) { if (pdp_packet_image_isvalid(packet)) pdp_packet_image_info(packet)->chanmask = chanmask; } t_image *pdp_packet_image_info(int packet) { return (t_image *)pdp_packet_subheader(packet); } t_pdp_symbol *pdp_packet_image_get_description(int packet) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); char description[1024]; char *c = description; int encoding; if (!header) return pdp_gensym("invalid"); else if (!header->desc){ /* if description is not defined, try to reconstruct it (for backwards compat) */ if (header->type == PDP_IMAGE){ c += sprintf(c, "image"); encoding = image->encoding; switch(encoding){ case PDP_IMAGE_YV12: c += sprintf(c, "/YCrCb"); break; case PDP_IMAGE_GREY: c += sprintf(c, "/grey"); break; case PDP_IMAGE_MCHP: c += sprintf(c, "/multi"); break; default: c += sprintf(c, "/unknown"); goto exit; } if (encoding == PDP_IMAGE_MCHP){ c += sprintf(c, "/%dx%dx%d", image->width, image->height, image->depth); } else { c += sprintf(c, "/%dx%d", image->width, image->height); } exit: return pdp_gensym(description); } else return pdp_gensym("unknown"); } else return header->desc; } /* IMAGE PACKAGE CONVERSION ROUTINES */ /* note: these are internal: no extra checking is done it is assumed the packets are of correct type (the type template associated with the conversion program) */ // image/YCrCb/* -> image/grey/* // image/multi/* -> image/grey/* (only first channel) static int _pdp_packet_image_convert_YCrCb_to_grey(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); int w = image->width; int h = image->height; int p = pdp_packet_new_image_grey(w,h); if (p == -1) return p; memcpy(pdp_packet_data(p), pdp_packet_data(packet), 2*w*h); return p; } // image/grey/* -> image/YCrCb/* static int _pdp_packet_image_convert_grey_to_YCrCb(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); int w = image->width; int h = image->height; int p = pdp_packet_new_image_YCrCb(w,h); int y_bytes = 2*w*h; void *data; if (p == -1) return p; data = pdp_packet_data(p); memcpy(data, pdp_packet_data(packet), y_bytes); memset(data+y_bytes, 0, y_bytes >> 1); return p; } // image/grey/* -> image/multi/* static int _pdp_packet_image_convert_grey_to_multi(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); int w = image->width; int h = image->height; int p = pdp_packet_new_image_mchp(w,h,1); int y_bytes = 2*w*h; void *data; if (p == -1) return p; data = pdp_packet_data(p); memcpy(data, pdp_packet_data(packet), y_bytes); return p; } // image/multi/* -> image/YCrCb/* (only first 3 channels) static int _pdp_packet_image_convert_multi_to_YCrCb(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data, *newdata; /* get info */ int w = image->width; int h = image->height; int d = image->depth; int plane_size = w*h; /* create new packet */ int newpacket = pdp_packet_new_image_YCrCb(w, h); if (-1 == newpacket) return -1; data = pdp_packet_data(packet); newdata = pdp_packet_data(newpacket); /* copy channel 0 */ memcpy(newdata, data, plane_size<<1); newdata += plane_size; data += plane_size; /* copy channel 1 */ if (d >= 1) pdp_resample_halve(data, newdata, w, h); else memset(newdata, 0, plane_size >> 1); data += plane_size; newdata += (plane_size >> 2); /* copy channel 2 */ if (d >= 2) pdp_resample_halve(data, newdata, w, h); else memset(newdata, 0, plane_size >> 1); return newpacket; } // image/YCrCb/* -> image/multi/* static int _pdp_packet_image_convert_YCrCb_to_multi(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data, *newdata; /* get info */ int w = image->width; int h = image->height; int plane_size = w*h; /* create new packet */ int newpacket = pdp_packet_new_image_mchp(w, h, 3); if (-1 == newpacket) return -1; data = pdp_packet_data(packet); newdata = pdp_packet_data(newpacket); /* copy channel 0 */ memcpy(newdata, data, plane_size<<1); newdata += plane_size; data += plane_size; w >>= 1; h >>= 1; /* copy channel 1 */ pdp_resample_double(data, newdata, w, h); data += (plane_size >> 2); newdata += plane_size; /* copy channel 2 */ pdp_resample_double(data, newdata, w, h); return newpacket; } static void _pdp_description_get_dims(t_pdp_symbol *template, int *w, int *h, int *d) { char *c = template->s_name; // get requested dimensions *w = 0; *h = 0; *d = 0; while (*c++ != '/'); while (*c++ != '/'); sscanf(c, "%dx%dx%d", w, h, d); } // resample image/YCrCb/* static int _pdp_packet_image_convert_resample_YCrCb(int packet, t_pdp_symbol *dest_template) { int quality = 1; int dst_w, dst_h, dummy; int new_packet; unsigned int src_size, src_voffset, src_uoffset; unsigned int dst_size, dst_voffset, dst_uoffset; t_pdp *header0 = pdp_packet_header(packet); t_image *image0 = pdp_packet_image_info(packet); unsigned int src_w = image0->width; unsigned int src_h = image0->height; short int *src_image = (short int *)pdp_packet_data(packet); short int *dst_image; _pdp_description_get_dims(dest_template, &dst_w, &dst_h, &dummy); new_packet = pdp_packet_new_image_YCrCb(dst_w, dst_h); if (-1 == new_packet) return -1; dst_image = (short int*)pdp_packet_data(new_packet); src_size = src_w*src_h; src_voffset = src_size; src_uoffset = src_size + (src_size>>2); dst_size = dst_w*dst_h; dst_voffset = dst_size; dst_uoffset = dst_size + (dst_size>>2); if (quality){ pdp_resample_scale_bilin(src_image, dst_image, src_w, src_h, dst_w, dst_h); pdp_resample_scale_bilin(src_image+src_voffset, dst_image+dst_voffset, src_w>>1, src_h>>1, dst_w>>1, dst_h>>1); pdp_resample_scale_bilin(src_image+src_uoffset, dst_image+dst_uoffset, src_w>>1, src_h>>1, dst_w>>1, dst_h>>1); } else{ pdp_resample_scale_nn(src_image, dst_image, src_w, src_h, dst_w, dst_h); pdp_resample_scale_nn(src_image+src_voffset, dst_image+dst_voffset, src_w>>1, src_h>>1, dst_w>>1, dst_h>>1); pdp_resample_scale_nn(src_image+src_uoffset, dst_image+dst_uoffset, src_w>>1, src_h>>1, dst_w>>1, dst_h>>1); } return new_packet; } // resample image/grey/* and image/multi/* static int _pdp_packet_image_convert_resample_multi(int packet, t_pdp_symbol *dest_template) { int quality = 1; int dst_w, dst_h, depth; int new_packet; unsigned int src_size; unsigned int dst_size; t_pdp *header0 = pdp_packet_header(packet); t_image *image0 = pdp_packet_image_info(packet); unsigned int src_w = image0->width; unsigned int src_h = image0->height; short int *src_image = (short int *)pdp_packet_data(packet); short int *dst_image; _pdp_description_get_dims(dest_template, &dst_w, &dst_h, &depth); if (depth == 0){ depth = 1; new_packet = pdp_packet_new_image_grey(dst_w, dst_h); } else { new_packet = pdp_packet_new_image_mchp(dst_w, dst_h, depth); } if (-1 == new_packet) return -1; dst_image = (short int*)pdp_packet_data(new_packet); src_size = src_w*src_h; dst_size = dst_w*dst_h; while (depth--){ if (quality){ pdp_resample_scale_bilin(src_image, dst_image, src_w, src_h, dst_w, dst_h); } else{ pdp_resample_scale_nn(src_image, dst_image, src_w, src_h, dst_w, dst_h); } src_image += src_size; dst_image += dst_size; } return new_packet; } static int _pdp_packet_image_convert_fallback(int packet, t_pdp_symbol *dest_template) { pdp_post("can't convert image type %s to %s", pdp_packet_get_description(packet)->s_name, dest_template->s_name); return -1; } /* the expensive factory method */ static int pdp_image_factory(t_pdp_symbol *type) { t_pdp_list *l; t_pdp_symbol *s; int t; int w = 0; int h = 0; int d = 0; int p = -1; int n = 0; int m = 0; char *garbage = 0; //pdp_post("creating:"); //pdp_post("%s", type->s_name); l = pdp_type_to_list(type); s = pdp_list_pop(l).w_symbol; // first element is "image" s = pdp_list_pop(l).w_symbol; /* get image type */ if (s == pdp_gensym("grey")) t = PDP_IMAGE_GREY; else if (s == pdp_gensym("YCrCb")) t = PDP_IMAGE_YV12; else if (s == pdp_gensym("multi")) t = PDP_IMAGE_MCHP; else goto exit; /* get image dimensions and create image */ s = pdp_list_pop(l).w_symbol; switch (t){ case PDP_IMAGE_MCHP: m = sscanf(s->s_name, "%dx%dx%d", &w, &h, &d); p = pdp_packet_new_image_mchp(w,h,d); break; default: sscanf(s->s_name, "%dx%d", &w, &h); p = pdp_packet_new_image(t,w,h); break; } if (p != -1){ t_pdp *h = pdp_packet_header(p); /* if type is not exact, delete the packet */ if (type != h->desc) { pdp_packet_delete(p); p = -1; } } exit: pdp_list_free(l); return p; } void pdp_image_words_setup(t_pdp_class *c); void pdp_image_setup(void) { t_pdp_conversion_program *program; /* setup the class object */ image_class = pdp_class_new(pdp_gensym("image/*/*"), pdp_image_factory); /* setup conversion programs */ program = pdp_conversion_program_new(_pdp_packet_image_convert_YCrCb_to_grey, 0); pdp_type_register_conversion(pdp_gensym("image/YCrCb/*"), pdp_gensym("image/grey/*"), program); pdp_type_register_conversion(pdp_gensym("image/multi/*"), pdp_gensym("image/grey/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_grey_to_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("image/grey/*"), pdp_gensym("image/YCrCb/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_grey_to_multi, 0); pdp_type_register_conversion(pdp_gensym("image/grey/*"), pdp_gensym("image/multi/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_multi_to_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("image/multi/*"), pdp_gensym("image/YCrCb/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_YCrCb_to_multi, 0); pdp_type_register_conversion(pdp_gensym("image/YCrCb/*"), pdp_gensym("image/multi/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_resample_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("image/YCrCb/*"), pdp_gensym("image/YCrCb/*"), program); program = pdp_conversion_program_new(_pdp_packet_image_convert_resample_multi, 0); pdp_type_register_conversion(pdp_gensym("image/multi/*"), pdp_gensym("image/multi/*"), program); pdp_type_register_conversion(pdp_gensym("image/grey/*"), pdp_gensym("image/grey/*"), program); /* catch-all fallback */ program = pdp_conversion_program_new(_pdp_packet_image_convert_fallback, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("image/*/*"), program); } --- NEW FILE: pdp_bitmap.c --- /* * Pure Data Packet system implementation. : 8 bit image packet implementation * Copyright (c) by Tom Schouten <pdp(a)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 <string.h> #include "pdp_packet.h" #include "pdp_type.h" #include "pdp_llconv.h" #include "pdp_internals.h" #include "pdp_post.h" /* the class object */ static t_pdp_class* bitmap_class; t_bitmap *pdp_packet_bitmap_info(int packet) { return (t_bitmap *)pdp_packet_subheader(packet); } /* check if packet is a valid image packet */ int pdp_packet_bitmap_isvalid(int packet) { t_pdp *header = pdp_packet_header(packet); t_bitmap *image = pdp_packet_bitmap_info(packet); if (!header) return 0; if (PDP_BITMAP != header->type) return 0; return 1; } /* bitmap constructors */ t_pdp_symbol *pdp_packet_bitmap_get_description(int packet) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); char description[1024]; char *c = description; int encoding; if (!header) return pdp_gensym("invalid"); else if (!header->desc){ /* if description is not defined, try to reconstruct it (for backwards compat) */ if (header->type == PDP_BITMAP){ c += sprintf(c, "bitmap"); encoding = bitmap->encoding; switch(encoding){ case PDP_BITMAP_RGB: c += sprintf(c, "/rgb"); break; case PDP_BITMAP_RGBA: c += sprintf(c, "/rgba"); break; case PDP_BITMAP_GREY: c += sprintf(c, "/grey"); break; case PDP_BITMAP_YV12: c += sprintf(c, "/yv12"); break; default: c += sprintf(c, "/unknown"); goto exit; } c += sprintf(c, "/%dx%d", bitmap->width, bitmap->height); exit: return pdp_gensym(description); } else return pdp_gensym("unknown"); } else return header->desc; } int pdp_packet_new_bitmap_yv12(u32 w, u32 h) { t_pdp *header; t_bitmap *bitmap; int packet; u32 size = w*h; u32 totalnbpixels = size; u32 packet_size = size + (size >> 1); packet = pdp_packet_new(PDP_BITMAP, packet_size); header = pdp_packet_header(packet); bitmap = pdp_packet_bitmap_info(packet); if (!header) return -1; bitmap->encoding = PDP_BITMAP_YV12; bitmap->width = w; bitmap->height = h; header->desc = pdp_packet_bitmap_get_description(packet); header->theclass = bitmap_class; return packet; } int pdp_packet_new_bitmap_grey(u32 w, u32 h) { t_pdp *header; t_bitmap *bitmap; int packet; u32 size = w*h; u32 totalnbpixels = size; u32 packet_size = totalnbpixels; packet = pdp_packet_new(PDP_BITMAP, packet_size); header = pdp_packet_header(packet); bitmap = pdp_packet_bitmap_info(packet); if (!header) return -1; bitmap->encoding = PDP_BITMAP_GREY; bitmap->width = w; bitmap->height = h; header->desc = pdp_packet_bitmap_get_description(packet); header->theclass = bitmap_class; return packet; } int pdp_packet_new_bitmap_rgb(u32 w, u32 h) { t_pdp *header; t_bitmap *bitmap; int packet; u32 size = w*h; u32 totalnbpixels = size; u32 packet_size = totalnbpixels * 3; packet = pdp_packet_new(PDP_BITMAP, packet_size); header = pdp_packet_header(packet); bitmap = pdp_packet_bitmap_info(packet); if (!header) return -1; bitmap->encoding = PDP_BITMAP_RGB; bitmap->width = w; bitmap->height = h; header->desc = pdp_packet_bitmap_get_description(packet); header->theclass = bitmap_class; return packet; } int pdp_packet_new_bitmap_rgba(u32 w, u32 h) { t_pdp *header; t_bitmap *bitmap; int packet; u32 size = w*h; u32 totalnbpixels = size; u32 packet_size = totalnbpixels * 4; packet = pdp_packet_new(PDP_BITMAP, packet_size); header = pdp_packet_header(packet); bitmap = pdp_packet_bitmap_info(packet); if (!header) return -1; bitmap->encoding = PDP_BITMAP_RGBA; bitmap->width = w; bitmap->height = h; header->desc = pdp_packet_bitmap_get_description(packet); header->theclass = bitmap_class; return packet; } int pdp_packet_new_bitmap(int type, u32 w, u32 h) { switch(type){ case PDP_BITMAP_GREY: return pdp_packet_new_bitmap_grey(w,h); case PDP_BITMAP_YV12: return pdp_packet_new_bitmap_yv12(w,h); case PDP_BITMAP_RGB: return pdp_packet_new_bitmap_rgb(w,h); case PDP_BITMAP_RGBA: return pdp_packet_new_bitmap_rgba(w,h); default: return -1; } } /* some utility methods */ void pdp_llconv_flip_top_bottom(char *data, int width, int height, int pixelsize); /* flip top & bottom */ void pdp_packet_bitmap_flip_top_bottom(int packet) { t_bitmap *b = (t_bitmap *)pdp_packet_subheader(packet); char *d = (char *)pdp_packet_data(packet); int w,h; if (!pdp_packet_bitmap_isvalid(packet)) return; if (!b) return; w = b->width; h = b->height; switch(b->encoding){ case PDP_BITMAP_GREY: pdp_llconv_flip_top_bottom(d,w,h,1); break; case PDP_BITMAP_RGB: pdp_llconv_flip_top_bottom(d,w,h,3); break; case PDP_BITMAP_RGBA: pdp_llconv_flip_top_bottom(d,w,h,4); break; default: break; } } /* conversion methods */ // image/grey/* -> bitmap/grey/* static int _pdp_packet_bitmap_convert_grey_to_grey8(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data = (s16 *)pdp_packet_data(packet); u8 *new_data; u32 w,h; int new_p; if (!pdp_packet_image_isvalid(packet)) return -1; w = image->width; h = image->height; if (!((image->encoding == PDP_IMAGE_GREY) || (image->encoding == PDP_IMAGE_YV12))) return -1; new_p = pdp_packet_new_bitmap_grey(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); /* convert image to greyscale 8 bit */ pdp_llconv(data,RIF_GREY______S16, new_data, RIF_GREY______U8, w, h); return new_p; } static int _pdp_packet_bitmap_convert_YCrCb_to_rgb8(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data = (s16 *)pdp_packet_data(packet); u8 *new_data; u32 w,h; int new_p; if (!pdp_packet_image_isvalid(packet)) return -1; w = image->width; h = image->height; if (!((image->encoding == PDP_IMAGE_YV12))) return -1; new_p = pdp_packet_new_bitmap_rgb(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); /* convert image to greyscale 8 bit */ pdp_llconv(data,RIF_YVU__P411_S16, new_data, RIF_RGB__P____U8, w, h); return new_p; } static int _pdp_packet_bitmap_convert_image_to_yv12(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data = (s16 *)pdp_packet_data(packet); u8 *new_data; u32 w,h, nbpixels; int new_p; int encoding = image->encoding; if (!pdp_packet_image_isvalid(packet)) return -1; w = image->width; h = image->height; nbpixels = w*h; new_p = pdp_packet_new_bitmap_yv12(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); switch (encoding){ case PDP_IMAGE_YV12: pdp_llconv(data, RIF_YVU__P411_S16, new_data, RIF_YVU__P411_U8, w, h); break; case PDP_IMAGE_GREY: pdp_llconv(data, RIF_GREY______S16, new_data, RIF_GREY______U8, w, h); memset(new_data + nbpixels, 0x80, nbpixels>>1); break; default: /* not supported, $$$TODO add more */ pdp_packet_mark_unused(new_p); new_p = -1; break; } return new_p; } static int _pdp_packet_bitmap_convert_rgb8_to_YCrCb(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); s16 *new_data; u32 w,h; int new_p; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_image_YCrCb(w,h); if (-1 == new_p) return -1; new_data = (s16 *)pdp_packet_data(new_p); /* convert image to greyscale 8 bit */ pdp_llconv(data, RIF_RGB__P____U8, new_data, RIF_YVU__P411_S16, w, h); return new_p; } static int _pdp_packet_bitmap_convert_rgb8_to_bitmap_YCrCb(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); u8 *new_data; u32 w,h; int new_p; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_bitmap_yv12(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); /* convert image to greyscale 8 bit */ pdp_llconv(data, RIF_RGB__P____U8, new_data, RIF_YVU__P411_U8, w, h); return new_p; } static int _pdp_packet_bitmap_convert_grey8_to_grey(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); s16 *data = (s16 *)pdp_packet_data(packet); u8 *new_data; u32 w,h; int new_p; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_image_grey(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); /* convert image to greyscale 8 bit */ pdp_llconv(data, RIF_GREY______U8, new_data, RIF_GREY______S16, w, h); return new_p; } static int _pdp_packet_bitmap_convert_rgb8_to_rgba8(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); u8 *new_data; int w,h, new_p, i; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_bitmap_rgba(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); for(i=0; i<w*h; i++){ new_data[4*i+0] = data[3*i + 0]; new_data[4*i+1] = data[3*i + 1]; new_data[4*i+2] = data[3*i + 2]; new_data[4*i+3] = 0; } return new_p; } static int _pdp_packet_bitmap_convert_rgba8_to_rgb8(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); u8 *new_data; int w,h, new_p, i; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_bitmap_rgb(w,h); if (-1 == new_p) return -1; new_data = (u8 *)pdp_packet_data(new_p); for(i=0; i<w*h; i++){ new_data[3*i+0] = data[4*i + 0]; new_data[3*i+1] = data[4*i + 1]; new_data[3*i+2] = data[4*i + 2]; } return new_p; } static int _pdp_packet_bitmap_convert_rgb8_to_mchp(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); s16 *new_data; int w,h; int new_p, i, plane; w = bitmap->width; h = bitmap->height; plane = w*h; new_p = pdp_packet_new_image_multi(w,h,3); if (-1 == new_p) return -1; new_data = (s16 *)pdp_packet_data(new_p); for(i=0; i<w*h; i++){ new_data[i] = ((u32)data[3*i + 0]) << 7; new_data[i+plane] = ((u32)data[3*i + 1]) << 7; new_data[i+plane*2] = ((u32)data[3*i + 2]) << 7; } return new_p; } static int _pdp_packet_bitmap_convert_yv12_to_image(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_bitmap *bitmap = pdp_packet_bitmap_info(packet); u8 *data = (u8 *)pdp_packet_data(packet); s16 *new_data; int w,h; int new_p; w = bitmap->width; h = bitmap->height; new_p = pdp_packet_new_image_YCrCb(w,h); new_data = pdp_packet_data(new_p); if (-1 == new_p || !new_data) return -1; pdp_llconv(data, RIF_YVU__P411_U8, new_data, RIF_YVU__P411_S16, w, h); return new_p; } static int _pdp_packet_bitmap_convert_mchp_to_rgb8(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_image *image = (t_image *)pdp_packet_subheader(packet); s16 *data = (s16 *)pdp_packet_data(packet); u8 *new_data; int w = image->width; int h = image->height; int plane = w*h; int nb_channels = image->depth; int new_p, i; static inline u8 _map(s32 pixel){ s32 mask = ~(pixel>>16); return ((pixel >> 7) & mask); } switch(nb_channels){ default: return -1; case 1: if (-1 == (new_p = pdp_packet_new_bitmap_grey(w,h))) return -1; new_data = (u8*)pdp_packet_data(new_p); for(i=0; i<plane; i++) new_data[i] = _map(data[i]); break; case 3: if (-1 == (new_p = pdp_packet_new_bitmap_rgb(w,h))) return -1; new_data = (u8*)pdp_packet_data(new_p); for(i=0; i<plane; i++){ new_data[3*i+0] = _map(data[i]); new_data[3*i+1] = _map(data[i+plane]); new_data[3*i+2] = _map(data[i+plane*2]); } break; case 4: if (-1 == (new_p = pdp_packet_new_bitmap_rgba(w,h))) return -1; new_data = (u8*)pdp_packet_data(new_p); for(i=0; i<plane; i++){ new_data[4*i+0] = _map(data[i]); new_data[4*i+1] = _map(data[i+plane]); new_data[4*i+2] = _map(data[i+plane*2]); new_data[4*i+3] = _map(data[i+plane*3]); } break; } return new_p; } static int _pdp_packet_bitmap_convert_fallback(int packet, t_pdp_symbol *dest_template) { pdp_post("can't convert image type %s to %s", pdp_packet_get_description(packet)->s_name, dest_template->s_name); return -1; } static int pdp_bitmap_factory(t_pdp_symbol *type) { t_pdp_list *l; t_pdp_symbol *s; int t; int w = 0; int h = 0; int d = 0; int p = -1; int n = 0; int m = 0; char *garbage = 0; //pdp_post("creating:"); //pdp_post("%s", type->s_name); l = pdp_type_to_list(type); s = pdp_list_pop(l).w_symbol; // first element is "bitmap" s = pdp_list_pop(l).w_symbol; /* get image type */ if (s == pdp_gensym("grey")) t = PDP_BITMAP_GREY; else if (s == pdp_gensym("yv12")) t = PDP_BITMAP_YV12; else if (s == pdp_gensym("rgb")) t = PDP_BITMAP_RGB; else goto exit; /* get image dimensions and create image */ s = pdp_list_pop(l).w_symbol; sscanf(s->s_name, "%dx%d", &w, &h); p = pdp_packet_new_bitmap(t,w,h); if (p != -1){ t_pdp *h = pdp_packet_header(p); /* if type is not exact, delete the packet */ if (type != h->desc) { pdp_packet_delete(p); p = -1; } } exit: pdp_list_free(l); return p; } void pdp_bitmap_setup(void) { t_pdp_conversion_program *program; /* setup class object */ bitmap_class = pdp_class_new(pdp_gensym("bitmap/*/*"), pdp_bitmap_factory); /* setup conversion programs */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_grey_to_grey8, 0); pdp_type_register_conversion(pdp_gensym("image/grey/*"), pdp_gensym("bitmap/grey/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_grey8_to_grey, 0); pdp_type_register_conversion(pdp_gensym("bitmap/grey/*"), pdp_gensym("image/grey/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_YCrCb_to_rgb8, 0); pdp_type_register_conversion(pdp_gensym("image/YCrCb/*"), pdp_gensym("bitmap/rgb/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_image_to_yv12, 0); pdp_type_register_conversion(pdp_gensym("image/YCrCb/*"), pdp_gensym("bitmap/yv12/*"), program); pdp_type_register_conversion(pdp_gensym("image/grey/*"), pdp_gensym("bitmap/yv12/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_yv12_to_image, 0); pdp_type_register_conversion(pdp_gensym("bitmap/yv12/*"), pdp_gensym("image/YCrCb/*"), program); /* rgb->YCrCb converts the colour space */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgb8_to_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgb/*"), pdp_gensym("image/YCrCb/*"), program); /* rgb <-> multi does not convert the colour space */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgb8_to_mchp, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgb/*"), pdp_gensym("image/multi/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_mchp_to_rgb8, 0); pdp_type_register_conversion(pdp_gensym("image/multi/*"), pdp_gensym("bitmap/*/*"), program); /* rgb <-> rgba */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgb8_to_rgba8, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgb/*"), pdp_gensym("bitmap/rgba/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgba8_to_rgb8, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgba/*"), pdp_gensym("bitmap/rgb/*"), program); /* fallback rgb convertor */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgb8_to_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgb/*"), pdp_gensym("image/*/*"), program); program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_rgb8_to_bitmap_YCrCb, 0); pdp_type_register_conversion(pdp_gensym("bitmap/rgb/*"), pdp_gensym("bitmap/yv12/*"), program); /* fallbacks */ program = pdp_conversion_program_new(_pdp_packet_bitmap_convert_fallback, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("bitmap/*/*"), program); pdp_type_register_conversion(pdp_gensym("bitmap/*/*"), pdp_gensym("image/*/*"), program); pdp_type_register_conversion(pdp_gensym("bitmap/*/*"), pdp_gensym("bitmap/*/*"), program); } --- NEW FILE: Makefile --- OBJECTS = pdp_bitmap.o pdp_image.o $(PDP_OPTTYPES) include ../../Makefile.config all: $(OBJECTS) clean: rm -f *~ rm -f *.o --- NEW FILE: pdp_matrix.c --- #include <string.h> #include "pdp_matrix.h" #include "pdp_packet.h" #include "pdp_symbol.h" #include "pdp_internals.h" // for pdp_packet_new, which is not a proper constructor #include "pdp_post.h" #include "pdp_type.h" /* the class object */ static t_pdp_class *matrix_class; /* declare header and subheader variables and exit with errval if invalid */ #define VALID_MATRIX_HEADER(packet, header, subheader, mtype, errval) \ t_pdp * header = pdp_packet_header( packet ); \ t_matrix * subheader = (t_matrix *)pdp_packet_subheader( packet ); \ if (! header ) return errval; \ if (PDP_MATRIX != header->type) return errval; \ if (mtype) {if (subheader->type != mtype) return errval;} int pdp_packet_matrix_isvalid(int p) { VALID_MATRIX_HEADER(p, h, m, 0, 0); return 1; } void *pdp_packet_matrix_get_gsl_matrix(int p, u32 type) { VALID_MATRIX_HEADER(p, h, m, type, 0); return &m->matrix; } void *pdp_packet_matrix_get_gsl_vector(int p, u32 type) { VALID_MATRIX_HEADER(p, h, m, type, 0); return &m->vector; } int pdp_packet_matrix_get_type(int p) { VALID_MATRIX_HEADER(p, h, m, 0, 0); return m->type; } int pdp_packet_matrix_isvector(int p) { VALID_MATRIX_HEADER(p, h, m, 0, 0); return ((m->rows == 1) || (m->columns == 1)); } int pdp_packet_matrix_ismatrix(int p) { VALID_MATRIX_HEADER(p, h, m, 0, 0); return ((m->rows != 1) && (m->columns != 1)); } /* gsl blas matrix/vector multiplication: vector.vector (const gsl_vector * x, const gsl_vector * y, double * result) gsl_blas_sdot gsl_blas_ddot gsl_blas_cdot gsl_blas_zdot gsl_blas_cdotu gsl_blas_zdotu matrix.vector ( CBLAS_TRANSPOSE_t TransA, double alpha, const gsl_matrix * A, const gsl_vector * x, double beta, gsl_vector * y ) gsl_blas_sgemv gsl_blas_dgemv gsl_blas_cgemv gsl_blas_zgemv matrix.matrix ( CBLAS_TRANSPOSE_t TransA, CBLAS_TRANSPOSE_t TransB, double alpha, const gsl_matrix * A, const gsl_matrix * B, double beta, gsl_matrix * C ) gsl_blas_sgemm gsl_blas_dgemm gsl_blas_cgemm gsl_blas_zgemm */ /* compute the matrix inverse using the LU decomposition */ /* it only works for double real/complex */ int pdp_packet_matrix_LU_to_inverse(int p) { int new_p; u32 n; int type = pdp_packet_matrix_get_type(p); t_matrix *sheader = (t_matrix *)pdp_packet_subheader(p); gsl_matrix *m = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(p, type); gsl_matrix *im; if (!m) return -1; n = m->gsl_rows; if (n != m->gsl_columns) return -1; new_p = pdp_packet_new_matrix(n, n, type); if (-1 == new_p) return -1; im = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(new_p, type); switch(type){ case PDP_MATRIX_TYPE_RDOUBLE: gsl_linalg_LU_invert (m, &sheader->perm, im); break; case PDP_MATRIX_TYPE_CDOUBLE: gsl_linalg_complex_LU_invert ((gsl_matrix_complex *)m, &sheader->perm, (gsl_matrix_complex *)im); break; default: pdp_packet_mark_unused(new_p); new_p = -1; } return new_p; } /* compute the LU decomposition of a square matrix */ /* it only works for double real/complex */ int pdp_packet_matrix_LU(int p) { int p_LU, bytes; u32 n; int type = pdp_packet_matrix_get_type(p); t_matrix *sh_m_LU; t_matrix *sh_m = (t_matrix *)pdp_packet_subheader(p); gsl_matrix *m = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(p, type); gsl_matrix *m_LU; if (!m) return -1; n = m->gsl_rows; if (n != m->gsl_columns) return -1; p_LU = pdp_packet_new_matrix(n, n, type); if (-1 == p_LU) return -1; sh_m_LU = (t_matrix *)pdp_packet_subheader(p_LU); m_LU = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(p_LU, type); /* copy matrix data: move this to copy method */ memcpy(pdp_packet_data(p_LU), pdp_packet_data(p), sh_m->block.size); switch(type){ case PDP_MATRIX_TYPE_RDOUBLE: gsl_linalg_LU_decomp (m_LU, &sh_m_LU->perm, &sh_m_LU->signum); break; case PDP_MATRIX_TYPE_CDOUBLE: gsl_linalg_complex_LU_decomp ((gsl_matrix_complex *)m_LU, &sh_m_LU->perm, &sh_m_LU->signum); break; default: pdp_packet_mark_unused(p_LU); p_LU = -1; } return p_LU; } int pdp_packet_matrix_LU_solve(int p_matrix, int p_vector) { int type = pdp_packet_matrix_get_type(p_matrix); int p_result_vector = pdp_packet_clone_rw(p_vector); gsl_matrix *m = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(p_matrix, type); gsl_vector *v = (gsl_vector *)pdp_packet_matrix_get_gsl_vector(p_vector, type); gsl_vector *rv = (gsl_vector *)pdp_packet_matrix_get_gsl_vector(p_result_vector, type); t_matrix *sh_m = (t_matrix *)pdp_packet_subheader(p_matrix); if (!(m && v && rv)) goto error; switch(type){ case PDP_MATRIX_TYPE_RDOUBLE: if (gsl_linalg_LU_solve (m, &sh_m->perm, v, rv)) goto error; break; case PDP_MATRIX_TYPE_CDOUBLE: if(gsl_linalg_complex_LU_solve ((gsl_matrix_complex*)m, &sh_m->perm, (gsl_vector_complex *)v, (gsl_vector_complex *)rv)) goto error; break; default: goto error; } return p_result_vector; error: pdp_packet_mark_unused(p_result_vector); //post("error"); return -1; } /* matrix matrix mul: C is defining type returns 0 on success */ int pdp_packet_matrix_blas_mm ( CBLAS_TRANSPOSE_t TransA, CBLAS_TRANSPOSE_t TransB, int pA, int pB, int pC, float scale_r, float scale_i ) { gsl_complex_float cf_scale = {{scale_r, scale_i}}; gsl_complex cd_scale = {{(double)scale_r, (double)scale_i}}; gsl_complex_float cf_one = {{1.0f, 0.0f}}; gsl_complex cd_one = {{1.0, 0.0}}; gsl_matrix *mA, *mB, *mC; int type; type = pdp_packet_matrix_get_type(pC); mA = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pA,type); mB = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pB,type); mC = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pC,type); if (!(mA && mB)) return 1; switch(type){ case PDP_MATRIX_TYPE_RFLOAT: return gsl_blas_sgemm(TransA, TransB, scale_r, (gsl_matrix_float *)mA, (gsl_matrix_float *)mB, 1.0f, (gsl_matrix_float *)mC); case PDP_MATRIX_TYPE_RDOUBLE: return gsl_blas_dgemm(TransA, TransB, (double)scale_r, (gsl_matrix *)mA, (gsl_matrix *)mB, 1.0, (gsl_matrix *)mC); case PDP_MATRIX_TYPE_CFLOAT: return gsl_blas_cgemm(TransA, TransB, cf_scale, (gsl_matrix_complex_float *)mA, (gsl_matrix_complex_float *)mB, cf_one, (gsl_matrix_complex_float *)mC); case PDP_MATRIX_TYPE_CDOUBLE: return gsl_blas_zgemm(TransA, TransB, cd_scale, (gsl_matrix_complex *)mA, (gsl_matrix_complex *)mB, cd_one, (gsl_matrix_complex *)mC); default: return 0; } } /* matrix vector mul: C is defining type returns 0 on success */ int pdp_packet_matrix_blas_mv ( CBLAS_TRANSPOSE_t TransA, int pA, int pb, int pc, float scale_r, float scale_i ) { gsl_complex_float cf_scale = {{scale_r, scale_i}}; gsl_complex cd_scale = {{(double)scale_r, (double)scale_i}}; gsl_complex_float cf_one = {{1.0f, 0.0f}}; gsl_complex cd_one = {{1.0, 0.0}}; gsl_matrix *mA; gsl_vector *vb, *vc; int type; type = pdp_packet_matrix_get_type(pA); mA = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pA,type); vb = (gsl_vector *)pdp_packet_matrix_get_gsl_vector(pb,type); vc = (gsl_vector *)pdp_packet_matrix_get_gsl_vector(pc,type); if (!(vb && vc)) return 1; switch(type){ case PDP_MATRIX_TYPE_RFLOAT: return gsl_blas_sgemv(TransA, scale_r, (gsl_matrix_float *)mA, (gsl_vector_float *)vb, 1.0f, (gsl_vector_float *)vc); case PDP_MATRIX_TYPE_RDOUBLE: return gsl_blas_dgemv(TransA, (double)scale_r, (gsl_matrix *)mA, (gsl_vector *)vb, 1.0, (gsl_vector *)vc); case PDP_MATRIX_TYPE_CFLOAT: return gsl_blas_cgemv(TransA, cf_scale, (gsl_matrix_complex_float *)mA, (gsl_vector_complex_float *)vb, cf_one, (gsl_vector_complex_float *)vc); case PDP_MATRIX_TYPE_CDOUBLE: return gsl_blas_zgemv(TransA, cd_scale, (gsl_matrix_complex *)mA, (gsl_vector_complex *)vb, cd_one, (gsl_vector_complex *)vc); default: return 0; } } t_pdp_symbol *_pdp_matrix_get_description(t_pdp *header) { t_matrix *m = (t_matrix *)(&header->info.raw); char description[100]; char *c = description; int encoding; if (!header) return pdp_gensym("invalid"); else if (!header->desc){ /* if description is not defined, try to reconstruct it (for backwards compat) */ if (header->type == PDP_MATRIX){ c += sprintf(c, "matrix"); switch(m->type){ case PDP_MATRIX_TYPE_RFLOAT: c += sprintf(c, "/float/real"); break; case PDP_MATRIX_TYPE_CFLOAT: c += sprintf(c, "/float/complex"); break; case PDP_MATRIX_TYPE_RDOUBLE: c += sprintf(c, "/double/real"); break; case PDP_MATRIX_TYPE_CDOUBLE: c += sprintf(c, "/double/complex"); break; default: c += sprintf(c, "/unknown"); goto exit; } c += sprintf(c, "/%dx%d", (int)m->rows, (int)m->columns); exit: return pdp_gensym(description); } else return pdp_gensym("unknown"); } else return header->desc; } static void _pdp_matrix_copy(t_pdp *dst, t_pdp *src); static void _pdp_matrix_clone(t_pdp *dst, t_pdp *src); static void _pdp_matrix_reinit(t_pdp *dst); static void _pdp_matrix_cleanup(t_pdp *dst); static size_t _pdp_matrix_mdata_byte_size(u32 rows, u32 columns, u32 type) { size_t dsize = rows * columns; switch (type){ case PDP_MATRIX_TYPE_RFLOAT: dsize *= sizeof(float); break; case PDP_MATRIX_TYPE_CFLOAT: dsize *= 2*sizeof(float); break; case PDP_MATRIX_TYPE_RDOUBLE: dsize *= sizeof(double); break; case PDP_MATRIX_TYPE_CDOUBLE: dsize *= 2*sizeof(double); break; default: dsize = 0; } return dsize; } static size_t _pdp_matrix_pdata_vector_size(u32 rows, u32 columns) { return (rows>columns ? rows : columns); } static void _pdp_matrix_init(t_pdp *dst, u32 rows, u32 columns, u32 type) { int i; t_matrix *m = (t_matrix *)(&dst->info.raw); void *d = ((void *)dst) + PDP_HEADER_SIZE; int matrix_bytesize = _pdp_matrix_mdata_byte_size(rows, columns, type); int permsize = _pdp_matrix_pdata_vector_size(rows, columns); /* set meta data */ m->type = type; m->rows = rows; m->columns = columns; /* set the block data */ m->block.size = matrix_bytesize; m->block.data = (double *)d; /* set the vector view */ m->vector.size = (1==columns) ? rows : columns; m->vector.stride = 1; m->vector.data = (double *)d; m->vector.block = &m->block; m->vector.owner = 0; /* set the matrix view */ m->matrix.gsl_rows = rows; m->matrix.gsl_columns = columns; m->matrix.tda = columns; m->matrix.data = (double *)d; m->matrix.block = &m->block; m->matrix.owner = 0; /* set the permutation object & init */ m->perm.size = permsize; m->perm.data = (size_t *)(d + matrix_bytesize); for(i=0; i<permsize; i++) m->perm.data[i] = i; m->signum = -1; /* init packet header */ dst->theclass = matrix_class; dst->desc = _pdp_matrix_get_description(dst); } static void _pdp_matrix_clone(t_pdp *dst, t_pdp *src) { t_matrix *m = (t_matrix *)(&src->info.raw); _pdp_matrix_init(dst, m->rows, m->columns, m->type); } static void _pdp_matrix_copy(t_pdp *dst, t_pdp *src) { _pdp_matrix_clone(dst, src); memcpy(dst + PDP_HEADER_SIZE, src + PDP_HEADER_SIZE, src->size - PDP_HEADER_SIZE); //post("matrix copy successful"); } static void _pdp_matrix_reinit(t_pdp *dst) { /* nothing to do, assuming data is correct */ } static void _pdp_matrix_cleanup(t_pdp *dst) { /* no extra memory to free */ } int pdp_packet_new_matrix(u32 rows, u32 columns, u32 type) { t_pdp *header; int dsize, p; /* compute the blocksize for the matrix data */ /* if 0, something went wrong -> return invalid packet */ if (!(dsize = _pdp_matrix_mdata_byte_size(rows, columns, type))) return -1; dsize += sizeof(size_t) * _pdp_matrix_pdata_vector_size(rows, columns); p = pdp_packet_new(PDP_MATRIX, dsize); if (-1 == p) return -1; header = pdp_packet_header(p); _pdp_matrix_init(header, rows, columns, type); return p; } int pdp_packet_new_matrix_product_result(CBLAS_TRANSPOSE_t TransA, CBLAS_TRANSPOSE_t TransB, int pA, int pB) { gsl_matrix *mA, *mB; u32 type = pdp_packet_matrix_get_type(pA); u32 colA, colB, rowA, rowB; /* check if A is a matrix */ if (!type) return -1; mA = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pA, type); mB = (gsl_matrix *)pdp_packet_matrix_get_gsl_matrix(pB, type); /* check if A and B are same type */ if (!mB) return -1; /* get dims A */ if (TransA == CblasNoTrans){ rowA = mA->gsl_rows; colA = mA->gsl_columns; } else { rowA = mA->gsl_columns; colA = mA->gsl_rows; } /* get dims B */ if (TransB == CblasNoTrans){ rowB = mB->gsl_rows; colB = mB->gsl_columns; } else { rowB = mB->gsl_columns; colB = mB->gsl_rows; } /* check if sizes are compatible */ if (colA != rowB) return -1; /* create new packet */ return pdp_packet_new_matrix(rowA, colB, type); } void pdp_packet_matrix_setzero(int p) { t_matrix *m; if (!pdp_packet_matrix_isvalid(p)) return; m = (t_matrix *) pdp_packet_subheader(p); memset(m->block.data, 0, m->block.size); } /* type conversion programs */ static int _pdp_packet_convert_matrix_to_greyimage(int packet, t_pdp_symbol *dest_template) { t_pdp *header = pdp_packet_header(packet); t_matrix *matrix = (t_matrix *)pdp_packet_subheader(packet); void *data = pdp_packet_data(packet); s16 *new_data; u32 c,r, nbelements; int new_p; u32 i; c = matrix->columns; r = matrix->rows; nbelements = c*r; new_p = pdp_packet_new_image_grey(c,r); if (-1 == new_p) return -1; new_data = (s16 *)pdp_packet_data(new_p); /* convert first channel */ switch(matrix->type){ case PDP_MATRIX_TYPE_RFLOAT: for (i=0; i<nbelements; i++) (new_data)[i] = (s16)(((float *)data)[i] * (float)0x8000); break; case PDP_MATRIX_TYPE_CFLOAT: //only copy real channel for (i=0; i<nbelements; i++) (new_data)[i] = (s16)(((float *)data)[i<<1] * (float)0x8000); break; case PDP_MATRIX_TYPE_RDOUBLE: for (i=0; i<nbelements; i++) (new_data)[i] = (s16)(((double *)data)[i] * (float)0x8000); break; case PDP_MATRIX_TYPE_CDOUBLE: //only copy real channel for (i=0; i<nbelements; i++) (new_data)[i] = (s16)(((double *)data)[i<<1] * (float)0x8000); break; default: pdp_packet_mark_unused(new_p); new_p = -1; } return new_p; } static int _pdp_packet_convert_image_to_matrix(int packet, t_pdp_symbol *dest_template, int type) { t_pdp *header = pdp_packet_header(packet); t_image *image = pdp_packet_image_info(packet); s16 *data = (s16 *)pdp_packet_data(packet); void *new_data; u32 w,h, nbelements; int new_p; int encoding = image->encoding; u32 i; if (!pdp_packet_image_isvalid(packet)) return -1; w = image->width; h = image->height; nbelements = w*h; new_p = pdp_packet_new_matrix(h,w, type); if (-1 == new_p) return -1; new_data = pdp_packet_data(new_p); switch (encoding){ case PDP_IMAGE_YV12: case PDP_IMAGE_GREY: case PDP_IMAGE_MCHP: /* convert first channel */ switch(type){ case PDP_MATRIX_TYPE_RFLOAT: for (i=0; i<nbelements; i++) ((float *)new_data)[i] = ((float)data[i]) * (1.0f / (float)0x8000); break; case PDP_MATRIX_TYPE_RDOUBLE: for (i=0; i<nbelements; i++) ((double *)new_data)[i] = ((double)data[i]) * (1.0f / (double)0x8000); break; case PDP_MATRIX_TYPE_CFLOAT: for (i=0; i<nbelements; i++){ ((float *)new_data)[i*2] = ((float)data[i]) * (1.0f / (float)0x8000); ((float *)new_data)[i*2+1] = 0.0f; } break; case PDP_MATRIX_TYPE_CDOUBLE: for (i=0; i<nbelements; i++){ ((double *)new_data)[i*2] = ((double)data[i]) * (1.0f / (double)0x8000); ((double *)new_data)[i*2+1] = 0.0; } break; default: pdp_post("_pdp_packet_convert_image_to_matrix: INTERNAL ERROR"); } break; default: pdp_packet_mark_unused(new_p); new_p = -1; break; } return new_p; } static int _pdp_packet_convert_image_to_floatmatrix(int packet, t_pdp_symbol *dest_template){ return _pdp_packet_convert_image_to_matrix(packet, dest_template, PDP_MATRIX_TYPE_RFLOAT);} static int _pdp_packet_convert_image_to_doublematrix(int packet, t_pdp_symbol *dest_template){ return _pdp_packet_convert_image_to_matrix(packet, dest_template, PDP_MATRIX_TYPE_RDOUBLE);} static int _pdp_packet_convert_image_to_complexfloatmatrix(int packet, t_pdp_symbol *dest_template){ return _pdp_packet_convert_image_to_matrix(packet, dest_template, PDP_MATRIX_TYPE_CFLOAT);} static int _pdp_packet_convert_image_to_complexdoublematrix(int packet, t_pdp_symbol *dest_template){ return _pdp_packet_convert_image_to_matrix(packet, dest_template, PDP_MATRIX_TYPE_CDOUBLE);} static int _pdp_packet_matrix_convert_fallback(int packet, t_pdp_symbol *dest_template) { pdp_post("can't convert image type %s to %s", pdp_packet_get_description(packet)->s_name, dest_template->s_name); return -1; } /* this seems like a nice spot to place a dummy gsl signal handler */ static void _gsl_error_handler (const char * reason, const char * file, int line, int gsl_errno) { //pdp_post("gsl error:\nREASON: %s\nFILE:%s\nLINE:%d\nERRNO:%d", reason, file, line, gsl_errno); } static int pdp_matrix_factory(t_pdp_symbol *type) { return -1; } void pdp_matrix_setup(void) { t_pdp_conversion_program *program; /* setup the class */ matrix_class = pdp_class_new(pdp_gensym("matrix/*/*/*"), pdp_matrix_factory); matrix_class->copy = _pdp_matrix_copy; //matrix_class->clone = _pdp_matrix_clone; // is now solved through (symbol based) constructor matrix_class->wakeup = _pdp_matrix_reinit; matrix_class->cleanup = _pdp_matrix_cleanup; /* image -> matrix: default = double/real (most ops available) */ program = pdp_conversion_program_new(_pdp_packet_convert_image_to_doublematrix, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("matrix/double/real/*"), program); program = pdp_conversion_program_new(_pdp_packet_convert_image_to_floatmatrix, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("matrix/float/real/*"), program); program = pdp_conversion_program_new(_pdp_packet_convert_image_to_complexdoublematrix, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("matrix/double/complex/*"), program); program = pdp_conversion_program_new(_pdp_packet_convert_image_to_complexfloatmatrix, 0); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("matrix/float/complex/*"), program); /* matrix -> image */ program = pdp_conversion_program_new(_pdp_packet_convert_matrix_to_greyimage, 0); pdp_type_register_conversion(pdp_gensym("matrix/*/*/*"), pdp_gensym("image/grey/*"), program); /* fallbacks */ program = pdp_conversion_program_new(_pdp_packet_matrix_convert_fallback, 0); pdp_type_register_conversion(pdp_gensym("matrix/*/*/*"), pdp_gensym("image/*/*"), program); pdp_type_register_conversion(pdp_gensym("matrix/*/*/*"), pdp_gensym("bitmap/*/*"), program); pdp_type_register_conversion(pdp_gensym("image/*/*"), pdp_gensym("matrix/*/*/*/*"), program); pdp_type_register_conversion(pdp_gensym("bitmap/*/*"), pdp_gensym("matrix/*/*/*/*"), program); /* setup gsl handler */ if(gsl_set_error_handler(_gsl_error_handler)){ pdp_post("pdp_matrix_setup: WARNING: overriding gsl error handler."); } }

1 0

[PD-cvs] externals/pdp/system/net Makefile, 1.2, 1.3 pdp_net.c, 1.2, 1.3
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/system/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6756/system/net Added Files: Makefile pdp_net.c Log Message: checking in pdp 0.12.4 from http://zwizwa.fartit.com/pd/pdp/pdp-0.12.4.tar.gz --- NEW FILE: Makefile --- OBJECTS = pdp_net.o include ../../Makefile.config all: $(OBJECTS) clean: rm -f *~ rm -f *.o --- NEW FILE: pdp_net.c --- #include "pdp_net.h" #include "pdp_debug.h" #include "pdp_post.h" #include "pdp_mem.h" #define D if (0) // DEBUG MSG #define DD if (0) // DROP DEBUG MSG /* shared internals */ static int _is_udp_header(t_pdp_udp_header *header, unsigned int size) { if (size < sizeof(t_pdp_udp_header)) return 0; if (strcmp(header->signature, "PDP")) return 0; if (PDP_UDP_VERSION != header->version) return 0; return 1; } static void _make_udp_header(t_pdp_udp_header *header) { strcpy(header->signature, "PDP"); header->version = PDP_UDP_VERSION; } /* R E C E I V E R */ /* INTERNALS */ static void _send_packet(t_pdp_udp_receiver *x) { _make_udp_header(&x->x_resend_header); PDP_ASSERT(x->x_resend_udp_packet_size <= sizeof(t_pdp_udp_header) + sizeof(x->x_resend_chunks)); /* send the packet */ if (-1 == sendto (x->x_socket, &x->x_resend_header, x->x_resend_udp_packet_size, 0, (struct sockaddr *)&x->x_source_socket, x->x_sslen)){ pdp_post("pdp_netreceive: send failed"); } } static void _send_ack_new(t_pdp_udp_receiver *x) { /* setup resend header */ x->x_resend_header.connection_id = x->x_connection_id; x->x_resend_header.sequence_number = PDP_UDP_ACKNEW; x->x_resend_udp_packet_size = sizeof(t_pdp_udp_header); _send_packet(x); } static int _handle_PDP_UDP_NEW(t_pdp_udp_receiver *x) { /* we've got a PDP_UDP_NEW packet, so prepare to receive the data */ t_pdp_udp_newpacket *np = (t_pdp_udp_newpacket *)x->x_buf; //pdp_post("conn_id = %x", x->x_header.connection_id); //pdp_post("size = %d", np->data_size); //pdp_post("nb_chunks = %d", np->nb_chunks); //pdp_post("chunk_size = %d", np->chunk_size); //pdp_post("type = %s", np->type); /* check if it is a resend of the PDP_UDP_NEW packet (if NEW_ACK didn't get through) if not, prepare for reception */ if (x->x_connection_id != x->x_header.connection_id){ /* prepare for reception : TODO add some more checks here */ // setup type info if (x->x_data_type) pdp_dealloc (x->x_data_type); x->x_data_type = pdp_alloc(1 + strlen(np->type)); strcpy(x->x_data_type, np->type); // setup data buffer x->x_data_size = np->data_size; if (x->x_data) pdp_dealloc (x->x_data); x->x_data = pdp_alloc(x->x_data_size); memset(x->x_data, 0, x->x_data_size); // clear for debug // setup connection info x->x_connection_id = x->x_header.connection_id; x->x_nb_chunks = np->nb_chunks; x->x_chunk_size = np->chunk_size; /* setup chunk list */ if (x->x_chunk_list) pdp_dealloc(x->x_chunk_list); x->x_chunk_list = pdp_alloc(sizeof(unsigned int)*x->x_nb_chunks); memset(x->x_chunk_list, 0, sizeof(unsigned int)*x->x_nb_chunks); x->x_receive_finished = 0; // we're in a receiving state x->x_packet_transferred = 0; // we didn't pass the packet yet } /* send ACK */ _send_ack_new(x); return 1; } static void _handle_PDP_UDP_DONE(t_pdp_udp_receiver *x) { unsigned int chunk; unsigned int missing; unsigned int i; unsigned int resend_packet_size; /* check the connection id */ if (x->x_connection_id != x->x_header.connection_id) return; /* determine how many packets are missing */ missing = 0; for (i=0; i<x->x_nb_chunks; i++) if (!x->x_chunk_list[i]) missing++; D pdp_post ("last packet %x had %d/%d dropped chunks", x->x_connection_id, missing, x->x_nb_chunks); /* build the resend request (chunk list )*/ if (missing > RESEND_MAX_CHUNKS) missing = RESEND_MAX_CHUNKS; chunk = 0; i = missing; while(i--){ while (x->x_chunk_list[chunk]) chunk++; // find next missing chunk x->x_resend_chunks[i] = chunk++; // store it in list } /* set the packet size to include the list */ x->x_resend_udp_packet_size = sizeof(t_pdp_udp_header) + missing * sizeof(unsigned int); /* setup resend header */ strcpy((char *)&x->x_resend_header, "PDP"); x->x_resend_header.version = PDP_UDP_VERSION; x->x_resend_header.connection_id = x->x_connection_id; x->x_resend_header.sequence_number = PDP_UDP_RESEND; D pdp_post("pdp_netreceive: sending RESEND response for %u chunks", missing); /* send out */ _send_packet(x); /* indicate we're done if there's no chunks missing */ if (!missing) x->x_receive_finished = 1; } static int _handle_UDP_DATA(t_pdp_udp_receiver *x) { unsigned int seq = x->x_header.sequence_number; unsigned int offset = x->x_chunk_size * seq; /* ignore the packet if we're not expecting it */ if ((!x->x_connection_id) || (x->x_connection_id != x->x_header.connection_id)){ //pdp_post("pdp_netreceive: got invalid data packet: transmission id %x is not part of current transmisson %x", // x->x_header.connection_id, x->x_connection_id); return 0; } /* check if it is valid */ if (seq >= x->x_nb_chunks){ pdp_post("pdp_netreceive: got invalid data packet: sequence number %u out of bound (nb_chunks=%u)", seq, x->x_nb_chunks); return 0; } /* final check */ PDP_ASSERT(offset + x->x_buf_size <= x->x_data_size); /* write & log it */ memcpy(x->x_data + offset, x->x_buf, x->x_buf_size); x->x_chunk_list[seq] = 1; return 1; } /* INTERFACE */ /* setup */ t_pdp_udp_receiver *pdp_udp_receiver_new(int port) { t_pdp_udp_receiver *x = pdp_alloc(sizeof(*x)); memset(x, 0, sizeof(*x)); /* init */ x->x_data = 0; x->x_data_type = 0; x->x_data_size = 0; x->x_chunk_list = 0; x->x_receive_finished = 0; x->x_packet_transferred = 0; x->x_zero_terminator = 0; x->x_socket = socket(PF_INET, SOCK_DGRAM, 0); x->x_connection_id = 0; /* zero for bootstrap (0 == an invalid id) */ x->x_sslen = sizeof(struct sockaddr_in); /* bind socket */ x->x_sa.sin_port = htons(port); x->x_sa.sin_addr.s_addr = 0; if (-1 != bind (x->x_socket, (struct sockaddr *)&x->x_sa, sizeof(struct sockaddr_in))) return x; /* suicide if find failed */ else { pdp_dealloc(x); return 0; } } void pdp_udp_receiver_free(t_pdp_udp_receiver *x) { if (!x) return; if (x->x_socket != 1) close (x->x_socket); if (x->x_data) pdp_dealloc(x->x_data); if (x->x_data_type) pdp_dealloc (x->x_data_type); if (x->x_chunk_list) pdp_dealloc (x->x_chunk_list); } void pdp_udp_receiver_reset(t_pdp_udp_receiver *x) { x->x_connection_id = 0; } /* receive loop, returns 1 on success, -1 on error, 0 on timeout */ int pdp_udp_receiver_receive(t_pdp_udp_receiver *x, unsigned int timeout_ms) { /* listen for packets */ unsigned int size; struct timeval tv = {0,1000 * timeout_ms}; fd_set inset; FD_ZERO(&inset); FD_SET(x->x_socket, &inset); switch(select (x->x_socket+1, &inset, NULL, NULL, &tv)){ case -1: return -1; /* select error */ case 0: return 0; /* select time out */ default: break; /* data ready */ } /* this won't block, since there's data available */ if (-1 == (int)(size = recvfrom(x->x_socket, (void *)&x->x_header, PDP_UDP_BUFSIZE+sizeof(x->x_header), 0, (struct sockaddr *)&x->x_source_socket, &x->x_sslen))) return -1; /* store the data size of the packet */ x->x_buf_size = size - sizeof(t_pdp_udp_header); /* parse the udp packet */ if (_is_udp_header(&x->x_header, size)){ /* it is a control packet */ if ((int)x->x_header.sequence_number < 0){ switch (x->x_header.sequence_number){ case PDP_UDP_NEW: _handle_PDP_UDP_NEW(x); break; case PDP_UDP_DONE: _handle_PDP_UDP_DONE(x); /* check if we got a complete packet and signal arrival if we haven't done this already */ if (x->x_receive_finished && !x->x_packet_transferred){ x->x_packet_transferred = 1; return 1; // data complete, please receive } break; default: pdp_post("got unknown msg"); break; } } /* it is a data packet */ else { _handle_UDP_DATA(x); } } else { pdp_post("pdp_netreceive: got invalid UDP packet (size = %d)", size); } return 0; //no major event, please poll again } /* get meta & data */ char *pdp_udp_receiver_type(t_pdp_udp_receiver *x){return x->x_data_type;} unsigned int pdp_udp_receiver_size(t_pdp_udp_receiver *x){return x->x_data_size;} void *pdp_udp_receiver_data(t_pdp_udp_receiver *x){return x->x_data;} /* S E N D E R */ /* INTERNALS */ static void _sleep(t_pdp_udp_sender *x) { int sleep_period = x->x_sleep_period; if (sleep_period) { if (!x->x_sleep_count++) usleep(x->x_sleepgrain_us); x->x_sleep_count %= sleep_period; } } static void _send(t_pdp_udp_sender *x) { //post("sending %u data bytes", x->x_buf_size); _make_udp_header(&x->x_header); PDP_ASSERT (x->x_buf_size <= PDP_UDP_BUFSIZE); if (-1 == sendto (x->x_socket, &x->x_header, x->x_buf_size + sizeof(t_pdp_udp_header), 0, (struct sockaddr *)&x->x_sa, sizeof(struct sockaddr_in))) pdp_post("pdp_netsend: send FAILED"); _sleep(x); } static void _prepare_for_new_transmission(t_pdp_udp_sender *x, char *type, unsigned int size, void *data) { unsigned int i; /* setup data for transmission */ x->x_data_type = type; x->x_data_size = size; x->x_data = data; x->x_chunk_size = x->x_udp_payload_size; x->x_nb_chunks = (x->x_data_size - 1) / x->x_chunk_size + 1; /* generate a connection id (non-zero) */ while (!(x->x_connection_id = rand())); /* setup chunk list to contain all chunks */ if (x->x_chunk_list) free (x->x_chunk_list); x->x_chunk_list_size = x->x_nb_chunks; x->x_chunk_list = malloc(sizeof(unsigned int)*x->x_chunk_list_size); for (i=0; i<x->x_chunk_list_size; i++) x->x_chunk_list[i] = i; } static void _send_header_packet(t_pdp_udp_sender *x) { t_pdp_udp_newpacket *np = (t_pdp_udp_newpacket *)x->x_buf; /* buf contains the PDP_UDP_NEW body */ /* init packet */ x->x_header.sequence_number = PDP_UDP_NEW; x->x_header.connection_id = x->x_connection_id; np->data_size = x->x_data_size; np->nb_chunks = x->x_nb_chunks; np->chunk_size = x->x_chunk_size; strcpy(np->type, x->x_data_type); x->x_buf_size = sizeof(*np) + strlen(np->type) + 1; PDP_ASSERT(x->x_buf_size <= PDP_UDP_BUFSIZE); /* send the packet */ _send(x); } /* saend the chunks in the chunk list */ static void _send_chunks(t_pdp_udp_sender *x){ unsigned int i; unsigned int count = 0; /* send chunks: this requires header is setup ok (sig,ver,connid)*/ for (i=0; i<x->x_chunk_list_size; i++){ unsigned int offset; unsigned int current_chunk_size; unsigned int seq = x->x_chunk_list[i]; PDP_ASSERT(seq < x->x_nb_chunks); x->x_header.sequence_number = seq; // store chunk number /* get current chunk offset */ offset = seq * x->x_chunk_size; PDP_ASSERT(offset < x->x_data_size); /* get current chunk size */ current_chunk_size = (offset + x->x_chunk_size > x->x_data_size) ? (x->x_data_size - offset) : x->x_chunk_size; x->x_buf_size = current_chunk_size; PDP_ASSERT(x->x_buf_size <= PDP_UDP_BUFSIZE); /* copy chunk to transmission buffer & send */ PDP_ASSERT(offset + current_chunk_size <= x->x_data_size); memcpy(x->x_buf, x->x_data + offset, current_chunk_size); /* send the chunk */ _send(x); count++; } D pdp_post("sent %d chunks, id=%x", count,x->x_connection_id); } /* send a DONE packet */ static void _send_done(t_pdp_udp_sender *x){ x->x_header.sequence_number = PDP_UDP_DONE; x->x_buf_size = 0; _send(x); } static int _receive_packet(t_pdp_udp_sender *x, int desired_type) /* 0 == timeout, -1 == error, 1 == got packet */ { unsigned int size; int type; struct timeval tv; fd_set inset; int sr; while (1){ int retval; /* wait for incoming */ tv.tv_sec = 0; tv.tv_usec = x->x_timeout_us; FD_ZERO(&inset); FD_SET(x->x_socket, &inset); switch (select (x->x_socket+1, &inset, NULL, NULL, &tv)){ case -1: return -1; /* select error */ case 0: return 0; /* select time out */ default: break; /* data ready */ } /* read packet */ if (-1 == (int)(size = recv(x->x_socket, (void *)&x->x_resend_header, MAX_UDP_PACKET, 0))){ pdp_post("pdp_netsend: error while reading from socket"); return -1; } /* check if it is a valid PDP_UDP packet */ if (!_is_udp_header(&x->x_resend_header, size)){ pdp_post("pdp_netsend: ignoring invalid UDP packet (size = %u)", size); continue; } /* check connection id */ if (x->x_connection_id != x->x_resend_header.connection_id){ D pdp_post("pdp_netsend: ignoring ghost packet id=%x, current id=%x", x->x_resend_header.connection_id, x->x_connection_id); continue; } /* check type */ type = x->x_resend_header.sequence_number; if (type != desired_type) continue; /* setup data buffer for known packets */ switch(type){ case PDP_UDP_RESEND: x->x_resend_items = (size - sizeof(t_pdp_udp_header)) / sizeof(unsigned int); break; default: break; } return 1; } } /* get the resend list */ static int _need_resend(t_pdp_udp_sender *x) { int retries = 3; int retval; while (retries--){ /* send a DONE msg */ _send_done(x); /* wait for ACK */ switch(_receive_packet(x, PDP_UDP_RESEND)){ case 0: /* timeout, retry */ continue; case -1: /* error */ goto move_on; default: /* got PDP_UDP_RESEND packet: setup resend list */ if (x->x_resend_items > x->x_nb_chunks){ pdp_post("pdp_netsend: WARNING: chunk list size (%d) is too big, ignoring RESEND request", x->x_resend_items); x->x_resend_items = 0; continue; } x->x_chunk_list_size = x->x_resend_items; memcpy(x->x_chunk_list, x->x_resend_chunks, sizeof(unsigned int) * x->x_resend_items); D pdp_post("got RESEND request for %d chunks (id %x)", x->x_resend_items,x->x_connection_id); return x->x_chunk_list_size > 0; } } /* timeout */ move_on: x->x_chunk_list_size = 0; return 0; } /* INTERFACE */ /* some flow control hacks */ void pdp_udp_sender_timeout_us(t_pdp_udp_sender *x, unsigned int timeout_us) { x->x_timeout_us = timeout_us; } void pdp_udp_sender_sleepgrain_us(t_pdp_udp_sender *x, unsigned int sleepgrain_us) { x->x_sleepgrain_us = sleepgrain_us; } void pdp_udp_sender_sleepperiod(t_pdp_udp_sender *x, unsigned int sleepperiod) { x->x_sleep_period = sleepperiod; } void pdp_udp_sender_udp_packet_size(t_pdp_udp_sender *x, unsigned int udp_packet_size) { int i = (int)udp_packet_size - sizeof(t_pdp_udp_header); if (i < 1024) i = 1024; if (i > PDP_UDP_BUFSIZE) i = PDP_UDP_BUFSIZE; x->x_udp_payload_size = i; } void pdp_udp_sender_connect(t_pdp_udp_sender *x, char *host, unsigned int port) { struct hostent *hp; hp = gethostbyname(host); if (!hp){ pdp_post("pdp_udp_sender: host %s not found", host); } else{ /* host ok, setup address */ x->x_sa.sin_family = AF_INET; x->x_sa.sin_port = htons(port); memcpy((char *)&x->x_sa.sin_addr, (char *)hp->h_addr, hp->h_length); /* create the a socket if necessary */ if (x->x_socket == -1){ if (-1 == (x->x_socket = socket(PF_INET, SOCK_DGRAM, 0))){ pdp_post("pdp_udp_sender: can't create socket"); } if (1){ int on = 1; if (setsockopt(x->x_socket,SOL_SOCKET,SO_BROADCAST,(char *)&on,sizeof(on))<0) pdp_post("pdp_udp_sender: can't set broadcast flag"); } } } } /* setup */ t_pdp_udp_sender *pdp_udp_sender_new(void) { t_pdp_udp_sender *x = pdp_alloc(sizeof(*x)); memset(x,0,sizeof(*x)); x->x_chunk_list = 0; /* no connection */ x->x_socket = -1; /* set flow control */ pdp_udp_sender_timeout_us(x, 50000); x->x_sleep_count = 0; pdp_udp_sender_sleepgrain_us(x, 0); pdp_udp_sender_sleepperiod(x, 50); pdp_udp_sender_udp_packet_size(x, 1472); //optimal udp packet size (ip: 1500 = 28 + 1472) return x; } void pdp_udp_sender_free(t_pdp_udp_sender *x) { int i; void* retval; if (x->x_socket != -1) close(x->x_socket); if (x->x_chunk_list) free (x->x_chunk_list); } /* send, returns 1 on success, 0 on error */ int pdp_udp_sender_send(t_pdp_udp_sender *x, char* type, unsigned int size, void *data) { /* SEND A PACKET */ /* get the type and data from caller */ /* send header packet and make sure it has arrived */ /* send a chunk burst */ /* send done packet and get the resend list */ /* repeat until send list is empty */ int hs_retry = 5; // retry count for initial handshake int rs_retry = 5; // retry count for resends /* check if we have a target */ if (-1 == x->x_socket) goto transerror; /* setup internal state */ _prepare_for_new_transmission(x,type,size,data); /* handshake a new transmission */ do { if (!(hs_retry--)) break; // pdp_post("handshake retry %d for packet %x", hscount, x->x_connection_id); _send_header_packet(x); } while (!_receive_packet(x, PDP_UDP_ACKNEW)); /* exit if no handshake was possible */ if (hs_retry < 0){ DD pdp_post("pdp_netsend: DROP: receiver does not accept new transmission"); goto transerror; } /* transmission loop */ do { if (!(rs_retry--)) break; _send_chunks(x); } while (_need_resend(x)); /* exit if transmission was not successful */ if (rs_retry < 0){ DD pdp_post("pdp_netsend: DROP: receiver did not confirm reception"); goto transerror; } /* send successful */ return 1; transerror: /* transmission error */ return 0; }

1 0

[PD-cvs] externals/pdp/system/png Makefile, 1.2, 1.3 pdp_png.c, 1.2, 1.3
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/system/png In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6756/system/png Added Files: Makefile pdp_png.c Log Message: checking in pdp 0.12.4 from http://zwizwa.fartit.com/pd/pdp/pdp-0.12.4.tar.gz --- NEW FILE: pdp_png.c --- /* * Pure Data Packet system module. - png glue code * Copyright (c) by Tom Schouten <pdp(a)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 "pdp_packet.h" #include "pdp_mem.h" #include "pdp_post.h" #include "pdp_debug.h" // this is an optional module #include "pdp_config.h" #ifdef HAVE_PDP_PNG //if 0 #include <png.h> #define READING 1 #define WRITING 2 #define SIG_BYTES 8 #define D if(0) typedef struct { FILE *x_fp; int x_kindof; //READING or WRITING png_structp x_png; png_infop x_info; png_infop x_end_info; png_uint_32 x_width; png_uint_32 x_height; int x_bit_depth; int x_color_type; int x_interlace_type; int x_compression_type; int x_filter_type; int x_pdp_bitmap_type; int x_packet; } t_png_image; static t_png_image *_init(t_png_image *x) { x->x_png = 0; x->x_info = 0; x->x_end_info = 0; x->x_fp = 0; x->x_packet = -1; return x; } static int _cleanup(t_png_image *x) { #define INTERNAL_ERROR 1 if (!x) return 1; pdp_packet_mark_unused(x->x_packet); if (x->x_png) switch(x->x_kindof){ case READING: png_destroy_read_struct(&x->x_png, &x->x_info, &x->x_end_info); break; case WRITING: png_destroy_write_struct(&x->x_png, &x->x_info); break; default: PDP_ASSERT(INTERNAL_ERROR); } if (x->x_fp) fclose(x->x_fp); return 1; } static int _open_read(t_png_image* x, char *file) { char header[SIG_BYTES]; int is_png; x->x_fp = fopen(file, "r"); if (!x->x_fp) { D pdp_post("can't open %s for reading", file); return 0; } fread(header, 1, SIG_BYTES, x->x_fp); is_png = !png_sig_cmp(header, 0, SIG_BYTES); D pdp_post("%s is %s png file", file, is_png ? "a" : "not a"); return is_png; } static int _open_write(t_png_image* x, char *file) { char header[SIG_BYTES]; int is_png; x->x_fp = fopen(file, "w"); if (!x->x_fp) { D pdp_post("can't open %s for writing", file); return 0; } return 1; } /* progress callback */ static void _row_callback(png_structp p, png_uint_32 row, int pass) { fprintf(stderr, "."); } static int _initio_read(t_png_image *x) { png_init_io(x->x_png, x->x_fp); png_set_sig_bytes(x->x_png, SIG_BYTES); D png_set_read_status_fn(x->x_png, _row_callback); return 1; } static int _initio_write(t_png_image *x) { png_init_io(x->x_png, x->x_fp); D png_set_write_status_fn(x->x_png, _row_callback); return 1; } static int _checkimagetype(t_png_image *x) { png_read_info(x->x_png, x->x_info); png_get_IHDR(x->x_png, x->x_info, &x->x_width, &x->x_height, &x->x_bit_depth, &x->x_color_type, &x->x_interlace_type, &x->x_compression_type, &x->x_filter_type); D pdp_post("image info: w=%d, h=%d, depth=%d, type=%d", (int)x->x_width, (int)x->x_height, (int)x->x_bit_depth, (int)x->x_color_type); /* handle paletted images: convert to 8 bit RGB(A) */ if (x->x_color_type == PNG_COLOR_TYPE_PALETTE && x->x_bit_depth <= 8) { png_set_expand(x->x_png); D pdp_post("convert palette"); /* check if there's an alpha channel and set PDP_BITMAP type */ x->x_pdp_bitmap_type = (png_get_valid(x->x_png, x->x_info, PNG_INFO_tRNS)) ? PDP_BITMAP_RGBA : PDP_BITMAP_RGB; return 1; } /* handle bitdepth */ if (x->x_bit_depth < 8) { png_set_expand(x->x_png); D pdp_post("convert greyscale to 8 bit"); } if (x->x_bit_depth == 16){ D pdp_post("stripping 16 bit to 8 bit"); png_set_strip_16(x->x_png); } /* handle greyscale images */ if (x->x_color_type == PNG_COLOR_TYPE_GRAY){ x->x_pdp_bitmap_type = PDP_BITMAP_GREY; if (png_get_valid(x->x_png, x->x_info, PNG_INFO_tRNS)){ D pdp_post("no support for greyscale images with alpha info"); return 0; } return 1; } /* handle RGB imges */ if (x->x_color_type = PNG_COLOR_TYPE_RGB){ x->x_pdp_bitmap_type = PDP_BITMAP_RGB; return 1; } /* handle RGBA imges */ if (x->x_color_type = PNG_COLOR_TYPE_RGBA){ x->x_pdp_bitmap_type = PDP_BITMAP_RGBA; return 1; } /* can't handle image type */ D pdp_post("image type not supported"); return 0; } #define user_error_ptr NULL #define user_error_fn NULL #define user_warning_fn NULL static int _buildstruct_read(t_png_image *x) { x->x_kindof = READING; if (!(x->x_png = png_create_read_struct (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr, user_error_fn, user_warning_fn))) return 0; if (!(x->x_info = png_create_info_struct(x->x_png))) return 0; if (!(x->x_end_info = png_create_info_struct(x->x_png))) return 0; return 1; } static int _buildstruct_write(t_png_image *x) { x->x_kindof = WRITING; if (!(x->x_png = png_create_write_struct (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr, user_error_fn, user_warning_fn))) return 0; if (!(x->x_info = png_create_info_struct(x->x_png))) return 0; return 1; } static int _getimagedata(t_png_image *x) { int nbchans = 0; char *image_data; png_bytep row_pointers[x->x_height]; png_uint_32 i; D pdp_post("reading %d rows ", (int)x->x_height); switch (x->x_pdp_bitmap_type){ case PDP_BITMAP_GREY: nbchans = 1; break; case PDP_BITMAP_RGB: nbchans = 3; break; case PDP_BITMAP_RGBA: nbchans = 4; break; default: return 0; } x->x_packet = pdp_packet_new_bitmap(x->x_pdp_bitmap_type, x->x_width, x->x_height); if (!(image_data = pdp_packet_data(x->x_packet))) return 0; for(i=0; i<x->x_height; i++) row_pointers[i] = image_data + nbchans * i * x->x_width; png_read_image(x->x_png, row_pointers); D pdp_post("DONE"); return 1; } static int _saveimagedata(t_png_image *x, int packet) { png_bytep *row_pointers; png_uint_32 i; int nbchans; t_pdp *h = pdp_packet_header(packet); char *image_data = (char *)pdp_packet_data(packet); if (!h) return 0; if (PDP_BITMAP != h->type) return 0; if (!image_data) return 0; x->x_width = h->info.bitmap.width; x->x_height = h->info.bitmap.height; switch(h->info.image.encoding){ case PDP_BITMAP_GREY: x->x_color_type = PNG_COLOR_TYPE_GRAY; nbchans = 1; break; case PDP_BITMAP_RGB: x->x_color_type = PNG_COLOR_TYPE_RGB; nbchans = 3; break; case PDP_BITMAP_RGBA: x->x_color_type = PNG_COLOR_TYPE_RGBA; nbchans = 4; break; default: return 0; } png_set_IHDR(x->x_png, x->x_info, x->x_width, x->x_height, 8, x->x_color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); png_write_info(x->x_png, x->x_info); D pdp_post("writing %d rows ", (int)x->x_height); row_pointers = (png_bytep *)pdp_alloc(sizeof(png_bytep) * x->x_height); for(i=0; i<x->x_height; i++) row_pointers[i] = image_data + nbchans * i * x->x_width; png_write_image(x->x_png, row_pointers); png_write_end(x->x_png, x->x_info); pdp_dealloc(row_pointers); D pdp_post("DONE"); return 1; } /* simple functions to load and save png images */ int pdp_packet_bitmap_from_png_file(char *filename) { int packet = -1; t_png_image _x; t_png_image *x = &_x; if (!_init(x)) goto exit; if (!_open_read(x, filename)) goto exit; if (!_buildstruct_read(x)) goto exit; if (!_initio_read(x)) goto exit; if (!_checkimagetype(x)) goto exit; if (!_getimagedata(x)) goto exit; packet = x->x_packet; x->x_packet = -1; _cleanup(x); return packet; exit: _cleanup(x); return -1; } int pdp_packet_bitmap_save_png_file(int packet, char *filename) { t_png_image _x; t_png_image *x = &_x; if (!_init(x)) goto exit; if (!_open_write(x, filename)) goto exit; if (!_buildstruct_write(x)) goto exit; if (!_initio_write(x)) goto exit; if (!_saveimagedata(x, packet)) goto exit; _cleanup(x); return 1; exit: _cleanup(x); return 0; } #else //PDP_HAVE_PNG int pdp_packet_bitmap_save_png_file(int packet, char *filename) { pdp_post("WARNING: no png support, can't save png file %s", filename); return 0; } int pdp_packet_bitmap_from_png_file(char *filename) { pdp_post("WARNING: no png support, can't load png file %s", filename); return -1; } #endif //PDP_HAVE_PNG #if 0 int main(int argc, char **argv) { char *image = 0; if (argc != 2) pdp_post("usage: %s <png file>", argv[0]); else image = load_png(argv[1]); pdp_post ("%s", image ? "OK" : "ERROR"); } #endif --- NEW FILE: Makefile --- OBJECTS = pdp_png.o include ../../Makefile.config all: $(OBJECTS) clean: rm -f *~ rm -f *.o

1 0

externals/pdp/system/kernel CONTENTS, 1.2, 1.3 Makefile, 1.2, 1.3 pdp_debug.c, 1.2, 1.3 pdp_dpd_command.c, 1.2, 1.3 pdp_list.c, 1.2, 1.3 pdp_mem.c, 1.2, 1.3 pdp_packet.c, 1.2, 1.3 pdp_packet2.c, 1.2, 1.3 pdp_post.c, 1.2, 1.3 pdp_symbol.c, 1.2, 1.3 pdp_type.c, 1.2, 1.3
by Hans-Christoph Steiner 16 Dec '05

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/system/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6756/system/kernel Added Files: CONTENTS Makefile pdp_debug.c pdp_dpd_command.c pdp_list.c pdp_mem.c pdp_packet.c pdp_packet2.c pdp_post.c pdp_symbol.c pdp_type.c Log Message: checking in pdp 0.12.4 from http://zwizwa.fartit.com/pd/pdp/pdp-0.12.4.tar.gz --- NEW FILE: pdp_list.c --- /* * Pure Data Packet header file. List class * Copyright (c) by Tom Schouten <pdp(a)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. * */ /* who can live without a list, hmm? this is sorth of a compromise between lists, queues, stacks, lisp and forth. list contain pdp atoms (floats, ints, symbols, pointers, packets or lists) */ #include <pthread.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include "pdp_list.h" #include "pdp_symbol.h" #include "pdp_packet.h" #include "pdp_type.h" #include "pdp_types.h" #include "pdp_mem.h" #include "pdp_post.h" #include "pdp_debug.h" #define D if (0) t_pdp_fastalloc *_fast_atom_allocator; t_pdp_fastalloc *_fast_list_allocator; static void _pdp_list_dealloc(t_pdp_list *l) { pdp_fastalloc_save_atom(_fast_list_allocator, l); } // allocator macros #define PDP_ATOM_ALLOC() pdp_fastalloc_new_atom(_fast_atom_allocator) #define PDP_ATOM_DEALLOC(x) pdp_fastalloc_save_atom(_fast_atom_allocator, x) #define PDP_LIST_ALLOC() pdp_fastalloc_new_atom(_fast_list_allocator) #define PDP_LIST_DEALLOC(x) _pdp_list_dealloc(x) //#define PDP_LIST_DEALLOC(x) pdp_fastalloc_save_atom(_fast_list_allocator, x) /* some private helper methods */ /* list pool setup */ void pdp_list_setup(void) { /* create fast allocators */ _fast_atom_allocator = pdp_fastalloc_new(sizeof(t_pdp_atom)); _fast_list_allocator = pdp_fastalloc_new(sizeof(t_pdp_list)); /* testing code */ if (0){ char *next; t_pdp_list *l = pdp_tree_from_cstring("( een twee (3 vier ()) vijf (6.0)", &next); if (!l){ pdp_post("parse error:"); pdp_post(next); } else{ pdp_list_print(l); } exit(1); } } /* create a list */ t_pdp_list* pdp_list_new(int elements) { t_pdp_atom *a = 0; t_pdp_list *l = PDP_LIST_ALLOC(); l->elements = 0; if (elements){ a = PDP_ATOM_ALLOC(); l->elements++; a->t = a_undef; a->w.w_int = 0; a->next = 0; elements--; } l->first = a; l->last = a; while (elements--){ a = PDP_ATOM_ALLOC(); l->elements++; a->t = a_undef; a->w.w_int = 0; a->next = l->first; l->first = a; } return l; } /* clear a list */ void pdp_list_clear(t_pdp_list *l) { t_pdp_atom *a = l->first; t_pdp_atom *next_a; while(a){ next_a = a->next; PDP_ATOM_DEALLOC(a); a = next_a; } l->first = 0; l->last = 0; l->elements = 0; } /* destroy a list */ void pdp_list_free(t_pdp_list *l) { if (l){ pdp_list_clear(l); PDP_LIST_DEALLOC(l); } } /* destroy a (sub)tree */ void pdp_tree_free(t_pdp_list *l) { if (l) { pdp_tree_clear(l); PDP_LIST_DEALLOC(l); } } /* clear a tree */ void pdp_tree_clear(t_pdp_list *l) { t_pdp_atom *a = l->first; t_pdp_atom *next_a; while(a){ if (a->t == a_list){ pdp_tree_free(a->w.w_list); } next_a = a->next; PDP_ATOM_DEALLOC(a); a = next_a; } l->first = 0; l->last = 0; l->elements = 0; } /* BEGIN PARSER CODE */ /* real whitespace handling */ static inline int _is_whitespace(char c){return (c == ' ' || c == '\n' || c == '\t');} static inline void _skip_real_whitespace(char **c){while (_is_whitespace(**c)) (*c)++;} /* comment handling */ static inline int _is_left_comment(char c) {return (c == '#');} static inline int _is_right_comment(char c) {return (c == '\n');} static inline void _skip_comment(char **c) { if (!_is_left_comment(**c)) return; (*c)++; while (!_is_right_comment(**c)){ if (!**c) return; // no terminating newline (*c)++; } (*c)++; } /* comment + whitespace handling */ static inline void _skip_whitespace(char **c) { char *prev_c; /* skip comments and whitespace until the pointer stops moving */ do { prev_c = *c; _skip_real_whitespace(c); _skip_comment(c); } while (prev_c != *c); } static inline int _is_left_separator(char c) {return (c == '(');} static inline int _is_right_separator(char c) {return (c == ')');} static inline int _is_terminator(char c) {return (c == 0);} /* the end of an atom is marked by a separator */ static inline int _is_separator(char c) {return (_is_terminator(c) || _is_left_separator(c) || _is_right_separator(c) || _is_whitespace(c));} /* parse a single pure atom from a zero terminated string a pure atom is either a number (int or float) xor a symbol */ static inline void _parse_pure_atom(t_pdp_atom *a, char *c) { char *next; /* check if the string has a decimal point */ int has_decimal = 0; char *c2; for(c2 = c; *c2; c2++){ if (*c2 == '.') { has_decimal = 1; break; } } /* try parsing as a number (int or float) first */ if (has_decimal){ // try float float f = strtod(c, &next); if (next[0] == 0){ // got everything? D pdp_post("parsing float %f", f); a->t = a_float; a->w = (t_pdp_word)f; return; } } else { // try int int i = strtol(c, &next, 0); if (next[0] == 0){ // got everything? D pdp_post("parsing int %d", i); a->t = a_int; a->w = (t_pdp_word)i; return; } } /* number parsing failed: it's a symbol */ D pdp_post("parsing symbol %s", c); a->t = a_symbol; a->w = (t_pdp_word)pdp_gensym(c); } t_pdp_atom *pdp_atom_new(void){t_pdp_atom *a = PDP_ATOM_ALLOC(); a->next = 0; return a;} void pdp_atom_free(t_pdp_atom *a){PDP_ATOM_DEALLOC(a);} /* there are two parser methods: parse an atom and parse a list both can call each other recursively. the atoms and list are allocated with pdp_list_new and pdp_atom_new respectively */ t_pdp_atom *pdp_atom_from_cstring(char *chardef, char **next) { t_pdp_atom *a = 0; /* skip whitespace and check if there's anything left */ _skip_whitespace(&chardef); if (!chardef[0] || _is_right_separator(*chardef)) goto done; /* check if it's a list atom */ if(_is_left_separator(*chardef)){ t_pdp_list *l = pdp_tree_from_cstring(chardef, &chardef); if (l){ a = pdp_atom_new(); a->t = a_list; a->w.w_list = l; } } /* we have a pure atom, copy it to a temp buffer */ else{ int n = 0; while (!_is_separator(chardef[n])) n++; if (!n) goto done; else { char tmp[n+1]; strncpy(tmp, chardef, n); tmp[n] = 0; a = pdp_atom_new(); _parse_pure_atom(a, tmp); chardef += n; } } done: if (next) *next = chardef; return a; } /* check if a tree (list of lists) matches a certain type syntax types: symbol -> a_sym; int -> a_int; float -> a_float; packet -> a_packet; list -> a_list; ... -> zero or more times the preceeding elements in the list */ /* create a list from a character string */ t_pdp_list *pdp_tree_from_cstring(char *chardef, char **next) { t_pdp_list *l = pdp_list_new(0); t_pdp_atom *a = 0; D pdp_post ("creating list from char: %s", chardef); /* find opening parenthesis and skip it*/ _skip_whitespace(&chardef); if (!_is_left_separator(*chardef)) goto error; else chardef++; /* chardef now points at the first atom, start adding atoms */ while(1){ a = pdp_atom_from_cstring(chardef, &chardef); if (a)pdp_list_add_back_atom(l, a); else break; } /* skip whitespace and find closing parenthesis */ _skip_whitespace(&chardef); if (!_is_right_separator(*chardef)) goto error; else chardef++; if (next) *next = chardef; return l; error: /* end of string encountered: parse error */ D pdp_post("parse error: %s", chardef); if (next) *next = chardef; pdp_tree_free(l); //this will free all sublists too return 0; // parse error } /* END PARSER CODE */ // this assumes syntax's syntax is correct int pdp_tree_check_syntax(t_pdp_list *list, t_pdp_list *syntax) { t_pdp_atom *la = 0; t_pdp_atom *sa = 0; t_pdp_symbol *ellipsis = pdp_gensym("..."); t_pdp_symbol *wildcard = pdp_gensym("*"); /* handle empty lists */ if (list->elements == 0){ /* check if syntax list is empty */ if (syntax->elements == 0) goto match; /* check if syntax list has ellipsis */ if (syntax->last->t == a_symbol && syntax->last->w.w_symbol == ellipsis) goto match; /* default: no match */ goto nomatch; } /* loop over list and syntax list */ for (la = list->first, sa = syntax->first; la && sa; la = la->next, sa = sa->next){ D pdp_post("pdp_tree_check_syntax: starting check"); checkatom: /* what do we expect for this atom ? */ switch(sa->t){ case a_list: D pdp_post("expecting list"); /* we need to recurse down the tree */ /* exit if the current list to check does not have a sublist */ if (la->t != a_list) { D pdp_post("not a list"); goto nomatch; } /* recurse and exit if no match */ D pdp_post("checking sublist"); if (!pdp_tree_check_syntax(la->w.w_list, sa->w.w_list)){ D pdp_post("sublist does not match"); goto nomatch; } break; case a_symbol: /* if ellipsis, rewind */ if (ellipsis == sa->w.w_symbol){ D pdp_post("got ellipsis"); /* check if we're not looping */ if (sa == syntax->first){ D pdp_post("ellipsis at start of list"); goto nomatch; } /* try again */ sa = syntax->first; D pdp_post("ellipsis rewind"); goto checkatom; } else if (wildcard == sa->w.w_symbol){ D pdp_post("got wildcard"); } /* ordinary atom: check type */ else{ D pdp_post("expecting %s", sa->w.w_symbol->s_name); switch(la->t){ case a_int: if (sa->w.w_symbol != pdp_gensym("int")) goto nomatch; break; case a_float: if (sa->w.w_symbol != pdp_gensym("float")) goto nomatch; break; case a_symbol: if (sa->w.w_symbol != pdp_gensym("symbol")) goto nomatch; break; case a_packet: if (sa->w.w_symbol != pdp_gensym("packet")) goto nomatch; break; case a_list: if (sa->w.w_symbol != pdp_gensym("list")) goto nomatch; break; default: goto nomatch; } D pdp_post("OK"); } break; default: D pdp_post("syntax syntax error"); pdp_list_print(syntax); goto nomatch; // incorrect syntax description } } /* loop ended because one of the lists was finished */ /* only two cases can be valid: la == 0 and (sa == 0 or ellipsis) */ if (la != 0){ D pdp_post("not end of list -> no match"); goto nomatch; } if (sa == 0) goto match; if (!(sa->t == a_symbol && sa->w.w_symbol == ellipsis)){ D pdp_post("syntax list not in ellipsis position -> no match"); goto nomatch; } /* exits */ match: D pdp_post("pdp_tree_check_syntax: match"); return 1; nomatch: D pdp_post("pdp_tree_check_syntax: no match"); return 0; } /* traversal */ void pdp_list_apply(t_pdp_list *l, t_pdp_atom_method m) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next) m(a); } void pdp_tree_apply(t_pdp_list *l, t_pdp_atom_method m) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next){ if (a->t == a_list) pdp_tree_apply(a->w.w_list, m); else m(a); } } void pdp_list_apply_word_method(t_pdp_list *l, t_pdp_word_type type, t_pdp_word_method wm) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next){ if (a->t == type) wm(a->w); } } void pdp_list_apply_pword_method(t_pdp_list *l, t_pdp_word_type type, t_pdp_pword_method pwm) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next){ if (a->t == type) pwm(&a->w); } } void pdp_tree_apply_word_method(t_pdp_list *l, t_pdp_word_type type, t_pdp_word_method wm) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next){ if (a->t == a_list) pdp_tree_apply_word_method(a->w.w_list, type, wm); else if (a->t == type) wm(a->w); } } void pdp_tree_apply_pword_method(t_pdp_list *l, t_pdp_word_type type, t_pdp_pword_method pwm) { t_pdp_atom *a; if (!l) return; for (a=l->first; a; a=a->next){ if (a->t == a_list) pdp_tree_apply_pword_method(a->w.w_list, type ,pwm); else if (a->t == type) pwm(&a->w); } } static void _atom_packet_mark_unused(t_pdp_atom *a) { if (a->t == a_packet){ pdp_packet_mark_unused(a->w.w_packet); a->w.w_packet = -1; } } static void _atom_packet_copy_ro(t_pdp_atom *a) { int p; if (a->t == a_packet){ a->w.w_packet = pdp_packet_copy_ro(a->w.w_packet); } } void pdp_tree_strip_packets (t_pdp_list *l) { pdp_tree_apply(l, _atom_packet_mark_unused); } static void _pdp_tree_copy_ro_packets (t_pdp_list *l) { pdp_tree_apply(l, _atom_packet_copy_ro); } t_pdp_list *pdp_tree_copy_ro(t_pdp_list *l) { t_pdp_list *l2 = pdp_tree_copy(l); _pdp_tree_copy_ro_packets(l2); return l2; } static void _pdp_atomlist_fprint(FILE* f, t_pdp_atom *a); static void _pdp_atom_fprint(FILE* f, t_pdp_atom *a) { if (!a){ fprintf(f, "<NULL ATOM>"); return; } switch(a->t){ /* generic atoms */ case a_symbol: fprintf(f, "%s",a->w.w_symbol->s_name); break; case a_float: fprintf(f, "%f",a->w.w_float); break; case a_int: fprintf(f, "%d",a->w.w_int); break; case a_packet: fprintf(f, "#<pdp %d %s>",a->w.w_packet, pdp_packet_get_description(a->w.w_packet)->s_name); break; case a_pointer: fprintf(f, "#<0x%08x>", a->w.w_int); break; case a_list: _pdp_atomlist_fprint(f, a->w.w_list->first); break; case a_atom_pointer: fprintf(f, "->"); _pdp_atom_fprint(f, a->w.w_atom_pointer); break; case a_undef: fprintf(f, "<undef>"); break; /* forth atoms */ case a_forthword: fprintf(f, "#<forth word 0x%08x>", a->w.w_int); break; case a_vmword: fprintf(f, "#<vm word 0x%08x>", a->w.w_int); break; case a_vmmacro: fprintf(f, "#<vm macro 0x%08x>", a->w.w_int); break; default: fprintf(f, "<unknown type>"); break; } } /* debug */ static void _pdp_atomlist_fprint(FILE* f, t_pdp_atom *a) { fprintf(f, "("); while (a){ _pdp_atom_fprint(f,a); a = a->next; if (a) fprintf(f, " "); } fprintf(f, ")"); } void _pdp_list_fprint(FILE* f, t_pdp_list *l) { _pdp_atomlist_fprint(f, l->first); fprintf(f, "\n"); } void pdp_list_print(t_pdp_list *l) { _pdp_list_fprint(stderr, l); } void pdp_atom_print(t_pdp_atom *a) { _pdp_atom_fprint(stderr, a); } /* public list operations */ /* add a atom/word to the start of the list */ void pdp_list_add_atom(t_pdp_list *l, t_pdp_atom *a) { a->next = l->first; l->first = a; l->elements++; if (!l->last) l->last = a; } void pdp_list_add(t_pdp_list *l, t_pdp_word_type t, t_pdp_word w) { t_pdp_atom *a = PDP_ATOM_ALLOC(); a->t = t; a->w = w; pdp_list_add_atom(l, a); } /* add a word to the end of the list */ void pdp_list_add_back_atom(t_pdp_list *l, t_pdp_atom *a) { l->elements++; a->next = 0; if (l->last){ l->last->next = a; } else{ l->first = a; } l->last = a; } void pdp_list_add_back(t_pdp_list *l, t_pdp_word_type t, t_pdp_word w) { t_pdp_atom *a = PDP_ATOM_ALLOC(); a->w = w; a->t = t; pdp_list_add_back_atom(l, a); } /* get list size */ int pdp_list_size(t_pdp_list *l) { return l->elements; } /* pop: return first item and remove */ t_pdp_atom *pdp_list_pop_atom(t_pdp_list *l) { t_pdp_atom *a = l->first; if (!a) return a; l->first = a->next; l->elements--; if (!l->first) l->last = 0; a->next = 0; // detach return a; } /* pop: return first item and remove */ t_pdp_word pdp_list_pop(t_pdp_list *l) { t_pdp_atom *a = pdp_list_pop_atom(l); t_pdp_word w=a->w; PDP_ATOM_DEALLOC(a); return w; } /* pop from one list and push to other */ void pdp_list_pop_push(t_pdp_list *source, t_pdp_list *dest) { t_pdp_atom *a = source->first; /* pop atom */ if (--(source->elements)){source->last = 0;} source->first = a->next; /* push atom */ a->next = dest->first; if (dest->elements++) {dest->last = a;} dest->first = a; return; } /* return element at index */ t_pdp_word pdp_list_index(t_pdp_list *l, int index) { t_pdp_atom *a; for (a = l->first; index--; a = a->next); return a->w; } /* remove an element from a list */ void pdp_list_remove(t_pdp_list *l, t_pdp_word_type t, t_pdp_word w) { t_pdp_atom head; t_pdp_atom *a; t_pdp_atom *kill_a; head.next = l->first; for(a = &head; a->next; a = a->next){ if (a->next->w.w_int == w.w_int && a->next->t == t){ kill_a = a->next; // element to be killed a->next = a->next->next; // remove link PDP_ATOM_DEALLOC(kill_a); l->elements--; l->first = head.next; // restore the start pointer if (l->last == kill_a) { // restore the end pointer l->last = (a != &head) ? a : 0; } break; } } } /* copy a list */ t_pdp_list* pdp_tree_copy_reverse(t_pdp_list *list) { t_pdp_list *newlist = pdp_list_new(0); t_pdp_atom *a; for (a = list->first; a; a = a->next) if (a->t == a_list){ pdp_list_add(newlist, a->t, (t_pdp_word)pdp_tree_copy_reverse(a->w.w_list)); } else{ pdp_list_add(newlist, a->t, a->w); } return newlist; } t_pdp_list* pdp_list_copy_reverse(t_pdp_list *list) { t_pdp_list *newlist = pdp_list_new(0); t_pdp_atom *a; for (a = list->first; a; a = a->next) pdp_list_add(newlist, a->t, a->w); return newlist; } t_pdp_list* pdp_tree_copy(t_pdp_list *list) { t_pdp_list *newlist = pdp_list_new(list->elements); t_pdp_atom *a_src = list->first; t_pdp_atom *a_dst = newlist->first; while(a_src){ a_dst->t = a_src->t; if (a_dst->t == a_list){ //recursively copy sublists (tree copy) a_dst->w.w_list = pdp_tree_copy(a_src->w.w_list); } else{ a_dst->w = a_src->w; } a_src = a_src->next; a_dst = a_dst->next; } return newlist; } t_pdp_list* pdp_list_copy(t_pdp_list *list) { t_pdp_list *newlist = pdp_list_new(list->elements); t_pdp_atom *a_src = list->first; t_pdp_atom *a_dst = newlist->first; while(a_src){ a_dst->t = a_src->t; a_dst->w = a_src->w; a_src = a_src->next; a_dst = a_dst->next; } return newlist; } void pdp_list_join (t_pdp_list *l, t_pdp_list *tail) { if (tail->elements){ l->elements += tail->elements; if (l->last){ l->last->next = tail->first; l->last = tail->last; } else { l->first = tail->first; l->last = tail->last; } } PDP_LIST_DEALLOC(tail); //delete the tail header } void pdp_list_cat (t_pdp_list *l, t_pdp_list *tail) { t_pdp_list *tmp = pdp_list_copy(tail); pdp_list_join(l, tmp); } /* in place reverse: atoms stay the same they are just relinked. so pointers will stay accurate */ void pdp_list_reverse(t_pdp_list *l) { t_pdp_list tmp; t_pdp_atom *a; tmp.first = l->first; tmp.last = l->last; tmp.elements = l->elements; l->first = 0; l->last = 0; l->elements = 0; while (a = pdp_list_pop_atom(&tmp)){ pdp_list_add_atom(l, a); } } void pdp_list_reverse_old(t_pdp_list *l) { t_pdp_list *l2 = pdp_list_copy_reverse(l); pdp_list_clear(l); l->first = l2->first; l->last = l2->last; l->elements = l2->elements; _pdp_list_dealloc(l2); } /* check if a list contains an element */ int pdp_list_contains(t_pdp_list *list, t_pdp_word_type t, t_pdp_word w) { t_pdp_atom *a; for(a = list->first; a; a=a->next){ if (a->w.w_int == w.w_int && a->t == t) return 1; } return 0; } /* add a thing to the start of the list if it's not in there already */ void pdp_list_add_to_set(t_pdp_list *list, t_pdp_word_type t, t_pdp_word w) { if (!pdp_list_contains(list, t, w)) pdp_list_add(list, t, w); } --- NEW FILE: pdp_dpd_command.c --- /* * Pure Data Packet header file. DPD command class * Copyright (c) by Tom Schouten <pdp(a)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. * */ /* this object implements a dpd command queue and command object */ #include "pdp_dpd_command.h" #include "pdp_mem.h" void pdp_dpd_commandfactory_init(t_pdp_dpd_commandfactory *x, u32 size) { x->nb_commands = 0; x->command_size = size; x->command = 0; } void _pdp_dpd_commandfactory_free(t_pdp_dpd_command *x) { if (x) _pdp_dpd_commandfactory_free(x->next); pdp_dealloc(x); } void pdp_dpd_commandfactory_free(t_pdp_dpd_commandfactory *x) { _pdp_dpd_commandfactory_free(x->command); x->command = 0; x->nb_commands = 0; } /* factory method */ t_pdp_dpd_command *pdp_dpd_commandfactory_get_new_command(t_pdp_dpd_commandfactory *x) { t_pdp_dpd_command *c = x->command; t_pdp_dpd_command *oldhead = c; /* check if we can reuse */ while (c){ if (!c->used){ c->used = 1; //post("reusing command %x", c, c->used); return c; } //post("command %x is used %d", c, c->used); c = c->next; } /* create a new command */ x->command = (t_pdp_dpd_command *)pdp_alloc(x->command_size); x->command->next = oldhead; x->command->used = 1; x->nb_commands++; //post("created command %x, nbcommands: %d", x->command, x->nb_commands); return x->command; } /* (self)destructor */ void pdp_dpd_command_suicide(void *x) { t_pdp_dpd_command *c = (t_pdp_dpd_command *)x; c->used = 0; //post("command %x committed suicide %d", c, c->used); } --- NEW FILE: pdp_packet.c --- /* * Pure Data Packet system implementation: Packet Manager * Copyright (c) by Tom Schouten <pdp(a)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 <pthread.h> #include <unistd.h> #include <string.h> #include "pdp_post.h" #include "pdp_packet.h" #include "pdp_mem.h" #include "pdp_list.h" #include "pdp_type.h" #include "pdp_debug.h" /* packet implementation. contains class and packet (instance) handling some notes on packet operations. copy ro/rw and unregister are relatively straightforward packet creation can be done in 2 ways in this interface: create + reuse however, these methods should only be called by specific factory methods, so the user should only create packets using pdp_factory_newpacket reuse or create is thus the responsability of the factory methods for each packet type (class) implementation */ /* NOTE: the packet pool methods are called within the pool locks. this probably needs to change, because it will cause deadlocks for container packets (fobs) */ /* new implementation: probably just a minor adjustment: add the reuse fifo attached to type desc symbol name need to check and possibly eliminate hacks for non-pure packets pdp_packet_new: LOCK 1. check reuse fifo 2. empty -> create packet+return (search array) 3. element -> check if type is correct, yes->pop+return, no->goto 1. UNLOCK 4. wakeup pdp_packet_mark_unused 1. check refcount. if > 1 dec + exit 2. if 1 put packet to sleep 3. dec refcount 4. add to reuse fifo (no fifo -> create) pdp_packet_delete: analogous to mark_unused pdp_packet_copy_ro/rw: analogous to new */ /* the pool */ #define PDP_INITIAL_POOL_SIZE 64 static int pdp_pool_size; static t_pdp** pdp_pool; /* mutex: protects the pool and reuse lists attached to symbols */ static pthread_mutex_t pdp_pool_mutex; #define LOCK pthread_mutex_lock (&pdp_pool_mutex) #define UNLOCK pthread_mutex_unlock (&pdp_pool_mutex) /* the list of classes */ static t_pdp_list *class_list; /* debug */ void pdp_packet_print_debug(int packet) { t_pdp *h = pdp_packet_header(packet); pdp_post("debug info for packet %d", packet); if (!h){ pdp_post("invalid packet"); } else{ pdp_post ("\ttype: %d", h->type); pdp_post ("\tdesc: %s", h->desc ? h->desc->s_name : "unknown"); pdp_post ("\tsize: %d", h->size); pdp_post ("\tflags: %x", h->flags); pdp_post ("\tusers: %d", h->users); pdp_post ("\tclass: %x", h->theclass); } } /* setup methods */ void pdp_packet_setup(void) { pdp_pool_size = PDP_INITIAL_POOL_SIZE; pdp_pool = (t_pdp **)pdp_alloc(PDP_INITIAL_POOL_SIZE * sizeof(t_pdp *)); bzero(pdp_pool, pdp_pool_size * sizeof(t_pdp *)); class_list = pdp_list_new(0); pthread_mutex_init(&pdp_pool_mutex, NULL); } /* class methods */ t_pdp_class *pdp_class_new(t_pdp_symbol *type, t_pdp_factory_method create){ t_pdp_class *c = (t_pdp_class *)pdp_alloc(sizeof(t_pdp_class)); memset(c, 0, sizeof(t_pdp_class)); c->create = create; c->type = type; // set type pdp_list_add(class_list, a_pointer, (t_pdp_word)((void *)c)); return c; } /* the packet factory */ int pdp_factory_newpacket(t_pdp_symbol *type) { int p; t_pdp_class *c; t_pdp_atom *a = class_list->first; /* try to reuse first THINK: should this be the responsability of the type specific constructors, or should a packet allways be reusable (solution: depends on what the cleanup method returns??) */ p = pdp_packet_reuse(type); if (-1 != p) return p; /* call class constructor */ while(a){ c = (t_pdp_class *)(a->w.w_pointer); if (c->type && pdp_type_description_match(type, c->type)){ //pdp_post("method %x, type %s", c->create, type->s_name); return (c->create) ? (*c->create)(type) : -1; } a = a->next; } return -1; } static void _pdp_pool_expand_nolock(void){ int i; /* double the size */ int new_pool_size = pdp_pool_size << 1; t_pdp **new_pool = (t_pdp **)pdp_alloc(new_pool_size * sizeof(t_pdp *)); bzero(new_pool, new_pool_size * sizeof(t_pdp *)); memcpy(new_pool, pdp_pool, pdp_pool_size * sizeof(t_pdp *)); pdp_dealloc(pdp_pool); pdp_pool = new_pool; pdp_pool_size = new_pool_size; } /* private _pdp_packet methods */ /* packets can only be created and destroyed using these 2 methods */ /* it updates the mem usage and total packet count */ static void _pdp_packet_dealloc_nolock(t_pdp *p) { /* free memory */ pdp_dealloc (p); } static t_pdp* _pdp_packet_alloc_nolock(unsigned int datatype, unsigned int datasize) { unsigned int totalsize = datasize + PDP_HEADER_SIZE; t_pdp *p = (t_pdp *)pdp_alloc(totalsize); if (p){ memset(p, 0, PDP_HEADER_SIZE); //initialize header to 0 p->type = datatype; p->size = totalsize; p->users = 1; } return p; } /* create a new packet and expand pool if necessary */ static int _pdp_packet_create_nolock(unsigned int datatype, unsigned int datasize) { int p = 0; while(1){ for (; p < pdp_pool_size; p++){ if (!pdp_pool[p]){ /* found slot to store packet*/ t_pdp *header = _pdp_packet_alloc_nolock(datatype, datasize); if (!header) return -1; // error allocating packet pdp_pool[p] = header; return p; } } /* no slot found, expand pool */ _pdp_pool_expand_nolock(); } } void pdp_packet_destroy(void) { int i = 0; /* dealloc all the data in object stack */ pdp_post("DEBUG: pdp_packet_destroy: clearing object pool."); while ((i < pdp_pool_size) && (pdp_pool[i])) _pdp_packet_dealloc_nolock(pdp_pool[i++]); } /* public pool operations: have to be thread safe so each entry point locks the mutex */ /* create a new packet. this should only be used by type specific factory methods, and only if the reuse method fails, since it will always create a new packet */ int pdp_packet_create(unsigned int datatype, unsigned int datasize /*without header*/) { int packet; LOCK; packet = _pdp_packet_create_nolock(datatype, datasize); UNLOCK; return packet; } /* return a new packet. it tries to reuse a packet based on 1. matching data size 2. abscence of destructor (which SHOULD mean there are no enclosed references) it obviously can't use the reuse fifo tagged to a symbolic type description ALWAYS USE pdp_packet_reuse BEFORE calling pdp_packet_new if possible use both ONLY IN CONSTRUCTORS !!! use pdp_packet_factory to create packets as a "user" this is a summary of all internal packet creation mechanisms: -> pdp_packet_reuse, which uses symbolic type descriptions, and should work for all packet types it returns an initialized container (meta = correct, data = garbage) -> pdp_packet_new, which only works for non-pure packets, and reuses packets based on data type it returns a pure packet (meta + data = garbage) -> pdp_packet_create, like pdp_packet_new, only it always creates a new packet */ int pdp_packet_new(unsigned int datatype, unsigned int datasize) { t_pdp *header; int packet; LOCK; for (packet = 0; packet < pdp_pool_size; packet++){ header = pdp_pool[packet]; /* check data size */ if (header && header->users == 0 // must be unused && header->size == datasize + PDP_HEADER_SIZE // must be same size && !(header->theclass && header->theclass->cleanup)){ // must be pure packet (no destructor) /* ok, got one. initialize */ memset(header, 0, PDP_HEADER_SIZE); header->users = 1; header->type = datatype; header->size = datasize + PDP_HEADER_SIZE; UNLOCK; //EXIT1 return packet; } } /* no usable non-pure packet found, create a new one */ UNLOCK; //EXIT2 return pdp_packet_create(datatype, datasize); } /* internal method to add a packet to a packet type description symbol's unused packet fifo */ void _pdp_packet_save_nolock(int packet) { t_pdp *header = pdp_packet_header(packet); t_pdp_symbol *s; PDP_ASSERT(header); PDP_ASSERT(header->users == 0); PDP_ASSERT(header->desc); s = header->desc; if (!s->s_reusefifo) s->s_reusefifo = pdp_list_new(0); pdp_list_add(s->s_reusefifo, a_packet, (t_pdp_word)packet); } /* this will revive a packet matching a certain type description no wildcards are allowed */ int pdp_packet_reuse(t_pdp_symbol *type_description) { int packet = -1; t_pdp *header = 0; t_pdp_list *l = 0; LOCK; if (!type_description || !(l = type_description->s_reusefifo)) goto exit; while(l->elements){ packet = pdp_list_pop(l).w_packet; header = pdp_packet_header(packet); /* check if reuse fifo is consistent (packet unused + correct type) packet could be deleted and replaced with another one, or revived without the index updated (it's a "hint cache") */ if (header->users == 0){ /* check if type matches */ if (pdp_type_description_match(header->desc, type_description)){ header->users++; // revive goto exit; } /* if not, add the packet to the correct reuse fifo */ else{ _pdp_packet_save_nolock(packet); } } /* remove dangling refs */ header = 0; packet = -1; } exit: UNLOCK; if (header && header->theclass && header->theclass->wakeup){ header->theclass->wakeup(header); // revive if necessary } return packet; } /* find all unused packets in pool, marked as used (to protect from other reapers) and return them as a list. non-pure packets are not revived */ /* this returns a copy of a packet for read only access. (increases refcount of the packet -> packet will become readonly if it was writable, i.e. had rc=1 */ int pdp_packet_copy_ro(int handle) { t_pdp* header; if (header = pdp_packet_header(handle)){ PDP_ASSERT(header->users); // consistency check LOCK; header->users++; // increment reference count UNLOCK; } else handle = -1; return handle; } /* clone a packet: create a new packet with the same type as the source packet */ int pdp_packet_clone_rw(int handle) { t_pdp* header; int new_handle = -1; if (header = pdp_packet_header(handle)){ /* consistency checks */ PDP_ASSERT(header->users); PDP_ASSERT(header->desc); /* first try to reuse old packet */ new_handle = pdp_packet_reuse(header->desc); /* if this failed, create a new one using the central packet factory method */ if (-1 == new_handle) new_handle = pdp_factory_newpacket(header->desc); /* if the factory method failed cline it manually */ if (-1 == new_handle) { t_pdp *new_header; //pdp_post("WARNING: pdp_clone_rw: working around non-implemented factory method."); new_handle = pdp_packet_new(header->type, header->size - PDP_HEADER_SIZE); new_header = pdp_packet_header(new_handle); if (new_header){ memcpy(new_header, header, PDP_HEADER_SIZE); } } } return new_handle; } /* return a copy of a packet (clone + copy data) */ int pdp_packet_copy_rw(int handle) { t_pdp *header, *new_header; int new_handle = -1; if (!(header = pdp_packet_header(handle))) return -1; /* check if we are allowed to copy */ if (header->flags & PDP_FLAG_DONOTCOPY) return -1; /* get target packet */ new_handle = pdp_packet_clone_rw(handle); if (-1 == new_handle) return -1; new_header = pdp_packet_header(new_handle); /* if there is a copy method, use that one */ if (header->theclass && header->theclass->copy){ header->theclass->copy(header, new_header); } /* otherwize copy the data verbatim */ else { memcpy(pdp_packet_data(new_handle), pdp_packet_data(handle), pdp_packet_data_size(handle)); } return new_handle; } /* decrement refcount */ void pdp_packet_mark_unused(int handle) { t_pdp *header; if (!(header = pdp_packet_header(handle))) return; PDP_ASSERT(header->users); // consistency check LOCK; /* just decrement refcount */ if (header->users > 1){ header->users--; } /* put packet to sleep if refcount 1->0 */ else { if (header->theclass && header->theclass->sleep){ /* call sleep method (if any) outside of lock while the packet is still alive, so it won't be acclaimed by another thread */ UNLOCK; header->theclass->sleep(header); LOCK; } /* clear refcount & save in fifo for later use */ header->users = 0; if (header->desc) // sleep could have destructed packet.. _pdp_packet_save_nolock(handle); } UNLOCK; } /* delete a packet. rc needs to be == 1 */ void pdp_packet_delete(int handle) { t_pdp *header; header = pdp_packet_header(handle); PDP_ASSERT(header); PDP_ASSERT(header->users == 1); // consistency check LOCK; if (header->theclass && header->theclass->cleanup){ /* call cleanup method (if any) outside of lock while the packet is still alive, so it won't be acclaimed by another thread */ UNLOCK; header->theclass->cleanup(header); LOCK; } /* delete the packet */ pdp_pool[handle] = 0; _pdp_packet_dealloc_nolock(header); UNLOCK; } /* public data access methods */ t_pdp* pdp_packet_header(int handle) { if ((handle >= 0) && (handle < pdp_pool_size)) return pdp_pool[handle]; else return 0; } void* pdp_packet_subheader(int handle) { t_pdp* header = pdp_packet_header(handle); if (!header) return 0; return (void *)(&header->info.raw); } void* pdp_packet_data(int handle) { t_pdp *h; if ((handle >= 0) && (handle < pdp_pool_size)) { h = pdp_pool[handle]; if (!h) return 0; return (char *)(h) + PDP_HEADER_SIZE; } else return 0; } int pdp_packet_data_size(int handle) { t_pdp *h; if ((handle >= 0) && (handle < pdp_pool_size)) { h = pdp_pool[handle]; if (!h) return 0; return h->size - PDP_HEADER_SIZE; } else return 0; } int pdp_packet_writable(int packet) /* returns true if packet is writable */ { t_pdp *h = pdp_packet_header(packet); if (!h) return 0; return (h->users == 1); } void pdp_packet_replace_with_writable(int *packet) /* replaces a packet with a writable copy */ { int new_p; if (!pdp_packet_writable(*packet)){ new_p = pdp_packet_copy_rw(*packet); pdp_packet_mark_unused(*packet); *packet = new_p; } } /* pool stuff */ int pdp_pool_collect_garbage(void) { pdp_post("ERROR: garbage collector not implemented"); return 0; } void pdp_pool_set_max_mem_usage(int max) { pdp_post("ERROR: mem limit not implemented"); } #ifdef __cplusplus } #endif --- NEW FILE: Makefile --- OBJECTS = pdp_packet.o pdp_type.o pdp_dpd_command.o \ pdp_list.o pdp_debug.o pdp_symbol.o \ pdp_mem.o pdp_post.o include ../../Makefile.config all: pdp_main_clean $(OBJECTS) pdp_main_clean: rm -f pdp.o clean: rm -f *~ rm -f *.o --- NEW FILE: pdp_debug.c --- #include <sys/types.h> #include <signal.h> #include <unistd.h> #include "pdp_post.h" int pdp_debug_sigtrap_on_assert; void pdp_assert_hook (char *condition, char *file, int line) { pdp_post("PDP_ASSERT (%s) failed in file %s, line %u. ", condition, file, line); pdp_post("%s.\n", pdp_debug_sigtrap_on_assert ? "sending SIGTRAP" : "continuing"); if (pdp_debug_sigtrap_on_assert) kill(getpid(), SIGTRAP); } void pdp_debug_setup(void) { pdp_debug_sigtrap_on_assert = 1; } --- NEW FILE: pdp_type.c --- /* * Pure Data Packet system implementation. : code for handling different packet types * Copyright (c) by Tom Schouten <pdp(a)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. * */ /* this file contains type handling routines */ #include <stdarg.h> #include <string.h> #include <pthread.h> #include "pdp_list.h" #include "pdp_symbol.h" #include "pdp_packet.h" #include "pdp_post.h" #include "pdp_type.h" #include "pdp_mem.h" #include "pdp_debug.h" // debug #define D if (0) static t_pdp_list *conversion_list; #define INIT_MAX_CACHE_SIZE 32 static t_pdp_list *cached_conversion_list; static int max_cache_size; /* mutex */ static pthread_mutex_t pdp_conversion_mutex; static pthread_mutex_t pdp_cache_mutex; /* convert a type to a list */ t_pdp_list *pdp_type_to_list(t_pdp_symbol *type) { #define TMPSIZE 1024 char *c = type->s_name; char *lastname = c; int n = 0; char tmp[strlen(type->s_name)+1]; t_pdp_list *l = pdp_list_new(0); while(*c){ if (*c == '/'){ strncpy(tmp, lastname, n); tmp[n] = 0; pdp_list_add_back(l, a_symbol, (t_pdp_word)pdp_gensym(tmp)); c++; lastname = c; n = 0; } else{ c++; n++; PDP_ASSERT(n < TMPSIZE); } } pdp_list_add_back(l, a_symbol, (t_pdp_word)pdp_gensym(lastname)); return l; } /* get the description symbol. */ t_pdp_symbol *pdp_packet_get_description(int packet) { t_pdp *header = pdp_packet_header(packet); if (!header) return pdp_gensym("invalid"); else if (!header->desc){ /* since every packet is obliged to have a description, this is an error */ pdp_post("ERROR: pdp_packet_get_description: packet %d has no description.", packet); pdp_packet_print_debug(packet); return pdp_gensym("unknown"); } else return header->desc; } /* this runs a conversion program */ int _pdp_type_run_conversion_program(t_pdp_conversion_program *program, int packet, t_pdp_symbol *dest_template) { /* run a conversion program: treat the source packet as readonly, and cleanup intermediates, such that the net result is the production of a new packet, with the source packet intact. */ int p, tmp; t_pdp_atom *a; t_pdp_conversion_method m; // run the first line of the program a = program->first; m = a->w.w_pointer; D pdp_post("DEBUG: _pdp_type_run_conversion_program: method = %x", m); p = m(packet, dest_template); D pdp_post("DEBUG: _pdp_type_run_conversion_program:"); D pdp_post(" packet returned = %d, type = %s", p, pdp_packet_get_description(p)->s_name); // run the remaining lines + cleanup intermediates for (a=a->next; a; a=a->next){ m = a->w.w_pointer; D pdp_post("DEBUG: _pdp_type_run_conversion_program: next method ptr = %x", m); tmp = m(p, dest_template); pdp_packet_mark_unused(p); p = tmp; } return p; } /* find a conversion program */ t_pdp_conversion_program * _pdp_type_find_conversion_program(t_pdp_symbol *src_pattern, t_pdp_symbol *dst_pattern) { t_pdp_conversion *c; t_pdp_atom *a; t_pdp_conversion_program *retval = 0; /* lock conversion list */ pthread_mutex_lock(&pdp_conversion_mutex); for (a = conversion_list->first; a; a=a->next){ c = a->w.w_pointer; /* can be a wildcard match */ if (pdp_type_description_match(src_pattern, c->src_pattern) && pdp_type_description_match(dst_pattern, c->dst_pattern)) { /* found a program */ D pdp_post("DEBUG: _pdp_type_find_conversion_program: found: %s -> %s", c->src_pattern->s_name, c->dst_pattern->s_name); retval = c->program; goto gotit; } } /* no conversion program was found */ retval = 0; gotit: /* lock conversion list */ pthread_mutex_unlock(&pdp_conversion_mutex); return retval; } /* find a cached conversion program if one is found it will be moved to the back of the queue (MRU) */ t_pdp_conversion_program * _pdp_type_find_cached_conversion_program(t_pdp_symbol *src_pattern, t_pdp_symbol *dst_pattern) { t_pdp_conversion *c, *c_tmp; t_pdp_atom *a; t_pdp_conversion_program *retval = 0; /* lock cached list */ pthread_mutex_lock(&pdp_cache_mutex); for (a = cached_conversion_list->first; a; a=a->next){ c = a->w.w_pointer; /* must be exact match */ if ((src_pattern == c->src_pattern) && (dst_pattern == c->dst_pattern)) { /* found a program */ D pdp_post("DEBUG: _pdp_type_find_cached_conversion_program: found: %s -> %s", c->src_pattern->s_name, c->dst_pattern->s_name); retval = c->program; /* make MRU (move to back) */ c_tmp = cached_conversion_list->last->w.w_pointer; cached_conversion_list->last->w.w_pointer = c; a->w.w_pointer = c_tmp; goto gotit; } } retval = 0; gotit: /* un lock cached list */ pthread_mutex_unlock(&pdp_cache_mutex); /* no conversion program was found */ return retval; } /* conversion program manipulations */ void pdp_conversion_program_free(t_pdp_conversion_program *program) { pdp_list_free(program); } /* debug print */ void _pdp_conversion_program_print(t_pdp_conversion_program *program) { D pdp_post("_pdp_conversion_program_print %x", program); pdp_list_print(program); } t_pdp_conversion_program *pdp_conversion_program_new(t_pdp_conversion_method method, ...) { t_pdp_conversion_program *p = pdp_list_new(0); t_pdp_conversion_method m = method; va_list ap; D pdp_post("DEBUG: pdp_conversion_program_new:BEGIN"); pdp_list_add_back_pointer(p, m); va_start(ap, method); while (m = va_arg(ap, t_pdp_conversion_method)) pdp_list_add_back_pointer(p, m); va_end(ap); D pdp_post("DEBUG: pdp_conversion_program_new:END"); return p; } t_pdp_conversion_program *pdp_conversion_program_copy(t_pdp_conversion_program *program) { if (program) return pdp_list_copy(program); else return 0; } void pdp_conversion_program_add(t_pdp_conversion_program *program, t_pdp_conversion_program *tail) { return pdp_list_cat(program, tail); } /* conversion registration */ void pdp_type_register_conversion (t_pdp_symbol *src_pattern, t_pdp_symbol *dst_pattern, t_pdp_conversion_program *program) { t_pdp_conversion *c = (t_pdp_conversion *)pdp_alloc(sizeof(*c)); c->src_pattern = src_pattern; c->dst_pattern = dst_pattern; c->program = program; /* lock conversion list */ pthread_mutex_lock(&pdp_conversion_mutex); pdp_list_add_back_pointer(conversion_list, c); /* unlock conversion list */ pthread_mutex_unlock(&pdp_conversion_mutex); } /* register a cached conversion */ void pdp_type_register_cached_conversion (t_pdp_symbol *src_pattern, t_pdp_symbol *dst_pattern, t_pdp_conversion_program *program) { /* create the new conversion */ t_pdp_conversion *c = (t_pdp_conversion *)pdp_alloc(sizeof(*c)); c->src_pattern = src_pattern; c->dst_pattern = dst_pattern; c->program = program; /* lock cached conversion list */ pthread_mutex_lock(&pdp_cache_mutex); /* check size, and remove LRU (top) if the cache is full */ while (cached_conversion_list->elements >= max_cache_size){ t_pdp_conversion *c_old = pdp_list_pop(cached_conversion_list).w_pointer; if (c_old->program) pdp_conversion_program_free(c_old->program); pdp_dealloc(c_old); } /* add and make MRU (back) */ pdp_list_add_back_pointer(cached_conversion_list, c); /* unlock cached conversion list */ pthread_mutex_unlock(&pdp_cache_mutex); } /* convert a given packet to a certain type (template) */ int _pdp_packet_convert(int packet, t_pdp_symbol *dest_template) { t_pdp_symbol *type = pdp_packet_get_description(packet); t_pdp_symbol *tmp_type = 0; int tmp_packet = -1; t_pdp_conversion_program *program = 0; t_pdp_conversion_program *program_last = 0; t_pdp_conversion_program *program_tail = 0; /* check if there is a program in the cached list, if so run it */ if (program = _pdp_type_find_cached_conversion_program(type, dest_template)) return _pdp_type_run_conversion_program(program, packet, dest_template); /* if it is not cached, iteratively convert and save program on top of cache list if a conversion path (program) was found */ // run first conversion that matches program = pdp_conversion_program_copy (_pdp_type_find_conversion_program(type, dest_template)); program_last = program; if (!program){ D pdp_post("DEBUG: pdp_type_convert: (1) can't convert %s to %s", type->s_name, dest_template->s_name); return -1; } tmp_packet = _pdp_type_run_conversion_program(program, packet, dest_template); tmp_type = pdp_packet_get_description(tmp_packet); // run more conversions if necessary, deleting intermediate packets while (!pdp_type_description_match(tmp_type, dest_template)){ int new_packet; program_tail = _pdp_type_find_conversion_program(tmp_type, dest_template); if (!program_tail){ D pdp_post("DEBUG: pdp_type_convert: (2) can't convert %s to %s", tmp_type->s_name, dest_template->s_name); pdp_packet_mark_unused(tmp_packet); pdp_conversion_program_free(program); return -1; } if (program_last == program_tail){ pdp_post("ERROR: pdp_packet_convert: conversion loop detected"); } program_last = program_tail; pdp_conversion_program_add(program, program_tail); new_packet = _pdp_type_run_conversion_program(program_tail, tmp_packet, dest_template); pdp_packet_mark_unused(tmp_packet); tmp_packet = new_packet; tmp_type = pdp_packet_get_description(tmp_packet); } // save the conversion program in the cache pdp_type_register_cached_conversion(type, dest_template, program); // return resulting packet return tmp_packet; } /* convert or copy ro */ int pdp_packet_convert_ro(int packet, t_pdp_symbol *dest_template) { t_pdp_symbol *type = pdp_packet_get_description(packet); /* if it is compatible, return a ro copy */ if (pdp_type_description_match(type, dest_template)) return pdp_packet_copy_ro(packet); /* if not, convert to a new type */ else return _pdp_packet_convert(packet, dest_template); } /* convert or copy rw */ int pdp_packet_convert_rw(int packet, t_pdp_symbol *dest_template) { t_pdp_symbol *type = pdp_packet_get_description(packet); /* if it is compatible, just return a rw copy */ if (pdp_type_description_match(type, dest_template)) return pdp_packet_copy_rw(packet); /* if not, convert to a new type */ else return _pdp_packet_convert(packet, dest_template); } /* this is a hack. type cache data: (a type description parsed into a pdp_list for fast comparison) should be setup when a packet symbol is created, but since that can be everywhere, we set it up on first use. type cache is permanent. */ static void _setup_type_cache(t_pdp_symbol *s) { t_pdp_list *l = pdp_type_to_list(s); if (!pdp_symbol_set_typelist(s, l)) pdp_list_free(l); // list was already present -> free cached list } /* check if a type description fits a template this function is symmetric */ int pdp_type_description_match(t_pdp_symbol *description, t_pdp_symbol *pattern) { int match = 0; // no match until all tests are passed t_pdp_atom *ad, *ap; t_pdp_symbol *wildcard = PDP_SYM_WILDCARD; PDP_ASSERT(pattern); PDP_ASSERT(description); /* same type symbol -> match */ if (description == pattern) {match = 1; goto done;} /* check the description list */ if (!(description->s_type)) _setup_type_cache(description); if (!(pattern->s_type)) _setup_type_cache(pattern); /* compare symbols of description list */ for(ad=description->s_type->first, ap=pattern->s_type->first; ad && ap; ad=ad->next, ap=ap->next) { if (ad->w.w_symbol == wildcard) continue; if (ap->w.w_symbol == wildcard) continue; if (ad->w.w_symbol != ap->w.w_symbol) {goto done;} /* difference and not a wildcard */ } /* ok if sizes are equal */ if (! (ad || ap)) {match = 1; goto done;} /* one of the two is shorter, so the shortest list needs to end with a wildcard to have a match */ if (ap && description->s_type->last->w.w_symbol != wildcard) goto done; if (ad && pattern->s_type->last->w.w_symbol != wildcard) goto done; /* all tests passed: type templates match */ match = 1; done: D pdp_post("DEBUG: testing match between %s and %s: %s", description->s_name, pattern->s_name, match ? "match" : "no match"); return match; } /* setup method */ void pdp_type_setup(void) { int i; // create mutexes pthread_mutex_init(&pdp_conversion_mutex, NULL); pthread_mutex_init(&pdp_cache_mutex, NULL); // create conversion lists cached_conversion_list = pdp_list_new(0); conversion_list = pdp_list_new(0); max_cache_size = INIT_MAX_CACHE_SIZE; } --- NEW FILE: CONTENTS --- debug debug stuff forth the forth system list the list implementation mem memory allocation stuf packet the packet memory manager type the type handling and conversion system symbol symbol implementation, with namespaces for forth, types, classes, ... --- NEW FILE: pdp_symbol.c --- /* * Pure Data Packet system implementation. : code implementing pdp's namespace (symbols) * Copyright (c) by Tom Schouten <pdp(a)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 <string.h> #include <pthread.h> #include "pdp_symbol.h" #include "pdp_list.h" #include "pdp_debug.h" // some extra prototypes void *pdp_alloc(int size); void pdp_dealloc(void *data); // the symbol hash mutex static pthread_mutex_t pdp_hash_mutex; #define HASHSIZE 1024 static t_pdp_symbol *pdp_symhash[HASHSIZE]; #define LOCK pthread_mutex_lock(&pdp_hash_mutex) #define UNLOCK pthread_mutex_unlock(&pdp_hash_mutex) static void _pdp_symbol_init(t_pdp_symbol *s) { memset(s, 0, sizeof(*s)); s->s_forth.t = a_undef; } /* shamelessly copied from pd src and made thread safe */ t_pdp_symbol *_pdp_dogensym(char *s, t_pdp_symbol *oldsym) { t_pdp_symbol **sym1, *sym2; unsigned int hash1 = 0, hash2 = 0; int length = 0; char *s2 = s; while (*s2) { hash1 += *s2; hash2 += hash1; length++; s2++; } sym1 = pdp_symhash + (hash2 & (HASHSIZE-1)); /* lock hash */ LOCK; while (sym2 = *sym1) { if (!strcmp(sym2->s_name, s)) goto gotit; sym1 = &sym2->s_next; } if (oldsym){ sym2 = oldsym; } else { sym2 = (t_pdp_symbol *)pdp_alloc(sizeof(*sym2)); _pdp_symbol_init(sym2); sym2->s_name = pdp_alloc(length+1); sym2->s_next = 0; strcpy(sym2->s_name, s); } *sym1 = sym2; gotit: /* unlock hash */ UNLOCK; return (sym2); } t_pdp_symbol *pdp_gensym(char *s) { return(_pdp_dogensym(s, 0)); } /* connect a parsed typelist to a symbol type name 1 = succes, 0 = error (symbol already connected) */ int pdp_symbol_set_typelist(t_pdp_symbol *s, t_pdp_list *typelist) { int status = 0; LOCK; if (!s->s_type){ s->s_type = typelist; status = 1; } UNLOCK; return status; } void pdp_symbol_apply_all(t_pdp_symbol_iterator it) { int i; for (i=0; i<HASHSIZE; i++){ t_pdp_symbol *s; for (s = pdp_symhash[i]; s; s=s->s_next){ it(s); } } } t_pdp_symbol _pdp_sym_wildcard; t_pdp_symbol _pdp_sym_float; t_pdp_symbol _pdp_sym_int; t_pdp_symbol _pdp_sym_symbol; t_pdp_symbol _pdp_sym_packet; t_pdp_symbol _pdp_sym_pointer; t_pdp_symbol _pdp_sym_invalid; t_pdp_symbol _pdp_sym_list; t_pdp_symbol _pdp_sym_question_mark; t_pdp_symbol _pdp_sym_atom; t_pdp_symbol _pdp_sym_null; t_pdp_symbol _pdp_sym_quote_start; t_pdp_symbol _pdp_sym_quote_end; t_pdp_symbol _pdp_sym_return; t_pdp_symbol _pdp_sym_nreturn; t_pdp_symbol _pdp_sym_defstart; t_pdp_symbol _pdp_sym_defend; t_pdp_symbol _pdp_sym_if; t_pdp_symbol _pdp_sym_then; t_pdp_symbol _pdp_sym_local; t_pdp_symbol _pdp_sym_forth; t_pdp_symbol _pdp_sym_call; t_pdp_symbol _pdp_sym_push; t_pdp_symbol _pdp_sym_pop; static void _sym(char *name, t_pdp_symbol *s) { t_pdp_symbol *realsym; _pdp_symbol_init(s); s->s_name = name; realsym = _pdp_dogensym(name, s); PDP_ASSERT(realsym == s); // if this fails, the symbol was already defined } void pdp_symbol_setup(void) { // create mutexes pthread_mutex_init(&pdp_hash_mutex, NULL); // init symbol hash memset(pdp_symhash, 0, HASHSIZE * sizeof(t_pdp_symbol *)); // setup predefined symbols (those that have direct pointer access for speedup) _sym("*", &_pdp_sym_wildcard); _sym("float", &_pdp_sym_float); _sym("int", &_pdp_sym_int); _sym("symbol", &_pdp_sym_symbol); _sym("packet", &_pdp_sym_packet); _sym("pointer", &_pdp_sym_pointer); _sym("invalid", &_pdp_sym_invalid); _sym("list", &_pdp_sym_list); _sym("?", &_pdp_sym_question_mark); _sym("atom", &_pdp_sym_atom); _sym("null", &_pdp_sym_null); _sym("[", &_pdp_sym_quote_start); _sym("]", &_pdp_sym_quote_end); _sym("ret", &_pdp_sym_return); _sym("nret", &_pdp_sym_nreturn); _sym(":", &_pdp_sym_defstart); _sym(";", &_pdp_sym_defend); _sym("if", &_pdp_sym_if); _sym("then", &_pdp_sym_then); _sym("local", &_pdp_sym_local); _sym("forth", &_pdp_sym_forth); _sym("call", &_pdp_sym_call); _sym("push", &_pdp_sym_push); _sym("pop", &_pdp_sym_pop); } --- NEW FILE: pdp_mem.c --- /* * Pure Data Packet system file: memory allocation * Copyright (c) by Tom Schouten <pdp(a)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 <stdlib.h> #include "pdp_mem.h" #include "pdp_debug.h" /* malloc wrapper that calls garbage collector */ void *pdp_alloc(int size) { void *ptr = malloc(size); PDP_ASSERT(ptr); return ptr; //TODO: REPAIR THIS //post ("malloc failed in a pdp module: running garbage collector."); //pdp_pool_collect_garbage(); //return malloc(size); } void pdp_dealloc(void *stuff) { free (stuff); } /* fast atom allocation object well, this is not too fast yet, but will be later when it suports linux futexes or atomic operations */ //#include <pthread.h> /* private linked list struct */ typedef struct _fastalloc { struct _fastalloc * next; } t_fastalloc; static void _pdp_fastalloc_lock(t_pdp_fastalloc *x){pthread_mutex_lock(&x->mut);} static void _pdp_fastalloc_unlock(t_pdp_fastalloc *x){pthread_mutex_unlock(&x->mut);} static void _pdp_fastalloc_refill_freelist(t_pdp_fastalloc *x) { t_fastalloc *atom; unsigned int i; PDP_ASSERT(x->freelist == 0); /* get a new block there is no means of freeing the data afterwards, this is a fast implementation with the tradeoff of data fragmentation "memory leaks".. */ x->freelist = pdp_alloc(x->block_elements * x->atom_size); /* link all atoms together */ atom = x->freelist; for (i=0; i<x->block_elements-1; i++){ atom->next = (t_fastalloc *)(((char *)atom) + x->atom_size); atom = atom->next; } atom->next = 0; } void *pdp_fastalloc_new_atom(t_pdp_fastalloc *x) { t_fastalloc *atom; _pdp_fastalloc_lock(x); /* get an atom from the freelist or refill it and try again */ while (!(atom = x->freelist)){ _pdp_fastalloc_refill_freelist(x); } /* delete the element from the freelist */ x->freelist = x->freelist->next; atom->next = 0; _pdp_fastalloc_unlock(x); return (void *)atom; } void pdp_fastalloc_save_atom(t_pdp_fastalloc *x, void *atom) { _pdp_fastalloc_lock(x); ((t_fastalloc *)atom)->next = x->freelist; x->freelist = (t_fastalloc *)atom; _pdp_fastalloc_unlock(x); } t_pdp_fastalloc *pdp_fastalloc_new(unsigned int size) { t_pdp_fastalloc *x = pdp_alloc(sizeof(*x)); if (size < sizeof(t_fastalloc)) size = sizeof(t_fastalloc); x->freelist = 0; x->atom_size = size; x->block_elements = PDP_FASTALLOC_BLOCK_ELEMENTS; pthread_mutex_init(&x->mut, NULL); return x; } --- NEW FILE: pdp_packet2.c --- /* * Pure Data Packet system implementation: Packet Manager * Copyright (c) by Tom Schouten <pdp(a)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 <pthread.h> #include <unistd.h> #include <string.h> #include "pdp_post.h" #include "pdp_packet.h" #include "pdp_mem.h" #include "pdp_list.h" #include "pdp_type.h" #include "pdp_debug.h" /* packet implementation. contains class and packet (instance) handling some notes on packet operations. copy ro/rw and unregister are relatively straightforward packet creation can be done in 2 ways in this interface: create + reuse however, these methods should only be called by specific factory methods, so the user should only create packets using pdp_factory_newpacket reuse or create is thus the responsability of the factory methods for each packet type (class) implementation */ /* NOTE: the packet pool methods are called within the pool locks. this probably needs to change, because it will cause deadlocks for container packets (fobs) */ /* new implementation: probably just a minor adjustment: add the reuse fifo attached to type desc symbol name need to check and possibly eliminate hacks for non-pure packets pdp_packet_new: LOCK 1. check reuse fifo 2. empty -> create packet+return (search array) 3. element -> check if type is correct, yes->pop+return, no->goto 1. UNLOCK 4. wakeup pdp_packet_mark_unused 1. check refcount. if > 1 dec + exit 2. if 1 put packet to sleep 3. dec refcount 4. add to reuse fifo (no fifo -> create) pdp_packet_delete: analogous to mark_unused pdp_packet_copy_ro/rw: analogous to new */ /* the pool */ #define PDP_INITIAL_POOL_SIZE 64 static int pdp_pool_size; static t_pdp** pdp_pool; /* mutex: protects the pool and reuse lists attached to symbols */ static pthread_mutex_t pdp_pool_mutex; #define LOCK pthread_mutex_lock (&pdp_pool_mutex) #define UNLOCK pthread_mutex_unlock (&pdp_pool_mutex) /* the list of classes */ static t_pdp_list *class_list; /* debug */ void pdp_packet_print_debug(int packet) { t_pdp *h = pdp_packet_header(packet); pdp_post("debug info for packet %d", packet); if (!h){ pdp_post("invalid packet"); } else{ pdp_post ("\ttype: %d", h->type); pdp_post ("\tdesc: %s", h->desc ? h->desc->s_name : "unknown"); pdp_post ("\tsize: %d", h->size); pdp_post ("\tflags: %x", h->flags); pdp_post ("\tusers: %d", h->users); pdp_post ("\tclass: %x", h->theclass); } } /* setup methods */ void pdp_packet_setup(void) { pdp_pool_size = PDP_INITIAL_POOL_SIZE; pdp_pool = (t_pdp **)pdp_alloc(PDP_INITIAL_POOL_SIZE * sizeof(t_pdp *)); bzero(pdp_pool, pdp_pool_size * sizeof(t_pdp *)); class_list = pdp_list_new(0); pthread_mutex_init(&pdp_pool_mutex, NULL); } /* class methods */ t_pdp_class *pdp_class_new(t_pdp_symbol *type, t_pdp_factory_method create){ t_pdp_class *c = (t_pdp_class *)pdp_alloc(sizeof(t_pdp_class)); memset(c, 0, sizeof(t_pdp_class)); c->create = create; c->type = type; // set type pdp_list_add(class_list, a_pointer, (t_pdp_word)((void *)c)); return c; } /* the packet factory */ int pdp_factory_newpacket(t_pdp_symbol *type) { int p; t_pdp_class *c; t_pdp_atom *a = class_list->first; /* try to reuse first THINK: should this be the responsability of the type specific constructors, or should a packet allways be reusable (solution: depends on what the cleanup method returns??) */ p = pdp_packet_reuse(type); if (-1 != p) return p; /* call class constructor */ while(a){ c = (t_pdp_class *)(a->w.w_pointer); if (c->type && pdp_type_description_match(type, c->type)){ //pdp_post("method %x, type %s", c->create, type->s_name); return (c->create) ? (*c->create)(type) : -1; } a = a->next; } return -1; } static void _pdp_pool_expand_nolock(void){ int i; /* double the size */ int new_pool_size = pdp_pool_size << 1; t_pdp **new_pool = (t_pdp **)pdp_alloc(new_pool_size * sizeof(t_pdp *)); bzero(new_pool, new_pool_size * sizeof(t_pdp *)); memcpy(new_pool, pdp_pool, pdp_pool_size * sizeof(t_pdp *)); pdp_dealloc(pdp_pool); pdp_pool = new_pool; pdp_pool_size = new_pool_size; } /* private _pdp_packet methods */ /* packets can only be created and destroyed using these 2 methods */ /* it updates the mem usage and total packet count */ static void _pdp_packet_dealloc_nolock(t_pdp *p) { /* free memory */ pdp_dealloc (p); } static t_pdp* _pdp_packet_alloc_nolock(unsigned int datatype, unsigned int datasize) { unsigned int totalsize = datasize + PDP_HEADER_SIZE; t_pdp *p = (t_pdp *)pdp_alloc(totalsize); if (p){ memset(p, 0, PDP_HEADER_SIZE); //initialize header to 0 p->type = datatype; p->size = totalsize; p->users = 1; } return p; } /* create a new packet and expand pool if necessary */ static int _pdp_packet_create_nolock(unsigned int datatype, unsigned int datasize) { int p = 0; while(1){ for (; p < pdp_pool_size; p++){ if (!pdp_pool[p]){ /* found slot to store packet*/ t_pdp *header = _pdp_packet_alloc_nolock(datatype, datasize); if (!header) return -1; // error allocating packet pdp_pool[p] = header; return p; } } /* no slot found, expand pool */ _pdp_pool_expand_nolock(); } } void pdp_packet_destroy(void) { int i = 0; /* dealloc all the data in object stack */ pdp_post("DEBUG: pdp_packet_destroy: clearing object pool."); while ((i < pdp_pool_size) && (pdp_pool[i])) _pdp_packet_dealloc_nolock(pdp_pool[i++]); } /* public pool operations: have to be thread safe so each entry point locks the mutex */ /* create a new packet. this should only be used by type specific factory methods, and only if the reuse method fails, since it will always create a new packet */ int pdp_packet_create(unsigned int datatype, unsigned int datasize /*without header*/) { int packet; LOCK; packet = _pdp_packet_create_nolock(datatype, datasize); UNLOCK; return packet; } /* return a new packet. it tries to reuse a packet based on 1. matching data size 2. abscence of destructor (which SHOULD mean there are no enclosed references) it obviously can't use the reuse fifo tagged to a symbolic type description ALWAYS USE pdp_packet_reuse BEFORE calling pdp_packet_new if possible use both ONLY IN CONSTRUCTORS !!! use pdp_packet_factory to create packets as a "user" this is a summary of all internal packet creation mechanisms: -> pdp_packet_reuse, which uses symbolic type descriptions, and should work for all packet types it returns an initialized container (meta = correct, data = garbage) -> pdp_packet_new, which only works for non-pure packets, and reuses packets based on data type it returns a pure packet (meta + data = garbage) -> pdp_packet_create, like pdp_packet_new, only it always creates a new packet */ int pdp_packet_new(unsigned int datatype, unsigned int datasize) { t_pdp *header; int packet; LOCK; for (packet = 0; packet < pdp_pool_size; packet++){ header = pdp_pool[packet]; /* check data size */ if (header && header->users == 0 && header->size == datasize + PDP_HEADER_SIZE && !(header->theclass && header->theclass->cleanup)){ /* ok, got one. initialize */ memset(header, 0, PDP_HEADER_SIZE); header->users = 1; header->type = datatype; header->size = datasize + PDP_HEADER_SIZE; UNLOCK; //EXIT1 return packet; } } /* no usable non-pure packet found, create a new one */ UNLOCK; //EXIT2 return pdp_packet_create(datatype, datasize); } /* internal method to add a packet to a packet type description symbol's unused packet fifo */ void _pdp_packet_save_nolock(int packet) { t_pdp *header = pdp_packet_header(packet); t_pdp_symbol *s; PDP_ASSERT(header); PDP_ASSERT(header->users == 0); PDP_ASSERT(header->desc); s = header->desc; if (!s->s_reusefifo) s->s_reusefifo = pdp_list_new(0); pdp_list_add(s->s_reusefifo, a_packet, (t_pdp_word)packet); } /* this will revive a packet matching a certain type description no wildcards are allowed */ int pdp_packet_reuse(t_pdp_symbol *type_description) { int packet = -1; t_pdp *header = 0; t_pdp_list *l = 0; LOCK; if (!type_description || !(l = type_description->s_reusefifo)) goto exit; while(l->elements){ packet = pdp_list_pop(l).w_packet; header = pdp_packet_header(packet); /* check if reuse fifo is consistent (packet unused + correct type) packet could be deleted and replaced with another one, or revived without the index updated (it's a "hint cache") */ if (header->users == 0){ /* check if type matches */ if (pdp_type_description_match(header->desc, type_description)){ header->users++; // revive goto exit; } /* if not, add the packet to the correct reuse fifo */ else{ _pdp_packet_save_nolock(packet); } } /* remove dangling refs */ header = 0; packet = -1; } exit: UNLOCK; if (header && header->theclass && header->theclass->wakeup){ header->theclass->wakeup(header); // revive if necessary } return packet; } /* find all unused packets in pool, marked as used (to protect from other reapers) and return them as a list. non-pure packets are not revived */ /* this returns a copy of a packet for read only access. (increases refcount of the packet -> packet will become readonly if it was writable, i.e. had rc=1 */ int pdp_packet_copy_ro(int handle) { t_pdp* header; if (header = pdp_packet_header(handle)){ PDP_ASSERT(header->users); // consistency check LOCK; header->users++; // increment reference count UNLOCK; } else handle = -1; return handle; } /* clone a packet: create a new packet with the same type as the source packet */ int pdp_packet_clone_rw(int handle) { t_pdp* header; int new_handle = -1; if (header = pdp_packet_header(handle)){ /* consistency checks */ PDP_ASSERT(header->users); PDP_ASSERT(header->desc); /* first try to reuse old packet */ new_handle = pdp_packet_reuse(header->desc); /* if this failed, create a new one using the central packet factory method */ if (-1 == new_handle) new_handle = pdp_factory_newpacket(header->desc); } return new_handle; } /* return a copy of a packet (clone + copy data) */ int pdp_packet_copy_rw(int handle) { t_pdp *header, *new_header; int new_handle = -1; if (!(header = pdp_packet_header(handle))) return -1; /* check if we are allowed to copy */ if (header->flags & PDP_FLAG_DONOTCOPY) return -1; /* get target packet */ new_handle = pdp_packet_clone_rw(handle); if (-1 == new_handle) return -1; new_header = pdp_packet_header(new_handle); /* if there is a copy method, use that one */ if (header->theclass && header->theclass->copy){ header->theclass->copy(header, new_header); } /* otherwize copy the data verbatim */ else { memcpy(pdp_packet_data(new_handle), pdp_packet_data(handle), pdp_packet_data_size(handle)); } return new_handle; } /* decrement refcount */ void pdp_packet_mark_unused(int handle) { t_pdp *header; if (!(header = pdp_packet_header(handle))) return; PDP_ASSERT(header->users); // consistency check LOCK; /* just decrement refcount */ if (header->users > 1){ header->users--; } /* put packet to sleep if refcount 1->0 */ else { if (header->theclass && header->theclass->sleep){ /* call sleep method (if any) outside of lock while the packet is still alive, so it won't be acclaimed by another thread */ UNLOCK; header->theclass->sleep(header); LOCK; } /* clear refcount & save in fifo for later use */ header->users = 0; if (header->desc) // sleep could have destructed packet.. _pdp_packet_save_nolock(handle); } UNLOCK; } /* delete a packet. rc needs to be == 1 */ void pdp_packet_delete(int handle) { t_pdp *header; header = pdp_packet_header(handle); PDP_ASSERT(header); PDP_ASSERT(header->users == 1); // consistency check LOCK; if (header->theclass && header->theclass->cleanup){ /* call cleanup method (if any) outside of lock while the packet is still alive, so it won't be acclaimed by another thread */ UNLOCK; header->theclass->cleanup(header); LOCK; } /* delete the packet */ pdp_pool[handle] = 0; _pdp_packet_dealloc_nolock(header); UNLOCK; } /* public data access methods */ t_pdp* pdp_packet_header(int handle) { if ((handle >= 0) && (handle < pdp_pool_size)) return pdp_pool[handle]; else return 0; } void* pdp_packet_subheader(int handle) { t_pdp* header = pdp_packet_header(handle); if (!header) return 0; return (void *)(&header->info.raw); } void* pdp_packet_data(int handle) { t_pdp *h; if ((handle >= 0) && (handle < pdp_pool_size)) { h = pdp_pool[handle]; if (!h) return 0; return (char *)(h) + PDP_HEADER_SIZE; } else return 0; } int pdp_packet_data_size(int handle) { t_pdp *h; if ((handle >= 0) && (handle < pdp_pool_size)) { h = pdp_pool[handle]; if (!h) return 0; return h->size - PDP_HEADER_SIZE; } else return 0; } int pdp_packet_writable(int packet) /* returns true if packet is writable */ { t_pdp *h = pdp_packet_header(packet); if (!h) return 0; return (h->users == 1); } void pdp_packet_replace_with_writable(int *packet) /* replaces a packet with a writable copy */ { int new_p; if (!pdp_packet_writable(*packet)){ new_p = pdp_packet_copy_rw(*packet); pdp_packet_mark_unused(*packet); *packet = new_p; } } /* pool stuff */ int pdp_pool_collect_garbage(void) { pdp_post("ERROR: garbage collector not implemented"); return 0; } void pdp_pool_set_max_mem_usage(int max) { pdp_post("ERROR: mem limit not implemented"); } #ifdef __cplusplus } #endif --- NEW FILE: pdp_post.c --- /* * Pure Data Packet system file. pdp logging. * Copyright (c) by Tom Schouten <pdp(a)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 <stdlib.h> #include <stdio.h> #include <stdarg.h> #include <string.h> #include <errno.h> #include "pdp_post.h" /* list printing should be moved here too */ /* write a message to log (console) */ void pdp_post_n(char *fmt, ...) { va_list ap; va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); } void pdp_post(char *fmt, ...) { va_list ap; va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); putc('\n', stderr); }

1 0

16 Dec '05

Update of /cvsroot/pure-data/externals/pdp/system/mmx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6756/system/mmx Added Files: Makefile pdp_mmx_test.c pixel_add_s16.s pixel_biquad_dirI_s16.s pixel_biquad_s16.s pixel_ca_s1.s pixel_cascade_s16.s pixel_cheby_s16.s pixel_conv_hor_s16.s pixel_conv_ver_s16.s pixel_crot_s16.s pixel_gain.s pixel_gain_s16.s pixel_mix_s16.s pixel_mul_s16.s pixel_pack_s16u8.s pixel_rand_s16.s pixel_randmix_s16.s pixel_resample_s16.s pixel_s1.s pixel_unpack_u8s16.s Log Message: checking in pdp 0.12.4 from http://zwizwa.fartit.com/pd/pdp/pdp-0.12.4.tar.gz --- NEW FILE: pixel_resample_s16.s --- #interpolation data: #* 4 vectors: neighbourhood for samples (TL, TR, BL, BR) #* 2 vectors: fractional part (unsigned) #* 2 vectors: addresses of pixel blocks #coord conversion data: #1 vector: 32bit splatted address #1 vector: 16bit splatted w-1 #1 vector: 16bit splatted h-1 #1 vector: 16bit splatted w (reuse w-1 with add?) #1 dword: 32 bit line offset #coord generation data: several vectors for parameter update stuff.. #coordinate systems: 16 bit virtual coordinates (signed, center relative) #* 2 vectors: virtual coordinates #(evt tussenstap + conversie naar 16 bit virtual) #step 1: generate virtual coords #step 2: virtual coords -> block adresses + fractional adresses #* mulhigh: real coords (x,y) (center relative) #* add center -> unsigned (top left relative) #* mullow: fractional part (x_frac, y_frac) #* mulhigh, mullow, pack 32bit: y_offset #* pack 32bit: x_offset #* add, shift, add start address: real addresses #step3: data fetch using generated addresses: # this step would be much simpler in 4x16bit rgba. life's a bitch.. #step4: billinear interpolation #stat5: store # this can be simplified by doing 32 bit unaligned moves # and vector unpacking on the data # cooked image data structure # pixel environment temp storage TL1 = 0x00 TL2 = 0x02 TL3 = 0x04 TL4 = 0x06 TR1 = 0x08 TR2 = 0x0A TR3 = 0x0C TR4 = 0x0E BL1 = 0x10 BL2 = 0x12 BL3 = 0x14 BL4 = 0x16 BR1 = 0x18 BR2 = 0x1A BR3 = 0x1C BR4 = 0x1E # addresses of pixel blocks ADDRESS1 = 0x20 ADDRESS2 = 0x24 ADDRESS3 = 0x28 ADDRESS4 = 0x2C # second env + address buffer (testing: not used) SECONDBUFFER = 0x30 # 32bit splatted bitmap address V2PLANEADDRESS = 0x60 # 16bit splatted image constants V4TWOWIDTHM1 = 0x68 V4TWOHEIGHTM1 = 0x70 V4LINEOFFSET = 0x78 # data struct size RESAMPLEDATASIZE = 0x80 # interpolation routine # input: %mm0, %mm1 4 x 16bit unsigned top left relative virtual x and y coordinates # %esi: temp & algo data structure getpixelsbilin: psrlw $1, %mm0 # convert to range 0->0x7fff [0,0.5[ psrlw $1, %mm1 movq %mm0, %mm2 movq %mm1, %mm3 movq V4TWOWIDTHM1(%esi), %mm4 # 2 * (width - 1) movq V4TWOHEIGHTM1(%esi), %mm5 # 2 * (height - 1) pmulhw %mm5, %mm3 # mm3 == y coord (topleft relative) pmulhw %mm4, %mm2 # mm2 == x coord (topleft relative) pmullw %mm5, %mm1 # mm1 == y frac (unsigned) pmullw %mm4, %mm0 # mm0 == x frac (unsigned) movq %mm3, %mm5 # copy y coord pmullw V4LINEOFFSET(%esi), %mm3 # low part of line offset pmulhw V4LINEOFFSET(%esi), %mm5 # high part of line offset movq %mm2, %mm7 # copy x coord vector pxor %mm4, %mm4 punpcklwd %mm4, %mm2 # low part in %mm2 punpckhwd %mm4, %mm7 # hight part in %mm7 movq %mm3, %mm6 # copy punpcklwd %mm5, %mm3 # unpack low part in %mm3 punpckhwd %mm5, %mm6 # high part int %mm6 paddd %mm2, %mm3 paddd %mm7, %mm6 pslld $1, %mm3 # convert to word adresses pslld $1, %mm6 paddd V2PLANEADDRESS(%esi), %mm3 # add pixel plane address paddd V2PLANEADDRESS(%esi), %mm6 movq %mm3, ADDRESS1(%esi) # store adresses movq %mm6, ADDRESS3(%esi) pcmpeqw %mm2, %mm2 # all ones movq %mm0, %mm4 # copy x frac movq %mm1, %mm5 # copy y frac pxor %mm2, %mm4 # compute compliment (approx negative) pxor %mm2, %mm5 psrlw $1, %mm0 # shift right (0.5 * (frac x) psrlw $1, %mm1 # shift right (0.5 * (frac y) psrlw $1, %mm4 # shift right (0.5 * (1 - frac x) psrlw $1, %mm5 # shift right (0.5 * (1 - frac y) movq %mm0, %mm2 # copy of frac x movq %mm4, %mm3 # copy of (1-frac x) # fetch data #jmp skipfetch # seems the fetch is the real killer. try to optimize this # using 32 bit accesses & shifts # the src image data struct is padded to the cooked data struct movl RESAMPLEDATASIZE(%esi), %edi shll $1, %edi movl ADDRESS1(%esi), %ecx movl ADDRESS2(%esi), %edx movw (%ecx), %ax movw (%edx), %bx movw %ax, TL1(%esi) movw %bx, TL2(%esi) movw 2(%ecx), %ax movw 2(%edx), %bx movw %ax, TR1(%esi) movw %bx, TR2(%esi) addl %edi, %ecx addl %edi, %edx movw (%ecx), %ax movw (%edx), %bx movw %ax, BL1(%esi) movw %bx, BL2(%esi) movw 2(%ecx), %ax movw 2(%edx), %bx movw %ax, BR1(%esi) movw %bx, BR2(%esi) movl ADDRESS3(%esi), %ecx movl ADDRESS4(%esi), %edx movw (%ecx), %ax movw (%edx), %bx movw %ax, TL3(%esi) movw %bx, TL4(%esi) movw 2(%ecx), %ax movw 2(%edx), %bx movw %ax, TR3(%esi) movw %bx, TR4(%esi) addl %edi, %ecx addl %edi, %edx movw (%ecx), %ax movw (%edx), %bx movw %ax, BL3(%esi) movw %bx, BL4(%esi) movw 2(%ecx), %ax movw 2(%edx), %bx movw %ax, BR3(%esi) movw %bx, BR4(%esi) skipfetch: pmulhw TL1(%esi), %mm4 # bilin interpolation pmulhw TR1(%esi), %mm0 pmulhw BL1(%esi), %mm3 pmulhw BR1(%esi), %mm2 paddw %mm4, %mm0 paddw %mm3, %mm2 pmulhw %mm5, %mm0 pmulhw %mm1, %mm2 paddw %mm2, %mm0 psllw $2, %mm0 # compensate for gain reduction ret // linear mapping data struct ROWSTATEX = 0x0 ROWSTATEY = 0x8 COLSTATEX = 0x10 COLSTATEY = 0x18 ROWINCX = 0x20 ROWINCY = 0x28 COLINCX = 0x30 COLINCY = 0x38 // image data struct LINEOFFSET = 0x0 IMAGEADDRESS = 0x4 WIDTH = 0x8 HEIGHT = 0xC IMAGEDATASIZE = 0x10 # pixel_resample_linmap_s16(void *x) .globl pixel_resample_linmap_s16 .type pixel_resample_linmap_s16,@function SOURCEIMAGE = RESAMPLEDATASIZE DESTIMAGE = SOURCEIMAGE + IMAGEDATASIZE LINMAPDATA = DESTIMAGE + IMAGEDATASIZE pixel_resample_linmap_s16: pushl %ebp movl %esp, %ebp pushl %esi pushl %edi pushl %ebx movl 8(%ebp), %esi # get data struct movl DESTIMAGE+HEIGHT(%esi), %edx # image height movl DESTIMAGE+IMAGEADDRESS(%esi), %edi # dest image address movl DESTIMAGE+WIDTH(%esi), %ecx # image width shrl $2, %ecx # vector count .align 16 linmap_looprow: movq LINMAPDATA+ROWSTATEX(%esi), %mm0 # get current coordinates movq LINMAPDATA+ROWSTATEY(%esi), %mm1 linmap_loopcol: movq %mm0, %mm4 # copy movq %mm1, %mm5 paddd LINMAPDATA+ROWINCX(%esi), %mm4 # increment paddd LINMAPDATA+ROWINCY(%esi), %mm5 movq %mm4, %mm6 # copy movq %mm5, %mm7 paddd LINMAPDATA+ROWINCX(%esi), %mm6 # increment paddd LINMAPDATA+ROWINCY(%esi), %mm7 movq %mm6, LINMAPDATA+ROWSTATEX(%esi) # store next state movq %mm7, LINMAPDATA+ROWSTATEY(%esi) psrad $16, %mm0 # round to 16 bit psrad $16, %mm1 psrad $16, %mm4 psrad $16, %mm5 packssdw %mm4, %mm0 # pack new coordinates packssdw %mm5, %mm1 push %ecx push %edx push %edi call getpixelsbilin # do interpolation pop %edi pop %edx pop %ecx movq %mm0, (%edi) # store 4 pixels addl $0x8, %edi # point to next 4 pixels decl %ecx # dec row counter jnz linmap_looprow movq LINMAPDATA+COLSTATEX(%esi), %mm0 # get column state vector movq LINMAPDATA+COLSTATEY(%esi), %mm1 movl DESTIMAGE+WIDTH(%esi), %ecx # image width shrl $2, %ecx # vector count paddd LINMAPDATA+COLINCX(%esi), %mm0 # increment paddd LINMAPDATA+COLINCY(%esi), %mm1 movq %mm0, LINMAPDATA+COLSTATEX(%esi) # store movq %mm1, LINMAPDATA+COLSTATEY(%esi) decl %edx # dec column counter jnz linmap_loopcol emms popl %ebx popl %edi popl %esi leave ret --- NEW FILE: pixel_gain_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_gain_s16 .type pixel_gain_s16,@function # gain is integer, shift count is down # void pixel_gain_s16(int *buf, int nb_8pixel_vectors, short int gain[4], unsigned long long *shift) pixel_gain_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 20(%ebp), %edi movq (%edi), %mm6 # get shift vector movl 16(%ebp), %edi movq (%edi), %mm7 # get gain vector movl 8(%ebp), %esi # input array movl 12(%ebp), %ecx # pixel count .align 16 .loop_gain: movq (%esi), %mm0 # load 4 pixels from memory movq %mm0, %mm1 pmulhw %mm7, %mm1 # apply gain (s15.0) fixed point, high word pmullw %mm7, %mm0 # low word movq %mm0, %mm2 # copy movq %mm1, %mm3 punpcklwd %mm1, %mm0 # unpack lsw components punpckhwd %mm3, %mm2 # unpack msw components psrad %mm6, %mm0 # apply signed shift psrad %mm6, %mm2 packssdw %mm2, %mm0 # pack result & saturate movq %mm0, (%esi) # store result addl $8, %esi # increment source pointer decl %ecx jnz .loop_gain # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_cheby_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_cheby_s16_3plus .type pixel_cheby_s16_3plus,@function # void pixel_cheby_s16(int *buf, int nb_8pixel_vectors, int order+1, short int *coefs) # coefs are s2.13 fixed point (-4->4) pixel_cheby_s16_3plus: pushl %ebp movl %esp, %ebp push %esi push %edi push %edx movl 8(%ebp), %esi # input array movl 12(%ebp), %ecx # vector count movl 16(%ebp), %eax # get order+1 shll $3, %eax movl 20(%ebp), %edx addl %eax, %edx # edx = coef endx address # jmp skip .align 16 .loop_cheby: movl 20(%ebp), %edi # get coefs movq (%esi), %mm0 # load 4 pixels from memory (mm0 = x) pcmpeqw %mm2, %mm2 movq %mm0, %mm1 # mm1 (T_n-1) <- x psrlw $1, %mm2 # mm2 (T_n-2) <- 1 movq (%edi), %mm4 # mm4 (acc) == a0 psraw $1, %mm4 # mm4 == a0/2 movq %mm0, %mm5 # mm5 (intermediate) pmulhw 8(%edi), %mm5 # mm5 == (x * a1)/2 paddsw %mm5, %mm4 # acc = c0 + c1 x addl $16, %edi .loop_cheby_inner: movq %mm1, %mm3 # mm3 == T_n-1 psraw $2, %mm2 # mm2 == T_n-2 / 4 pmulhw %mm0, %mm3 # mm3 == (2 x T_n-1) / 4 psubsw %mm2, %mm3 # mm3 == (2 x T_n-1 - T_n-2) / 4 paddsw %mm3, %mm3 paddsw %mm3, %mm3 # mm3 == T_n movq %mm1, %mm2 # mm2 == new T_n-1 movq %mm3, %mm1 # mm3 == new T_n-2 pmulhw (%edi), %mm3 # mm3 = a_n * T_n / 2 paddsw %mm3, %mm4 # accumulate addl $8, %edi cmpl %edx, %edi jne .loop_cheby_inner paddsw %mm4, %mm4 # compensate for 0.125 factor paddsw %mm4, %mm4 paddsw %mm4, %mm4 movq %mm4, (%esi) # store result in memory addl $8, %esi # increment source/dest pointer decl %ecx jnz .loop_cheby # loop skip: emms pop %edx pop %edi pop %esi leave ret --- NEW FILE: pixel_cascade_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # TODO: COUPLED CASCADE SECOND ORDER SECTION # # s1[k] = ar * s1[k-1] + ai * s2[k-1] + x[k] # s2[k] = ar * s2[k-1] - ai * s1[k-1] # y[k] = c0 * x[k] + c1 * s1[k-1] + c2 * s2[k-1] # MACRO: df2 # # computes a coupled cascade # # input: %mm0 == input # %mm1 == state 1 # %mm2 == state 2 # (%esi) == cascade coefs (ar ai c0 c1 c2) in s0.15 # output: %mm0 == output # %mm1 == state 1 # %mm2 == state 2 .macro coupled pmovq %mm1, %mm3 # mm3 == s1[k-1] pmovq %mm1, %mm4 # mm4 == s1[k-1] pmovq %mm2, %mm5 # mm5 == s2[k-1] pmovq %mm2, %mm6 # mm5 == s2[k-1] pmulhw (%esi), %mm1 # mm1 == s1[k-1] * ar pmulhw 8(%esi), %mm3 # mm3 == s1[k-1] * ai pmulhw 24(%esi), %mm4 # mm4 == s1[k-1] * c1 pmulhw (%esi), %mm2 # mm2 == s2[k-1] * ar pmulhw 8(%esi), %mm5 # mm5 == s2[k-1] * ai pmulhw 32(%esi), %mm6 # mm6 == s2[k-1] * c2 paddw %mm5, %mm1 # mm1 == s1[k-1] * ar + s2[k-1] * ai psubw %mm3, %mm2 # mm2 == s2[k-1] * ar - s1[k-1] * ai == s2[k] paddw %mm0, %mm1 # mm1 == s1[k] pmulhw 16(%esi), %mm0 # mm0 == x[k] * c0 paddw %mm6, %mm4 # mm4 == s1[k-1] * c1 + s2[k-1] * c2 paddw %mm4, %mm0 # mm0 == y[k] .endm # in order to use the 4 line parallel cascade routine on horizontal # lines, we need to reorder (rotate or transpose) the matrix, since # images are scanline encoded, and we want to work in parallell # on 4 lines. # # since the 4 lines are independent, it doesnt matter in which order # the the vector elements are present. # # this allows us to use the same routine for left->right and right->left # processing. # # some comments on the non-abelean group of square isometries consisting of # (I) identity # (H) horizontal axis mirror # (V) vertical axis mirror # (T) transpose (diagonal axis mirror) # (A) antitranspose (antidiagonal axis mirror) # (R1) 90deg anticlockwize rotation # (R2) 180deg rotation # (R3) 90deg clockwize rotation # # # we basicly have two options: (R1,R3) or (T,A) # we opt for T and A because they are self inverting, which improves locality # # use antitranspose for right to left an transpose # for left to right (little endian) # antitranspose 4x4 # input # %mm3 == {d0 d1 d2 d3} # %mm2 == {c0 c1 c2 c3} # %mm1 == {b0 b1 b2 b3} # %mm0 == {a0 a1 a2 a3} # output # %mm3 == {a3 b3 c3 d3} # %mm2 == {a2 b2 c2 d2} # %mm1 == {a1 b1 c1 d1} # %mm0 == {a0 b0 c0 d0} .macro antitranspose_4x4: movq %mm3, %mm4 punpcklwd %mm1, %mm4 # mm4 <- {b2 d2 b3 d3} movq %mm3, %mm5 punpckhwd %mm1, %mm5 # mm5 <- {b0 d0 b1 d1} movq %mm2, %mm6 punpcklwd %mm0, %mm6 # mm6 <- {a2 c2 a3 c3} movq %mm2, %mm7 punpckhwd %mm0, %mm7 # mm7 <- {a0 c0 a1 c1} movq %mm4, %mm3 punpcklwd %mm6, %mm3 # mm3 <- {a3 b3 c3 d3} movq %mm4, %mm2 punpckhwd %mm6, %mm2 # mm2 <- {a2 b2 c2 d2} movq %mm5, %mm1 punpcklwd %mm7, %mm1 # mm1 <- {a1 b1 c1 d1} movq %mm5, %mm0 punpckhwd %mm7, %mm0 # mm0 <- {a0 b0 c0 d0} .endm # transpose 4x4 # input # %mm3 == {d3 d2 d1 d0} # %mm2 == {c3 c2 c1 c0} # %mm1 == {b3 b2 b1 b0} # %mm0 == {a3 a2 a1 a0} # output # %mm3 == {d3 c3 b3 a3} # %mm2 == {d2 c2 b2 a2} # %mm1 == {d1 c1 b1 a1} # %mm0 == {d0 c0 b0 a0} .macro transpose_4x4: movq %mm0, %mm4 punpcklwd %mm2, %mm4 # mm4 <- {c1 a1 c0 a0} movq %mm0, %mm5 punpckhwd %mm2, %mm5 # mm5 <- {c3 a3 c2 a2} movq %mm1, %mm6 punpcklwd %mm3, %mm6 # mm6 <- {d1 b1 d0 b0} movq %mm1, %mm7 punpckhwd %mm3, %mm7 # mm7 <- {d3 b3 d2 b2} movq %mm4, %mm0 punpcklwd %mm6, %mm0 # mm0 <- {d0 c0 b0 a0} movq %mm4, %mm1 punpckhwd %mm6, %mm1 # mm1 <- {d1 c1 b1 a1} movq %mm5, %mm2 punpcklwd %mm7, %mm2 # mm2 <- {d2 c2 b2 a2} movq %mm5, %mm3 punpckhwd %mm7, %mm3 # mm3 <- {d3 c3 b3 a3} .endm .globl pixel_cascade_vertb_s16 .type pixel_cascade_vertb_s16,@function # pixel_cascade_vertbr_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_cascade_vertb_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing subl %edx, %ebx movq 0(%edi), %mm1 # s1[k-1] movq 8(%edi), %mm2 # s2[k-1] .align 16 .cascade_vertb_line_loop: movq (%ebx,%edx,1), %mm3 movq %mm3, %mm0 addl %edx, %ebx coupled movq %mm0, (%ebx) movq (%ebx,%edx,1), %mm3 movq %mm3, %mm0 addl %edx, %ebx coupled movq %mm0, (%ebx) movq (%ebx,%edx,1), %mm3 movq %mm3, %mm0 addl %edx, %ebx coupled movq %mm0, (%ebx) movq (%ebx,%edx,1), %mm3 movq %mm3, %mm0 addl %edx, %ebx coupled movq %mm0, (%ebx) decl %ecx jnz .cascade_vertb_line_loop movq %mm1, 0(%edi) # s1[k-1] movq %mm2, 8(%edi) # s2[k-1] emms pop %edi pop %esi pop %ebx leave ret .globl pixel_cascade_horlr_s16 .type pixel_cascade_horlr_s16,@function # pixel_cascade_hor_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_cascade_horlr_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .cascade_horlr_line_loop: movq (%edi), %mm1 movq 8(%edi), %mm2 movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 transpose_4x4 movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) coupled movq %mm0, (%ebx) movq (%ebx,%edx,1), %mm3 movq %mm3, %mm0 coupled movq %mm0, (%ebx, %edx,1) movq (%ebx,%edx,2), %mm3 movq %mm3, %mm0 coupled movq %mm0, (%ebx, %edx,2) movq (%ebx,%eax,1), %mm3 movq %mm3, %mm0 coupled movq %mm1, 0(%edi) # s1[k-1] movq %mm2, 8(%edi) # s2[k-1] movq %mm0, %mm3 movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 transpose_4x4 movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) addl $8, %ebx decl %ecx jnz .cascade_horlr_line_loop emms pop %edi pop %esi pop %ebx leave ret --- NEW FILE: pixel_rand_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_rand_s16 .type pixel_rand_s16,@function # mmx rgba pixel gain # void pixel_rand_s16(int *dst, nb_4pixel_vectors, short int random_seed[4]) pixel_rand_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 16(%ebp), %esi # int16[4] array of random seeds movl 8(%ebp), %edi # dst array movl 12(%ebp), %ecx # pixel count movq (%esi), %mm6 pcmpeqw %mm3, %mm3 psrlw $15, %mm3 # get bit mask 4 times 0x0001 .align 16 .loop_rand: # prefetch 128(%esi) movq %mm6, %mm4 # get random vector psrlw $15, %mm4 # get first component movq %mm6, %mm5 psrlw $14, %mm5 # get second component pxor %mm5, %mm4 movq %mm6, %mm5 psrlw $12, %mm5 # get third component pxor %mm5, %mm4 movq %mm6, %mm5 psrlw $3, %mm5 # get forth component pxor %mm5, %mm4 psllw $1, %mm6 # shift left original random vector pand %mm3, %mm4 # isolate new bit por %mm4, %mm6 # combine into new random vector movq %mm6, (%edi) addl $8, %edi decl %ecx jnz .loop_rand # loop movq %mm6, (%esi) # store random seeds emms pop %edi pop %esi leave ret --- NEW FILE: pixel_conv_ver_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # #TODO: fix out of bound acces in conv_ver and conv_hor # intermediate function # input in register: # %mm0: top 4 pixels # %mm1: middle 4 pixels # %mm2: bottom 4 pixels # %mm5: top 4 pixel mask # %mm6: middle 4 pixel mask # %mm7: bottom 4 pixel mask # return in register: # %mm0: middle 4 pixels result .conv_ver_4_pixels: .align 16 # compute quadruplet # get top pixel pmulhw %mm5, %mm0 psllw $1, %mm0 # get middle pixel movq %mm1, %mm4 pmulhw %mm6, %mm4 psllw $1, %mm4 paddsw %mm4, %mm0 # get bottom pixel movq %mm2, %mm3 pmulhw %mm7, %mm3 psllw $1, %mm3 # mm3 <- mm3/4 paddsw %mm3, %mm0 ret .globl pixel_conv_ver_s16 .type pixel_conv_ver_s16,@function # pixel_conv_ver_s16(short int *pixel_array, int nb_4_pixel_vectors, int row_byte_size, short int border[4]) # horizontal unsigned pixel conv (1/4 1/2 1/4) not tested # NOT TESTED pixel_conv_ver_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %esi # pixel array offset movl 12(%ebp), %ecx # nb of 4 pixel vectors in a row (at least 2) movl 16(%ebp), %edx # rowsize in bytes movl 24(%ebp), %edi # mask vector movq (%edi), %mm5 movq 8(%edi), %mm6 movq 16(%edi), %mm7 movl 20(%ebp), %edi # edge vector shll $1, %edx decl %ecx # loop has a terminator stub decl %ecx # loop has another terminator stub movq (%edi), %mm0 # init regs (left edge, so mm0 is zero) movq (%esi), %mm1 movq (%esi,%edx,1), %mm2 jmp .conv_line_loop .align 16 .conv_line_loop: call .conv_ver_4_pixels # compute conv movq %mm0, (%esi) # store result movq %mm1, %mm0 # mm0 <- prev (%esi) movq %mm2, %mm1 # mm1 <- (%esi,%edx,1) movq (%esi,%edx,2), %mm2 # mm2 <- (%esi,%edx,2) addl %edx, %esi # increase pointer decl %ecx jnz .conv_line_loop call .conv_ver_4_pixels # compute conv movq %mm0, (%esi) # store result movq %mm1, %mm0 # mm0 <- prev (%esi) movq %mm2, %mm1 # mm1 <- (%esi,%edx,1) movq (%edi), %mm2 # clear invalid edge vector addl %edx, %esi # increase pointer call .conv_ver_4_pixels # compute last vector movq %mm0, (%esi) # store it emms pop %edi pop %esi leave ret --- NEW FILE: pixel_biquad_dirI_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # TODO MOVE TO DIRECT FORM II # y[k] = b0 * x[k] + u1[k-1] # u1[k] = b1 * x[k] + u2[k-1] - a1 * y[k] # u2[k] = b2 * x[k] - a2 * y[k] # input in register: # %mm0-mm3: input 4x4 pixels {x0 x1 x2 x3} # %esi: coef memory (a1, a2, b0, b1, b2) # %edi: state memory (u1, u2) # return in register: # %mm0-mm4: 4x4 pixels result .biquad_4x4_pixels: .align 16 # prescale movq -8(%esi), %mm4 pmulhw %mm4, %mm0 pmulhw %mm4, %mm1 pmulhw %mm4, %mm2 pmulhw %mm4, %mm3 psllw $1, %mm0 psllw $1, %mm1 psllw $1, %mm2 psllw $1, %mm3 # first vector movq 0(%edi), %mm4 # mm4 <- u[-1] movq 8(%edi), %mm5 # mm5 <- u[-2] movq %mm4, %mm6 movq %mm5, %mm7 pmulhw 0(%esi), %mm6 # multiply by a1 pmulhw 8(%esi), %mm7 # multiply by a2 paddsw %mm6, %mm0 # accumulate paddsw %mm7, %mm0 # accumulate paddsw %mm0, %mm0 # scale by 2 (since all fixed point muls are x*y/2) movq %mm0, %mm6 # mm6 <- u[0] movq %mm4, %mm7 # mm7 <- u[-1] pmulhw 16(%esi), %mm0 # multiply by b0 pmulhw 24(%esi), %mm4 # multiply by b1 pmulhw 32(%esi), %mm5 # multiply by b2 paddsw %mm4, %mm0 # accumulate paddsw %mm5, %mm0 # accumulate # mm0 is result 0 # second vector movq %mm6, %mm4 # mm4 <- u[0] movq %mm7, %mm5 # mm5 <- u[-1] pmulhw 0(%esi), %mm6 # multiply by a1 pmulhw 8(%esi), %mm7 # multiply by a2 paddsw %mm6, %mm1 # accumulate paddsw %mm7, %mm1 # accumulate paddsw %mm1, %mm1 # scale by 2 movq %mm1, %mm6 # mm6 <- u[1] movq %mm4, %mm7 # mm7 <- u[0] pmulhw 16(%esi), %mm1 # multiply by b0 pmulhw 24(%esi), %mm4 # multiply by b1 pmulhw 32(%esi), %mm5 # multiply by b2 paddsw %mm4, %mm1 # accumulate paddsw %mm5, %mm1 # accumulate # mm1 is result 1 # third vector movq %mm6, %mm4 # mm4 <- u[1] movq %mm7, %mm5 # mm5 <- u[0] pmulhw 0(%esi), %mm6 # multiply by a1 pmulhw 8(%esi), %mm7 # multiply by a2 paddsw %mm6, %mm2 # accumulate paddsw %mm7, %mm2 # accumulate paddsw %mm2, %mm2 # scale by 2 movq %mm2, %mm6 # mm6 <- u[2] movq %mm4, %mm7 # mm7 <- u[1] pmulhw 16(%esi), %mm2 # multiply by b0 pmulhw 24(%esi), %mm4 # multiply by b1 pmulhw 32(%esi), %mm5 # multiply by b2 paddsw %mm4, %mm2 # accumulate paddsw %mm5, %mm2 # accumulate # mm2 is result 2 # fourth vector movq %mm6, %mm4 # mm4 <- u[2] movq %mm7, %mm5 # mm5 <- u[1] pmulhw 0(%esi), %mm6 # multiply by a1 pmulhw 8(%esi), %mm7 # multiply by a2 paddsw %mm6, %mm3 # accumulate paddsw %mm7, %mm3 # accumulate paddsw %mm3, %mm3 # scale by 2 movq %mm3, 0(%edi) # store u[3] movq %mm4, 8(%edi) # store u[2] pmulhw 16(%esi), %mm3 # multiply by b0 pmulhw 24(%esi), %mm4 # multiply by b1 pmulhw 32(%esi), %mm5 # multiply by b2 paddsw %mm4, %mm3 # accumulate paddsw %mm5, %mm3 # accumulate # mm3 is result 3 ret # in order to use the 4 line parallel biquad routine on horizontal # lines, we need to reorder (rotate or transpose) the matrix, since # images are scanline encoded, and we want to work in parallell # on 4 lines. # # since the 4 lines are independent, it doesnt matter in which order # the the vector elements are present. # # this allows us to use the same routine for left->right and right->left # processing. # # some comments on the non-abelean group of square isometries consisting of # (I) identity # (H) horizontal axis mirror # (V) vertical axis mirror # (T) transpose (diagonal axis mirror) # (A) antitranspose (antidiagonal axis mirror) # (R1) 90deg anticlockwize rotation # (R2) 180deg rotation # (R3) 90deg clockwize rotation # # # we basicly have two options: (R1,R3) or (T,A) # we opt for T and A because they are self inverting, which improves locality # # use antitranspose for right to left an transpose # for left to right (little endian) # antitranspose 4x4 # input # %mm3 == {d0 d1 d2 d3} # %mm2 == {c0 c1 c2 c3} # %mm1 == {b0 b1 b2 b3} # %mm0 == {a0 a1 a2 a3} # output # %mm3 == {a3 b3 c3 d3} # %mm2 == {a2 b2 c2 d2} # %mm1 == {a1 b1 c1 d1} # %mm0 == {a0 b0 c0 d0} .antitranspose_4x4: .align 16 movq %mm3, %mm4 punpcklwd %mm1, %mm4 # mm4 <- {b2 d2 b3 d3} movq %mm3, %mm5 punpckhwd %mm1, %mm5 # mm5 <- {b0 d0 b1 d1} movq %mm2, %mm6 punpcklwd %mm0, %mm6 # mm6 <- {a2 c2 a3 c3} movq %mm2, %mm7 punpckhwd %mm0, %mm7 # mm7 <- {a0 c0 a1 c1} movq %mm4, %mm3 punpcklwd %mm6, %mm3 # mm3 <- {a3 b3 c3 d3} movq %mm4, %mm2 punpckhwd %mm6, %mm2 # mm2 <- {a2 b2 c2 d2} movq %mm5, %mm1 punpcklwd %mm7, %mm1 # mm1 <- {a1 b1 c1 d1} movq %mm5, %mm0 punpckhwd %mm7, %mm0 # mm0 <- {a0 b0 c0 d0} ret # transpose 4x4 # input # %mm3 == {d3 d2 d1 d0} # %mm2 == {c3 c2 c1 c0} # %mm1 == {b3 b2 b1 b0} # %mm0 == {a3 a2 a1 a0} # output # %mm3 == {d3 c3 b3 a3} # %mm2 == {d2 c2 b2 a2} # %mm1 == {d1 c1 b1 a1} # %mm0 == {d0 c0 b0 a0} .transpose_4x4: .align 16 movq %mm0, %mm4 punpcklwd %mm2, %mm4 # mm4 <- {c1 a1 c0 a0} movq %mm0, %mm5 punpckhwd %mm2, %mm5 # mm5 <- {c3 a3 c2 a2} movq %mm1, %mm6 punpcklwd %mm3, %mm6 # mm6 <- {d1 b1 d0 b0} movq %mm1, %mm7 punpckhwd %mm3, %mm7 # mm7 <- {d3 b3 d2 b2} movq %mm4, %mm0 punpcklwd %mm6, %mm0 # mm0 <- {d0 c0 b0 a0} movq %mm4, %mm1 punpckhwd %mm6, %mm1 # mm1 <- {d1 c1 b1 a1} movq %mm5, %mm2 punpcklwd %mm7, %mm2 # mm2 <- {d2 c2 b2 a2} movq %mm5, %mm3 punpckhwd %mm7, %mm3 # mm3 <- {d3 c3 b3 a3} ret .globl pixel_biquad_vertb_s16 .type pixel_biquad_vertb_s16,@function # pixel_biquad_vertbr_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_vertb_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_vertb_line_loop: movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 call .biquad_4x4_pixels movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) addl %edx, %ebx addl %eax, %ebx decl %ecx jnz .biquad_vertb_line_loop emms pop %edi pop %esi pop %ebx leave ret .globl pixel_biquad_horlr_s16 .type pixel_biquad_horlr_s16,@function # pixel_biquad_hor_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_horlr_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_horlr_line_loop: movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 call .transpose_4x4 call .biquad_4x4_pixels call .transpose_4x4 movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) addl $8, %ebx decl %ecx jnz .biquad_horlr_line_loop emms pop %edi pop %esi pop %ebx leave ret --- NEW FILE: Makefile --- include ../../Makefile.config OBJ = \ pixel_pack_s16u8.o \ pixel_unpack_u8s16.o \ pixel_add_s16.o \ pixel_mul_s16.o \ pixel_mix_s16.o \ pixel_randmix_s16.o \ pixel_conv_hor_s16.o \ pixel_conv_ver_s16.o \ pixel_biquad_s16.o \ pixel_ca_s1.o \ pixel_rand_s16.o \ pixel_crot_s16.o \ pixel_gain_s16.o \ pixel_resample_s16.o \ pixel_cheby_s16.o all: $(OBJ) test: pdp_mmx_test.o $(OBJ) gcc -o pdp_mmx_test pdp_mmx_test.o $(OBJ) -g clean: rm -f *.o rm -f *~ rm -f pdp_mmx.a rm -f pdp_mmx_test --- NEW FILE: pixel_add_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_add_s16 .type pixel_add_s16,@function # simple add # void pixel_add_s16(int *left, int *right, int nb_4pixel_vectors) pixel_add_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %edi # left array movl 12(%ebp), %esi # right array movl 16(%ebp), %ecx # pixel count .align 16 .loop_mix: # prefetch 128(%esi) movq (%esi), %mm1 # load right 4 pixels from memory movq (%edi), %mm0 # load 4 left pixels from memory paddsw %mm1, %mm0 # mix movq %mm0, (%edi) addl $8, %esi addl $8, %edi decl %ecx jnz .loop_mix # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_randmix_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_randmix_s16 .type pixel_randmix_s16,@function # mmx rgba pixel gain # void pixel_randmix_s16(int *left, int *right, int nb_4pixel_vectors, short int random_seed[4], short int threshold[4]) pixel_randmix_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 20(%ebp), %edi # int16[4] array of random seeds movq (%edi), %mm6 movl 24(%ebp), %edi # int16[4] array of thresholds movq (%edi), %mm7 movl 8(%ebp), %edi # left array movl 12(%ebp), %esi # right array movl 16(%ebp), %ecx # pixel count pcmpeqw %mm3, %mm3 psrlw $15, %mm3 # get bit mask 4 times 0x0001 .align 16 .loop_randmix: # prefetch 128(%esi) movq (%esi), %mm1 # load right 4 pixels from memory movq (%edi), %mm0 # load 4 left pixels from memory movq %mm6, %mm2 # get random vector pcmpgtw %mm7, %mm2 # compare random vector with threshold movq %mm2, %mm5 pand %mm0, %mm2 # get left array's components pandn %mm1, %mm5 # get right array's components por %mm2, %mm5 movq %mm5, (%edi) # store pixels movq %mm6, %mm4 # get random vector psrlw $15, %mm4 # get first component movq %mm6, %mm5 psrlw $14, %mm5 # get second component pxor %mm5, %mm4 movq %mm6, %mm5 psrlw $12, %mm5 # get third component pxor %mm5, %mm4 movq %mm6, %mm5 psrlw $3, %mm5 # get forth component pxor %mm5, %mm4 psllw $1, %mm6 # shift left original random vector pand %mm3, %mm4 # isolate new bit por %mm4, %mm6 # combine into new random vector addl $8, %esi addl $8, %edi decl %ecx jnz .loop_randmix # loop movl 20(%ebp), %edi # int16[4] array of random seeds movq %mm6, (%edi) # store random seeds emms pop %edi pop %esi leave ret --- NEW FILE: pixel_unpack_u8s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_unpack_u8s16_y .type pixel_unpack_u8s16_y,@function # mmx rgba pixel gain # void pixel_unpack_u8s16_y(char *input, char *output, int32 nb_pixels_div8) pixel_unpack_u8s16_y: pushl %ebp movl %esp, %ebp push %esi push %edi # movl 20(%ebp), %edi # int16[4] array of gains # movq (%edi), %mm7 # get gain array movl 8(%ebp), %esi # input uint8 pixel array movl 12(%ebp), %edi # output sint16 pixel array movl 16(%ebp), %ecx # nb of elements div 8 .align 16 .loop_unpack_y: movq (%esi), %mm5 # load 8 pixels from memory pxor %mm0, %mm0 # zero mm0 - mm3 pxor %mm1, %mm1 punpcklbw %mm5, %mm0 # unpack 1st 4 pixels punpckhbw %mm5, %mm1 # unpack 2nd 4 pixles psrlw $0x1, %mm0 # shift right to clear sign bit 9.7 psrlw $0x1, %mm1 # pmulhw %mm7, %mm0 # apply gain # pmulhw %mm7, %mm1 # paddsw %mm0, %mm0 # correct factor 2 # paddsw %mm1, %mm1 movq %mm0, (%edi) # store movq %mm1, 8(%edi) addl $8, %esi # increment source pointer addl $16, %edi # increment dest pointer decl %ecx jnz .loop_unpack_y # loop emms pop %edi pop %esi leave ret .globl pixel_unpack_u8s16_uv .type pixel_unpack_u8s16_uv,@function pixel_unpack_u8s16_uv: pushl %ebp movl %esp, %ebp push %esi push %edi # movl 20(%ebp), %edi # int16[4] array of gains # movq (%edi), %mm7 # get gain array movl 8(%ebp), %esi # input uint8 pixel array movl 12(%ebp), %edi # output sint16 pixel array movl 16(%ebp), %ecx # nb of elements div 8 pcmpeqw %mm6, %mm6 psllw $15, %mm6 .align 16 .loop_unpack_uv: movq (%esi), %mm5 # load 8 pixels from memory pxor %mm0, %mm0 # zero mm0 - mm3 pxor %mm1, %mm1 punpcklbw %mm5, %mm0 # unpack 1st 4 pixels punpckhbw %mm5, %mm1 # unpack 2nd 4 pixles pxor %mm6, %mm0 # flip sign bit (Cr and Cb are ofset by 128) pxor %mm6, %mm1 # pmulhw %mm7, %mm0 # apply gain # pmulhw %mm7, %mm1 # paddsw %mm0, %mm0 # correct factor 2 # paddsw %mm1, %mm1 movq %mm0, (%edi) # store movq %mm1, 8(%edi) addl $8, %esi # increment source pointer addl $16, %edi # increment dest pointer decl %ecx jnz .loop_unpack_uv # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_pack_s16u8.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_pack_s16u8_y .type pixel_pack_s16u8_y,@function # mmx rgba pixel gain # void pixel_pack_s16u8_y(int *input, int *output, int nb_8pixel_vectors) pixel_pack_s16u8_y: pushl %ebp movl %esp, %ebp push %esi push %edi # movl 20(%ebp), %edi # int16[4] array of gains # movq (%edi), %mm7 # get gain array # psllw $1, %mm7 # adjust for shifted sign bit movl 8(%ebp), %esi # input array movl 12(%ebp), %edi # output array movl 16(%ebp), %ecx # pixel count pxor %mm6, %mm6 .align 16 .loop_pack_y: # prefetch 128(%esi) movq (%esi), %mm0 # load 4 pixels from memory # pmulhw %mm7, %mm0 # apply gain movq 8(%esi), %mm1 # load 4 pixels from memory # pmulhw %mm7, %mm1 # apply gain # movq %mm0, %mm2 # pcmpgtw %mm6, %mm2 # mm2 > 0 ? 0xffff : 0 # pand %mm2, %mm0 # movq %mm1, %mm3 # pcmpgtw %mm6, %mm3 # mm3 > 0 ? 0xffff : 0 # pand %mm3, %mm1 # psllw $1, %mm0 # shift out sign bit # psllw $1, %mm1 # shift out sign bit psraw $7, %mm0 # shift to lsb psraw $7, %mm1 # shift to lsb packuswb %mm1, %mm0 # pack & saturate to 8bit vector movq %mm0, (%edi) # store result in memory addl $16, %esi # increment source pointer addl $8, %edi # increment dest pointer decl %ecx jnz .loop_pack_y # loop emms pop %edi pop %esi leave ret .globl pixel_pack_s16u8_uv .type pixel_pack_s16u8_uv,@function pixel_pack_s16u8_uv: pushl %ebp movl %esp, %ebp push %esi push %edi # movl 20(%ebp), %edi # int16[4] array of gains # movq (%edi), %mm7 # get gain array movl 8(%ebp), %esi # pixel array offset movl 12(%ebp), %edi # nb of elements movl 16(%ebp), %ecx # pixel count pcmpeqw %mm6, %mm6 psllw $15, %mm6 movq %mm6, %mm5 psrlw $8, %mm5 por %mm5, %mm6 # mm6 <- 8 times 0x80 .align 16 .loop_pack_uv: # prefetch 128(%esi) movq (%esi), %mm0 # load 4 pixels from memory # pmulhw %mm7, %mm0 # apply gain movq 8(%esi), %mm1 # load 4 pixels from memory # pmulhw %mm7, %mm1 # apply gain psraw $8, %mm0 # shift to msb psraw $8, %mm1 packsswb %mm1, %mm0 # pack & saturate to 8bit vector pxor %mm6, %mm0 # flip sign bits movq %mm0, (%edi) # store result in memory addl $16, %esi # increment source pointer addl $8, %edi # increment dest pointer decl %ecx jnz .loop_pack_uv # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_mix_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_mix_s16 .type pixel_mix_s16,@function # mmx rgba pixel gain # void pixel_mix_s16(int *left, int *right, int nb_4pixel_vectors, # short int gain_left[4], short int gain_right[4]) pixel_mix_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 20(%ebp), %edi # int16[4] array of gains movq (%edi), %mm6 # get left gain array movl 24(%ebp), %edi # int16[4] array of gains movq (%edi), %mm7 # get right gain array movl 8(%ebp), %edi # left array movl 12(%ebp), %esi # right array movl 16(%ebp), %ecx # pixel count .align 16 .loop_mix: # prefetch 128(%esi) movq (%esi), %mm1 # load right 4 pixels from memory pmulhw %mm7, %mm1 # apply right gain movq (%edi), %mm0 # load 4 left pixels from memory pmulhw %mm6, %mm0 # apply left gain # pslaw $1, %mm1 # shift left ((s).15 x (s).15 -> (s0).14)) # pslaw $1, %mm0 paddsw %mm0, %mm0 # no shift left arithmic, so use add instead paddsw %mm1, %mm1 paddsw %mm1, %mm0 # mix movq %mm0, (%edi) addl $8, %esi addl $8, %edi decl %ecx jnz .loop_mix # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_ca_s1.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # this file contains assembler routines for 2D 1 bit cellular automata # processing. it is organized around a feeder kernel and a # stack based bit processor (virtual forth machine) # # the feeder kernel is responsable for loading/storing CA cells # from/to memory. data in memory is organized as a scanline # encoded toroidial bitplane (lsb = left). to simplify the kernel, the top # left corner of the rectangular grid of pixels will shift down # every processing step. # # the stack machine has the following architecture: # CA stack: %esi, TOS: %mm0 (32x2 pixels. lsw = top row) # CA horizon: %mm4-%mm7 (64x4 pixels. %mm4 = top row) # # the stack size / organization is not known to the stack machine. # it can be thought of as operating on a 3x3 cell neightbourhood. # the only purpose of forth program is to determine the CA local update rule. # # the machine is supposed to be very minimal. no looping control. # no adressing modes. no conditional code (hey, this is an experiment!) # so recursion is not allowed (no way to stop it) # there are 9 words to load the cell neigbourhood on the stack. # the rest is just logic and stack manips. # this file contains pure asm macros. it is to be included before assembly # after scaforth.pl has processed the .scaf file # *************************** CA CELL ACCESS MACROS ***************************** # fetchTL - fetchBR # shift / load rectangle macros: # shift rectangle horizontal # result is in reg1 .macro shift reg1 reg2 count psllq $(32+\count), \reg1 psrlq $(32-\count), \reg2 psrlq $32, \reg1 psllq $32, \reg2 por \reg2, \reg1 .endm .macro ldtop reg1 reg2 movq %mm4, \reg1 movq %mm5, \reg2 .endm .macro ldcenter reg1 reg2 movq %mm5, \reg1 movq %mm6, \reg2 .endm .macro ldbottom reg1 reg2 movq %mm6, \reg1 movq %mm7, \reg2 .endm # fetch from top row # fetch the top left square .macro fetchTL ldtop %mm0, %mm1 shift %mm0, %mm1, -1 .endm # fetch the top mid square .macro fetchTM ldtop %mm0, %mm1 shift %mm0, %mm1, 0 .endm # fetch the top right square .macro fetchTR ldtop %mm0, %mm1 shift %mm0, %mm1, 1 .endm # fetch from center row # fetch the mid left square .macro fetchML ldcenter %mm0, %mm1 shift %mm0, %mm1, -1 .endm # fetch the mid mid square .macro fetchMM ldcenter %mm0, %mm1 shift %mm0, %mm1, 0 .endm # fetch the mid right square .macro fetchMR ldcenter %mm0, %mm1 shift %mm0, %mm1, 1 .endm # fetch from bottom row # fetch the bottom left square .macro fetchBL ldbottom %mm0, %mm1 shift %mm0, %mm1, -1 .endm # fetch the bottom mid square .macro fetchBM ldbottom %mm0, %mm1 shift %mm0, %mm1, 0 .endm # fetch the bottom right square .macro fetchBR ldbottom %mm0, %mm1 shift %mm0, %mm1, 1 .endm # *************************** CA STACK MANIP MACROS ***************************** # dup drop dropdup swap nip dropover .macro dup lea -8(%esi), %esi movq %mm0, (%esi) .endm .macro drop movq (%esi), %mm0 lea 8(%esi), %esi .endm .macro dropdup movq (%esi), %mm0 .endm .macro swap movq (%esi), %mm1 movq %mm0, (%esi) movq %mm1, %mm0 .endm .macro nip lea 8(%esi), %esi .endm .macro dropover movq 8(%esi), %mm0 .endm # *************************** CA BOOLEAN LOGIC MACROS ***************************** # overxor .macro overxor pxor (%esi), %mm0 .endm --- NEW FILE: pixel_biquad_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # DIRECT FORM II BIQUAD # # y[k] = b0 * x[k] + u1[k-1] # u1[k] = b1 * x[k] + u2[k-1] - a1 * y[k] # u2[k] = b2 * x[k] - a2 * y[k] # MACRO: df2 <reg> # # computes a direct form 2 biquad # does not use {mm0-mm3}\<inreg> # # input: <reg> == input # %mm4 == state 1 # %mm5 == state 2 # (%esi) == biquad coefs (-a1 -a2 b0 b1 b2) in s1.14 # output: <reg> == output # %mm4 == state 1 # %mm5 == state 2 .macro df2 reg movq \reg, %mm6 # mm6 == x[k] movq \reg, %mm7 # mm7 == x[k] pmulhw 16(%esi), %mm6 # mm6 == x[k] * b0 pmulhw 24(%esi), %mm7 # mm7 == x[k] * b1 paddw %mm4, %mm6 # mm6 == x[k] * b0 + u1[k-1] == y[k] paddw %mm5, %mm7 # mm7 == x[k] * b1 + u2[k-1] paddsw %mm6, %mm6 # compensate for mul = x*y/4 (coefs are s1.14 fixed point) paddsw %mm6, %mm6 # paddsw ensures saturation movq \reg, %mm5 # mm5 == x[k] movq %mm6, %mm4 # mm4 == y[k] movq %mm6, \reg # reg == y[k] -------------------- pmulhw 0(%esi), %mm4 # mm4 == y[k] * (-a1) pmulhw 8(%esi), %mm6 # mm6 == y[k] * (-a2) pmulhw 32(%esi), %mm5 # mm5 == x[k] * b2 paddw %mm7, %mm4 # mm4 == u1[k] -------------------- paddw %mm6, %mm5 # mm5 == u2[k] -------------------- .endm # input in register: # %mm0-mm3: input 4x4 pixels {x0 x1 x2 x3} # %esi: coef memory (-a1, -a2, b0, b1, b2) in s1.14 # %edi: state memory (u1, u2) # return in register: # %mm0-mm4: 4x4 pixels result .macro biquad_4x4_pixels .align 16 movq 0(%edi), %mm4 # get state movq 8(%edi), %mm5 df2 %mm0 # compute 4 biquads df2 %mm1 df2 %mm2 df2 %mm3 movq %mm4, 0(%edi) # store state movq %mm5, 8(%edi) .endm # in order to use the 4 line parallel biquad routine on horizontal # lines, we need to reorder (rotate or transpose) the matrix, since # images are scanline encoded, and we want to work in parallell # on 4 lines. # # since the 4 lines are independent, it doesnt matter in which order # the the vector elements are present. # # this allows us to use the same routine for left->right and right->left # processing. # # some comments on the non-abelean group of square isometries consisting of # (I) identity # (H) horizontal axis mirror # (V) vertical axis mirror # (T) transpose (diagonal axis mirror) # (A) antitranspose (antidiagonal axis mirror) # (R1) 90deg anticlockwize rotation # (R2) 180deg rotation # (R3) 90deg clockwize rotation # # # we basicly have two options: (R1,R3) or (T,A) # we opt for T and A because they are self inverting, which improves locality # # use antitranspose for right to left an transpose # for left to right (little endian) # antitranspose 4x4 # input # %mm3 == {d0 d1 d2 d3} # %mm2 == {c0 c1 c2 c3} # %mm1 == {b0 b1 b2 b3} # %mm0 == {a0 a1 a2 a3} # output # %mm3 == {a3 b3 c3 d3} # %mm2 == {a2 b2 c2 d2} # %mm1 == {a1 b1 c1 d1} # %mm0 == {a0 b0 c0 d0} .macro antitranspose_4x4: movq %mm3, %mm4 punpcklwd %mm1, %mm4 # mm4 <- {b2 d2 b3 d3} movq %mm3, %mm5 punpckhwd %mm1, %mm5 # mm5 <- {b0 d0 b1 d1} movq %mm2, %mm6 punpcklwd %mm0, %mm6 # mm6 <- {a2 c2 a3 c3} movq %mm2, %mm7 punpckhwd %mm0, %mm7 # mm7 <- {a0 c0 a1 c1} movq %mm4, %mm3 punpcklwd %mm6, %mm3 # mm3 <- {a3 b3 c3 d3} movq %mm4, %mm2 punpckhwd %mm6, %mm2 # mm2 <- {a2 b2 c2 d2} movq %mm5, %mm1 punpcklwd %mm7, %mm1 # mm1 <- {a1 b1 c1 d1} movq %mm5, %mm0 punpckhwd %mm7, %mm0 # mm0 <- {a0 b0 c0 d0} .endm # transpose 4x4 # input # %mm3 == {d3 d2 d1 d0} # %mm2 == {c3 c2 c1 c0} # %mm1 == {b3 b2 b1 b0} # %mm0 == {a3 a2 a1 a0} # output # %mm3 == {d3 c3 b3 a3} # %mm2 == {d2 c2 b2 a2} # %mm1 == {d1 c1 b1 a1} # %mm0 == {d0 c0 b0 a0} .macro transpose_4x4: movq %mm0, %mm4 punpcklwd %mm2, %mm4 # mm4 <- {c1 a1 c0 a0} movq %mm0, %mm5 punpckhwd %mm2, %mm5 # mm5 <- {c3 a3 c2 a2} movq %mm1, %mm6 punpcklwd %mm3, %mm6 # mm6 <- {d1 b1 d0 b0} movq %mm1, %mm7 punpckhwd %mm3, %mm7 # mm7 <- {d3 b3 d2 b2} movq %mm4, %mm0 punpcklwd %mm6, %mm0 # mm0 <- {d0 c0 b0 a0} movq %mm4, %mm1 punpckhwd %mm6, %mm1 # mm1 <- {d1 c1 b1 a1} movq %mm5, %mm2 punpcklwd %mm7, %mm2 # mm2 <- {d2 c2 b2 a2} movq %mm5, %mm3 punpckhwd %mm7, %mm3 # mm3 <- {d3 c3 b3 a3} .endm .globl pixel_biquad_vertb_s16 .type pixel_biquad_vertb_s16,@function # pixel_biquad_vertbr_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_vertb_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_vertb_line_loop: movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 biquad_4x4_pixels movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) addl %edx, %ebx addl %eax, %ebx decl %ecx jnz .biquad_vertb_line_loop emms pop %edi pop %esi pop %ebx leave ret .globl pixel_biquad_verbt_s16 .type pixel_biquad_verbt_s16,@function # pixel_biquad_vertbt_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_verbt_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %eax # line with shll $3, %eax # 4 line byte spacing decl %ecx mul %ecx incl %ecx addl %eax, %ebx # ebx points to last pixblock movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_verbt_line_loop: movq (%ebx), %mm3 movq (%ebx,%edx,1), %mm2 movq (%ebx,%edx,2), %mm1 movq (%ebx,%eax,1), %mm0 biquad_4x4_pixels movq %mm3, (%ebx) movq %mm2, (%ebx,%edx,1) movq %mm1, (%ebx,%edx,2) movq %mm0, (%ebx,%eax,1) subl %edx, %ebx subl %eax, %ebx decl %ecx jnz .biquad_verbt_line_loop emms pop %edi pop %esi pop %ebx leave ret .globl pixel_biquad_horlr_s16 .type pixel_biquad_horlr_s16,@function # pixel_biquad_hor_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_horlr_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_horlr_line_loop: movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 transpose_4x4 biquad_4x4_pixels transpose_4x4 movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) addl $8, %ebx decl %ecx jnz .biquad_horlr_line_loop emms pop %edi pop %esi pop %ebx leave ret .globl pixel_biquad_horrl_s16 .type pixel_biquad_horrl_s16,@function # pixel_biquad_horrl_s16(char *pixel_array, int nb_rows, int linewidth, short int coef[20], short int state[8]) pixel_biquad_horrl_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %ecx # nb of 4x4 pixblocks movl 16(%ebp), %edx # line with movl %ecx, %eax decl %eax shll $3, %eax addl %eax, %ebx # ebx points to last pixblock movl 20(%ebp), %esi # coefs movl 24(%ebp), %edi # state shll $1, %edx # short int addressing movl %edx, %eax shll $1, %eax addl %edx, %eax # eax = 3 * edx .align 16 .biquad_horrl_line_loop: movq (%ebx), %mm0 movq (%ebx,%edx,1), %mm1 movq (%ebx,%edx,2), %mm2 movq (%ebx,%eax,1), %mm3 antitranspose_4x4 biquad_4x4_pixels antitranspose_4x4 movq %mm0, (%ebx) movq %mm1, (%ebx,%edx,1) movq %mm2, (%ebx,%edx,2) movq %mm3, (%ebx,%eax,1) subl $8, %ebx decl %ecx jnz .biquad_horrl_line_loop emms pop %edi pop %esi pop %ebx leave ret .globl pixel_biquad_time_s16 .type pixel_biquad_time_s16,@function # pixel_biquad_time_s16(short int *pixel_array, short int *s1, short int *s2, short int *coefs, int nb_4_pix_vectors) pixel_biquad_time_s16: pushl %ebp movl %esp, %ebp push %ebx push %esi push %edi movl 8(%ebp), %ebx # pixel array offset movl 12(%ebp), %edx # state 1 array movl 16(%ebp), %edi # state 2 array movl 20(%ebp), %esi # coefs movl 24(%ebp), %ecx # nb of 4 pixel vectors .align 16 .biquad_time_loop: movq (%ebx), %mm0 # get input movq (%edx), %mm4 # get state 1 movq (%edi), %mm5 # get state 2 df2 %mm0 # compute direct form 2 movq %mm0, (%ebx) # write output movq %mm5, (%edi) # write state 2 movq %mm4, (%edx) # write state 1 addl $8, %ebx addl $8, %edi addl $8, %edx decl %ecx jnz .biquad_time_loop emms pop %edi pop %esi pop %ebx leave ret --- NEW FILE: pixel_conv_hor_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # intermediate function # input in register: # %mm0: left 4 pixels # %mm1: middle 4 pixels # %mm2: right 4 pixels # %mm5: left 4 pixel masks # %mm6: middle 4 pixel masks # %mm7: right 4 pixel masks # return in register: # %mm0: middle 4 pixels result .conv_hor_4_pixels: .align 16 # compute quadruplet # get left pixels psrlq $48, %mm0 # shift word 3 to byte 0 movq %mm1, %mm4 psllq $16, %mm4 # shift word 0,1,2 to 1,2,3 por %mm4, %mm0 # combine pmulhw %mm5, %mm0 psllw $1, %mm0 # get middle pixels movq %mm1, %mm4 pmulhw %mm6, %mm4 psllw $1, %mm4 paddsw %mm4, %mm0 # get right pixels movq %mm2, %mm3 psllq $48, %mm3 # shift word 0 to word 3 movq %mm1, %mm4 psrlq $16, %mm4 # shift word 1,2,3 to 0,1,2 por %mm4, %mm3 # combine pmulhw %mm7, %mm3 psllw $1, %mm3 paddsw %mm3, %mm0 # accumulate ret .globl pixel_conv_hor_s16 .type pixel_conv_hor_s16,@function # pixel_conv_hor_s16(short int *pixel_array, int nb_4_pixel_vectors, short int border[4], short int mask[12]) # horizontal unsigned pixel conv (1/4 1/2 1/4) not tested # NOT TESTED pixel_conv_hor_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %esi # pixel array offset movl 12(%ebp), %ecx # nb of 8 pixel vectors in a row (at least 2) movl 20(%ebp), %edi # mask vector movq (%edi), %mm5 movq 8(%edi), %mm6 movq 16(%edi), %mm7 movl 16(%ebp), %edi # boundary pixel vector movq (%edi), %mm0 # init regs (left edge, so mm0 is zero) movq (%esi), %mm1 movq 8(%esi), %mm2 decl %ecx # loop has 2 terminator stubs decl %ecx # todo: handle if ecx < 3 jmp .conv_line_loop .align 16 .conv_line_loop: call .conv_hor_4_pixels # compute conv movq %mm0, (%esi) # store result movq %mm1, %mm0 # mm0 <- prev (%esi) movq %mm2, %mm1 # mm1 <- 8(%esi) movq 16(%esi), %mm2 # mm2 <- 16(%esi) addl $8, %esi # increase pointer decl %ecx jnz .conv_line_loop call .conv_hor_4_pixels # compute conv movq %mm0, (%esi) # store result movq %mm1, %mm0 # mm0 <- prev (%esi) movq %mm2, %mm1 # mm1 <- 8(%esi) movq (%edi), %mm2 # mm2 <- border call .conv_hor_4_pixels # compute last vector movq %mm0, 8(%esi) # store it emms pop %edi pop %esi leave ret --- NEW FILE: pixel_crot_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_crot3d_s16 .type pixel_crot3d_s16,@function # 3 dimensional colour space rotation # 3x3 matrix is column encoded, each coefficient is a 4x16 bit fixed point vector # void pixel_crot3d_s16(int *buf, int nb_4pixel_vectors_per_plane, short int *matrix) pixel_crot3d_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %esi # input array movl 12(%ebp), %ecx # pixel count movl 16(%ebp), %edi # rotation matrix movl %ecx, %edx shll $3, %edx # %edx = plane spacing .align 16 .loop_crot3d: movq (%esi), %mm0 # get 1st component movq (%esi,%edx,1), %mm6 # get 2nd component movq (%esi,%edx,2), %mm7 # get 3rd component movq %mm0, %mm1 # copy 1st component movq %mm0, %mm2 pmulhw (%edi), %mm0 # mul first column pmulhw 8(%edi), %mm1 pmulhw 16(%edi), %mm2 movq %mm6, %mm5 # copy 2nd component movq %mm6, %mm3 pmulhw 24(%edi), %mm6 # mul second column pmulhw 32(%edi), %mm5 pmulhw 40(%edi), %mm3 paddsw %mm6, %mm0 # accumulate paddsw %mm5, %mm1 paddsw %mm3, %mm2 movq %mm7, %mm4 # copy 3rd component movq %mm7, %mm6 pmulhw 48(%edi), %mm4 # mul third column pmulhw 56(%edi), %mm6 pmulhw 64(%edi), %mm7 paddsw %mm4, %mm0 # accumulate paddsw %mm6, %mm1 paddsw %mm7, %mm2 paddsw %mm0, %mm0 # double (fixed point normalization) paddsw %mm1, %mm1 paddsw %mm2, %mm2 movq %mm0, (%esi) # store movq %mm1, (%esi, %edx, 1) movq %mm2, (%esi, %edx, 2) addl $8, %esi # increment source pointer decl %ecx jnz .loop_crot3d # loop emms pop %edi pop %esi leave ret .globl pixel_crot2d_s16 .type pixel_crot2d_s16,@function # 2 dimensional colour space rotation # 2x2 matrix is column encoded, each coefficient is a 4x16 bit fixed point vector # void pixel_crot2d_s16(int *buf, int nb_4pixel_vectors_per_plane, short int *matrix) pixel_crot2d_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %esi # input array movl 12(%ebp), %ecx # pixel count movl 16(%ebp), %edi # rotation matrix movl %ecx, %edx shll $3, %edx # %edx = plane spacing .align 16 .loop_crot2d: movq (%esi), %mm0 # get 1st component movq (%esi,%edx,1), %mm2 # get 2nd component movq %mm0, %mm1 # copy 1st component movq %mm2, %mm3 # copy 2nd component pmulhw (%edi), %mm0 # mul first column pmulhw 8(%edi), %mm1 pmulhw 16(%edi), %mm2 # mul second column pmulhw 24(%edi), %mm3 paddsw %mm2, %mm0 # accumulate paddsw %mm3, %mm1 paddsw %mm0, %mm0 # fixed point gain correction paddsw %mm1, %mm1 movq %mm0, (%esi) # store movq %mm1, (%esi, %edx, 1) addl $8, %esi # increment source pointer decl %ecx jnz .loop_crot2d # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_s1.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # # this file contains ops for binary image processing # 8x8 bit tile encoded # low byte = bottom row # low bit = right column # %mm7 = scratch reg for all macros # ************ load mask ******************* # compute bit masks for rows and columns # %mm7: scratch reg # load mask top .macro ldmt count reg pcmpeqb \reg, \reg psllq $(64-(\count<<3)), \reg .endm # load mask bottom .macro ldmb count reg pcmpeqb \reg, \reg psrlq $(64-(\count<<3)), \reg .endm # load mask top and bottom .macro ldmtb count regt regb ldmb \count, \regb ldmt \count, \regt .endm # load mask right .macro ldmr count reg pcmpeqb %mm7, %mm7 psrlw $(16-\count), %mm7 movq %mm7, \reg psllq $8, %mm7 por %mm7, \reg .endm # load mask left .macro ldml count reg pcmpeqb %mm7, %mm7 psllw $(16-\count), %mm7 movq %mm7, \reg psrlq $8, %mm7 por %mm7, \reg .endm # load mask left and right .macro ldmlr count regl regr pcmpeqb %mm7, %mm7 psllw $(16-\count), %mm7 movq %mm7, \regl psrlq $8, %mm7 por %mm7, \regl movq \regl, \regr psrlq $(8-\count), \regr .endm # ************* shift square ********** # shifts a square in reg, fills with zeros # shift square top .macro sst count reg psllq $(\count<<3), \reg .endm # shift square bottom .macro ssb count reg psrlq $(\count<<3), \reg .endm # not tested # shift square left .macro ssl count reg movq \reg, %mm7 pcmpeqb \reg, \reg psllw $(16-\count), \reg psrlw $8, \reg pandn %mm7, \reg psllw $(\count), \reg .endm # shift square right .macro ssr count reg movq \reg, %mm7 pcmpeqb \reg, \reg psrlw $(16-\count), \reg psllw $8, \reg pandn %mm7, \reg psrlw $(\count), \reg .endm # ********** combine square ************* # combines 2 squares # combine right .macro csr count regr reg ssl \count, \reg ssr (8-\count), \regr por \regr, \reg .endm # combine left .macro csl count regl reg ssr \count, \reg ssl (8-\count), \regl por \regl, \reg .endm # combine top .macro cst count regt reg ssb \count, \reg sst (8-\count), \regt por \regt, \reg .endm # combine bottom .macro csb count regb reg sst \count, \reg ssb (8-\count), \regb por \regb, \reg .endm # ********** load combine square ************* # loads combined square using mask # load combined square left # mask should be count bits set right (i.e. 0x01) .macro lcsml count mask source sourcel dstreg movq \mask, \dstreg movq \mask, %mm7 pandn \source, \dstreg pand \sourcel, %mm7 psrlq $(\count), \dstreg psllq $(8-\count), %mm7 por %mm7, \dstreg .endm .globl pixel_test_s1 .type pixel_test_s1,@function # simple add # void pixel_add_s16(void *dest, void *source, int nb_squares, int spacing) # pixel_test_s1: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %edi # dest movl 12(%ebp), %esi # source movl 16(%ebp), %ecx # count movl 20(%ebp), %edx # row distance ldmr 1, %mm6 lcsml 1, %mm6, (%esi), 8(%esi), %mm0 movq %mm0, (%edi) # movq (%esi), %mm0 # movq 8(%esi), %mm1 # csl 4, %mm1, %mm0 # movq %mm0, (%edi) emms pop %edi pop %esi leave ret --- NEW FILE: pdp_mmx_test.c --- #include "pdp_mmx.h" #define FP(x) ((short int)(((float)(x) * 2 * 256.0f))) #define nbp 256 short int a1[4] = {0x0100,0x0100,0x0100,0x0100}; short int a2[4] = {0x0100,0x0100,0x0100,0x0100}; short int b0[4] = {0x0100,0x0100,0x0100,0x0100}; short int b1[4] = {0x0100,0x0100,0x0100,0x0100}; short int b2[4] = {0x0100,0x0100,0x0100,0x0100}; short int u1[4] = {0x0100,0x0100,0x0100,0x0100}; short int u2[4] = {0x0100,0x0100,0x0100,0x0100}; short int x0[4] = {0x0100,0x0100,0x0100,0x0100}; short int x1[4] = {0x0100,0x0100,0x0100,0x0100}; short int x2[4] = {0x0100,0x0100,0x0100,0x0100}; short int x3[4] = {0x0100,0x0100,0x0100,0x0100}; void print_pixel(unsigned int i) { if (i) printf("x "); else printf(". "); } void print_line(void) { printf("\n"); } void print_square(unsigned char *c) { int i,j; for(j=7; j>=0; j--){ for(i=0; i<8; i++) print_pixel(c[j] & (1<<(7-i))); printf("\n"); } } main() { unsigned char src[16]={1,2,3,4,5,6,7,8,-1,-2,-3,-4,-5,-6,-7,-8}; unsigned char dst[8]; print_square(src); print_line(); print_square(src+8); print_line(); pixel_test_s1(dst,src,1,1); print_square(dst); print_line(); } --- NEW FILE: pixel_mul_s16.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_mul_s16 .type pixel_mul_s16,@function # simple add # void pixel_mul_s16(int *left, int *right, int nb_4pixel_vectors) pixel_mul_s16: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %edi # left array movl 12(%ebp), %esi # right array movl 16(%ebp), %ecx # pixel count .align 16 .loop_mix: # prefetch 128(%esi) movq (%esi), %mm1 # load right 4 pixels from memory movq (%edi), %mm0 # load 4 left pixels from memory pmulhw %mm1, %mm0 # mul psllw $1, %mm0 # fixed point shift correction movq %mm0, (%edi) addl $8, %esi addl $8, %edi decl %ecx jnz .loop_mix # loop emms pop %edi pop %esi leave ret --- NEW FILE: pixel_gain.s --- # Pure Data Packet mmx routine. # Copyright (c) by Tom Schouten <pdp(a)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. # .globl pixel_gain .type pixel_gain,@function # mmx rgba pixel gain # void asmtest(char *pixelarray, int32 nbpixels, int *rgba_gain) # gains are 7.9 fixed point for rgba pixel_gain: pushl %ebp movl %esp, %ebp push %esi push %edi movl 8(%ebp), %esi # pixel array offset movl 12(%ebp), %ecx # nb of elements movl 16(%ebp), %edi # int16[4] array of gains prefetch (%esi) emms sarl $2, %ecx # process 4 pixels per loop iteration jz .exit movq (%edi), %mm7 # read gain array from memory jmp .loop_gain .align 16 .loop_gain: prefetch 128(%esi) movq (%esi), %mm5 # load pixel 1-2 from memory movq 8(%esi), %mm6 # load pixel 3-4 from memory pxor %mm0, %mm0 # zero mm0 - mm3 pxor %mm1, %mm1 pxor %mm2, %mm2 pxor %mm3, %mm3 punpcklbw %mm5, %mm0 # unpack 1st pixel into 8.8 bit ints punpckhbw %mm5, %mm1 # unpack 2nd punpcklbw %mm6, %mm2 # unpack 3rd punpckhbw %mm6, %mm3 # unpack 4th psrlw $0x1, %mm0 # shift right to clear sign bit 9.7 psrlw $0x1, %mm1 psrlw $0x1, %mm2 psrlw $0x1, %mm3 pmulhw %mm7, %mm0 # multiply 1st pixel 9.7 * 7.9 -> 16.0 pmulhw %mm7, %mm1 # multiply 2nd pmulhw %mm7, %mm2 # multiply 3rd pmulhw %mm7, %mm3 # multiply 4th packuswb %mm1, %mm0 # pack & saturate to 8bit vector movq %mm0, (%esi) # store result in memory packuswb %mm3, %mm2 # pack & saturate to 8bit vector movq %mm2, 8(%esi) # store result in memory addl $16, %esi # increment source pointer decl %ecx jnz .loop_gain # loop .exit: emms pop %edi pop %esi leave ret

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2005