retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-5242

This commit is contained in:
Anthony Minessale 2013-05-21 10:03:22 -05:00
parent 0cee5ac9df
commit 8ac3178e45
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1300,14 +1300,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 * (fh->samplerate / 1000); samps = step * (fh->native_rate / 1000);
switch_core_file_seek(fh, &pos, samps, SEEK_CUR); switch_core_file_seek(fh, &pos, samps, SEEK_CUR);
} else { } else {
samps = abs(step) * (fh->samplerate / 1000); samps = abs(step) * (fh->native_rate / 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) * (fh->samplerate / 1000); samps = atoi(p) * (fh->native_rate / 1000);
switch_core_file_seek(fh, &pos, samps, SEEK_SET); switch_core_file_seek(fh, &pos, samps, SEEK_SET);
} }
} }

4
src/switch_ivr.c
View File

@ -3384,7 +3384,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *ses
step = 1000; step = 1000;
} }
samps = step * (fhp->samplerate / 1000); samps = step * (fhp->native_rate / 1000);
target = (int32_t)fhp->pos + samps; target = (int32_t)fhp->pos + samps;
if (target < 0) { if (target < 0) {
@ -3395,7 +3395,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) * (fhp->samplerate / 1000); samps = switch_atoui(p) * (fhp->native_rate / 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 / fh->samplerate); switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / fh->native_rate);
switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (fh->samplerate/ 1000)); switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (fh->native_rate/ 1000));
} }
@ -1694,8 +1694,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 / fh->samplerate); switch_channel_set_variable_printf(channel, "playback_seconds", "%d", fh->samples_in / fh->native_rate);
switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_in / fh->samplerate); switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_in / fh->native_rate);
} }
switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_in); switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_in);