kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FSCORE-339 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12682 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-03-20 13:58:45 +00:00
parent b6660ec721
commit c2692bf05a
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_module_interfaces.h
View File

@ -317,7 +317,8 @@ struct switch_file_handle {
uint32_t thresh; uint32_t thresh;
uint32_t silence_hits; uint32_t silence_hits;
uint32_t offset_pos; uint32_t offset_pos;
//uint32_t last_pos; switch_size_t samples_in;
switch_size_t samples_out;
int32_t vol; int32_t vol;
switch_audio_resampler_t *resampler; switch_audio_resampler_t *resampler;
switch_buffer_t *buffer; switch_buffer_t *buffer;

10
src/switch_core_file.c
View File

@ -177,6 +177,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) { if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) {
switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE); switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE);
} else { } else {
fh->samples_in += rlen;
if (fh->channels > 1) { if (fh->channels > 1) {
switch_mux_channels((int16_t *)fh->pre_buffer_data, rlen, fh->channels); switch_mux_channels((int16_t *)fh->pre_buffer_data, rlen, fh->channels);
} }
@ -202,6 +203,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
goto top; goto top;
} }
fh->samples_in += *len;
if (fh->channels > 1) { if (fh->channels > 1) {
switch_mux_channels((int16_t *)data, *len, fh->channels); switch_mux_channels((int16_t *)data, *len, fh->channels);
} }
@ -317,11 +320,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh,
if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) {
*len = 0; *len = 0;
} }
fh->samples_out += blen;
} }
return status; return status;
} else { } else {
return fh->file_interface->file_write(fh, data, len); switch_status_t status;
if ((status = fh->file_interface->file_write(fh, data, len)) == SWITCH_STATUS_SUCCESS) {
fh->samples_out += *len;
}
return status;
} }
} }

11
src/switch_ivr_async.c
View File

@ -439,12 +439,23 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
case SWITCH_ABC_TYPE_INIT: case SWITCH_ABC_TYPE_INIT:
break; break;
case SWITCH_ABC_TYPE_CLOSE: case SWITCH_ABC_TYPE_CLOSE:
{
switch_codec_implementation_t read_impl = {0};
switch_core_session_get_read_impl(session, &read_impl);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file);
switch_channel_set_private(channel, rh->file, NULL); switch_channel_set_private(channel, rh->file, NULL);
if (rh->fh) { if (rh->fh) {
switch_core_file_close(rh->fh); switch_core_file_close(rh->fh);
} }
if (rh->fh->samples_out < read_impl.samples_per_second * 3) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
switch_file_remove(rh->file, switch_core_session_get_pool(session));
}
}
break; break;
case SWITCH_ABC_TYPE_READ_PING: case SWITCH_ABC_TYPE_READ_PING:
if (rh->fh) { if (rh->fh) {