update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2554 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/codec/lpc10/Makefile.am b/libs/codec/lpc10/Makefile.am
index c0db44433e67717e514d4fa70917d3bba390b014..052876cfd7c0dcf8e41d904dfc286ff448bc36ab 100644 (file)
--- a/libs/codec/lpc10/Makefile.am
+++ b/libs/codec/lpc10/Makefile.am
@@ -2,24 +2,20 @@ EXTRA_DIST =
 SUBDIRS = 
 AUTOMAKE_OPTS= gnu
 MAKE=gmake
-NAME=liblpc10
+NAME=libg7xx
 
 AM_CC=gcc
 AM_CFLAGS      = -Wall -O3 -funroll-loops
 AM_CPPFLAGS = $(AM_CFLAGS)
 
-lib_LTLIBRARIES                = liblpc10.la
-liblpc10_la_SOURCES    = analys.c  dcbias.c  difmag.c  energy.c  hp100.c   ivfilt.c  lpcini.c  mload.c   placea.c  prepro.c  synths.c  vparms.c \
-bsynz.c   decode.c  dyptrk.c  f2clib.c  invert.c  lpcdec.c  lpfilt.c  onset.c   placev.c  random.c  tbdm.c \
-chanwr.c  deemp.c   encode.c  ham84.c   irc2pc.c  lpcenc.c  median.c  pitsyn.c  preemp.c  rcchk.c   voicin.c 
+lib_LTLIBRARIES                = libg7xx.la
+libg7xx_la_SOURCES     = g711.c g722_deode.c  g722_encode.c  g726.c  
 
+libg7xx_la_CFLAGS      = $(AM_CFLAGS)
+libg7xx_la_LDFLAGS     = 
 
-
-liblpc10_la_CFLAGS     = $(AM_CFLAGS)
-liblpc10_la_LDFLAGS    = 
-
-library_includedir     = $(prefix)/include/lpc10
-library_include_HEADERS =  f2c.h  lpc10.h
+library_includedir     = $(prefix)/include/g7xx
+library_include_HEADERS =  g726.h g711.h  g722.h
 
 
 

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 4e7fb9a23357f602346840ddabf73991c4cc84ad..56a33d26638079096c3a39e4788ef0e615d32848 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -283,17 +283,13 @@ static int activate_rtp(struct private_object *tech_pvt)
 {
        switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session);
        const char *err;
-       int ms = 20;
+       int ms = 0;
        switch_rtp_flag_t flags;
 
        if (switch_rtp_ready(tech_pvt->rtp_session)) {
                return 1;
        }
 
-       if (!strncasecmp(tech_pvt->codec_name, "ilbc", 4)) {
-               ms = 30;
-       }
-
        if (switch_core_codec_init(&tech_pvt->read_codec,
                                                           tech_pvt->codec_name,
                                                           tech_pvt->codec_rate,
@@ -1693,6 +1689,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
                                                if (!strncasecmp(name, "ilbc", 4)) {
                                                        name = "ilbc";
                                                }
+                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d to %s %d\n", payloads[x].name, payloads[x].id, name, tech_pvt->codecs[y]->ianacode);
                                                if (tech_pvt->codecs[y]->ianacode > 96) {
                                                        match = strcasecmp(name, payloads[x].name) ? 0 : 1;
                                                } else {

diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.c b/src/mod/endpoints/mod_exosip/mod_exosip.c
index cc4701feea8bde45bccb5367db1b8e1324bd2289..c9cbdcb4a6edba393de6a8b67b9e762474ad6ba7 100644 (file)
--- a/src/mod/endpoints/mod_exosip/mod_exosip.c
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.c
@@ -1439,17 +1439,13 @@ static switch_status_t exosip_create_call(eXosip_event_t * event)
 
                {
                        int rate = atoi(drate);
-                       int ms = globals.codec_ms;
+                       int ms = 0; //globals.codec_ms;
 
 
                        if (imp) {
                                ms = imp->microseconds_per_frame / 1000;
                        }
 
-                       if (!strcasecmp(dname, "ilbc")) {
-                               ms = 30;
-                       }
-                       
                        if (switch_core_codec_init(&tech_pvt->read_codec,
                                                                           dname,
                                                                           rate,
@@ -1938,11 +1934,7 @@ static void handle_answer(eXosip_event_t *event)
        if (!switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) {
        
                int rate = atoi(drate);
-               int ms = globals.codec_ms;
-
-               if (!strcasecmp(dname, "ilbc")) {
-                       ms = 30;
-               }
+               int ms = 0; //globals.codec_ms;
 
                if (imp) {
                        ms = imp->microseconds_per_frame / 1000;
@@ -2273,7 +2265,7 @@ static int config_exosip(int reload)
        }
 
        if (!globals.codec_ms) {
-               globals.codec_ms = 20;
+               globals.codec_ms = 0;
        }
 
        if (!globals.port) {

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 5cdc74cfa2587174e81a9f637890d347b42cb314..383a248a8aba37cf3ef2c67e28fe44488e919a05 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1661,6 +1661,8 @@ static switch_status_t config_sofia(int reload)
                profile->name = switch_core_strdup(profile->pool, xprofilename);
 
                profile->dtmf_duration = 100;           
+               profile->codec_ms = 20;
+
                for (param = switch_xml_child(xprofile, "param"); param; param = param->next) {
                        char *var = (char *) switch_xml_attr_soft(param, "name");
                        char *val = (char *) switch_xml_attr_soft(param, "value");
@@ -1738,10 +1740,6 @@ static switch_status_t config_sofia(int reload)
                        profile->rtpip = switch_core_strdup(profile->pool, "127.0.0.1");
                }
 
-               if (!profile->codec_ms) {
-                       profile->codec_ms = 20;
-               }
-               
                if (!profile->sip_port) {
                        profile->sip_port = 5060;
                }

diff --git a/src/switch_core.c b/src/switch_core.c
index 86d79ba7044df86c2434eaf0c462fcb652af0a01..6eb433fc9741d11e9075af857af9d1e8305d4e53 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -502,8 +502,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, ch
 
                return SWITCH_STATUS_SUCCESS;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec %s Exists but not at the desired implementation.\n",
-                                                         codec_name);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec %s Exists but not at the desired implementation. %dhz %dms\n",
+                                                 codec_name,
+                                                 rate,
+                                                 ms);
        }
 
        return SWITCH_STATUS_NOTIMPL;