- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5434 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 21 Jun '07

21 Jun '07

Author: anthm Date: Thu Jun 21 18:36:04 2007 New Revision: 5434 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h Log: try to fix latency on portaudio Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jun 21 18:36:04 2007 @@ -29,7 +29,7 @@ * mod_portaudio.c -- PortAudio Endpoint Module * */ -#include <switch.h> +#include "switch.h" #include <stdio.h> #include <stdlib.h> @@ -47,8 +47,7 @@ static switch_endpoint_interface_t *channel_endpoint_interface; #define SAMPLE_TYPE paInt16 -//#define SAMPLE_TYPE paFloat32 -typedef short SAMPLE; +typedef int16_t SAMPLE; typedef switch_status_t (*pa_command_t) (char **argv, int argc, switch_stream_handle_t *stream); @@ -268,7 +267,7 @@ if (olen == 0) { break; } - WriteAudioStream(globals.ring_stream, abuf, (long) olen); + WriteAudioStream(globals.ring_stream, abuf, (long) olen, globals.read_codec.implementation->microseconds_per_frame / 1000); } } } @@ -638,7 +637,12 @@ switch_mutex_lock(globals.device_lock); - if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame)) != 0) { + if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, + globals.read_codec.implementation->samples_per_frame, + globals.read_codec.implementation->microseconds_per_frame / 1000)) == 0) { + + goto cng; + } else { globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; @@ -682,7 +686,8 @@ if (globals.audio_stream) { if (switch_test_flag((&globals), GFLAG_EAR)) { - WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE))); + WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), + globals.read_codec.implementation->microseconds_per_frame / 1000); } status = SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Thu Jun 21 18:36:04 2007 @@ -71,27 +71,16 @@ * ****************/ -#if defined(__VIA_HACK__) -#define NO_BARRIER -#endif - -#if defined(NO_BARRIER) -# define PaUtil_FullMemoryBarrier() -# define PaUtil_ReadMemoryBarrier() -# define PaUtil_WriteMemoryBarrier() -#else - -#if defined(__APPLE__) //|| defined(__FreeBSD__) +#if defined(HAVE_LIBKERN_OSATOMIC_H) && (defined(__APPLE__) || defined(__FreeBSD__)) # include <libkern/OSAtomic.h> - /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide - full memory barriers, so the three types of barriers are the same. */ + /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide + full memory barriers, so the three types of barriers are the same. */ # define PaUtil_FullMemoryBarrier() OSMemoryBarrier() # define PaUtil_ReadMemoryBarrier() OSMemoryBarrier() # define PaUtil_WriteMemoryBarrier() OSMemoryBarrier() #elif defined(__GNUC__) - - /* GCC understands volatile asm and "memory" to mean it - * should not reorder memory read/writes */ + /* GCC understands volatile __asm__ and "memory" to mean it + * should not reorder memory read/writes */ # if defined( __PPC__ ) # define PaUtil_FullMemoryBarrier() __asm__ volatile("sync":::"memory") # define PaUtil_ReadMemoryBarrier() __asm__ volatile("sync":::"memory") @@ -101,61 +90,63 @@ # define PaUtil_ReadMemoryBarrier() __asm__ volatile("lfence":::"memory") # define PaUtil_WriteMemoryBarrier() __asm__ volatile("sfence":::"memory") # else +# ifdef ALLOW_SMP_DANGERS +# warning Memory barriers not defined on this system or system unknown +# warning For SMP safety, you should fix this. +# define PaUtil_FullMemoryBarrier() +# define PaUtil_ReadMemoryBarrier() +# define PaUtil_WriteMemoryBarrier() +# else +# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed. +# endif +# endif +#else +# ifdef ALLOW_SMP_DANGERS +# warning Memory barriers not defined on this system or system unknown +# warning For SMP safety, you should fix this. # define PaUtil_FullMemoryBarrier() # define PaUtil_ReadMemoryBarrier() # define PaUtil_WriteMemoryBarrier() +# else +# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed. # endif -#elif defined(_MSC_VER) -# include <intrin.h> -# pragma intrinsic(_ReadWriteBarrier) -# pragma intrinsic(_ReadBarrier) -# pragma intrinsic(_WriteBarrier) -# define PaUtil_FullMemoryBarrier() _ReadWriteBarrier() -# define PaUtil_ReadMemoryBarrier() _ReadBarrier() -# define PaUtil_WriteMemoryBarrier() _WriteBarrier() -#else -# define PaUtil_FullMemoryBarrier() -# define PaUtil_ReadMemoryBarrier() -# define PaUtil_WriteMemoryBarrier() -#endif #endif + /*************************************************************************** * Initialize FIFO. * numBytes must be power of 2, returns -1 if not. */ -long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr) +long PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, long numBytes, void *dataPtr ) { - if (((numBytes - 1) & numBytes) != 0) - return -1; /* Not Power of two. */ - rbuf->bufferSize = numBytes; - rbuf->buffer = (char *) dataPtr; - PaUtil_FlushRingBuffer(rbuf); - rbuf->bigMask = (numBytes * 2) - 1; - rbuf->smallMask = (numBytes) - 1; - return 0; + if( ((numBytes-1) & numBytes) != 0) return -1; /* Not Power of two. */ + rbuf->bufferSize = numBytes; + rbuf->buffer = (char *)dataPtr; + PaUtil_FlushRingBuffer( rbuf ); + rbuf->bigMask = (numBytes*2)-1; + rbuf->smallMask = (numBytes)-1; + return 0; } /*************************************************************************** ** Return number of bytes available for reading. */ -long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf) +long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf ) { - PaUtil_ReadMemoryBarrier(); - return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask); + PaUtil_ReadMemoryBarrier(); + return ( (rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask ); } - /*************************************************************************** ** Return number of bytes available for writing. */ -long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf) +long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf ) { - /* Since we are calling PaUtil_GetRingBufferReadAvailable, we don't need an aditional MB */ - return (rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf)); + /* Since we are calling PaUtil_GetRingBufferReadAvailable, we don't need an aditional MB */ + return ( rbuf->bufferSize - PaUtil_GetRingBufferReadAvailable(rbuf)); } /*************************************************************************** ** Clear buffer. Should only be called when buffer is NOT being read. */ -void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf) +void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf ) { - rbuf->writeIndex = rbuf->readIndex = 0; + rbuf->writeIndex = rbuf->readIndex = 0; } /*************************************************************************** @@ -164,38 +155,42 @@ ** If non-contiguous, size2 will be the size of second region. ** Returns room available to be written or numBytes, whichever is smaller. */ -long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2) -{ - long index; - long available = PaUtil_GetRingBufferWriteAvailable(rbuf); - if (numBytes > available) - numBytes = available; - /* Check to see if write is not contiguous. */ - index = rbuf->writeIndex & rbuf->smallMask; - if ((index + numBytes) > rbuf->bufferSize) { - /* Write data in two blocks that wrap the buffer. */ - long firstHalf = rbuf->bufferSize - index; - *dataPtr1 = &rbuf->buffer[index]; - *sizePtr1 = firstHalf; - *dataPtr2 = &rbuf->buffer[0]; - *sizePtr2 = numBytes - firstHalf; - } else { - *dataPtr1 = &rbuf->buffer[index]; - *sizePtr1 = numBytes; - *dataPtr2 = NULL; - *sizePtr2 = 0; - } - return numBytes; +long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes, + void **dataPtr1, long *sizePtr1, + void **dataPtr2, long *sizePtr2 ) +{ + long index; + long available = PaUtil_GetRingBufferWriteAvailable( rbuf ); + if( numBytes > available ) numBytes = available; + /* Check to see if write is not contiguous. */ + index = rbuf->writeIndex & rbuf->smallMask; + if( (index + numBytes) > rbuf->bufferSize ) + { + /* Write data in two blocks that wrap the buffer. */ + long firstHalf = rbuf->bufferSize - index; + *dataPtr1 = &rbuf->buffer[index]; + *sizePtr1 = firstHalf; + *dataPtr2 = &rbuf->buffer[0]; + *sizePtr2 = numBytes - firstHalf; + } + else + { + *dataPtr1 = &rbuf->buffer[index]; + *sizePtr1 = numBytes; + *dataPtr2 = NULL; + *sizePtr2 = 0; + } + return numBytes; } /*************************************************************************** */ -long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes) +long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes ) { - /* we need to ensure that previous writes are seen before we update the write index */ - PaUtil_WriteMemoryBarrier(); - return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask; + /* we need to ensure that previous writes are seen before we update the write index */ + PaUtil_WriteMemoryBarrier(); + return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask; } /*************************************************************************** @@ -204,72 +199,81 @@ ** If non-contiguous, size2 will be the size of second region. ** Returns room available to be written or numBytes, whichever is smaller. */ -long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2) -{ - long index; - long available = PaUtil_GetRingBufferReadAvailable(rbuf); - if (numBytes > available) - numBytes = available; - /* Check to see if read is not contiguous. */ - index = rbuf->readIndex & rbuf->smallMask; - if ((index + numBytes) > rbuf->bufferSize) { - /* Write data in two blocks that wrap the buffer. */ - long firstHalf = rbuf->bufferSize - index; - *dataPtr1 = &rbuf->buffer[index]; - *sizePtr1 = firstHalf; - *dataPtr2 = &rbuf->buffer[0]; - *sizePtr2 = numBytes - firstHalf; - } else { - *dataPtr1 = &rbuf->buffer[index]; - *sizePtr1 = numBytes; - *dataPtr2 = NULL; - *sizePtr2 = 0; - } - return numBytes; +long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes, + void **dataPtr1, long *sizePtr1, + void **dataPtr2, long *sizePtr2 ) +{ + long index; + long available = PaUtil_GetRingBufferReadAvailable( rbuf ); + if( numBytes > available ) numBytes = available; + /* Check to see if read is not contiguous. */ + index = rbuf->readIndex & rbuf->smallMask; + if( (index + numBytes) > rbuf->bufferSize ) + { + /* Write data in two blocks that wrap the buffer. */ + long firstHalf = rbuf->bufferSize - index; + *dataPtr1 = &rbuf->buffer[index]; + *sizePtr1 = firstHalf; + *dataPtr2 = &rbuf->buffer[0]; + *sizePtr2 = numBytes - firstHalf; + } + else + { + *dataPtr1 = &rbuf->buffer[index]; + *sizePtr1 = numBytes; + *dataPtr2 = NULL; + *sizePtr2 = 0; + } + return numBytes; } - /*************************************************************************** */ -long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes) +long PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, long numBytes ) { - /* we need to ensure that previous writes are always seen before updating the index. */ - PaUtil_WriteMemoryBarrier(); - return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask; + /* we need to ensure that previous writes are always seen before updating the index. */ + PaUtil_WriteMemoryBarrier(); + return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask; } /*************************************************************************** ** Return bytes written. */ -long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes) +long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numBytes ) { - long size1, size2, numWritten; - void *data1, *data2; - numWritten = PaUtil_GetRingBufferWriteRegions(rbuf, numBytes, &data1, &size1, &data2, &size2); - if (size2 > 0) { - - memcpy(data1, data, size1); - data = ((char *) data) + size1; - memcpy(data2, data, size2); - } else { - memcpy(data1, data, size1); - } - PaUtil_AdvanceRingBufferWriteIndex(rbuf, numWritten); - return numWritten; + long size1, size2, numWritten; + void *data1, *data2; + numWritten = PaUtil_GetRingBufferWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); + if( size2 > 0 ) + { + + memcpy( data1, data, size1 ); + data = ((char *)data) + size1; + memcpy( data2, data, size2 ); + } + else + { + memcpy( data1, data, size1 ); + } + PaUtil_AdvanceRingBufferWriteIndex( rbuf, numWritten ); + return numWritten; } /*************************************************************************** ** Return bytes read. */ -long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes) +long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes ) { - long size1, size2, numRead; - void *data1, *data2; - numRead = PaUtil_GetRingBufferReadRegions(rbuf, numBytes, &data1, &size1, &data2, &size2); - if (size2 > 0) { - memcpy(data, data1, size1); - data = ((char *) data) + size1; - memcpy(data, data2, size2); - } else { - memcpy(data, data1, size1); - } - PaUtil_AdvanceRingBufferReadIndex(rbuf, numRead); - return numRead; + long size1, size2, numRead; + void *data1, *data2; + numRead = PaUtil_GetRingBufferReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); + if( size2 > 0 ) + { + memcpy( data, data1, size1 ); + data = ((char *)data) + size1; + memcpy( data, data2, size2 ); + } + else + { + memcpy( data, data1, size1 ); + } + PaUtil_AdvanceRingBufferReadIndex( rbuf, numRead ); + return numRead; } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.h Thu Jun 21 18:36:04 2007 @@ -51,17 +51,19 @@ */ #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - typedef struct PaUtilRingBuffer { - long bufferSize; /* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */ - long writeIndex; /* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */ - long readIndex; /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */ - long bigMask; /* Used for wrapping indices with extra bit to distinguish full/empty. */ - long smallMask; /* Used for fitting indices to buffer. */ - char *buffer; - } PaUtilRingBuffer; +extern "C" +{ +#endif /* __cplusplus */ + +typedef struct PaUtilRingBuffer +{ + long bufferSize; /* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */ + long writeIndex; /* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */ + long readIndex; /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */ + long bigMask; /* Used for wrapping indices with extra bit to distinguish full/empty. */ + long smallMask; /* Used for fitting indices to buffer. */ + char *buffer; +}PaUtilRingBuffer; /** Initialize Ring Buffer. @@ -74,13 +76,13 @@ @return -1 if numBytes is not a power of 2, otherwise 0. */ - long PaUtil_InitializeRingBuffer(PaUtilRingBuffer * rbuf, long numBytes, void *dataPtr); +long PaUtil_InitializeRingBuffer( PaUtilRingBuffer *rbuf, long numBytes, void *dataPtr ); /** Clear buffer. Should only be called when buffer is NOT being read. @param rbuf The ring buffer. */ - void PaUtil_FlushRingBuffer(PaUtilRingBuffer * rbuf); +void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf ); /** Retrieve the number of bytes available in the ring buffer for writing. @@ -88,7 +90,7 @@ @return The number of bytes available for writing. */ - long PaUtil_GetRingBufferWriteAvailable(PaUtilRingBuffer * rbuf); +long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf ); /** Retrieve the number of bytes available in the ring buffer for reading. @@ -96,7 +98,7 @@ @return The number of bytes available for reading. */ - long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf); +long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf ); /** Write data to the ring buffer. @@ -108,7 +110,7 @@ @return The number of bytes written. */ - long PaUtil_WriteRingBuffer(PaUtilRingBuffer * rbuf, const void *data, long numBytes); +long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numBytes ); /** Read data from the ring buffer. @@ -120,7 +122,7 @@ @return The number of bytes read. */ - long PaUtil_ReadRingBuffer(PaUtilRingBuffer * rbuf, void *data, long numBytes); +long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes ); /** Get address of region(s) to which we can write data. @@ -142,7 +144,9 @@ @return The room available to be written or numBytes, whichever is smaller. */ - long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2); +long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes, + void **dataPtr1, long *sizePtr1, + void **dataPtr2, long *sizePtr2 ); /** Advance the write index to the next location to be written. @@ -152,7 +156,7 @@ @return The new position. */ - long PaUtil_AdvanceRingBufferWriteIndex(PaUtilRingBuffer * rbuf, long numBytes); +long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes ); /** Get address of region(s) from which we can write data. @@ -174,7 +178,9 @@ @return The number of bytes available for reading. */ - long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2); +long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes, + void **dataPtr1, long *sizePtr1, + void **dataPtr2, long *sizePtr2 ); /** Advance the read index to the next location to be read. @@ -184,9 +190,9 @@ @return The new position. */ - long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes); +long PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, long numBytes ); #ifdef __cplusplus } -#endif /* __cplusplus */ -#endif /* PA_RINGBUFFER_H */ +#endif /* __cplusplus */ +#endif /* PA_RINGBUFFER_H */ Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Thu Jun 21 18:36:04 2007 @@ -49,11 +49,12 @@ #include <string.h> #include <time.h> + /************************************************************************/ /******** Constants *****************************************************/ /************************************************************************/ -#define FRAMES_PER_BUFFER (256) +#define FRAMES_PER_BUFFER (128) /************************************************************************/ /******** Prototypes ****************************************************/ @@ -117,17 +118,24 @@ * Write data to ring buffer. * Will not return until all the data has been written. */ -long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames) +long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int timeout) { long bytesWritten; char *p = (char *) data; long numBytes = aStream->bytesPerFrame * numFrames; + int time = 0; + while (numBytes > 0) { bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); numBytes -= bytesWritten; p += bytesWritten; - if (numBytes > 0) - Pa_Sleep(10); + if (numBytes > 0) { + Pa_Sleep(1); + if (++time >= timeout * 2) { + PaUtil_FlushRingBuffer(&aStream->outFIFO); + return 0; + } + } } return numFrames; } @@ -136,19 +144,27 @@ * Read data from ring buffer. * Will not return until all the data has been read. */ -long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames) +long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int timeout) { long bytesRead; char *p = (char *) data; long numBytes = aStream->bytesPerFrame * numFrames; - + int time = 0; + while (numBytes > 0) { bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, numBytes); numBytes -= bytesRead; p += bytesRead; - if (numBytes > 0) - Pa_Sleep(10); + if (numBytes > 0) { + Pa_Sleep(1); + time++; + if (time > timeout * 2) { + PaUtil_FlushRingBuffer(&aStream->inFIFO); + return 0; + } + } } + //printf("%d\n", time); return numFrames; } @@ -172,18 +188,20 @@ return bytesFull / aStream->bytesPerFrame; } -/************************************************************/ +/*********************************************************** static unsigned long RoundUpToNextPowerOf2(unsigned long n) { long numBits = 0; if (((n - 1) & n) == 0) - return n; /* Already Power of two. */ + return n; while (n > 0) { n = n >> 1; numBits++; } return (1 << numBits); } +*/ + /************************************************************ * Opens a PortAudio stream with default characteristics. @@ -194,11 +212,11 @@ const PaStreamParameters * inputParameters, const PaStreamParameters * outputParameters, double sampleRate, PaStreamFlags streamFlags) { - long bytesPerSample; + long bytesPerSample = 2; PaError err; PABLIO_Stream *aStream; long numFrames; - long numBytes; + //long numBytes; int channels = 1; /* Allocate PABLIO_Stream structure for caller. */ @@ -218,12 +236,8 @@ channels = outputParameters->channelCount; } - numFrames = 4 * FRAMES_PER_BUFFER; - numFrames = RoundUpToNextPowerOf2(numFrames); - - bytesPerSample = 2; - aStream->samplesPerFrame = channels; - aStream->bytesPerFrame = bytesPerSample * aStream->samplesPerFrame; + numFrames = FRAMES_PER_BUFFER; + aStream->bytesPerFrame = bytesPerSample; /* Initialize Ring Buffers */ @@ -240,8 +254,8 @@ } /* Make Write FIFO appear full initially. */ - numBytes = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFO); - PaUtil_AdvanceRingBufferWriteIndex(&aStream->outFIFO, numBytes); + //numBytes = PaUtil_GetRingBufferWriteAvailable(&aStream->outFIFO); + //PaUtil_AdvanceRingBufferWriteIndex(&aStream->outFIFO, numBytes); /* Open a PortAudio stream that we will use to communicate with the underlying Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h Thu Jun 21 18:36:04 2007 @@ -61,7 +61,6 @@ PaUtilRingBuffer outFIFO; PaStream *stream; int bytesPerFrame; - int samplesPerFrame; } PABLIO_Stream; /* Values for flags for OpenAudioStream(). */ @@ -75,13 +74,13 @@ * Write data to ring buffer. * Will not return until all the data has been written. */ - long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames); + long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int timeout); /************************************************************ * Read data from ring buffer. * Will not return until all the data has been read. */ - long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames); + long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, int timeout); /************************************************************ * Return the number of frames that could be written to the stream without

1 0

[commit] r5433 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 21 Jun '07

21 Jun '07

Author: greenlizard Date: Thu Jun 21 14:23:56 2007 New Revision: 5433 Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.i freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Log: bugfix: return values from playAndGetDigits stopped working Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.i ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.i (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.i Thu Jun 21 14:23:56 2007 @@ -1,6 +1,14 @@ %module freeswitch %include "cstring.i" +/** + * tell swig to treat these variables as mutable so they + * can be used to return values. + * See http://www.swig.org/Doc1.3/Library.html + */ +%cstring_bounded_mutable(char *dtmf_buf, 128); +%cstring_bounded_mutable(char *terminator, 8); + /** insert the following includes into generated code so it compiles */ %{ #include "switch_cpp.h" @@ -14,8 +22,5 @@ %include switch_cpp.h %include freeswitch_python.h -/** hmm .. dunno why this is here */ -%cstring_bounded_mutable(char *dtmf_buf, 128); -%cstring_bounded_mutable(char *terminator, 8); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Thu Jun 21 14:23:56 2007 @@ -4110,7 +4110,9 @@ void *argp1 = 0 ; int res1 = 0 ; int res2 ; - char *buf2 = 0 ; + char temp2[128+1] ; + char *t2 = 0 ; + size_t n2 = 0 ; int alloc2 = 0 ; int val3 ; int ecode3 = 0 ; @@ -4118,7 +4120,9 @@ char *buf4 = 0 ; int alloc4 = 0 ; int res5 ; - char *buf5 = 0 ; + char temp5[8+1] ; + char *t5 = 0 ; + size_t n5 = 0 ; int alloc5 = 0 ; int val6 ; int ecode6 = 0 ; @@ -4135,11 +4139,15 @@ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getDigits" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + res2 = SWIG_AsCharPtrAndSize(obj1, &t2, &n2, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_getDigits" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_getDigits" "', argument " "2"" of type '" "char *dtmf_buf""'"); } - arg2 = reinterpret_cast< char * >(buf2); + if ( n2 > (size_t) 128 ) n2 = (size_t) 128; + memcpy(temp2, t2, sizeof(char)*n2); + if (alloc2 == SWIG_NEWOBJ) delete[] t2; + temp2[n2 - 1] = 0; + arg2 = (char *) temp2; ecode3 = SWIG_AsVal_int(obj2, &val3); if (!SWIG_IsOK(ecode3)) { SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_getDigits" "', argument " "3"" of type '" "int""'"); @@ -4150,11 +4158,15 @@ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_getDigits" "', argument " "4"" of type '" "char *""'"); } arg4 = reinterpret_cast< char * >(buf4); - res5 = SWIG_AsCharPtrAndSize(obj4, &buf5, NULL, &alloc5); + res5 = SWIG_AsCharPtrAndSize(obj4, &t5, &n5, &alloc5); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CoreSession_getDigits" "', argument " "5"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CoreSession_getDigits" "', argument " "5"" of type '" "char *terminator""'"); } - arg5 = reinterpret_cast< char * >(buf5); + if ( n5 > (size_t) 8 ) n5 = (size_t) 8; + memcpy(temp5, t5, sizeof(char)*n5); + if (alloc5 == SWIG_NEWOBJ) delete[] t5; + temp5[n5 - 1] = 0; + arg5 = (char *) temp5; ecode6 = SWIG_AsVal_int(obj5, &val6); if (!SWIG_IsOK(ecode6)) { SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CoreSession_getDigits" "', argument " "6"" of type '" "int""'"); @@ -4162,14 +4174,14 @@ arg6 = static_cast< int >(val6); result = (int)(arg1)->getDigits(arg2,arg3,arg4,arg5,arg6); resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + arg2[128] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg2)); + arg5[8] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg5)); if (alloc4 == SWIG_NEWOBJ) delete[] buf4; - if (alloc5 == SWIG_NEWOBJ) delete[] buf5; return resultobj; fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc4 == SWIG_NEWOBJ) delete[] buf4; - if (alloc5 == SWIG_NEWOBJ) delete[] buf5; return NULL; } @@ -4265,7 +4277,9 @@ char *buf8 = 0 ; int alloc8 = 0 ; int res9 ; - char *buf9 = 0 ; + char temp9[128+1] ; + char *t9 = 0 ; + size_t n9 = 0 ; int alloc9 = 0 ; int res10 ; char *buf10 = 0 ; @@ -4322,11 +4336,15 @@ SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CoreSession_playAndGetDigits" "', argument " "8"" of type '" "char *""'"); } arg8 = reinterpret_cast< char * >(buf8); - res9 = SWIG_AsCharPtrAndSize(obj8, &buf9, NULL, &alloc9); + res9 = SWIG_AsCharPtrAndSize(obj8, &t9, &n9, &alloc9); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CoreSession_playAndGetDigits" "', argument " "9"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CoreSession_playAndGetDigits" "', argument " "9"" of type '" "char *dtmf_buf""'"); } - arg9 = reinterpret_cast< char * >(buf9); + if ( n9 > (size_t) 128 ) n9 = (size_t) 128; + memcpy(temp9, t9, sizeof(char)*n9); + if (alloc9 == SWIG_NEWOBJ) delete[] t9; + temp9[n9 - 1] = 0; + arg9 = (char *) temp9; res10 = SWIG_AsCharPtrAndSize(obj9, &buf10, NULL, &alloc10); if (!SWIG_IsOK(res10)) { SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "CoreSession_playAndGetDigits" "', argument " "10"" of type '" "char *""'"); @@ -4334,17 +4352,17 @@ arg10 = reinterpret_cast< char * >(buf10); result = (int)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); resultobj = SWIG_From_int(static_cast< int >(result)); + arg9[128] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg9)); if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; - if (alloc9 == SWIG_NEWOBJ) delete[] buf9; if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return resultobj; fail: if (alloc6 == SWIG_NEWOBJ) delete[] buf6; if (alloc7 == SWIG_NEWOBJ) delete[] buf7; if (alloc8 == SWIG_NEWOBJ) delete[] buf8; - if (alloc9 == SWIG_NEWOBJ) delete[] buf9; if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return NULL; }

1 0

[commit] r5431 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 21 Jun '07

21 Jun '07

Author: anthm Date: Thu Jun 21 12:30:56 2007 New Revision: 5431 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: fix odbc Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Thu Jun 21 12:30:56 2007 @@ -424,21 +424,39 @@ static JSPropertySpec odbc_props[] = { -// {"name", odbc_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, + {"name", odbc_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; +static JSBool odbc_setProperty(JSContext * cx, JSObject * obj, jsval id, jsval *vp) +{ + char *name = JS_GetStringBytes(JS_ValueToString(cx, id)); + + if (strcmp(name, "_oDbC_dB_RoW_DaTa_")) { + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + } + return JS_TRUE; +} -static JSBool odbc_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +static JSBool odbc_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval *vp) { - JSBool res = JS_TRUE; + int param; + char *name = JS_GetStringBytes(JS_ValueToString(cx, id)); + + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } - return res; + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; } JSClass odbc_class = { modname, JSCLASS_HAS_PRIVATE, - JS_PropertyStub, JS_PropertyStub, odbc_getProperty, DEFAULT_SET_PROPERTY, + JS_PropertyStub, JS_PropertyStub, odbc_getProperty, odbc_setProperty, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, odbc_destroy, NULL, NULL, NULL, odbc_construct };

1 0

[commit] r5429 - freeswitch/trunk/w32/Setup
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:53:49 2007 New Revision: 5429 Modified: freeswitch/trunk/w32/Setup/Setup.vdproj Log: make msi work for now. Modified: freeswitch/trunk/w32/Setup/Setup.vdproj ============================================================================== --- freeswitch/trunk/w32/Setup/Setup.vdproj (original) +++ freeswitch/trunk/w32/Setup/Setup.vdproj Wed Jun 20 14:53:49 2007 @@ -15,12 +15,6 @@ { "Entry" { - "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0F091427EEA0245FBA87474748D35ABD" "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" @@ -45,199 +39,199 @@ } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_F84240319757424DB1C58AD0AD420127" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_87768631363249B2B301143C193612F7" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_7358123D2D064AD1BC517911A8B23D1B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_684D96FA2BDD46909367E651099D8C4E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_5A636BB90F7F4B86ACB8839EA2C899AA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" "MsmSig" = "8:_UNDEFINED" } @@ -273,14 +267,14 @@ } "Entry" { - "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmKey" = "8:_326CFBAF7BA54A989CB1BF8A9CF959D8" + "OwnerKey" = "8:_245904E3D36D4A86B2FB963505EB83D2" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_35FACDFFDDB943568B7588D14D0513A7" - "OwnerKey" = "8:_27200676A75147D0BB7FA5500BB31A6D" + "MsmKey" = "8:_329D8DAE6C01FCF026E9DFB48B932203" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -303,18 +297,6 @@ } "Entry" { - "MsmKey" = "8:_525E8ED430D44113995AB8FBF1945569" - "OwnerKey" = "8:_548996CD77304E3598846F122E79431A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_548996CD77304E3598846F122E79431A" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -417,12 +399,6 @@ } "Entry" { - "MsmKey" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A944ADCEDF884574A23F7BA5420A6BA1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -742,26 +718,6 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB" - { - "SourcePath" = "8:..\\..\\AUTHORS" - "TargetName" = "8:AUTHORS" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F091427EEA0245FBA87474748D35ABD" { "SourcePath" = "8:js32.dll" @@ -962,26 +918,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A40E3F2045F44C60A8509FDFE47E6C45" - { - "SourcePath" = "8:..\\..\\COPYING" - "TargetName" = "8:COPYING" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ADA22D44BCDEBA509E09A5D4C155AA41" { "SourcePath" = "8:ODBC32.dll" @@ -1173,7 +1109,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Freeswitch" "ProductCode" = "8:{317A9CC0-40DC-4803-A13E-5937F05F9D2E}" - "PackageCode" = "8:{35A30F10-964D-4C59-A882-360D2CAC47EC}" + "PackageCode" = "8:{F98461BC-9B50-4BEA-A554-74A6F557BECF}" "UpgradeCode" = "8:{8080E3A5-7ADD-4173-8913-BDA439D1C8DD}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1447,53 +1383,6 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E8A0FD168FA4401FBF582E01DA819A71" - { - "Sequence" = "3:210" - "DisplayName" = "8:License Agreement" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "EulaText" - { - "Name" = "8:EulaText" - "DisplayName" = "8:#1008" - "Description" = "8:#1108" - "Type" = "3:6" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "UsePlugInResources" = "11:TRUE" - } - "Sunken" - { - "Name" = "8:Sunken" - "DisplayName" = "8:#1007" - "Description" = "8:#1107" - "Type" = "3:5" - "ContextData" = "8:4;True=4;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:4" - "DefaultValue" = "3:4" - "UsePlugInResources" = "11:TRUE" - } - } - } } } "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9237AC900FC7421096FC1C1F479A57D9" @@ -1595,53 +1484,6 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1229F6668E004795AE90C753D37CA881" - { - "Sequence" = "3:300" - "DisplayName" = "8:License Agreement" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "EulaText" - { - "Name" = "8:EulaText" - "DisplayName" = "8:#1008" - "Description" = "8:#1108" - "Type" = "3:6" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:2" - "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45" - "UsePlugInResources" = "11:TRUE" - } - "Sunken" - { - "Name" = "8:Sunken" - "DisplayName" = "8:#1007" - "Description" = "8:#1107" - "Type" = "3:5" - "ContextData" = "8:4;True=4;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:4" - "DefaultValue" = "3:4" - "UsePlugInResources" = "11:TRUE" - } - } - } "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4748A502E1E4F89B72F6B70E40E6954" { "Sequence" = "3:400" @@ -1804,7 +1646,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_27200676A75147D0BB7FA5500BB31A6D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_245904E3D36D4A86B2FB963505EB83D2" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1818,7 +1660,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_35FACDFFDDB943568B7588D14D0513A7" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_326CFBAF7BA54A989CB1BF8A9CF959D8" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1832,34 +1674,6 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_525E8ED430D44113995AB8FBF1945569" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_548996CD77304E3598846F122E79431A" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" {

1 0

[commit] r5428 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_iax mod_portaudio mod_woomera
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:53:26 2007 New Revision: 5428 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: whoops Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Jun 20 14:53:26 2007 @@ -1817,7 +1817,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "digngaling"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_event_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Jun 20 14:53:26 2007 @@ -868,7 +868,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "iax"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_state_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jun 20 14:53:26 2007 @@ -852,7 +852,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); channel_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - channel_endpoint_interface->interface_name = modname; + channel_endpoint_interface->interface_name = "portaudio"; channel_endpoint_interface->io_routines = &channel_io_routines; channel_endpoint_interface->state_handler = &channel_event_handlers; Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed Jun 20 14:53:26 2007 @@ -1353,7 +1353,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); woomera_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - woomera_endpoint_interface->interface_name = modname; + woomera_endpoint_interface->interface_name = "woomera"; woomera_endpoint_interface->io_routines = &woomera_io_routines; woomera_endpoint_interface->state_handler = &woomera_event_handlers;

1 0

[commit] r5426 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 14:45:35 2007 New Revision: 5426 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: whoops Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Jun 20 14:45:35 2007 @@ -1529,7 +1529,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); sofia_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); - sofia_endpoint_interface->interface_name = modname; + sofia_endpoint_interface->interface_name = "sofia"; sofia_endpoint_interface->io_routines = &sofia_io_routines; sofia_endpoint_interface->state_handler = &sofia_event_handlers;

1 0

[commit] r5424 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: mikej Date: Wed Jun 20 11:13:46 2007 New Revision: 5424 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Log: fix windows build. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Wed Jun 20 11:13:46 2007 @@ -1271,7 +1271,7 @@ } } - nta_agent_bind_tport_update(nua->nua_nta, nua, nua_stack_tport_update); + nta_agent_bind_tport_update(nua->nua_nta, (nta_update_magic_t *)nua, nua_stack_tport_update); return 0; }

1 0

[commit] r5423 - freeswitch/trunk/src
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: anthm Date: Wed Jun 20 10:50:02 2007 New Revision: 5423 Modified: freeswitch/trunk/src/switch_channel.c Log: avoiding deadlock Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Jun 20 10:50:02 2007 @@ -319,9 +319,10 @@ if (!(v = switch_core_hash_find(channel->variables, varname))) { if (!channel->caller_profile || !(v = switch_caller_get_field_by_name(channel->caller_profile, varname))) { if (!strcmp(varname, "base_dir")) { - return SWITCH_GLOBAL_dirs.base_dir; + v = SWITCH_GLOBAL_dirs.base_dir; + } else { + v = switch_core_get_variable(varname); } - v = switch_core_get_variable(varname); } } switch_mutex_unlock(channel->profile_mutex);

1 0

[commit] r5422 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: cparker Date: Wed Jun 20 10:45:28 2007 New Revision: 5422 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Remove uneeded module_pool declaration Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Jun 20 10:45:28 2007 @@ -40,8 +40,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, NULL, NULL); -static switch_memory_pool_t *module_pool = NULL; - static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; static char * my_timeout; /* 5 */ @@ -471,8 +469,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load) { - module_pool = pool; - if (load_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; }

1 0

[commit] r5421 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 20 Jun '07

20 Jun '07

Author: cparker Date: Wed Jun 20 10:41:55 2007 New Revision: 5421 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Changes to new macro initialzation Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Wed Jun 20 10:41:55 2007 @@ -37,7 +37,10 @@ #include <freeradius-client.h> #include "mod_radius_cdr.h" -static const char modname[] = "mod_radius_cdr"; +SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load); +SWITCH_MODULE_DEFINITION(mod_radius_cdr, mod_radius_cdr_load, NULL, NULL); + +static switch_memory_pool_t *module_pool = NULL; static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; @@ -466,18 +469,10 @@ /*.on_transmit */ NULL }; - -static const switch_loadable_module_interface_t mod_radius_cdr_module_interface = { - /*.module_name = */ modname, - /*.endpoint_interface = */ NULL, - /*.timer_interface = */ NULL, - /*.dialplan_interface = */ NULL, - /*.codec_interface = */ NULL, - /*.application_interface */ NULL -}; - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load) { + module_pool = pool; + if (load_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; } @@ -485,7 +480,7 @@ /* test global state handlers */ switch_core_add_state_handler(&state_handlers); - *module_interface = &mod_radius_cdr_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0