[svn-commits] kpfleming: branch 1.4 r110880 - in /branches/1.4: ./ codecs/ codecs/ilbc/

Wed Mar 26 11:42:36 CDT 2008

Author: kpfleming
Date: Wed Mar 26 11:42:35 2008
New Revision: 110880

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110880
Log:
Merged revisions 3365 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3365 | kpfleming | 2007-12-08 11:04:11 -0600 (Sat, 08 Dec 2007) | 5 lines

clean up firmware handling across wct4xxp, wctc4xxp, wctdm24xxp and wcte12xp drivers to use consistent methods
add non-hotplug firmware loading support to wctdm24xxp and wcte12xp
add license and copyright headers to various files that did not have them
clean up header inclusion in some files

........

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

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.4/CHANGES?view=diff&rev=110880&r1=110879&r2=110880
==============================================================================

--- branches/1.4/CHANGES (original)
+++ branches/1.4/CHANGES Wed Mar 26 11:42:35 2008
@@ -339,3 +339,4 @@
          1. aelparse -- compile .ael files outside of asterisk
     * New manager events:
          1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure
+    * iLBC source code no longer included (see UPGRADE.txt for details)

Modified: branches/1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.4/UPGRADE.txt?view=diff&rev=110880&r1=110879&r2=110880
==============================================================================
--- branches/1.4/UPGRADE.txt (original)
+++ branches/1.4/UPGRADE.txt Wed Mar 26 11:42:35 2008
@@ -481,3 +481,20 @@
   future release.  The use of GAIN for the increasing of voicemail message
   volume should use the 'volgain' option in voicemail.conf
 
+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.4/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/Makefile?view=diff&rev=110880&r1=110879&r2=110880
==============================================================================
--- branches/1.4/codecs/Makefile (original)
+++ branches/1.4/codecs/Makefile Wed Mar 26 11:42:35 2008
@@ -56,6 +56,6 @@
 $(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.4/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/codec_ilbc.c?view=diff&rev=110880&r1=110879&r2=110880
==============================================================================
--- branches/1.4/codecs/codec_ilbc.c (original)
+++ branches/1.4/codecs/codec_ilbc.c Wed Mar 26 11:42:35 2008
@@ -24,6 +24,10 @@
  * 
  * \ingroup codecs
  */
+
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
 
 #include "asterisk.h"
 


