Pd-cvs April 2005

pd-cvs@lists.iem.at

13 participants
303 discussions

pd/src s_audio_jack.c,1.5.4.5,1.5.4.6
by Tim Blechmann 09 Apr '05

09 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11810 Modified Files: Tag: devel_0_38 s_audio_jack.c Log Message: workaround: reconnect if jack kicked us out Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.5 retrieving revision 1.5.4.6 diff -C2 -d -r1.5.4.5 -r1.5.4.6 *** s_audio_jack.c 9 Apr 2005 06:52:00 -0000 1.5.4.5 --- s_audio_jack.c 9 Apr 2005 19:53:29 -0000 1.5.4.6 *************** *** 87,96 **** int i,j; ! if (sys_timedlock(sys_schedadvance) == EBUSY) ! /* this is bad ... we're blocking a realtime thread */ ! { ! return 1; ! } ! for (i = 0; i != dspticks_per_jacktick; ++i) { --- 87,93 ---- int i,j; ! ! /* rethink: should we lock the sys_lock? */ ! for (i = 0; i != dspticks_per_jacktick; ++i) { *************** *** 123,127 **** zerovec_simd(sys_soundout, j * sys_dacblocksize); } - sys_unlock(); return 0; --- 120,123 ---- *************** *** 137,145 **** } static void jack_shutdown (void *arg) { ! /* Ignore for now */ ! // exit (1); } --- 133,152 ---- } + + static t_int jack_shutdown_handler(t_int* none) + { + jack_close_audio(); + post("jack most likely kicked us out ... trying to reconnect"); + /* try to reconnect to jack server */ + jack_open_audio(sys_inchannels, sys_outchannels,\ + sys_dacsr, sys_callbackscheduler); + return 0; + } + static void jack_shutdown (void *arg) { ! /* register idle callback in scheduler */ ! sys_callback(jack_shutdown_handler, NULL, 0); }

1 0

pd Makefile.am,1.1.4.1,1.1.4.2
by Tim Blechmann 09 Apr '05

09 Apr '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16240 Modified Files: Tag: devel_0_38 Makefile.am Log Message: proper installation of documentation Index: Makefile.am =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/Makefile.am,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** Makefile.am 6 Nov 2004 10:20:35 -0000 1.1.4.1 --- Makefile.am 9 Apr 2005 10:11:23 -0000 1.1.4.2 *************** *** 20,23 **** man_MANS = man/pd.1 man/pdsend.1 man/pdreceive.1 ! install-data: cp -r ./doc ${prefix}/lib/pd/ --- 20,23 ---- man_MANS = man/pd.1 man/pdsend.1 man/pdreceive.1 ! install-data-local: cp -r ./doc ${prefix}/lib/pd/

1 0

pd/src s_audio_jack.c,1.5.4.4,1.5.4.5
by Tim Blechmann 09 Apr '05

09 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13435 Modified Files: Tag: devel_0_38 s_audio_jack.c Log Message: don't block callback too long Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** s_audio_jack.c 8 Apr 2005 13:04:16 -0000 1.5.4.4 --- s_audio_jack.c 9 Apr 2005 06:52:00 -0000 1.5.4.5 *************** *** 12,16 **** #include <jack/jack.h> #include <regex.h> ! #define MAX_CLIENTS 100 --- 12,16 ---- #include <jack/jack.h> #include <regex.h> ! #include <errno.h> #define MAX_CLIENTS 100 *************** *** 87,91 **** int i,j; ! sys_lock(); for (i = 0; i != dspticks_per_jacktick; ++i) { --- 87,96 ---- int i,j; ! if (sys_timedlock(sys_schedadvance) == EBUSY) ! /* this is bad ... we're blocking a realtime thread */ ! { ! return 1; ! } ! for (i = 0; i != dspticks_per_jacktick; ++i) {

1 0

pd/src m_sched.c,1.5.4.21,1.5.4.22
by Tim Blechmann 09 Apr '05

09 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13319 Modified Files: Tag: devel_0_38 m_sched.c Log Message: sys_timedlock() Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.21 retrieving revision 1.5.4.22 diff -C2 -d -r1.5.4.21 -r1.5.4.22 *** m_sched.c 7 Apr 2005 21:15:22 -0000 1.5.4.21 --- m_sched.c 9 Apr 2005 06:51:13 -0000 1.5.4.22 *************** *** 17,21 **** #define THREAD_LOCKING #include "pthread.h" ! static int sys_quit; --- 17,21 ---- #define THREAD_LOCKING #include "pthread.h" ! #include "time.h" static int sys_quit; *************** *** 580,583 **** --- 580,594 ---- } + /* tb { */ + int sys_timedlock(int microsec) + { + struct timespec timeout; + timeout.tv_sec = 0; + timeout.tv_nsec = 1000 * microsec; + + return pthread_mutex_timedlock(&sys_mutex, &timeout); + } + /* tb } */ + #else *************** *** 585,588 **** --- 596,600 ---- void sys_unlock(void) {} int sys_trylock(void) {} + int sys_timedlock(int microsec) {} #endif

1 0

pd/src m_pd.h,1.4.4.9,1.4.4.10
by Tim Blechmann 09 Apr '05

09 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12527 Modified Files: Tag: devel_0_38 m_pd.h Log Message: added zerovec and sys_timedlock Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.9 retrieving revision 1.4.4.10 diff -C2 -d -r1.4.4.9 -r1.4.4.10 *** m_pd.h 23 Jan 2005 21:19:30 -0000 1.4.4.9 --- m_pd.h 9 Apr 2005 06:49:24 -0000 1.4.4.10 *************** *** 479,482 **** --- 479,483 ---- EXTERN void sys_unlock(void); EXTERN int sys_trylock(void); + EXTERN int sys_timedlock(int microsec); /* tb: to be called at idle time */ *************** *** 674,677 **** --- 675,679 ---- EXTERN void copyvec(t_float *dst,const t_float *src,int n); EXTERN void addvec(t_float *dst,const t_float *src,int n); + EXTERN void zerovec(t_float *dst, int n); EXTERN int simd_runtime_check(void);

1 0

pd/src s_audio_jack.c,1.5.4.3,1.5.4.4
by Tim Blechmann 08 Apr '05

08 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27121 Modified Files: Tag: devel_0_38 s_audio_jack.c Log Message: oops Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.3 retrieving revision 1.5.4.4 diff -C2 -d -r1.5.4.3 -r1.5.4.4 *** s_audio_jack.c 8 Apr 2005 12:44:05 -0000 1.5.4.3 --- s_audio_jack.c 8 Apr 2005 13:04:16 -0000 1.5.4.4 *************** *** 404,408 **** { ! jack_client_deactivate(jack_client); jack_started = 0; jack_client_close(jack_client); --- 404,408 ---- { ! jack_deactivate(jack_client); jack_started = 0; jack_client_close(jack_client);

1 0

pd/src s_stuff.h,1.5.4.4,1.5.4.5
by Tim Blechmann 08 Apr '05

08 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15997 Modified Files: Tag: devel_0_38 s_stuff.h Log Message: callback based scheduling for jack Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** s_stuff.h 14 Dec 2004 10:02:14 -0000 1.5.4.4 --- s_stuff.h 8 Apr 2005 12:45:25 -0000 1.5.4.5 *************** *** 130,133 **** --- 130,139 ---- void sched_set_using_dacs(int flag); + /* tb { */ + EXTERN int sys_keepsched; /* if 0: change scheduler mode */ + EXTERN int sys_callbackscheduler; /* if 1: change scheduler to callback based dsp */ + /* tb } */ + + /* s_inter.c */ *************** *** 226,230 **** int maxndev, int devdescsize); ! int jack_open_audio(int wantinchans, int wantoutchans, int srate); void jack_close_audio(void); int jack_send_dacs(void); --- 232,236 ---- int maxndev, int devdescsize); ! int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler); void jack_close_audio(void); int jack_send_dacs(void);

1 0

pd/src s_audio_jack.c,1.5.4.2,1.5.4.3
by Tim Blechmann 08 Apr '05

08 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15034 Modified Files: Tag: devel_0_38 s_audio_jack.c Log Message: callback based scheduling Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -C2 -d -r1.5.4.2 -r1.5.4.3 *** s_audio_jack.c 27 Feb 2005 12:06:52 -0000 1.5.4.2 --- s_audio_jack.c 8 Apr 2005 12:44:05 -0000 1.5.4.3 *************** *** 8,11 **** --- 8,12 ---- #include <string.h> #include <m_pd.h> + #include "m_simd.h" #include <s_stuff.h> #include <jack/jack.h> *************** *** 31,38 **** static int jack_dio_error; - pthread_mutex_t jack_mutex; pthread_cond_t jack_sem; static int process (jack_nframes_t nframes, void *arg) --- 32,41 ---- static int jack_dio_error; pthread_mutex_t jack_mutex; pthread_cond_t jack_sem; + extern int sys_keepsched; + extern int sys_callbackscheduler; + static int process (jack_nframes_t nframes, void *arg) *************** *** 41,46 **** float *out; float *in; ! ! if (nframes > JACK_OUT_MAX) jack_out_max = nframes; else jack_out_max = JACK_OUT_MAX; --- 44,48 ---- float *out; float *in; ! if (nframes > JACK_OUT_MAX) jack_out_max = nframes; else jack_out_max = JACK_OUT_MAX; *************** *** 66,74 **** jack_filled = 0; } ! /* tb: wait in the scheduler ! * pthread_cond_broadcast(&jack_sem); */ return 0; } static int jack_srate (jack_nframes_t srate, void *arg) --- 68,128 ---- jack_filled = 0; } ! /* tb: wait in the scheduler */ ! /* pthread_cond_broadcast(&jack_sem); */ ! return 0; ! } ! ! ! void sys_peakmeters(void); ! extern int sys_meters; /* true if we're metering */ ! extern float sys_inmax; /* max input amplitude */ ! extern float sys_outmax; /* max output amplitude */ ! ! static int dspticks_per_jacktick; ! static void (*copyblock)(t_sample *dst,t_sample *src,int n); ! static void (*zeroblock)(t_sample *dst,int n); ! ! static int cb_process (jack_nframes_t nframes, void *arg) ! { ! int i,j; ! ! sys_lock(); ! for (i = 0; i != dspticks_per_jacktick; ++i) ! { ! /* get sound from the inputs */ ! for (j = 0; j < sys_inchannels; j++) ! { ! t_sample * in = jack_port_get_buffer(input_port[j], nframes); ! copyvec_simd(sys_soundin + j * sys_dacblocksize, ! in + i * sys_dacblocksize, ! sys_dacblocksize); ! } ! ! /* run dsp */ ! sched_tick(sys_time + sys_time_per_dsp_tick); ! ! /* send sound to the output */ ! for (j = 0; j < sys_outchannels; j++) ! { ! t_sample * out = jack_port_get_buffer (output_port[j], nframes); ! copyvec_simd(out + i * sys_dacblocksize, ! sys_soundout + j * sys_dacblocksize, ! sys_dacblocksize); ! } ! ! /* update peak meters */ ! if (sys_meters) ! sys_peakmeters(); ! ! /* clear the output buffer */ ! zerovec_simd(sys_soundout, j * sys_dacblocksize); ! } ! sys_unlock(); ! return 0; } + + static int jack_srate (jack_nframes_t srate, void *arg) *************** *** 97,101 **** int num_clients = 0; regex_t port_regex; ! jack_ports = jack_get_ports( jack_client, "", "", 0 ); regcomp( &port_regex, "^[^:]*", REG_EXTENDED ); --- 151,155 ---- int num_clients = 0; regex_t port_regex; ! jack_ports = jack_get_ports( jack_client, "", "", 0 ); regcomp( &port_regex, "^[^:]*", REG_EXTENDED ); *************** *** 201,206 **** int ! jack_open_audio(int inchans, int outchans, int rate) ! { int j; --- 255,259 ---- int ! jack_open_audio(int inchans, int outchans, int rate, int scheduler) { int j; *************** *** 224,227 **** --- 277,289 ---- } + if (jack_client && sys_callbackscheduler != scheduler) + { + jack_client_close(jack_client); + jack_client = NULL; + } + + sys_keepsched = 0; + sys_callbackscheduler = scheduler; + /* try to become a client of the JACK server (we allow two pd's)*/ if (!jack_client) { *************** *** 241,248 **** /* tell the JACK server to call `process()' whenever there is work to be done. */ ! ! jack_set_process_callback (jack_client, process, 0); ! jack_set_error_function (jack_error); --- 303,314 ---- /* tell the JACK server to call `process()' whenever there is work to be done. + tb: adapted for callback based scheduling */ ! if (scheduler == 1) ! jack_set_process_callback (jack_client, cb_process, 0); ! else ! jack_set_process_callback (jack_client, process, 0); ! ! jack_set_error_function (jack_error); *************** *** 311,314 **** --- 377,401 ---- pthread_cond_init(&jack_sem,NULL); } + + if (scheduler) + dspticks_per_jacktick = jack_get_buffer_size(jack_client) + / sys_schedblocksize; + + /* tb: get advance from jack server */ + sys_schedadvance = (float)jack_port_get_total_latency(jack_client,output_port[0]) + * 1000. / sys_dacsr * 1000; + + /* set block copy/zero functions */ + if(SIMD_CHKCNT(sys_dacblocksize) && simd_runtime_check()) + { + copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; + zeroblock = &zerovec_simd; + } + else + { + copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec; + zeroblock = &zerovec; + } + return 0; } *************** *** 317,321 **** --- 404,411 ---- { + jack_client_deactivate(jack_client); jack_started = 0; + jack_client_close(jack_client); + jack_client = NULL; } *************** *** 339,344 **** if (jack_filled >= jack_out_max) return SENDDACS_NO; ! /* tb: wait in the scheduler ! * pthread_cond_wait(&jack_sem,&jack_mutex); */ jack_started = 1; --- 429,434 ---- if (jack_filled >= jack_out_max) return SENDDACS_NO; ! /* tb: wait in the scheduler */ ! /* pthread_cond_wait(&jack_sem,&jack_mutex); */ jack_started = 1;

1 0

pd/src s_audio.c,1.5.4.10,1.5.4.11
by Tim Blechmann 08 Apr '05

08 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13287 Modified Files: Tag: devel_0_38 s_audio.c Log Message: more portable peak metering and sleepgrain adaption Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.10 retrieving revision 1.5.4.11 diff -C2 -d -r1.5.4.10 -r1.5.4.11 *** s_audio.c 7 Apr 2005 21:23:15 -0000 1.5.4.10 --- s_audio.c 8 Apr 2005 12:42:04 -0000 1.5.4.11 *************** *** 39,45 **** int sys_schedblocksize; ! static int sys_meters; /* true if we're metering */ ! static float sys_inmax; /* max input amplitude */ ! static float sys_outmax; /* max output amplitude */ /* exported variables */ --- 39,45 ---- int sys_schedblocksize; ! int sys_meters; /* true if we're metering */ ! float sys_inmax; /* max input amplitude */ ! float sys_outmax; /* max output amplitude */ /* exported variables */ *************** *** 323,337 **** sys_schedadvance = advance * 1000; - /* tb { - * cut'n'paste from m_scheduler to adapt the sleepgrain with the latency */ - if (sys_schedadvance < 20000) - sys_sleepgrain = sys_schedadvance/4; - if (sys_sleepgrain < 100) - sys_sleepgrain = 100; - else - if (sys_sleepgrain > 5000) - sys_sleepgrain = 5000; - /* } tb */ - sys_setchsr(inchans, outchans, rate, dacblocksize); sys_log_error(ERR_NOTHING); --- 323,326 ---- *************** *** 352,356 **** if (sys_audioapi == API_JACK) jack_open_audio((naudioindev > 0 ? realinchans[0] : 0), ! (naudiooutdev > 0 ? realoutchans[0] : 0), rate); else --- 341,345 ---- if (sys_audioapi == API_JACK) jack_open_audio((naudioindev > 0 ? realinchans[0] : 0), ! (naudiooutdev > 0 ? realoutchans[0] : 0), rate, schedmode); else *************** *** 402,405 **** --- 391,405 ---- sys_vgui("set pd_whichapi %d\n", (audio_isopen() ? sys_audioapi : 0)); sched_set_using_dacs(enable); + + /* tb { + * cut'n'paste from m_scheduler to adapt the sleepgrain with the latency */ + if (sys_schedadvance < 20000) + sys_sleepgrain = sys_schedadvance/4; + if (sys_sleepgrain < 100) + sys_sleepgrain = 100; + else + if (sys_sleepgrain > 5000) + sys_sleepgrain = 5000; + /* } tb */ } *************** *** 482,494 **** /* } */ int sys_send_dacs(void) { if (sys_meters) ! { ! sys_inmax = peak_fp(sys_soundin,sys_inchannels * sys_dacblocksize, ! sys_inmax); ! sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, ! sys_outmax); ! } #ifdef USEAPI_PORTAUDIO --- 482,497 ---- /* } */ + void sys_peakmeters(void) + { + sys_inmax = peak_fp(sys_soundin,sys_inchannels * sys_dacblocksize, + sys_inmax); + sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, + sys_outmax); + } + int sys_send_dacs(void) { if (sys_meters) ! sys_peakmeters(); #ifdef USEAPI_PORTAUDIO

1 0

pd/src m_simd.c,1.1.4.6,1.1.4.7
by Tim Blechmann 08 Apr '05

08 Apr '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11657 Modified Files: Tag: devel_0_38 m_simd.c Log Message: adding zerovec function Index: m_simd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd.c,v retrieving revision 1.1.4.6 retrieving revision 1.1.4.7 diff -C2 -d -r1.1.4.6 -r1.1.4.7 *** m_simd.c 23 Jan 2005 21:11:43 -0000 1.1.4.6 --- m_simd.c 8 Apr 2005 12:39:33 -0000 1.1.4.7 *************** *** 43,46 **** --- 43,53 ---- } + void zerovec(t_float *dst, int n) + { + while(n--) + *dst++ = 0; + } + + void addvec(t_float *dst,const t_float *src,int n) { *************** *** 91,114 **** - /* float sumvec_8(t_float* in, t_int n) */ - /* { */ - /* int i; */ - /* float result = 0; */ - - /* n>>=3; */ - /* for (i = 0; i != n; ++i) */ - /* { */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* result += *in++; */ - /* } */ - /* return result; */ - /* } */ - #ifdef DONTUSESIMD --- 98,101 ---- *************** *** 154,161 **** } - /* float sumvec_simd(t_float* in, t_int n) */ - /* { */ - /* return sumvec_8(in,n); */ - /* } */ #endif /* DONTUSESIMD */ --- 141,144 ----

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs April 2005