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

FS-5242

Browse Source
This commit is contained in:
Anthony Minessale 2013-03-29 10:54:45 -05:00
parent 47e6dfbbdf
commit c0f736c9da
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/formats/mod_shout/mod_shout.c
View File

@ -882,7 +882,7 @@ static switch_status_t shout_file_close(switch_file_handle_t *handle)
static switch_status_t shout_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence) static switch_status_t shout_file_seek(switch_file_handle_t *handle, unsigned int *cur_sample, int64_t samples, int whence)
{ {
shout_context_t *context = handle->private_info; shout_context_t *context = handle->private_info;
if (handle->handler || switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { if (handle->handler || switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} else { } else {

12
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -1217,7 +1217,7 @@ static switch_status_t js_stream_input_callback(switch_core_session_t *session,
switch_status_t status; switch_status_t status;
struct input_callback_state *cb_state = buf; struct input_callback_state *cb_state = buf;
switch_file_handle_t *fh = cb_state->extra; switch_file_handle_t *fh = cb_state->extra;
struct js_session *jss = cb_state->session_state; //struct js_session *jss = cb_state->session_state;
if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -1285,11 +1285,11 @@ static switch_status_t js_stream_input_callback(switch_core_session_t *session,
switch_core_file_seek(fh, &pos, 0, SEEK_SET); switch_core_file_seek(fh, &pos, 0, SEEK_SET);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} else if (!strncasecmp(ret, "seek", 4)) { } else if (!strncasecmp(ret, "seek", 4)) {
switch_codec_t *codec; //switch_codec_t *codec;
uint32_t samps = 0; uint32_t samps = 0;
uint32_t pos = 0; uint32_t pos = 0;
char *p; char *p;
codec = switch_core_session_get_read_codec(jss->session); //codec = switch_core_session_get_read_codec(jss->session);
if ((p = strchr(ret, ':'))) { if ((p = strchr(ret, ':'))) {
p++; p++;
@ -1299,14 +1299,14 @@ static switch_status_t js_stream_input_callback(switch_core_session_t *session,
step = 1000; step = 1000;
} }
if (step > 0) { if (step > 0) {
samps = step * (codec->implementation->actual_samples_per_second / 1000); samps = step * (fh->samplerate / 1000);
switch_core_file_seek(fh, &pos, samps, SEEK_CUR); switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
} else { } else {
samps = abs(step) * (codec->implementation->actual_samples_per_second / 1000); samps = abs(step) * (fh->samplerate / 1000);
switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET);
} }
} else { } else {
samps = atoi(p) * (codec->implementation->actual_samples_per_second / 1000); samps = atoi(p) * (fh->samplerate / 1000);
switch_core_file_seek(fh, &pos, samps, SEEK_SET); switch_core_file_seek(fh, &pos, samps, SEEK_SET);
} }
} }

8
src/switch_ivr.c
View File

@ -3366,11 +3366,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *ses
switch_core_file_seek(fhp, &pos, 0, SEEK_SET); switch_core_file_seek(fhp, &pos, 0, SEEK_SET);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} else if (!strncasecmp(cmd, "seek", 4)) { } else if (!strncasecmp(cmd, "seek", 4)) {
switch_codec_t *codec; //switch_codec_t *codec;
unsigned int samps = 0; unsigned int samps = 0;
unsigned int pos = 0; unsigned int pos = 0;
char *p; char *p;
codec = switch_core_session_get_read_codec(session); //codec = switch_core_session_get_read_codec(session);
if ((p = strchr(cmd, ':'))) { if ((p = strchr(cmd, ':'))) {
p++; p++;
@ -3381,7 +3381,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *ses
step = 1000; step = 1000;
} }
samps = step * (codec->implementation->samples_per_second / 1000); samps = step * (fhp->samplerate / 1000);
target = (int32_t)fhp->pos + samps; target = (int32_t)fhp->pos + samps;
if (target < 0) { if (target < 0) {
@ -3392,7 +3392,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *ses
switch_core_file_seek(fhp, &pos, target, SEEK_SET); switch_core_file_seek(fhp, &pos, target, SEEK_SET);
} else { } else {
samps = switch_atoui(p) * (codec->implementation->samples_per_second / 1000); samps = switch_atoui(p) * (fhp->samplerate / 1000);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", samps); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", samps);
switch_core_file_seek(fhp, &pos, samps, SEEK_SET); switch_core_file_seek(fhp, &pos, samps, SEEK_SET);
} }

8
src/switch_ivr_play_say.c
View File

@ -797,8 +797,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
} }
if (read_impl.actual_samples_per_second) { if (read_impl.actual_samples_per_second) {
switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / read_impl.actual_samples_per_second); switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / fh->samplerate);
switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (read_impl.actual_samples_per_second / 1000)); switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (fh->samplerate/ 1000));
} }
@ -1693,8 +1693,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done playing file %s\n", file); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done playing file %s\n", file);
if (read_impl.samples_per_second) { if (read_impl.samples_per_second) {
switch_channel_set_variable_printf(channel, "playback_seconds", "%d", fh->samples_in / read_impl.samples_per_second); switch_channel_set_variable_printf(channel, "playback_seconds", "%d", fh->samples_in / fh->samplerate);
switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_in / (read_impl.samples_per_second / 1000)); switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_in / fh->samplerate);
} }
switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_in); switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_in);