Pd-cvs September 2006

pd-cvs@lists.iem.at

19 participants
346 discussions

externals/pdp/system/png pdp_png.c,1.3,1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/system/png In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/system/png Modified Files: pdp_png.c Log Message: pdp current darcs merge Index: pdp_png.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/system/png/pdp_png.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_png.c 16 Dec 2005 01:05:40 -0000 1.3 --- pdp_png.c 1 Sep 2006 13:45:31 -0000 1.4 *************** *** 89,93 **** static int _open_read(t_png_image* x, char *file) { ! char header[SIG_BYTES]; int is_png; --- 89,93 ---- static int _open_read(t_png_image* x, char *file) { ! unsigned char header[SIG_BYTES]; int is_png; *************** *** 244,248 **** { int nbchans = 0; ! char *image_data; png_bytep row_pointers[x->x_height]; png_uint_32 i; --- 244,248 ---- { int nbchans = 0; ! unsigned char *image_data; png_bytep row_pointers[x->x_height]; png_uint_32 i; *************** *** 278,282 **** int nbchans; t_pdp *h = pdp_packet_header(packet); ! char *image_data = (char *)pdp_packet_data(packet); if (!h) return 0; --- 278,282 ---- int nbchans; t_pdp *h = pdp_packet_header(packet); ! unsigned char *image_data = (unsigned char *)pdp_packet_data(packet); if (!h) return 0;

1 0

externals/pdp/opengl/modules pdp_3d_draw.c,1.3,1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/opengl/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl/modules Modified Files: pdp_3d_draw.c Log Message: pdp current darcs merge Index: pdp_3d_draw.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/modules/pdp_3d_draw.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3d_draw.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3d_draw.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 21,25 **** //#include "GL/gl.h" ! #include <GL/glut.h> #include <math.h> --- 21,26 ---- //#include "GL/gl.h" ! //#include <GL/glut.h> ! #include <GL/glu.h> #include <math.h> *************** *** 163,167 **** static void draw_wcube(t_drawcommand *x) { ! glutWireCube(x->x_p0); } --- 164,178 ---- static void draw_wcube(t_drawcommand *x) { ! x->x_p1 = x->x_p0; // set square z coord; ! glPushMatrix(); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glRotatef(90, 0,1,0); ! draw_wsquare(x); ! glPopMatrix(); ! } *************** *** 170,176 **** x->x_p1 = x->x_p0; // set square z coord; - //glutSolidCube(x->x_p0); - - //glMatrixMode(GL_MODELVIEW); glPushMatrix(); draw_square(x); --- 181,184 ---- *************** *** 202,206 **** if (m < 1) m = n; ! glutWireTorus(ri, ro, n, m); } --- 210,214 ---- if (m < 1) m = n; ! // glutWireTorus(ri, ro, n, m); } *************** *** 216,220 **** if (m < 1) m = n; ! glutSolidTorus(ri, ro, n, m); } --- 224,228 ---- if (m < 1) m = n; ! // glutSolidTorus(ri, ro, n, m); } *************** *** 230,234 **** if (m < 1) m = n; ! glutSolidCone(base, height, n, m); } --- 238,242 ---- if (m < 1) m = n; ! // glutSolidCone(base, height, n, m); } *************** *** 244,248 **** if (m < 1) m = n; ! glutWireCone(base, height, n, m); } --- 252,256 ---- if (m < 1) m = n; ! // glutWireCone(base, height, n, m); } *************** *** 251,255 **** { float f = x->x_p0; ! glutWireTeapot(f); } --- 259,263 ---- { float f = x->x_p0; ! // glutWireTeapot(f); } *************** *** 258,262 **** { float f = x->x_p0; ! glutSolidTeapot(f); } --- 266,270 ---- { float f = x->x_p0; ! // glutSolidTeapot(f); } *************** *** 271,275 **** if (m < 1) m = n; ! glutWireSphere(f, n, m); } --- 279,283 ---- if (m < 1) m = n; ! // glutWireSphere(f, n, m); } *************** *** 290,302 **** } ! static void draw_dodeca(t_drawcommand *x){glutSolidDodecahedron();} ! static void draw_octa(t_drawcommand *x) {glutSolidOctahedron();} ! static void draw_tetra(t_drawcommand *x) {glutSolidTetrahedron();} ! static void draw_icosa(t_drawcommand *x) {glutSolidIcosahedron();} ! static void draw_wdodeca(t_drawcommand *x){glutWireDodecahedron();} ! static void draw_wocta(t_drawcommand *x) {glutWireOctahedron();} ! static void draw_wtetra(t_drawcommand *x) {glutWireTetrahedron();} ! static void draw_wicosa(t_drawcommand *x) {glutWireIcosahedron();} --- 298,310 ---- } ! static void draw_dodeca(t_drawcommand *x){ /* glutSolidDodecahedron(); */ } ! static void draw_octa(t_drawcommand *x) { /* glutSolidOctahedron(); */ } ! static void draw_tetra(t_drawcommand *x) { /* glutSolidTetrahedron(); */ } ! static void draw_icosa(t_drawcommand *x) { /* glutSolidIcosahedron(); */ } ! static void draw_wdodeca(t_drawcommand *x){ /* glutWireDodecahedron(); */ } ! static void draw_wocta(t_drawcommand *x) { /* glutWireOctahedron(); */ } ! static void draw_wtetra(t_drawcommand *x) { /* glutWireTetrahedron(); */ } ! static void draw_wicosa(t_drawcommand *x) { /* glutWireIcosahedron(); */ }

1 0

externals/pdp/opengl/system pdp_3Dcontext_common.c, 1.3, 1.4 pdp_3Dcontext_glx.c, 1.3, 1.4 pdp_opengl.c, 1.3, 1.4 setup.c, 1.3, 1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/opengl/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl/system Modified Files: pdp_3Dcontext_common.c pdp_3Dcontext_glx.c pdp_opengl.c setup.c Log Message: pdp current darcs merge Index: pdp_3Dcontext_common.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_3Dcontext_common.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3Dcontext_common.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3Dcontext_common.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 29,35 **** #include "pdp_3Dcontext.h" #include <GL/gl.h> - //#include <GL/glx.h> #include <GL/glu.h> - //#include <GL/glut.h> #define D if (0) --- 29,33 ---- Index: pdp_3Dcontext_glx.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_3Dcontext_glx.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_3Dcontext_glx.c 16 Dec 2005 01:05:35 -0000 1.3 --- pdp_3Dcontext_glx.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 29,33 **** #include <GL/glx.h> #include <GL/glu.h> - //#include <GL/glut.h> /* all symbols are C-style */ --- 29,32 ---- Index: setup.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/setup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.c 16 Dec 2005 01:05:36 -0000 1.3 --- setup.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 47,54 **** #define D(x) x void pdp_opengl_setup(void) { int i; ! post("PDP: pdp_opengl extension library"); /* setup system */ --- 47,59 ---- #define D(x) x + + void pdp_setup(void); void pdp_opengl_setup(void) { int i; ! ! pdp_setup(); ! ! post("PDP: opengl extensions version " PDP_VERSION); /* setup system */ Index: pdp_opengl.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/system/pdp_opengl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_opengl.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_opengl.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 57,60 **** --- 57,61 ---- } + /* kernel setup */ void pdp_opengl_system_setup(void) *************** *** 69,72 **** --- 70,74 ---- /* add pdp_control method for thread */ pdp_control_addmethod((t_method)pdp_control_thread, gensym("3dthread")); + }

1 0

externals/pdp/opengl Makefile, 1.3, 1.4 Makefile.config, 1.3, 1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/opengl Modified Files: Makefile Makefile.config Log Message: pdp current darcs merge Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 16 Dec 2005 01:05:34 -0000 1.3 --- Makefile 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 25,27 **** pdp_opengl.pd_darwin: subdirs rm -f pdp_opengl.pd_linux ! $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -bundle -bundle_loader $(PD_EXECUTABLE) --- 25,44 ---- pdp_opengl.pd_darwin: subdirs rm -f pdp_opengl.pd_linux ! $(CC) -o pdp_opengl.pd_pd_darwin ../modules/*/*.o ../system/pdp.o ../system/*/*.o ../puredata/*.o modules/*.o system/*.o $(PDP_LIBS) -bundle -undefined error -twolevel_namespace -bundle_loader $(PD_EXECUTABLE) ! ! ! # $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -dynamic -bundle -flat_namespace -undefined suppress ! # $(CC) -o pdp_opengl.pd_pd_darwin modules/*.o system/*.o $(LDFLAGS) -g -bundle -bundle_loader $(PD_EXECUTABLE) ! ! install: all ! test -d $(prefix)/lib/pd #check if pd is installed. if this fails make install will stop here. ! install -d $(prefix)/lib/pd/extra ! install -m 755 $(PDP_OPENGL_LIBRARY_NAME) $(prefix)/lib/pd/extra ! install -m 644 abstractions/*.pd $(prefix)/lib/pd/extra ! install -m 644 doc/objects/*.pd $(prefix)/lib/pd/doc/5.reference ! install -m 755 -d $(prefix)/lib/pd/doc/pdp ! install -m 755 -d $(prefix)/lib/pd/doc/pdp/introduction ! install -m 755 -d $(prefix)/lib/pd/doc/pdp/examples_opengl ! install -m 644 doc/reference_opengl.txt $(prefix)/lib/pd/doc/pdp ! install -m 644 doc/examples/*.pd $(prefix)/lib/pd/doc/pdp/examples_opengl ! Index: Makefile.config =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/opengl/Makefile.config,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.config 16 Dec 2005 01:05:34 -0000 1.3 --- Makefile.config 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 1,6 **** - PD_DIR = /home/tom/pd/distro/pd/src - PDP_DIR = /home/tom/pd/packet/include - PDP_OGL_DIR = /home/tom/pd/packet/opengl/include --- 1,8 ---- + prefix = /usr/local + + PDP_VERSION=0.12.5-darcs + PDP_DIR = ../../include + PDP_OGL_DIR = ../include *************** *** 9,17 **** -Wno-unused -Wno-parentheses -Wno-switch -g ! CPPFLAGS = -I$(PD_DIR) -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include LDFLAGS = -lGL -lglut TARGET=linux #uncomment these for darwin: #TARGET=darwin --- 11,24 ---- -Wno-unused -Wno-parentheses -Wno-switch -g ! ! CPPFLAGS = -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include -DPDP_VERSION=\"$(PDP_VERSION)\" ! # CPPFLAGS = -I$(PD_DIR) -I$(PDP_DIR) -I$(PDP_OGL_DIR) -I/usr/X11R6/include ! LDFLAGS = -lGL -lglut TARGET=linux + PDP_OPENGL_LIBRARY_NAME=pdp_opengl.pd_$(TARGET) + #uncomment these for darwin: #TARGET=darwin

1 0

externals/pdp/modules/image_basic pdp_cheby.c,1.3,1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/modules/image_basic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/modules/image_basic Modified Files: pdp_cheby.c Log Message: pdp current darcs merge Index: pdp_cheby.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/image_basic/pdp_cheby.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_cheby.c 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_cheby.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 45,49 **** { t_pdp_cheby *x = (t_pdp_cheby *)params; ! int index; /* if there's no array, return the identity function */ --- 45,49 ---- { t_pdp_cheby *x = (t_pdp_cheby *)params; ! int indx; /* if there's no array, return the identity function */ *************** *** 51,56 **** /* else interpolate the array */ ! index = ((f + 1) * 0.5) * (x->x_nbpoints - 1); ! return x->x_vec[index]; } --- 51,56 ---- /* else interpolate the array */ ! indx = ((f + 1) * 0.5) * (x->x_nbpoints - 1); ! return x->x_vec[indx]; }

1 0

externals/pdp/include pdp_comm.h, 1.3, 1.4 pdp_config.h, 1.3, 1.4 pdp_list.h, 1.3, 1.4 pdp_mem.h, 1.3, 1.4 pdp_net.h, 1.4, 1.5 pdp_packet.h, 1.3, 1.4 pdp_post.h, 1.3, 1.4 pdp_queue.h, 1.3, 1.4 pdp_types.h, 1.4, 1.5
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/include Modified Files: pdp_comm.h pdp_config.h pdp_list.h pdp_mem.h pdp_net.h pdp_packet.h pdp_post.h pdp_queue.h pdp_types.h Log Message: pdp current darcs merge Index: pdp_config.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_config.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_config.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_config.h 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 30,37 **** /* build pdp_sdl */ ! /* #undef HAVE_PDP_SDL */ /* build pdp_v4l */ ! /* #undef HAVE_PDP_V4L */ /* experimental vforth dsp engine */ --- 30,37 ---- /* build pdp_sdl */ ! #define HAVE_PDP_SDL 1 /* build pdp_v4l */ ! #define HAVE_PDP_V4L 1 /* experimental vforth dsp engine */ Index: pdp_list.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_list.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_list.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_list.h 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 180,184 **** t_pdp_atom *pdp_list_pop_atom (t_pdp_list *l); t_pdp_word pdp_list_pop (t_pdp_list *l); ! t_pdp_word pdp_list_index (t_pdp_list *l, int index); void pdp_list_pop_push (t_pdp_list *source, t_pdp_list *dest); --- 180,184 ---- t_pdp_atom *pdp_list_pop_atom (t_pdp_list *l); t_pdp_word pdp_list_pop (t_pdp_list *l); ! t_pdp_word pdp_list_index (t_pdp_list *l, int indx); void pdp_list_pop_push (t_pdp_list *source, t_pdp_list *dest); Index: pdp_packet.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_packet.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_packet.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_packet.h 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 50,54 **** The interface to the packet manager contains the following managing methods: ! * pdp_packet_new: create a new packet or reuse a previous one * pdp_packet_mark_unused: release a packet * pdp_packet_copy_ro: register a packet for read only use --- 50,54 ---- The interface to the packet manager contains the following managing methods: ! * pdp_packet_create: create a new packet * pdp_packet_mark_unused: release a packet * pdp_packet_copy_ro: register a packet for read only use *************** *** 56,59 **** --- 56,62 ---- * pdp_packet_clone_rw: create a new packet using a template, but don't copy the data + ( some types have shortcut methods pdp_packet_new_ which create/reuse a packet + unless you are writing a factory method for a packet, you should NEVER call a _create method ) + And two methods for raw data access Index: pdp_net.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_net.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pdp_net.h 16 Dec 2005 02:55:15 -0000 1.4 --- pdp_net.h 1 Sep 2006 13:45:29 -0000 1.5 *************** *** 115,119 **** void *x_data; struct sockaddr_in x_source_socket; ! int x_sslen; int x_receive_finished; int x_packet_transferred; --- 115,119 ---- void *x_data; struct sockaddr_in x_source_socket; ! socklen_t x_sslen; int x_receive_finished; int x_packet_transferred; Index: pdp_types.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_types.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pdp_types.h 16 Dec 2005 01:05:32 -0000 1.4 --- pdp_types.h 1 Sep 2006 13:45:30 -0000 1.5 *************** *** 25,36 **** #define PDP_TYPES_H typedef signed char s8; typedef signed short s16; ! typedef signed long s32; typedef signed long long s64; typedef unsigned char u8; typedef unsigned short u16; ! typedef unsigned long u32; typedef unsigned long long u64; --- 25,47 ---- #define PDP_TYPES_H + /* check + http://www.unix.org/whitepapers/64bit.html + on unix (LP64) int = 32bit + + it was like this: + + typedef signed long s32; + typedef unsigned long u32; + */ + + typedef signed char s8; typedef signed short s16; ! typedef signed int s32; typedef signed long long s64; typedef unsigned char u8; typedef unsigned short u16; ! typedef unsigned int u32; typedef unsigned long long u64; Index: pdp_queue.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_queue.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_queue.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_queue.h 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 83,87 **** void pdp_procqueue_flush(t_pdp_procqueue *q); void pdp_procqueue_wait(t_pdp_procqueue *q); ! void pdp_procqueue_finish(t_pdp_procqueue *q, int index); void pdp_procqueue_add(t_pdp_procqueue *q, void *owner, void *process, void *callback, int *queue_id); void pdp_procqueue_use_thread(t_pdp_procqueue* q, int t); --- 83,87 ---- void pdp_procqueue_flush(t_pdp_procqueue *q); void pdp_procqueue_wait(t_pdp_procqueue *q); ! void pdp_procqueue_finish(t_pdp_procqueue *q, int indx); void pdp_procqueue_add(t_pdp_procqueue *q, void *owner, void *process, void *callback, int *queue_id); void pdp_procqueue_use_thread(t_pdp_procqueue* q, int t); Index: pdp_comm.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_comm.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_comm.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_comm.h 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 38,43 **** don't use these directly!! use the macros instead, in case ! this is proven to be too much of a hack.. */ extern t_symbol s_pdp; extern t_symbol s_register_ro; --- 38,52 ---- don't use these directly!! use the macros instead, in case ! this is proven to be too much of a hack.. ! ! it's too much of a hack. getting rid of them. ! ! */ ! + #define PDP_SYMBOL_HACK 0 + + + #if PDP_SYMBOL_HACK extern t_symbol s_pdp; extern t_symbol s_register_ro; *************** *** 59,62 **** --- 68,85 ---- #define S_CHANMASK &s_chanmask + #else + + #define S_PDP gensym("pdp") + #define S_REGISTER_RO gensym("register_ro") + #define S_REGISTER_RW gensym("register_rw") + #define S_PROCESS gensym("process") + #define S_DPD gensym("dpd") + #define S_INSPECT gensym("inspect") + #define S_ACCUMULATE gensym("accumulate") + #define S_CHANMASK gensym("chanmask") + + + #endif + /* utility methods */ Index: pdp_mem.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_mem.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_mem.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_mem.h 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 30,34 **** /* fast allocator object (for lists and atoms) */ - #define PDP_FASTALLOC_BLOCK_ELEMENTS 4096 typedef struct _pdp_fastalloc { --- 30,33 ---- Index: pdp_post.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/include/pdp_post.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_post.h 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_post.h 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 23,29 **** #define _PDP_POST_H_ /* write a message to log (console) */ ! void pdp_post_n(char *fmt, ...); ! void pdp_post(char *fmt, ...); #endif --- 23,43 ---- #define _PDP_POST_H_ + #include <stdarg.h> + #include <m_pd.h> + /* write a message to log (console) */ ! ! #include <m_pd.h> ! ! // old ! //void pdp_post_n(char *fmt, ...); ! //void pdp_post(char *fmt, ...); ! ! // new ! //void startpost(const char *fmt, ...); ! //void post(const char *fmt, ...); ! ! #define pdp_post_n startpost ! #define pdp_post post #endif

1 0

[PD-cvs] externals/pdp/modules/image_io pdp_glx.c, 1.3, 1.4 pdp_qt.c, 1.3, 1.4 pdp_v4l.c, 1.3, 1.4 pdp_xv.c, 1.3, 1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/modules/image_io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/modules/image_io Modified Files: pdp_glx.c pdp_qt.c pdp_v4l.c pdp_xv.c Log Message: pdp current darcs merge Index: pdp_xv.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/image_io/pdp_xv.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_xv.c 16 Dec 2005 01:05:33 -0000 1.3 --- pdp_xv.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 154,157 **** --- 154,158 ---- static void pdp_xv_bang_callback(t_pdp_xv *x) { + /* receive events + send to outputs */ t_pdp_list *eventlist = pdp_xwindow_get_eventlist(x->x_xwin); Index: pdp_glx.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/image_io/pdp_glx.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_glx.c 16 Dec 2005 01:05:33 -0000 1.3 --- pdp_glx.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 73,76 **** --- 73,77 ---- int x_initialized; int x_autocreate; + int x_interpol; } t_pdp_glx; *************** *** 376,381 **** glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); --- 377,391 ---- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); ! ! if (x->x_interpol){ ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); ! } ! else { ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); ! glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); ! } ! ! glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); *************** *** 486,489 **** --- 496,502 ---- } + static void pdp_glx_interpol(t_pdp_glx *x, t_float finterpol){ + x->x_interpol = (int)finterpol; + } *************** *** 526,529 **** --- 539,544 ---- x->x_tex_height = 64; + x->x_interpol = 1; + //pdp_glx_create(x); *************** *** 564,567 **** --- 579,583 ---- class_addmethod(pdp_glx_class, (t_method)pdp_glx_fullscreen, gensym("fullscreen"), A_NULL); class_addmethod(pdp_glx_class, (t_method)pdp_glx_moveresize, gensym("posdim"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(pdp_glx_class, (t_method)pdp_glx_interpol, gensym("interpol"), A_FLOAT, A_NULL); class_addmethod(pdp_glx_class, (t_method)pdp_glx_tile, gensym("tile"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); Index: pdp_v4l.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/image_io/pdp_v4l.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_v4l.c 16 Dec 2005 01:05:33 -0000 1.3 --- pdp_v4l.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 185,188 **** --- 185,200 ---- } + static void pdp_v4l_pwc_agc(t_pdp_v4l *x, float gain){ + gain *= (float)(1<<16); + int g = (int)gain; + if (g < 0) g = -1; // automatic + if (g > 1<<16) g = 1<<16 - 1; // fixed + + //post("pdp_v4l: setting agc to %d", g); + if (ioctl(x->x_tvfd, VIDIOCPWCSAGC, &g)){ + post("pdp_v4l: pwc: VIDIOCPWCSAGC"); + //goto closit; + } + } static void pdp_v4l_pwc_init(t_pdp_v4l *x) *************** *** 207,214 **** --- 219,237 ---- post("pdp_v4l: detected pwc"); + if(ioctl(x->x_tvfd, VIDIOCPWCRUSER)){ perror("pdp_v4l: pwc: VIDIOCPWCRUSER"); goto closit; } + + /* this is a workaround: + we disable AGC after restoring user prefs + something is wrong with newer cams (like Qickcam 4000 pro) + */ + + if (1){ + pdp_v4l_pwc_agc(x, 1.0); + } + if (ioctl(x->x_tvfd, VIDIOCGWIN, &x->x_vwin)){ *************** *** 825,828 **** --- 848,852 ---- class_addmethod(pdp_v4l_class, (t_method)pdp_v4l_freq, gensym("freq"), A_FLOAT, A_NULL); class_addmethod(pdp_v4l_class, (t_method)pdp_v4l_freqMHz, gensym("freqMHz"), A_FLOAT, A_NULL); + class_addmethod(pdp_v4l_class, (t_method)pdp_v4l_pwc_agc, gensym("gain"), A_FLOAT, A_NULL); class_addmethod(pdp_v4l_class, (t_method)pdp_v4l_format, gensym("captureformat"), A_SYMBOL, A_NULL); Index: pdp_qt.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/image_io/pdp_qt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_qt.c 16 Dec 2005 01:05:33 -0000 1.3 --- pdp_qt.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 20,25 **** ! #include <quicktime/lqt.h> ! #include <quicktime/colormodels.h> #include "pdp.h" --- 20,27 ---- ! //#include <quicktime/lqt.h> ! //#include <quicktime/colormodels.h> ! #include <lqt/lqt.h> ! #include <lqt/colormodels.h> #include "pdp.h"

1 0

externals/pdp/puredata pdp_comm.c, 1.3, 1.4 pdp_queue.c, 1.3, 1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/puredata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/puredata Modified Files: pdp_comm.c pdp_queue.c Log Message: pdp current darcs merge Index: pdp_comm.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/puredata/pdp_comm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_comm.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_comm.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 117,126 **** --- 117,130 ---- pdp_packet_pass_if_valid(t_outlet *outlet, int *packet_ptr) { + + t_pdp *header = pdp_packet_header(*packet_ptr); if (header){ + /* send register phase */ outlet_pdp_register(outlet, *packet_ptr); + /* unregister */ pdp_packet_mark_unused(*packet_ptr); *************** *** 130,134 **** --- 134,140 ---- outlet_pdp_process(outlet); + } + } *************** *** 318,322 **** } ! /* some "accelerated" pd symbols */ --- 324,328 ---- } ! #if PDP_SYMBOL_HACK /* some "accelerated" pd symbols */ *************** *** 330,333 **** --- 336,341 ---- t_symbol s_chanmask = {"chanmask", 0, 0}; + + // internal pd method t_symbol *dogensym(char *s, t_symbol *oldsym); *************** *** 346,349 **** --- 354,358 ---- } + void pdp_pdsym_setup(void) *************** *** 361,364 **** --- 370,379 ---- } + #else + + void pdp_pdsym_setup(void){ + } + + #endif Index: pdp_queue.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/puredata/pdp_queue.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_queue.c 16 Dec 2005 01:05:36 -0000 1.3 --- pdp_queue.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 80,87 **** } ! void pdp_procqueue_finish(t_pdp_procqueue *q, int index) { ! if (-1 == index) { //post("pdp_pq_remove: index == -1"); return; --- 80,87 ---- } ! void pdp_procqueue_finish(t_pdp_procqueue *q, int indx) { ! if (-1 == indx) { //post("pdp_pq_remove: index == -1"); return; *************** *** 91,96 **** /* invalidate callback at index */ ! q->q[index & q->mask].x_callback = 0; ! q->q[index & q->mask].x_queue_id = 0; } --- 91,96 ---- /* invalidate callback at index */ ! q->q[indx & q->mask].x_callback = 0; ! q->q[indx & q->mask].x_queue_id = 0; } *************** *** 365,369 **** /* default pdp queue shortcut methods */ void pdp_queue_wait() {pdp_procqueue_wait(&pdp_queue);} ! void pdp_queue_finish(int index) { pdp_procqueue_finish(&pdp_queue, index);} void pdp_queue_add(void *owner, void *process, void *callback, int *queue_id) { pdp_procqueue_add(&pdp_queue, owner, process, callback, queue_id); --- 365,369 ---- /* default pdp queue shortcut methods */ void pdp_queue_wait() {pdp_procqueue_wait(&pdp_queue);} ! void pdp_queue_finish(int indx) { pdp_procqueue_finish(&pdp_queue, indx);} void pdp_queue_add(void *owner, void *process, void *callback, int *queue_id) { pdp_procqueue_add(&pdp_queue, owner, process, callback, queue_id);

1 0

[PD-cvs] externals/pdp/modules/generic Makefile, 1.3, 1.4 pdp_del.c, 1.3, 1.4 pdp_rawin.c, 1.3, 1.4 pdp_rawout.c, 1.3, 1.4
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/modules/generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/modules/generic Modified Files: Makefile pdp_del.c pdp_rawin.c pdp_rawout.c Log Message: pdp current darcs merge Index: pdp_rawin.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/generic/pdp_rawin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_rawin.c 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_rawin.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 1,4 **** /* ! * Pure Data Packet module. packet forth console * Copyright (c) by Tom Schouten <pdp(a)zzz.kotnet.org> * --- 1,4 ---- /* ! * Pure Data Packet module. Raw packet input * Copyright (c) by Tom Schouten <pdp(a)zzz.kotnet.org> * *************** *** 20,23 **** --- 20,24 ---- + #include <string.h> #include <pthread.h> #include <stdio.h> *************** *** 41,44 **** --- 42,94 ---- + /* TODO: add flow control + + reminder: pthread condition values for synchro + + writing to a queue goes like this: + * pthread_mutex_lock + * atomic op (write) + * pthread_cond_signal + * pthread_mutex_unlock + + reading from a queue goes like this: + * pthread_mutex_lock + * while (!CONDITION) pthread_cond_wait + * atomic op (read) + * pthread_mutex_unlock + + + in this case, there is a reader and a writer, AND a maximum + size of the buffer between them (1 atom) so both reader and writer + might block. compare this to the 'command queue' in libpf, where + only the reader blocks. + + so the course of events is: + + READER + * wait for data ready (COND_READ) this blocks pd, it is assumed data is always ready in normal operation + * consume + * signal writer (COND_WRITE) + + + WRITER + * wait for space ready (COND_WRITE) + * write + * signal reader + + + one remark though: + is this machinery really necessary? + ----------------------------------- + + it might be easier to just read in the pd thread. + the only problem this gives is when data really arrives not in a single chunk, but as a stream. + to me that seems a really awkward special case which can be solved using another PROCESS to + do the buffering / dropping. + + so, for now, it's just synchronous, no threads for sync reading. + + */ + *************** *** 55,58 **** --- 105,109 ---- /* comm */ t_pdp_list *x_queue; // packet queue + int x_pipefd; /* thread */ *************** *** 60,68 **** pthread_attr_t x_attr; pthread_t x_thread; /* sync */ int x_giveup; // 1-> terminate reader thread int x_active; // 1-> reader thread is launched - int x_done; // 1-> reader thread has exited /* config */ --- 111,120 ---- pthread_attr_t x_attr; pthread_t x_thread; + /* sync */ + int x_mode; // 1-> sync to input int x_giveup; // 1-> terminate reader thread int x_active; // 1-> reader thread is launched /* config */ *************** *** 77,212 **** static void rawin_close(t_rawin *x); - static void tick(t_rawin *x) - { - /* send all packets in queue to outlet */ - lock(x); - while (x->x_queue->elements){ - outlet_pdp_atom(x->x_outlet, x->x_queue->first); - pdp_list_pop(x->x_queue); // pop stale reference - } - unlock(x); - clock_delay(x->x_clock, PERIOD); - /* check if thread is done */ - if (x->x_done) rawin_close(x); - } - static void move_current_to_queue(t_rawin *x, int packet) - { - lock(x); - pdp_list_add_back(x->x_queue, a_packet, (t_pdp_word)packet); - unlock(x); - } ! static void *rawin_thread(void *y) ! { ! int pipe; int packet = -1; ! t_rawin *x = (t_rawin *)y; int period_sec; int period_usec; ! ! //D pdp_post("pipe: %s", x->x_pipe->s_name); ! //D pdp_post("type: %s", x->x_type->s_name); ! ! /* open pipe */ ! if (-1 == (pipe = open(x->x_pipe->s_name, O_RDONLY|O_NONBLOCK))){ ! perror(x->x_pipe->s_name); ! goto exit; } ! /* main loop (packets) */ ! while(1){ ! void *data = 0; ! int left = -1; ! /* create packet */ ! if (-1 != packet){ ! pdp_post("WARNING: deleting stale packet"); pdp_packet_mark_unused(packet); } ! packet = pdp_factory_newpacket(x->x_type); ! if (-1 == packet){ ! pdp_post("ERROR: can't create packet. type = %s", x->x_type->s_name); ! goto exit; } - - /* fill packet */ - data = pdp_packet_data(packet); - left = pdp_packet_data_size(packet); - // D pdp_post("packet %d, data %x, size %d", packet, data, left); - - /* inner loop: pipe reads */ - while(left){ - - fd_set inset; - struct timeval tv = {0,10000}; - - /* check if we need to stop */ - if (x->x_giveup){ - pdp_packet_mark_unused(packet); - goto close; - } - /* select, with timeout */ - FD_ZERO(&inset); - FD_SET(pipe, &inset); - if (-1 == select(pipe+1, &inset, NULL,NULL, &tv)){ - pdp_post("select error"); - goto close; - } ! /* if ready, read, else retry */ ! if (FD_ISSET(pipe, &inset)){ ! int bytes = read(pipe, data, left); ! if (!bytes){ ! /* if no bytes are read, pipe is closed */ ! goto close; ! } ! data += bytes; ! left -= bytes; } } ! ! /* move to queue */ ! move_current_to_queue(x, packet); ! packet = -1; ! } - close: - /* close pipe */ - close(pipe); - - - exit: - x->x_done = 1; return 0; } ! static void rawin_type(t_rawin *x, t_symbol *type) ! { ! x->x_type = pdp_gensym(type->s_name); } - static void rawin_open(t_rawin *x, t_symbol *pipe) - { - /* save pipe name if not empty */ - if (pipe->s_name[0]) {x->x_pipe = pipe;} ! if (x->x_active) { ! pdp_post("already open"); ! return; ! } ! /* start thread */ ! x->x_giveup = 0; ! x->x_done = 0; ! pthread_create(&x->x_thread, &x->x_attr, rawin_thread , x); ! x->x_active = 1; } --- 129,251 ---- static void rawin_close(t_rawin *x); ! static int read_packet(t_rawin *x){ ! int packet = -1; ! void *data = 0; ! int left = -1; int period_sec; int period_usec; ! /* create packet */ ! if (-1 != packet){ ! pdp_post("WARNING: deleting stale packet"); ! pdp_packet_mark_unused(packet); } + packet = pdp_factory_newpacket(x->x_type); + if (-1 == packet){ + pdp_post("ERROR: can't create packet. type = %s", x->x_type->s_name); + goto close; + } + + /* fill packet */ + data = pdp_packet_data(packet); + left = pdp_packet_data_size(packet); + // D pdp_post("packet %d, data %x, size %d", packet, data, left); ! /* inner loop: pipe reads */ ! while(left){ ! fd_set inset; ! struct timeval tv = {0,10000}; ! ! /* check if we need to stop */ ! if (x->x_giveup){ pdp_packet_mark_unused(packet); + goto close; } ! /* select, with timeout */ ! FD_ZERO(&inset); ! FD_SET(x->x_pipefd, &inset); ! if (-1 == select(x->x_pipefd+1, &inset, NULL,NULL, &tv)){ ! pdp_post("select error"); ! goto close; } ! /* if ready, read, else retry */ ! if (FD_ISSET(x->x_pipefd, &inset)){ ! int bytes = read(x->x_pipefd, data, left); ! if (!bytes){ ! /* if no bytes are read, pipe is closed */ ! goto close; } + data += bytes; + left -= bytes; } ! } ! return packet; ! close: ! return -1; ! } ! /* reader thread syncs to pipe */ ! static void *rawin_thread(void *y) ! { ! t_rawin *x = (t_rawin *)y; ! int packet = -1; ! ! /* loop until error or close */ ! while (-1 != (packet = read_packet(x))) { ! lock(x); ! pdp_list_add_back(x->x_queue, a_packet, (t_pdp_word)packet); ! unlock(x); } return 0; } + /* sync to stream: + tick polls the receive queue */ + static void rawin_tick(t_rawin *x) + { + int p = -1; + + /* send all packets in queue to outlet */ + while (x->x_queue->elements){ + lock(x); + //pdp_post("%d", x->x_queue->elements); + p = pdp_list_pop(x->x_queue).w_packet; + unlock(x); + //pdp_post_n("%d ", p); + pdp_packet_pass_if_valid(x->x_outlet, &p); + //pdp_post("%d",p); + } + clock_delay(x->x_clock, PERIOD); + } ! /* sync to bang: ! this runs the reader in the pd thread ! */ ! static void rawin_bang(t_rawin *x){ ! if (!x->x_active) return; ! if (x->x_mode) return; ! int packet = read_packet(x); ! if (-1 == packet) rawin_close(x); // close on error ! pdp_packet_pass_if_valid(x->x_outlet, &packet); ! } ! ! ! ! static void rawin_type(t_rawin *x, t_symbol *type) ! { ! x->x_type = pdp_gensym(type->s_name); } *************** *** 218,234 **** /* stop thread: set giveup + wait */ x->x_giveup = 1; ! pthread_join(x->x_thread, NULL); x->x_active = 0; /* notify */ outlet_bang(x->x_sync_outlet); ! pdp_post("connection to %s closed", x->x_pipe->s_name); ! } static void rawin_free(t_rawin *x) { --- 257,306 ---- /* stop thread: set giveup + wait */ x->x_giveup = 1; ! if (x->x_mode) pthread_join(x->x_thread, NULL); x->x_active = 0; + /* close pipe */ + close(x->x_pipefd); + /* notify */ outlet_bang(x->x_sync_outlet); ! pdp_post("pdp_rawin: connection to %s closed", x->x_pipe->s_name); + } + static void rawin_open(t_rawin *x, t_symbol *spipe) + { + /* save pipe name if not empty */ + if (spipe->s_name[0]) {x->x_pipe = spipe;} + + if (x->x_active) { + pdp_post("pdp_rawin: already open"); + return; + } + + /* open pipe */ + if (-1 == (x->x_pipefd = open(x->x_pipe->s_name, O_RDONLY|O_NONBLOCK))){ + perror(x->x_pipe->s_name); + return; + } + + /* thread control vars */ + x->x_giveup = 0; + x->x_active = 1; + + /* start thread if sync mode */ + if (x->x_mode) + pthread_create(&x->x_thread, &x->x_attr, rawin_thread , x); } + + static void rawin_sync(t_rawin *x, t_float fmode){ + rawin_close(x); + x->x_mode = (int)fmode; + } + + static void rawin_free(t_rawin *x) { *************** *** 242,250 **** ! static void *rawin_new(t_symbol *pipe, t_symbol *type) { t_rawin *x; ! pdp_post("%s %s", pipe->s_name, type->s_name); /* allocate & init */ --- 314,322 ---- ! static void *rawin_new(t_symbol *spipe, t_symbol *type) { t_rawin *x; ! pdp_post("%s %s", spipe->s_name, type->s_name); /* allocate & init */ *************** *** 252,260 **** x->x_outlet = outlet_new(&x->x_obj, &s_anything); x->x_sync_outlet = outlet_new(&x->x_obj, &s_anything); ! x->x_clock = clock_new(x, (t_method)tick); x->x_queue = pdp_list_new(0); x->x_active = 0; x->x_giveup = 0; ! x->x_done = 0; x->x_type = pdp_gensym("image/YCrCb/320x240"); //default x->x_pipe = gensym("/tmp/pdpraw"); // default --- 324,332 ---- x->x_outlet = outlet_new(&x->x_obj, &s_anything); x->x_sync_outlet = outlet_new(&x->x_obj, &s_anything); ! x->x_clock = clock_new(x, (t_method)rawin_tick); x->x_queue = pdp_list_new(0); x->x_active = 0; x->x_giveup = 0; ! x->x_mode = 0; x->x_type = pdp_gensym("image/YCrCb/320x240"); //default x->x_pipe = gensym("/tmp/pdpraw"); // default *************** *** 265,269 **** /* args */ rawin_type(x, type); ! if (pipe->s_name[0]) x->x_pipe = pipe; return (void *)x; --- 337,341 ---- /* args */ rawin_type(x, type); ! if (spipe->s_name[0]) x->x_pipe = spipe; return (void *)x; *************** *** 287,294 **** (t_method)rawin_free, sizeof(t_rawin), 0, A_DEFSYMBOL, A_DEFSYMBOL, A_NULL); ! /* add global message handler */ class_addmethod(rawin_class, (t_method)rawin_type, gensym("type"), A_SYMBOL, A_NULL); class_addmethod(rawin_class, (t_method)rawin_open, gensym("open"), A_DEFSYMBOL, A_NULL); class_addmethod(rawin_class, (t_method)rawin_close, gensym("close"), A_NULL); --- 359,368 ---- (t_method)rawin_free, sizeof(t_rawin), 0, A_DEFSYMBOL, A_DEFSYMBOL, A_NULL); ! /* add global message handlers */ class_addmethod(rawin_class, (t_method)rawin_type, gensym("type"), A_SYMBOL, A_NULL); class_addmethod(rawin_class, (t_method)rawin_open, gensym("open"), A_DEFSYMBOL, A_NULL); class_addmethod(rawin_class, (t_method)rawin_close, gensym("close"), A_NULL); + class_addmethod(rawin_class, (t_method)rawin_sync, gensym("sync"), A_FLOAT, A_NULL); + class_addmethod(rawin_class, (t_method)rawin_bang, gensym("bang"), A_NULL); Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/generic/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 16 Dec 2005 01:05:32 -0000 1.3 --- Makefile 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 5,9 **** PDP_MOD = pdp_reg.o pdp_del.o pdp_snap.o pdp_trigger.o \ pdp_route.o pdp_inspect.o pdp_loop.o pdp_description.o pdp_convert.o \ ! pdp_udp_send.o pdp_udp_receive.o pdp_rawin.o pdp_rawout.o # build generic modules --- 5,9 ---- PDP_MOD = pdp_reg.o pdp_del.o pdp_snap.o pdp_trigger.o \ pdp_route.o pdp_inspect.o pdp_loop.o pdp_description.o pdp_convert.o \ ! pdp_udp_send.o pdp_udp_receive.o pdp_rawin.o pdp_rawout.o pdp_metro.o # build generic modules Index: pdp_del.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/generic/pdp_del.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_del.c 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_del.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 72,76 **** out = (((x->x_head + x->x_delay)) % x->x_order); packet = x->x_packet[out]; ! pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet[out]); /* --- 72,83 ---- out = (((x->x_head + x->x_delay)) % x->x_order); packet = x->x_packet[out]; ! ! // originally, we wouldn't keep the packet in the delay line to save memory ! // however, this behaviour is very annoying, and doesn't allow ''scratching'' ! // so we send out a copy instead. ! // pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet[out]); ! int p = pdp_packet_copy_ro(packet); ! pdp_packet_pass_if_valid(x->x_outlet0, &p); ! /* *************** *** 89,92 **** --- 96,108 ---- x->x_head = (x->x_head + x->x_order - 1) % x->x_order; + + /* + int i; + for (i=0; i<x->x_order; i++){ + fprintf(stderr, " %d", x->x_packet[i]); + } + fprintf(stderr, "\n"); + */ + } Index: pdp_rawout.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/modules/generic/pdp_rawout.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_rawout.c 16 Dec 2005 01:05:32 -0000 1.3 --- pdp_rawout.c 1 Sep 2006 13:45:30 -0000 1.4 *************** *** 1,4 **** /* ! * Pure Data Packet module. packet forth console * Copyright (c) by Tom Schouten <pdp(a)zzz.kotnet.org> * --- 1,4 ---- /* ! * Pure Data Packet module. Raw packet output. * Copyright (c) by Tom Schouten <pdp(a)zzz.kotnet.org> * *************** *** 20,23 **** --- 20,48 ---- + /* + This is the most straightforward way to get data out of pdp. + The internals follow the simple reader/writer pattern + * writer: runs in pd thread, accepts packets from inlet and stores in queue + * reader: runs in own thread, reads packets from queue and writes to pipe + + Since there is no communication from reader to writer, we need a watchdog + timer to check the status of the writer. Mainly to close when necessary. + + To enable audio recording, pdp_rawout will also produce interleaved 16bit + audio. You will need to instantiate it with [pdp_rawout~ nbchans] + + + + */ + + /* TODO: + + make audio buffer smaller (128 bytes writes is too heavy) + + */ + + + + #include <string.h> #include <pthread.h> #include <stdio.h> *************** *** 40,47 **** #define D if (1) ! #define MAX_QUEUESIZE 4 #define PIPE_BLOCKSIZE 4096 ! ! --- 65,71 ---- #define D if (1) ! #define DEF_QUEUESIZE 100 #define PIPE_BLOCKSIZE 4096 ! #define POLLTIME 20 *************** *** 52,60 **** /* pd */ t_object x_obj; //t_outlet *x_outlet; t_outlet *x_sync_outlet; /* comm */ ! t_pdp_list *x_queue; // packet queue /* thread */ --- 76,92 ---- /* pd */ t_object x_obj; + t_float x_f; + //t_outlet *x_outlet; t_outlet *x_sync_outlet; /* comm */ ! t_pdp_list *x_queue; // packet queue ! t_clock *x_clock; // watchdog timer ! t_float x_deltime; // watchdog period ! int x_verbose; ! int x_packet; // dsp fillup state ! int x_countdown; // amount of packet filled up ! short int * x_needle; // start writing here /* thread */ *************** *** 69,74 **** /* config */ ! t_symbol *x_pipe; ! t_pdp_symbol *x_type; } t_rawout; --- 101,108 ---- /* config */ ! t_symbol *x_pipe; ! int x_chans; // nb audio channels ! t_pdp_symbol *x_tmptype; ! int x_max_queuesize; // buffer size ( < 0 = infty ) } t_rawout; *************** *** 79,131 **** static void rawout_close(t_rawout *x); - static void pdp_in(t_rawout *x, t_symbol *s, t_float f) - { - /* save packet to pdp queue, if size is smaller than maxsize */ - if (s == S_REGISTER_RO){ - if (x->x_queue->elements < MAX_QUEUESIZE){ - int p = (int)f; - p = pdp_packet_copy_ro(p); - if (p != -1){ - lock(x); - pdp_list_add_back(x->x_queue, a_packet, (t_pdp_word)p); - unlock(x); - } - } - else { - pdp_post("pdp_rawout: dropping packet: (queue full)", MAX_QUEUESIZE); - } - - } - - /* check if thread is done */ - if (x->x_done) rawout_close(x); - - } - static void *rawout_thread(void *y) { ! int pipe; int packet = -1; t_rawout *x = (t_rawout *)y; int period_sec; int period_usec; ! sigset_t sigvec; /* signal handling */ /* ignore pipe signal */ ! sigemptyset(&sigvec); ! sigaddset(&sigvec,SIGPIPE); ! pthread_sigmask(SIG_BLOCK, &sigvec, 0); //D pdp_post("pipe: %s", x->x_pipe->s_name); //D pdp_post("type: %s", x->x_type->s_name); /* open pipe */ ! if (-1 == (pipe = open(x->x_pipe->s_name, O_WRONLY|O_NONBLOCK))){ ! perror(x->x_pipe->s_name); ! goto exit; } /* main loop (packets) */ while(1){ --- 113,151 ---- static void rawout_close(t_rawout *x); + /* READER THREAD: reads from queue, writes to pipe */ static void *rawout_thread(void *y) { ! int pipefd; int packet = -1; t_rawout *x = (t_rawout *)y; int period_sec; int period_usec; ! sigset_t _sigvec; /* signal handling */ ! ! char me[1024]; ! sprintf(me, "pdp_rawout: %s", x->x_pipe->s_name); /* ignore pipe signal */ ! sigemptyset(&_sigvec); ! sigaddset(&_sigvec,SIGPIPE); ! pthread_sigmask(SIG_BLOCK, &_sigvec, 0); //D pdp_post("pipe: %s", x->x_pipe->s_name); //D pdp_post("type: %s", x->x_type->s_name); + /* open pipe */ ! if (-1 == (pipefd = open(x->x_pipe->s_name, O_WRONLY|O_NONBLOCK|O_APPEND))){ ! if (-1 == (pipefd = open(x->x_pipe->s_name, O_WRONLY|O_CREAT))){ ! perror(me); ! goto exit; ! } } + pdp_post("pdp_rawout: opened %s", x->x_pipe->s_name); + + /* main loop (packets) */ while(1){ *************** *** 148,155 **** packet = pdp_list_pop(x->x_queue).w_packet; unlock(x); ! /* send packet */ data = pdp_packet_data(packet); left = pdp_packet_data_size(packet); /* inner loop: pipe reads */ --- 168,180 ---- packet = pdp_list_pop(x->x_queue).w_packet; unlock(x); ! /* send packet */ + //t_pdp *h = pdp_packet_header(packet); + //fprintf(stderr, "users %d\n", h->users); + data = pdp_packet_data(packet); left = pdp_packet_data_size(packet); + //int i; for (i = 0; i<left/2; i++) fprintf(stderr, "%06x ", ((short int *)data)[i]); fprintf(stderr, "\n"); + /* inner loop: pipe reads */ *************** *** 167,172 **** /* select, with timeout */ FD_ZERO(&outset); ! FD_SET(pipe, &outset); ! if (-1 == select(pipe+1, NULL, &outset, NULL, &tv)){ pdp_post("select error"); goto close; --- 192,197 ---- /* select, with timeout */ FD_ZERO(&outset); ! FD_SET(pipefd, &outset); ! if (-1 == select(pipefd+1, NULL, &outset, NULL, &tv)){ pdp_post("select error"); goto close; *************** *** 174,183 **** /* if ready, read, else retry */ ! if (FD_ISSET(pipe, &outset)){ ! int bytes = write(pipe, data, left); /* handle errors */ if (bytes <= 0){ ! perror(x->x_pipe->s_name); ! if (bytes != EAGAIN) goto close; } /* or update pointers */ --- 199,209 ---- /* if ready, read, else retry */ ! if (FD_ISSET(pipefd, &outset)){ ! ! int bytes = write(pipefd, data, left); /* handle errors */ if (bytes <= 0){ ! perror(me); ! if (errno != EAGAIN) goto close; } /* or update pointers */ *************** *** 201,205 **** close: /* close pipe */ ! close(pipe); --- 227,231 ---- close: /* close pipe */ ! close(pipefd); *************** *** 210,223 **** ! static void rawout_type(t_rawout *x, t_symbol *type) { ! x->x_type = pdp_gensym(type->s_name); } ! static void rawout_open(t_rawout *x, t_symbol *pipe) { /* save pipe name if not empty */ ! if (pipe->s_name[0]) {x->x_pipe = pipe;} if (x->x_active) { --- 236,354 ---- + /* DSP INPUT */ + #define DSP_ARG(type, name, source) type name = (type)source ! static t_int *rawout_perform(t_int *w); ! static void rawout_dsp(t_rawout *x, t_signal **sp){ ! int nargs = 2 + x->x_chans; ! t_int args[nargs]; ! args[0] = (int)x; ! args[1] = (int)sp[0]->s_n; ! float **in = (float **)(args+2); ! int i; ! for (i=0; i<x->x_chans; i++) in[i] = sp[i]->s_vec; ! dsp_addv(rawout_perform, nargs, args); ! } ! ! static t_int *rawout_perform(t_int *w) { ! DSP_ARG(t_rawout*, x, w[1]); ! DSP_ARG(t_int, n, w[2]); ! DSP_ARG(t_float**, in, &w[3]); ! ! short int *out; ! int i,c,k; ! ! ! if (x->x_queue->elements >= x->x_max_queuesize){ ! // drop ! if (x->x_verbose && x->x_active) pdp_post_n("."); ! } ! else { ! ! // create packet ! if (x->x_countdown) { ! out = x->x_needle; ! } ! else { ! int p = pdp_factory_newpacket(x->x_tmptype); ! pdp_packet_mark_unused(x->x_packet); ! // if (-1 == p) pdp_post("pdp_rawout~: can't create packet"); ! x->x_needle = out = (short int *)pdp_packet_data(p); ! x->x_packet = p; ! x->x_countdown = pdp_packet_data_size(p) / 2; ! } ! ! //pdp_post("data size = %d bytes", pdp_packet_data_size(p)); ! ! //memset(out, 0, pdp_packet_data_size(p)); ! ! ! // convert & interleave ! for (k=0,i=0; i<n; i++){ ! for (c=0; c<x->x_chans; c++,k++){ ! float val = (in[c])[i]; ! val *= (float)((1<<15)-1); ! out[k] = (short int)(val); ! //out[k] = 0x1234; ! //fprintf(stderr, "(%d,%d,%d) %d\n", c, i, k, (int)out[k]); ! } ! } ! ! x->x_needle += k; ! x->x_countdown -= k; ! if (!x->x_countdown){ ! // transfer ! lock(x); ! pdp_list_add_back(x->x_queue, a_packet, (t_pdp_word)x->x_packet); ! x->x_packet = -1; ! unlock(x); ! } ! } ! ! return w+3+x->x_chans; } ! ! /* PACKET INPUT */ ! ! ! static void pdp_in(t_rawout *x, t_symbol *s, t_float f) ! { ! /* save packet to pdp queue, if size is smaller than maxsize */ ! if (s == S_REGISTER_RO){ ! if (x->x_queue->elements < x->x_max_queuesize){ ! int p = (int)f; ! p = pdp_packet_copy_ro(p); ! if (p != -1){ ! lock(x); ! pdp_list_add_back(x->x_queue, a_packet, (t_pdp_word)p); ! unlock(x); ! } ! } ! else { ! //pdp_post("pdp_rawout: dropping packet: (queue full)", x->x_max_queuesize); ! if (x->x_active && x->x_verbose) pdp_post_n("."); ! } ! ! } ! ! /* check if thread is done */ ! if (x->x_done) rawout_close(x); ! ! } ! ! /* CONTROL */ ! ! //static void rawout_type(t_rawout *x, t_symbol *type) ! //{ ! //x->x_type = pdp_gensym(type->s_name); ! //} ! ! static void clear_queue(t_rawout *x); ! static void rawout_open(t_rawout *x, t_symbol *spipe) { /* save pipe name if not empty */ ! if (spipe->s_name[0]) {x->x_pipe = spipe;} if (x->x_active) { *************** *** 228,238 **** x->x_giveup = 0; x->x_done = 0; pthread_create(&x->x_thread, &x->x_attr, rawout_thread , x); x->x_active = 1; } ! static void rawout_close(t_rawout *x) ! { ! if (!x->x_active) return; --- 359,368 ---- x->x_giveup = 0; x->x_done = 0; + clear_queue(x); pthread_create(&x->x_thread, &x->x_attr, rawout_thread , x); x->x_active = 1; } ! static void rawout_stopthread(t_rawout *x){ if (!x->x_active) return; *************** *** 241,273 **** pthread_join(x->x_thread, NULL); x->x_active = 0; /* notify */ outlet_bang(x->x_sync_outlet); ! pdp_post("connection to %s closed", x->x_pipe->s_name); ! ! } static void rawout_free(t_rawout *x) { ! rawout_close(x); ! pdp_tree_strip_packets(x->x_queue); pdp_tree_free(x->x_queue); } t_class *rawout_class; ! ! static void *rawout_new(t_symbol *pipe, t_symbol *type) ! { ! t_rawout *x; ! ! pdp_post("%s %s", pipe->s_name, type->s_name); ! ! /* allocate & init */ ! x = (t_rawout *)pd_new(rawout_class); //x->x_outlet = outlet_new(&x->x_obj, &s_anything); x->x_sync_outlet = outlet_new(&x->x_obj, &s_anything); --- 371,428 ---- pthread_join(x->x_thread, NULL); x->x_active = 0; + clear_queue(x); + } + + static void rawout_close(t_rawout *x) + { + if (!x->x_active) return; + rawout_stopthread(x); /* notify */ outlet_bang(x->x_sync_outlet); ! pdp_post("pdp_rawout: closed %s", x->x_pipe->s_name); + } + static void rawout_verbose(t_rawout *x, t_float fverbose){ + x->x_verbose = (int)fverbose; + } + static void rawout_tick(t_rawout *x){ + if (x->x_done) rawout_close(x); + clock_delay(x->x_clock, x->x_deltime); + } ! static void clear_queue(t_rawout *x){ ! lock(x); ! while(x->x_queue->elements){ ! pdp_packet_mark_unused(pdp_list_pop(x->x_queue).w_packet); ! } ! unlock(x); ! } ! ! #define MAXINT (0x80 << ((sizeof(int)-1)*8)) ! static void rawout_queuesize(t_rawout *x, t_float fbufsize){ ! int bufsize = (int)fbufsize; ! if (fbufsize < 1) fbufsize = MAXINT; ! x->x_max_queuesize = bufsize; } static void rawout_free(t_rawout *x) { ! // terminate thread ! rawout_stopthread(x); ! ! // cleanup ! clock_unset(x->x_clock); ! clear_queue(x); pdp_tree_free(x->x_queue); + pdp_packet_mark_unused(x->x_packet); } t_class *rawout_class; + t_class *rawout_dsp_class; ! // shared stuff ! static void rawout_init(t_rawout *x, t_symbol *spipe){ //x->x_outlet = outlet_new(&x->x_obj, &s_anything); x->x_sync_outlet = outlet_new(&x->x_obj, &s_anything); *************** *** 276,292 **** x->x_giveup = 0; x->x_done = 0; ! x->x_type = pdp_gensym("image/YCrCb/320x240"); //default x->x_pipe = gensym("/tmp/pdpraw"); // default pthread_attr_init(&x->x_attr); pthread_mutex_init(&x->x_mut, NULL); /* args */ ! rawout_type(x, type); ! if (pipe->s_name[0]) x->x_pipe = pipe; return (void *)x; } --- 431,489 ---- x->x_giveup = 0; x->x_done = 0; ! x->x_packet = -1; ! x->x_countdown = 0; ! x->x_max_queuesize = DEF_QUEUESIZE; ! //x->x_type = pdp_gensym("image/YCrCb/320x240"); //default x->x_pipe = gensym("/tmp/pdpraw"); // default + x->x_deltime = POLLTIME; + x->x_clock = clock_new(x, (t_method)rawout_tick); pthread_attr_init(&x->x_attr); pthread_mutex_init(&x->x_mut, NULL); /* args */ ! //rawout_type(x, type); ! if (spipe && spipe->s_name[0]) x->x_pipe = spipe; ! rawout_tick(x); ! rawout_verbose(x,0); ! } + // [pdp_rawout] + static void *rawout_new(t_symbol *spipe /* , t_symbol *type */) + { + t_rawout *x; + /* allocate & init */ + x = (t_rawout *)pd_new(rawout_class); + rawout_init(x, spipe); return (void *)x; } + // [pdp_rawout~] + + + // HUH??? why do i get the symbol first, then the float???? + // see http://lists.puredata.info/pipermail/pd-dev/2003-09/001618.html + //static void *rawout_dsp_new(t_float fchans, t_symbol *spipe){ + static void *rawout_dsp_new(t_symbol *spipe, t_float fchans){ + int chans = (int)fchans; + if (chans < 1) chans = 1; + if (chans > 64) return 0; // this is just a safety measure + + t_rawout *x = (t_rawout *)pd_new(rawout_dsp_class); + rawout_init(x, spipe); + + // hack: temp packet + char temp_packet[1024]; + sprintf(temp_packet, "image/grey/256x%d", 8 * chans); + pdp_post("pdp_rawout: using fake packet %s", temp_packet); + x->x_tmptype = pdp_gensym(temp_packet); + + // create audio inlets + x->x_chans = chans; + while (--chans) inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + + return (void *)x; + } + *************** *** 297,319 **** ! void pdp_rawout_setup(void) ! { int i; /* create a standard pd class: [pdp_rawout pipe type] */ rawout_class = class_new(gensym("pdp_rawout"), (t_newmethod)rawout_new, ! (t_method)rawout_free, sizeof(t_rawout), 0, A_DEFSYMBOL, A_DEFSYMBOL, A_NULL); /* add global message handler */ ! class_addmethod(rawout_class, (t_method)pdp_in, ! gensym("pdp"), A_SYMBOL, A_FLOAT, A_NULL); ! class_addmethod(rawout_class, (t_method)rawout_type, gensym("type"), A_SYMBOL, A_NULL); ! class_addmethod(rawout_class, (t_method)rawout_open, gensym("open"), A_DEFSYMBOL, A_NULL); ! class_addmethod(rawout_class, (t_method)rawout_close, gensym("close"), A_NULL); } #ifdef __cplusplus } --- 494,537 ---- ! ! #define COMMON(base_class)\ ! class_addmethod(base_class, (t_method)rawout_open, gensym("open"), A_DEFSYMBOL, A_NULL);\ ! class_addmethod(base_class, (t_method)rawout_close, gensym("close"), A_NULL);\ ! class_addmethod(base_class, (t_method)rawout_verbose, gensym("verbose"), A_FLOAT, A_NULL);\ ! class_addmethod(base_class, (t_method)rawout_queuesize, gensym("bufsize"), A_FLOAT, A_NULL); ! ! void pdp_rawout_setup(void){ ! int i; + /* PACKETS */ + /* create a standard pd class: [pdp_rawout pipe type] */ rawout_class = class_new(gensym("pdp_rawout"), (t_newmethod)rawout_new, ! (t_method)rawout_free, sizeof(t_rawout), 0, A_DEFSYMBOL, A_NULL); /* add global message handler */ ! class_addmethod(rawout_class, (t_method)pdp_in, gensym("pdp"), A_SYMBOL, A_FLOAT, A_NULL); ! COMMON(rawout_class); ! /* DSP */ + /* create a standard pd class: [pdp_rawout pipe type] */ + rawout_dsp_class = class_new(gensym("pdp_rawout~"), (t_newmethod)rawout_dsp_new, + (t_method)rawout_free, sizeof(t_rawout), 0, A_DEFFLOAT, A_DEFSYMBOL, A_NULL); + + /* add signal input */ + CLASS_MAINSIGNALIN(rawout_dsp_class, t_rawout, x_f); + class_addmethod(rawout_dsp_class, (t_method)rawout_dsp, gensym("dsp"), 0); + COMMON(rawout_dsp_class); } + + + + + + #ifdef __cplusplus }

1 0

externals/pdp/doc reference.txt,1.6,1.7
by Tom Schouten 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/externals/pdp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/doc Modified Files: reference.txt Log Message: pdp current darcs merge Index: reference.txt =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/doc/reference.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** reference.txt 16 Dec 2005 00:51:04 -0000 1.6 --- reference.txt 1 Sep 2006 13:45:29 -0000 1.7 *************** *** 13,16 **** --- 13,17 ---- pdp_description output a symbol describing the packet type pdp_convert convert between packet types + pdp_metro~ audio/video sync object image inputs/outputs: *************** *** 20,23 **** --- 21,27 ---- pdp_v4l reads images from a video4linux device pdp_qt reads quicktime movies + pdp_rawin read packets from pipe or file + pdp_rawout write packets to pipe or file + pdp_rawout~ write audio to pipe or file image processors:

1 0

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 September 2006