]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
remove old g726 we no longer use
authorBrian West <brian@freeswitch.org>
Fri, 1 Feb 2008 06:25:48 +0000 (06:25 +0000)
committerBrian West <brian@freeswitch.org>
Fri, 1 Feb 2008 06:25:48 +0000 (06:25 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7453 d0543943-73ff-0310-b7d9-9358b9ac24b2

32 files changed:
libs/codec/g726/.update [deleted file]
libs/codec/g726/AUTHORS [deleted file]
libs/codec/g726/COPYING [deleted file]
libs/codec/g726/ChangeLog [deleted file]
libs/codec/g726/INSTALL [deleted file]
libs/codec/g726/Makefile.am [deleted file]
libs/codec/g726/NEWS [deleted file]
libs/codec/g726/README [deleted file]
libs/codec/g726/acsite.m4 [deleted file]
libs/codec/g726/build/config/ac_cflags_gcc_option.m4 [deleted file]
libs/codec/g726/build/config/ac_cflags_sun_option.m4 [deleted file]
libs/codec/g726/build/config/ac_gcc_archflag.m4 [deleted file]
libs/codec/g726/build/config/ac_gcc_x86_cpuid.m4 [deleted file]
libs/codec/g726/build/config/ac_prog_gzip.m4 [deleted file]
libs/codec/g726/build/config/ac_prog_wget.m4 [deleted file]
libs/codec/g726/build/config/ax_cc_maxopt.m4 [deleted file]
libs/codec/g726/build/config/ax_cflags_warn_all_ansi.m4 [deleted file]
libs/codec/g726/build/config/ax_check_compiler_flags.m4 [deleted file]
libs/codec/g726/build/config/ax_compiler_vendor.m4 [deleted file]
libs/codec/g726/configure.gnu [deleted file]
libs/codec/g726/configure.in [deleted file]
libs/codec/g726/libg726.2008.vcproj [deleted file]
libs/codec/g726/libg726.vcproj [deleted file]
libs/codec/g726/src/g711.c [deleted file]
libs/codec/g726/src/g711.h [deleted file]
libs/codec/g726/src/g726_16.c [deleted file]
libs/codec/g726/src/g726_24.c [deleted file]
libs/codec/g726/src/g726_32.c [deleted file]
libs/codec/g726/src/g726_40.c [deleted file]
libs/codec/g726/src/g72x.c [deleted file]
libs/codec/g726/src/g72x.h [deleted file]
libs/codec/g726/src/private.h [deleted file]

diff --git a/libs/codec/g726/.update b/libs/codec/g726/.update
deleted file mode 100644 (file)
index 52fbd5e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Fri Mar 16 17:13:05 EDT 2007
diff --git a/libs/codec/g726/AUTHORS b/libs/codec/g726/AUTHORS
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libs/codec/g726/COPYING b/libs/codec/g726/COPYING
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libs/codec/g726/ChangeLog b/libs/codec/g726/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libs/codec/g726/INSTALL b/libs/codec/g726/INSTALL
deleted file mode 100644 (file)
index 23e5f25..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/libs/codec/g726/Makefile.am b/libs/codec/g726/Makefile.am
deleted file mode 100644 (file)
index f6b51f1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST =
-SUBDIRS = 
-AUTOMAKE_OPTS= gnu
-NAME=libg726
-
-AM_CFLAGS   = $(new_AM_CFLAGS) -I./src/include
-AM_CPPFLAGS = $(AM_CFLAGS)
-AM_LDFLAGS  = $(new_AM_LDFLAGS) -lm
-
-lib_LTLIBRARIES                = libg726.la
-libg726_la_SOURCES     = src/g726_16.c \
-src/g726_24.c  \
-src/g726_32.c  \
-src/g726_40.c  \
-src/g72x.c \
-src/g711.c
-
-libg726_la_CFLAGS      = $(AM_CFLAGS)
-libg726_la_LDFLAGS     = 
-
-library_includedir     = $(prefix)/include
-library_include_HEADERS =  src/g72x.h src/private.h src/g711.h
-
-
-
-
-
-
diff --git a/libs/codec/g726/NEWS b/libs/codec/g726/NEWS
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libs/codec/g726/README b/libs/codec/g726/README
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libs/codec/g726/acsite.m4 b/libs/codec/g726/acsite.m4
deleted file mode 100644 (file)
index 80f8cf4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-m4_include([build/config/ax_compiler_vendor.m4])
-m4_include([build/config/ax_cflags_warn_all_ansi.m4])
-m4_include([build/config/ax_cc_maxopt.m4])
-m4_include([build/config/ax_check_compiler_flags.m4])
-m4_include([build/config/ac_gcc_archflag.m4])
-m4_include([build/config/ac_gcc_x86_cpuid.m4])
diff --git a/libs/codec/g726/build/config/ac_cflags_gcc_option.m4 b/libs/codec/g726/build/config/ac_cflags_gcc_option.m4
deleted file mode 100644 (file)
index e651a5e..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl -------------------------------------------------------------------------
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])
-
diff --git a/libs/codec/g726/build/config/ac_cflags_sun_option.m4 b/libs/codec/g726/build/config/ac_cflags_sun_option.m4
deleted file mode 100644 (file)
index a09e6fb..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-AC_DEFUN([AX_CFLAGS_SUN_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_sun_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for sun/cc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "+xstrconst  % -xc99=all m4_ifval($2,$2,-option)"     dnl Solaris C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_SUN_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_sun_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for sun/cc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "+xstrconst  % -xc99=all  m4_ifval($2,$2,-option)"     dnl Solaris C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl -----------------------------------------------------------------------
-
-AC_DEFUN([AX_CFLAGS_SUN_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_sun_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for sun/cc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "+xstrconst  % -xc99=all m4_ifval($1,$1,-option)"     dnl Solaris C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_SUN_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_sun_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for sun/cc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "+xstrconst  % -xc99=all m4_ifval($1,$1,-option)"     dnl Solaris C
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-AC_DEFUN([AX_CFLAGS_SUN_OPTION],[ifelse(m4_regexp([$2],[-]),-1,
-[AX_CFLAGS_SUN_OPTION_NEW($@)],[AX_CFLAGS_SUN_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_SUN_OPTION],[ifelse(m4_regexp([$2],[-]),-1,
-[AX_CXXFLAGS_SUN_OPTION_NEW($@)],[AX_CXXFLAGS_SUN_OPTION_OLD($@)])])
-
diff --git a/libs/codec/g726/build/config/ac_gcc_archflag.m4 b/libs/codec/g726/build/config/ac_gcc_archflag.m4
deleted file mode 100644 (file)
index b38a564..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-AC_DEFUN([AX_GCC_ARCHFLAG],
-[AC_REQUIRE([AC_PROG_CC])
-
-AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
-        ax_gcc_arch=$withval, ax_gcc_arch=yes)
-
-AC_MSG_CHECKING([for gcc architecture flag])
-AC_MSG_RESULT([])
-AC_CACHE_VAL(ax_cv_gcc_archflag,
-[
-ax_cv_gcc_archflag="unknown"
-
-if test "$GCC" = yes; then
-
-if test "x$ax_gcc_arch" = xyes; then
-ax_gcc_arch=""
-if test "$cross_compiling" = no; then
-case $host_cpu in
-  i[[3456]]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones
-     AX_GCC_X86_CPUID(0)
-     AX_GCC_X86_CPUID(1)
-     case $ax_cv_gcc_x86_cpuid_0 in
-       *:756e6547:*:*) # Intel
-          case $ax_cv_gcc_x86_cpuid_1 in
-            *5[[48]]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;;
-            *5??:*:*:*) ax_gcc_arch=pentium ;;
-            *6[[3456]]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
-            *6a?:*[[01]]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;;
-            *6a?:*[[234]]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
-            *6[[9d]]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;;
-            *6[[78b]]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;;
-            *6??:*:*:*) ax_gcc_arch=pentiumpro ;;
-            *f3[[347]]:*:*:*|*f4[1347]:*:*:*)
-                case $host_cpu in
-                  x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;;
-                  *) ax_gcc_arch="prescott pentium4 pentiumpro" ;;
-                esac ;;
-            *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";;
-          esac ;;
-       *:68747541:*:*) # AMD
-          case $ax_cv_gcc_x86_cpuid_1 in
-            *5[[67]]?:*:*:*) ax_gcc_arch=k6 ;;
-            *5[[8d]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;;
-            *5[[9]]?:*:*:*) ax_gcc_arch="k6-3 k6" ;;
-            *60?:*:*:*) ax_gcc_arch=k7 ;;
-            *6[[12]]?:*:*:*) ax_gcc_arch="athlon k7" ;;
-            *6[[34]]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;;
-            *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;;
-            *6[[68a]]?:*:*:*)
-               AX_GCC_X86_CPUID(0x80000006) # L2 cache size
-               case $ax_cv_gcc_x86_cpuid_0x80000006 in
-                 *:*:*[[1-9a-f]]??????:*) # (L2 = ecx >> 16) >= 256
-                        ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;;
-                 *) ax_gcc_arch="athlon-4 athlon k7" ;;
-               esac ;;
-            *f[[4cef8b]]?:*:*:*) ax_gcc_arch="athlon64 k8" ;;
-            *f5?:*:*:*) ax_gcc_arch="opteron k8" ;;
-            *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;;
-            *f??:*:*:*) ax_gcc_arch="k8" ;;
-          esac ;;
-        *:746e6543:*:*) # IDT
-           case $ax_cv_gcc_x86_cpuid_1 in
-             *54?:*:*:*) ax_gcc_arch=winchip-c6 ;;
-             *58?:*:*:*) ax_gcc_arch=winchip2 ;;
-             *6[[78]]?:*:*:*) ax_gcc_arch=c3 ;;
-             *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;;
-           esac ;;
-     esac
-     if test x"$ax_gcc_arch" = x; then # fallback
-        case $host_cpu in
-          i586*) ax_gcc_arch=pentium ;;
-          i686*) ax_gcc_arch=pentiumpro ;;
-        esac
-     fi
-     ;;
-
-  sparc*)
-     AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/])
-     cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null`
-     cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters`
-     case $cputype in
-         *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;;
-         *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;;
-         *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;;
-         *supersparc*|*tms390z5[[05]]*) ax_gcc_arch="supersparc v8" ;;
-         *hypersparc*|*rt62[[056]]*) ax_gcc_arch="hypersparc v8" ;;
-         *cypress*) ax_gcc_arch=cypress ;;
-     esac ;;
-
-  alphaev5) ax_gcc_arch=ev5 ;;
-  alphaev56) ax_gcc_arch=ev56 ;;
-  alphapca56) ax_gcc_arch="pca56 ev56" ;;
-  alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;;
-  alphaev6) ax_gcc_arch=ev6 ;;
-  alphaev67) ax_gcc_arch=ev67 ;;
-  alphaev68) ax_gcc_arch="ev68 ev67" ;;
-  alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;;
-  alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;;
-  alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;;
-
-  powerpc*)
-     cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null`
-     cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'`
-     case $cputype in
-       *750*) ax_gcc_arch="750 G3" ;;
-       *740[[0-9]]*) ax_gcc_arch="$cputype 7400 G4" ;;
-       *74[[4-5]][[0-9]]*) ax_gcc_arch="$cputype 7450 G4" ;;
-       *74[[0-9]][[0-9]]*) ax_gcc_arch="$cputype G4" ;;
-       *970*) ax_gcc_arch="970 G5 power4";;
-       *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";;
-       *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";;
-       603ev|8240) ax_gcc_arch="$cputype 603e 603";;
-       *) ax_gcc_arch=$cputype ;;
-     esac
-     ax_gcc_arch="$ax_gcc_arch powerpc"
-     ;;
-esac
-fi # not cross-compiling
-fi # guess arch
-
-if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
-for arch in $ax_gcc_arch; do
-  if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code
-    flags="-mtune=$arch"
-    # -mcpu=$arch and m$arch generate nonportable code on every arch except
-    # x86.  And some other arches (e.g. Alpha) don't accept -mtune.  Grrr.
-    case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac
-  else
-    flags="-march=$arch -mcpu=$arch -m$arch"
-  fi
-  for flag in $flags; do
-    AX_CHECK_COMPILER_FLAGS($flag, [ax_cv_gcc_archflag=$flag; break])
-  done
-  test "x$ax_cv_gcc_archflag" = xunknown || break
-done
-fi
-
-fi # $GCC=yes
-])
-AC_MSG_CHECKING([for gcc architecture flag])
-AC_MSG_RESULT($ax_cv_gcc_archflag)
-if test "x$ax_cv_gcc_archflag" = xunknown; then
-  m4_default([$3],:)
-else
-  m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
-fi
-])
-
diff --git a/libs/codec/g726/build/config/ac_gcc_x86_cpuid.m4 b/libs/codec/g726/build/config/ac_gcc_x86_cpuid.m4
deleted file mode 100644 (file)
index 3cf22d0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-AC_DEFUN([AX_GCC_X86_CPUID],
-[AC_REQUIRE([AC_PROG_CC])
-AC_LANG_PUSH([C])
-AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
-     int op = $1, eax, ebx, ecx, edx;
-     FILE *f;
-      __asm__("cpuid"
-        : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-        : "a" (op));
-     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
-     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
-     fclose(f);
-     return 0;
-])], 
-     [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid],
-     [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid],
-     [ax_cv_gcc_x86_cpuid_$1=unknown])])
-AC_LANG_POP([C])
-])
-
diff --git a/libs/codec/g726/build/config/ac_prog_gzip.m4 b/libs/codec/g726/build/config/ac_prog_gzip.m4
deleted file mode 100644 (file)
index f37a4cc..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_DEFUN([AC_PROG_GZIP],[
-AC_CHECK_PROGS(gzip,[gzip],no)
-export gzip;
-if test $gzip = "no" ;
-then
-        AC_MSG_ERROR([Unable to find the gzip application]);
-fi
-AC_SUBST(gzip)
-])
diff --git a/libs/codec/g726/build/config/ac_prog_wget.m4 b/libs/codec/g726/build/config/ac_prog_wget.m4
deleted file mode 100644 (file)
index 56b6b83..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_DEFUN([AC_PROG_WGET],[
-AC_CHECK_PROGS(wget,[wget],no)
-export wget;
-if test $wget = "no" ;
-then
-        AC_MSG_ERROR([Unable to find the wget application]);
-fi
-AC_SUBST(wget)
-])
diff --git a/libs/codec/g726/build/config/ax_cc_maxopt.m4 b/libs/codec/g726/build/config/ax_cc_maxopt.m4
deleted file mode 100644 (file)
index 6205ee8..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-AC_DEFUN([AX_CC_MAXOPT],
-[
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AX_COMPILER_VENDOR])
-
-AC_ARG_ENABLE(portable-binary, [AC_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
-        acx_maxopt_portable=$withval, acx_maxopt_portable=no)
-
-# Try to determine "good" native compiler flags if none specified via CFLAGS
-if test "$ac_test_CFLAGS" != "set"; then
-  CFLAGS=""
-  case $ax_cv_c_compiler_vendor in
-    dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host"
-         if test "x$acx_maxopt_portable" = xno; then
-           CFLAGS="$CFLAGS -arch host"
-         fi;;
-
-    sun) CFLAGS="-native -fast -xO5 -dalign -xc99=all"
-         if test "x$acx_maxopt_portable" = xyes; then
-           CFLAGS="$CFLAGS -xarch=generic"
-         fi;;
-
-    hp)  CFLAGS="+Oall +Optrs_ansi +DSnative"
-         if test "x$acx_maxopt_portable" = xyes; then
-           CFLAGS="$CFLAGS +DAportable"
-         fi;;
-
-    ibm) if test "x$acx_maxopt_portable" = xno; then
-           xlc_opt="-qarch=auto -qtune=auto"
-         else
-           xlc_opt="-qtune=auto"
-         fi
-         AX_CHECK_COMPILER_FLAGS($xlc_opt,
-                CFLAGS="-O3 -qansialias -w $xlc_opt",
-               [CFLAGS="-O3 -qansialias -w"
-                echo "******************************************************"
-                echo "*  You seem to have the IBM  C compiler.  It is      *"
-                echo "*  recommended for best performance that you use:    *"
-                echo "*                                                    *"
-                echo "*    CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *"
-                echo "*                      ^^^        ^^^                *"
-                echo "*  where xxx is pwr2, pwr3, 604, or whatever kind of *"
-                echo "*  CPU you have.  (Set the CFLAGS environment var.   *"
-                echo "*  and re-run configure.)  For more info, man cc.    *"
-                echo "******************************************************"])
-         ;;
-
-    intel) CFLAGS="-O3 -ansi_alias"
-        if test "x$acx_maxopt_portable" = xno; then
-          icc_archflag=unknown
-          icc_flags=""
-          case $host_cpu in
-            i686*|x86_64*)
-              # icc accepts gcc assembly syntax, so these should work:
-              AX_GCC_X86_CPUID(0)
-              AX_GCC_X86_CPUID(1)
-              case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG
-                *:756e6547:*:*) # Intel
-                  case $ax_cv_gcc_x86_cpuid_1 in
-                    *6a?:*[[234]]:*:*|*6[[789b]]?:*:*:*) icc_flags="-xK";;
-                    *f3[[347]]:*:*:*|*f4[1347]:*:*:*) icc_flags="-xP -xN -xW -xK";;
-                    *f??:*:*:*) icc_flags="-xN -xW -xK";;
-                  esac ;;
-              esac ;;
-          esac
-          if test "x$icc_flags" != x; then
-            for flag in $icc_flags; do
-              AX_CHECK_COMPILER_FLAGS($flag, [icc_archflag=$flag; break])
-            done
-          fi
-          AC_MSG_CHECKING([for icc architecture flag])
-          AC_MSG_RESULT($icc_archflag)
-          if test "x$icc_archflag" != xunknown; then
-            CFLAGS="$CFLAGS $icc_archflag"
-          fi
-        fi
-        ;;
-
-    gnu)
-     # default optimization flags for gcc on all systems
-     CFLAGS="-O3 -fomit-frame-pointer"
-
-     # -malign-double for x86 systems
-     AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")
-
-     #  -fstrict-aliasing for gcc-2.95+
-     AX_CHECK_COMPILER_FLAGS(-fstrict-aliasing,
-        CFLAGS="$CFLAGS -fstrict-aliasing")
-
-     # note that we enable "unsafe" fp optimization with other compilers, too
-     AX_CHECK_COMPILER_FLAGS(-ffast-math, CFLAGS="$CFLAGS -ffast-math")
-
-     AX_GCC_ARCHFLAG($acx_maxopt_portable)
-     ;;
-  esac
-
-  if test -z "$CFLAGS"; then
-        echo ""
-        echo "********************************************************"
-        echo "* WARNING: Don't know the best CFLAGS for this system  *"
-        echo "* Use ./configure CFLAGS=... to specify your own flags *"
-        echo "* (otherwise, a default of CFLAGS=-O3 will be used)    *"
-        echo "********************************************************"
-        echo ""
-        CFLAGS="-O3"
-  fi
-
-  AX_CHECK_COMPILER_FLAGS($CFLAGS, [], [
-        echo ""
-        echo "********************************************************"
-        echo "* WARNING: The guessed CFLAGS don't seem to work with  *"
-        echo "* your compiler.                                       *"
-        echo "* Use ./configure CFLAGS=... to specify your own flags *"
-        echo "********************************************************"
-        echo ""
-        CFLAGS=""
-  ])
-
-fi
-])
diff --git a/libs/codec/g726/build/config/ax_cflags_warn_all_ansi.m4 b/libs/codec/g726/build/config/ax_cflags_warn_all_ansi.m4
deleted file mode 100644 (file)
index 5b35464..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all_ansi])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_[]FLAGS="$[]FLAGS"
-# IRIX C compiler:
-#      -use_readonly_const is the default for IRIX C,
-#       puts them into .rodata, but they are copied later.
-#       need to be "-G0 -rdatashared" for strictmode but
-#       I am not sure what effect that has really.         - guidod
-for ac_arg dnl
-in "-pedantic  % -Wall -std=c99 -pedantic"       dnl   GCC
-   "-xstrconst % -v -xc99=all"                      dnl Solaris C
-   "-std1      % -verbose -w0 -warnprotos -std1" dnl Digital Unix
-   " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
-   " % -ansi -ansiE -fullwarn"                dnl IRIX
-   "+ESlit     % +w1 -Aa"                     dnl HP-UX C
-   "-Xc        % -pvctl[,]fullmsg -Xc"        dnl NEC SX-5 (Super-UX 10)
-   "-h conform % -h msglevel 2 -h conform"    dnl Cray C (Unicos)
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
-        AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-# IRIX C compiler:
-#      -use_readonly_const is the default for IRIX C,
-#       puts them into .rodata, but they are copied later.
-#       need to be "-G0 -rdatashared" for strictmode but
-#       I am not sure what effect that has really.         - guidod
-for ac_arg dnl
-in "-pedantic  % -Wall -ansi -pedantic"       dnl   GCC
-   "-xstrconst % -v -Xc"                      dnl Solaris C
-   "-std1      % -verbose -w0 -warnprotos -std1" dnl Digital Unix
-   " % -qlanglvl=ansi -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
-   " % -ansi -ansiE -fullwarn"                dnl IRIX
-   "+ESlit     % +w1 -Aa"                     dnl HP-UX C
-   "-Xc        % -pvctl[,]fullmsg -Xc"        dnl NEC SX-5 (Super-UX 10)
-   "-h conform % -h msglevel 2 -h conform"    dnl Cray C (Unicos)
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
-        AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
diff --git a/libs/codec/g726/build/config/ax_check_compiler_flags.m4 b/libs/codec/g726/build/config/ax_check_compiler_flags.m4
deleted file mode 100644 (file)
index 73377b7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
-[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
-AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
-dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
-AS_LITERAL_IF([$1],
-  [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
-      ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-      _AC_LANG_PREFIX[]FLAGS="$1"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], 
-        AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
-        AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
-      _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
-  [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-   _AC_LANG_PREFIX[]FLAGS="$1"
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], 
-     eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
-     eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
-   _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
-eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
-AC_MSG_RESULT($ax_check_compiler_flags)
-if test "x$ax_check_compiler_flags" = xyes; then
-        m4_default([$2], :)
-else
-        m4_default([$3], :)
-fi
-])dnl AX_CHECK_COMPILER_FLAG
diff --git a/libs/codec/g726/build/config/ax_compiler_vendor.m4 b/libs/codec/g726/build/config/ax_compiler_vendor.m4
deleted file mode 100644 (file)
index a24a58d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-AC_DEFUN([AX_COMPILER_VENDOR],
-[
-AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
- [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
-  # note: don't check for gcc first since some other compilers define __GNUC__
-  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
-    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
-#if !($vencpp)
-      thisisanerror;
-#endif
-])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
-  done
- ])
-])
diff --git a/libs/codec/g726/configure.gnu b/libs/codec/g726/configure.gnu
deleted file mode 100644 (file)
index 8d649f2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-./configure "$@" --disable-shared
diff --git a/libs/codec/g726/configure.in b/libs/codec/g726/configure.in
deleted file mode 100644 (file)
index 3c302bd..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE(libg726,0.1)
-AC_CONFIG_SRCDIR([src])
-
-#Set default language
-AC_LANG_C
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-
-#Check for compiler vendor
-AX_COMPILER_VENDOR
-
-#  Optimize
-AC_ARG_ENABLE(optimization,
-[AC_HELP_STRING([--enable-optimization],[Set if you want us to add max optimising compiler flags])],[enable_optimizer="$enableval"],[enable_optimizer="no"])
-
-if test "${enable_optimizer}" = "yes" ; then
-        AC_DEFINE([OPTIMZER],[],[Enable Optimization.])
-        AX_CC_MAXOPT
-fi
-
-#  Enable debugging
-AC_ARG_ENABLE(debug,
-[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"])
-
-if test "${enable_debug}" = "yes"; then
-        AC_DEFINE([DEBUG],[],[Enable extra debugging.])
-        AX_CFLAGS_WARN_ALL_ANSI
-fi
-
-AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
-
-
-case "$host" in
-                *-solaris2*)
-                        if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-                                SOLINK="-Bdynamic -dy -G"
-                                new_AM_CFLAGS="-KPIC -DPIC"
-                                new_AM_LDFLAGS="-R${prefix}/lib"
-                        elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
-                                SOLINK="-Bdynamic -dy -G"
-                                new_AM_CFLAGS="-fPIC"
-                                new_AM_LDFLAGS=""
-                        fi
-                        DYNAMIC_LIB_EXTEN="so"
-                ;;
-                *-darwin*)
-                        if test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
-                                SOLINK="-dynamic -bundle -force-flat-namespace"
-                                new_AM_CFLAGS="-DMACOSX"
-                                new_AM_LDFLAGS=""
-                        fi
-                        DYNAMIC_LIB_EXTEN="dylib"
-                ;;
-                x86_64-*-linux-gnu)
-                        if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
-                                SOLINK="-Bdynamic -dy -G"
-                                new_AM_CFLAGS="-KPIC -DPIC"
-                                new_AM_LDFLAGS="-R${prefix}/lib"
-                        elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
-                                SOLINK="-shared -Xlinker -x"
-                                new_AM_CFLAGS="-fPIC"
-                                new_AM_LDFLAGS=""
-                        fi
-                        DYNAMIC_LIB_EXTEN="so"
-                ;;
-                i*6-*-linux-gnu)
-                        if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
-                                SOLINK="-Bdynamic -dy -G"
-                                new_AM_CFLAGS="-KPIC -DPIC"
-                                new_AM_LDFLAGS="-R${prefix}/lib"
-                        elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then
-                                SOLINK="-shared -Xlinker -x"
-                                new_AM_CFLAGS="-fpic"
-                                new_AM_LDFLAGS=""
-                        fi
-                        DYNAMIC_LIB_EXTEN="so"
-                ;;
-                x86_64-*-freebsd*|amd64-*-freebsd*)
-                        SOLINK="-shared -Xlinker -x"
-                        new_AM_CFLAGS="-fPIC"
-                        new_AM_LDFLAGS=""
-                        DYNAMIC_LIB_EXTEN="so"
-                ;;
-                i*6-*-freebsd*)
-                        SOLINK="-shared -Xlinker -x"
-                        new_AM_CFLAGS="-fpic"
-                        new_AM_LDFLAGS=""
-                        DYNAMIC_LIB_EXTEN="so"
-                ;;
-esac
-#  Enable 64 bit build
-AC_ARG_ENABLE(64,
-[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
-
-if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
-    if test "${enable_64}" = "yes"; then
-        new_AM_CFLAGS="$new_AM_CFLAGS -m64"
-    fi
-fi
-AC_SUBST(new_AM_CFLAGS)
-AC_SUBST(new_AM_LDFLAGS)
-AC_SUBST(SOLINK)
-AC_SUBST(DYNAMIC_LIB_EXTEN)
-
-# Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_TYPE_SIGNAL
-AC_FUNC_STRFTIME
-
-AC_CONFIG_FILES([Makefile])
-
-AC_OUTPUT
diff --git a/libs/codec/g726/libg726.2008.vcproj b/libs/codec/g726/libg726.2008.vcproj
deleted file mode 100644 (file)
index b779058..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="libg726"\r
-       ProjectGUID="{5A6A281A-AA50-470A-8305-202BDA1CD1BF}"\r
-       RootNamespace="libg726"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\g711.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_16.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_24.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_32.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_40.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g72x.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\g72x.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\private.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/codec/g726/libg726.vcproj b/libs/codec/g726/libg726.vcproj
deleted file mode 100644 (file)
index 595e87f..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="libg726"\r
-       ProjectGUID="{5A6A281A-AA50-470A-8305-202BDA1CD1BF}"\r
-       RootNamespace="libg726"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\g711.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_16.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_24.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_32.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g726_40.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\g72x.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\src\g72x.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\src\private.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/codec/g726/src/g711.c b/libs/codec/g726/src/g711.c
deleted file mode 100644 (file)
index c4e2a4a..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * December 30, 1994:
- * Functions linear2alaw, linear2ulaw have been updated to correctly
- * convert unquantized 16 bit values.
- * Tables for direct u- to A-law and A- to u-law conversions have been
- * corrected.
- * Borge Lindberg, Center for PersonKommunikation, Aalborg University.
- * bli@cpk.auc.dk
- *
- */
-/*
- * Downloaded from comp.speech site in Cambridge.
- *
- */
-
-#include "g711.h"
-#ifdef __ICC
-#pragma warning (disable:810 869 1418)
-#endif
-
-/*
- * g711.c
- *
- * u-law, A-law and linear PCM conversions.
- */
-#define        SIGN_BIT        (0x80)          /* Sign bit for a A-law byte. */
-#define        QUANT_MASK      (0xf)           /* Quantization field mask. */
-#define        NSEGS           (8)                     /* Number of A-law segments. */
-#define        SEG_SHIFT       (4)                     /* Left shift for segment number. */
-#define        SEG_MASK        (0x70)          /* Segment field mask. */
-
-static short seg_aend[8] = { 0x1F, 0x3F, 0x7F, 0xFF,
-       0x1FF, 0x3FF, 0x7FF, 0xFFF
-};
-static short seg_uend[8] = { 0x3F, 0x7F, 0xFF, 0x1FF,
-       0x3FF, 0x7FF, 0xFFF, 0x1FFF
-};
-
-/* copy from CCITT G.711 specifications */
-unsigned char _u2a[128] = {            /* u- to A-law conversions */
-       1, 1, 2, 2, 3, 3, 4, 4,
-       5, 5, 6, 6, 7, 7, 8, 8,
-       9, 10, 11, 12, 13, 14, 15, 16,
-       17, 18, 19, 20, 21, 22, 23, 24,
-       25, 27, 29, 31, 33, 34, 35, 36,
-       37, 38, 39, 40, 41, 42, 43, 44,
-       46, 48, 49, 50, 51, 52, 53, 54,
-       55, 56, 57, 58, 59, 60, 61, 62,
-       64, 65, 66, 67, 68, 69, 70, 71,
-       72, 73, 74, 75, 76, 77, 78, 79,
-/* corrected:
-       81,     82,     83,     84,     85,     86,     87,     88, 
-   should be: */
-       80, 82, 83, 84, 85, 86, 87, 88,
-       89, 90, 91, 92, 93, 94, 95, 96,
-       97, 98, 99, 100, 101, 102, 103, 104,
-       105, 106, 107, 108, 109, 110, 111, 112,
-       113, 114, 115, 116, 117, 118, 119, 120,
-       121, 122, 123, 124, 125, 126, 127, 128
-};
-
-unsigned char _a2u[128] = {            /* A- to u-law conversions */
-       1, 3, 5, 7, 9, 11, 13, 15,
-       16, 17, 18, 19, 20, 21, 22, 23,
-       24, 25, 26, 27, 28, 29, 30, 31,
-       32, 32, 33, 33, 34, 34, 35, 35,
-       36, 37, 38, 39, 40, 41, 42, 43,
-       44, 45, 46, 47, 48, 48, 49, 49,
-       50, 51, 52, 53, 54, 55, 56, 57,
-       58, 59, 60, 61, 62, 63, 64, 64,
-       65, 66, 67, 68, 69, 70, 71, 72,
-/* corrected:
-       73,     74,     75,     76,     77,     78,     79,     79,
-   should be: */
-       73, 74, 75, 76, 77, 78, 79, 80,
-       80, 81, 82, 83, 84, 85, 86, 87,
-       88, 89, 90, 91, 92, 93, 94, 95,
-       96, 97, 98, 99, 100, 101, 102, 103,
-       104, 105, 106, 107, 108, 109, 110, 111,
-       112, 113, 114, 115, 116, 117, 118, 119,
-       120, 121, 122, 123, 124, 125, 126, 127
-};
-
-static short search(short val, short *table, short size)
-{
-       short i;
-
-       for (i = 0; i < size; i++) {
-               if (val <= *table++)
-                       return (i);
-       }
-       return (size);
-}
-
-/*
- * linear2alaw() - Convert a 16-bit linear PCM value to 8-bit A-law
- *
- * linear2alaw() accepts an 16-bit integer and encodes it as A-law data.
- *
- *             Linear Input Code       Compressed Code
- *     ------------------------        ---------------
- *     0000000wxyza                    000wxyz
- *     0000001wxyza                    001wxyz
- *     000001wxyzab                    010wxyz
- *     00001wxyzabc                    011wxyz
- *     0001wxyzabcd                    100wxyz
- *     001wxyzabcde                    101wxyz
- *     01wxyzabcdef                    110wxyz
- *     1wxyzabcdefg                    111wxyz
- *
- * For further information see John C. Bellamy's Digital Telephony, 1982,
- * John Wiley & Sons, pps 98-111 and 472-476.
- */
-unsigned char linear2alaw(short pcm_val)
-{                                                              /* 2's complement (16-bit range) */
-       short mask;
-       short seg;
-       unsigned char aval;
-
-       pcm_val = pcm_val >> 3;
-
-       if (pcm_val >= 0) {
-               mask = 0xD5;                    /* sign (7th) bit = 1 */
-       } else {
-               mask = 0x55;                    /* sign bit = 0 */
-               pcm_val = -pcm_val - 1;
-       }
-
-       /* Convert the scaled magnitude to segment number. */
-       seg = search(pcm_val, seg_aend, 8);
-
-       /* Combine the sign, segment, and quantization bits. */
-
-       if (seg >= 8)                           /* out of range, return maximum value. */
-               return (unsigned char) (0x7F ^ mask);
-       else {
-               aval = (unsigned char) seg << SEG_SHIFT;
-               if (seg < 2)
-                       aval |= (pcm_val >> 1) & QUANT_MASK;
-               else
-                       aval |= (pcm_val >> seg) & QUANT_MASK;
-               return (unsigned char)(aval ^ mask);
-       }
-}
-
-/*
- * alaw2linear() - Convert an A-law value to 16-bit linear PCM
- *
- */
-short alaw2linear(unsigned char a_val)
-{
-       short t;
-       short seg;
-
-       a_val ^= 0x55;
-
-       t = (a_val & QUANT_MASK) << 4;
-       seg = (short)(((unsigned) a_val & SEG_MASK) >> SEG_SHIFT);
-       switch (seg) {
-       case 0:
-               t += 8;
-               break;
-       case 1:
-               t += 0x108;
-               break;
-       default:
-               t += 0x108;
-               t <<= seg - 1;
-       }
-       return ((a_val & SIGN_BIT) ? t : -t);
-}
-
-#define        BIAS            (0x84)          /* Bias for linear code. */
-#define CLIP                   8159
-
-/*
-* linear2ulaw() - Convert a linear PCM value to u-law
-*
-* In order to simplify the encoding process, the original linear magnitude
-* is biased by adding 33 which shifts the encoding range from (0 - 8158) to
-* (33 - 8191). The result can be seen in the following encoding table:
-*
-*      Biased Linear Input Code        Compressed Code
-*      ------------------------        ---------------
-*      00000001wxyza                   000wxyz
-*      0000001wxyzab                   001wxyz
-*      000001wxyzabc                   010wxyz
-*      00001wxyzabcd                   011wxyz
-*      0001wxyzabcde                   100wxyz
-*      001wxyzabcdef                   101wxyz
-*      01wxyzabcdefg                   110wxyz
-*      1wxyzabcdefgh                   111wxyz
-*
-* Each biased linear code has a leading 1 which identifies the segment
-* number. The value of the segment number is equal to 7 minus the number
-* of leading 0's. The quantization interval is directly available as the
-* four bits wxyz.  * The trailing bits (a - h) are ignored.
-*
-* Ordinarily the complement of the resulting code word is used for
-* transmission, and so the code word is complemented before it is returned.
-*
-* For further information see John C. Bellamy's Digital Telephony, 1982,
-* John Wiley & Sons, pps 98-111 and 472-476.
-*/
-unsigned char linear2ulaw(short pcm_val)
-{                                                              /* 2's complement (16-bit range) */
-       short mask;
-       short seg;
-       unsigned char uval;
-
-       /* Get the sign and the magnitude of the value. */
-       pcm_val = pcm_val >> 2;
-       if (pcm_val < 0) {
-               pcm_val = -pcm_val;
-               mask = 0x7F;
-       } else {
-               mask = 0xFF;
-       }
-       if (pcm_val > CLIP)
-               pcm_val = CLIP;                 /* clip the magnitude */
-       pcm_val += (BIAS >> 2);
-
-       /* Convert the scaled magnitude to segment number. */
-       seg = search(pcm_val, seg_uend, 8);
-
-       /*
-        * Combine the sign, segment, quantization bits;
-        * and complement the code word.
-        */
-       if (seg >= 8)                           /* out of range, return maximum value. */
-               return (unsigned char) (0x7F ^ mask);
-       else {
-               uval = (unsigned char) ((seg << 4) | ((pcm_val >> (seg + 1)) & 0xF));
-               return (unsigned char) (uval ^ mask);
-       }
-
-}
-
-/*
- * ulaw2linear() - Convert a u-law value to 16-bit linear PCM
- *
- * First, a biased linear code is derived from the code word. An unbiased
- * output can then be obtained by subtracting 33 from the biased code.
- *
- * Note that this function expects to be passed the complement of the
- * original code word. This is in keeping with ISDN conventions.
- */
-short ulaw2linear(unsigned char u_val)
-{
-       short t;
-
-       /* Complement to obtain normal u-law value. */
-       u_val = ~u_val;
-
-       /*
-        * Extract and bias the quantization bits. Then
-        * shift up by the segment number and subtract out the bias.
-        */
-       t = ((u_val & QUANT_MASK) << 3) + BIAS;
-       t <<= ((unsigned) u_val & SEG_MASK) >> SEG_SHIFT;
-
-       return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
-}
-
-/* A-law to u-law conversion */
-unsigned char alaw2ulaw(unsigned char aval)
-{
-       aval &= 0xff;
-       return (unsigned char) ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) : (0x7F ^ _a2u[aval ^ 0x55]));
-}
-
-/* u-law to A-law conversion */
-unsigned char ulaw2alaw(unsigned char uval)
-{
-       uval &= 0xff;
-       return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
-}
-
-/* ---------- end of g711.c ----------------------------------------------------- */
diff --git a/libs/codec/g726/src/g711.h b/libs/codec/g726/src/g711.h
deleted file mode 100644 (file)
index 015c232..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * December 30, 1994:
- * Functions linear2alaw, linear2ulaw have been updated to correctly
- * convert unquantized 16 bit values.
- * Tables for direct u- to A-law and A- to u-law conversions have been
- * corrected.
- * Borge Lindberg, Center for PersonKommunikation, Aalborg University.
- * bli@cpk.auc.dk
- *
- */
-/*
- * Downloaded from comp.speech site in Cambridge.
- *
- */
-
-#ifndef _G711_H_
-#define _G711_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-unsigned char  linear2alaw(short pcm_val);
-short          alaw2linear(unsigned char a_val);
-unsigned char  linear2ulaw(short pcm_val);
-short          ulaw2linear(unsigned char u_val);
-unsigned char  alaw2ulaw(unsigned char aval);
-unsigned char  ulaw2alaw(unsigned char uval);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _G711_H_ */
diff --git a/libs/codec/g726/src/g726_16.c b/libs/codec/g726/src/g726_16.c
deleted file mode 100644 (file)
index 67896c3..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/* 16kbps version created, used 24kbps code and changing as little as possible.
- * G.726 specs are available from ITU's gopher or WWW site (http://www.itu.ch)
- * If any errors are found, please contact me at mrand@tamu.edu
- *      -Marc Randolph
- */
-
-/*
- * g726_16.c
- *
- * Description:
- *
- * g723_16_encoder(), g723_16_decoder()
- *
- * These routines comprise an implementation of the CCITT G.726 16 Kbps
- * ADPCM coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which take advantage
- * of workstation attributes, such as hardware 2's complement arithmetic.
- *
- * The ITU-T G.726 coder is an adaptive differential pulse code modulation
- * (ADPCM) waveform coding algorithm, suitable for coding of digitized
- * telephone bandwidth (0.3-3.4 kHz) speech or audio signals sampled at 8 kHz.
- * This coder operates on a sample-by-sample basis. Input samples may be 
- * represented in linear PCM or companded 8-bit G.711 (m-law/A-law) formats
- * (i.e., 64 kbps). For 32 kbps operation, each sample is converted into a
- * 4-bit quantized difference signal resulting in a compression ratio of 
- * 2:1 over the G.711 format. For 24 kbps 40 kbps operation, the quantized
- * difference signal is 3 bits and 5 bits, respectively.
- *
- * $Log: g726_16.c,v $
- * Revision 1.4  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- *
- */
-#include "g72x.h"
-#include "private.h"
-
-/*
- * Maps G.723_16 code word to reconstructed scale factor normalized log
- * magnitude values.  Comes from Table 11/G.726
- */
-static short   _dqlntab[4] = { 116, 365, 365, 116}; 
-
-/* Maps G.723_16 code word to log of scale factor multiplier.
- *
- * _witab[4] is actually {-22 , 439, 439, -22}, but FILTD wants it
- * as WI << 5  (multiplied by 32), so we'll do that here 
- */
-static short   _witab[4] = {-704, 14048, 14048, -704};
-
-/*
- * Maps G.723_16 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-
-/* Comes from FUNCTF */
-static short   _fitab[4] = {0, 0xE00, 0xE00, 0};
-
-/* Comes from quantizer decision level tables (Table 7/G.726)
- */
-static int qtab_723_16[1] = {261};
-
-
-/*
- * g723_16_encoder()
- *
- * Encodes a linear PCM, A-law or u-law input sample and returns its 2-bit code.
- * Returns -1 if invalid input coding value.
- */
-int
-g726_16_encoder(
-       int             sl,
-       int             in_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             d;                              /* SUBTA */
-       int             y;                              /* MIX */
-       int             i;
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;                  /* ADDC */
-
-       switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-       case AUDIO_ENCODING_ALAW:
-               sl = alaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_ULAW:
-               sl = ulaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_LINEAR:
-               sl >>= 2;               /* sl of 14-bit dynamic range */
-               break;
-       default:
-               return (-1);
-       }
-
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       d = sl - se;                    /* d = estimation diff. */
-
-       /* quantize prediction difference d */
-       y = step_size(state_ptr);       /* quantizer step size */
-       i = quantize(d, y, qtab_723_16, 1);  /* i = ADPCM code */
-
-             /* Since quantize() only produces a three level output
-              * (1, 2, or 3), we must create the fourth one on our own
-              */
-       if (i == 3)                          /* i code for the zero region */
-         if ((d & 0x8000) == 0)             /* If d > 0, i=3 isn't right... */
-           i = 0;
-           
-       dq = reconstruct(i & 2, _dqlntab[i], y); /* quantized diff. */
-
-       sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */
-
-       dqsez = sr + sez - se;          /* pole prediction diff. */
-
-       update(2, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       return (i);
-}
-
-/*
- * g723_16_decoder()
- *
- * Decodes a 2-bit CCITT G.723_16 ADPCM code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g726_16_decoder(
-       int             i,
-       int             out_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             y;                              /* MIX */
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;
-
-       i &= 0x03;                      /* mask to get proper bits */
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       y = step_size(state_ptr);       /* adaptive quantizer step size */
-       dq = reconstruct(i & 0x02, _dqlntab[i], y); /* unquantize pred diff */
-
-       sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */
-
-       dqsez = sr - se + sez;                  /* pole prediction diff. */
-
-       update(2, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       switch (out_coding) {
-       case AUDIO_ENCODING_ALAW:
-               return (tandem_adjust_alaw(sr, se, y, i, 2, qtab_723_16));
-       case AUDIO_ENCODING_ULAW:
-               return (tandem_adjust_ulaw(sr, se, y, i, 2, qtab_723_16));
-       case AUDIO_ENCODING_LINEAR:
-               return (sr << 2);       /* sr was of 14-bit dynamic range */
-       default:
-               return (-1);
-       }
-}
-
diff --git a/libs/codec/g726/src/g726_24.c b/libs/codec/g726/src/g726_24.c
deleted file mode 100644 (file)
index 1bc1baf..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g726_24.c
- *
- * Description:
- *
- * g723_24_encoder(), g723_24_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 24 Kbps
- * ADPCM coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which take advantage
- * of workstation attributes, such as hardware 2's complement arithmetic.
- *
- * The ITU-T G.726 coder is an adaptive differential pulse code modulation
- * (ADPCM) waveform coding algorithm, suitable for coding of digitized
- * telephone bandwidth (0.3-3.4 kHz) speech or audio signals sampled at 8 kHz.
- * This coder operates on a sample-by-sample basis. Input samples may be 
- * represented in linear PCM or companded 8-bit G.711 (m-law/A-law) formats
- * (i.e., 64 kbps). For 32 kbps operation, each sample is converted into a
- * 4-bit quantized difference signal resulting in a compression ratio of 
- * 2:1 over the G.711 format. For 24 kbps 40 kbps operation, the quantized
- * difference signal is 3 bits and 5 bits, respectively.
- *
- * $Log: g726_24.c,v $
- * Revision 1.4  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- */
-#include "g72x.h"
-#include "private.h"
-
-/*
- * Maps G.723_24 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short   _dqlntab[8] = {-2048, 135, 273, 373, 373, 273, 135, -2048};
-
-/* Maps G.723_24 code word to log of scale factor multiplier. */
-static short   _witab[8] = {-128, 960, 4384, 18624, 18624, 4384, 960, -128};
-
-/*
- * Maps G.723_24 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short   _fitab[8] = {0, 0x200, 0x400, 0xE00, 0xE00, 0x400, 0x200, 0};
-
-static int qtab_723_24[3] = {8, 218, 331};
-
-/*
- * g723_24_encoder()
- *
- * Encodes a linear PCM, A-law or u-law input sample and returns its 3-bit code.
- * Returns -1 if invalid input coding value.
- */
-int
-g726_24_encoder(
-       int             sl,
-       int             in_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sei;
-       int             sez;                    /* ACCUM */
-       int             se;
-       int             d;                              /* SUBTA */
-       int             y;                              /* MIX */
-       int             i;
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;                  /* ADDC */
-
-       switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-       case AUDIO_ENCODING_ALAW:
-               sl = alaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_ULAW:
-               sl = ulaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_LINEAR:
-               sl >>= 2;               /* sl of 14-bit dynamic range */
-               break;
-       default:
-               return (-1);
-       }
-
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       d = sl - se;                    /* d = estimation diff. */
-
-       /* quantize prediction difference d */
-       y = step_size(state_ptr);       /* quantizer step size */
-       i = quantize(d, y, qtab_723_24, 3);     /* i = ADPCM code */
-       dq = reconstruct(i & 4, _dqlntab[i], y); /* quantized diff. */
-
-       sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq; /* reconstructed signal */
-
-       dqsez = sr + sez - se;          /* pole prediction diff. */
-
-       update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       return (i);
-}
-
-/*
- * g723_24_decoder()
- *
- * Decodes a 3-bit CCITT G.723_24 ADPCM code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g726_24_decoder(
-       int             i,
-       int             out_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             y;                              /* MIX */
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;
-
-       i &= 0x07;                              /* mask to get proper bits */
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       y = step_size(state_ptr);       /* adaptive quantizer step size */
-       dq = reconstruct(i & 0x04, _dqlntab[i], y); /* unquantize pred diff */
-
-       sr = (dq < 0) ? (se - (dq & 0x3FFF)) : (se + dq); /* reconst. signal */
-
-       dqsez = sr - se + sez;                  /* pole prediction diff. */
-
-       update(3, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       switch (out_coding) {
-       case AUDIO_ENCODING_ALAW:
-               return (tandem_adjust_alaw(sr, se, y, i, 4, qtab_723_24));
-       case AUDIO_ENCODING_ULAW:
-               return (tandem_adjust_ulaw(sr, se, y, i, 4, qtab_723_24));
-       case AUDIO_ENCODING_LINEAR:
-               return (sr << 2);       /* sr was of 14-bit dynamic range */
-       default:
-               return (-1);
-       }
-}
-
diff --git a/libs/codec/g726/src/g726_32.c b/libs/codec/g726/src/g726_32.c
deleted file mode 100644 (file)
index 35e2277..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g726_32.c
- *
- * Description:
- *
- * g721_encoder(), g721_decoder()
- *
- * These routines comprise an implementation of the CCITT G.721 ADPCM
- * coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of work station attributes, such as hardware 2's
- * complement arithmetic and large memory.  Specifically, certain time
- * consuming operations such as multiplications are replaced
- * with lookup tables and software 2's complement operations are
- * replaced with hardware 2's complement.
- *
- * The deviation from the bit level specification (lookup tables)
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.721 Recommendation, the algorithm is broken
- * down into modules.  Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- * The ITU-T G.726 coder is an adaptive differential pulse code modulation
- * (ADPCM) waveform coding algorithm, suitable for coding of digitized
- * telephone bandwidth (0.3-3.4 kHz) speech or audio signals sampled at 8 kHz.
- * This coder operates on a sample-by-sample basis. Input samples may be 
- * represented in linear PCM or companded 8-bit G.711 (m-law/A-law) formats
- * (i.e., 64 kbps). For 32 kbps operation, each sample is converted into a
- * 4-bit quantized difference signal resulting in a compression ratio of 
- * 2:1 over the G.711 format. For 24 kbps 40 kbps operation, the quantized
- * difference signal is 3 bits and 5 bits, respectively.
- *
- * $Log: g726_32.c,v $
- * Revision 1.5  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- */
-#include "g72x.h"
-#include "private.h"
-
-static int qtab_721[7] = {-124, 80, 178, 246, 300, 349, 400};
-/*
- * Maps G.721 code word to reconstructed scale factor normalized log
- * magnitude values.
- */
-static short   _dqlntab[16] = {-2048, 4, 135, 213, 273, 323, 373, 425,
-                               425, 373, 323, 273, 213, 135, 4, -2048};
-
-/* Maps G.721 code word to log of scale factor multiplier. */
-static short   _witab[16] = {-12, 18, 41, 64, 112, 198, 355, 1122,
-                               1122, 355, 198, 112, 64, 41, 18, -12};
-/*
- * Maps G.721 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short   _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
-                               0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
-
-/*
- * g721_encoder()
- *
- * Encodes the input vale of linear PCM, A-law or u-law data sl and returns
- * the resulting code. -1 is returned for unknown input coding value.
- */
-int
-g726_32_encoder(
-       int             sl,
-       int             in_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             se;
-       int             d;                              /* SUBTA */
-       int             y;                              /* MIX */
-       int             i;
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;                  /* ADDC */
-
-       switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-       case AUDIO_ENCODING_ALAW:
-               sl = alaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_ULAW:
-               sl = ulaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_LINEAR:
-               sl >>= 2;                       /* 14-bit dynamic range */
-               break;
-       default:
-               return (-1);
-       }
-
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       se = (sezi + predictor_pole(state_ptr)) >> 1;   /* estimated signal */
-
-       d = sl - se;                            /* estimation difference */
-
-       /* quantize the prediction difference */
-       y = step_size(state_ptr);               /* quantizer step size */
-       i = quantize(d, y, qtab_721, 7);        /* i = ADPCM code */
-
-       dq = reconstruct(i & 8, _dqlntab[i], y);        /* quantized est diff */
-
-       sr = (dq < 0) ? se - (dq & 0x3FFF) : se + dq;   /* reconst. signal */
-
-       dqsez = sr + sez - se;                  /* pole prediction diff. */
-
-       update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
-       return (i);
-}
-
-/*
- * g721_decoder()
- *
- * Description:
- *
- * Decodes a 4-bit code of G.721 encoded data of i and
- * returns the resulting linear PCM, A-law or u-law value.
- * return -1 for unknown out_coding value.
- */
-int
-g726_32_decoder(
-       int             i,
-       int             out_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             y;                              /* MIX */
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;
-       long    lino;
-
-       i &= 0x0f;                              /* mask to get proper bits */
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       y = step_size(state_ptr);       /* dynamic quantizer step size */
-
-       dq = reconstruct(i & 0x08, _dqlntab[i], y); /* quantized diff. */
-
-       sr = (dq < 0) ? (se - (dq & 0x3FFF)) : se + dq; /* reconst. signal */
-
-       dqsez = sr - se + sez;                  /* pole prediction diff. */
-
-       update(4, y, _witab[i] << 5, _fitab[i], dq, sr, dqsez, state_ptr);
-
-       switch (out_coding) {
-       case AUDIO_ENCODING_ALAW:
-               return (tandem_adjust_alaw(sr, se, y, i, 8, qtab_721));
-       case AUDIO_ENCODING_ULAW:
-               return (tandem_adjust_ulaw(sr, se, y, i, 8, qtab_721));
-       case AUDIO_ENCODING_LINEAR:
-        lino = (long)sr << 2;  /* this seems to overflow a short*/
-               lino = lino > 32767 ? 32767 : lino;
-               lino = lino < -32768 ? -32768 : lino;
-               return lino;//(sr << 2);        /* sr was 14-bit dynamic range */
-       default:
-               return (-1);
-       }
-}
-
diff --git a/libs/codec/g726/src/g726_40.c b/libs/codec/g726/src/g726_40.c
deleted file mode 100644 (file)
index 82251a7..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g726_40.c
- *
- * Description:
- *
- * g723_40_encoder(), g723_40_decoder()
- *
- * These routines comprise an implementation of the CCITT G.723 40Kbps
- * ADPCM coding algorithm.  Essentially, this implementation is identical to
- * the bit level description except for a few deviations which
- * take advantage of workstation attributes, such as hardware 2's
- * complement arithmetic.
- *
- * The deviation from the bit level specification (lookup tables),
- * preserves the bit level performance specifications.
- *
- * As outlined in the G.723 Recommendation, the algorithm is broken
- * down into modules.  Each section of code below is preceded by
- * the name of the module which it is implementing.
- *
- * The ITU-T G.726 coder is an adaptive differential pulse code modulation
- * (ADPCM) waveform coding algorithm, suitable for coding of digitized
- * telephone bandwidth (0.3-3.4 kHz) speech or audio signals sampled at 8 kHz.
- * This coder operates on a sample-by-sample basis. Input samples may be 
- * represented in linear PCM or companded 8-bit G.711 (m-law/A-law) formats
- * (i.e., 64 kbps). For 32 kbps operation, each sample is converted into a
- * 4-bit quantized difference signal resulting in a compression ratio of 
- * 2:1 over the G.711 format. For 24 kbps 40 kbps operation, the quantized
- * difference signal is 3 bits and 5 bits, respectively.
- *
- * $Log: g726_40.c,v $
- * Revision 1.4  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- */
-
-#include "g72x.h"
-#include "private.h"
-
-/*
- * Maps G.723_40 code word to ructeconstructed scale factor normalized log
- * magnitude values.
- */
-static short   _dqlntab[32] = {-2048, -66, 28, 104, 169, 224, 274, 318,
-                               358, 395, 429, 459, 488, 514, 539, 566,
-                               566, 539, 514, 488, 459, 429, 395, 358,
-                               318, 274, 224, 169, 104, 28, -66, -2048};
-
-/* Maps G.723_40 code word to log of scale factor multiplier. */
-static short   _witab[32] = {448, 448, 768, 1248, 1280, 1312, 1856, 3200,
-                       4512, 5728, 7008, 8960, 11456, 14080, 16928, 22272,
-                       22272, 16928, 14080, 11456, 8960, 7008, 5728, 4512,
-                       3200, 1856, 1312, 1280, 1248, 768, 448, 448};
-
-/*
- * Maps G.723_40 code words to a set of values whose long and short
- * term averages are computed and then compared to give an indication
- * how stationary (steady state) the signal is.
- */
-static short   _fitab[32] = {0, 0, 0, 0, 0, 0x200, 0x200, 0x200,
-                       0x200, 0x200, 0x400, 0x600, 0x800, 0xA00, 0xC00, 0xC00,
-                       0xC00, 0xC00, 0xA00, 0x800, 0x600, 0x400, 0x200, 0x200,
-                       0x200, 0x200, 0x200, 0, 0, 0, 0, 0};
-
-static int qtab_723_40[15] = {-122, -16, 68, 139, 198, 250, 298, 339,
-                               378, 413, 445, 475, 502, 528, 553};
-
-/*
- * g723_40_encoder()
- *
- * Encodes a 16-bit linear PCM, A-law or u-law input sample and returns
- * the resulting 5-bit CCITT G.723 40Kbps code.
- * Returns -1 if the input coding value is invalid.
- */
-int
-g726_40_encoder(
-       int             sl,
-       int             in_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             d;                              /* SUBTA */
-       int             y;                              /* MIX */
-       int             i;
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;                  /* ADDC */
-
-       switch (in_coding) {    /* linearize input sample to 14-bit PCM */
-       case AUDIO_ENCODING_ALAW:
-               sl = alaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_ULAW:
-               sl = ulaw2linear(sl) >> 2;
-               break;
-       case AUDIO_ENCODING_LINEAR:
-               sl >>= 2;               /* sl of 14-bit dynamic range */
-               break;
-       default:
-               return (-1);
-       }
-
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       d = sl - se;                    /* d = estimation difference */
-
-       /* quantize prediction difference */
-       y = step_size(state_ptr);       /* adaptive quantizer step size */
-       i = quantize(d, y, qtab_723_40, 15);    /* i = ADPCM code */
-
-       dq = reconstruct(i & 0x10, _dqlntab[i], y);     /* quantized diff */
-
-       sr = (dq < 0) ? se - (dq & 0x7FFF) : se + dq; /* reconstructed signal */
-
-       dqsez = sr + sez - se;          /* dqsez = pole prediction diff. */
-
-       update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       return (i);
-}
-
-/*
- * g723_40_decoder()
- *
- * Decodes a 5-bit CCITT G.723 40Kbps code and returns
- * the resulting 16-bit linear PCM, A-law or u-law sample value.
- * -1 is returned if the output coding is unknown.
- */
-int
-g726_40_decoder(
-       int             i,
-       int             out_coding,
-       g726_state *state_ptr)
-{
-       int             sezi;
-       int             sez;                    /* ACCUM */
-       int             sei;
-       int             se;
-       int             y;                              /* MIX */
-       int             dq;
-       int             sr;                             /* ADDB */
-       int             dqsez;
-
-       i &= 0x1f;                              /* mask to get proper bits */
-       sezi = predictor_zero(state_ptr);
-       sez = sezi >> 1;
-       sei = sezi + predictor_pole(state_ptr);
-       se = sei >> 1;                  /* se = estimated signal */
-
-       y = step_size(state_ptr);       /* adaptive quantizer step size */
-       dq = reconstruct(i & 0x10, _dqlntab[i], y);     /* estimation diff. */
-
-       sr = (dq < 0) ? (se - (dq & 0x7FFF)) : (se + dq); /* reconst. signal */
-
-       dqsez = sr - se + sez;          /* pole prediction diff. */
-
-       update(5, y, _witab[i], _fitab[i], dq, sr, dqsez, state_ptr);
-
-       switch (out_coding) {
-       case AUDIO_ENCODING_ALAW:
-               return (tandem_adjust_alaw(sr, se, y, i, 0x10, qtab_723_40));
-       case AUDIO_ENCODING_ULAW:
-               return (tandem_adjust_ulaw(sr, se, y, i, 0x10, qtab_723_40));
-       case AUDIO_ENCODING_LINEAR:
-               return (sr << 2);       /* sr was of 14-bit dynamic range */
-       default:
-               return (-1);
-       }
-}
-
diff --git a/libs/codec/g726/src/g72x.c b/libs/codec/g726/src/g72x.c
deleted file mode 100644 (file)
index 32c330a..0000000
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * $Log: g72x.c,v $
- * Revision 1.3  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- * Common routines for G.721 and G.723 conversions.
- */
-
-#include "g72x.h"
-#include "private.h"
-
-static int power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
-                       0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000};
-
-#ifndef abs
-#define abs(n) ((n)<0 ? -(n) : (n))
-#endif
-
-/*
- * quan()
- *
- * quantizes the input val against the table of size short integers.
- * It returns i if table[i - 1] <= val < table[i].
- *
- * Using linear search for simple coding.
- */
-static int
-quan(
-       int             val,
-       int *   table,
-       int             size)
-{
-       int             i;
-
-       for (i = 0; i < size; i++)
-               if (val < *table++)
-                       break;
-       return (i);
-}
-
-/*
- * fmult()
- *
- * returns the integer product of the 14-bit integer "an" and
- * "floating point" representation (4-bit exponent, 6-bit mantessa) "srn".
- */
-static int
-fmult(
-       int             an,
-       int             srn)
-{
-       int anmag;
-       int anexp;
-       int anmant;
-       int wanexp;
-       int wanmant;
-       int retval;
-
-       anmag = (an > 0) ? an : ((-an) & 0x1FFF);
-       anexp = quan(anmag, power2, 15) - 6;
-       anmant = (anmag == 0) ? 32 :
-           (anexp >= 0) ? anmag >> anexp : anmag << -anexp;
-       wanexp = anexp + ((srn >> 6) & 0xF) - 13;
-
-       wanmant = (anmant * (srn & 077) + 0x30) >> 4;
-       retval = (wanexp >= 0) ? ((wanmant << wanexp) & 0x7FFF) :
-           (wanmant >> -wanexp);
-
-       return (((an ^ srn) < 0) ? -retval : retval);
-}
-
-/*
- * g72x_init_state()
- *
- * This routine initializes and/or resets the g72x_state structure
- * pointed to by 'state_ptr'.
- * All the initial state values are specified in the CCITT G.721 document.
- */
-void
-g726_init_state(
-       g726_state *state_ptr)
-{
-       int             cnta;
-
-       state_ptr->yl = 34816;
-       state_ptr->yu = 544;
-       state_ptr->dms = 0;
-       state_ptr->dml = 0;
-       state_ptr->ap = 0;
-       for (cnta = 0; cnta < 2; cnta++) {
-               state_ptr->a[cnta] = 0;
-               state_ptr->pk[cnta] = 0;
-               state_ptr->sr[cnta] = 32;
-       }
-       for (cnta = 0; cnta < 6; cnta++) {
-               state_ptr->b[cnta] = 0;
-               state_ptr->dq[cnta] = 32;
-       }
-       state_ptr->td = 0;
-}
-
-/*
- * predictor_zero()
- *
- * computes the estimated signal from 6-zero predictor.
- *
- */
-int
-predictor_zero(
-       g726_state *state_ptr)
-{
-       int             i;
-       int             sezi;
-
-       sezi = fmult(state_ptr->b[0] >> 2, state_ptr->dq[0]);
-       for (i = 1; i < 6; i++)                 /* ACCUM */
-               sezi += fmult(state_ptr->b[i] >> 2, state_ptr->dq[i]);
-       return (sezi);
-}
-/*
- * predictor_pole()
- *
- * computes the estimated signal from 2-pole predictor.
- *
- */
-int
-predictor_pole(
-       g726_state *state_ptr)
-{
-       return (fmult(state_ptr->a[1] >> 2, state_ptr->sr[1]) +
-           fmult(state_ptr->a[0] >> 2, state_ptr->sr[0]));
-}
-/*
- * step_size()
- *
- * computes the quantization step size of the adaptive quantizer.
- *
- */
-int
-step_size(
-       g726_state *state_ptr)
-{
-       int             y;
-       int             dif;
-       int             al;
-
-       if (state_ptr->ap >= 256)
-               return (state_ptr->yu);
-       else {
-               y = state_ptr->yl >> 6;
-               dif = state_ptr->yu - y;
-               al = state_ptr->ap >> 2;
-               if (dif > 0)
-                       y += (dif * al) >> 6;
-               else if (dif < 0)
-                       y += (dif * al + 0x3F) >> 6;
-               return (y);
-       }
-}
-
-/*
- * quantize()
- *
- * Given a raw sample, 'd', of the difference signal and a
- * quantization step size scale factor, 'y', this routine returns the
- * ADPCM codeword to which that sample gets quantized.  The step
- * size scale factor division operation is done in the log base 2 domain
- * as a subtraction.
- */
-int
-quantize(
-       int             d,      /* Raw difference signal sample */
-       int             y,      /* Step size multiplier */
-       int     *       table,  /* quantization table */
-       int             size)   /* table size of integers */
-{
-       int             dqm;    /* Magnitude of 'd' */
-       int             exp;    /* Integer part of base 2 log of 'd' */
-       int             mant;   /* Fractional part of base 2 log */
-       int             dl;     /* Log of magnitude of 'd' */
-       int             dln;    /* Step size scale factor normalized log */
-       int             i;
-
-       /*
-        * LOG
-        *
-        * Compute base 2 log of 'd', and store in 'dl'.
-        */
-       dqm = abs(d);
-       exp = quan(dqm >> 1, power2, 15);
-       mant = ((dqm << 7) >> exp) & 0x7F;      /* Fractional portion. */
-       dl = (exp << 7) + mant;
-
-       /*
-        * SUBTB
-        *
-        * "Divide" by step size multiplier.
-        */
-       dln = dl - (y >> 2);
-
-       /*
-        * QUAN
-        *
-        * Obtain codword i for 'd'.
-        */
-       i = quan(dln, table, size);
-       if (d < 0)                      /* take 1's complement of i */
-               return ((size << 1) + 1 - i);
-       else if (i == 0)                /* take 1's complement of 0 */
-               return ((size << 1) + 1); /* new in 1988 */
-       else
-               return (i);
-}
-/*
- * reconstruct()
- *
- * Returns reconstructed difference signal 'dq' obtained from
- * codeword 'i' and quantization step size scale factor 'y'.
- * Multiplication is performed in log base 2 domain as addition.
- */
-int
-reconstruct(
-       int             sign,   /* 0 for non-negative value */
-       int             dqln,   /* G.72x codeword */
-       int             y)              /* Step size multiplier */
-{
-       int             dql;    /* Log of 'dq' magnitude */
-       int             dex;    /* Integer part of log */
-       int             dqt;
-       int             dq;             /* Reconstructed difference signal sample */
-
-       dql = dqln + (y >> 2);  /* ADDA */
-
-       if (dql < 0) {
-               return ((sign) ? -0x8000 : 0);
-       } else {                /* ANTILOG */
-               dex = (dql >> 7) & 15;
-               dqt = 128 + (dql & 127);
-               dq = (short)((dqt << 7) >> (14 - dex));
-               return ((sign) ? (dq - 0x8000) : dq);
-       }
-}
-
-
-/*
- * update()
- *
- * updates the state variables for each output code
- */
-void
-update(
-       int             code_size,      /* distinguish 723_40 with others */
-       int             y,              /* quantizer step size */
-       int             wi,             /* scale factor multiplier */
-       int             fi,             /* for long/short term energies */
-       int             dq,             /* quantized prediction difference */
-       int             sr,             /* reconstructed signal */
-       int             dqsez,          /* difference from 2-pole predictor */
-       g726_state *state_ptr)  /* coder state pointer */
-{
-       int             cnt;
-       int             mag, exp;       /* Adaptive predictor, FLOAT A */
-       int             a2p;            /* LIMC */
-       int             a1ul;           /* UPA1 */
-       int             pks1;           /* UPA2 */
-       int             fa1;
-       int             tr;                     /* tone/transition detector */
-       int             ylint, thr2, dqthr;
-       int     ylfrac, thr1;
-       int             pk0;
-
-       pk0 = (dqsez < 0) ? 1 : 0;      /* needed in updating predictor poles */
-
-       mag = dq & 0x7FFF;              /* prediction difference magnitude */
-       /* TRANS */
-       ylint = state_ptr->yl >> 15;    /* exponent part of yl */
-       ylfrac = (state_ptr->yl >> 10) & 0x1F;  /* fractional part of yl */
-       thr1 = (32 + ylfrac) << ylint;          /* threshold */
-       thr2 = (ylint > 9) ? 31 << 10 : thr1;   /* limit thr2 to 31 << 10 */
-       dqthr = (thr2 + (thr2 >> 1)) >> 1;      /* dqthr = 0.75 * thr2 */
-       if (state_ptr->td == 0)         /* signal supposed voice */
-               tr = 0;
-       else if (mag <= dqthr)          /* supposed data, but small mag */
-               tr = 0;                 /* treated as voice */
-       else                            /* signal is data (modem) */
-               tr = 1;
-
-       /*
-        * Quantizer scale factor adaptation.
-        */
-
-       /* FUNCTW & FILTD & DELAY */
-       /* update non-steady state step size multiplier */
-       state_ptr->yu = y + ((wi - y) >> 5);
-
-       /* LIMB */
-       if (state_ptr->yu < 544)        /* 544 <= yu <= 5120 */
-               state_ptr->yu = 544;
-       else if (state_ptr->yu > 5120)
-               state_ptr->yu = 5120;
-
-       /* FILTE & DELAY */
-       /* update steady state step size multiplier */
-       state_ptr->yl += state_ptr->yu + ((-state_ptr->yl) >> 6);
-
-       /*
-        * Adaptive predictor coefficients.
-        */
-       if (tr == 1) {                  /* reset a's and b's for modem signal */
-               state_ptr->a[0] = 0;
-               state_ptr->a[1] = 0;
-               state_ptr->b[0] = 0;
-               state_ptr->b[1] = 0;
-               state_ptr->b[2] = 0;
-               state_ptr->b[3] = 0;
-               state_ptr->b[4] = 0;
-               state_ptr->b[5] = 0;
-               a2p = 0 ;
-       } else {                        /* update a's and b's */
-               pks1 = pk0 ^ state_ptr->pk[0];          /* UPA2 */
-
-               /* update predictor pole a[1] */
-               a2p = state_ptr->a[1] - (state_ptr->a[1] >> 7);
-               if (dqsez != 0) {
-                       fa1 = (pks1) ? state_ptr->a[0] : -state_ptr->a[0];
-                       if (fa1 < -8191)        /* a2p = function of fa1 */
-                               a2p -= 0x100;
-                       else if (fa1 > 8191)
-                               a2p += 0xFF;
-                       else
-                               a2p += fa1 >> 5;
-
-                       if (pk0 ^ state_ptr->pk[1])
-                               /* LIMC */
-                               if (a2p <= -12160)
-                                       a2p = -12288;
-                               else if (a2p >= 12416)
-                                       a2p = 12288;
-                               else
-                                       a2p -= 0x80;
-                       else if (a2p <= -12416)
-                               a2p = -12288;
-                       else if (a2p >= 12160)
-                               a2p = 12288;
-                       else
-                               a2p += 0x80;
-               }
-
-               /* TRIGB & DELAY */
-               state_ptr->a[1] = a2p;
-
-               /* UPA1 */
-               /* update predictor pole a[0] */
-               state_ptr->a[0] -= state_ptr->a[0] >> 8;
-               if (dqsez != 0) {
-                       if (pks1 == 0) {
-                               state_ptr->a[0] += 192;
-                       } else {
-                               state_ptr->a[0] -= 192;
-                       }
-               }
-               /* LIMD */
-               a1ul = 15360 - a2p;
-               if (state_ptr->a[0] < -a1ul)
-                       state_ptr->a[0] = -a1ul;
-               else if (state_ptr->a[0] > a1ul)
-                       state_ptr->a[0] = a1ul;
-
-               /* UPB : update predictor zeros b[6] */
-               for (cnt = 0; cnt < 6; cnt++) {
-                       if (code_size == 5)             /* for 40Kbps G.723 */
-                               state_ptr->b[cnt] -= state_ptr->b[cnt] >> 9;
-                       else                    /* for G.721 and 24Kbps G.723 */
-                               state_ptr->b[cnt] -= state_ptr->b[cnt] >> 8;
-                       if (dq & 0x7FFF) {                      /* XOR */
-                               if ((dq ^ state_ptr->dq[cnt]) >= 0)
-                                       state_ptr->b[cnt] += 128;
-                               else
-                                       state_ptr->b[cnt] -= 128;
-                       }
-               }
-       }
-
-       for (cnt = 5; cnt > 0; cnt--)
-               state_ptr->dq[cnt] = state_ptr->dq[cnt-1];
-       /* FLOAT A : convert dq[0] to 4-bit exp, 6-bit mantissa f.p. */
-       if (mag == 0) {
-               state_ptr->dq[0] = (dq >= 0) ? 0x20 : 0xFC20;
-       } else {
-               exp = quan(mag, power2, 15);
-               state_ptr->dq[0] = (short)((dq >= 0) ?
-                   (exp << 6) + ((mag << 6) >> exp) :
-                   (exp << 6) + ((mag << 6) >> exp) - 0x400);
-       }
-
-       state_ptr->sr[1] = state_ptr->sr[0];
-       /* FLOAT B : convert sr to 4-bit exp., 6-bit mantissa f.p. */
-       if (sr == 0) {
-               state_ptr->sr[0] = 0x20;
-       } else if (sr > 0) {
-               exp = quan(sr, power2, 15);
-               state_ptr->sr[0] = (exp << 6) + ((sr << 6) >> exp);
-       } else if (sr > -32768) {
-               mag = -sr;
-               exp = quan(mag, power2, 15);
-               state_ptr->sr[0] =  (exp << 6) + ((mag << 6) >> exp) - 0x400;
-       } else
-               state_ptr->sr[0] = 0xFC20;
-
-       /* DELAY A */
-       state_ptr->pk[1] = state_ptr->pk[0];
-       state_ptr->pk[0] = pk0;
-
-       /* TONE */
-       if (tr == 1)            /* this sample has been treated as data */
-               state_ptr->td = 0;      /* next one will be treated as voice */
-       else if (a2p < -11776)  /* small sample-to-sample correlation */
-               state_ptr->td = 1;      /* signal may be data */
-       else                            /* signal is voice */
-               state_ptr->td = 0;
-
-       /*
-        * Adaptation speed control.
-        */
-       state_ptr->dms += (fi - state_ptr->dms) >> 5;           /* FILTA */
-       state_ptr->dml += (((fi << 2) - state_ptr->dml) >> 7);  /* FILTB */
-
-       if (tr == 1)
-               state_ptr->ap = 256;
-       else if (y < 1536)                                      /* SUBTC */
-               state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-       else if (state_ptr->td == 1)
-               state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-       else if (abs((state_ptr->dms << 2) - state_ptr->dml) >=
-           (state_ptr->dml >> 3))
-               state_ptr->ap += (0x200 - state_ptr->ap) >> 4;
-       else
-               state_ptr->ap += (-state_ptr->ap) >> 4;
-}
-
-/*
- * tandem_adjust(sr, se, y, i, sign)
- *
- * At the end of ADPCM decoding, it simulates an encoder which may be receiving
- * the output of this decoder as a tandem process. If the output of the
- * simulated encoder differs from the input to this decoder, the decoder output
- * is adjusted by one level of A-law or u-law codes.
- *
- * Input:
- *     sr      decoder output linear PCM sample,
- *     se      predictor estimate sample,
- *     y       quantizer step size,
- *     i       decoder input code,
- *     sign    sign bit of code i
- *
- * Return:
- *     adjusted A-law or u-law compressed sample.
- */
-int
-tandem_adjust_alaw(
-       int             sr,     /* decoder output linear PCM sample */
-       int             se,     /* predictor estimate sample */
-       int             y,      /* quantizer step size */
-       int             i,      /* decoder input code */
-       int             sign,
-       int *   qtab)
-{
-       int             sp;     /* A-law compressed 8-bit code */
-       int             dx;     /* prediction error */
-       int             id;     /* quantized prediction error */
-       int             sd;     /* adjusted A-law decoded sample value */
-       int             im;     /* biased magnitude of i */
-       int             imx;    /* biased magnitude of id */
-
-       if (sr <= -32768)
-               sr = -1;
-       sp = linear2alaw((sr >> 1) << 3);       /* short to A-law compression */
-       dx = (alaw2linear(sp) >> 2) - se;       /* 16-bit prediction error */
-       id = quantize(dx, y, qtab, sign - 1);
-
-       if (id == i) {                  /* no adjustment on sp */
-               return (sp);
-       } else {                        /* sp adjustment needed */
-               /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
-               im = i ^ sign;          /* 2's complement to biased unsigned */
-               imx = id ^ sign;
-
-               if (imx > im) {         /* sp adjusted to next lower value */
-                       if (sp & 0x80) {
-                               sd = (sp == 0xD5) ? 0x55 :
-                                   ((sp ^ 0x55) - 1) ^ 0x55;
-                       } else {
-                               sd = (sp == 0x2A) ? 0x2A :
-                                   ((sp ^ 0x55) + 1) ^ 0x55;
-                       }
-               } else {                /* sp adjusted to next higher value */
-                       if (sp & 0x80)
-                               sd = (sp == 0xAA) ? 0xAA :
-                                   ((sp ^ 0x55) + 1) ^ 0x55;
-                       else
-                               sd = (sp == 0x55) ? 0xD5 :
-                                   ((sp ^ 0x55) - 1) ^ 0x55;
-               }
-               return (sd);
-       }
-}
-
-int
-tandem_adjust_ulaw(
-       int             sr,     /* decoder output linear PCM sample */
-       int             se,     /* predictor estimate sample */
-       int             y,      /* quantizer step size */
-       int             i,      /* decoder input code */
-       int             sign,
-       int *   qtab)
-{
-       int             sp;     /* u-law compressed 8-bit code */
-       int             dx;     /* prediction error */
-       int             id;     /* quantized prediction error */
-       int             sd;     /* adjusted u-law decoded sample value */
-       int             im;     /* biased magnitude of i */
-       int             imx;    /* biased magnitude of id */
-
-       if (sr <= -32768)
-               sr = 0;
-       sp = linear2ulaw(sr << 2);      /* short to u-law compression */
-       dx = (ulaw2linear(sp) >> 2) - se;       /* 16-bit prediction error */
-       id = quantize(dx, y, qtab, sign - 1);
-       if (id == i) {
-               return (sp);
-       } else {
-               /* ADPCM codes : 8, 9, ... F, 0, 1, ... , 6, 7 */
-               im = i ^ sign;          /* 2's complement to biased unsigned */
-               imx = id ^ sign;
-               if (imx > im) {         /* sp adjusted to next lower value */
-                       if (sp & 0x80)
-                               sd = (sp == 0xFF) ? 0x7E : sp + 1;
-                       else
-                               sd = (sp == 0) ? 0 : sp - 1;
-
-               } else {                /* sp adjusted to next higher value */
-                       if (sp & 0x80)
-                               sd = (sp == 0x80) ? 0x80 : sp - 1;
-                       else
-                               sd = (sp == 0x7F) ? 0xFE : sp + 1;
-               }
-               return (sd);
-       }
-}
-
-/* Allocate and Init. codec struct */
-
diff --git a/libs/codec/g726/src/g72x.h b/libs/codec/g726/src/g72x.h
deleted file mode 100644 (file)
index 2e472b9..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use.  Users may copy or modify this source code without
- * charge.
- *
- * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
- * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * g72x.h
- *
- * Header file for CCITT conversion routines.
- *
- */
-#ifndef _G72X_H
-#define        _G72X_H
-
-#define        AUDIO_ENCODING_ULAW     (1)     /* ISDN u-law */
-#define        AUDIO_ENCODING_ALAW     (2)     /* ISDN A-law */
-#define        AUDIO_ENCODING_LINEAR   (3)     /* PCM 2's-complement (0-center) */
-
-/*
- * The following is the definition of the state structure
- * used by the G.721/G.723 encoder and decoder to preserve their internal
- * state between successive calls.  The meanings of the majority
- * of the state structure fields are explained in detail in the
- * CCITT Recommendation G.721.  The field names are essentially indentical
- * to variable names in the bit level description of the coding algorithm
- * included in this Recommendation.
- */
-typedef struct g726_state_s {
-       long yl;        /* Locked or steady state step size multiplier. */
-       int yu;         /* Unlocked or non-steady state step size multiplier. */
-       int dms;        /* Short term energy estimate. */
-       int dml;        /* Long term energy estimate. */
-       int ap;         /* Linear weighting coefficient of 'yl' and 'yu'. */
-
-       int a[2];       /* Coefficients of pole portion of prediction filter. */
-       int b[6];       /* Coefficients of zero portion of prediction filter. */
-       int pk[2];      /* Signs of previous two samples of a partially
-                                * reconstructed signal. */
-       short dq[6];/* int here fails in newupdate on encode!
-                                * Previous 6 samples of the quantized difference
-                                * signal represented in an internal floating point
-                                * format.
-                                */
-       int sr[2];      /* Previous 2 samples of the quantized difference
-                                * signal represented in an internal floating point
-                                * format. */
-       int td;         /* delayed tone detect, new in 1988 version */
-} g726_state;
-
-/* External function definitions. */
-
-void g726_init_state( g726_state *);
-
-int g726_32_encoder(
-               int sample,
-               int in_coding,
-                g726_state *state_ptr);
-int g726_32_decoder(
-               int code,
-               int out_coding,
-                g726_state *state_ptr);
-int g726_16_encoder(
-        int sample,
-        int in_coding,
-         g726_state *state_ptr);
-int g726_16_decoder(
-        int code,
-        int out_coding,
-         g726_state *state_ptr);
-int g726_24_encoder(
-               int sample,
-               int in_coding,
-                g726_state *state_ptr);
-int g726_24_decoder(
-               int code,
-               int out_coding,
-                g726_state *state_ptr);
-int g726_40_encoder(
-               int sample,
-               int in_coding,
-                g726_state *state_ptr);
-int g726_40_decoder(
-               int code,
-               int out_coding,
-                g726_state *state_ptr);
-
-#endif /* !_G72X_H */
-
diff --git a/libs/codec/g726/src/private.h b/libs/codec/g726/src/private.h
deleted file mode 100644 (file)
index 30b5e1a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- *
- * $Log: private.h,v $
- * Revision 1.4  2002/11/20 04:29:13  robertj
- * Included optimisations for G.711 and G.726 codecs, thanks Ted Szoczei
- *
- * Revision 1.1  2002/02/11 23:24:23  robertj
- * Updated to openH323 v1.8.0
- *
- * Revision 1.2  2002/02/10 21:14:54  dereks
- * Add cvs log history to head of the file.
- * Ensure file is terminated by a newline.
- *
- *
- *
- */
-#if !defined G726_PRIVATE
-#define G726_PRIVATE
-
-int linear2ulaw(int pcm_val);
-int ulaw2linear(int u_val);
-int linear2alaw(int pcm_val);
-int alaw2linear(int u_val);
-
-static int fmult(int an, int srn);
-int predictor_zero(    g726_state *state_ptr);
-int predictor_pole(    g726_state *state_ptr);
-int step_size( g726_state *state_ptr);
-int quantize(  int             d,      /* Raw difference signal sample */
-       int             y,      /* Step size multiplier */
-       int *   table,  /* quantization table */
-       int             size);  /* table size of short integers */
-int reconstruct(       int             sign,   /* 0 for non-negative value */
-       int             dqln,   /* G.72x codeword */
-       int             y);     /* Step size multiplier */
-void update(   int             code_size,      /* distinguish 723_40 with others */
-       int             y,              /* quantizer step size */
-       int             wi,             /* scale factor multiplier */
-       int             fi,             /* for long/short term energies */
-       int             dq,             /* quantized prediction difference */
-       int             sr,             /* reconstructed signal */
-       int             dqsez,          /* difference from 2-pole predictor */
-       g726_state *state_ptr); /* coder state pointer */
-int tandem_adjust_alaw(
-       int             sr,     /* decoder output linear PCM sample */
-       int             se,     /* predictor estimate sample */
-       int             y,      /* quantizer step size */
-       int             i,      /* decoder input code */
-       int             sign,
-       int *   qtab);
-int tandem_adjust_ulaw(
-       int             sr,     /* decoder output linear PCM sample */
-       int             se,     /* predictor estimate sample */
-       int             y,      /* quantizer step size */
-       int             i,      /* decoder input code */
-       int             sign,
-       int *   qtab);
-
-#endif // G726_PRIVATE
-