提交 36ccf76a authored 作者: Anthony Minessale's avatar Anthony Minessale

update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5435 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 4e50738c
...@@ -51,19 +51,17 @@ ...@@ -51,19 +51,17 @@
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif /* __cplusplus */
#endif /* __cplusplus */
typedef struct PaUtilRingBuffer {
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 bufferSize; /* Number of bytes in FIFO. Power of 2. Set by PaUtil_InitRingBuffer. */ long readIndex; /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */
long writeIndex; /* Index of next writable byte. Set by PaUtil_AdvanceRingBufferWriteIndex. */ long bigMask; /* Used for wrapping indices with extra bit to distinguish full/empty. */
long readIndex; /* Index of next readable byte. Set by PaUtil_AdvanceRingBufferReadIndex. */ long smallMask; /* Used for fitting indices to buffer. */
long bigMask; /* Used for wrapping indices with extra bit to distinguish full/empty. */ char *buffer;
long smallMask; /* Used for fitting indices to buffer. */ } PaUtilRingBuffer;
char *buffer;
}PaUtilRingBuffer;
/** Initialize Ring Buffer. /** Initialize Ring Buffer.
...@@ -76,13 +74,13 @@ typedef struct PaUtilRingBuffer ...@@ -76,13 +74,13 @@ typedef struct PaUtilRingBuffer
@return -1 if numBytes is not a power of 2, otherwise 0. @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. /** Clear buffer. Should only be called when buffer is NOT being read.
@param rbuf The ring buffer. @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. /** Retrieve the number of bytes available in the ring buffer for writing.
...@@ -90,7 +88,7 @@ void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf ); ...@@ -90,7 +88,7 @@ void PaUtil_FlushRingBuffer( PaUtilRingBuffer *rbuf );
@return The number of bytes available for writing. @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. /** Retrieve the number of bytes available in the ring buffer for reading.
...@@ -98,7 +96,7 @@ long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf ); ...@@ -98,7 +96,7 @@ long PaUtil_GetRingBufferWriteAvailable( PaUtilRingBuffer *rbuf );
@return The number of bytes available for reading. @return The number of bytes available for reading.
*/ */
long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf ); long PaUtil_GetRingBufferReadAvailable(PaUtilRingBuffer * rbuf);
/** Write data to the ring buffer. /** Write data to the ring buffer.
...@@ -110,7 +108,7 @@ long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf ); ...@@ -110,7 +108,7 @@ long PaUtil_GetRingBufferReadAvailable( PaUtilRingBuffer *rbuf );
@return The number of bytes written. @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. /** Read data from the ring buffer.
...@@ -122,7 +120,7 @@ long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numB ...@@ -122,7 +120,7 @@ long PaUtil_WriteRingBuffer( PaUtilRingBuffer *rbuf, const void *data, long numB
@return The number of bytes read. @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. /** Get address of region(s) to which we can write data.
...@@ -144,9 +142,7 @@ long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes ); ...@@ -144,9 +142,7 @@ long PaUtil_ReadRingBuffer( PaUtilRingBuffer *rbuf, void *data, long numBytes );
@return The room available to be written or numBytes, whichever is smaller. @return The room available to be written or numBytes, whichever is smaller.
*/ */
long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes, long PaUtil_GetRingBufferWriteRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
void **dataPtr1, long *sizePtr1,
void **dataPtr2, long *sizePtr2 );
/** Advance the write index to the next location to be written. /** Advance the write index to the next location to be written.
...@@ -156,7 +152,7 @@ long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes, ...@@ -156,7 +152,7 @@ long PaUtil_GetRingBufferWriteRegions( PaUtilRingBuffer *rbuf, long numBytes,
@return The new position. @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. /** Get address of region(s) from which we can write data.
...@@ -178,9 +174,7 @@ long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes ) ...@@ -178,9 +174,7 @@ long PaUtil_AdvanceRingBufferWriteIndex( PaUtilRingBuffer *rbuf, long numBytes )
@return The number of bytes available for reading. @return The number of bytes available for reading.
*/ */
long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes, long PaUtil_GetRingBufferReadRegions(PaUtilRingBuffer * rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2);
void **dataPtr1, long *sizePtr1,
void **dataPtr2, long *sizePtr2 );
/** Advance the read index to the next location to be read. /** Advance the read index to the next location to be read.
...@@ -190,9 +184,9 @@ long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes, ...@@ -190,9 +184,9 @@ long PaUtil_GetRingBufferReadRegions( PaUtilRingBuffer *rbuf, long numBytes,
@return The new position. @return The new position.
*/ */
long PaUtil_AdvanceRingBufferReadIndex( PaUtilRingBuffer *rbuf, long numBytes ); long PaUtil_AdvanceRingBufferReadIndex(PaUtilRingBuffer * rbuf, long numBytes);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* PA_RINGBUFFER_H */ #endif /* PA_RINGBUFFER_H */
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论