mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-25 12:10:18 +00:00
dos2unix
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@968 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
0232f398c7
commit
df1f3209d9
@ -55,10 +55,10 @@
|
|||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/******** Prototypes ****************************************************/
|
/******** Prototypes ****************************************************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
static int blockingIOCallback(void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer,
|
static int blockingIOCallback(void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer,
|
||||||
PaTimestamp outTime, void *userData);
|
PaTimestamp outTime, void *userData);
|
||||||
static PaError PABLIO_InitFIFO(RingBuffer * rbuf, long numFrames, long bytesPerFrame);
|
static PaError PABLIO_InitFIFO(RingBuffer * rbuf, long numFrames, long bytesPerFrame);
|
||||||
static PaError PABLIO_TermFIFO(RingBuffer * rbuf);
|
static PaError PABLIO_TermFIFO(RingBuffer * rbuf);
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/******** Functions *****************************************************/
|
/******** Functions *****************************************************/
|
||||||
@ -90,7 +90,7 @@ static int blockingIOCallback(void *inputBuffer, void *outputBuffer,
unsigned l
|
|||||||
((char *) outputBuffer)[i] = 0;
|
((char *) outputBuffer)[i] = 0;
|
||||||
} }
|
} }
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Allocate buffer. */
|
/* Allocate buffer. */
|
||||||
@ -102,7 +102,7 @@ static PaError PABLIO_InitFIFO(RingBuffer * rbuf, long numFrames, long bytesPerF
|
|||||||
return paInsufficientMemory;
|
return paInsufficientMemory;
|
||||||
memset(buffer, 0, numBytes);
|
memset(buffer, 0, numBytes);
|
||||||
return (PaError) RingBuffer_Init(rbuf, numBytes, buffer);
|
return (PaError) RingBuffer_Init(rbuf, numBytes, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Free buffer. */
|
/* Free buffer. */
|
||||||
@ -112,7 +112,7 @@ static PaError PABLIO_TermFIFO(RingBuffer * rbuf)
|
|||||||
free(rbuf->buffer);
|
free(rbuf->buffer);
|
||||||
rbuf->buffer = NULL;
|
rbuf->buffer = NULL;
|
||||||
return paNoError;
|
return paNoError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
@ -133,7 +133,7 @@ long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames)
|
|||||||
Pa_Sleep(10);
|
Pa_Sleep(10);
|
||||||
}
|
}
|
||||||
return numFrames;
|
return numFrames;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
@ -154,7 +154,7 @@ long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames)
|
|||||||
Pa_Sleep(10);
|
Pa_Sleep(10);
|
||||||
}
|
}
|
||||||
return numFrames;
|
return numFrames;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
@ -165,7 +165,7 @@ long GetAudioStreamWriteable(PABLIO_Stream * aStream)
|
|||||||
{
|
{
|
||||||
int bytesEmpty = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
int bytesEmpty = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
||||||
return bytesEmpty / aStream->bytesPerFrame;
|
return bytesEmpty / aStream->bytesPerFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
@ -176,7 +176,7 @@ long GetAudioStreamReadable(PABLIO_Stream * aStream)
|
|||||||
{
|
{
|
||||||
int bytesFull = RingBuffer_GetReadAvailable(&aStream->inFIFO);
|
int bytesFull = RingBuffer_GetReadAvailable(&aStream->inFIFO);
|
||||||
return bytesFull / aStream->bytesPerFrame;
|
return bytesFull / aStream->bytesPerFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************/
|
/************************************************************/
|
||||||
@ -191,7 +191,7 @@ static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
|||||||
numBits++;
|
numBits++;
|
||||||
}
|
}
|
||||||
return (1 << numBits);
|
return (1 << numBits);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
@ -276,7 +276,7 @@ static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
|||||||
|
|
||||||
/* Open a PortAudio stream that we will use to communicate with the underlying
|
/* Open a PortAudio stream that we will use to communicate with the underlying
|
||||||
* audio drivers. */
|
* audio drivers. */
|
||||||
err = Pa_OpenStream(
&aStream->stream,
|
err = Pa_OpenStream(&aStream->stream,
|
||||||
(doRead ? (indev > -1) ? indev : Pa_GetDefaultInputDeviceID() : paNoDevice),
|
(doRead ? (indev > -1) ? indev : Pa_GetDefaultInputDeviceID() : paNoDevice),
|
||||||
(doRead ? aStream->samplesPerFrame : 0), format, NULL,
|
(doRead ? aStream->samplesPerFrame : 0), format, NULL,
|
||||||
(doWrite ? (outdev > -1) ? outdev : Pa_GetDefaultOutputDeviceID() : paNoDevice),
|
(doWrite ? (outdev > -1) ? outdev : Pa_GetDefaultOutputDeviceID() : paNoDevice),
|
||||||
@ -291,10 +291,10 @@ static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
|||||||
goto error;
|
goto error;
|
||||||
*rwblPtr = aStream;
|
*rwblPtr = aStream;
|
||||||
return paNoError;
|
return paNoError;
|
||||||
error:
CloseAudioStream(aStream);
|
error:CloseAudioStream(aStream);
|
||||||
*rwblPtr = NULL;
|
*rwblPtr = NULL;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************/
|
/************************************************************/
|
||||||
@ -323,11 +323,11 @@ static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
|||||||
goto error;
|
goto error;
|
||||||
err = Pa_CloseStream(aStream->stream);
|
err = Pa_CloseStream(aStream->stream);
|
||||||
}
|
}
|
||||||
error:
Pa_Terminate();
|
error:Pa_Terminate();
|
||||||
PABLIO_TermFIFO(&aStream->inFIFO);
|
PABLIO_TermFIFO(&aStream->inFIFO);
|
||||||
PABLIO_TermFIFO(&aStream->outFIFO);
|
PABLIO_TermFIFO(&aStream->outFIFO);
|
||||||
free(aStream);
|
free(aStream);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ long RingBuffer_Init(RingBuffer * rbuf, long numBytes, void *dataPtr)
|
|||||||
rbuf->bigMask = (numBytes * 2) - 1;
|
rbuf->bigMask = (numBytes * 2) - 1;
|
||||||
rbuf->smallMask = (numBytes) - 1;
|
rbuf->smallMask = (numBytes) - 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -61,7 +61,7 @@ long RingBuffer_Init(RingBuffer * rbuf, long numBytes, void *dataPtr)
|
|||||||
long RingBuffer_GetReadAvailable(RingBuffer * rbuf)
|
long RingBuffer_GetReadAvailable(RingBuffer * rbuf)
|
||||||
{
|
{
|
||||||
return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask);
|
return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -69,7 +69,7 @@ long RingBuffer_GetReadAvailable(RingBuffer * rbuf)
|
|||||||
long RingBuffer_GetWriteAvailable(RingBuffer * rbuf)
|
long RingBuffer_GetWriteAvailable(RingBuffer * rbuf)
|
||||||
{
|
{
|
||||||
return (rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf));
|
return (rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -77,7 +77,7 @@ long RingBuffer_GetWriteAvailable(RingBuffer * rbuf)
|
|||||||
void RingBuffer_Flush(RingBuffer * rbuf)
|
void RingBuffer_Flush(RingBuffer * rbuf)
|
||||||
{
|
{
|
||||||
rbuf->writeIndex = rbuf->readIndex = 0;
|
rbuf->writeIndex = rbuf->readIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
** Get address of region(s) to which we can write data.
|
** Get address of region(s) to which we can write data.
|
||||||
@ -114,7 +114,7 @@ long RingBuffer_GetWriteRegions(RingBuffer * rbuf, long numBytes,
void **dataPt
|
|||||||
*sizePtr2 = 0;
|
*sizePtr2 = 0;
|
||||||
}
|
}
|
||||||
return numBytes;
|
return numBytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -122,7 +122,7 @@ long RingBuffer_GetWriteRegions(RingBuffer * rbuf, long numBytes,
void **dataPt
|
|||||||
long RingBuffer_AdvanceWriteIndex(RingBuffer * rbuf, long numBytes)
|
long RingBuffer_AdvanceWriteIndex(RingBuffer * rbuf, long numBytes)
|
||||||
{
|
{
|
||||||
return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
|
return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -160,7 +160,7 @@ long RingBuffer_GetReadRegions(RingBuffer * rbuf, long numBytes,
void **dataPtr
|
|||||||
*sizePtr2 = 0;
|
*sizePtr2 = 0;
|
||||||
}
|
}
|
||||||
return numBytes;
|
return numBytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -168,7 +168,7 @@ long RingBuffer_GetReadRegions(RingBuffer * rbuf, long numBytes,
void **dataPtr
|
|||||||
long RingBuffer_AdvanceReadIndex(RingBuffer * rbuf, long numBytes)
|
long RingBuffer_AdvanceReadIndex(RingBuffer * rbuf, long numBytes)
|
||||||
{
|
{
|
||||||
return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
|
return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -191,7 +191,7 @@ long RingBuffer_Write(RingBuffer * rbuf, void *data, long numBytes)
|
|||||||
}
|
}
|
||||||
RingBuffer_AdvanceWriteIndex(rbuf, numWritten);
|
RingBuffer_AdvanceWriteIndex(rbuf, numWritten);
|
||||||
return numWritten;
|
return numWritten;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
@ -214,6 +214,6 @@ long RingBuffer_Read(RingBuffer * rbuf, void *data, long numBytes)
|
|||||||
}
|
}
|
||||||
RingBuffer_AdvanceReadIndex(rbuf, numRead);
|
RingBuffer_AdvanceReadIndex(rbuf, numRead);
|
||||||
return numRead;
|
return numRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user