kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

fix MODAPP-49

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6187 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-11-08 15:47:19 +00:00
parent e4e4f007c5
commit 6f3c88e3ef
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/switch_ivr_originate.c
View File

@ -719,25 +719,23 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
/* read from the channel while we wait if the audio is up on it */ /* read from the channel while we wait if the audio is up on it */
if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)) && if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)) &&
(switch_channel_test_flag(caller_channel, CF_ANSWERED) (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) {
|| switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) {
switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0);
if (!SWITCH_READ_ACCEPTABLE(status)) { if (!SWITCH_READ_ACCEPTABLE(status)) {
break; break;
} }
if (ring_ready && read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) if (ring_ready && read_frame && !pass) {
&& read_frame->datalen > 1) {
if (ringback.fh) { if (ringback.fh) {
uint8_t abuf[1024]; uint8_t abuf[1024];
switch_size_t mlen, olen; switch_size_t mlen, olen;
unsigned int pos = 0; unsigned int pos = 0;
if (ringback.asis) { if (ringback.asis) {
mlen = read_frame->datalen; mlen = write_frame.codec->implementation->encoded_bytes_per_frame;
} else { } else {
mlen = read_frame->datalen / 2; mlen = write_frame.codec->implementation->samples_per_frame;
} }
olen = mlen; olen = mlen;
@ -754,9 +752,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
write_frame.data = abuf; write_frame.data = abuf;
write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2); write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2);
if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) {
break;
}
} else if (ringback.audio_buffer) { } else if (ringback.audio_buffer) {
if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(ringback.audio_buffer, if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(ringback.audio_buffer,
write_frame.data, write_frame.data,
@ -764,7 +759,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
break; break;
} }
} }
if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) {
break; break;
} }