[Freeswitch-svn] [commit] r13011 - in freeswitch/trunk/src: . include mod/endpoints/mod_loopback
FreeSWITCH SVN
anthm at freeswitch.org
Mon Apr 13 11:35:26 PDT 2009
Author: anthm
Date: Mon Apr 13 13:35:26 2009
New Revision: 13011
Log:
clone frames in loopback so we can smooth it out better, now with more memory usage (tm) maybe this will curb pepople from using it like candy
Modified:
freeswitch/trunk/src/include/switch_types.h
freeswitch/trunk/src/include/switch_utils.h
freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c
freeswitch/trunk/src/switch_utils.c
Modified: freeswitch/trunk/src/include/switch_types.h
==============================================================================
--- freeswitch/trunk/src/include/switch_types.h (original)
+++ freeswitch/trunk/src/include/switch_types.h Mon Apr 13 13:35:26 2009
@@ -896,6 +896,7 @@
SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header
SFF_PLC = (1 << 3) - Frame has generated PLC data
SFF_RFC2833 = (1 << 4) - Frame has rfc2833 dtmf data
+SFF_DYNAMIC = (1 << 5) - Frame is dynamic and should be freed
</pre>
*/
typedef enum {
@@ -905,7 +906,8 @@
SFF_RTP_HEADER = (1 << 2),
SFF_PLC = (1 << 3),
SFF_RFC2833 = (1 << 4),
- SFF_PROXY_PACKET = (1 << 5)
+ SFF_PROXY_PACKET = (1 << 5),
+ SFF_DYNAMIC = (1 << 6)
} switch_frame_flag_enum_t;
typedef uint32_t switch_frame_flag_t;
Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h (original)
+++ freeswitch/trunk/src/include/switch_utils.h Mon Apr 13 13:35:26 2009
@@ -109,6 +109,10 @@
SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len);
+SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size);
+SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_frame_t **clone);
+SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame);
+
/*!
\brief Evaluate the truthfullness of a string expression
\param expr a string expression
Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Apr 13 13:35:26 2009
@@ -69,7 +69,7 @@
unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
switch_frame_t *x_write_frame;
- switch_frame_t write_frame;
+ switch_frame_t *write_frame;
unsigned char write_databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
switch_frame_t cng_frame;
@@ -78,6 +78,7 @@
switch_caller_profile_t *caller_profile;
int32_t bowout_frame_count;
char *other_uuid;
+ switch_queue_t *frame_queue;
};
typedef struct private_object private_t;
@@ -157,10 +158,6 @@
tech_pvt->read_frame.data = tech_pvt->databuf;
tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
-
- tech_pvt->write_frame.data = tech_pvt->write_databuf;
- tech_pvt->write_frame.buflen = sizeof(tech_pvt->write_databuf);
- tech_pvt->write_frame.codec = &tech_pvt->write_codec;
tech_pvt->cng_frame.data = tech_pvt->cng_databuf;
@@ -190,6 +187,7 @@
switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
switch_core_session_set_private(session, tech_pvt);
+ switch_queue_create(&tech_pvt->frame_queue, 50000, switch_core_session_get_pool(session));
tech_pvt->session = session;
tech_pvt->channel = switch_core_session_get_channel(session);
}
@@ -348,6 +346,7 @@
{
switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL;
+ void *pop;
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
@@ -364,6 +363,15 @@
if (switch_core_codec_ready(&tech_pvt->write_codec)) {
switch_core_codec_destroy(&tech_pvt->write_codec);
}
+
+ if (tech_pvt->write_frame) {
+ switch_frame_free(&tech_pvt->write_frame);
+ }
+
+ while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+ switch_frame_t *frame = (switch_frame_t *) pop;
+ switch_frame_free(&frame);
+ }
}
@@ -518,6 +526,7 @@
private_t *tech_pvt = NULL;
switch_status_t status = SWITCH_STATUS_FALSE;
switch_mutex_t *mutex = NULL;
+ void *pop = NULL;
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
@@ -539,18 +548,19 @@
goto end;
}
- if (!switch_test_flag(tech_pvt, TFLAG_CNG) && !switch_test_flag(tech_pvt, TFLAG_WRITE)) {
- switch_core_timer_next(&tech_pvt->timer);
- }
- if (switch_test_flag(tech_pvt, TFLAG_WRITE)) {
- *frame = &tech_pvt->write_frame;
- switch_clear_flag_locked(tech_pvt, TFLAG_WRITE);
- switch_clear_flag_locked(tech_pvt, TFLAG_CNG);
+ switch_core_timer_next(&tech_pvt->timer);
+ if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+ if (tech_pvt->write_frame) {
+ switch_frame_free(&tech_pvt->write_frame);
+ }
+ tech_pvt->write_frame = (switch_frame_t *) pop;
+ tech_pvt->write_frame->codec = &tech_pvt->read_codec;
+ *frame = tech_pvt->write_frame;
} else {
switch_set_flag(tech_pvt, TFLAG_CNG);
}
-
+
if (switch_test_flag(tech_pvt, TFLAG_CNG)) {
*frame = &tech_pvt->cng_frame;
tech_pvt->cng_frame.codec = &tech_pvt->read_codec;
@@ -622,17 +632,18 @@
}
if (switch_test_flag(tech_pvt, TFLAG_LINKED)) {
+ switch_frame_t *clone;
if (frame->codec->implementation != tech_pvt->write_codec.implementation) {
/* change codecs to match */
tech_init(tech_pvt, session, frame->codec);
tech_init(tech_pvt->other_tech_pvt, tech_pvt->other_session, frame->codec);
}
+
+ if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) {
+ abort();
+ }
- memcpy(&tech_pvt->other_tech_pvt->write_frame, frame, sizeof(*frame));
- tech_pvt->other_tech_pvt->write_frame.data = tech_pvt->other_tech_pvt->write_databuf;
- tech_pvt->other_tech_pvt->write_frame.buflen = sizeof(tech_pvt->other_tech_pvt->write_databuf);
- //tech_pvt->other_tech_pvt->write_frame.codec = &tech_pvt->other_tech_pvt->write_codec;
- memcpy(tech_pvt->other_tech_pvt->write_frame.data, frame->data, frame->datalen);
+ switch_queue_push(tech_pvt->other_tech_pvt->frame_queue, clone);
switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
status = SWITCH_STATUS_SUCCESS;
}
Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c (original)
+++ freeswitch/trunk/src/switch_utils.c Mon Apr 13 13:35:26 2009
@@ -61,6 +61,56 @@
}
#endif
+
+SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size)
+{
+ switch_frame_t *new_frame;
+
+ switch_zmalloc(new_frame, sizeof(*new_frame));
+
+ switch_set_flag(new_frame, SFF_DYNAMIC);
+ new_frame->buflen = size;
+ new_frame->data = malloc(size);
+ switch_assert(new_frame->data);
+
+ *frame = new_frame;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_frame_t **clone)
+{
+ switch_frame_t *new_frame;
+
+ new_frame = malloc(sizeof(*new_frame));
+
+ *new_frame = *orig;
+ switch_set_flag(new_frame, SFF_DYNAMIC);
+ new_frame->data = malloc(new_frame->buflen);
+ switch_assert(new_frame->data);
+
+ memcpy(new_frame->data, orig->data, orig->datalen);
+ new_frame->codec = NULL;
+
+ *clone = new_frame;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame)
+{
+ if (!frame || !*frame || !switch_test_flag((*frame), SFF_DYNAMIC)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
+ free((*frame)->data);
+ free(*frame);
+ *frame = NULL;
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, switch_bool_t default_type, switch_memory_pool_t *pool)
{
switch_network_list_t *new_list;
More information about the Freeswitch-svn
mailing list