[svn-commits] kpfleming: branch 1.6.0 r110882 - in /branches/1.6.0: ./ codecs/ codecs/ilbc/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Mar 26 12:15:07 CDT 2008 

Author: kpfleming
Date: Wed Mar 26 12:15:06 2008
New Revision: 110882

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110882
Log:
Merged revisions 110881 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110881 | kpfleming | 2008-03-26 10:10:28 -0700 (Wed, 26 Mar 2008) | 18 lines

Merged revisions 110880 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r110880 | kpfleming | 2008-03-26 09:42:35 -0700 (Wed, 26 Mar 2008) | 10 lines

Merged revisions 110869 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r110869 | kpfleming | 2008-03-26 08:53:46 -0700 (Wed, 26 Mar 2008) | 2 lines

due to licensing restrictions, we cannot distribute the source code for iLBC encoding and decoding... so remove it, and add instructions on how the user can obtain it themselves

........

................

................

Removed:
    branches/1.6.0/codecs/ilbc/FrameClassify.c
    branches/1.6.0/codecs/ilbc/FrameClassify.h
    branches/1.6.0/codecs/ilbc/LPCdecode.c
    branches/1.6.0/codecs/ilbc/LPCdecode.h
    branches/1.6.0/codecs/ilbc/LPCencode.c
    branches/1.6.0/codecs/ilbc/LPCencode.h
    branches/1.6.0/codecs/ilbc/StateConstructW.c
    branches/1.6.0/codecs/ilbc/StateConstructW.h
    branches/1.6.0/codecs/ilbc/StateSearchW.c
    branches/1.6.0/codecs/ilbc/StateSearchW.h
    branches/1.6.0/codecs/ilbc/anaFilter.c
    branches/1.6.0/codecs/ilbc/anaFilter.h
    branches/1.6.0/codecs/ilbc/constants.c
    branches/1.6.0/codecs/ilbc/constants.h
    branches/1.6.0/codecs/ilbc/createCB.c
    branches/1.6.0/codecs/ilbc/createCB.h
    branches/1.6.0/codecs/ilbc/doCPLC.c
    branches/1.6.0/codecs/ilbc/doCPLC.h
    branches/1.6.0/codecs/ilbc/enhancer.c
    branches/1.6.0/codecs/ilbc/enhancer.h
    branches/1.6.0/codecs/ilbc/filter.c
    branches/1.6.0/codecs/ilbc/filter.h
    branches/1.6.0/codecs/ilbc/gainquant.c
    branches/1.6.0/codecs/ilbc/gainquant.h
    branches/1.6.0/codecs/ilbc/getCBvec.c
    branches/1.6.0/codecs/ilbc/getCBvec.h
    branches/1.6.0/codecs/ilbc/helpfun.c
    branches/1.6.0/codecs/ilbc/helpfun.h
    branches/1.6.0/codecs/ilbc/hpInput.c
    branches/1.6.0/codecs/ilbc/hpInput.h
    branches/1.6.0/codecs/ilbc/hpOutput.c
    branches/1.6.0/codecs/ilbc/hpOutput.h
    branches/1.6.0/codecs/ilbc/iCBConstruct.c
    branches/1.6.0/codecs/ilbc/iCBConstruct.h
    branches/1.6.0/codecs/ilbc/iCBSearch.c
    branches/1.6.0/codecs/ilbc/iCBSearch.h
    branches/1.6.0/codecs/ilbc/iLBC_decode.c
    branches/1.6.0/codecs/ilbc/iLBC_decode.h
    branches/1.6.0/codecs/ilbc/iLBC_define.h
    branches/1.6.0/codecs/ilbc/iLBC_encode.c
    branches/1.6.0/codecs/ilbc/iLBC_encode.h
    branches/1.6.0/codecs/ilbc/libilbc.vcproj
    branches/1.6.0/codecs/ilbc/lsf.c
    branches/1.6.0/codecs/ilbc/lsf.h
    branches/1.6.0/codecs/ilbc/packing.c
    branches/1.6.0/codecs/ilbc/packing.h
    branches/1.6.0/codecs/ilbc/syntFilter.c
    branches/1.6.0/codecs/ilbc/syntFilter.h
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/CHANGES
    branches/1.6.0/UPGRADE.txt
    branches/1.6.0/codecs/Makefile
    branches/1.6.0/codecs/codec_ilbc.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/CHANGES?view=diff&rev=110882&r1=110881&r2=110882
==============================================================================
--- branches/1.6.0/CHANGES (original)
+++ branches/1.6.0/CHANGES Wed Mar 26 12:15:06 2008
@@ -555,4 +555,4 @@
   * Added a compiler flag, CHANNEL_TRACE, which permits channel tracing to be
      turned on, via the CHANNEL(trace) dialplan function.  Could be useful for
      dialplan debugging.
-
+  * iLBC source code no longer included (see UPGRADE.txt for details)

Modified: branches/1.6.0/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/UPGRADE.txt?view=diff&rev=110882&r1=110881&r2=110882
==============================================================================
--- branches/1.6.0/UPGRADE.txt (original)
+++ branches/1.6.0/UPGRADE.txt Wed Mar 26 12:15:06 2008
@@ -184,3 +184,21 @@
 * The Originate command now requires the Originate write permission.  For
    Originate with the Application parameter, you need the additional System
    privilege if you want to do anything that calls out to a subshell.
+
+iLBC Codec:
+
+* Previously, the Asterisk source code distribution included the iLBC
+  encoder/decoder source code, from Global IP Solutions
+  (http://www.gipscorp.com). This code is not licensed for
+  distribution, and thus has been removed from the Asterisk source
+  code distribution. If you wish to use codec_ilbc to support iLBC
+  channels in Asterisk, you must go to:
+
+  http://ilbcfreeware.org
+
+  and obtain the iLBC source code from that site, including agreeing
+  to the license agreement specified. The site has instructions on how
+  to extract the source code from the RFC file where it has been
+  published; after you have done that, copy the resulting *.c and *.h
+  files into the codecs/ilbc directory of the Asterisk source code
+  tree and follow your normal steps of building Asterisk.

Modified: branches/1.6.0/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/Makefile?view=diff&rev=110882&r1=110881&r2=110882
==============================================================================
--- branches/1.6.0/codecs/Makefile (original)
+++ branches/1.6.0/codecs/Makefile Wed Mar 26 12:15:06 2008
@@ -46,7 +46,7 @@
 $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
 
 $(LIBILBC):
-	@$(MAKE) -C ilbc all ASTCFLAGS="$(ASTCFLAGS) $(AST_NO_STRICT_OVERFLOW)"
+	@$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
 
 $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)
 

Modified: branches/1.6.0/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/codec_ilbc.c?view=diff&rev=110882&r1=110881&r2=110882
==============================================================================
--- branches/1.6.0/codecs/codec_ilbc.c (original)
+++ branches/1.6.0/codecs/codec_ilbc.c Wed Mar 26 12:15:06 2008
@@ -24,6 +24,10 @@
  * 
  * \ingroup codecs
  */
+
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
 
 #include "asterisk.h"

More information about the svn-commits mailing list