Skip to content

F
freeswitch
提交 82d5e9c9 authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

tighten up media bug code 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7217 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 b9b66953
显示空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 59 行删除
src/mod/formats/mod_local_stream/mod_local_stream.c
浏览文件 @ 82d5e9c9
...@@ -411,7 +411,12 @@ static void launch_threads(void) ...@@ -411,7 +411,12 @@ static void launch_threads(void)
source->channels = (uint8_t)tmp; source->channels = (uint8_t)tmp;
} }
} else if (!strcasecmp(var, "interval")) { } else if (!strcasecmp(var, "interval")) {
source->interval = atoi(val); int tmp = atoi(val);
if (tmp >= 10) {
source->interval = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't set interval to less than 10\n");
}
} else if (!strcasecmp(var, "timer-name")) { } else if (!strcasecmp(var, "timer-name")) {
source->timer_name = switch_core_strdup(source->pool, val); source->timer_name = switch_core_strdup(source->pool, val);
} }
......
src/switch_buffer.c
浏览文件 @ 82d5e9c9
...@@ -252,7 +252,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const ...@@ -252,7 +252,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const
} }
*/ */
if (switch_test_flag(buffer, SWITCH_BUFFER_FLAG_DYNAMIC)) { if (switch_test_flag(buffer, SWITCH_BUFFER_FLAG_DYNAMIC)) {
if (freespace < datalen && (!buffer->max_len || (buffer->datalen + datalen <= buffer->max_len))) { if (freespace < datalen && (!buffer->max_len || (buffer->used + datalen <= buffer->max_len))) {
switch_size_t new_size, new_block_size; switch_size_t new_size, new_block_size;
new_size = buffer->datalen + datalen; new_size = buffer->datalen + datalen;
......
src/switch_core_media_bug.c
浏览文件 @ 82d5e9c9
...@@ -103,6 +103,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b ...@@ -103,6 +103,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b
maxlen = sizeof(data) > frame->buflen ? frame->buflen : sizeof(data); maxlen = sizeof(data) > frame->buflen ? frame->buflen : sizeof(data);
if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) { if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) {
rdlen = maxlen; rdlen = maxlen;
} }
...@@ -222,7 +224,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t ...@@ -222,7 +224,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
bug->user_data = user_data; bug->user_data = user_data;
bug->session = session; bug->session = session;
bug->flags = flags; bug->flags = flags;
bug->ready = 1;
bug->stop_time = stop_time; bug->stop_time = stop_time;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel));
bytes = session->read_codec->implementation->bytes_per_frame; bytes = session->read_codec->implementation->bytes_per_frame;
...@@ -231,7 +233,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t ...@@ -231,7 +233,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
bug->flags = (SMBF_READ_STREAM | SMBF_WRITE_STREAM); bug->flags = (SMBF_READ_STREAM | SMBF_WRITE_STREAM);
} }
if (switch_test_flag(bug, SMBF_READ_STREAM)) { if (switch_test_flag(bug, SMBF_READ_STREAM) || switch_test_flag(bug, SMBF_READ_PING)) {
switch_buffer_create_dynamic(&bug->raw_read_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_buffer_create_dynamic(&bug->raw_read_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER);
switch_mutex_init(&bug->read_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&bug->read_mutex, SWITCH_MUTEX_NESTED, session->pool);
} }
...@@ -242,7 +244,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t ...@@ -242,7 +244,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t
switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER);
switch_mutex_init(&bug->write_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&bug->write_mutex, SWITCH_MUTEX_NESTED, session->pool);
} }
bug->ready = 1;
switch_thread_rwlock_wrlock(session->bug_rwlock); switch_thread_rwlock_wrlock(session->bug_rwlock);
bug->next = session->bugs; bug->next = session->bugs;
session->bugs = bug; session->bugs = bug;
......
src/switch_ivr_async.c
浏览文件 @ 82d5e9c9
...@@ -411,7 +411,6 @@ struct eavesdrop_pvt { ...@@ -411,7 +411,6 @@ struct eavesdrop_pvt {
uint32_t flags; uint32_t flags;
}; };
static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
{ {
struct eavesdrop_pvt *ep = (struct eavesdrop_pvt *) user_data; struct eavesdrop_pvt *ep = (struct eavesdrop_pvt *) user_data;
...@@ -444,6 +443,7 @@ static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data ...@@ -444,6 +443,7 @@ static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data
case SWITCH_ABC_TYPE_READ_REPLACE: case SWITCH_ABC_TYPE_READ_REPLACE:
{ {
if (switch_test_flag(ep, ED_MUX_READ)) { if (switch_test_flag(ep, ED_MUX_READ)) {
switch_frame_t *rframe = switch_core_media_bug_get_read_replace_frame(bug); switch_frame_t *rframe = switch_core_media_bug_get_read_replace_frame(bug);
...@@ -498,7 +498,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -498,7 +498,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
switch_codec_t *read_codec = switch_core_session_get_read_codec(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session);
if ((tsession = switch_core_session_locate(uuid))) { if ((tsession = switch_core_session_locate(uuid))) {
struct eavesdrop_pvt ep = { 0 }; struct eavesdrop_pvt *ep;
switch_media_bug_t *bug = NULL; switch_media_bug_t *bug = NULL;
switch_channel_t *tchannel = switch_core_session_get_channel(tsession); switch_channel_t *tchannel = switch_core_session_get_channel(tsession);
switch_frame_t *read_frame, write_frame = { 0 }; switch_frame_t *read_frame, write_frame = { 0 };
...@@ -506,6 +506,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -506,6 +506,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
int16_t buf[1024]; int16_t buf[1024];
switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession);
ep = switch_core_session_alloc(session, sizeof(*ep));
switch_channel_pre_answer(channel); switch_channel_pre_answer(channel);
...@@ -527,21 +528,21 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -527,21 +528,21 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
write_frame.buflen = sizeof(buf); write_frame.buflen = sizeof(buf);
write_frame.rate = read_codec->implementation->actual_samples_per_second; write_frame.rate = read_codec->implementation->actual_samples_per_second;
ep.flags = flags; ep->flags = flags;
switch_mutex_init(&ep.mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); switch_mutex_init(&ep->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession));
switch_buffer_create_dynamic(&ep.buffer, 1024, 2048, 2048); switch_buffer_create_dynamic(&ep->buffer, 2048, 2048, 8192);
switch_buffer_add_mutex(ep.buffer, ep.mutex); switch_buffer_add_mutex(ep->buffer, ep->mutex);
switch_mutex_init(&ep.w_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); switch_mutex_init(&ep->w_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession));
switch_buffer_create_dynamic(&ep.w_buffer, 1024, 2048, 2048); switch_buffer_create_dynamic(&ep->w_buffer, 2048, 2048, 8192);
switch_buffer_add_mutex(ep.w_buffer, ep.w_mutex); switch_buffer_add_mutex(ep->w_buffer, ep->w_mutex);
switch_mutex_init(&ep.r_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); switch_mutex_init(&ep->r_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession));
switch_buffer_create_dynamic(&ep.r_buffer, 1024, 2048, 2048); switch_buffer_create_dynamic(&ep->r_buffer, 2048, 2048, 8192);
switch_buffer_add_mutex(ep.r_buffer, ep.r_mutex); switch_buffer_add_mutex(ep->r_buffer, ep->r_mutex);
if (switch_core_media_bug_add(tsession, eavesdrop_callback, &ep, 0, if (switch_core_media_bug_add(tsession, eavesdrop_callback, ep, 0,
SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING, SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING,
&bug) != SWITCH_STATUS_SUCCESS) { &bug) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n");
...@@ -552,6 +553,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -552,6 +553,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
uint32_t len = sizeof(buf); uint32_t len = sizeof(buf);
switch_event_t *event = NULL; switch_event_t *event = NULL;
char *fcommand = NULL; char *fcommand = NULL;
char db[2] = "";
status = switch_core_session_read_frame(session, &read_frame, 1000, 0); status = switch_core_session_read_frame(session, &read_frame, 1000, 0);
...@@ -570,7 +572,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -570,7 +572,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
if ((flags & ED_DTMF) && switch_channel_has_dtmf(channel)) { if ((flags & ED_DTMF) && switch_channel_has_dtmf(channel)) {
switch_dtmf_t dtmf = {0}; switch_dtmf_t dtmf = {0};
switch_channel_dequeue_dtmf(channel, &dtmf); switch_channel_dequeue_dtmf(channel, &dtmf);
*fcommand = dtmf.digit; db[0] = dtmf.digit;
fcommand = db;
} }
if (fcommand) { if (fcommand) {
...@@ -580,20 +583,20 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -580,20 +583,20 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
switch (*d) { switch (*d) {
case '1': case '1':
switch_set_flag((&ep), ED_MUX_READ); switch_set_flag(ep, ED_MUX_READ);
switch_clear_flag((&ep), ED_MUX_WRITE); switch_clear_flag(ep, ED_MUX_WRITE);
break; break;
case '2': case '2':
switch_set_flag((&ep), ED_MUX_WRITE); switch_set_flag(ep, ED_MUX_WRITE);
switch_clear_flag((&ep), ED_MUX_READ); switch_clear_flag(ep, ED_MUX_READ);
break; break;
case '3': case '3':
switch_set_flag((&ep), ED_MUX_READ); switch_set_flag(ep, ED_MUX_READ);
switch_set_flag((&ep), ED_MUX_WRITE); switch_set_flag(ep, ED_MUX_WRITE);
break; break;
case '0': case '0':
switch_clear_flag((&ep), ED_MUX_READ); switch_clear_flag(ep, ED_MUX_READ);
switch_clear_flag((&ep), ED_MUX_WRITE); switch_clear_flag(ep, ED_MUX_WRITE);
break; break;
default: default:
z = 0; z = 0;
...@@ -602,41 +605,48 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -602,41 +605,48 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
} }
if (z) { if (z) {
switch_buffer_lock(ep.r_buffer); if (ep->r_buffer) {
switch_buffer_zero(ep.r_buffer); switch_buffer_lock(ep->r_buffer);
switch_buffer_unlock(ep.r_buffer); switch_buffer_zero(ep->r_buffer);
switch_buffer_unlock(ep->r_buffer);
}
switch_buffer_lock(ep.w_buffer); if (ep->w_buffer) {
switch_buffer_zero(ep.w_buffer); switch_buffer_lock(ep->w_buffer);
switch_buffer_unlock(ep.w_buffer); switch_buffer_zero(ep->w_buffer);
switch_buffer_unlock(ep->w_buffer);
}
} }
} }
} }
if (!switch_test_flag(read_frame, SFF_CNG)) { if (!switch_test_flag(read_frame, SFF_CNG)) {
switch_buffer_lock(ep.r_buffer); switch_buffer_lock(ep->r_buffer);
switch_buffer_zwrite(ep.r_buffer, read_frame->data, read_frame->datalen); switch_buffer_zwrite(ep->r_buffer, read_frame->data, read_frame->datalen);
switch_buffer_unlock(ep.r_buffer); switch_buffer_unlock(ep->r_buffer);
switch_buffer_lock(ep.w_buffer); switch_buffer_lock(ep->w_buffer);
switch_buffer_zwrite(ep.w_buffer, read_frame->data, read_frame->datalen); switch_buffer_zwrite(ep->w_buffer, read_frame->data, read_frame->datalen);
switch_buffer_unlock(ep.w_buffer); switch_buffer_unlock(ep->w_buffer);
} }
if (len > tread_codec->implementation->samples_per_frame * 2) { if (len > tread_codec->implementation->bytes_per_frame) {
len = tread_codec->implementation->samples_per_frame * 2; len = tread_codec->implementation->bytes_per_frame;
} }
if (switch_buffer_inuse(ep.buffer) >= len) { if (switch_buffer_inuse(ep->buffer) >= len) {
switch_buffer_lock(ep.buffer); switch_buffer_lock(ep->buffer);
write_frame.datalen = (uint32_t)switch_buffer_read(ep.buffer, buf, len); while (switch_buffer_inuse(ep->buffer) >= len) {
write_frame.datalen = (uint32_t)switch_buffer_read(ep->buffer, buf, len);
write_frame.samples = write_frame.datalen / 2; write_frame.samples = write_frame.datalen / 2;
if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { if ((status = switch_core_session_write_frame(session, &write_frame, 1000, 0)) != SWITCH_STATUS_SUCCESS) {
goto end; break;
} }
switch_buffer_unlock(ep.buffer);
} }
switch_buffer_unlock(ep->buffer);
}
} }
...@@ -648,16 +658,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session ...@@ -648,16 +658,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
switch_core_media_bug_remove(tsession, &bug); switch_core_media_bug_remove(tsession, &bug);
} }
if (ep.buffer) { if (ep->buffer) {
switch_buffer_destroy(&ep.buffer); switch_buffer_destroy(&ep->buffer);
} }
if (ep.r_buffer) { if (ep->r_buffer) {
switch_buffer_destroy(&ep.r_buffer); switch_buffer_destroy(&ep->r_buffer);
} }
if (ep.w_buffer) { if (ep->w_buffer) {
switch_buffer_destroy(&ep.w_buffer); switch_buffer_destroy(&ep->w_buffer);
} }
switch_core_session_rwunlock(tsession); switch_core_session_rwunlock(tsession);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论