From 78c058423b2095195a4bcbedd8c31b3362a520c3 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 12 Mar 2007 20:17:34 +0000 Subject: [PATCH] tweaks to file buffering git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4575 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_types.h | 6 ++++-- src/switch_channel.c | 11 ++++++----- src/switch_core.c | 2 ++ src/switch_ivr.c | 6 ++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 12b71ee494..3a545ff68e 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -730,7 +730,8 @@ SWITCH_FILE_DATA_FLOAT = (1 << 5) - Read data in floats SWITCH_FILE_DATA_DOUBLE = (1 << 6) - Read data in doubles SWITCH_FILE_DATA_RAW = (1 << 7) - Read data as is SWITCH_FILE_PAUSE = (1 << 8) - Pause -SWITCH_FILE_NATIVE = (1 << 8) - File is in native format (no transcoding) +SWITCH_FILE_NATIVE = (1 << 9) - File is in native format (no transcoding) +SWITCH_FILE_SEEK = (1 << 10) - File has done a seek */ typedef enum { @@ -743,7 +744,8 @@ typedef enum { SWITCH_FILE_DATA_DOUBLE = (1 << 6), SWITCH_FILE_DATA_RAW = (1 << 7), SWITCH_FILE_PAUSE = (1 << 8), - SWITCH_FILE_NATIVE = (1 << 9) + SWITCH_FILE_NATIVE = (1 << 9), + SWITCH_FILE_SEEK = (1 << 10) } switch_file_flag_t; typedef enum { diff --git a/src/switch_channel.c b/src/switch_channel.c index db49b557ac..ebd0baff39 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -432,7 +432,8 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_state(switch_channel_t SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel) { assert(channel != NULL); - return (channel->state > CS_RING && channel->state < CS_HANGUP && !switch_test_flag(channel, CF_TRANSFER)) ? 1 : 0; + + return (!channel->hangup_cause && channel->state > CS_RING && channel->state < CS_HANGUP && !switch_test_flag(channel, CF_TRANSFER)) ? 1 : 0; } static const char *state_names[] = { @@ -1059,7 +1060,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel assert(channel != NULL); - if (channel->state >= CS_HANGUP) { + if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; } @@ -1093,7 +1094,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ring_ready(switch_channel assert(channel != NULL); - if (channel->state >= CS_HANGUP) { + if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; } @@ -1127,7 +1128,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan assert(channel != NULL); - if (channel->state >= CS_HANGUP) { + if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; } @@ -1169,7 +1170,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t * { assert(channel != NULL); - if (channel->state >= CS_HANGUP) { + if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; } diff --git a/src/switch_core.c b/src/switch_core.c index a96ef469b3..d8d6f2f035 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -1070,6 +1070,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, int whence) { assert(fh != NULL); + + switch_set_flag(fh, SWITCH_FILE_SEEK); return fh->file_interface->file_seek(fh, cur_pos, samples, whence); } diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 514b33ccb1..c1c7b8e763 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -1377,6 +1377,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess switch_buffer_zero(fh->audio_buffer); } + if (switch_test_flag(fh, SWITCH_FILE_SEEK)) { + /* file position has changed flush the buffer */ + switch_buffer_zero(fh->audio_buffer); + switch_clear_flag(fh, SWITCH_FILE_SEEK); + } + if (!asis && fh->speed && do_speed) { float factor = 0.25f * abs(fh->speed);