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

FS-8378: refactor a bit to clarify code and get better debug in gdb

This commit is contained in:
Mike Jerris 2015-10-22 12:57:19 -05:00 committed by Brian West
parent 39f6d107ac
commit 1968453e32
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/switch_utils.c
View File

@ -146,6 +146,7 @@ static switch_frame_t *find_free_frame(switch_frame_buffer_t *fb, switch_frame_t
if (orig->packet) { if (orig->packet) {
np->frame->packet = switch_core_alloc(fb->pool, SWITCH_RTP_MAX_BUF_LEN); np->frame->packet = switch_core_alloc(fb->pool, SWITCH_RTP_MAX_BUF_LEN);
} else { } else {
np->frame->packet = NULL;
np->frame->data = switch_core_alloc(fb->pool, SWITCH_RTP_MAX_BUF_LEN); np->frame->data = switch_core_alloc(fb->pool, SWITCH_RTP_MAX_BUF_LEN);
np->frame->buflen = SWITCH_RTP_MAX_BUF_LEN; np->frame->buflen = SWITCH_RTP_MAX_BUF_LEN;
} }
@ -174,6 +175,7 @@ static switch_frame_t *find_free_frame(switch_frame_buffer_t *fb, switch_frame_t
np->frame->data = ((unsigned char *)np->frame->packet) + 12; np->frame->data = ((unsigned char *)np->frame->packet) + 12;
np->frame->datalen = orig->datalen; np->frame->datalen = orig->datalen;
} else { } else {
np->frame->packet = NULL;
np->frame->packetlen = 0; np->frame->packetlen = 0;
memcpy(np->frame->data, orig->data, orig->datalen); memcpy(np->frame->data, orig->data, orig->datalen);
np->frame->datalen = orig->datalen; np->frame->datalen = orig->datalen;
@ -285,6 +287,7 @@ SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_fr
memcpy(new_frame->packet, orig->packet, orig->packetlen); memcpy(new_frame->packet, orig->packet, orig->packetlen);
new_frame->data = ((unsigned char *)new_frame->packet) + 12; new_frame->data = ((unsigned char *)new_frame->packet) + 12;
} else { } else {
new_frame->packet = NULL;
new_frame->data = malloc(new_frame->buflen); new_frame->data = malloc(new_frame->buflen);
switch_assert(new_frame->data); switch_assert(new_frame->data);
memcpy(new_frame->data, orig->data, orig->datalen); memcpy(new_frame->data, orig->data, orig->datalen);
@ -304,24 +307,32 @@ SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_fr
SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame) SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame)
{ {
if (!frame || !*frame || !switch_test_flag((*frame), SFF_DYNAMIC)) { switch_frame_t * f;
if (!frame) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if ((*frame)->img) { f = *frame;
switch_img_free(&(*frame)->img);
if (!f || !switch_test_flag(f, SFF_DYNAMIC)) {
return SWITCH_STATUS_FALSE;
} }
if ((*frame)->packet) {
free((*frame)->packet);
(*frame)->packet = NULL;
} else {
switch_safe_free((*frame)->data);
}
free(*frame);
*frame = NULL; *frame = NULL;
if (f->img) {
switch_img_free(&(f->img));
}
if (f->packet) {
switch_safe_free(f->packet);
} else {
switch_safe_free(f->data);
}
free(f);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }