kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

tweaks to file buffering

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4575 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-12 20:17:34 +00:00
parent 82be2101db
commit 78c058423b
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/switch_types.h
View File

@ -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_DOUBLE = (1 << 6) - Read data in doubles
SWITCH_FILE_DATA_RAW = (1 << 7) - Read data as is SWITCH_FILE_DATA_RAW = (1 << 7) - Read data as is
SWITCH_FILE_PAUSE = (1 << 8) - Pause 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
</pre> </pre>
*/ */
typedef enum { typedef enum {
@ -743,7 +744,8 @@ typedef enum {
SWITCH_FILE_DATA_DOUBLE = (1 << 6), SWITCH_FILE_DATA_DOUBLE = (1 << 6),
SWITCH_FILE_DATA_RAW = (1 << 7), SWITCH_FILE_DATA_RAW = (1 << 7),
SWITCH_FILE_PAUSE = (1 << 8), SWITCH_FILE_PAUSE = (1 << 8),
SWITCH_FILE_NATIVE = (1 << 9) SWITCH_FILE_NATIVE = (1 << 9),
SWITCH_FILE_SEEK = (1 << 10)
} switch_file_flag_t; } switch_file_flag_t;
typedef enum { typedef enum {

11
src/switch_channel.c
View File

@ -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) SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel)
{ {
assert(channel != NULL); 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[] = { static const char *state_names[] = {
@ -1059,7 +1060,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
assert(channel != NULL); assert(channel != NULL);
if (channel->state >= CS_HANGUP) { if (channel->hangup_cause || channel->state >= CS_HANGUP) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1093,7 +1094,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_ring_ready(switch_channel
assert(channel != NULL); assert(channel != NULL);
if (channel->state >= CS_HANGUP) { if (channel->hangup_cause || channel->state >= CS_HANGUP) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1127,7 +1128,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
assert(channel != NULL); assert(channel != NULL);
if (channel->state >= CS_HANGUP) { if (channel->hangup_cause || channel->state >= CS_HANGUP) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1169,7 +1170,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *
{ {
assert(channel != NULL); assert(channel != NULL);
if (channel->state >= CS_HANGUP) { if (channel->hangup_cause || channel->state >= CS_HANGUP) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }

2
src/switch_core.c
View File

@ -1070,6 +1070,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh,
int whence) int whence)
{ {
assert(fh != NULL); assert(fh != NULL);
switch_set_flag(fh, SWITCH_FILE_SEEK);
return fh->file_interface->file_seek(fh, cur_pos, samples, whence); return fh->file_interface->file_seek(fh, cur_pos, samples, whence);
} }

6
src/switch_ivr.c
View File

@ -1377,6 +1377,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
switch_buffer_zero(fh->audio_buffer); 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) { if (!asis && fh->speed && do_speed) {
float factor = 0.25f * abs(fh->speed); float factor = 0.25f * abs(fh->speed);