提交 73d78231 authored 作者: Brian West's avatar Brian West

update portaudio from last commit

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7858 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 2294d906
...@@ -552,7 +552,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch ...@@ -552,7 +552,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
globals.read_frame.datalen = samples * 2; globals.read_frame.datalen = samples * 2;
globals.read_frame.samples = samples; globals.read_frame.samples = samples;
switch_core_timer_check(&globals.timer); switch_core_timer_check(&globals.timer, SWITCH_TRUE);
*frame = &globals.read_frame; *frame = &globals.read_frame;
if (!switch_test_flag((&globals), GFLAG_MOUTH)) { if (!switch_test_flag((&globals), GFLAG_MOUTH)) {
......
...@@ -127,7 +127,7 @@ long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, switc ...@@ -127,7 +127,7 @@ long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, switc
numBytes -= bytesWritten; numBytes -= bytesWritten;
p += bytesWritten; p += bytesWritten;
if (numBytes > 0) { if (numBytes > 0) {
if (switch_core_timer_check(timer) == SWITCH_STATUS_SUCCESS) { if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
PaUtil_FlushRingBuffer(&aStream->outFIFO); PaUtil_FlushRingBuffer(&aStream->outFIFO);
return 0; return 0;
} }
...@@ -151,7 +151,7 @@ long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, switch ...@@ -151,7 +151,7 @@ long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames, switch
bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, numBytes); bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, numBytes);
numBytes -= bytesRead; numBytes -= bytesRead;
if (numBytes > 0) { if (numBytes > 0) {
if (switch_core_timer_check(timer) == SWITCH_STATUS_SUCCESS) { if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
PaUtil_FlushRingBuffer(&aStream->inFIFO); PaUtil_FlushRingBuffer(&aStream->inFIFO);
return 0; return 0;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论