fix playback_ms and record_ms to work right and add playback_seconds and record_seconds

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15155 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-10-13 22:29:20 +00:00
parent f70d980a9d
commit 1fd13eeb5e
3 changed files with 20 additions and 5 deletions

View File

@ -469,6 +469,8 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, name);
caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, number);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Update Callee ID to \"%s\" <%s>\n", name, number);
if (send) {
sofia_send_callee_id(session, NULL, NULL);
}

View File

@ -498,9 +498,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh)
if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) {
if (!asis) blen /= 2;
if (fh->channels > 1) blen /= fh->channels;
if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) {
break;
}
fh->samples_out += blen;
}
}
}

View File

@ -715,10 +715,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *se
switch_core_codec_destroy(&write_codec);
}
switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_in / read_impl.samples_per_second);
switch_channel_set_variable_printf(channel, "record_samples", "%d", fh->samples_in);
switch_core_file_close(fh);
if (read_impl.samples_per_second) {
switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / read_impl.samples_per_second);
switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (read_impl.samples_per_second / 1000));
}
switch_channel_set_variable_printf(channel, "record_samples", "%d", fh->samples_out);
switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
return status;
}
@ -1425,7 +1431,12 @@ 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\n");
if (read_impl.samples_per_second) switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_out / read_impl.samples_per_second);
if (read_impl.samples_per_second) {
switch_channel_set_variable_printf(channel, "playback_seconds",
"%d", fh->samples_out / read_impl.samples_per_second);
switch_channel_set_variable_printf(channel, "playback_ms",
"%d", fh->samples_out / (read_impl.samples_per_second / 1000) );
}
switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_out);
switch_core_file_close(fh);