[asterisk-commits] mjordan: branch 10 r351451 - in /branches/10: ./ codecs/ codecs/ilbc/ contrib...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jan 18 15:05:41 CST 2012 

Author: mjordan
Date: Wed Jan 18 15:05:35 2012
New Revision: 351451

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=351451
Log:
Include iLBC source code for distribution with Asterisk

This patch includes the iLBC source code for distribution with Asterisk.
Clarification regarding the iLBC source code was provided by Google, and
the appropriate licenses have been included in the codecs/ilbc folder.

Review: https://reviewboard.asterisk.org/r/1675
Review: https://reviewboard.asterisk.org/r/1649

(closes issue: ASTERISK-18943)
Reporter: Leif Madsen
Tested by: Matt Jordan
........

Merged revisions 351450 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Added:
    branches/10/codecs/ilbc/FrameClassify.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/FrameClassify.c
    branches/10/codecs/ilbc/FrameClassify.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/FrameClassify.h
    branches/10/codecs/ilbc/LICENSE
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LICENSE
    branches/10/codecs/ilbc/LICENSE_ADDENDUM
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LICENSE_ADDENDUM
    branches/10/codecs/ilbc/LPCdecode.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LPCdecode.c
    branches/10/codecs/ilbc/LPCdecode.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LPCdecode.h
    branches/10/codecs/ilbc/LPCencode.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LPCencode.c
    branches/10/codecs/ilbc/LPCencode.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/LPCencode.h
    branches/10/codecs/ilbc/PATENTS
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/PATENTS
    branches/10/codecs/ilbc/StateConstructW.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/StateConstructW.c
    branches/10/codecs/ilbc/StateConstructW.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/StateConstructW.h
    branches/10/codecs/ilbc/StateSearchW.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/StateSearchW.c
    branches/10/codecs/ilbc/StateSearchW.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/StateSearchW.h
    branches/10/codecs/ilbc/anaFilter.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/anaFilter.c
    branches/10/codecs/ilbc/anaFilter.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/anaFilter.h
    branches/10/codecs/ilbc/constants.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/constants.c
    branches/10/codecs/ilbc/constants.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/constants.h
    branches/10/codecs/ilbc/createCB.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/createCB.c
    branches/10/codecs/ilbc/createCB.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/createCB.h
    branches/10/codecs/ilbc/doCPLC.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/doCPLC.c
    branches/10/codecs/ilbc/doCPLC.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/doCPLC.h
    branches/10/codecs/ilbc/enhancer.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/enhancer.c
    branches/10/codecs/ilbc/enhancer.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/enhancer.h
    branches/10/codecs/ilbc/extract-cfile.awk
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/extract-cfile.awk
    branches/10/codecs/ilbc/filter.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/filter.c
    branches/10/codecs/ilbc/filter.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/filter.h
    branches/10/codecs/ilbc/gainquant.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/gainquant.c
    branches/10/codecs/ilbc/gainquant.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/gainquant.h
    branches/10/codecs/ilbc/getCBvec.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/getCBvec.c
    branches/10/codecs/ilbc/getCBvec.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/getCBvec.h
    branches/10/codecs/ilbc/helpfun.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/helpfun.c
    branches/10/codecs/ilbc/helpfun.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/helpfun.h
    branches/10/codecs/ilbc/hpInput.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/hpInput.c
    branches/10/codecs/ilbc/hpInput.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/hpInput.h
    branches/10/codecs/ilbc/hpOutput.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/hpOutput.c
    branches/10/codecs/ilbc/hpOutput.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/hpOutput.h
    branches/10/codecs/ilbc/iCBConstruct.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iCBConstruct.c
    branches/10/codecs/ilbc/iCBConstruct.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iCBConstruct.h
    branches/10/codecs/ilbc/iCBSearch.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iCBSearch.c
    branches/10/codecs/ilbc/iCBSearch.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iCBSearch.h
    branches/10/codecs/ilbc/iLBC_decode.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_decode.c
    branches/10/codecs/ilbc/iLBC_decode.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_decode.h
    branches/10/codecs/ilbc/iLBC_define.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_define.h
    branches/10/codecs/ilbc/iLBC_encode.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_encode.c
    branches/10/codecs/ilbc/iLBC_encode.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_encode.h
    branches/10/codecs/ilbc/iLBC_test.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/iLBC_test.c
    branches/10/codecs/ilbc/lsf.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/lsf.c
    branches/10/codecs/ilbc/lsf.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/lsf.h
    branches/10/codecs/ilbc/packing.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/packing.c
    branches/10/codecs/ilbc/packing.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/packing.h
    branches/10/codecs/ilbc/rfc3951.txt
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/rfc3951.txt
    branches/10/codecs/ilbc/syntFilter.c
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/syntFilter.c
    branches/10/codecs/ilbc/syntFilter.h
      - copied unchanged from r351450, branches/1.8/codecs/ilbc/syntFilter.h
Modified:
    branches/10/   (props changed)
    branches/10/codecs/codec_ilbc.c
    branches/10/codecs/ilbc/Makefile
    branches/10/contrib/scripts/get_ilbc_source.sh

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/codecs/codec_ilbc.c?view=diff&rev=351451&r1=351450&r2=351451
==============================================================================
--- branches/10/codecs/codec_ilbc.c (original)
+++ branches/10/codecs/codec_ilbc.c Wed Jan 18 15:05:35 2012
@@ -26,7 +26,6 @@
  */
 
 /*** MODULEINFO
-	<defaultenabled>no</defaultenabled>
 	<support_level>core</support_level>
  ***/
 

Modified: branches/10/codecs/ilbc/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10/codecs/ilbc/Makefile?view=diff&rev=351451&r1=351450&r2=351451
==============================================================================
--- branches/10/codecs/ilbc/Makefile (original)
+++ branches/10/codecs/ilbc/Makefile Wed Jan 18 15:05:35 2012
@@ -1,11 +1,12 @@
 LIB=libilbc.a
 CFLAGS+=-fPIC
 
-OBJS=anaFilter.o iCBSearch.o packing.o \
-     constants.o gainquant.o iLBC_decode.o StateConstructW.o \
-     createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \
-     helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \
-     filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o
+OBJS=anaFilter.o constants.o createCB.o \
+     doCPLC.o enhancer.o filter.o FrameClassify.o \
+     gainquant.o getCBvec.o helpfun.o hpInput.o hpOutput.o \
+     iCBConstruct.o iCBSearch.o iLBC_decode.o iLBC_encode.o iLBC_test.o \
+     LPCdecode.o LPCencode.o lsf.o packing.o StateConstructW.o StateSearchW.o \
+     syntFilter.o \
 
 include $(ASTTOPDIR)/Makefile.rules
 

Modified: branches/10/contrib/scripts/get_ilbc_source.sh
URL: http://svnview.digium.com/svn/asterisk/branches/10/contrib/scripts/get_ilbc_source.sh?view=diff&rev=351451&r1=351450&r2=351451
==============================================================================
--- branches/10/contrib/scripts/get_ilbc_source.sh (original)
+++ branches/10/contrib/scripts/get_ilbc_source.sh Wed Jan 18 15:05:35 2012
@@ -10,9 +10,10 @@
 fi
 
 echo "***"
-echo "This script will download the Global IP Solutions iLBC encoder/decoder"
-echo "source code from http://ilbcfreeware.org. Use of this code requires"
-echo "agreeing to the license agreement present at that site."
+echo "This script will download and extract the iLBC RFC from http://ilbcfreeware.org."
+echo "As Google acquired Global IP Solutions, usage of iLBC is bound by the same"
+echo "license as the WebRTC project (http://www.webrtc.org).  Usage of the iLBC codec"
+echo "entails agreeing to the license agreement present at that site."
 echo ""
 echo "This script assumes that you have already agreed to the license agreement."
 echo "If you have not done so, you can abort the script now."

More information about the asterisk-commits mailing list