kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nobody saw this coming, I bet.

Browse Source 
jitterbuffer!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
North Antara
2006-06-01 04:35:00 +00:00
parent a8c1284633
commit e25c4621b4
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
channels/chan_skinny.c
View File

@@ -69,6 +69,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
#include "asterisk/dsp.h"
#include "asterisk/stringfields.h"
#include "asterisk/abstract_jb.h"
/*************************************
* Skinny/Asterisk Protocol Settings *
@@ -116,6 +117,15 @@ typedef unsigned int UINT32;
#define htoles(x) __bswap_16(x)
#endif
/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
.impl = ""
};
static struct ast_jb_conf global_jbconf;
/*********************
* Protocol Messages *
@@ -816,6 +826,8 @@ struct skinny_subchannel {
int nat;
int outgoing;
int alreadygone;
struct ast_jb_conf jbconf;
struct skinny_subchannel *next;
};
@@ -1603,6 +1615,10 @@ static struct skinny_device *build_device(char *cat, struct ast_variable *v)
callnums++;
sub->cxmode = SKINNY_CX_INACTIVE;
sub->nat = nat;
/* Assign default jb conf to the new skinny_subchannel */
memcpy(&sub->jbconf, &global_jbconf, sizeof(struct ast_jb_conf));
sub->next = l->sub;
l->sub = sub;
} else {
@@ -2292,6 +2308,10 @@ static struct ast_channel *skinny_new(struct skinny_subchannel *sub, int state)
tmp = NULL;
}
}
/* Configure the new channel jb */
if (tmp && sub && sub->rtp)
ast_jb_configure(tmp, &sub->jbconf);
} else {
ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
}
@@ -3094,10 +3114,21 @@ static int reload_config(void)
ast_log(LOG_NOTICE, "Unable to load config %s, Skinny disabled\n", config);
return 0;
}
/* load the general section */
memset(&bindaddr, 0, sizeof(bindaddr));
/* Copy the default jb config over global_jbconf */
memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
/* load the general section */
v = ast_variable_browse(cfg, "general");
while(v) {
/* handle jb conf */
if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
{
v = v->next;
continue;
}
/* Create the interface list */
if (!strcasecmp(v->name, "bindaddr")) {
if (!(hp = ast_gethostbyname(v->value, &ahp))) {