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

fix recording timing issue 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14128 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-07-03 21:55:50 +00:00
parent d85f73d1dd
commit 3f55e02c44
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_core_media_bug.c
View File

@ -104,7 +104,7 @@ SWITCH_DECLARE(void) switch_core_media_bug_flush(switch_media_bug_t *bug)
SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame, switch_bool_t fill) SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame, switch_bool_t fill)
{ {
switch_size_t bytes = 0, datalen = 0; switch_size_t bytes = 0, datalen = 0, ttl = 0;
int16_t *dp, *fp; int16_t *dp, *fp;
uint32_t x; uint32_t x;
size_t rlen = 0; size_t rlen = 0;
@ -126,11 +126,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel));
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
frame->flags = 0;
frame->datalen = 0; frame->datalen = 0;
switch_mutex_lock(bug->read_mutex); switch_mutex_lock(bug->read_mutex);
frame->datalen = (uint32_t) switch_buffer_read(bug->raw_read_buffer, frame->data, bytes); frame->datalen = (uint32_t) switch_buffer_read(bug->raw_read_buffer, frame->data, bytes);
ttl += frame->datalen;
if (fill && frame->datalen < bytes) { if (fill && frame->datalen < bytes) {
memset(((unsigned char *)frame->data) + frame->datalen, 0, bytes - frame->datalen); memset(((unsigned char *)frame->data) + frame->datalen, 0, bytes - frame->datalen);
frame->datalen = bytes; frame->datalen = bytes;
@ -141,6 +143,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
switch_assert(bug->raw_write_buffer); switch_assert(bug->raw_write_buffer);
switch_mutex_lock(bug->write_mutex); switch_mutex_lock(bug->write_mutex);
datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes); datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes);
ttl += datalen;
if (fill && datalen < bytes) { if (fill && datalen < bytes) {
memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen); memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen);
datalen = bytes; datalen = bytes;
@ -192,6 +195,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
} }
} }
if (!ttl) {
switch_set_flag(frame, SFF_CNG);
}
frame->datalen = bytes; frame->datalen = bytes;
frame->samples = bytes / sizeof(int16_t); frame->samples = bytes / sizeof(int16_t);
frame->rate = read_impl.actual_samples_per_second; frame->rate = read_impl.actual_samples_per_second;

5
src/switch_ivr_async.c
View File

@ -486,11 +486,12 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
if (switch_channel_test_flag(channel, CF_ANSWERED) || !switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) { if (switch_channel_test_flag(channel, CF_ANSWERED) || !switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) {
int loops = LEAD_IN;
while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && frame.datalen) { while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && frame.datalen) {
len = (switch_size_t) frame.datalen / 2; len = (switch_size_t) frame.datalen / 2;
switch_core_file_write(rh->fh, data, &len); switch_core_file_write(rh->fh, data, &len);
if (!--loops) break; if (switch_test_flag((&frame), SFF_CNG)) {
break;
}
} }
} }
rh->lead_in = LEAD_IN; rh->lead_in = LEAD_IN;