Pd-cvs January 2005

pd-cvs@lists.iem.at

8 participants
348 discussions

externals/pidip/system pidip.c,1.13,1.14
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/system Modified Files: pidip.c Log Message: PiDiP 0.12.18 Index: pidip.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/system/pidip.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pidip.c 14 Nov 2004 22:52:23 -0000 1.13 --- pidip.c 2 Jan 2005 06:02:50 -0000 1.14 *************** *** 75,78 **** --- 75,81 ---- void pdp_cropper_setup(void); void pdp_background_setup(void); + void pdp_mapper_setup(void); + void pdp_theonice_tilde_setup(void); + void pdp_icedthe_tilde_setup(void); #ifdef HAVE_PIDIP_FFMPEG *************** *** 156,159 **** --- 159,165 ---- pdp_cropper_setup(); pdp_background_setup(); + pdp_mapper_setup(); + pdp_theonice_tilde_setup(); + pdp_icedthe_tilde_setup(); #ifdef HAVE_PIDIP_FFMPEG

1 0

externals/pidip/patches/morphology help-closing.pd,1.1,1.2 help-opening.pd,1.1,1.2 help-thickening.pd,1.1,1.2 help-thinning.pd,1.1,1.2
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/patches/morphology In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/patches/morphology Modified Files: help-closing.pd help-opening.pd help-thickening.pd help-thinning.pd Log Message: PiDiP 0.12.18 Index: help-closing.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/patches/morphology/help-closing.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-closing.pd 14 Nov 2004 22:56:42 -0000 1.1 --- help-closing.pd 2 Jan 2005 06:02:49 -0000 1.2 *************** *** 3,7 **** -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 453 93 open \$1; --- 3,7 ---- -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 453 93 open \$1; *************** *** 12,16 **** #X msg 298 21 stop; #X obj 396 24 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 6900 1; #X obj 330 91 metro 70; #X obj 325 123 pdp_yqt; --- 12,16 ---- #X msg 298 21 stop; #X obj 396 24 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; #X obj 330 91 metro 70; #X obj 325 123 pdp_yqt; *************** *** 53,56 **** --- 53,57 ---- #X obj 148 437 pdp_dilate ----; #X obj 148 509 pdp_erode ----; + #X obj 42 283 pdp_glx; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 64,67 **** --- 65,69 ---- #X connect 9 0 10 0; #X connect 10 0 29 0; + #X connect 10 0 47 0; #X connect 11 0 29 0; #X connect 12 0 11 0; *************** *** 86,89 **** --- 88,92 ---- #X connect 30 0 24 0; #X connect 31 0 34 0; + #X connect 31 0 47 0; #X connect 32 0 45 1; #X connect 34 0 30 0; *************** *** 97,98 **** --- 100,102 ---- #X connect 46 0 42 0; #X connect 46 0 43 1; + #X connect 47 0 30 0; Index: help-thinning.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/patches/morphology/help-thinning.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-thinning.pd 14 Nov 2004 22:56:42 -0000 1.1 --- help-thinning.pd 2 Jan 2005 06:02:50 -0000 1.2 *************** *** 3,7 **** -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 453 93 open \$1; --- 3,7 ---- -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 453 93 open \$1; *************** *** 52,55 **** --- 52,56 ---- #X msg 327 471 kernel -1 -1 -1 -1 1 -1 1 1 1; #X obj 326 444 loadbang; + #X obj 43 282 pdp_glx; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 63,66 **** --- 64,68 ---- #X connect 9 0 10 0; #X connect 10 0 39 0; + #X connect 10 0 46 0; #X connect 11 0 39 0; #X connect 12 0 11 0; *************** *** 78,81 **** --- 80,84 ---- #X connect 29 0 24 0; #X connect 30 0 37 0; + #X connect 30 0 46 0; #X connect 32 0 36 2; #X connect 33 0 36 3; *************** *** 94,95 **** --- 97,99 ---- #X connect 44 0 36 0; #X connect 45 0 44 0; + #X connect 46 0 29 0; Index: help-opening.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/patches/morphology/help-opening.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-opening.pd 14 Nov 2004 22:56:42 -0000 1.1 --- help-opening.pd 2 Jan 2005 06:02:50 -0000 1.2 *************** *** 3,7 **** -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 453 93 open \$1; --- 3,7 ---- -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 453 93 open \$1; *************** *** 53,56 **** --- 53,57 ---- #X obj 61 508 pdp_xor; #X obj 61 547 pdp_glx; + #X obj 41 285 pdp_glx; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 64,67 **** --- 65,69 ---- #X connect 9 0 10 0; #X connect 10 0 29 0; + #X connect 10 0 47 0; #X connect 11 0 29 0; #X connect 12 0 11 0; *************** *** 86,89 **** --- 88,92 ---- #X connect 30 0 24 0; #X connect 31 0 34 0; + #X connect 31 0 47 0; #X connect 32 0 39 1; #X connect 34 0 30 0; *************** *** 97,98 **** --- 100,102 ---- #X connect 43 0 45 1; #X connect 45 0 46 0; + #X connect 47 0 30 0; Index: help-thickening.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/patches/morphology/help-thickening.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-thickening.pd 14 Nov 2004 22:56:42 -0000 1.1 --- help-thickening.pd 2 Jan 2005 06:02:50 -0000 1.2 *************** *** 3,7 **** -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 453 93 open \$1; --- 3,7 ---- -1; #X msg 196 92 loop \$1; ! #X obj 197 70 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 453 93 open \$1; *************** *** 54,57 **** --- 54,58 ---- #X obj 152 560 pdp_xor; #X obj 152 589 pdp_glx; + #X obj 42 284 pdp_glx; #X connect 0 0 9 0; #X connect 1 0 10 0; *************** *** 65,68 **** --- 66,70 ---- #X connect 9 0 10 0; #X connect 10 0 39 0; + #X connect 10 0 48 0; #X connect 11 0 39 0; #X connect 12 0 11 0; *************** *** 80,83 **** --- 82,86 ---- #X connect 29 0 24 0; #X connect 30 0 37 0; + #X connect 30 0 48 0; #X connect 32 0 36 2; #X connect 33 0 36 3; *************** *** 99,100 **** --- 102,104 ---- #X connect 45 0 46 0; #X connect 46 0 47 0; + #X connect 48 0 29 0;

1 0

externals/pidip/patches collage.pd,1.3,1.4
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/patches Modified Files: collage.pd Log Message: PiDiP 0.12.18 Index: collage.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/patches/collage.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** collage.pd 30 Mar 2004 01:56:16 -0000 1.3 --- collage.pd 2 Jan 2005 06:02:49 -0000 1.4 *************** *** 44,48 **** -1; #X msg 55 85 loop \$1; ! #X obj 56 63 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0 1 ; #X msg 100 54 open \$1; --- 44,48 ---- -1; #X msg 55 85 loop \$1; ! #X obj 56 63 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 100 54 open \$1; *************** *** 71,75 **** -1 0; #X msg 156 274 unhide \$1; ! #X obj 506 434 hradio 15 1 0 5 hide-layer empty empty 0 -6 128 8 -262144 -1 -1 4; #X text 506 416 Select layer; --- 71,75 ---- -1 0; #X msg 156 274 unhide \$1; ! #X obj 506 434 hradio 15 1 0 5 hide-layer empty empty 0 -6 0 8 -262144 -1 -1 4; #X text 506 416 Select layer; *************** *** 109,112 **** --- 109,113 ---- #X obj 75 483 pdp_affine; #X floatatom 105 442 5 0 0 0 - - -; + #X msg 178 427 cursor 1; #X connect 0 0 6 1; #X connect 1 0 6 2; *************** *** 197,198 **** --- 198,200 ---- #X connect 89 0 32 0; #X connect 90 0 89 1; + #X connect 91 0 83 0;

1 0

externals/pidip/modules pdp_icedthe~.c,NONE,1.1 pdp_mapper.c,NONE,1.1 pdp_theonice~.c,NONE,1.1 Makefile,1.13,1.14 Makefile.in,1.13,1.14 pdp_ascii.c,1.4,1.5 pdp_binary.c,1.1,1.2 pdp_ffmpeg~.c,1.5,1.6 pdp_i.c,1.4,1.5 pdp_live~.c,1.4,1.5 pdp_theorin~.c,1.1,1.2 pdp_theorout~.c,1.1,1.2
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/modules Modified Files: Makefile Makefile.in pdp_ascii.c pdp_binary.c pdp_ffmpeg~.c pdp_i.c pdp_live~.c pdp_theorin~.c pdp_theorout~.c Added Files: pdp_icedthe~.c pdp_mapper.c pdp_theonice~.c Log Message: PiDiP 0.12.18 Index: pdp_theorout~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theorout~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pdp_theorout~.c 14 Nov 2004 23:00:58 -0000 1.1 --- pdp_theorout~.c 2 Jan 2005 06:02:49 -0000 1.2 *************** *** 167,172 **** x->x_theora_info.fps_numerator=x->x_framerate; x->x_theora_info.fps_denominator=1; ! x->x_theora_info.aspect_numerator=x->x_vwidth; ! x->x_theora_info.aspect_denominator=x->x_vheight; x->x_theora_info.colorspace=OC_CS_UNSPECIFIED; x->x_theora_info.target_bitrate=x->x_vkbps; --- 167,172 ---- x->x_theora_info.fps_numerator=x->x_framerate; x->x_theora_info.fps_denominator=1; ! x->x_theora_info.aspect_numerator=1; ! x->x_theora_info.aspect_denominator=1; x->x_theora_info.colorspace=OC_CS_UNSPECIFIED; x->x_theora_info.target_bitrate=x->x_vkbps; *************** *** 182,187 **** --- 182,189 ---- x->x_theora_info.keyframe_mindistance=8; x->x_theora_info.noise_sensitivity=1; + x->x_theora_info.sharpness=2; theora_encode_init(&x->x_theora_state,&x->x_theora_info); + theora_info_clear (&x->x_theora_info); vorbis_info_init(&x->x_vorbis_info); *************** *** 204,207 **** --- 206,210 ---- vorbis_comment_init(&x->x_vorbis_comment); + vorbis_comment_add_tag (&x->x_vorbis_comment, "ENCODER", "pdp_theorout~"); vorbis_analysis_init(&x->x_dsp_state,&x->x_vorbis_info); vorbis_block_init(&x->x_dsp_state,&x->x_vorbis_block); *************** *** 250,253 **** --- 253,257 ---- theora_comment_init(&x->x_theora_comment); + theora_comment_add_tag (&x->x_theora_comment, "ENCODER", "pdp_theorout~"); theora_encode_comment(&x->x_theora_comment, &x->x_ogg_packet); ogg_stream_packetin(&x->x_statet, &x->x_ogg_packet); *************** *** 533,536 **** --- 537,544 ---- t_float **vbuffer; double videotime, audiotime; + theora_info lti; + theora_comment ltc; + ogg_packet logp, logp2; + if ( ( (int)(header->info.image.width) != x->x_vwidth ) || *************** *** 608,622 **** { // stream one packet ! theora_encode_packetout(&x->x_theora_state, 0, &x->x_ogg_packet); ! ogg_stream_packetin(&x->x_statet, &x->x_ogg_packet); // post( "pdp_theorout~ : new (theora) ogg packet : bytes:%ld, bos:%ld, eos:%ld, no:%lld", ! // x->x_ogg_packet.bytes, x->x_ogg_packet.b_o_s, ! // x->x_ogg_packet.e_o_s, x->x_ogg_packet.packetno ); while( ( ret = ogg_stream_pageout(&x->x_statet, &vpage) ) >0 ) { videotime = theora_granule_time(&x->x_theora_state, ogg_page_granulepos(&vpage)); ! x->x_vbytesout+=fwrite(vpage.header, 1, vpage.header_len, x->x_tfile ); ! x->x_vbytesout+=fwrite(vpage.body, 1, vpage.body_len, x->x_tfile ); } } --- 616,641 ---- { // stream one packet ! theora_encode_packetout(&x->x_theora_state, 0, &logp); ! ogg_stream_packetin(&x->x_statet, &logp); // post( "pdp_theorout~ : new (theora) ogg packet : bytes:%ld, bos:%ld, eos:%ld, no:%lld", ! // logp.bytes, logp.b_o_s, ! // logp.e_o_s, logp.packetno ); ! while( ( ret = ogg_stream_pageout(&x->x_statet, &vpage) ) >0 ) { videotime = theora_granule_time(&x->x_theora_state, ogg_page_granulepos(&vpage)); ! if ( ( ret = fwrite(vpage.header, 1, vpage.header_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_vbytesout+=ret; ! if ( ( ret = fwrite(vpage.body, 1, vpage.body_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_vbytesout+=ret; } } *************** *** 656,662 **** // weld packets into the bitstream ! while(vorbis_bitrate_flushpacket( &x->x_dsp_state, &x->x_ogg_packet)) { ! ogg_stream_packetin( &x->x_statev, &x->x_ogg_packet); } --- 675,681 ---- // weld packets into the bitstream ! while(vorbis_bitrate_flushpacket( &x->x_dsp_state, &logp2)) { ! ogg_stream_packetin( &x->x_statev, &logp2); } *************** *** 666,671 **** { audiotime = vorbis_granule_time(&x->x_dsp_state, ogg_page_granulepos(&apage)); ! x->x_abytesout+=fwrite(apage.header, 1, apage.header_len, x->x_tfile ); ! x->x_abytesout+=fwrite(apage.body, 1, apage.body_len, x->x_tfile ); } --- 685,700 ---- { audiotime = vorbis_granule_time(&x->x_dsp_state, ogg_page_granulepos(&apage)); ! if ( ( ret = fwrite(apage.header, 1, apage.header_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_abytesout+=ret; ! if ( ( ret = fwrite(apage.body, 1, apage.body_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_abytesout+=ret; } *************** *** 694,705 **** { // stream one packet ! theora_encode_packetout(&x->x_theora_state, 1, &x->x_ogg_packet); ! ogg_stream_packetin( &x->x_statet, &x->x_ogg_packet); while( ( ret = ogg_stream_pageout( &x->x_statet, &vpage) ) > 0 ) { videotime = theora_granule_time(&x->x_theora_state, ogg_page_granulepos(&vpage)); ! x->x_vbytesout+=fwrite(vpage.header, 1, vpage.header_len, x->x_tfile ); ! x->x_vbytesout+=fwrite(vpage.body, 1, vpage.body_len, x->x_tfile ); } } --- 723,744 ---- { // stream one packet ! theora_encode_packetout(&x->x_theora_state, 1, &logp); ! ogg_stream_packetin( &x->x_statet, &logp); while( ( ret = ogg_stream_pageout( &x->x_statet, &vpage) ) > 0 ) { videotime = theora_granule_time(&x->x_theora_state, ogg_page_granulepos(&vpage)); ! if ( ( ret = fwrite(vpage.header, 1, vpage.header_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_vbytesout+=ret; ! if ( ( ret = fwrite(vpage.body, 1, vpage.body_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_vbytesout+=ret; } } *************** *** 715,721 **** // weld packets into the bitstream ! while(vorbis_bitrate_flushpacket( &x->x_dsp_state, &x->x_ogg_packet)) { ! ogg_stream_packetin( &x->x_statev, &x->x_ogg_packet); } } --- 754,760 ---- // weld packets into the bitstream ! while(vorbis_bitrate_flushpacket( &x->x_dsp_state, &logp2)) { ! ogg_stream_packetin( &x->x_statev, &logp2); } } *************** *** 724,729 **** { audiotime = vorbis_granule_time(&x->x_dsp_state, ogg_page_granulepos(&apage)); ! x->x_abytesout+=fwrite(apage.header, 1, apage.header_len, x->x_tfile ); ! x->x_abytesout+=fwrite(apage.body, 1, apage.body_len, x->x_tfile ); } --- 763,778 ---- { audiotime = vorbis_granule_time(&x->x_dsp_state, ogg_page_granulepos(&apage)); ! if ( ( ret = fwrite(apage.header, 1, apage.header_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_abytesout+=ret; ! if ( ( ret = fwrite(apage.body, 1, apage.body_len, x->x_tfile) ) <= 0 ) ! { ! post( "pdp_theorout~ : could not write headers (ret=%d).", ret ); ! perror( "fwrite" ); ! } ! x->x_abytesout+=ret; } Index: pdp_ffmpeg~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ffmpeg~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pdp_ffmpeg~.c 14 Nov 2004 22:52:21 -0000 1.5 --- pdp_ffmpeg~.c 2 Jan 2005 06:02:48 -0000 1.6 *************** *** 323,326 **** --- 323,327 ---- t_int owidth, oheight; short *pencbuf; + t_int framerate, atime, ttime; /* allocate all ressources */ *************** *** 392,401 **** } } ! if ( x->x_secondcount[ svideoindex ] >= (x->x_avcontext->streams[i]->codec.frame_rate/10000) ) { - // post("pdp_ffmpeg : index=%d actual : %d, nominal : %d", - // svideoindex, - // x->x_secondcount[ svideoindex ], - // (x->x_avcontext->streams[i]->codec.frame_rate/10000) ); x->x_nbframes_dropped++; continue; --- 393,402 ---- } } ! framerate = x->x_avcontext->streams[i]->codec.frame_rate/10000; ! ttime = ( ( x->x_nbframes + 1 ) % framerate ) * ( 1000 / framerate ); ! atime = ( etime.tv_usec / 1000 ); ! // post("pdp_theonice~ : actual : %d, theoretical : %d", atime, ttime ); ! if ( atime < ttime ) { x->x_nbframes_dropped++; continue; --- NEW FILE: pdp_icedthe~.c --- /* * PiDiP module. * Copyright (c) by Yves Degoyon (ydegoyon(a)free.fr) * * 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. * */ [...1330 lines suppressed...] void pdp_icedthe_tilde_setup(void) { // post( pdp_icedthe_version ); pdp_icedthe_class = class_new(gensym("pdp_icedthe~"), (t_newmethod)pdp_icedthe_new, (t_method)pdp_icedthe_free, sizeof(t_pdp_icedthe), 0, A_NULL); class_addmethod(pdp_icedthe_class, (t_method)pdp_icedthe_dsp, gensym("dsp"), A_NULL); class_addmethod(pdp_icedthe_class, (t_method)pdp_icedthe_connect, gensym("connect"), A_SYMBOL, A_NULL); class_addmethod(pdp_icedthe_class, (t_method)pdp_icedthe_disconnect, gensym("disconnect"), A_NULL); class_addmethod(pdp_icedthe_class, (t_method)pdp_icedthe_priority, gensym("priority"), A_FLOAT, A_NULL); class_addmethod(pdp_icedthe_class, (t_method)pdp_icedthe_audio, gensym("audio"), A_FLOAT, A_NULL); class_sethelpsymbol( pdp_icedthe_class, gensym("pdp_icedthe~.pd") ); } #ifdef __cplusplus } #endif Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 14 Nov 2004 22:52:21 -0000 1.13 --- Makefile.in 2 Jan 2005 06:02:48 -0000 1.14 *************** *** 20,23 **** --- 20,24 ---- pdp_disintegration.o pdp_distance.o pdp_theorin~.o \ pdp_theorout~.o pdp_cropper.o pdp_background.o \ + pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\ @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o --- NEW FILE: pdp_mapper.c --- /* * PiDiP module. * Copyright (c) by Yves Degoyon (ydegoyon(a)free.fr) * * 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 is a pixels mapper enabling to do some cut and paste * Written by Yves Degoyon */ #include "pdp.h" #include <math.h> static char *pdp_mapper_version = "pdp_mapper: version 0.1, a pixels mapper, written by Yves Degoyon (ydegoyon(a)free.fr)"; typedef struct pdp_mapper_struct { t_object x_obj; t_float x_f; t_outlet *x_outlet0; t_int x_packet0; t_int x_packet1; t_int x_dropped; t_int x_queue_id; t_int x_vwidth; t_int x_vheight; t_int x_vsize; unsigned int x_encoding; t_int *x_pixelmap; } t_pdp_mapper; static void pdp_mapper_copy(t_pdp_mapper *x, t_floatarg fromX, t_floatarg fromY, t_floatarg toX, t_floatarg toY) { if ( ( fromX >= 0 ) && ( fromX < x->x_vwidth ) && ( toX >= 0 ) && ( toX < x->x_vwidth ) && ( fromY >= 0 ) && ( fromY < x->x_vheight ) && ( toY >= 0 ) && ( toY < x->x_vheight ) ) { x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ] = x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ]; } } static void pdp_mapper_reset(t_pdp_mapper *x) { t_int px, py; if ( x->x_vsize > 0 ) { for ( py=0; py<x->x_vheight; py++ ) { for ( px=0; px<x->x_vwidth; px++ ) { x->x_pixelmap[py*x->x_vwidth+px] = py*x->x_vwidth+px; } } } } static void pdp_mapper_swap(t_pdp_mapper *x, t_floatarg fromX, t_floatarg fromY, t_floatarg toX, t_floatarg toY) { t_int tval; if ( ( fromX >= 0 ) && ( fromX < x->x_vwidth ) && ( toX >= 0 ) && ( toX < x->x_vwidth ) && ( fromY >= 0 ) && ( fromY < x->x_vheight ) && ( toY >= 0 ) && ( toY < x->x_vheight ) ) { tval = x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ]; x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ] = x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ]; x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ] = tval; } } static void pdp_mapper_allocate(t_pdp_mapper *x, t_int newsize) { int i, px, py; if ( x->x_pixelmap != NULL ) { freebytes( x->x_pixelmap, x->x_vsize*sizeof(t_int) ); } x->x_vsize = newsize; x->x_pixelmap = (t_int*) getbytes( x->x_vsize*sizeof(t_int) ); for ( py=0; py<x->x_vheight; py++ ) { for ( px=0; px<x->x_vwidth; px++ ) { x->x_pixelmap[py*x->x_vwidth+px] = py*x->x_vwidth+px; } } } static void pdp_mapper_process_yv12(t_pdp_mapper *x) { t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); int i; t_int px, py, ppx, ppy, offset; short int *sy, *su, *sv, t; t_int *spy; short int *sny, *snu, *snv; /* allocate all ressources */ if ( ((t_int)header->info.image.width != x->x_vwidth ) || ((t_int)header->info.image.height != x->x_vheight ) ) { x->x_vwidth = header->info.image.width; x->x_vheight = header->info.image.height; post( "pdp_mapper : reallocating buffers" ); pdp_mapper_allocate(x, header->info.image.width*header->info.image.height ); } x->x_encoding = header->info.image.encoding; newheader->info.image.encoding = x->x_encoding; newheader->info.image.width = x->x_vwidth; newheader->info.image.height = x->x_vheight; /* copy images if necessary */ // memcpy( newdata, data, (( x->x_vsize + (x->x_vsize>>1))<<1)); sy = data; su = (data+x->x_vsize); sv = (data+x->x_vsize+(x->x_vsize>>2)); spy = x->x_pixelmap; sny = newdata; snu = (newdata+x->x_vsize); snv = (newdata+x->x_vsize+(x->x_vsize>>2)); for(py=1; py<x->x_vheight; py++) { for(px=0; px<x->x_vwidth; px++) { ppy = (*(spy)/x->x_vwidth); ppx = (*(spy)%x->x_vwidth); *(sny) = *(sy+ppy*x->x_vwidth+ppx); *(snu) = *(su+(ppy>>1)*(x->x_vwidth>>1)+(ppx>>1)); *(snv) = *(sv+(ppy>>1)*(x->x_vwidth>>1)+(ppx>>1)); sny++; spy++; if ( ( px%2 == 0 ) && ( py%2 == 0 ) ) { snu++; snv++; } } } return; } static void pdp_mapper_sendpacket(t_pdp_mapper *x) { /* release the packet */ pdp_packet_mark_unused(x->x_packet0); x->x_packet0 = -1; /* unregister and propagate if valid dest packet */ pdp_packet_pass_if_valid(x->x_outlet0, &x->x_packet1); } static void pdp_mapper_process(t_pdp_mapper *x) { int encoding; t_pdp *header = 0; /* check if image data packets are compatible */ if ( (header = pdp_packet_header(x->x_packet0)) && (PDP_IMAGE == header->type)){ /* pdp_mapper_process inputs and write into active inlet */ switch(pdp_packet_header(x->x_packet0)->info.image.encoding){ case PDP_IMAGE_YV12: x->x_packet1 = pdp_packet_clone_rw(x->x_packet0); pdp_queue_add(x, pdp_mapper_process_yv12, pdp_mapper_sendpacket, &x->x_queue_id); break; case PDP_IMAGE_GREY: // pdp_mapper_process_packet(x); break; default: /* don't know the type, so dont pdp_mapper_process */ break; } } } static void pdp_mapper_input_0(t_pdp_mapper *x, t_symbol *s, t_floatarg f) { /* if this is a register_ro message or register_rw message, register with packet factory */ if (s== gensym("register_rw")) { x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("image/YCrCb/*") ); } if ((s == gensym("process")) && (-1 != x->x_packet0) && (!x->x_dropped)) { /* add the process method and callback to the process queue */ pdp_mapper_process(x); } } static void pdp_mapper_free(t_pdp_mapper *x) { int i; pdp_queue_finish(x->x_queue_id); pdp_packet_mark_unused(x->x_packet0); if ( x->x_pixelmap ) freebytes( x->x_pixelmap, x->x_vsize*sizeof(t_int) ); } t_class *pdp_mapper_class; void *pdp_mapper_new(void) { int i; t_pdp_mapper *x = (t_pdp_mapper *)pd_new(pdp_mapper_class); x->x_outlet0 = outlet_new(&x->x_obj, &s_anything); x->x_packet0 = -1; x->x_packet1 = -1; x->x_queue_id = -1; x->x_vsize = -1; return (void *)x; } #ifdef __cplusplus extern "C" { #endif void pdp_mapper_setup(void) { // post( pdp_mapper_version ); pdp_mapper_class = class_new(gensym("pdp_mapper"), (t_newmethod)pdp_mapper_new, (t_method)pdp_mapper_free, sizeof(t_pdp_mapper), 0, A_NULL); class_addmethod(pdp_mapper_class, (t_method)pdp_mapper_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); class_addmethod(pdp_mapper_class, (t_method)pdp_mapper_copy, gensym("copy"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_NULL); class_addmethod(pdp_mapper_class, (t_method)pdp_mapper_swap, gensym("swap"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_NULL); class_addmethod(pdp_mapper_class, (t_method)pdp_mapper_reset, gensym("reset"), A_NULL); class_sethelpsymbol( pdp_mapper_class, gensym("pdp_mapper.pd") ); } #ifdef __cplusplus } #endif Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 14 Nov 2004 22:52:21 -0000 1.13 --- Makefile 2 Jan 2005 06:02:48 -0000 1.14 *************** *** 20,23 **** --- 20,24 ---- pdp_disintegration.o pdp_distance.o pdp_theorin~.o \ pdp_theorout~.o pdp_cropper.o pdp_background.o \ + pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\ pdp_live~.o pdp_ffmpeg~.o # pdp_xcanvas.o pdp_aa.o Index: pdp_live~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_live~.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pdp_live~.c 14 Nov 2004 22:52:21 -0000 1.4 --- pdp_live~.c 2 Jan 2005 06:02:49 -0000 1.5 *************** *** 84,87 **** --- 84,89 ---- pthread_t x_connectchild; // thread used for connecting to a stream pthread_t x_decodechild; // stream decoding thread + pthread_mutex_t x_audiolock; // audio mutex + pthread_mutex_t x_videolock; // video mutex t_int x_usethread; // flag to activate decoding in a thread t_int x_autoplay; // flag to autoplay the file ( default = true ) *************** *** 179,184 **** static void pdp_live_frame_cold(t_pdp_live *x, t_floatarg frameindex) { ! int frame = (int)frameindex; ! int ret; uint64_t newpts; --- 181,186 ---- static void pdp_live_frame_cold(t_pdp_live *x, t_floatarg frameindex) { ! t_int frame = (int)frameindex; ! t_int ret, flags=0; uint64_t newpts; *************** *** 197,201 **** return; } ! if ( ( ret = av_seek_frame(x->x_avcontext, x->x_videoindex, newpts) ) < 0 ) { post( "pdp_live~ : couldn't seek the requested frame (ret=%d)", ret ); --- 199,204 ---- return; } ! if ( frame < x->x_nbframes ) flags = AVSEEK_FLAG_BACKWARD; ! if ( ( ret = av_seek_frame(x->x_avcontext, x->x_videoindex, newpts, flags) ) < 0 ) { post( "pdp_live~ : couldn't seek the requested frame (ret=%d)", ret ); *************** *** 243,247 **** { post( "pdp_live~ : looping file reading..." ); ! if ( ( ret = av_seek_frame(x->x_avcontext, x->x_videoindex, 0) ) < 0 ) { post( "pdp_live~ : couldn't seek the requested frame (ret=%d)", ret ); --- 246,250 ---- { post( "pdp_live~ : looping file reading..." ); ! if ( ( ret = av_seek_frame(x->x_avcontext, x->x_videoindex, 0, 0) ) < 0 ) { post( "pdp_live~ : couldn't seek the requested frame (ret=%d)", ret ); *************** *** 302,305 **** --- 305,314 ---- } + if ( pthread_mutex_lock( &x->x_audiolock ) < 0 ) + { + post( "pdp_live~ : unable to lock audio mutex" ); + perror( "pthread_mutex_lock" ); + } + // resample received audio // post( "pdp_live~ : resampling from %dHz-%dch to %dHz-%dch (in position=%d)", *************** *** 337,340 **** --- 346,354 ---- // post( "pdp_live~ : audio on" ); } + if ( pthread_mutex_unlock( &x->x_audiolock ) < 0 ) + { + post( "pdp_live~ : unable to unlock audio mutex" ); + perror( "pthread_mutex_unlock" ); + } break; *************** *** 384,387 **** --- 398,406 ---- else { + if ( pthread_mutex_lock( &x->x_videolock ) < 0 ) + { + post( "pdp_live~ : unable to lock video mutex" ); + perror( "pthread_mutex_lock" ); + } x->x_newpicture=1; x->x_vwidth = x->x_avcontext->streams[x->x_pkt.stream_index]->codec.width; *************** *** 430,434 **** if ( gettimeofday(&ctime, NULL) == -1) { ! post("pdp_theorin~ : could not read time" ); } --- 449,453 ---- if ( gettimeofday(&ctime, NULL) == -1) { ! post("pdp_live~ : could not read time" ); } *************** *** 436,440 **** ( ctime.tv_usec-x->x_starttime.tv_usec )/1000; ttheoretical = ((x->x_nbframes)*1000 )/x->x_framerate; ! // post( "pdp-theorin~ : %d playing since : %lldms ( theory : %lldms )", // x->x_nbframes, tplaying, ttheoretical ); --- 455,459 ---- ( ctime.tv_usec-x->x_starttime.tv_usec )/1000; ttheoretical = ((x->x_nbframes)*1000 )/x->x_framerate; ! // post( "pdp_live~ : %d playing since : %lldms ( theory : %lldms )", // x->x_nbframes, tplaying, ttheoretical ); *************** *** 448,451 **** --- 467,475 ---- } } + if ( pthread_mutex_unlock( &x->x_videolock ) < 0 ) + { + post( "pdp_live~ : unable to unlock video mutex" ); + perror( "pthread_mutex_unlock" ); + } } break; *************** *** 474,478 **** if ( sched_setscheduler(0,SCHED_FIFO,&schedprio) == -1) { ! post("pdp_theorin~ : couldn't set priority for decoding thread."); } --- 498,502 ---- if ( sched_setscheduler(0,SCHED_FIFO,&schedprio) == -1) { ! post("pdp_live~ : couldn't set priority for decoding thread."); } *************** *** 765,768 **** --- 789,797 ---- if ( x->x_audioon ) { + if ( pthread_mutex_lock( &x->x_audiolock ) < 0 ) + { + post( "pdp_live~ : unable to lock audio mutex" ); + perror( "pthread_mutex_lock" ); + } sn=0; while (n--) *************** *** 790,793 **** --- 819,827 ---- // post( "pdp_live~ : audio off" ); } + if ( pthread_mutex_unlock( &x->x_audiolock ) < 0 ) + { + post( "pdp_live~ : unable to audio unlock mutex" ); + perror( "pthread_mutex_unlock" ); + } } else *************** *** 820,823 **** --- 854,862 ---- if ( x->x_newpicture ) { + if ( pthread_mutex_lock( &x->x_videolock ) < 0 ) + { + post( "pdp_live~ : unable to lock video mutex" ); + perror( "pthread_mutex_lock" ); + } pdp_packet_pass_if_valid(x->x_pdp_out, &x->x_packet0); x->x_newpicture = 0; *************** *** 827,830 **** --- 866,874 ---- x->x_secondcount++; outlet_float( x->x_outlet_nbframes, x->x_nbframes ); + if ( pthread_mutex_unlock( &x->x_videolock ) < 0 ) + { + post( "pdp_live~ : unable to unlock video mutex" ); + perror( "pthread_mutex_unlock" ); + } } outlet_float( x->x_outlet_streaming, x->x_streaming ); *************** *** 857,860 **** --- 901,915 ---- pdp_packet_mark_unused(x->x_packet0); av_free_static(); + + if ( pthread_mutex_destroy( &x->x_audiolock ) < 0 ) + { + post( "pdp_live~ : unable to destroy audio mutex" ); + perror( "pthread_mutex_destroy" ); + } + if ( pthread_mutex_destroy( &x->x_videolock ) < 0 ) + { + post( "pdp_live~ : unable to destroy video mutex" ); + perror( "pthread_mutex_destroy" ); + } } *************** *** 908,911 **** --- 963,979 ---- x->x_firstpts = -1; + if ( pthread_mutex_init( &x->x_audiolock, NULL ) < 0 ) + { + post( "pdp_live~ : unable to initialize audio mutex" ); + perror( "pthread_mutex_init" ); + return NULL; + } + if ( pthread_mutex_init( &x->x_videolock, NULL ) < 0 ) + { + post( "pdp_live~ : unable to initialize video mutex" ); + perror( "pthread_mutex_init" ); + return NULL; + } + x->x_avcontext = av_mallocz(sizeof(AVFormatContext)); if ( !x->x_avcontext ) Index: pdp_binary.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_binary.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pdp_binary.c 14 Nov 2004 23:00:58 -0000 1.1 --- pdp_binary.c 2 Jan 2005 06:02:48 -0000 1.2 *************** *** 199,203 **** if ( x->x_colorY >= 0 ) { ! diff += abs(y-x->x_colorY ); } if ( x->x_colorV >= 0 ) --- 199,203 ---- if ( x->x_colorY >= 0 ) { ! diff = abs(y-x->x_colorY ); } if ( x->x_colorV >= 0 ) Index: pdp_i.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_i.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pdp_i.c 14 Nov 2004 22:52:21 -0000 1.4 --- pdp_i.c 2 Jan 2005 06:02:48 -0000 1.5 *************** *** 156,160 **** if ( x->x_ddata ) freebytes( x->x_ddata, x->x_psize ); if ( x->x_hdata ) freebytes( x->x_hdata, x->x_hsize ); ! if ( x->x_bdata ) freebytes( x->x_hdata, x->x_bsize ); } --- 156,160 ---- if ( x->x_ddata ) freebytes( x->x_ddata, x->x_psize ); if ( x->x_hdata ) freebytes( x->x_hdata, x->x_hsize ); ! if ( x->x_bdata ) freebytes( x->x_bdata, x->x_bsize ); } --- NEW FILE: pdp_theonice~.c --- /* * PiDiP module. * Copyright (c) by Yves Degoyon <ydegoyon(a)free.fr> * * 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. * */ [...1294 lines suppressed...] class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_connect, gensym("connect"), A_SYMBOL, A_SYMBOL, A_DEFFLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_disconnect, gensym("disconnect"), A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_abitrate, gensym("audiobitrate"), A_FLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_vbitrate, gensym("videobitrate"), A_FLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_aquality, gensym("audioquality"), A_FLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_vquality, gensym("videoquality"), A_FLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_framerate, gensym("framerate"), A_FLOAT, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_passwd, gensym("passwd"), A_SYMBOL, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_title, gensym("title"), A_GIMME, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_artist, gensym("artist"), A_GIMME, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_url, gensym("url"), A_SYMBOL, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_description, gensym("description"), A_GIMME, A_NULL); class_addmethod(pdp_theonice_class, (t_method)pdp_theonice_genre, gensym("genre"), A_GIMME, A_NULL); class_sethelpsymbol( pdp_theonice_class, gensym("pdp_theonice~.pd") ); } #ifdef __cplusplus } #endif Index: pdp_ascii.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ascii.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pdp_ascii.c 14 Nov 2004 22:52:21 -0000 1.4 --- pdp_ascii.c 2 Jan 2005 06:02:48 -0000 1.5 *************** *** 316,319 **** --- 316,320 ---- case '0': case '1': + // post( "pdp_ascii : read %c", charread ); *pdata++ = ( charread == '0' )?0:1; nbexpdata--; Index: pdp_theorin~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theorin~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pdp_theorin~.c 14 Nov 2004 23:00:58 -0000 1.1 --- pdp_theorin~.c 2 Jan 2005 06:02:49 -0000 1.2 *************** *** 43,47 **** #define VIDEO_BUFFER_SIZE (1024*1024) #define MAX_AUDIO_PACKET_SIZE (64 * 1024) ! #define MIN_AUDIO_SIZE (64*1024) #define DEFAULT_CHANNELS 1 --- 43,47 ---- #define VIDEO_BUFFER_SIZE (1024*1024) #define MAX_AUDIO_PACKET_SIZE (64 * 1024) ! #define MIN_AUDIO_SIZE (128*1024) #define DEFAULT_CHANNELS 1 *************** *** 53,56 **** --- 53,57 ---- #define DEFAULT_PRIORITY 1 #define MAX_PRIORITY 20 + #define NB_NOFRAMES_HIT 10 #define THEORA_NUM_HEADER_PACKETS 3 *************** *** 81,84 **** --- 82,87 ---- pthread_t x_decodechild; // file decoding thread + pthread_mutex_t x_audiolock; // audio mutex + pthread_mutex_t x_videolock; // video mutex t_int x_usethread; // flag to activate decoding in a thread t_int x_autoplay; // flag to autoplay the file ( default = true ) *************** *** 91,97 **** t_int x_theorainit; // flag for indicating that theora is initialized t_int x_videoready; // video ready flag t_int x_newpicture; // new picture flag t_int x_newpictureready;// new picture ready flag - t_int x_loop; // looping flag ( default = on ) t_int x_notpackets; // number of theora packets decoded t_int x_novpackets; // number of vorbis packets decoded --- 94,100 ---- t_int x_theorainit; // flag for indicating that theora is initialized t_int x_videoready; // video ready flag + t_int x_noframeshits; // number of tries without getting a frame t_int x_newpicture; // new picture flag t_int x_newpictureready;// new picture ready flag t_int x_notpackets; // number of theora packets decoded t_int x_novpackets; // number of vorbis packets decoded *************** *** 125,131 **** /* audio structures */ t_int x_audio; // flag to activate the decoding of audio ! t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ ! t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ ! t_int x_audioin_position; // writing position for incoming audio } t_pdp_theorin; --- 128,135 ---- /* audio structures */ t_int x_audio; // flag to activate the decoding of audio ! t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; // left buffer for pd ! t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; // right buffer for pd ! t_int x_audioin_position;// writing position for incoming audio ! t_float **x_pcm; // buffer for vorbis decoding } t_pdp_theorin; *************** *** 163,174 **** } - static void pdp_theorin_loop(t_pdp_theorin *x, t_floatarg floop ) - { - if ( ( floop == 0. ) || ( floop == 1. ) ) - { - x->x_loop = (int)floop; - } - } - static void pdp_theorin_bang(t_pdp_theorin *x) { --- 167,170 ---- *************** *** 202,206 **** { int ret, count, maxsamples, samples, si=0, sj=0; - float **pcm; struct timespec mwait; struct timeval ctime; --- 198,201 ---- *************** *** 209,212 **** --- 204,208 ---- unsigned char *pY, *pU, *pV; unsigned char *psY, *psU, *psV; + t_float **lpcm; t_int px, py; *************** *** 215,239 **** if ( !x->x_reading ) return -1; ! while ( x->x_novpackets && !x->x_audioon ) { /* if there's pending, decoded audio, grab it */ ! if((ret=vorbis_synthesis_pcmout(&x->x_dsp_state, &pcm))>0) { if (x->x_audio) { maxsamples=(3*MAX_AUDIO_PACKET_SIZE-x->x_audioin_position); samples=(ret<maxsamples)?ret:maxsamples; ! if ( x->x_audioin_position + samples*x->x_audiochannels < 3*MAX_AUDIO_PACKET_SIZE ) ! { ! memcpy( (void*)&x->x_audio_inl[x->x_audioin_position], pcm[0], samples*sizeof(t_float) ); ! memcpy( (void*)&x->x_audio_inr[x->x_audioin_position], pcm[1], samples*sizeof(t_float) ); ! x->x_audioin_position = ( x->x_audioin_position + samples ) % (4*MAX_AUDIO_PACKET_SIZE); ! } ! else ! { ! post( "pdp_theorin~ : audio overflow : packet ignored..."); ! x->x_audioin_position = 0; ! } if ( ( x->x_audioin_position > MIN_AUDIO_SIZE ) && (!x->x_audioon) ) { --- 211,234 ---- if ( !x->x_reading ) return -1; ! while ( x->x_novpackets ) { /* if there's pending, decoded audio, grab it */ ! x->x_pcm = NULL; ! if((ret=vorbis_synthesis_pcmout(&x->x_dsp_state, &x->x_pcm))>0) { if (x->x_audio) { + if ( pthread_mutex_lock( &x->x_audiolock ) < 0 ) + { + post( "pdp_theorin~ : unable to lock audio mutex" ); + perror( "pthread_mutex_lock" ); + } maxsamples=(3*MAX_AUDIO_PACKET_SIZE-x->x_audioin_position); samples=(ret<maxsamples)?ret:maxsamples; ! memcpy( (void*)&x->x_audio_inl[x->x_audioin_position], x->x_pcm[0], samples*sizeof(t_float) ); ! memcpy( (void*)&x->x_audio_inr[x->x_audioin_position], x->x_pcm[1], samples*sizeof(t_float) ); ! x->x_audioin_position = ( x->x_audioin_position + samples ) % (3*MAX_AUDIO_PACKET_SIZE); ! if ( ( x->x_audioin_position > MIN_AUDIO_SIZE ) && (!x->x_audioon) ) { *************** *** 244,247 **** --- 239,251 ---- // post( "pdp_theorin~ : got %d audio samples (audioin=%d)", samples, x->x_audioin_position ); vorbis_synthesis_read(&x->x_dsp_state, samples); + if((ret=vorbis_synthesis_lapout(&x->x_dsp_state, &x->x_pcm))>0) + { + // post( "pdp_theorin~ : supplemental samples (nb=%d)", ret ); + } + if ( pthread_mutex_unlock( &x->x_audiolock ) < 0 ) + { + post( "pdp_theorin~ : unable to audio unlock mutex" ); + perror( "pthread_mutex_unlock" ); + } } else *************** *** 277,301 **** // post( "pdp_theorin~ : got one video frame" ); x->x_videoready=1; } else { // post( "pdp_theorin~ : no more video frame (frames=%d)", x->x_nbframes ); ! if ( x->x_nbframes > 0 ) { - if ( !x->x_loop ) - { x->x_endoffile = 1; - } - else - { - // restart a new loop - if ( gettimeofday(&x->x_starttime, NULL) == -1) - { - post("pdp_theorin~ : could not set start time" ); - } - } - x->x_nbframes = 0; - x->x_audioin_position = 0; // reset audio - x->x_audioon = 0; } break; --- 281,293 ---- // post( "pdp_theorin~ : got one video frame" ); x->x_videoready=1; + x->x_noframeshits=0; } else { // post( "pdp_theorin~ : no more video frame (frames=%d)", x->x_nbframes ); ! x->x_noframeshits++; ! if ( x->x_nbframes > 0 && ( x->x_noframeshits > NB_NOFRAMES_HIT ) ) { x->x_endoffile = 1; } break; *************** *** 305,308 **** --- 297,305 ---- if ( x->x_videoready ) { + if ( pthread_mutex_lock( &x->x_videolock ) < 0 ) + { + post( "pdp_theorin~ : unable to lock video mutex" ); + perror( "pthread_mutex_lock" ); + } theora_decode_YUVout(&x->x_theora_state, &x->x_yuvbuffer); *************** *** 351,354 **** --- 348,356 ---- x->x_newpictureready = 1; } + if ( pthread_mutex_unlock( &x->x_videolock ) < 0 ) + { + post( "pdp_theorin~ : unable to unlock video mutex" ); + perror( "pthread_mutex_unlock" ); + } } } *************** *** 364,368 **** ( ctime.tv_usec-x->x_starttime.tv_usec )/1000; ttheoretical = ((x->x_nbframes)*1000 )/x->x_framerate; ! // post( "pdp-theorin~ : %d playing since : %lldms ( theory : %lldms )", // x->x_nbframes, tplaying, ttheoretical ); --- 366,370 ---- ( ctime.tv_usec-x->x_starttime.tv_usec )/1000; ttheoretical = ((x->x_nbframes)*1000 )/x->x_framerate; ! // post( "pdp_theorin~ : %d playing since : %lldms ( theory : %lldms )", // x->x_nbframes, tplaying, ttheoretical ); *************** *** 375,391 **** } - // check end of file - if(!x->x_videoready && feof(x->x_infile)) - { - if ( x->x_loop ) - { - if ( fseek( x->x_infile, 0x0, SEEK_SET ) < 0 ) - { - post( "pdp_theorin~ : could not reset file." ); - perror( "fseek" ); - } - } - } - // read more data in if( ( x->x_audioin_position < MIN_AUDIO_SIZE ) || ( !x->x_newpicture && !x->x_newpictureready ) ) --- 377,380 ---- *************** *** 413,417 **** twait.tv_sec = 0; ! twait.tv_nsec = 5000000; // 5 ms schedprio.sched_priority = sched_get_priority_min(SCHED_FIFO) + x->x_priority; --- 402,406 ---- twait.tv_sec = 0; ! twait.tv_nsec = 10000000; // 10 ms schedprio.sched_priority = sched_get_priority_min(SCHED_FIFO) + x->x_priority; *************** *** 450,454 **** twait.tv_sec = 0; ! twait.tv_nsec = 10000000; // 10 ms if ( x->x_infile == NULL ) --- 439,443 ---- twait.tv_sec = 0; ! twait.tv_nsec = 100000000; // 100 ms if ( x->x_infile == NULL ) *************** *** 461,466 **** { x->x_newpicture = 0; x->x_reading = 0; ! post("pdp_theorin~ : waiting end of decoding..." ); while ( x->x_decoding ) nanosleep( &twait, NULL ); --- 450,456 ---- { x->x_newpicture = 0; + x->x_newpictureready = 0; x->x_reading = 0; ! // post("pdp_theorin~ : waiting end of decoding..." ); while ( x->x_decoding ) nanosleep( &twait, NULL ); *************** *** 493,497 **** x->x_notpackets = 0; x->x_novpackets = 0; - x->x_endoffile = 0; x->x_nbframes = 0; x->x_decoding = 0; --- 483,486 ---- *************** *** 516,520 **** if ( x->x_infile != NULL ) { ! post("pdp_theorin~ : open request but a file is open ... closing" ); pdp_theorin_close(x); } --- 505,509 ---- if ( x->x_infile != NULL ) { ! // post("pdp_theorin~ : open request but a file is open ... closing" ); pdp_theorin_close(x); } *************** *** 523,527 **** x->x_filename = (char*) malloc( strlen( s->s_name ) + 1 ); strcpy( x->x_filename, s->s_name ); ! post( "pdp_theorin~ : opening file : %s", x->x_filename ); if ( ( x->x_infile = fopen(x->x_filename,"r") ) == NULL ) --- 512,517 ---- x->x_filename = (char*) malloc( strlen( s->s_name ) + 1 ); strcpy( x->x_filename, s->s_name ); ! // post( "pdp_theorin~ : opening file : %s", x->x_filename ); ! x->x_audio = 1; if ( ( x->x_infile = fopen(x->x_filename,"r") ) == NULL ) *************** *** 636,640 **** } } ! post( "pdp_theorin~ : parsed headers ok." ); // initialize decoders --- 626,630 ---- } } ! // post( "pdp_theorin~ : parsed headers ok." ); // initialize decoders *************** *** 643,650 **** theora_decode_init(&x->x_theora_state, &x->x_theora_info); x->x_framerate = (t_int)x->x_theora_info.fps_numerator/x->x_theora_info.fps_denominator; ! post("pdp_theorin~ : stream %x is theora %dx%d %d fps video.", ! x->x_statet.serialno, ! x->x_theora_info.width,x->x_theora_info.height, ! x->x_framerate); if(x->x_theora_info.width!=x->x_theora_info.frame_width || x->x_theora_info.height!=x->x_theora_info.frame_height) --- 633,640 ---- theora_decode_init(&x->x_theora_state, &x->x_theora_info); x->x_framerate = (t_int)x->x_theora_info.fps_numerator/x->x_theora_info.fps_denominator; ! // post("pdp_theorin~ : stream %x is theora %dx%d %d fps video.", ! // x->x_statet.serialno, ! // x->x_theora_info.width,x->x_theora_info.height, ! // x->x_framerate); if(x->x_theora_info.width!=x->x_theora_info.frame_width || x->x_theora_info.height!=x->x_theora_info.frame_height) *************** *** 664,671 **** break;; case OC_CS_ITU_REC_470M: ! post("pdp_theorin~ : encoder specified ITU Rec 470M (NTSC) color."); break;; case OC_CS_ITU_REC_470BG: ! post("pdp_theorin~ : encoder specified ITU Rec 470BG (PAL) color."); break;; default: --- 654,661 ---- break;; case OC_CS_ITU_REC_470M: ! // post("pdp_theorin~ : encoder specified ITU Rec 470M (NTSC) color."); break;; case OC_CS_ITU_REC_470BG: ! // post("pdp_theorin~ : encoder specified ITU Rec 470BG (PAL) color."); break;; default: *************** *** 691,697 **** x->x_audiochannels = x->x_vorbis_info.channels; x->x_samplerate = x->x_vorbis_info.rate; ! post("pdp_theorin~ : ogg logical stream %x is vorbis %d channel %d Hz audio.", ! x->x_statev.serialno, ! x->x_audiochannels, x->x_samplerate); } else --- 681,687 ---- x->x_audiochannels = x->x_vorbis_info.channels; x->x_samplerate = x->x_vorbis_info.rate; ! // post("pdp_theorin~ : ogg logical stream %x is vorbis %d channel %d Hz audio.", ! // x->x_statev.serialno, ! // x->x_audiochannels, x->x_samplerate); } else *************** *** 789,794 **** // just read the buffer ! if ( x->x_audioon ) { sn=0; while (n--) --- 779,789 ---- // just read the buffer ! if ( x->x_audioon && x->x_reading ) { + if ( pthread_mutex_lock( &x->x_audiolock ) < 0 ) + { + post( "pdp_theorin~ : unable to lock audio mutex" ); + perror( "pthread_mutex_lock" ); + } sn=0; while (n--) *************** *** 817,820 **** --- 812,820 ---- // x->x_audioin_position, x->x_audiochannels ); } + if ( pthread_mutex_unlock( &x->x_audiolock ) < 0 ) + { + post( "pdp_theorin~ : unable to unlock audio mutex" ); + perror( "pthread_mutex_unlock" ); + } } else *************** *** 828,831 **** --- 828,833 ---- } + if ( !x->x_reading ) return (w+5); + // check if the framerate has been exceeded if ( gettimeofday(&etime, NULL) == -1) *************** *** 843,846 **** --- 845,853 ---- if ( x->x_newpicture ) { + if ( pthread_mutex_lock( &x->x_videolock ) < 0 ) + { + post( "pdp_theorin~ : unable to lock video mutex" ); + perror( "pthread_mutex_lock" ); + } pdp_packet_pass_if_valid(x->x_pdp_out, &x->x_packet0); x->x_newpicture = 0; *************** *** 849,859 **** x->x_nbframes++; x->x_secondcount++; outlet_float( x->x_outlet_nbframes, x->x_nbframes ); ! } if ( x->x_endoffile == 1 ) // only once { outlet_float( x->x_outlet_endoffile, x->x_endoffile ); - x->x_endoffile = 0; } if ( x->x_endoffile == -1 ) // reset --- 856,870 ---- x->x_nbframes++; x->x_secondcount++; + // post( "pdp_theorin~ : frame #%d", x->x_nbframes ); outlet_float( x->x_outlet_nbframes, x->x_nbframes ); ! if ( pthread_mutex_unlock( &x->x_videolock ) < 0 ) ! { ! post( "pdp_theorin~ : unable to unlock video mutex" ); ! perror( "pthread_mutex_unlock" ); ! } } if ( x->x_endoffile == 1 ) // only once { outlet_float( x->x_outlet_endoffile, x->x_endoffile ); } if ( x->x_endoffile == -1 ) // reset *************** *** 884,889 **** pdp_theorin_close(x); } ! post( "pdp_theorin~ : freeing object" ); } --- 895,911 ---- pdp_theorin_close(x); } + + if ( pthread_mutex_destroy( &x->x_audiolock ) < 0 ) + { + post( "pdp_theorin~ : unable to destroy audio mutex" ); + perror( "pthread_mutex_destroy" ); + } + if ( pthread_mutex_destroy( &x->x_videolock ) < 0 ) + { + post( "pdp_theorin~ : unable to destroy video mutex" ); + perror( "pthread_mutex_destroy" ); + } ! // post( "pdp_theorin~ : freeing object" ); } *************** *** 910,913 **** --- 932,947 ---- x->x_packet0 = -1; x->x_decodechild = 0; + if ( pthread_mutex_init( &x->x_audiolock, NULL ) < 0 ) + { + post( "pdp_theorin~ : unable to initialize audio mutex" ); + perror( "pthread_mutex_init" ); + return NULL; + } + if ( pthread_mutex_init( &x->x_videolock, NULL ) < 0 ) + { + post( "pdp_theorin~ : unable to initialize video mutex" ); + perror( "pthread_mutex_init" ); + return NULL; + } x->x_decoding = 0; x->x_theorainit = 0; *************** *** 928,932 **** x->x_blocksize = MIN_AUDIO_SIZE; x->x_autoplay = 1; - x->x_loop = 1; x->x_nextimage = 0; x->x_infile = NULL; --- 962,965 ---- *************** *** 958,962 **** class_addmethod(pdp_theorin_class, (t_method)pdp_theorin_audio, gensym("audio"), A_FLOAT, A_NULL); class_addmethod(pdp_theorin_class, (t_method)pdp_theorin_autoplay, gensym("autoplay"), A_FLOAT, A_NULL); - class_addmethod(pdp_theorin_class, (t_method)pdp_theorin_loop, gensym("loop"), A_FLOAT, A_NULL); class_addmethod(pdp_theorin_class, (t_method)pdp_theorin_threadify, gensym("thread"), A_FLOAT, A_NULL); class_addmethod(pdp_theorin_class, (t_method)pdp_theorin_bang, gensym("bang"), A_NULL); --- 991,994 ----

1 0

externals/pidip/charmaps acuadrosypuntos.map,NONE,1.1 allone.map,NONE,1.1 cuadros-basic.map,NONE,1.1 tati.map,NONE,1.1
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/charmaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/charmaps Added Files: acuadrosypuntos.map allone.map cuadros-basic.map tati.map Log Message: PiDiP 0.12.18 --- NEW FILE: allone.map --- #ifndef __default_h__ #define __default_h__ #define CHARWIDTH 5 #define CHARHEIGHT 8 #define NBCHARS 128 static char charmaps[NBCHARS][CHARWIDTH*CHARHEIGHT] = { { 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, }, { [...1251 lines suppressed...] 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, }, { 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1, } }; #endif --- NEW FILE: tati.map --- #ifndef __default_h__ #define __default_h__ #define CHARWIDTH 5 #define CHARHEIGHT 8 #define NBCHARS 128 static char charmaps[NBCHARS][CHARWIDTH*CHARHEIGHT] = { { 0,0,0,0,0, 0,0,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,1,1,1,0, 1,0,1,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 0,1,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,0,1,0,0, 0,1,1,0,0, 0,0,1,0,0, 1,1,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,1,1,1,0, 0,0,1,0,0, 0,1,0,0,0, 1,0,0,0,0, 1,1,1,1,0, 0,0,0,0,0, }, { 0,0,1,0,0, 0,1,0,0,0, 0,1,0,0,0, 1,0,0,0,0, 0,1,0,0,0, 0,1,0,0,0, 0,0,1,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 0,1,1,0,0, 1,0,1,0,0, 1,0,1,0,0, 0,1,1,0,0, 0,0,1,0,0, 0,0,1,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,1,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,1,0,0,0, 1,0,0,0,0, 1,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 1,0,0,0,0, 0,0,0,0,0, }, }; #endif --- NEW FILE: cuadros-basic.map --- #ifndef __default_h__ #define __default_h__ #define CHARWIDTH 5 #define CHARHEIGHT 8 #define NBCHARS 128 static char charmaps[NBCHARS][CHARWIDTH*CHARHEIGHT] = { { 0,0,0,0,0, 0,0,0,0,0, 1,1,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,1,0,0,0, 1,0,0,0,0, 1,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 1,0,0,0,0, 0,0,0,0,0, }, }; #endif --- NEW FILE: acuadrosypuntos.map --- #ifndef __default_h__ #define __default_h__ #define CHARWIDTH 5 #define CHARHEIGHT 8 #define NBCHARS 128 static char charmaps[NBCHARS][CHARWIDTH*CHARHEIGHT] = { { 0,1,0,0,0, 1,0,1,0,0, 0,1,0,0,0, 1,0,1,0,0, 1,0,1,0,0, 1,1,0,0,0, 0,1,1,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,1,0,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, }, { 0,1,0,1,0, 0,1,0,1,0, 0,1,1,1,0, 0,1,0,1,0, 0,1,0,1,0, 0,0,1,1,0, 0,0,0,1,0, 0,0,0,1,0, }, { 0,0,0,0,0, 0,1,1,0,0, 0,1,1,1,0, 1,1,1,1,0, 0,1,1,1,0, 0,0,1,0,0, 0,0,0,0,0, 0,0,0,0,0, }, { 0,1,1,0,0, 1,0,0,0,0, 0,1,1,0,0, 0,0,0,0,0, 0,0,1,1,0, 0,0,1,0,0, 0,0,1,1,0, 0,0,1,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,1,0,0,0, 0,1,1,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 1,1,0,0,0, 0,1,1,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, }, { 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,1,0,0,0, 1,0,0,0,0, 0,0,0,0,0, }, }; #endif

1 0

externals/pidip/doc help-pdp_icedthe~.pd,NONE,1.1 help-pdp_mapper.pd,NONE,1.1 help-pdp_theonice~.pd,NONE,1.1 rs_pdp_icedthe~.pd,NONE,1.1 rs_pdp_theonice~.pd,NONE,1.1 help-pdp_theorout~.pd,1.1,1.2 rs_pdp_theorin~.pd,1.1,1.2
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325/doc Modified Files: help-pdp_theorout~.pd rs_pdp_theorin~.pd Added Files: help-pdp_icedthe~.pd help-pdp_mapper.pd help-pdp_theonice~.pd rs_pdp_icedthe~.pd rs_pdp_theonice~.pd Log Message: PiDiP 0.12.18 Index: rs_pdp_theorin~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/rs_pdp_theorin~.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rs_pdp_theorin~.pd 14 Nov 2004 23:05:03 -0000 1.1 --- rs_pdp_theorin~.pd 2 Jan 2005 06:02:48 -0000 1.2 *************** *** 8,12 **** #X obj 134 543 outlet~; #X text 390 405 Set the priority of decoding thread; ! #X obj 247 143 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 250 379 audio \$1; --- 8,12 ---- #X obj 134 543 outlet~; #X text 390 405 Set the priority of decoding thread; ! #X obj 247 174 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 250 379 audio \$1; *************** *** 21,48 **** #X floatatom 256 526 5 0 0 0 - - -; #X floatatom 280 506 5 0 0 0 - - -; ! #X obj 339 257 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 395 255 loadbang; ! #X msg 360 255 1; ! #X msg 248 256 autoplay \$1; ! #X text 463 255 Activate auto play mode ( default : on ); ! #X msg 248 287 bang; ! #X msg 388 289 bang; ! #X floatatom 429 290 5 0 0 0 - - -; ! #X text 481 288 In manual mode \, read next frame ( autoplay = off ); ! #X obj 324 289 metro 70; ! #X msg 249 318 loop \$1; ! #X obj 311 319 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 ! 1; ! #X obj 367 317 loadbang; ! #X msg 332 317 1; ! #X text 435 317 Activate loop mode for files ( default : on ); ! #X msg 285 288 stop; #X obj 111 430 pdp_theorin~; ! #X msg 248 222 close; ! #X text 326 224 Close the current file; ! #X text 325 164 Open a theora video file; ! #X msg 247 193 open \$1; #X text 303 528 File framerate; #X text 327 507 End of file reached; --- 21,42 ---- #X floatatom 256 526 5 0 0 0 - - -; #X floatatom 280 506 5 0 0 0 - - -; ! #X obj 339 288 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 395 286 loadbang; ! #X msg 360 286 1; ! #X msg 248 287 autoplay \$1; ! #X text 463 286 Activate auto play mode ( default : on ); ! #X msg 248 318 bang; ! #X msg 388 318 bang; ! #X floatatom 429 319 5 0 0 0 - - -; ! #X text 481 319 In manual mode \, read next frame ( autoplay = off ); ! #X obj 324 318 metro 70; ! #X msg 285 318 stop; #X obj 111 430 pdp_theorin~; ! #X msg 248 253 close; ! #X text 326 255 Close the current file; ! #X text 325 195 Open a theora video file; ! #X msg 247 224 open \$1; #X text 303 528 File framerate; #X text 327 507 End of file reached; *************** *** 51,59 **** #X obj 72 543 outlet~; #X text 387 418 ([0 \, 20 ] default : 1 ); ! #X obj 247 165 openpanel; #X text 444 380 Activate decoding of audio ( default : on ); #X obj 377 380 loadbang; #X msg 342 380 1; - #X obj 67 60 block~ 512; #X text 12 179 warning : there's a big delay; #X text 11 192 and risks of desynchronisation; --- 45,52 ---- #X obj 72 543 outlet~; #X text 387 418 ([0 \, 20 ] default : 1 ); ! #X obj 247 196 openpanel; #X text 444 380 Activate decoding of audio ( default : on ); #X obj 377 380 loadbang; #X msg 342 380 1; #X text 12 179 warning : there's a big delay; #X text 11 192 and risks of desynchronisation; *************** *** 63,67 **** #X text 354 455 File size ( in kbs ); #X obj 39 496 pdp_xv; ! #X obj 78 259 vsl 15 128 0 2083 0 0 empty filesize empty 0 -8 0 8 -262144 -1 -1 0 1; #X msg 310 473 \; filesize range 0 \$1; --- 56,60 ---- #X text 354 455 File size ( in kbs ); #X obj 39 496 pdp_xv; ! #X obj 78 259 vsl 15 128 0 510 0 0 empty filesize empty 0 -8 0 8 -262144 -1 -1 0 1; #X msg 310 473 \; filesize range 0 \$1; *************** *** 73,83 **** #X floatatom 691 152 5 0 0 0 - - -; #X obj 691 123 route pdp_drop; ! #X connect 3 0 34 0; #X connect 4 0 3 0; ! #X connect 8 0 45 0; ! #X connect 9 0 34 0; #X connect 10 0 9 0; #X connect 11 0 12 0; ! #X connect 12 0 34 0; #X connect 13 0 14 0; #X connect 14 0 11 0; --- 66,80 ---- #X floatatom 691 152 5 0 0 0 - - -; #X obj 691 123 route pdp_drop; ! #X obj 129 294 route 1; ! #X obj 152 265 symbol; ! #X msg 115 265 bang; ! #X obj 241 582 block~ 512; ! #X connect 3 0 29 0; #X connect 4 0 3 0; ! #X connect 8 0 40 0; ! #X connect 9 0 29 0; #X connect 10 0 9 0; #X connect 11 0 12 0; ! #X connect 12 0 29 0; #X connect 13 0 14 0; #X connect 14 0 11 0; *************** *** 85,115 **** #X connect 19 0 20 0; #X connect 20 0 18 0; ! #X connect 21 0 34 0; ! #X connect 23 0 34 0; #X connect 24 0 27 0; #X connect 25 0 27 1; ! #X connect 27 0 34 0; ! #X connect 28 0 34 0; ! #X connect 29 0 28 0; ! #X connect 30 0 31 0; ! #X connect 31 0 29 0; ! #X connect 33 0 27 0; ! #X connect 34 0 56 0; ! #X connect 34 1 43 0; ! #X connect 34 2 6 0; ! #X connect 34 3 1 0; ! #X connect 34 4 16 0; ! #X connect 34 5 17 0; ! #X connect 34 6 54 0; ! #X connect 35 0 34 0; ! #X connect 38 0 34 0; ! #X connect 45 0 38 0; ! #X connect 47 0 48 0; ! #X connect 48 0 10 0; ! #X connect 54 0 58 0; ! #X connect 57 0 34 1; ! #X connect 57 0 59 0; ! #X connect 60 0 62 0; ! #X connect 61 0 64 0; ! #X connect 62 0 61 0; ! #X connect 64 0 63 0; --- 82,113 ---- #X connect 19 0 20 0; #X connect 20 0 18 0; ! #X connect 21 0 29 0; ! #X connect 23 0 29 0; #X connect 24 0 27 0; #X connect 25 0 27 1; ! #X connect 27 0 29 0; ! #X connect 28 0 27 0; ! #X connect 29 0 50 0; ! #X connect 29 1 38 0; ! #X connect 29 2 6 0; ! #X connect 29 3 1 0; ! #X connect 29 4 16 0; ! #X connect 29 5 17 0; ! #X connect 29 5 59 0; ! #X connect 29 6 48 0; ! #X connect 30 0 29 0; ! #X connect 33 0 29 0; ! #X connect 40 0 33 0; ! #X connect 40 0 60 1; ! #X connect 42 0 43 0; ! #X connect 43 0 10 0; ! #X connect 48 0 52 0; ! #X connect 51 0 29 1; ! #X connect 51 0 53 0; ! #X connect 54 0 56 0; ! #X connect 55 0 58 0; ! #X connect 56 0 55 0; ! #X connect 58 0 57 0; ! #X connect 59 0 61 0; ! #X connect 60 0 33 0; ! #X connect 61 0 60 0; Index: help-pdp_theorout~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_theorout~.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_theorout~.pd 14 Nov 2004 23:05:03 -0000 1.1 --- help-pdp_theorout~.pd 2 Jan 2005 06:02:48 -0000 1.2 *************** *** 67,70 **** --- 67,72 ---- #X text 682 324 ( or restart it ); #X obj 159 504 pdp_theorout~; + #X msg 452 82 loop 1; + #X obj 452 55 loadbang; #X connect 0 0 8 0; #X connect 1 0 19 0; *************** *** 117,118 **** --- 119,122 ---- #X connect 57 0 50 0; #X connect 60 0 18 0; + #X connect 61 0 38 0; + #X connect 62 0 61 0; --- NEW FILE: help-pdp_icedthe~.pd --- #N canvas 259 178 509 391 10; #X obj 156 158 dac~; #X text 51 309 written by Yves Degoyon (ydegoyon(a)free.fr); #X text 236 112 <-- everything is in this box; #X text 265 127 where the block size is redefined; #X text 265 141 this is necessary for an; #X text 266 154 ( acceptable? ) audio decoding; #X obj 395 221 loadbang; #X msg 395 251 \; pd dsp 1; #X obj 129 113 rs_pdp_icedthe~; #X text 51 295 pdp_icedthe~ : theora threaded stream decoder; #X connect 6 0 7 0; #X connect 8 0 0 0; #X connect 8 1 0 1; --- NEW FILE: help-pdp_mapper.pd --- #N canvas 237 21 712 664 10; #X obj 268 64 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 123 136 loop \$1; #X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1; #X msg 370 44 open \$1; #X obj 369 20 openpanel; #X obj 354 3 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X floatatom 316 99 5 0 0 0 - - -; #X msg 225 65 stop; #X obj 323 68 hsl 300 15 0 1000 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; #X obj 282 213 dac~; #X obj 257 135 metro 70; #X obj 252 167 pdp_yqt; #X obj 421 166 pdp_v4l; #X obj 430 135 metro 70; #X obj 475 101 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 432 102 stop; #X msg 517 133 open /dev/video; #X obj 548 463 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 548 515 pdp_control; #X msg 548 488 thread \$1; #X floatatom 548 576 5 0 0 0 - - -; #X obj 548 547 route pdp_drop; #X text 108 497 pdp_mapper : a pixel mapper; #X text 108 511 enabling some cut and paste; #X text 108 524 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X msg 369 299 copy \$1 \$2 \$3 \$4; #X obj 369 273 pack f f f f; #X obj 364 244 t b f; #X obj 404 244 t b f; #X obj 444 244 t b f; #X floatatom 502 245 5 0 0 0 - - -; #X floatatom 554 245 5 0 0 0 - - -; #X floatatom 603 244 5 0 0 0 - - -; #X floatatom 650 244 5 0 0 0 - - -; #X text 501 229 fromX; #X text 553 228 fromY; #X text 609 227 toX; #X text 652 226 toY; #X obj 373 364 pack f f f f; #X obj 368 335 t b f; #X obj 408 335 t b f; #X obj 448 335 t b f; #X floatatom 506 336 5 0 0 0 - - -; #X floatatom 558 336 5 0 0 0 - - -; #X floatatom 607 335 5 0 0 0 - - -; #X floatatom 654 335 5 0 0 0 - - -; #X text 505 320 fromX; #X text 557 319 fromY; #X text 613 318 toX; #X text 656 317 toY; #X msg 373 392 swap \$1 \$2 \$3 \$4; #X msg 373 426 reset; #N canvas 365 107 634 551 cutandpaste 0; #X obj 52 438 outlet; #X obj 121 76 f; #X obj 121 105 + 1; #X floatatom 121 137 5 0 0 0 - - -; #X msg 121 29 bang; #X obj 122 190 select 1; #X msg 167 104 34; #X msg 164 30 stop; #X obj 167 80 loadbang; #X obj 272 78 f; #X obj 272 107 + 1; #X floatatom 272 139 5 0 0 0 - - -; #X obj 273 192 select 1; #X obj 318 82 loadbang; #X msg 318 106 56; #X msg 272 54 bang; #X floatatom 169 269 5 0 0 0 - - -; #X floatatom 239 269 5 0 0 0 - - -; #X text 166 284 fromX; #X text 234 285 fromY; #X floatatom 315 268 5 0 0 0 - - -; #X text 321 285 toX; #X floatatom 395 269 5 0 0 0 - - -; #X text 400 284 toY; #X obj 168 358 pack f f f f; #X obj 191 327 t b f; #X obj 237 327 t b f; #X obj 286 327 t b f; #X obj 121 161 > 117; #X obj 314 243 + 100; #X obj 272 163 > 140; #X obj 395 243 + 80; #X obj 122 52 metro 1; #X obj 121 6 inlet; #X msg 52 406 copy \$1 \$2 \$3 \$4; #X connect 1 0 2 0; #X connect 2 0 1 1; #X connect 2 0 3 0; #X connect 3 0 16 0; #X connect 3 0 28 0; #X connect 4 0 32 0; #X connect 5 0 6 0; #X connect 5 0 15 0; #X connect 6 0 1 1; #X connect 7 0 32 0; #X connect 8 0 6 0; #X connect 9 0 10 0; #X connect 10 0 9 1; #X connect 10 0 11 0; #X connect 11 0 17 0; #X connect 11 0 30 0; #X connect 12 0 14 0; #X connect 13 0 14 0; #X connect 14 0 9 1; #X connect 14 0 7 0; #X connect 15 0 9 0; #X connect 16 0 24 0; #X connect 16 0 29 0; #X connect 17 0 25 0; #X connect 17 0 31 0; #X connect 20 0 26 0; #X connect 22 0 27 0; #X connect 24 0 34 0; #X connect 25 0 24 0; #X connect 25 1 24 1; #X connect 26 0 24 0; #X connect 26 1 24 2; #X connect 27 0 24 0; #X connect 27 1 24 3; #X connect 28 0 5 0; #X connect 29 0 20 0; #X connect 30 0 12 0; #X connect 31 0 22 0; #X connect 32 0 1 0; #X connect 33 0 4 0; #X connect 34 0 0 0; #X restore 375 455 pd cutandpaste; #N canvas 0 193 634 551 circleswap 0; #X obj 53 493 outlet; #X msg 121 29 bang; #X msg 164 30 stop; #X floatatom 204 328 5 0 0 0 - - -; #X text 131 343 fromX; #X text 199 344 fromY; #X floatatom 280 327 5 0 0 0 - - -; #X text 286 344 toX; #X floatatom 360 328 5 0 0 0 - - -; #X text 365 343 toY; #X obj 133 417 pack f f f f; #X obj 156 386 t b f; #X obj 202 386 t b f; #X obj 251 386 t b f; #X obj 279 302 + 100; #X obj 360 302 + 80; #X obj 123 78 f; #X obj 123 105 + 1; #X obj 124 156 select 1; #X floatatom 123 182 5 0 0 0 - - -; #X text 298 181 alpha; #X obj 124 130 > 359; #X obj 172 180 / 360; #X msg 153 79 0; #X obj 184 78 loadbang; #X obj 221 181 * 6.2832; #X obj 134 303 + 100; #X floatatom 134 328 5 0 0 0 - - -; #X obj 204 302 + 100; #X obj 126 274 expr $f1*cos($f2); #X obj 256 273 expr $f1*sin($f2); #X obj 438 77 loadbang; #X msg 439 103 50; #X obj 423 130 f; #X obj 423 154 - 1; #X obj 424 180 < 0; #X obj 424 206 select 1; #X msg 400 104 bang; #X floatatom 424 233 5 0 0 0 - - -; #X obj 243 227 t b f; #X obj 122 52 metro 1; #X obj 121 6 inlet; #X msg 53 461 copy \$1 \$2 \$3 \$4; #X connect 1 0 40 0; #X connect 2 0 40 0; #X connect 3 0 11 0; #X connect 3 0 15 0; #X connect 6 0 12 0; #X connect 8 0 13 0; #X connect 10 0 42 0; #X connect 11 0 10 0; #X connect 11 1 10 1; #X connect 12 0 10 0; #X connect 12 1 10 2; #X connect 13 0 10 0; #X connect 13 1 10 3; #X connect 14 0 6 0; #X connect 15 0 8 0; #X connect 16 0 17 0; #X connect 17 0 16 1; #X connect 17 0 19 0; #X connect 17 0 21 0; #X connect 18 0 23 0; #X connect 19 0 22 0; #X connect 21 0 18 0; #X connect 22 0 25 0; #X connect 23 0 16 1; #X connect 23 0 37 0; #X connect 24 0 23 0; #X connect 25 0 39 0; #X connect 26 0 27 0; #X connect 27 0 10 0; #X connect 27 0 14 0; #X connect 28 0 3 0; #X connect 29 0 26 0; #X connect 30 0 28 0; #X connect 31 0 32 0; #X connect 32 0 33 1; #X connect 32 0 30 0; #X connect 32 0 29 0; #X connect 33 0 34 0; #X connect 34 0 33 1; #X connect 34 0 35 0; #X connect 34 0 38 0; #X connect 35 0 36 0; #X connect 36 0 2 0; #X connect 36 0 32 0; #X connect 37 0 33 0; #X connect 38 0 30 0; #X connect 38 0 29 0; #X connect 39 0 30 0; #X connect 39 0 29 0; #X connect 39 1 30 1; #X connect 39 1 29 1; #X connect 40 0 16 0; #X connect 41 0 1 0; #X connect 42 0 0 0; #X restore 376 478 pd circleswap; #X obj 153 430 pdp_xv; #X msg 481 454 bang; #X msg 481 477 bang; #X obj 153 388 pdp_mapper; #X connect 0 0 10 0; #X connect 1 0 11 0; #X connect 2 0 1 0; #X connect 3 0 11 0; #X connect 4 0 3 0; #X connect 5 0 4 0; #X connect 6 0 10 1; #X connect 7 0 10 0; #X connect 8 0 6 0; #X connect 10 0 11 0; #X connect 11 0 57 0; #X connect 11 4 9 0; #X connect 11 5 9 1; #X connect 12 0 57 0; #X connect 13 0 12 0; #X connect 14 0 13 0; #X connect 15 0 13 0; #X connect 16 0 12 0; #X connect 17 0 19 0; #X connect 18 0 21 0; #X connect 19 0 18 0; #X connect 21 0 20 0; #X connect 25 0 57 0; #X connect 26 0 25 0; #X connect 27 0 26 0; #X connect 27 1 26 1; #X connect 28 0 26 0; #X connect 28 1 26 2; #X connect 29 0 26 0; #X connect 29 1 26 3; #X connect 30 0 26 0; #X connect 31 0 27 0; #X connect 32 0 28 0; #X connect 33 0 29 0; #X connect 38 0 50 0; #X connect 39 0 38 0; #X connect 39 1 38 1; #X connect 40 0 38 0; #X connect 40 1 38 2; #X connect 41 0 38 0; #X connect 41 1 38 3; #X connect 42 0 38 0; #X connect 43 0 39 0; #X connect 44 0 40 0; #X connect 45 0 41 0; #X connect 50 0 57 0; #X connect 51 0 57 0; #X connect 52 0 57 0; #X connect 53 0 57 0; #X connect 55 0 52 0; #X connect 56 0 53 0; #X connect 57 0 54 0; --- NEW FILE: rs_pdp_icedthe~.pd --- #N canvas 127 47 872 636 10; #X text 452 600 written by Yves Degoyon (ydegoyon(a)free.fr); #X floatatom 245 506 7 0 0 0 - - -; #X text 301 507 Number of video frames decoded; #X msg 248 352 priority \$1; #X floatatom 337 353 5 0 0 0 - - -; #X text 383 376 ( optional \, if you know what you're doing ); #X text 388 348 Set the priority of decoding thread; #X msg 248 322 audio \$1; #X obj 317 324 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X floatatom 261 483 5 0 0 0 - - -; #X floatatom 285 463 5 0 0 0 - - -; #X obj 72 543 outlet~; #X text 385 361 ([0 \, 20 ] default : 1 ); #X text 442 323 Activate decoding of audio ( default : on ); #X obj 375 323 loadbang; #X msg 340 323 1; #X obj 67 60 block~ 512; #X obj 39 496 pdp_xv; #X obj 691 39 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 691 91 pdp_control; #X msg 691 64 thread \$1; #X floatatom 691 152 5 0 0 0 - - -; #X obj 691 123 route pdp_drop; #X msg 248 291 disconnect; #X text 332 291 Disconnect from a stream; #X text 538 263 Connect to a stream; #X text 332 463 End of stream reached; #X text 308 485 Stream framerate; #X floatatom 232 530 5 0 0 0 - - -; #X text 281 531 Connection status; #X text 452 586 pdp_icedthe~ : threaded theora stream decoder; #X msg 248 263 connect http://localhost:8000/theora.ogg; #X floatatom 306 443 20 0 0 0 - - -; #X text 458 442 Video/Audio lag; #X msg 248 232 connect http://mirror.fluendo.com:8801/; #X obj 134 543 outlet~; #X obj 133 396 pdp_icedthe~; #X connect 3 0 36 0; #X connect 4 0 3 0; #X connect 7 0 36 0; #X connect 8 0 7 0; #X connect 14 0 15 0; #X connect 15 0 8 0; #X connect 18 0 20 0; #X connect 19 0 22 0; #X connect 20 0 19 0; #X connect 22 0 21 0; #X connect 23 0 36 0; #X connect 31 0 36 0; #X connect 34 0 36 0; #X connect 36 0 17 0; #X connect 36 1 11 0; #X connect 36 2 35 0; #X connect 36 3 28 0; #X connect 36 4 1 0; #X connect 36 5 9 0; #X connect 36 6 10 0; #X connect 36 7 32 0; --- NEW FILE: rs_pdp_theonice~.pd --- #N canvas 5 16 986 661 10; #X obj 255 34 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 117 65 loop \$1; #X obj 117 40 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1 1 ; #X msg 278 48 open \$1; #X obj 278 24 openpanel; #X obj 278 3 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X floatatom 293 75 5 0 0 0 - - -; #X msg 212 35 stop; #X obj 215 91 metro 70; #X obj 5 155 pdp_v4l; #X obj 14 124 metro 70; #X obj 59 90 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1 -1; #X msg 16 91 stop; #X msg 79 125 open /dev/video; #X text 647 79 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X obj 215 124 pdp_yqt; #X obj 860 516 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 860 568 pdp_control; #X msg 860 541 thread \$1; #X floatatom 860 629 5 0 0 0 - - -; #X obj 860 600 route pdp_drop; #X text 388 144 <---- audio connections; #X text 381 161 ==== ACTIONS ========; #X text 382 382 ==== VIDEOS SETTINGS ========; #X text 381 483 ==== AUDIO SETTINGS ========; #X obj 23 329 pdp_xv; #X obj 74 178 pdp_affine; #X floatatom 106 152 5 0 0 0 - - -; #X obj 356 19 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 356 69 open \$1; #X obj 356 41 openpanel; #X text 509 571 Warning : change audio and video settings; #X msg 383 431 videoquality \$1; #X msg 385 455 videobitrate \$1; #X text 558 457 Video bitrate ( kbps ) : [45 \, 2000]; #X text 723 471 default 48; #X msg 383 504 audioquality \$1; #X msg 384 532 audiobitrate \$1; #X text 725 547 default 32; #X text 561 533 Audio bitrate ( kbps ) : [8 \, 2000]; #X text 560 506 Audio quality : [-0.1 \, 1.0] \, default 0.5; #X floatatom 502 432 5 0 0 0 - - -; #X floatatom 503 454 5 0 0 0 - - -; #X floatatom 504 504 5 0 0 0 - - -; #X floatatom 504 533 5 0 0 0 - - -; #X text 650 26 pdp_theonice~ : streams theora a/v to a; #X text 647 39 (patched) icecast server; #X text 648 66 http://mediacast1.com/~karl; #X text 647 53 the icecast server can be found here :; #X msg 384 237 passwd letmein; #X text 579 585 before connecting; #X msg 384 210 disconnect; #X text 494 237 Setting up the password; #X text 627 184 Connect to an icecast server; #X text 466 212 Disconnect; #X text 577 598 ( or reconnect to the server ); #X msg 384 263 title the aesthetics of our anger; #X msg 384 362 genre angrrrry; #X msg 383 335 description images from infowar; #X msg 384 309 url http://www.indymedia.org; #X msg 384 285 artist recuerdos de luchas; #X msg 384 182 connect localhost theora.ogg 8000; #X obj 356 98 pdp_theorin~; #X floatatom 41 530 5 0 0 0 - - -; #X text 83 531 Streaming status; #X floatatom 68 551 7 0 0 0 - - -; #X text 126 551 Number of video frames emitted; #X floatatom 96 571 7 0 0 0 - - -; #X text 147 571 Number of video frames dropped; #X floatatom 124 594 5 0 0 0 - - -; #X text 168 593 Emission framerate; #X obj 23 304 pdp_spigot; #X obj 94 282 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X text 556 433 Video quality : [0 \, 63] \, default 2!; #X floatatom 502 406 5 0 0 0 - - -; #X msg 383 405 framerate \$1; #X obj 156 268 pdp_scale 192 160; #X floatatom 145 617 7 0 0 0 - - -; #X text 201 618 Audio stream time; #X floatatom 165 639 7 0 0 0 - - -; #X text 220 639 Video stream time; #X msg 76 329 close; #X obj 265 172 spigot~; #X obj 311 143 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 463 97 route 1; #X msg 464 70 bang; #X obj 416 69 symbol; #X obj 229 213 outlet~; #X obj 294 214 outlet~; #X obj 518 622 block~ 512; #X obj 142 366 inlet~; #X obj 216 366 inlet~; #X text 556 406 Framerate : [1 \, 100] \, default 7; #X obj 159 490 pdp_theonice~; #X connect 0 0 8 0; #X connect 1 0 15 0; #X connect 2 0 1 0; #X connect 3 0 15 0; #X connect 4 0 3 0; #X connect 5 0 4 0; #X connect 6 0 8 1; #X connect 7 0 8 0; #X connect 8 0 15 0; #X connect 9 0 26 0; #X connect 10 0 9 0; #X connect 11 0 10 0; #X connect 12 0 10 0; #X connect 13 0 9 0; #X connect 15 0 76 0; #X connect 15 4 82 0; #X connect 15 4 93 0; #X connect 15 5 82 0; #X connect 15 5 93 1; #X connect 16 0 18 0; #X connect 17 0 20 0; #X connect 18 0 17 0; #X connect 20 0 19 0; #X connect 26 0 76 0; #X connect 27 0 26 1; #X connect 28 0 30 0; #X connect 29 0 62 0; #X connect 30 0 29 0; #X connect 30 0 86 1; #X connect 32 0 93 0; #X connect 33 0 93 0; #X connect 36 0 93 0; #X connect 37 0 93 0; #X connect 41 0 32 0; #X connect 42 0 33 0; #X connect 43 0 36 0; #X connect 44 0 37 0; #X connect 49 0 93 0; #X connect 51 0 93 0; #X connect 56 0 93 0; #X connect 57 0 93 0; #X connect 58 0 93 0; #X connect 59 0 93 0; #X connect 60 0 93 0; #X connect 61 0 93 0; #X connect 62 0 93 0; #X connect 62 1 82 0; #X connect 62 1 93 0; #X connect 62 2 82 0; #X connect 62 2 93 1; #X connect 62 5 84 0; #X connect 71 1 25 0; #X connect 72 0 71 1; #X connect 74 0 75 0; #X connect 75 0 93 0; #X connect 76 0 71 0; #X connect 76 0 93 0; #X connect 81 0 25 0; #X connect 82 1 88 0; #X connect 82 1 87 0; #X connect 83 0 82 1; #X connect 84 0 85 0; #X connect 85 0 86 0; #X connect 86 0 29 0; #X connect 90 0 93 0; #X connect 91 0 93 1; #X connect 93 0 63 0; #X connect 93 1 65 0; #X connect 93 2 67 0; #X connect 93 3 69 0; #X connect 93 4 77 0; #X connect 93 5 79 0; --- NEW FILE: help-pdp_theonice~.pd --- #N canvas 131 125 861 556 10; #X obj 156 158 dac~; #X text 246 113 <-- everything is in this box; #X text 275 128 where the block size is redefined; #X text 275 142 this is necessary for an; #X msg 395 251 \; pd dsp 1; #X obj 128 113 rs_pdp_theonice~; #X text 52 282 written by Yves Degoyon ( ydegoyon(a)free.fr ); #X text 55 229 pdp_theonice~ : streams theora a/v to a; #X text 52 242 (patched) icecast server; #X text 53 269 http://mediacast1.com/~karl; #X text 52 256 the icecast server can be found here :; #X text 276 155 ( acceptable? ) theora audio decoding; #X obj 395 221 loadbang; #X obj 160 55 adc~; #X connect 5 0 0 0; #X connect 5 1 0 1; #X connect 12 0 4 0; #X connect 13 0 5 0; #X connect 13 1 5 1;

1 0

externals/pidip CHANGES.LOG,1.15,1.16 Makefile,1.7,1.8 acinclude.m4,1.8,1.9 aclocal.m4,1.8,1.9 configure,1.8,1.9 configure.ac,1.10,1.11 configure.in,1.5,1.6
by Yves Degoyon 02 Jan '05

02 Jan '05

Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5325 Modified Files: CHANGES.LOG Makefile acinclude.m4 aclocal.m4 configure configure.ac configure.in Log Message: PiDiP 0.12.18 Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** configure.ac 14 Nov 2004 22:52:20 -0000 1.10 --- configure.ac 2 Jan 2005 06:02:47 -0000 1.11 *************** *** 4,8 **** AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 4,8 ---- AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.18" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure 14 Nov 2004 22:52:19 -0000 1.8 --- configure 2 Jan 2005 06:02:47 -0000 1.9 *************** *** 1268,1272 **** ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 1268,1272 ---- ! PDP_PIDIP_VERSION="0.12.18" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CHANGES.LOG 14 Nov 2004 22:52:19 -0000 1.15 --- CHANGES.LOG 2 Jan 2005 06:02:47 -0000 1.16 *************** *** 1,3 **** --- 1,17 ---- + 0.12.18 ( codename Benisensi ) + added pdp_icedthe~ : a threaded theora stream reader ( from flumotion or icecast ) + added pdp_theonice~ : a theora a/v streamer ( to flumotion or icecast ) + the icecast server can be found here : http://mediacast1.com/~karl/ + added pdp_mapper : a pixel mapper ( copying regions and single pixels ) + + modified pdp_theorin~ : removed loop option ( was crashing ), added mutexes + modified pdp_live~ : added mutexes + modified pdp_ascii : added T. de la O. charmaps + + fixed pdp_ffmpeg~ : fixed framerate control + fixed pdp_binary : fixed wrong diff calculation + 0.12.17 ( codename No pasa nada ) + fixed pdp_shape : a unitializded cursor caused some crashes added pdp_theorout~ : theora file recorder fixed pdp_theorin~ : fixed buggy end of file detection Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.in 14 Nov 2004 22:52:20 -0000 1.5 --- configure.in 2 Jan 2005 06:02:47 -0000 1.6 *************** *** 4,8 **** AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 4,8 ---- AC_CONFIG_HEADER(include/pidip_config.h) ! PDP_PIDIP_VERSION="0.12.18" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 14 Nov 2004 22:52:19 -0000 1.7 --- Makefile 2 Jan 2005 06:02:47 -0000 1.8 *************** *** 8,14 **** MAGICK_CFLAGS = -I/usr/X11R6/include -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -Wall -pthread MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib ! THEORA_LIBS = /usr/lib/libtheora.a /usr/lib/libogg.a /usr/lib/libvorbis.a /usr/lib/libvorbisenc.a PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg-cvs-2003-03-04/libavcodec -I/SOURCES/ffmpeg-cvs-2003-03-04/libavformat ! PDP_PIDIP_VERSION = 0.12.17 MPEG4IP_CFLAGS = --- 8,14 ---- MAGICK_CFLAGS = -I/usr/X11R6/include -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -Wall -pthread MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib ! THEORA_LIBS = /usr/lib/libtheora.a /usr/local/lib/libtheora.a /usr/lib/libogg.a /usr/local/lib/libvorbis.a /usr/local/lib/libvorbisenc.a PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg-cvs-2003-03-04/libavcodec -I/SOURCES/ffmpeg-cvs-2003-03-04/libavformat ! PDP_PIDIP_VERSION = 0.12.18 MPEG4IP_CFLAGS =

1 0

externals/chaos/src chua.hpp,NONE,1.1 chua_dsp.cpp,NONE,1.1 chua_msg.cpp,NONE,1.1 Makefile.am,1.7,1.8 bernoulli_map.hpp,1.3,1.4 bungalow_tent_map.hpp,1.3,1.4 chaos.hpp,1.5,1.6 chaos_base.hpp,1.4,1.5 chaos_dsp.hpp,1.6,1.7 chaos_msg.hpp,1.1,1.2 circle_map.hpp,1.3,1.4 coupled_logistic.hpp,1.1,1.2 gauss_map.hpp,1.3,1.4 henon_map.hpp,1.3,1.4 henon_map_dsp.cpp,1.2,1.3 henon_map_msg.cpp,1.2,1.3 ikeda_laser_map.hpp,1.3,1.4 ikeda_laser_map_dsp.cpp,1.2,1.3 ikeda_laser_map_msg.cpp,1.2,1.3 logistic_map.hpp,1.5
by Tim Blechmann 01 Jan '05

01 Jan '05

Update of /cvsroot/pure-data/externals/chaos/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7115 Modified Files: Makefile.am bernoulli_map.hpp bungalow_tent_map.hpp chaos.hpp chaos_base.hpp chaos_dsp.hpp chaos_msg.hpp circle_map.hpp coupled_logistic.hpp gauss_map.hpp henon_map.hpp henon_map_dsp.cpp henon_map_msg.cpp ikeda_laser_map.hpp ikeda_laser_map_dsp.cpp ikeda_laser_map_msg.cpp logistic_map.hpp lozi_map.hpp lozi_map_dsp.cpp lozi_map_msg.cpp main.cpp map_base.hpp ode_base.cpp ode_base.hpp roessler.hpp sine_map.hpp standard_map.hpp tent_map.hpp tent_map_dsp.cpp tent_map_msg.cpp Added Files: chua.hpp chua_dsp.cpp chua_msg.cpp Log Message: speedup using function pointers Index: lozi_map_msg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/lozi_map_msg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lozi_map_msg.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- lozi_map_msg.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(lozi_map, LOZI_MAP, "lozi"); --- 22,24 ---- #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(lozi_map, LOZI_MAP, lozi); Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/main.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** main.cpp 28 Dec 2004 12:38:45 -0000 1.7 --- main.cpp 1 Jan 2005 11:06:58 -0000 1.8 *************** *** 30,33 **** --- 30,34 ---- CHAOS_ADD(circle_map); CHAOS_ADD(coupled_logistic); + CHAOS_ADD(chua); CHAOS_ADD(driven_anharmonic); CHAOS_ADD(driven_van_der_pol); Index: ode_base.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/ode_base.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ode_base.cpp 24 Dec 2004 15:31:14 -0000 1.2 --- ode_base.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 73,90 **** } - void ode_base::m_step() - { - switch (m_method) - { - case 0: - rk1(); - break; - case 1: - rk2(); - break; - case 2: - rk4(); - break; - } - - } --- 73,74 ---- --- NEW FILE: chua_msg.cpp --- // // // chaos~ // Copyright (C) 2004 Tim Blechmann // // 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; see the file COPYING. If not, write to // the Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. #include "chua.hpp" #include "chaos_msg.hpp" CHAOS_MSG_CLASS(chua,CHUA); Index: henon_map_dsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/henon_map_dsp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** henon_map_dsp.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- henon_map_dsp.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_dsp.hpp" ! CHAOS_DSP_CLASS_NAME(henon, HENON, "henon~"); --- 22,24 ---- #include "chaos_dsp.hpp" ! CHAOS_DSP_CLASS_NAME(henon, HENON, henon~); Index: Makefile.am =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 28 Dec 2004 12:38:45 -0000 1.7 --- Makefile.am 1 Jan 2005 11:06:58 -0000 1.8 *************** *** 6,9 **** --- 6,10 ---- circle_map_dsp.cpp circle_map_msg.cpp \ coupled_logistic_dsp.cpp coupled_logistic_msg.cpp \ + chua_dsp.cpp chua_msg.cpp \ driven_anharmonic_dsp.cpp driven_anharmonic_msg.cpp \ driven_van_der_pol_dsp.cpp driven_van_der_pol_msg.cpp \ Index: tent_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/tent_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tent_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- tent_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 21,28 **** #include "map_base.hpp" ! // tent map: x[n+1] = 2 * x[n] (for 0 < x <= 0.5) ! // 2 * (1 - x[n]) (else) ! // 0 <= x[n] < 1 ! // taken from Willi-Hans Steeb: Chaos and Fractals class tent_map: --- 21,28 ---- #include "map_base.hpp" ! // tent map: x[n+1] = 1 - 2*abs(x[n]) ! // -1 < x[n] < 1 ! // taken from Julien C. Sprott, Strange Attractors: Creating Patterns in Chaos ! class tent_map: *************** *** 33,38 **** { m_num_eq = 1; ! m_data = new data_t[1]; ! CHAOS_SYS_INIT(x, 0.5); } --- 33,38 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x, 0.6); } *************** *** 45,59 **** { data_t data = m_data[0]; ! ! if (data < 0.5f) ! m_data[0] = 2.f * data; ! else ! m_data[0] = 2.f * (1.f - data); } ! CHAOS_SYSPAR_FUNCS_PRED(x, m_pred_x); bool m_pred_x(t_float f) { ! return (f >= 0) && (f < 1); } }; --- 45,56 ---- { data_t data = m_data[0]; ! ! m_data[0] = 1 - 2*CHAOS_ABS(data); } ! CHAOS_SYSVAR_FUNCS_PRED(x, 0, m_pred_x); bool m_pred_x(t_float f) { ! return (f > -1) && (f < 1); } }; Index: map_base.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/map_base.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** map_base.hpp 24 Dec 2004 23:20:22 -0000 1.2 --- map_base.hpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 27,31 **** : public chaos_base { ! }; --- 27,34 ---- : public chaos_base { ! protected: ! virtual void m_step() ! { ! } }; Index: tent_map_dsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/tent_map_dsp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tent_map_dsp.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- tent_map_dsp.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 24,26 **** ! CHAOS_DSP_CLASS_NAME(tent_map, TENT_MAP, "tent~"); --- 24,26 ---- ! CHAOS_DSP_CLASS_NAME(tent_map, TENT_MAP, tent~); Index: sine_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/sine_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sine_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- sine_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 34,38 **** { m_num_eq = 1; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x,0); } --- 34,38 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0); } Index: ikeda_laser_map_dsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/ikeda_laser_map_dsp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ikeda_laser_map_dsp.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- ikeda_laser_map_dsp.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 23,26 **** ! CHAOS_DSP_CLASS_NAME(ikeda_laser_map, IKEDA_LASER_MAP, "ikeda"); --- 23,26 ---- ! CHAOS_DSP_CLASS_NAME(ikeda_laser_map, IKEDA_LASER_MAP, ikeda~); Index: henon_map_msg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/henon_map_msg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** henon_map_msg.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- henon_map_msg.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(henon, HENON, "henon"); --- 22,24 ---- #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(henon, HENON, henon); Index: tent_map_msg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/tent_map_msg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tent_map_msg.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- tent_map_msg.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(tent_map, TENT_MAP, "tent"); --- 22,24 ---- #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(tent_map, TENT_MAP, tent); Index: bungalow_tent_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/bungalow_tent_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bungalow_tent_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- bungalow_tent_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 40,44 **** { m_num_eq = 1; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x, 0.6); CHAOS_SYS_INIT(r, 0.5); --- 40,44 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x, 0.6); CHAOS_SYS_INIT(r, 0.5); Index: circle_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/circle_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** circle_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- circle_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 34,38 **** { m_num_eq = 1; ! m_data = new data_t[1]; CHAOS_SYS_INIT(omega, 0.1); CHAOS_SYS_INIT(r, 3); --- 34,38 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(omega, 0.1); CHAOS_SYS_INIT(r, 3); Index: standard_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/standard_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** standard_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- standard_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 34,38 **** { m_num_eq = 2; ! m_data = new data_t[2]; CHAOS_SYS_INIT(I,0.1); --- 34,38 ---- { m_num_eq = 2; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(I,0.1); Index: gauss_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/gauss_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gauss_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- gauss_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 35,39 **** { m_num_eq = 1; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x,0.5); } --- 35,39 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0.5); } --- NEW FILE: chua_dsp.cpp --- // // // chaos~ // Copyright (C) 2004 Tim Blechmann // // 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; see the file COPYING. If not, write to // the Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. #include "chua.hpp" #include "chaos_dsp.hpp" CHAOS_DSP_CLASS(chua,CHUA); Index: lozi_map_dsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/lozi_map_dsp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lozi_map_dsp.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- lozi_map_dsp.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_dsp.hpp" ! CHAOS_DSP_CLASS_NAME(lozi_map, LOZI_MAP, "lozi"); --- 22,24 ---- #include "chaos_dsp.hpp" ! CHAOS_DSP_CLASS_NAME(lozi_map, LOZI_MAP, lozi~); Index: chaos_msg.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/chaos_msg.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** chaos_msg.hpp 27 Dec 2004 14:44:11 -0000 1.1 --- chaos_msg.hpp 1 Jan 2005 11:06:58 -0000 1.2 *************** *** 33,37 **** void m_bang() { ! m_system->m_step(); int outlets = m_system->get_num_eq(); --- 33,37 ---- void m_bang() { ! m_system->m_perform(); int outlets = m_system->get_num_eq(); Index: henon_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/henon_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** henon_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- henon_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 33,37 **** { m_num_eq = 2; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x,0); --- 33,37 ---- { m_num_eq = 2; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0); Index: chaos_base.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/chaos_base.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** chaos_base.hpp 27 Dec 2004 22:55:41 -0000 1.4 --- chaos_base.hpp 1 Jan 2005 11:06:58 -0000 1.5 *************** *** 37,50 **** } ! virtual void m_step() { } data_t * m_data; // state of the system protected: int m_num_eq; // number of equations of the system }; #define CHAOS_CALLBACKS \ public: \ --- 37,65 ---- } ! void m_perform() { + m_step(); + m_verify(); } + virtual void m_verify() + { + for (int i = 0; i != get_num_eq(); ++i) + { + #ifndef DOUBLE_PRECISION + if (PD_BIGORSMALL(m_data[i])) + m_data[i] = 0; + #endif + } + }; + data_t * m_data; // state of the system protected: + virtual void m_step(); int m_num_eq; // number of equations of the system }; + #define CHAOS_CALLBACKS \ public: \ Index: ikeda_laser_map_msg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/ikeda_laser_map_msg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ikeda_laser_map_msg.cpp 27 Dec 2004 22:55:41 -0000 1.2 --- ikeda_laser_map_msg.cpp 1 Jan 2005 11:06:58 -0000 1.3 *************** *** 22,24 **** #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(ikeda_laser_map, IKEDA_LASER_MAP, "ikeda~"); --- 22,24 ---- #include "chaos_msg.hpp" ! CHAOS_MSG_CLASS_NAME(ikeda_laser_map, IKEDA_LASER_MAP, ikeda); Index: coupled_logistic.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/coupled_logistic.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** coupled_logistic.hpp 27 Dec 2004 22:55:41 -0000 1.1 --- coupled_logistic.hpp 1 Jan 2005 11:06:58 -0000 1.2 *************** *** 33,37 **** { m_num_eq = 2; ! m_data = new data_t[2]; CHAOS_SYS_INIT(e, 0.06); CHAOS_SYS_INIT(r, 3.7); --- 33,37 ---- { m_num_eq = 2; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(e, 0.06); CHAOS_SYS_INIT(r, 3.7); Index: chaos.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/chaos.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** chaos.hpp 28 Dec 2004 12:38:45 -0000 1.5 --- chaos.hpp 1 Jan 2005 11:06:58 -0000 1.6 *************** *** 25,28 **** --- 25,29 ---- #include "flext.h" #include "chaos_defs.hpp" + #include <cmath> /* internal we can work with a higher precision than pd */ Index: chaos_dsp.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/chaos_dsp.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** chaos_dsp.hpp 28 Dec 2004 12:38:45 -0000 1.6 --- chaos_dsp.hpp 1 Jan 2005 11:06:58 -0000 1.7 *************** *** 38,42 **** void m_signal_c(int n, t_sample *const *insigs,t_sample *const *outsigs); ! virtual void m_signal(int n, t_sample *const *insigs,t_sample *const *outsigs); virtual void m_dsp(int n, t_sample *const *insigs,t_sample *const *outsigs) --- 38,45 ---- void m_signal_c(int n, t_sample *const *insigs,t_sample *const *outsigs); ! virtual void m_signal(int n, t_sample *const *insigs,t_sample *const *outsigs) ! { ! (this->*m_routine)(n,insigs,outsigs); ! } virtual void m_dsp(int n, t_sample *const *insigs,t_sample *const *outsigs) *************** *** 44,48 **** m_sr = Samplerate(); } ! /* local data for system, output and interpolation */ --- 47,52 ---- m_sr = Samplerate(); } ! ! void (thisType::*m_routine)(int n, t_sample *const *insigs,t_sample *const *outsigs); /* local data for system, output and interpolation */ *************** *** 58,61 **** --- 62,66 ---- /* local data for signal functions */ float m_freq; /* frequency of oscillations */ + float m_invfreq; /* inverse frequency */ int m_phase; /* phase counter */ float m_sr; /* sample rate */ *************** *** 63,67 **** int m_imethod; /* interpolation method */ ! int get_imethod(int &i) { i = m_imethod; --- 68,72 ---- int m_imethod; /* interpolation method */ ! void get_imethod(int &i) { i = m_imethod; *************** *** 71,75 **** --- 76,94 ---- { if( (i >= 0) && (i <= 2) ) + { m_imethod = i; + switch (i) + { + case 0: + m_routine = &thisType::m_signal_n; + break; + case 1: + m_routine = &thisType::m_signal_l; + break; + case 2: + m_routine = &thisType::m_signal_c; + break; + } + } else { *************** *** 89,93 **** } ! int get_freq(float &f) { f = m_freq; --- 108,112 ---- } ! void get_freq(float &f) { f = m_freq; *************** *** 97,101 **** --- 116,123 ---- { if( (f >= 0) && (f <= m_sr*0.5) ) + { m_freq = f; + m_invfreq = 1.f / f; + } else post("frequency out of range"); *************** *** 113,117 **** SYSTEM##_dsp(int argc, t_atom* argv ) \ { \ ! m_sr = 44100; /* assume default sampling rate (for max frequency) */ \ m_system = new SYSTEM; \ \ --- 135,139 ---- SYSTEM##_dsp(int argc, t_atom* argv ) \ { \ ! m_sr = 44100; /* assume default sampling rate */ \ m_system = new SYSTEM; \ \ *************** *** 177,204 **** template <class system> - void chaos_dsp<system>::m_signal(int n, t_sample *const *insigs, - t_sample *const *outsigs) - { - if (m_freq >= m_sr * 0.5) - { - m_signal_(n, insigs, outsigs); - return; - } - - switch (m_imethod) - { - case 0: - m_signal_n(n, insigs, outsigs); - return; - case 1: - m_signal_l(n, insigs, outsigs); - return; - case 2: - m_signal_c(n, insigs, outsigs); - return; - } - } - - template <class system> void chaos_dsp<system>::m_signal_(int n, t_sample *const *insigs, t_sample *const *outsigs) --- 199,202 ---- *************** *** 208,212 **** for (int i = 0; i!=n; ++i) { ! m_system->m_step(); for (int j = 0; j != outlets; ++j) { --- 206,210 ---- for (int i = 0; i!=n; ++i) { ! m_system->m_perform(); for (int j = 0; j != outlets; ++j) { *************** *** 231,236 **** if (phase == 0) { ! m_system->m_step(); ! phase = int (m_sr / m_freq); } --- 229,234 ---- if (phase == 0) { ! m_system->m_perform(); ! phase = int (m_sr * m_invfreq); } *************** *** 267,272 **** if (phase == 0) { ! m_system->m_step(); ! phase = int (m_sr / m_freq); for (int j = 0; j != outlets; ++j) --- 265,270 ---- if (phase == 0) { ! m_system->m_perform(); ! phase = int (m_sr * m_invfreq); for (int j = 0; j != outlets; ++j) *************** *** 306,311 **** if (phase == 0) { ! m_system->m_step(); ! phase = int (m_sr / m_freq); phase = (phase > 2) ? phase : 2; --- 304,309 ---- if (phase == 0) { ! m_system->m_perform(); ! phase = int (m_sr * m_invfreq); phase = (phase > 2) ? phase : 2; Index: ode_base.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/ode_base.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ode_base.hpp 24 Dec 2004 23:20:22 -0000 1.3 --- ode_base.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 31,35 **** --- 31,48 ---- { if (i >=0 && i <4) + { m_method = (unsigned char) i; + switch (i) + { + case 0: + m_routine = &ode_base::rk1; + break; + case 1: + m_routine = &ode_base::rk2; + break; + case 2: + m_routine = &ode_base::rk4; + } + } else post("no such method"); *************** *** 48,52 **** } ! virtual void m_step(); void ode_base_alloc() --- 61,68 ---- } ! virtual void m_step() ! { ! (this->*m_routine)(); ! } void ode_base_alloc() *************** *** 68,76 **** delete m_k[i]; } - delete m_tmp; } protected: unsigned char m_method; /* 0: rk1, 1: rk2, 3: rk4 */ --- 84,92 ---- delete m_k[i]; } delete m_tmp; } protected: + void (ode_base::*m_routine)(); unsigned char m_method; /* 0: rk1, 1: rk2, 3: rk4 */ Index: lozi_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/lozi_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lozi_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- lozi_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 33,37 **** { m_num_eq = 2; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x,0); CHAOS_SYS_INIT(y,0); --- 33,37 ---- { m_num_eq = 2; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0); CHAOS_SYS_INIT(y,0); Index: logistic_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/logistic_map.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** logistic_map.hpp 28 Dec 2004 12:38:45 -0000 1.5 --- logistic_map.hpp 1 Jan 2005 11:06:58 -0000 1.6 *************** *** 22,26 **** // logistic map: x[n+1] = alpha * x[n] * (1 - x[n]) ! // 0 <= x[n] < 1 // 0 <= alpha <= 4 --- 22,26 ---- // logistic map: x[n+1] = alpha * x[n] * (1 - x[n]) ! // 0 < x[n] < 1 // 0 <= alpha <= 4 *************** *** 44,50 **** virtual void m_step() { ! data_t data = m_data[0]; data_t alpha = CHAOS_PARAMETER(alpha); ! m_data[0] = alpha * data * (1.f - data); } --- 44,50 ---- virtual void m_step() { ! data_t x = m_data[0]; data_t alpha = CHAOS_PARAMETER(alpha); ! m_data[0] = alpha * x * (1.f - x); } *************** *** 61,64 **** --- 61,72 ---- return (f > 0) && (f < 1); } + + virtual void m_verify() + { + data_t x = m_data[0]; + if (m_pred_x(x)) + return; + m_data[0] = 0.5; + } }; Index: bernoulli_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/bernoulli_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bernoulli_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- bernoulli_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 32,36 **** { m_num_eq = 1; ! m_data = new data_t[1]; CHAOS_SYS_INIT(x,0.5); } --- 32,36 ---- { m_num_eq = 1; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0.5); } --- NEW FILE: chua.hpp --- // // // chaos~ // Copyright (C) 2004 Tim Blechmann // // 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; see the file COPYING. If not, write to // the Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. #include "ode_base.hpp" // chua system: dx1/dt = alpha * (x2 - x1 - h(x1)) // dx2/dt = x1 - x2 + x3 // dx3/dt = - beta * x2 // // with h(x) = b*x + a - b (for x > 1) // a*x (for -1 <= x <= 1 // b*x - a + b (for x < -1) // // taken from Viktor Avrutin: lecture note class chua: public ode_base { public: chua() { m_num_eq = 3; m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x1,1); CHAOS_SYS_INIT(x2,1); CHAOS_SYS_INIT(x3,1); CHAOS_SYS_INIT(a,1.4); CHAOS_SYS_INIT(b,0.3); CHAOS_SYS_INIT(alpha,0.3); CHAOS_SYS_INIT(beta,0.3); ode_base_alloc(); } ~chua() { ode_base_free(); delete m_data; } virtual void m_system(data_t* deriv, data_t* data) { data_t x1 = data[0]; data_t x2 = data[1]; data_t x3 = data[2]; data_t a = CHAOS_PARAMETER(a), b = CHAOS_PARAMETER(b); data_t h; if (x1 > 1) h = b*x1 + a - b; else if (x1 < -1) h = b*x1 - a + b; else h = a*x1; deriv[0] = CHAOS_PARAMETER(alpha) * (x2 - x1 - h); deriv[1] = x1 - x2 + x3; deriv[2] = - CHAOS_PARAMETER(beta) * x2; } CHAOS_SYSVAR_FUNCS(x1, 0); CHAOS_SYSVAR_FUNCS(x2, 1); CHAOS_SYSVAR_FUNCS(x3, 2); CHAOS_SYSPAR_FUNCS(a); CHAOS_SYSPAR_FUNCS(b); CHAOS_SYSPAR_FUNCS(alpha); CHAOS_SYSPAR_FUNCS(beta); }; #define CHUA_CALLBACKS \ ODE_CALLBACKS; \ CHAOS_SYS_CALLBACKS(alpha); \ CHAOS_SYS_CALLBACKS(beta); \ CHAOS_SYS_CALLBACKS(a); \ CHAOS_SYS_CALLBACKS(b); \ CHAOS_SYS_CALLBACKS(x1); \ CHAOS_SYS_CALLBACKS(x2); \ CHAOS_SYS_CALLBACKS(x3); #define CHUA_ATTRIBUTES \ ODE_ATTRIBUTES; \ CHAOS_SYS_ATTRIBUTE(a); \ CHAOS_SYS_ATTRIBUTE(b); \ CHAOS_SYS_ATTRIBUTE(alpha); \ CHAOS_SYS_ATTRIBUTE(beta); \ CHAOS_SYS_ATTRIBUTE(x1); \ CHAOS_SYS_ATTRIBUTE(x2); \ CHAOS_SYS_ATTRIBUTE(x3); Index: roessler.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/roessler.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roessler.hpp 27 Dec 2004 22:55:41 -0000 1.1 --- roessler.hpp 1 Jan 2005 11:06:58 -0000 1.2 *************** *** 42,45 **** --- 42,46 ---- CHAOS_SYS_INIT(b,4); CHAOS_SYS_INIT(c,4); + CHAOS_SYS_INIT(dt,0.01); ode_base_alloc(); Index: ikeda_laser_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/chaos/src/ikeda_laser_map.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ikeda_laser_map.hpp 27 Dec 2004 14:44:11 -0000 1.3 --- ikeda_laser_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 *************** *** 39,43 **** { m_num_eq = 2; ! m_data = new data_t[2]; CHAOS_SYS_INIT(c1,0.4); CHAOS_SYS_INIT(c2,0.9); --- 39,43 ---- { m_num_eq = 2; ! m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(c1,0.4); CHAOS_SYS_INIT(c2,0.9);

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 January 2005