[Buildroot] [RFC 1/1] package/asterisk: new package
Bernd Kuhls
bernd.kuhls at t-online.de
Sun Apr 26 17:17:03 UTC 2015
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
package/Config.in | 1 +
package/asterisk/0001-configure-cross-fix.patch | 22 +
package/asterisk/0002-ASTERISK-24155.patch | 241 ++
package/asterisk/0003-resinit.patch | 15 +
package/asterisk/0004-uclibc-pthread.patch | 25 +
package/asterisk/0005-configure-uclibc.patch | 18 +
package/asterisk/0006-no-xml-docs.patch | 20 +
package/asterisk/Config.in | 73 +
package/asterisk/asterisk-addon-mp3-r201.patch | 4076 +++++++++++++++++++++++
package/asterisk/asterisk.hash | 2 +
package/asterisk/asterisk.makeopts-13 | 54 +
package/asterisk/asterisk.mk | 106 +
12 files changed, 4653 insertions(+)
create mode 100644 package/asterisk/0001-configure-cross-fix.patch
create mode 100644 package/asterisk/0002-ASTERISK-24155.patch
create mode 100644 package/asterisk/0003-resinit.patch
create mode 100644 package/asterisk/0004-uclibc-pthread.patch
create mode 100644 package/asterisk/0005-configure-uclibc.patch
create mode 100644 package/asterisk/0006-no-xml-docs.patch
create mode 100644 package/asterisk/Config.in
create mode 100644 package/asterisk/asterisk-addon-mp3-r201.patch
create mode 100644 package/asterisk/asterisk.hash
create mode 100644 package/asterisk/asterisk.makeopts-13
create mode 100644 package/asterisk/asterisk.mk
diff --git a/package/Config.in b/package/Config.in
index d47b787..231a927 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,6 +4,7 @@ menu "Target packages"
menu "Audio and video applications"
source "package/alsa-utils/Config.in"
+ source "package/asterisk/Config.in"
source "package/aumix/Config.in"
source "package/bellagio/Config.in"
source "package/dvdauthor/Config.in"
diff --git a/package/asterisk/0001-configure-cross-fix.patch b/package/asterisk/0001-configure-cross-fix.patch
new file mode 100644
index 0000000..ba40344
--- /dev/null
+++ b/package/asterisk/0001-configure-cross-fix.patch
@@ -0,0 +1,22 @@
+Cosmetic error when cross-compiling as ./configure calls ./menuselect/configure
+
+Downloaded from https://issues.asterisk.org/jira/browse/ASTERISK-23184
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
++++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
+@@ -2382,11 +2382,13 @@
+ AC_OUTPUT
+
+ ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
++if test "${cross_compiling}" = "no"; then
+ if test "x${ac_cv_path_CMP}" = "x:"; then
+ ( cd `pwd`/menuselect && ./configure )
+ else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
+ ( cd `pwd`/menuselect && ./configure )
+ fi ; fi
++fi
+
+ rm makeopts.acbak makeopts.acbak2
+
diff --git a/package/asterisk/0002-ASTERISK-24155.patch b/package/asterisk/0002-ASTERISK-24155.patch
new file mode 100644
index 0000000..5abf2ca
--- /dev/null
+++ b/package/asterisk/0002-ASTERISK-24155.patch
@@ -0,0 +1,241 @@
+Improved and portable ast_log recursion avoidance
+
+Downloaded from https://reviewboard.asterisk.org/r/4502/
+Concrete URL: https://reviewboard.asterisk.org/r/4502/diff/raw/
+
+Fixes backtrace problems with uClibc & musl.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+Index: /branches/13/main/utils.c
+===================================================================
+--- a/main/utils.c (revision 433360)
++++ b/main/utils.c (working copy)
+@@ -1998,7 +1998,7 @@
+ cur = *pool_head;
+ } else { /* preserve the last pool */
+ if (*pool_head == NULL) {
+- ast_log(LOG_WARNING, "trying to reset empty pool\n");
++ ast_log_safe(LOG_WARNING, "trying to reset empty pool\n");
+ return -1;
+ }
+ preserve = *pool_head;
+Index: /branches/13/main/strings.c
+===================================================================
+--- a/main/strings.c (revision 433360)
++++ b/main/strings.c (working copy)
+@@ -87,9 +87,6 @@
+ } else if (max_len == 0) { /* if unbounded, give more room for next time */
+ need += 16 + need / 4;
+ }
+- if (0) { /* debugging */
+- ast_verbose("extend from %d to %d\n", len, need);
+- }
+ if (
+ #if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
+ _ast_str_make_space(buf, need, file, lineno, function)
+@@ -97,7 +94,7 @@
+ ast_str_make_space(buf, need)
+ #endif
+ ) {
+- ast_verbose("failed to extend from %d to %d\n", len, need);
++ ast_log_safe(LOG_VERBOSE, "failed to extend from %d to %d\n", len, need);
+ va_end(aq);
+ return AST_DYNSTR_BUILD_FAILED;
+ }
+Index: /branches/13/main/logger.c
+===================================================================
+--- a/main/logger.c (revision 433360)
++++ b/main/logger.c (working copy)
+@@ -107,6 +107,7 @@
+ } logfiles = { 1 };
+
+ static char hostname[MAXHOSTNAMELEN];
++AST_THREADSTORAGE_RAW(in_safe_log);
+
+ enum logtypes {
+ LOGTYPE_SYSLOG,
+@@ -1766,6 +1767,36 @@
+ }
+ }
+
++void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...)
++{
++ va_list ap;
++ void *recursed = ast_threadstorage_get_ptr(&in_safe_log);
++ struct ast_callid *callid;
++
++ if (recursed) {
++ return;
++ }
++
++ if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) {
++ /* We've failed to set the flag that protects against
++ * recursion, so bail. */
++ return;
++ }
++
++ callid = ast_read_threadstorage_callid();
++
++ va_start(ap, fmt);
++ ast_log_full(level, file, line, function, callid, fmt, ap);
++ va_end(ap);
++
++ if (callid) {
++ ast_callid_unref(callid);
++ }
++
++ /* Clear flag so the next allocation failure can be logged. */
++ ast_threadstorage_set_ptr(&in_safe_log, NULL);
++}
++
+ void ast_log_callid(int level, const char *file, int line, const char *function, struct ast_callid *callid, const char *fmt, ...)
+ {
+ va_list ap;
+Index: /branches/13/main/hashtab.c
+===================================================================
+--- a/main/hashtab.c (revision 433360)
++++ b/main/hashtab.c (working copy)
+@@ -43,10 +43,6 @@
+ #include "asterisk/hashtab.h"
+
+
+-#ifndef __AST_DEBUG_MALLOC
+-void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
+-#endif
+-
+ #if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
+ static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func);
+ #define ast_hashtab_resize(a) _ast_hashtab_resize(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
+Index: /branches/13/main/astobj2.c
+===================================================================
+--- a/main/astobj2.c (revision 433360)
++++ b/main/astobj2.c (working copy)
+@@ -36,6 +36,9 @@
+ #include "asterisk/cli.h"
+ #include "asterisk/paths.h"
+
++/* Use ast_log_safe in place of ast_log. */
++#define ast_log ast_log_safe
++
+ static FILE *ref_log;
+
+ /*!
+Index: /branches/13/include/asterisk/utils.h
+===================================================================
+--- a/include/asterisk/utils.h (revision 433360)
++++ b/include/asterisk/utils.h (working copy)
+@@ -25,7 +25,6 @@
+
+ #include "asterisk/network.h"
+
+-#include <execinfo.h>
+ #include <time.h> /* we want to override localtime_r */
+ #include <unistd.h>
+ #include <string.h>
+@@ -526,26 +525,8 @@
+ #define ast_free free
+ #define ast_free_ptr ast_free
+
+-/*
+- * This buffer is in static memory. We never intend to read it,
+- * nor do we care about multiple threads writing to it at the
+- * same time. We only want to know if we're recursing too deep
+- * already. 60 entries should be more than enough. Function
+- * call depth rarely exceeds 20 or so.
+- */
+-#define _AST_MEM_BACKTRACE_BUFLEN 60
+-extern void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
+-
+-/*
+- * Ok, this sucks. But if we're already out of mem, we don't
+- * want the logger to create infinite recursion (and a crash).
+- */
+ #define MALLOC_FAILURE_MSG \
+- do { \
+- if (backtrace(_ast_mem_backtrace_buffer, _AST_MEM_BACKTRACE_BUFLEN) < _AST_MEM_BACKTRACE_BUFLEN) { \
+- ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
+- } \
+- } while (0)
++ ast_log_safe(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file)
+
+ /*!
+ * \brief A wrapper for malloc()
+Index: /branches/13/include/asterisk/threadstorage.h
+===================================================================
+--- a/include/asterisk/threadstorage.h (revision 433360)
++++ b/include/asterisk/threadstorage.h (working copy)
+@@ -84,6 +84,8 @@
+ AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, ast_free_ptr,)
+ #define AST_THREADSTORAGE_EXTERNAL(name) \
+ extern struct ast_threadstorage name
++#define AST_THREADSTORAGE_RAW(name) \
++ AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, NULL,)
+
+ /*!
+ * \brief Define a thread storage variable, with custom initialization and cleanup
+@@ -216,4 +218,42 @@
+ #define ast_threadstorage_get(ts, init_size) __ast_threadstorage_get(ts, init_size, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+ #endif /* defined(DEBUG_THREADLOCALS) */
+
++/*!
++ * \brief Retreive a raw pointer from threadstorage.
++ * \param ts Threadstorage object to operate on.
++ *
++ * \return A pointer associated with the current thread, NULL
++ * if no pointer is associated yet.
++ *
++ * \note This should only be used on threadstorage declared
++ * by AST_THREADSTORAGE_RAW unless you really know what
++ * you are doing.
++ */
++AST_INLINE_API(
++void *ast_threadstorage_get_ptr(struct ast_threadstorage *ts),
++{
++ pthread_once(&ts->once, ts->key_init);
++ return pthread_getspecific(ts->key);
++}
++)
++
++/*!
++ * \brief Set a raw pointer from threadstorage.
++ * \param ts Threadstorage object to operate on.
++ *
++ * \retval 0 Success
++ * \retval non-zero Failure
++ *
++ * \note This should only be used on threadstorage declared
++ * by AST_THREADSTORAGE_RAW unless you really know what
++ * you are doing.
++ */
++AST_INLINE_API(
++int ast_threadstorage_set_ptr(struct ast_threadstorage *ts, void *ptr),
++{
++ pthread_once(&ts->once, ts->key_init);
++ return pthread_setspecific(ts->key, ptr);
++}
++)
++
+ #endif /* ASTERISK_THREADSTORAGE_H */
+Index: /branches/13/include/asterisk/logger.h
+===================================================================
+--- a/include/asterisk/logger.h (revision 433360)
++++ b/include/asterisk/logger.h (working copy)
+@@ -62,6 +62,17 @@
+ void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
+ __attribute__((format(printf, 5, 6)));
+
++/*!
++ * \brief Used for sending a log message with protection against recursion.
++ *
++ * \note This function should be used by all error messages that might be directly
++ * or indirectly caused by logging.
++ *
++ * \see ast_log for documentation on the parameters.
++ */
++void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...)
++ __attribute__((format(printf, 5, 6)));
++
+ /* XXX needs documentation */
+ struct ast_callid;
+
diff --git a/package/asterisk/0003-resinit.patch b/package/asterisk/0003-resinit.patch
new file mode 100644
index 0000000..e5acab4
--- /dev/null
+++ b/package/asterisk/0003-resinit.patch
@@ -0,0 +1,15 @@
+uclibc does not contain support for res_ninit.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr asterisk-13.2.0-rc1.org/configure.ac asterisk-13.2.0-rc1/configure.ac
+--- asterisk-13.2.0-rc1.org/configure.ac 2015-01-26 15:49:32.000000000 +0100
++++ asterisk-13.2.0-rc1/configure.ac 2015-02-03 22:06:34.956432426 +0100
+@@ -1190,7 +1190,6 @@
+ #include <resolv.h>],
+ [int foo = res_ninit(NULL);])],
+ AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
+ AC_SEARCH_LIBS(res_9_ndestroy, resolv)
+ AC_MSG_CHECKING(for res_ndestroy)
+ AC_LINK_IFELSE(
diff --git a/package/asterisk/0004-uclibc-pthread.patch b/package/asterisk/0004-uclibc-pthread.patch
new file mode 100644
index 0000000..b4913dc
--- /dev/null
+++ b/package/asterisk/0004-uclibc-pthread.patch
@@ -0,0 +1,25 @@
+Gentoo bug 66557
+Link: http://bugs.gentoo.org/show_bug.cgi?id=66557
+Patch-By: REdOG
+
+Submitted upstream: No
+
+The uclibc environment, as opposed to the glibc environment, needs explicit
+linking with the pthread & dl libraries. Without these, name resolution is
+not functional.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+--- asterisk-1.8.7.0-rc2.orig/Makefile 2011-08-25 21:00:55.000000000 +0200
++++ asterisk-1.8.7.0-rc2.orig/Makefile 2011-09-21 14:13:12.823076046 +0200
+@@ -247,6 +247,10 @@
+ _ASTCFLAGS+=-pthread -ftrampolines
+ endif
+
++ifeq ($(findstring $(OSARCH), uclibc ),)
++ AST_LIBS+=-lpthread -ldl
++endif
++
+ ifeq ($(OSARCH),SunOS)
+ _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
+ endif
diff --git a/package/asterisk/0005-configure-uclibc.patch b/package/asterisk/0005-configure-uclibc.patch
new file mode 100644
index 0000000..b2ba7db
--- /dev/null
+++ b/package/asterisk/0005-configure-uclibc.patch
@@ -0,0 +1,18 @@
+Force recognition of uclibc toolchains, this patch forces
+recognition of linux-uclibcgnueabi as uclibc-based.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr asterisk-13.2.0-rc1.org/configure.ac asterisk-13.2.0-rc1/configure.ac
+--- asterisk-13.2.0-rc1.org/configure.ac 2015-01-26 15:49:32.000000000 +0100
++++ asterisk-13.2.0-rc1/configure.ac 2015-02-03 23:52:09.500018494 +0100
+@@ -181,6 +181,9 @@
+ linux-gnueabi* | linux-gnuspe)
+ OSARCH=linux-gnu
+ ;;
++ linux-uclibc*)
++ OSARCH=linux-uclibc
++ ;;
+ kfreebsd*-gnu)
+ OSARCH=kfreebsd-gnu
+ ;;
diff --git a/package/asterisk/0006-no-xml-docs.patch b/package/asterisk/0006-no-xml-docs.patch
new file mode 100644
index 0000000..49b6e67
--- /dev/null
+++ b/package/asterisk/0006-no-xml-docs.patch
@@ -0,0 +1,20 @@
+Docs are not needed on the target, this saves compile time
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr asterisk-13.2.0.org/include/asterisk/xml.h asterisk-13.2.0/include/asterisk/xml.h
+--- asterisk-13.2.0.org/include/asterisk/xml.h 2013-02-15 14:38:12.000000000 +0100
++++ asterisk-13.2.0/include/asterisk/xml.h 2015-03-06 20:28:07.099389969 +0100
+@@ -247,9 +247,9 @@
+ struct ast_xml_xpath_results *ast_xml_query(struct ast_xml_doc *doc, const char *xpath_str);
+
+ /* Features using ast_xml_ */
+-#ifdef HAVE_LIBXML2
+-#define AST_XML_DOCS
+-#endif
++//#ifdef HAVE_LIBXML2
++//#define AST_XML_DOCS
++//#endif
+
+ #endif /* _ASTERISK_XML_H */
+
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
new file mode 100644
index 0000000..4072b1f
--- /dev/null
+++ b/package/asterisk/Config.in
@@ -0,0 +1,73 @@
+menuconfig BR2_PACKAGE_ASTERISK
+ bool "asterisk"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS # libical
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # fork()
+ depends on BR2_USE_WCHAR # util-linux
+ select BR2_PACKAGE_JANSSON
+ select BR2_PACKAGE_LIBICAL
+ select BR2_PACKAGE_LIBEDIT
+ select BR2_PACKAGE_LIBSPANDSP
+ select BR2_PACKAGE_LIBXSLT
+ select BR2_PACKAGE_NEON
+ select BR2_PACKAGE_NEON_EXPAT
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_LIBPJSIP
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ select BR2_PACKAGE_ZLIB
+ help
+ Asterisk is an Open Source PBX and telephony toolkit. It is, in a
+ sense, middleware between Internet and telephony channels on the
+ bottom, and Internet and telephony applications at the top. However,
+ Asterisk supports more telephony interfaces than just Internet
+ telephony. Asterisk also has a vast amount of support for traditional
+ PSTN telephony, as well.
+
+ http://www.asterisk.org
+
+if BR2_PACKAGE_ASTERISK
+
+config BR2_PACKAGE_ASTERISK_FREERADIUS
+ bool "freeradius"
+ select BR2_PACKAGE_FREERADIUS_CLIENT
+
+config BR2_PACKAGE_ASTERISK_LIBCURL
+ bool "libcurl"
+ select BR2_PACKAGE_LIBCURL
+
+config BR2_PACKAGE_ASTERISK_LIBVORBIS
+ bool "libvorbis"
+ select BR2_PACKAGE_LIBVORBIS
+
+config BR2_PACKAGE_ASTERISK_OPENSSL
+ bool "openssl"
+ select BR2_PACKAGE_OPENSSL
+
+config BR2_PACKAGE_ASTERISK_PORTAUDIO
+ bool "portaudio"
+ select BR2_PACKAGE_PORTAUDIO
+
+config BR2_PACKAGE_ASTERISK_OPUS
+ bool "opus"
+ select BR2_PACKAGE_OPUS
+
+config BR2_PACKAGE_ASTERISK_SPEEX
+ bool "speex"
+ select BR2_PACKAGE_SPEEX
+
+config BR2_PACKAGE_ASTERISK_SQLITE
+ bool "sqlite"
+ select BR2_PACKAGE_SQLITE
+
+config BR2_PACKAGE_ASTERISK_UNIXODBC
+ bool "unixodbc"
+ select BR2_PACKAGE_UNIXODBC
+
+endif # BR2_PACKAGE_ASTERISK
+
+comment "asterisk needs a toolchain w/ C++, dynamic library, wchar, threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/package/asterisk/asterisk-addon-mp3-r201.patch b/package/asterisk/asterisk-addon-mp3-r201.patch
new file mode 100644
index 0000000..1e4a163
--- /dev/null
+++ b/package/asterisk/asterisk-addon-mp3-r201.patch
@@ -0,0 +1,4076 @@
+Asterisk mp3 support
+
+Downloaded from
+http://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz
+to avoid downloading code while compile by contrib/scripts/get_mp3_source.sh
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -ruN a/addons.orig/mp3/MPGLIB_README b/addons/mp3/MPGLIB_README
+--- a/addons.orig/mp3/MPGLIB_README 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/MPGLIB_README 2014-08-06 08:45:08.167283943 -0300
+@@ -0,0 +1,39 @@
++MP3 library
++-----------
++Version 0.2
++
++This decoder is a 'light' version (thrown out all unnecessay parts)
++from the mpg123 package. I made this for a company.
++
++Currently only Layer3 is enabled to save some space. Layer1,2 isn't
++tested at all. The interface will not change significantly.
++A backport to the mpg123 package is planed.
++
++comiled and tested only on Solaris 2.6
++main.c contains a simple demo application for library.
++
++COPYING: you may use this source under GPL terms!
++
++PLEASE NOTE: This software may contain patented alogrithm (at least
++ patented in some countries). It may be not allowed to sell/use products
++ based on this source code in these countries. Check this out first!
++
++COPYRIGHT of MP3 music:
++ Please note, that the duplicating of copyrighted music without explicit
++ permission violates the rights of the owner.
++
++SENDING PATCHES:
++ Maybe I change the copyright policy (ie some kind of more free BSD licencse).
++ Please consider this when sending patches/changes.
++ I also want to have the freedom to sell the code to companies that
++ can not use the code under GPL. So, if you send me significant patches,
++ I need your explicit permission to do this. Of course, there will also
++ be the GPLed open source version of the 100% same code.
++ For the case you cannot accept this: the code is GPL, it's your freedom
++ to distribute your changes again under GPL.
++
++FEEDBACK:
++ I'm interessted to here from you, when you use this package as part
++ of another project.
++
++
+diff -ruN a/addons.orig/mp3/MPGLIB_TODO b/addons/mp3/MPGLIB_TODO
+--- a/addons.orig/mp3/MPGLIB_TODO 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/MPGLIB_TODO 2014-08-06 08:45:08.167283943 -0300
+@@ -0,0 +1,2 @@
++
++apply 'VBR' bugfix
+diff -ruN a/addons.orig/mp3/Makefile b/addons/mp3/Makefile
+--- a/addons.orig/mp3/Makefile 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/Makefile 2014-08-06 08:45:08.167283943 -0300
+@@ -0,0 +1,24 @@
++MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o
++
++ifeq ($(OSARCH),FreeBSD)
++OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
++CFLAGS+=$(if $(OSVERSION)<500016,-D_THREAD_SAFE)
++LIBS+=$(if $(OSVERSION)<502102,-lc_r,-pthread)
++INCLUDE+=-I/usr/local/include
++CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
++endif # FreeBSD
++
++ifeq ($(OSARCH),NetBSD)
++CFLAGS+=-pthread
++INCLUDE+=-I/usr/local/include
++endif
++
++ifeq ($(OSARCH),OpenBSD)
++CFLAGS+=-pthread
++endif
++
++all: $(MP3OBJS)
++
++clean:
++ rm -f *.o *.so *~
++ rm -f .*.o.d
+diff -ruN a/addons.orig/mp3/README b/addons/mp3/README
+--- a/addons.orig/mp3/README 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/README 2014-08-06 08:45:08.167283943 -0300
+@@ -0,0 +1 @@
++
+diff -ruN a/addons.orig/mp3/common.c b/addons/mp3/common.c
+--- a/addons.orig/mp3/common.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/common.c 2014-08-06 08:45:08.167283943 -0300
+@@ -0,0 +1,267 @@
++#include "asterisk.h"
++#include "asterisk/logger.h"
++
++#include <ctype.h>
++#include <stdlib.h>
++#include <signal.h>
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++
++#include "mpg123.h"
++#include "mpglib.h"
++
++struct parameter param = { 1 , 1 , 0 , 0 };
++
++int tabsel_123[2][3][16] = {
++ { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
++ {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
++ {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} },
++
++ { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
++ {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
++ {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
++};
++
++long freqs[9] = { 44100, 48000, 32000,
++ 22050, 24000, 16000 ,
++ 11025 , 12000 , 8000 };
++
++
++#if 0
++static void get_II_stuff(struct frame *fr)
++{
++ static int translate[3][2][16] =
++ { { { 0,2,2,2,2,2,2,0,0,0,1,1,1,1,1,0 } ,
++ { 0,2,2,0,0,0,1,1,1,1,1,1,1,1,1,0 } } ,
++ { { 0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0 } ,
++ { 0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0 } } ,
++ { { 0,3,3,3,3,3,3,0,0,0,1,1,1,1,1,0 } ,
++ { 0,3,3,0,0,0,1,1,1,1,1,1,1,1,1,0 } } };
++
++ int table,sblim;
++ static struct al_table *tables[5] =
++ { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
++ static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
++
++ if(fr->lsf)
++ table = 4;
++ else
++ table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
++ sblim = sblims[table];
++
++ fr->alloc = tables[table];
++ fr->II_sblimit = sblim;
++}
++#endif
++
++#define HDRCMPMASK 0xfffffd00
++
++#if 0
++int head_check(unsigned long head)
++{
++ if( (head & 0xffe00000) != 0xffe00000)
++ return FALSE;
++ if(!((head>>17)&3))
++ return FALSE;
++ if( ((head>>12)&0xf) == 0xf)
++ return FALSE;
++ if( ((head>>10)&0x3) == 0x3 )
++ return FALSE;
++ return TRUE;
++}
++#endif
++
++
++/*
++ * the code a header and write the information
++ * into the frame structure
++ */
++int decode_header(struct frame *fr,unsigned long newhead)
++{
++ if( newhead & (1<<20) ) {
++ fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1;
++ fr->mpeg25 = 0;
++ }
++ else {
++ fr->lsf = 1;
++ fr->mpeg25 = 1;
++ }
++
++ fr->lay = 4-((newhead>>17)&3);
++ if( ((newhead>>10)&0x3) == 0x3) {
++ ast_log(LOG_WARNING,"Stream error\n");
++ return (0);
++ }
++ if(fr->mpeg25) {
++ fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
++ }
++ else
++ fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3);
++ fr->error_protection = ((newhead>>16)&0x1)^0x1;
++
++ if(fr->mpeg25) /* allow Bitrate change for 2.5 ... */
++ fr->bitrate_index = ((newhead>>12)&0xf);
++
++ fr->bitrate_index = ((newhead>>12)&0xf);
++ fr->padding = ((newhead>>9)&0x1);
++ fr->extension = ((newhead>>8)&0x1);
++ fr->mode = ((newhead>>6)&0x3);
++ fr->mode_ext = ((newhead>>4)&0x3);
++ fr->copyright = ((newhead>>3)&0x1);
++ fr->original = ((newhead>>2)&0x1);
++ fr->emphasis = newhead & 0x3;
++
++ fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
++
++ if(!fr->bitrate_index)
++ {
++ ast_log(LOG_WARNING,"Free format not supported.\n");
++ return (0);
++ }
++
++ switch(fr->lay)
++ {
++ case 1:
++#if 0
++ fr->do_layer = do_layer1;
++ fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
++ (fr->mode_ext<<2)+4 : 32;
++ fr->framesize = (long) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
++ fr->framesize /= freqs[fr->sampling_frequency];
++ fr->framesize = ((fr->framesize+fr->padding)<<2)-4;
++#else
++ ast_log(LOG_WARNING,"Layer 1 not supported!\n");
++#endif
++ break;
++ case 2:
++#if 0
++ fr->do_layer = do_layer2;
++ get_II_stuff(fr);
++ fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
++ (fr->mode_ext<<2)+4 : fr->II_sblimit;
++ fr->framesize = (long) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
++ fr->framesize /= freqs[fr->sampling_frequency];
++ fr->framesize += fr->padding - 4;
++#else
++ ast_log(LOG_WARNING,"Layer 2 not supported!\n");
++#endif
++ break;
++ case 3:
++#if 0
++ fr->do_layer = do_layer3;
++ if(fr->lsf)
++ ssize = (fr->stereo == 1) ? 9 : 17;
++ else
++ ssize = (fr->stereo == 1) ? 17 : 32;
++#endif
++
++#if 0
++ if(fr->error_protection)
++ ssize += 2;
++#endif
++ fr->framesize = (long) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
++ fr->framesize /= freqs[fr->sampling_frequency]<<(fr->lsf);
++ fr->framesize = fr->framesize + fr->padding - 4;
++ break;
++ default:
++ ast_log(LOG_WARNING,"Sorry, unknown layer type.\n");
++ return (0);
++ }
++ return 1;
++}
++
++#if 0
++void print_header(struct frame *fr)
++{
++ static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
++ static char *layers[4] = { "Unknown" , "I", "II", "III" };
++
++ ast_log(LOG_WARNING,"MPEG %s, Layer: %s, Freq: %ld, mode: %s, modext: %d, BPF : %d\n",
++ fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"),
++ layers[fr->lay],freqs[fr->sampling_frequency],
++ modes[fr->mode],fr->mode_ext,fr->framesize+4);
++ ast_log(LOG_WARNING,"Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d.\n",
++ fr->stereo,fr->copyright?"Yes":"No",
++ fr->original?"Yes":"No",fr->error_protection?"Yes":"No",
++ fr->emphasis);
++ ast_log(LOG_WARNING,"Bitrate: %d Kbits/s, Extension value: %d\n",
++ tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index],fr->extension);
++}
++
++void print_header_compact(struct frame *fr)
++{
++ static char *modes[4] = { "stereo", "joint-stereo", "dual-channel", "mono" };
++ static char *layers[4] = { "Unknown" , "I", "II", "III" };
++
++ ast_log(LOG_WARNING,"MPEG %s layer %s, %d kbit/s, %ld Hz %s\n",
++ fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"),
++ layers[fr->lay],
++ tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index],
++ freqs[fr->sampling_frequency], modes[fr->mode]);
++}
++
++#endif
++
++unsigned int getbits(struct mpstr *mp, int number_of_bits)
++{
++ unsigned long rval;
++
++ if(!number_of_bits)
++ return 0;
++
++ {
++ rval = (mp->worksample).wordpointer[0];
++ rval <<= 8;
++ rval |= (mp->worksample).wordpointer[1];
++ rval <<= 8;
++ rval |= (mp->worksample).wordpointer[2];
++ rval <<= (mp->worksample).bitindex;
++ rval &= 0xffffff;
++
++ (mp->worksample).bitindex += number_of_bits;
++
++ rval >>= (24-number_of_bits);
++
++ (mp->worksample).wordpointer += ((mp->worksample).bitindex>>3);
++ (mp->worksample).bitindex &= 7;
++ }
++ return rval;
++}
++
++unsigned int getbits_fast(struct mpstr *mp, int number_of_bits)
++{
++ unsigned long rval;
++
++ {
++ rval = (mp->worksample).wordpointer[0];
++ rval <<= 8;
++ rval |= (mp->worksample).wordpointer[1];
++ rval <<= (mp->worksample).bitindex;
++ rval &= 0xffff;
++ (mp->worksample).bitindex += number_of_bits;
++
++ rval >>= (16-number_of_bits);
++
++ (mp->worksample).wordpointer += ((mp->worksample).bitindex>>3);
++ (mp->worksample).bitindex &= 7;
++ }
++ return rval;
++}
++
++unsigned int get1bit(struct mpstr *mp)
++{
++ unsigned char rval;
++
++ rval = *((mp->worksample).wordpointer) << (mp->worksample).bitindex;
++
++ (mp->worksample).bitindex++;
++ (mp->worksample).wordpointer += ((mp->worksample).bitindex>>3);
++ (mp->worksample).bitindex &= 7;
++
++ return rval>>7;
++}
++
++
++
+diff -ruN a/addons.orig/mp3/dct64_i386.c b/addons/mp3/dct64_i386.c
+--- a/addons.orig/mp3/dct64_i386.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/dct64_i386.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,335 @@
++
++/*
++ * Discrete Cosine Tansform (DCT) for subband synthesis
++ * optimized for machines with no auto-increment.
++ * The performance is highly compiler dependend. Maybe
++ * the dct64.c version for 'normal' processor may be faster
++ * even for Intel processors.
++ */
++
++#include "mpg123.h"
++
++/*
++ * the call via dct64 is a trick to force GCC to use
++ * (new) registers for the b1,b2 pointer to the bufs[xx] field
++ */
++void dct64(real *a,real *b,real *c);
++
++static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
++{
++ {
++ register real *costab = pnts[0];
++
++ b1[0x00] = samples[0x00] + samples[0x1F];
++ b1[0x01] = samples[0x01] + samples[0x1E];
++ b1[0x1F] = (samples[0x00] - samples[0x1F]) * costab[0x0];
++ b1[0x1E] = (samples[0x01] - samples[0x1E]) * costab[0x1];
++
++ b1[0x02] = samples[0x02] + samples[0x1D];
++ b1[0x03] = samples[0x03] + samples[0x1C];
++ b1[0x1D] = (samples[0x02] - samples[0x1D]) * costab[0x2];
++ b1[0x1C] = (samples[0x03] - samples[0x1C]) * costab[0x3];
++
++ b1[0x04] = samples[0x04] + samples[0x1B];
++ b1[0x05] = samples[0x05] + samples[0x1A];
++ b1[0x1B] = (samples[0x04] - samples[0x1B]) * costab[0x4];
++ b1[0x1A] = (samples[0x05] - samples[0x1A]) * costab[0x5];
++
++ b1[0x06] = samples[0x06] + samples[0x19];
++ b1[0x07] = samples[0x07] + samples[0x18];
++ b1[0x19] = (samples[0x06] - samples[0x19]) * costab[0x6];
++ b1[0x18] = (samples[0x07] - samples[0x18]) * costab[0x7];
++
++ b1[0x08] = samples[0x08] + samples[0x17];
++ b1[0x09] = samples[0x09] + samples[0x16];
++ b1[0x17] = (samples[0x08] - samples[0x17]) * costab[0x8];
++ b1[0x16] = (samples[0x09] - samples[0x16]) * costab[0x9];
++
++ b1[0x0A] = samples[0x0A] + samples[0x15];
++ b1[0x0B] = samples[0x0B] + samples[0x14];
++ b1[0x15] = (samples[0x0A] - samples[0x15]) * costab[0xA];
++ b1[0x14] = (samples[0x0B] - samples[0x14]) * costab[0xB];
++
++ b1[0x0C] = samples[0x0C] + samples[0x13];
++ b1[0x0D] = samples[0x0D] + samples[0x12];
++ b1[0x13] = (samples[0x0C] - samples[0x13]) * costab[0xC];
++ b1[0x12] = (samples[0x0D] - samples[0x12]) * costab[0xD];
++
++ b1[0x0E] = samples[0x0E] + samples[0x11];
++ b1[0x0F] = samples[0x0F] + samples[0x10];
++ b1[0x11] = (samples[0x0E] - samples[0x11]) * costab[0xE];
++ b1[0x10] = (samples[0x0F] - samples[0x10]) * costab[0xF];
++
++ }
++
++
++ {
++ register real *costab = pnts[1];
++
++ b2[0x00] = b1[0x00] + b1[0x0F];
++ b2[0x01] = b1[0x01] + b1[0x0E];
++ b2[0x0F] = (b1[0x00] - b1[0x0F]) * costab[0];
++ b2[0x0E] = (b1[0x01] - b1[0x0E]) * costab[1];
++
++ b2[0x02] = b1[0x02] + b1[0x0D];
++ b2[0x03] = b1[0x03] + b1[0x0C];
++ b2[0x0D] = (b1[0x02] - b1[0x0D]) * costab[2];
++ b2[0x0C] = (b1[0x03] - b1[0x0C]) * costab[3];
++
++ b2[0x04] = b1[0x04] + b1[0x0B];
++ b2[0x05] = b1[0x05] + b1[0x0A];
++ b2[0x0B] = (b1[0x04] - b1[0x0B]) * costab[4];
++ b2[0x0A] = (b1[0x05] - b1[0x0A]) * costab[5];
++
++ b2[0x06] = b1[0x06] + b1[0x09];
++ b2[0x07] = b1[0x07] + b1[0x08];
++ b2[0x09] = (b1[0x06] - b1[0x09]) * costab[6];
++ b2[0x08] = (b1[0x07] - b1[0x08]) * costab[7];
++
++ /* */
++
++ b2[0x10] = b1[0x10] + b1[0x1F];
++ b2[0x11] = b1[0x11] + b1[0x1E];
++ b2[0x1F] = (b1[0x1F] - b1[0x10]) * costab[0];
++ b2[0x1E] = (b1[0x1E] - b1[0x11]) * costab[1];
++
++ b2[0x12] = b1[0x12] + b1[0x1D];
++ b2[0x13] = b1[0x13] + b1[0x1C];
++ b2[0x1D] = (b1[0x1D] - b1[0x12]) * costab[2];
++ b2[0x1C] = (b1[0x1C] - b1[0x13]) * costab[3];
++
++ b2[0x14] = b1[0x14] + b1[0x1B];
++ b2[0x15] = b1[0x15] + b1[0x1A];
++ b2[0x1B] = (b1[0x1B] - b1[0x14]) * costab[4];
++ b2[0x1A] = (b1[0x1A] - b1[0x15]) * costab[5];
++
++ b2[0x16] = b1[0x16] + b1[0x19];
++ b2[0x17] = b1[0x17] + b1[0x18];
++ b2[0x19] = (b1[0x19] - b1[0x16]) * costab[6];
++ b2[0x18] = (b1[0x18] - b1[0x17]) * costab[7];
++ }
++
++ {
++ register real *costab = pnts[2];
++
++ b1[0x00] = b2[0x00] + b2[0x07];
++ b1[0x07] = (b2[0x00] - b2[0x07]) * costab[0];
++ b1[0x01] = b2[0x01] + b2[0x06];
++ b1[0x06] = (b2[0x01] - b2[0x06]) * costab[1];
++ b1[0x02] = b2[0x02] + b2[0x05];
++ b1[0x05] = (b2[0x02] - b2[0x05]) * costab[2];
++ b1[0x03] = b2[0x03] + b2[0x04];
++ b1[0x04] = (b2[0x03] - b2[0x04]) * costab[3];
++
++ b1[0x08] = b2[0x08] + b2[0x0F];
++ b1[0x0F] = (b2[0x0F] - b2[0x08]) * costab[0];
++ b1[0x09] = b2[0x09] + b2[0x0E];
++ b1[0x0E] = (b2[0x0E] - b2[0x09]) * costab[1];
++ b1[0x0A] = b2[0x0A] + b2[0x0D];
++ b1[0x0D] = (b2[0x0D] - b2[0x0A]) * costab[2];
++ b1[0x0B] = b2[0x0B] + b2[0x0C];
++ b1[0x0C] = (b2[0x0C] - b2[0x0B]) * costab[3];
++
++ b1[0x10] = b2[0x10] + b2[0x17];
++ b1[0x17] = (b2[0x10] - b2[0x17]) * costab[0];
++ b1[0x11] = b2[0x11] + b2[0x16];
++ b1[0x16] = (b2[0x11] - b2[0x16]) * costab[1];
++ b1[0x12] = b2[0x12] + b2[0x15];
++ b1[0x15] = (b2[0x12] - b2[0x15]) * costab[2];
++ b1[0x13] = b2[0x13] + b2[0x14];
++ b1[0x14] = (b2[0x13] - b2[0x14]) * costab[3];
++
++ b1[0x18] = b2[0x18] + b2[0x1F];
++ b1[0x1F] = (b2[0x1F] - b2[0x18]) * costab[0];
++ b1[0x19] = b2[0x19] + b2[0x1E];
++ b1[0x1E] = (b2[0x1E] - b2[0x19]) * costab[1];
++ b1[0x1A] = b2[0x1A] + b2[0x1D];
++ b1[0x1D] = (b2[0x1D] - b2[0x1A]) * costab[2];
++ b1[0x1B] = b2[0x1B] + b2[0x1C];
++ b1[0x1C] = (b2[0x1C] - b2[0x1B]) * costab[3];
++ }
++
++ {
++ register real const cos0 = pnts[3][0];
++ register real const cos1 = pnts[3][1];
++
++ b2[0x00] = b1[0x00] + b1[0x03];
++ b2[0x03] = (b1[0x00] - b1[0x03]) * cos0;
++ b2[0x01] = b1[0x01] + b1[0x02];
++ b2[0x02] = (b1[0x01] - b1[0x02]) * cos1;
++
++ b2[0x04] = b1[0x04] + b1[0x07];
++ b2[0x07] = (b1[0x07] - b1[0x04]) * cos0;
++ b2[0x05] = b1[0x05] + b1[0x06];
++ b2[0x06] = (b1[0x06] - b1[0x05]) * cos1;
++
++ b2[0x08] = b1[0x08] + b1[0x0B];
++ b2[0x0B] = (b1[0x08] - b1[0x0B]) * cos0;
++ b2[0x09] = b1[0x09] + b1[0x0A];
++ b2[0x0A] = (b1[0x09] - b1[0x0A]) * cos1;
++
++ b2[0x0C] = b1[0x0C] + b1[0x0F];
++ b2[0x0F] = (b1[0x0F] - b1[0x0C]) * cos0;
++ b2[0x0D] = b1[0x0D] + b1[0x0E];
++ b2[0x0E] = (b1[0x0E] - b1[0x0D]) * cos1;
++
++ b2[0x10] = b1[0x10] + b1[0x13];
++ b2[0x13] = (b1[0x10] - b1[0x13]) * cos0;
++ b2[0x11] = b1[0x11] + b1[0x12];
++ b2[0x12] = (b1[0x11] - b1[0x12]) * cos1;
++
++ b2[0x14] = b1[0x14] + b1[0x17];
++ b2[0x17] = (b1[0x17] - b1[0x14]) * cos0;
++ b2[0x15] = b1[0x15] + b1[0x16];
++ b2[0x16] = (b1[0x16] - b1[0x15]) * cos1;
++
++ b2[0x18] = b1[0x18] + b1[0x1B];
++ b2[0x1B] = (b1[0x18] - b1[0x1B]) * cos0;
++ b2[0x19] = b1[0x19] + b1[0x1A];
++ b2[0x1A] = (b1[0x19] - b1[0x1A]) * cos1;
++
++ b2[0x1C] = b1[0x1C] + b1[0x1F];
++ b2[0x1F] = (b1[0x1F] - b1[0x1C]) * cos0;
++ b2[0x1D] = b1[0x1D] + b1[0x1E];
++ b2[0x1E] = (b1[0x1E] - b1[0x1D]) * cos1;
++ }
++
++ {
++ register real const cos0 = pnts[4][0];
++
++ b1[0x00] = b2[0x00] + b2[0x01];
++ b1[0x01] = (b2[0x00] - b2[0x01]) * cos0;
++ b1[0x02] = b2[0x02] + b2[0x03];
++ b1[0x03] = (b2[0x03] - b2[0x02]) * cos0;
++ b1[0x02] += b1[0x03];
++
++ b1[0x04] = b2[0x04] + b2[0x05];
++ b1[0x05] = (b2[0x04] - b2[0x05]) * cos0;
++ b1[0x06] = b2[0x06] + b2[0x07];
++ b1[0x07] = (b2[0x07] - b2[0x06]) * cos0;
++ b1[0x06] += b1[0x07];
++ b1[0x04] += b1[0x06];
++ b1[0x06] += b1[0x05];
++ b1[0x05] += b1[0x07];
++
++ b1[0x08] = b2[0x08] + b2[0x09];
++ b1[0x09] = (b2[0x08] - b2[0x09]) * cos0;
++ b1[0x0A] = b2[0x0A] + b2[0x0B];
++ b1[0x0B] = (b2[0x0B] - b2[0x0A]) * cos0;
++ b1[0x0A] += b1[0x0B];
++
++ b1[0x0C] = b2[0x0C] + b2[0x0D];
++ b1[0x0D] = (b2[0x0C] - b2[0x0D]) * cos0;
++ b1[0x0E] = b2[0x0E] + b2[0x0F];
++ b1[0x0F] = (b2[0x0F] - b2[0x0E]) * cos0;
++ b1[0x0E] += b1[0x0F];
++ b1[0x0C] += b1[0x0E];
++ b1[0x0E] += b1[0x0D];
++ b1[0x0D] += b1[0x0F];
++
++ b1[0x10] = b2[0x10] + b2[0x11];
++ b1[0x11] = (b2[0x10] - b2[0x11]) * cos0;
++ b1[0x12] = b2[0x12] + b2[0x13];
++ b1[0x13] = (b2[0x13] - b2[0x12]) * cos0;
++ b1[0x12] += b1[0x13];
++
++ b1[0x14] = b2[0x14] + b2[0x15];
++ b1[0x15] = (b2[0x14] - b2[0x15]) * cos0;
++ b1[0x16] = b2[0x16] + b2[0x17];
++ b1[0x17] = (b2[0x17] - b2[0x16]) * cos0;
++ b1[0x16] += b1[0x17];
++ b1[0x14] += b1[0x16];
++ b1[0x16] += b1[0x15];
++ b1[0x15] += b1[0x17];
++
++ b1[0x18] = b2[0x18] + b2[0x19];
++ b1[0x19] = (b2[0x18] - b2[0x19]) * cos0;
++ b1[0x1A] = b2[0x1A] + b2[0x1B];
++ b1[0x1B] = (b2[0x1B] - b2[0x1A]) * cos0;
++ b1[0x1A] += b1[0x1B];
++
++ b1[0x1C] = b2[0x1C] + b2[0x1D];
++ b1[0x1D] = (b2[0x1C] - b2[0x1D]) * cos0;
++ b1[0x1E] = b2[0x1E] + b2[0x1F];
++ b1[0x1F] = (b2[0x1F] - b2[0x1E]) * cos0;
++ b1[0x1E] += b1[0x1F];
++ b1[0x1C] += b1[0x1E];
++ b1[0x1E] += b1[0x1D];
++ b1[0x1D] += b1[0x1F];
++ }
++
++ out0[0x10*16] = b1[0x00];
++ out0[0x10*12] = b1[0x04];
++ out0[0x10* 8] = b1[0x02];
++ out0[0x10* 4] = b1[0x06];
++ out0[0x10* 0] = b1[0x01];
++ out1[0x10* 0] = b1[0x01];
++ out1[0x10* 4] = b1[0x05];
++ out1[0x10* 8] = b1[0x03];
++ out1[0x10*12] = b1[0x07];
++
++#if 1
++ out0[0x10*14] = b1[0x08] + b1[0x0C];
++ out0[0x10*10] = b1[0x0C] + b1[0x0a];
++ out0[0x10* 6] = b1[0x0A] + b1[0x0E];
++ out0[0x10* 2] = b1[0x0E] + b1[0x09];
++ out1[0x10* 2] = b1[0x09] + b1[0x0D];
++ out1[0x10* 6] = b1[0x0D] + b1[0x0B];
++ out1[0x10*10] = b1[0x0B] + b1[0x0F];
++ out1[0x10*14] = b1[0x0F];
++#else
++ b1[0x08] += b1[0x0C];
++ out0[0x10*14] = b1[0x08];
++ b1[0x0C] += b1[0x0a];
++ out0[0x10*10] = b1[0x0C];
++ b1[0x0A] += b1[0x0E];
++ out0[0x10* 6] = b1[0x0A];
++ b1[0x0E] += b1[0x09];
++ out0[0x10* 2] = b1[0x0E];
++ b1[0x09] += b1[0x0D];
++ out1[0x10* 2] = b1[0x09];
++ b1[0x0D] += b1[0x0B];
++ out1[0x10* 6] = b1[0x0D];
++ b1[0x0B] += b1[0x0F];
++ out1[0x10*10] = b1[0x0B];
++ out1[0x10*14] = b1[0x0F];
++#endif
++
++ {
++ real tmp;
++ tmp = b1[0x18] + b1[0x1C];
++ out0[0x10*15] = tmp + b1[0x10];
++ out0[0x10*13] = tmp + b1[0x14];
++ tmp = b1[0x1C] + b1[0x1A];
++ out0[0x10*11] = tmp + b1[0x14];
++ out0[0x10* 9] = tmp + b1[0x12];
++ tmp = b1[0x1A] + b1[0x1E];
++ out0[0x10* 7] = tmp + b1[0x12];
++ out0[0x10* 5] = tmp + b1[0x16];
++ tmp = b1[0x1E] + b1[0x19];
++ out0[0x10* 3] = tmp + b1[0x16];
++ out0[0x10* 1] = tmp + b1[0x11];
++ tmp = b1[0x19] + b1[0x1D];
++ out1[0x10* 1] = tmp + b1[0x11];
++ out1[0x10* 3] = tmp + b1[0x15];
++ tmp = b1[0x1D] + b1[0x1B];
++ out1[0x10* 5] = tmp + b1[0x15];
++ out1[0x10* 7] = tmp + b1[0x13];
++ tmp = b1[0x1B] + b1[0x1F];
++ out1[0x10* 9] = tmp + b1[0x13];
++ out1[0x10*11] = tmp + b1[0x17];
++ out1[0x10*13] = b1[0x17] + b1[0x1F];
++ out1[0x10*15] = b1[0x1F];
++ }
++}
++
++/*
++ * the call via dct64 is a trick to force GCC to use
++ * (new) registers for the b1,b2 pointer to the bufs[xx] field
++ */
++void dct64(real *a,real *b,real *c)
++{
++ real bufs[0x40];
++ dct64_1(a,b,bufs,bufs+0x20,c);
++}
++
+diff -ruN a/addons.orig/mp3/decode_i386.c b/addons/mp3/decode_i386.c
+--- a/addons.orig/mp3/decode_i386.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/decode_i386.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,153 @@
++/*
++ * Mpeg Layer-1,2,3 audio decoder
++ * ------------------------------
++ * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
++ * See also 'README'
++ *
++ * slighlty optimized for machines without autoincrement/decrement.
++ * The performance is highly compiler dependend. Maybe
++ * the decode.c version for 'normal' processor may be faster
++ * even for Intel processors.
++ */
++
++#include <stdlib.h>
++#include <math.h>
++#include <string.h>
++
++
++#include "mpglib.h"
++
++
++
++ /* old WRITE_SAMPLE */
++#define WRITE_SAMPLE(samples,sum,clip) \
++ if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
++ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
++ else { *(samples) = sum; }
++
++int synth_1to1_mono(struct mpstr *mp,real *bandPtr,unsigned char *samples,int *pnt)
++{
++ short samples_tmp[64];
++ short *tmp1 = samples_tmp;
++ int i,ret;
++ int pnt1 = 0;
++
++ ret = synth_1to1(mp,bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
++ samples += *pnt;
++
++ for(i=0;i<32;i++) {
++ *( (short *) samples) = *tmp1;
++ samples += 2;
++ tmp1 += 2;
++ }
++ *pnt += 64;
++
++ return ret;
++}
++
++
++int synth_1to1(struct mpstr *mp, real *bandPtr,int channel,unsigned char *out,int *pnt)
++{
++ static const int step = 2;
++ int bo;
++ short *samples = (short *) (out + *pnt);
++
++ real *b0,(*buf)[0x110];
++ int clip = 0;
++ int bo1;
++
++ bo = mp->synth_bo;
++
++ if(!channel) {
++ bo--;
++ bo &= 0xf;
++ buf = mp->synth_buffs[0];
++ }
++ else {
++ samples++;
++ buf = mp->synth_buffs[1];
++ }
++
++ if(bo & 0x1) {
++ b0 = buf[0];
++ bo1 = bo;
++ dct64(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
++ }
++ else {
++ b0 = buf[1];
++ bo1 = bo+1;
++ dct64(buf[0]+bo,buf[1]+bo+1,bandPtr);
++ }
++
++ mp->synth_bo = bo;
++
++ {
++ register int j;
++ real *window = decwin + 16 - bo1;
++
++ for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)
++ {
++ real sum;
++ sum = window[0x0] * b0[0x0];
++ sum -= window[0x1] * b0[0x1];
++ sum += window[0x2] * b0[0x2];
++ sum -= window[0x3] * b0[0x3];
++ sum += window[0x4] * b0[0x4];
++ sum -= window[0x5] * b0[0x5];
++ sum += window[0x6] * b0[0x6];
++ sum -= window[0x7] * b0[0x7];
++ sum += window[0x8] * b0[0x8];
++ sum -= window[0x9] * b0[0x9];
++ sum += window[0xA] * b0[0xA];
++ sum -= window[0xB] * b0[0xB];
++ sum += window[0xC] * b0[0xC];
++ sum -= window[0xD] * b0[0xD];
++ sum += window[0xE] * b0[0xE];
++ sum -= window[0xF] * b0[0xF];
++
++ WRITE_SAMPLE(samples,sum,clip);
++ }
++
++ {
++ real sum;
++ sum = window[0x0] * b0[0x0];
++ sum += window[0x2] * b0[0x2];
++ sum += window[0x4] * b0[0x4];
++ sum += window[0x6] * b0[0x6];
++ sum += window[0x8] * b0[0x8];
++ sum += window[0xA] * b0[0xA];
++ sum += window[0xC] * b0[0xC];
++ sum += window[0xE] * b0[0xE];
++ WRITE_SAMPLE(samples,sum,clip);
++ b0-=0x10,window-=0x20,samples+=step;
++ }
++ window += bo1<<1;
++
++ for (j=15;j;j--,b0-=0x10,window-=0x20,samples+=step)
++ {
++ real sum;
++ sum = -window[-0x1] * b0[0x0];
++ sum -= window[-0x2] * b0[0x1];
++ sum -= window[-0x3] * b0[0x2];
++ sum -= window[-0x4] * b0[0x3];
++ sum -= window[-0x5] * b0[0x4];
++ sum -= window[-0x6] * b0[0x5];
++ sum -= window[-0x7] * b0[0x6];
++ sum -= window[-0x8] * b0[0x7];
++ sum -= window[-0x9] * b0[0x8];
++ sum -= window[-0xA] * b0[0x9];
++ sum -= window[-0xB] * b0[0xA];
++ sum -= window[-0xC] * b0[0xB];
++ sum -= window[-0xD] * b0[0xC];
++ sum -= window[-0xE] * b0[0xD];
++ sum -= window[-0xF] * b0[0xE];
++ sum -= window[-0x0] * b0[0xF];
++
++ WRITE_SAMPLE(samples,sum,clip);
++ }
++ }
++ *pnt += 128;
++
++ return clip;
++}
++
+diff -ruN a/addons.orig/mp3/decode_ntom.c b/addons/mp3/decode_ntom.c
+--- a/addons.orig/mp3/decode_ntom.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/decode_ntom.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,219 @@
++/*
++ * Mpeg Layer-1,2,3 audio decoder
++ * ------------------------------
++ * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
++ * See also 'README'
++ *
++ * N->M down/up sampling. Not optimized for speed.
++ */
++
++#include "asterisk.h"
++#include "asterisk/logger.h"
++#include <stdlib.h>
++#include <math.h>
++#include <string.h>
++
++#include "mpg123.h"
++#include "mpglib.h"
++
++#define WRITE_SAMPLE(samples,sum,clip) \
++ if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
++ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
++ else { *(samples) = sum; }
++
++#define NTOM_MUL (32768)
++static unsigned long ntom_val[2] = { NTOM_MUL>>1,NTOM_MUL>>1 };
++static unsigned long ntom_step = NTOM_MUL;
++
++
++int synth_ntom_set_step(long m,long n)
++{
++ if(param.verbose > 1)
++ ast_log(LOG_WARNING,"Init rate converter: %ld->%ld\n",m,n);
++
++ if(n >= 96000 || m >= 96000 || m == 0 || n == 0) {
++ ast_log(LOG_WARNING,"NtoM converter: illegal rates\n");
++ return (1);
++ }
++
++ n *= NTOM_MUL;
++ ntom_step = n / m;
++
++ if(ntom_step > 8*NTOM_MUL) {
++ ast_log(LOG_WARNING,"max. 1:8 conversion allowed!\n");
++ return (1);
++ }
++
++ ntom_val[0] = ntom_val[1] = NTOM_MUL>>1;
++
++ return (0);
++
++}
++
++
++int synth_ntom_mono (struct mpstr *mp, real *bandPtr,unsigned char *samples,int *pnt)
++{
++ short samples_tmp[8*64];
++ short *tmp1 = samples_tmp;
++ int i,ret;
++ int pnt1 = 0;
++
++ ret = synth_ntom(mp, bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
++ samples += *pnt;
++
++ for(i=0;i<(pnt1>>2);i++) {
++ *( (short *)samples) = *tmp1;
++ samples += 2;
++ tmp1 += 2;
++ }
++ *pnt += pnt1 >> 1;
++
++ return ret;
++}
++
++
++
++int synth_ntom(struct mpstr *mp, real *bandPtr,int channel,unsigned char *out,int *pnt)
++{
++ static const int step = 2;
++ int bo;
++ short *samples = (short *) (out + *pnt);
++
++ real *b0,(*buf)[0x110];
++ int clip = 0;
++ int bo1;
++ int ntom;
++
++ bo = mp->synth_bo;
++
++ if(!channel) {
++ bo--;
++ bo &= 0xf;
++ buf = mp->synth_buffs[0];
++ ntom = ntom_val[1] = ntom_val[0];
++ }
++ else {
++ samples++;
++ out += 2; /* to compute the right *pnt value */
++ buf = mp->synth_buffs[1];
++ ntom = ntom_val[1];
++ }
++
++ if(bo & 0x1) {
++ b0 = buf[0];
++ bo1 = bo;
++ dct64(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
++ }
++ else {
++ b0 = buf[1];
++ bo1 = bo+1;
++ dct64(buf[0]+bo,buf[1]+bo+1,bandPtr);
++ }
++
++ mp->synth_bo = bo;
++
++ {
++ register int j;
++ real *window = (mp->decwin) + 16 - bo1;
++
++ for (j=16;j;j--,window+=0x10)
++ {
++ real sum;
++
++ ntom += ntom_step;
++ if(ntom < NTOM_MUL) {
++ window += 16;
++ b0 += 16;
++ continue;
++ }
++
++ sum = *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++ sum += *window++ * *b0++;
++ sum -= *window++ * *b0++;
++
++ while(ntom >= NTOM_MUL) {
++ WRITE_SAMPLE(samples,sum,clip);
++ samples += step;
++ ntom -= NTOM_MUL;
++ }
++ }
++
++ ntom += ntom_step;
++ if(ntom >= NTOM_MUL)
++ {
++ real sum;
++ sum = window[0x0] * b0[0x0];
++ sum += window[0x2] * b0[0x2];
++ sum += window[0x4] * b0[0x4];
++ sum += window[0x6] * b0[0x6];
++ sum += window[0x8] * b0[0x8];
++ sum += window[0xA] * b0[0xA];
++ sum += window[0xC] * b0[0xC];
++ sum += window[0xE] * b0[0xE];
++
++ while(ntom >= NTOM_MUL) {
++ WRITE_SAMPLE(samples,sum,clip);
++ samples += step;
++ ntom -= NTOM_MUL;
++ }
++ }
++
++ b0-=0x10,window-=0x20;
++ window += bo1<<1;
++
++ for (j=15;j;j--,b0-=0x20,window-=0x10)
++ {
++ real sum;
++
++ ntom += ntom_step;
++ if(ntom < NTOM_MUL) {
++ window -= 16;
++ b0 += 16;
++ continue;
++ }
++
++ sum = -*(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++ sum -= *(--window) * *b0++;
++
++ while(ntom >= NTOM_MUL) {
++ WRITE_SAMPLE(samples,sum,clip);
++ samples += step;
++ ntom -= NTOM_MUL;
++ }
++ }
++ }
++
++ ntom_val[channel] = ntom;
++ *pnt = ((unsigned char *) samples - out);
++
++ return clip;
++}
++
++
+diff -ruN a/addons.orig/mp3/huffman.h b/addons/mp3/huffman.h
+--- a/addons.orig/mp3/huffman.h 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/huffman.h 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,332 @@
++/*
++ * huffman tables ... recalcualted to work with my optimzed
++ * decoder scheme (MH)
++ *
++ * probably we could save a few bytes of memory, because the
++ * smaller tables are often the part of a bigger table
++ */
++
++struct newhuff
++{
++ unsigned int linbits;
++ short *table;
++};
++
++static short tab0[] =
++{
++ 0
++};
++
++static short tab1[] =
++{
++ -5, -3, -1, 17, 1, 16, 0
++};
++
++static short tab2[] =
++{
++ -15, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 17, -1, 1,
++ 16, 0
++};
++
++static short tab3[] =
++{
++ -13, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 16, 17, -1,
++ 1, 0
++};
++
++static short tab5[] =
++{
++ -29, -25, -23, -15, -7, -5, -3, -1, 51, 35, 50, 49, -3, -1, 19,
++ 3, -1, 48, 34, -3, -1, 18, 33, -1, 2, 32, 17, -1, 1, 16,
++ 0
++};
++
++static short tab6[] =
++{
++ -25, -19, -13, -9, -5, -3, -1, 51, 3, 35, -1, 50, 48, -1, 19,
++ 49, -3, -1, 34, 2, 18, -3, -1, 33, 32, 1, -1, 17, -1, 16,
++ 0
++};
++
++static short tab7[] =
++{
++ -69, -65, -57, -39, -29, -17, -11, -7, -3, -1, 85, 69, -1, 84, 83,
++ -1, 53, 68, -3, -1, 37, 82, 21, -5, -1, 81, -1, 5, 52, -1,
++ 80, -1, 67, 51, -5, -3, -1, 36, 66, 20, -1, 65, 64, -11, -7,
++ -3, -1, 4, 35, -1, 50, 3, -1, 19, 49, -3, -1, 48, 34, 18,
++ -5, -1, 33, -1, 2, 32, 17, -1, 1, 16, 0
++};
++
++static short tab8[] =
++{
++ -65, -63, -59, -45, -31, -19, -13, -7, -5, -3, -1, 85, 84, 69, 83,
++ -3, -1, 53, 68, 37, -3, -1, 82, 5, 21, -5, -1, 81, -1, 52,
++ 67, -3, -1, 80, 51, 36, -5, -3, -1, 66, 20, 65, -3, -1, 4,
++ 64, -1, 35, 50, -9, -7, -3, -1, 19, 49, -1, 3, 48, 34, -1,
++ 2, 32, -1, 18, 33, 17, -3, -1, 1, 16, 0
++};
++
++static short tab9[] =
++{
++ -63, -53, -41, -29, -19, -11, -5, -3, -1, 85, 69, 53, -1, 83, -1,
++ 84, 5, -3, -1, 68, 37, -1, 82, 21, -3, -1, 81, 52, -1, 67,
++ -1, 80, 4, -7, -3, -1, 36, 66, -1, 51, 64, -1, 20, 65, -5,
++ -3, -1, 35, 50, 19, -1, 49, -1, 3, 48, -5, -3, -1, 34, 2,
++ 18, -1, 33, 32, -3, -1, 17, 1, -1, 16, 0
++};
++
++static short tab10[] =
++{
++-125,-121,-111, -83, -55, -35, -21, -13, -7, -3, -1, 119, 103, -1, 118,
++ 87, -3, -1, 117, 102, 71, -3, -1, 116, 86, -1, 101, 55, -9, -3,
++ -1, 115, 70, -3, -1, 85, 84, 99, -1, 39, 114, -11, -5, -3, -1,
++ 100, 7, 112, -1, 98, -1, 69, 53, -5, -1, 6, -1, 83, 68, 23,
++ -17, -5, -1, 113, -1, 54, 38, -5, -3, -1, 37, 82, 21, -1, 81,
++ -1, 52, 67, -3, -1, 22, 97, -1, 96, -1, 5, 80, -19, -11, -7,
++ -3, -1, 36, 66, -1, 51, 4, -1, 20, 65, -3, -1, 64, 35, -1,
++ 50, 3, -3, -1, 19, 49, -1, 48, 34, -7, -3, -1, 18, 33, -1,
++ 2, 32, 17, -1, 1, 16, 0
++};
++
++static short tab11[] =
++{
++-121,-113, -89, -59, -43, -27, -17, -7, -3, -1, 119, 103, -1, 118, 117,
++ -3, -1, 102, 71, -1, 116, -1, 87, 85, -5, -3, -1, 86, 101, 55,
++ -1, 115, 70, -9, -7, -3, -1, 69, 84, -1, 53, 83, 39, -1, 114,
++ -1, 100, 7, -5, -1, 113, -1, 23, 112, -3, -1, 54, 99, -1, 96,
++ -1, 68, 37, -13, -7, -5, -3, -1, 82, 5, 21, 98, -3, -1, 38,
++ 6, 22, -5, -1, 97, -1, 81, 52, -5, -1, 80, -1, 67, 51, -1,
++ 36, 66, -15, -11, -7, -3, -1, 20, 65, -1, 4, 64, -1, 35, 50,
++ -1, 19, 49, -5, -3, -1, 3, 48, 34, 33, -5, -1, 18, -1, 2,
++ 32, 17, -3, -1, 1, 16, 0
++};
++
++static short tab12[] =
++{
++-115, -99, -73, -45, -27, -17, -9, -5, -3, -1, 119, 103, 118, -1, 87,
++ 117, -3, -1, 102, 71, -1, 116, 101, -3, -1, 86, 55, -3, -1, 115,
++ 85, 39, -7, -3, -1, 114, 70, -1, 100, 23, -5, -1, 113, -1, 7,
++ 112, -1, 54, 99, -13, -9, -3, -1, 69, 84, -1, 68, -1, 6, 5,
++ -1, 38, 98, -5, -1, 97, -1, 22, 96, -3, -1, 53, 83, -1, 37,
++ 82, -17, -7, -3, -1, 21, 81, -1, 52, 67, -5, -3, -1, 80, 4,
++ 36, -1, 66, 20, -3, -1, 51, 65, -1, 35, 50, -11, -7, -5, -3,
++ -1, 64, 3, 48, 19, -1, 49, 34, -1, 18, 33, -7, -5, -3, -1,
++ 2, 32, 0, 17, -1, 1, 16
++};
++
++static short tab13[] =
++{
++-509,-503,-475,-405,-333,-265,-205,-153,-115, -83, -53, -35, -21, -13, -9,
++ -7, -5, -3, -1, 254, 252, 253, 237, 255, -1, 239, 223, -3, -1, 238,
++ 207, -1, 222, 191, -9, -3, -1, 251, 206, -1, 220, -1, 175, 233, -1,
++ 236, 221, -9, -5, -3, -1, 250, 205, 190, -1, 235, 159, -3, -1, 249,
++ 234, -1, 189, 219, -17, -9, -3, -1, 143, 248, -1, 204, -1, 174, 158,
++ -5, -1, 142, -1, 127, 126, 247, -5, -1, 218, -1, 173, 188, -3, -1,
++ 203, 246, 111, -15, -7, -3, -1, 232, 95, -1, 157, 217, -3, -1, 245,
++ 231, -1, 172, 187, -9, -3, -1, 79, 244, -3, -1, 202, 230, 243, -1,
++ 63, -1, 141, 216, -21, -9, -3, -1, 47, 242, -3, -1, 110, 156, 15,
++ -5, -3, -1, 201, 94, 171, -3, -1, 125, 215, 78, -11, -5, -3, -1,
++ 200, 214, 62, -1, 185, -1, 155, 170, -1, 31, 241, -23, -13, -5, -1,
++ 240, -1, 186, 229, -3, -1, 228, 140, -1, 109, 227, -5, -1, 226, -1,
++ 46, 14, -1, 30, 225, -15, -7, -3, -1, 224, 93, -1, 213, 124, -3,
++ -1, 199, 77, -1, 139, 184, -7, -3, -1, 212, 154, -1, 169, 108, -1,
++ 198, 61, -37, -21, -9, -5, -3, -1, 211, 123, 45, -1, 210, 29, -5,
++ -1, 183, -1, 92, 197, -3, -1, 153, 122, 195, -7, -5, -3, -1, 167,
++ 151, 75, 209, -3, -1, 13, 208, -1, 138, 168, -11, -7, -3, -1, 76,
++ 196, -1, 107, 182, -1, 60, 44, -3, -1, 194, 91, -3, -1, 181, 137,
++ 28, -43, -23, -11, -5, -1, 193, -1, 152, 12, -1, 192, -1, 180, 106,
++ -5, -3, -1, 166, 121, 59, -1, 179, -1, 136, 90, -11, -5, -1, 43,
++ -1, 165, 105, -1, 164, -1, 120, 135, -5, -1, 148, -1, 119, 118, 178,
++ -11, -3, -1, 27, 177, -3, -1, 11, 176, -1, 150, 74, -7, -3, -1,
++ 58, 163, -1, 89, 149, -1, 42, 162, -47, -23, -9, -3, -1, 26, 161,
++ -3, -1, 10, 104, 160, -5, -3, -1, 134, 73, 147, -3, -1, 57, 88,
++ -1, 133, 103, -9, -3, -1, 41, 146, -3, -1, 87, 117, 56, -5, -1,
++ 131, -1, 102, 71, -3, -1, 116, 86, -1, 101, 115, -11, -3, -1, 25,
++ 145, -3, -1, 9, 144, -1, 72, 132, -7, -5, -1, 114, -1, 70, 100,
++ 40, -1, 130, 24, -41, -27, -11, -5, -3, -1, 55, 39, 23, -1, 113,
++ -1, 85, 7, -7, -3, -1, 112, 54, -1, 99, 69, -3, -1, 84, 38,
++ -1, 98, 53, -5, -1, 129, -1, 8, 128, -3, -1, 22, 97, -1, 6,
++ 96, -13, -9, -5, -3, -1, 83, 68, 37, -1, 82, 5, -1, 21, 81,
++ -7, -3, -1, 52, 67, -1, 80, 36, -3, -1, 66, 51, 20, -19, -11,
++ -5, -1, 65, -1, 4, 64, -3, -1, 35, 50, 19, -3, -1, 49, 3,
++ -1, 48, 34, -3, -1, 18, 33, -1, 2, 32, -3, -1, 17, 1, 16,
++ 0
++};
++
++static short tab15[] =
++{
++-495,-445,-355,-263,-183,-115, -77, -43, -27, -13, -7, -3, -1, 255, 239,
++ -1, 254, 223, -1, 238, -1, 253, 207, -7, -3, -1, 252, 222, -1, 237,
++ 191, -1, 251, -1, 206, 236, -7, -3, -1, 221, 175, -1, 250, 190, -3,
++ -1, 235, 205, -1, 220, 159, -15, -7, -3, -1, 249, 234, -1, 189, 219,
++ -3, -1, 143, 248, -1, 204, 158, -7, -3, -1, 233, 127, -1, 247, 173,
++ -3, -1, 218, 188, -1, 111, -1, 174, 15, -19, -11, -3, -1, 203, 246,
++ -3, -1, 142, 232, -1, 95, 157, -3, -1, 245, 126, -1, 231, 172, -9,
++ -3, -1, 202, 187, -3, -1, 217, 141, 79, -3, -1, 244, 63, -1, 243,
++ 216, -33, -17, -9, -3, -1, 230, 47, -1, 242, -1, 110, 240, -3, -1,
++ 31, 241, -1, 156, 201, -7, -3, -1, 94, 171, -1, 186, 229, -3, -1,
++ 125, 215, -1, 78, 228, -15, -7, -3, -1, 140, 200, -1, 62, 109, -3,
++ -1, 214, 227, -1, 155, 185, -7, -3, -1, 46, 170, -1, 226, 30, -5,
++ -1, 225, -1, 14, 224, -1, 93, 213, -45, -25, -13, -7, -3, -1, 124,
++ 199, -1, 77, 139, -1, 212, -1, 184, 154, -7, -3, -1, 169, 108, -1,
++ 198, 61, -1, 211, 210, -9, -5, -3, -1, 45, 13, 29, -1, 123, 183,
++ -5, -1, 209, -1, 92, 208, -1, 197, 138, -17, -7, -3, -1, 168, 76,
++ -1, 196, 107, -5, -1, 182, -1, 153, 12, -1, 60, 195, -9, -3, -1,
++ 122, 167, -1, 166, -1, 192, 11, -1, 194, -1, 44, 91, -55, -29, -15,
++ -7, -3, -1, 181, 28, -1, 137, 152, -3, -1, 193, 75, -1, 180, 106,
++ -5, -3, -1, 59, 121, 179, -3, -1, 151, 136, -1, 43, 90, -11, -5,
++ -1, 178, -1, 165, 27, -1, 177, -1, 176, 105, -7, -3, -1, 150, 74,
++ -1, 164, 120, -3, -1, 135, 58, 163, -17, -7, -3, -1, 89, 149, -1,
++ 42, 162, -3, -1, 26, 161, -3, -1, 10, 160, 104, -7, -3, -1, 134,
++ 73, -1, 148, 57, -5, -1, 147, -1, 119, 9, -1, 88, 133, -53, -29,
++ -13, -7, -3, -1, 41, 103, -1, 118, 146, -1, 145, -1, 25, 144, -7,
++ -3, -1, 72, 132, -1, 87, 117, -3, -1, 56, 131, -1, 102, 71, -7,
++ -3, -1, 40, 130, -1, 24, 129, -7, -3, -1, 116, 8, -1, 128, 86,
++ -3, -1, 101, 55, -1, 115, 70, -17, -7, -3, -1, 39, 114, -1, 100,
++ 23, -3, -1, 85, 113, -3, -1, 7, 112, 54, -7, -3, -1, 99, 69,
++ -1, 84, 38, -3, -1, 98, 22, -3, -1, 6, 96, 53, -33, -19, -9,
++ -5, -1, 97, -1, 83, 68, -1, 37, 82, -3, -1, 21, 81, -3, -1,
++ 5, 80, 52, -7, -3, -1, 67, 36, -1, 66, 51, -1, 65, -1, 20,
++ 4, -9, -3, -1, 35, 50, -3, -1, 64, 3, 19, -3, -1, 49, 48,
++ 34, -9, -7, -3, -1, 18, 33, -1, 2, 32, 17, -3, -1, 1, 16,
++ 0
++};
++
++static short tab16[] =
++{
++-509,-503,-461,-323,-103, -37, -27, -15, -7, -3, -1, 239, 254, -1, 223,
++ 253, -3, -1, 207, 252, -1, 191, 251, -5, -1, 175, -1, 250, 159, -3,
++ -1, 249, 248, 143, -7, -3, -1, 127, 247, -1, 111, 246, 255, -9, -5,
++ -3, -1, 95, 245, 79, -1, 244, 243, -53, -1, 240, -1, 63, -29, -19,
++ -13, -7, -5, -1, 206, -1, 236, 221, 222, -1, 233, -1, 234, 217, -1,
++ 238, -1, 237, 235, -3, -1, 190, 205, -3, -1, 220, 219, 174, -11, -5,
++ -1, 204, -1, 173, 218, -3, -1, 126, 172, 202, -5, -3, -1, 201, 125,
++ 94, 189, 242, -93, -5, -3, -1, 47, 15, 31, -1, 241, -49, -25, -13,
++ -5, -1, 158, -1, 188, 203, -3, -1, 142, 232, -1, 157, 231, -7, -3,
++ -1, 187, 141, -1, 216, 110, -1, 230, 156, -13, -7, -3, -1, 171, 186,
++ -1, 229, 215, -1, 78, -1, 228, 140, -3, -1, 200, 62, -1, 109, -1,
++ 214, 155, -19, -11, -5, -3, -1, 185, 170, 225, -1, 212, -1, 184, 169,
++ -5, -1, 123, -1, 183, 208, 227, -7, -3, -1, 14, 224, -1, 93, 213,
++ -3, -1, 124, 199, -1, 77, 139, -75, -45, -27, -13, -7, -3, -1, 154,
++ 108, -1, 198, 61, -3, -1, 92, 197, 13, -7, -3, -1, 138, 168, -1,
++ 153, 76, -3, -1, 182, 122, 60, -11, -5, -3, -1, 91, 137, 28, -1,
++ 192, -1, 152, 121, -1, 226, -1, 46, 30, -15, -7, -3, -1, 211, 45,
++ -1, 210, 209, -5, -1, 59, -1, 151, 136, 29, -7, -3, -1, 196, 107,
++ -1, 195, 167, -1, 44, -1, 194, 181, -23, -13, -7, -3, -1, 193, 12,
++ -1, 75, 180, -3, -1, 106, 166, 179, -5, -3, -1, 90, 165, 43, -1,
++ 178, 27, -13, -5, -1, 177, -1, 11, 176, -3, -1, 105, 150, -1, 74,
++ 164, -5, -3, -1, 120, 135, 163, -3, -1, 58, 89, 42, -97, -57, -33,
++ -19, -11, -5, -3, -1, 149, 104, 161, -3, -1, 134, 119, 148, -5, -3,
++ -1, 73, 87, 103, 162, -5, -1, 26, -1, 10, 160, -3, -1, 57, 147,
++ -1, 88, 133, -9, -3, -1, 41, 146, -3, -1, 118, 9, 25, -5, -1,
++ 145, -1, 144, 72, -3, -1, 132, 117, -1, 56, 131, -21, -11, -5, -3,
++ -1, 102, 40, 130, -3, -1, 71, 116, 24, -3, -1, 129, 128, -3, -1,
++ 8, 86, 55, -9, -5, -1, 115, -1, 101, 70, -1, 39, 114, -5, -3,
++ -1, 100, 85, 7, 23, -23, -13, -5, -1, 113, -1, 112, 54, -3, -1,
++ 99, 69, -1, 84, 38, -3, -1, 98, 22, -1, 97, -1, 6, 96, -9,
++ -5, -1, 83, -1, 53, 68, -1, 37, 82, -1, 81, -1, 21, 5, -33,
++ -23, -13, -7, -3, -1, 52, 67, -1, 80, 36, -3, -1, 66, 51, 20,
++ -5, -1, 65, -1, 4, 64, -1, 35, 50, -3, -1, 19, 49, -3, -1,
++ 3, 48, 34, -3, -1, 18, 33, -1, 2, 32, -3, -1, 17, 1, 16,
++ 0
++};
++
++static short tab24[] =
++{
++-451,-117, -43, -25, -15, -7, -3, -1, 239, 254, -1, 223, 253, -3, -1,
++ 207, 252, -1, 191, 251, -5, -1, 250, -1, 175, 159, -1, 249, 248, -9,
++ -5, -3, -1, 143, 127, 247, -1, 111, 246, -3, -1, 95, 245, -1, 79,
++ 244, -71, -7, -3, -1, 63, 243, -1, 47, 242, -5, -1, 241, -1, 31,
++ 240, -25, -9, -1, 15, -3, -1, 238, 222, -1, 237, 206, -7, -3, -1,
++ 236, 221, -1, 190, 235, -3, -1, 205, 220, -1, 174, 234, -15, -7, -3,
++ -1, 189, 219, -1, 204, 158, -3, -1, 233, 173, -1, 218, 188, -7, -3,
++ -1, 203, 142, -1, 232, 157, -3, -1, 217, 126, -1, 231, 172, 255,-235,
++-143, -77, -45, -25, -15, -7, -3, -1, 202, 187, -1, 141, 216, -5, -3,
++ -1, 14, 224, 13, 230, -5, -3, -1, 110, 156, 201, -1, 94, 186, -9,
++ -5, -1, 229, -1, 171, 125, -1, 215, 228, -3, -1, 140, 200, -3, -1,
++ 78, 46, 62, -15, -7, -3, -1, 109, 214, -1, 227, 155, -3, -1, 185,
++ 170, -1, 226, 30, -7, -3, -1, 225, 93, -1, 213, 124, -3, -1, 199,
++ 77, -1, 139, 184, -31, -15, -7, -3, -1, 212, 154, -1, 169, 108, -3,
++ -1, 198, 61, -1, 211, 45, -7, -3, -1, 210, 29, -1, 123, 183, -3,
++ -1, 209, 92, -1, 197, 138, -17, -7, -3, -1, 168, 153, -1, 76, 196,
++ -3, -1, 107, 182, -3, -1, 208, 12, 60, -7, -3, -1, 195, 122, -1,
++ 167, 44, -3, -1, 194, 91, -1, 181, 28, -57, -35, -19, -7, -3, -1,
++ 137, 152, -1, 193, 75, -5, -3, -1, 192, 11, 59, -3, -1, 176, 10,
++ 26, -5, -1, 180, -1, 106, 166, -3, -1, 121, 151, -3, -1, 160, 9,
++ 144, -9, -3, -1, 179, 136, -3, -1, 43, 90, 178, -7, -3, -1, 165,
++ 27, -1, 177, 105, -1, 150, 164, -17, -9, -5, -3, -1, 74, 120, 135,
++ -1, 58, 163, -3, -1, 89, 149, -1, 42, 162, -7, -3, -1, 161, 104,
++ -1, 134, 119, -3, -1, 73, 148, -1, 57, 147, -63, -31, -15, -7, -3,
++ -1, 88, 133, -1, 41, 103, -3, -1, 118, 146, -1, 25, 145, -7, -3,
++ -1, 72, 132, -1, 87, 117, -3, -1, 56, 131, -1, 102, 40, -17, -7,
++ -3, -1, 130, 24, -1, 71, 116, -5, -1, 129, -1, 8, 128, -1, 86,
++ 101, -7, -5, -1, 23, -1, 7, 112, 115, -3, -1, 55, 39, 114, -15,
++ -7, -3, -1, 70, 100, -1, 85, 113, -3, -1, 54, 99, -1, 69, 84,
++ -7, -3, -1, 38, 98, -1, 22, 97, -5, -3, -1, 6, 96, 53, -1,
++ 83, 68, -51, -37, -23, -15, -9, -3, -1, 37, 82, -1, 21, -1, 5,
++ 80, -1, 81, -1, 52, 67, -3, -1, 36, 66, -1, 51, 20, -9, -5,
++ -1, 65, -1, 4, 64, -1, 35, 50, -1, 19, 49, -7, -5, -3, -1,
++ 3, 48, 34, 18, -1, 33, -1, 2, 32, -3, -1, 17, 1, -1, 16,
++ 0
++};
++
++static short tab_c0[] =
++{
++ -29, -21, -13, -7, -3, -1, 11, 15, -1, 13, 14, -3, -1, 7, 5,
++ 9, -3, -1, 6, 3, -1, 10, 12, -3, -1, 2, 1, -1, 4, 8,
++ 0
++};
++
++static short tab_c1[] =
++{
++ -15, -7, -3, -1, 15, 14, -1, 13, 12, -3, -1, 11, 10, -1, 9,
++ 8, -7, -3, -1, 7, 6, -1, 5, 4, -3, -1, 3, 2, -1, 1,
++ 0
++};
++
++
++
++static struct newhuff ht[] =
++{
++ { /* 0 */ 0 , tab0 } ,
++ { /* 2 */ 0 , tab1 } ,
++ { /* 3 */ 0 , tab2 } ,
++ { /* 3 */ 0 , tab3 } ,
++ { /* 0 */ 0 , tab0 } ,
++ { /* 4 */ 0 , tab5 } ,
++ { /* 4 */ 0 , tab6 } ,
++ { /* 6 */ 0 , tab7 } ,
++ { /* 6 */ 0 , tab8 } ,
++ { /* 6 */ 0 , tab9 } ,
++ { /* 8 */ 0 , tab10 } ,
++ { /* 8 */ 0 , tab11 } ,
++ { /* 8 */ 0 , tab12 } ,
++ { /* 16 */ 0 , tab13 } ,
++ { /* 0 */ 0 , tab0 } ,
++ { /* 16 */ 0 , tab15 } ,
++
++ { /* 16 */ 1 , tab16 } ,
++ { /* 16 */ 2 , tab16 } ,
++ { /* 16 */ 3 , tab16 } ,
++ { /* 16 */ 4 , tab16 } ,
++ { /* 16 */ 6 , tab16 } ,
++ { /* 16 */ 8 , tab16 } ,
++ { /* 16 */ 10, tab16 } ,
++ { /* 16 */ 13, tab16 } ,
++ { /* 16 */ 4 , tab24 } ,
++ { /* 16 */ 5 , tab24 } ,
++ { /* 16 */ 6 , tab24 } ,
++ { /* 16 */ 7 , tab24 } ,
++ { /* 16 */ 8 , tab24 } ,
++ { /* 16 */ 9 , tab24 } ,
++ { /* 16 */ 11, tab24 } ,
++ { /* 16 */ 13, tab24 }
++};
++
++static struct newhuff htc[] =
++{
++ { /* 1 , 1 , */ 0 , tab_c0 } ,
++ { /* 1 , 1 , */ 0 , tab_c1 }
++};
++
++
+diff -ruN a/addons.orig/mp3/interface.c b/addons/mp3/interface.c
+--- a/addons.orig/mp3/interface.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/interface.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,323 @@
++#include "asterisk.h"
++#include "asterisk/logger.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include "mpg123.h"
++#include "mpglib.h"
++
++
++void InitMP3Constants(void)
++{
++ init_layer3_const();
++ make_decode_tables_const();
++
++}
++
++
++BOOL InitMP3(struct mpstr *mp, long outscale)
++{
++ /* quiet 4096 med 8192 */
++
++ memset(mp,0,sizeof(struct mpstr));
++
++ mp->framesize = 0;
++ mp->fsizeold = -1;
++ mp->bsize = 0;
++ mp->head = mp->tail = NULL;
++ mp->fr.single = 3; /* force mono */
++ mp->bsnum = 0;
++ mp->synth_bo = 1;
++ mp->outsamplerate = 8000;
++
++ make_decode_tables_scale(mp, outscale);
++
++ init_layer3_sample_limits(mp, SBLIMIT);
++
++ return !0;
++}
++
++void ExitMP3(struct mpstr *mp)
++{
++ struct buf *b,*bn;
++
++ b = mp->tail;
++ while(b) {
++ free(b->pnt);
++ bn = b->next;
++ free(b);
++ b = bn;
++ }
++}
++
++static struct buf *addbuf(struct mpstr *mp,char *buf,int size)
++{
++ struct buf *nbuf;
++
++ nbuf = malloc( sizeof(struct buf) );
++ if(!nbuf) {
++ ast_log(LOG_WARNING,"Out of memory!\n");
++ return NULL;
++ }
++ nbuf->pnt = malloc(size);
++ if(!nbuf->pnt) {
++ free(nbuf);
++ return NULL;
++ }
++ nbuf->size = size;
++ memcpy(nbuf->pnt,buf,size);
++ nbuf->next = NULL;
++ nbuf->prev = mp->head;
++ nbuf->pos = 0;
++
++ if(!mp->tail) {
++ mp->tail = nbuf;
++ }
++ else {
++ mp->head->next = nbuf;
++ }
++
++ mp->head = nbuf;
++ mp->bsize += size;
++
++ return nbuf;
++}
++
++static void remove_buf(struct mpstr *mp)
++{
++ struct buf *buf = mp->tail;
++
++ mp->tail = buf->next;
++ if(mp->tail)
++ mp->tail->prev = NULL;
++ else {
++ mp->tail = mp->head = NULL;
++ }
++
++ free(buf->pnt);
++ free(buf);
++
++}
++
++static int read_buf_byte(int *error, struct mpstr *mp)
++{
++ unsigned int b;int pos;
++
++ pos = mp->tail->pos;
++ while(pos >= mp->tail->size) {
++ remove_buf(mp);
++ pos = mp->tail->pos;
++ if(!mp->tail) {
++ /* We may pick up this error a few times*/
++ /* But things have gone pear shaped */
++ ast_log(LOG_WARNING,"Fatal Buffer error!\n");
++ *error = 1;
++ return (0);
++ }
++ }
++
++ b = mp->tail->pnt[pos];
++ mp->bsize--;
++ mp->tail->pos++;
++
++
++ return b;
++}
++
++static int read_head(struct mpstr *mp)
++{
++ unsigned long head;
++ int error=0;
++
++
++ head = read_buf_byte(&error, mp);
++ head <<= 8;
++ head |= read_buf_byte(&error, mp);
++ head <<= 8;
++ head |= read_buf_byte(&error, mp);
++ head <<= 8;
++ head |= read_buf_byte(&error, mp);
++
++ mp->header = head;
++
++ if(error){
++ return (1);
++ }else
++ return (0);
++
++}
++
++static int head_check(unsigned long head)
++{
++ if( (head & 0xffe00000) != 0xffe00000)
++ return FALSE;
++ if(!((head>>17)&3))
++ return FALSE;
++ if( ((head>>12)&0xf) == 0xf || ((head>>12)&0xf) == 0)
++ return FALSE;
++ if( ((head>>10)&0x3) == 0x3 )
++ return FALSE;
++ if ((head & 0xffff0000) == 0xfffe0000)
++ return FALSE;
++
++ return TRUE;
++}
++
++static int head_shift(struct mpstr *mp)
++{
++ unsigned long head;
++ int error = 0;
++
++ head = mp->header;
++
++ head <<= 8;
++ head |= read_buf_byte(&error, mp);
++
++ mp->header = head;
++
++ if (error){
++ return (1);
++ }else
++ return (0);
++
++}
++
++
++int decodeMP3(struct mpstr *mp,char *in,int isize,char *out,
++ int osize,int *done)
++{
++ int len;
++ long n,m;
++ int down_sample_sblimit;
++
++ if(osize < 4608) {
++ ast_log(LOG_WARNING,"To less out space\n");
++ return MP3_ERR;
++ }
++
++ if(in) {
++ if(addbuf(mp,in,isize) == NULL) {
++ return MP3_ERR;
++ }
++ }
++
++ /* First decode header */
++ if(mp->framesize == 0) {
++ if(mp->bsize < 4) {
++ return MP3_NEED_MORE;
++ }
++ if (read_head(mp))
++ return MP3_ERR;
++
++ if(!head_check(mp->header) ) {
++ int i;
++
++ ast_log(LOG_WARNING,"Junk at the beginning of frame %08lx\n",mp->header);
++
++ /* step in byte steps through next 64K */
++ for(i=0;i<65536;i++) {
++ if(!mp->bsize)
++ return MP3_NEED_MORE;
++
++ if(head_shift(mp))
++ return MP3_ERR;
++
++ if(head_check(mp->header))
++ break;
++ }
++ if(i == 65536) {
++ ast_log(LOG_WARNING,"Giving up searching valid MPEG header\n");
++ return MP3_ERR;
++ }
++ }
++
++ decode_header(&mp->fr,mp->header);
++ mp->framesize = mp->fr.framesize;
++
++ if (!mp->initmp3){
++ mp->initmp3 = 1;
++
++ n = freqs[mp->fr.sampling_frequency];
++ if (mp->outsamplerate) {
++ m = mp->outsamplerate;
++ }
++ else {
++ m =n;
++ }
++
++ if (synth_ntom_set_step(n,m))
++ return MP3_ERR;
++
++
++ if(n>m) {
++ down_sample_sblimit = SBLIMIT * m;
++ down_sample_sblimit /= n;
++ }
++ else {
++ down_sample_sblimit = SBLIMIT;
++ }
++
++ init_layer3_sample_limits(mp, down_sample_sblimit);
++
++ }
++ }
++
++
++ if(mp->fr.framesize > mp->bsize)
++ return MP3_NEED_MORE;
++
++ (mp->worksample).wordpointer = mp->bsspace[mp->bsnum] + 512;
++ mp->bsnum = (mp->bsnum + 1) & 0x1;
++ (mp->worksample).bitindex = 0;
++
++ len = 0;
++ while(len < mp->framesize) {
++ int nlen;
++ int blen = mp->tail->size - mp->tail->pos;
++ if( (mp->framesize - len) <= blen) {
++ nlen = mp->framesize-len;
++ }
++ else {
++ nlen = blen;
++ }
++ memcpy((mp->worksample).wordpointer+len,mp->tail->pnt+mp->tail->pos,nlen);
++ len += nlen;
++ mp->tail->pos += nlen;
++ mp->bsize -= nlen;
++ if(mp->tail->pos == mp->tail->size) {
++ remove_buf(mp);
++ }
++ }
++
++ *done = 0;
++ if(mp->fr.error_protection)
++ getbits(mp, 16);
++
++ if (do_layer3(mp,(unsigned char *) out,done))
++ return MP3_ERR;
++
++ mp->fsizeold = mp->framesize;
++ mp->framesize = 0;
++
++ return MP3_OK;
++}
++
++int set_pointer(struct mpstr *mp, long backstep)
++{
++ unsigned char *bsbufold;
++ if(mp->fsizeold < 0 && backstep > 0) {
++ ast_log(LOG_WARNING,"Can't step back %ld!\n",backstep);
++ return MP3_ERR;
++ }
++ bsbufold = mp->bsspace[mp->bsnum] + 512;
++ (mp->worksample).wordpointer -= backstep;
++ if (backstep)
++ memcpy((mp->worksample).wordpointer,bsbufold+mp->fsizeold-backstep,backstep);
++ (mp->worksample).bitindex = 0;
++ return MP3_OK;
++}
++
++
++
++
+diff -ruN a/addons.orig/mp3/layer3.c b/addons/mp3/layer3.c
+--- a/addons.orig/mp3/layer3.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/layer3.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,2029 @@
++/*
++ * Mpeg Layer-3 audio decoder
++ * --------------------------
++ * copyright (c) 1995,1996,1997 by Michael Hipp.
++ * All rights reserved. See also 'README'
++ */
++
++#include "asterisk.h"
++#include "asterisk/logger.h"
++#include <stdlib.h>
++#include "mpg123.h"
++#include "mpglib.h"
++#include "huffman.h"
++
++#define MPEG1
++
++/* These should all be constants setup once using init_layer3_const */
++static real ispow[8207];
++static real aa_ca[8],aa_cs[8];
++static real COS1[12][6];
++static real win[4][36];
++static real win1[4][36];
++static real gainpow2[256+118+4];
++static real COS9[9];
++static real COS6_1,COS6_2;
++static real tfcos36[9];
++static real tfcos12[3];
++
++struct bandInfoStruct {
++ short longIdx[23];
++ short longDiff[22];
++ short shortIdx[14];
++ short shortDiff[13];
++};
++
++
++struct bandInfoStruct bandInfo[9] = {
++
++/* MPEG 1.0 */
++ { {0,4,8,12,16,20,24,30,36,44,52,62,74, 90,110,134,162,196,238,288,342,418,576},
++ {4,4,4,4,4,4,6,6,8, 8,10,12,16,20,24,28,34,42,50,54, 76,158},
++ {0,4*3,8*3,12*3,16*3,22*3,30*3,40*3,52*3,66*3, 84*3,106*3,136*3,192*3},
++ {4,4,4,4,6,8,10,12,14,18,22,30,56} } ,
++
++ { {0,4,8,12,16,20,24,30,36,42,50,60,72, 88,106,128,156,190,230,276,330,384,576},
++ {4,4,4,4,4,4,6,6,6, 8,10,12,16,18,22,28,34,40,46,54, 54,192},
++ {0,4*3,8*3,12*3,16*3,22*3,28*3,38*3,50*3,64*3, 80*3,100*3,126*3,192*3},
++ {4,4,4,4,6,6,10,12,14,16,20,26,66} } ,
++
++ { {0,4,8,12,16,20,24,30,36,44,54,66,82,102,126,156,194,240,296,364,448,550,576} ,
++ {4,4,4,4,4,4,6,6,8,10,12,16,20,24,30,38,46,56,68,84,102, 26} ,
++ {0,4*3,8*3,12*3,16*3,22*3,30*3,42*3,58*3,78*3,104*3,138*3,180*3,192*3} ,
++ {4,4,4,4,6,8,12,16,20,26,34,42,12} } ,
++
++/* MPEG 2.0 */
++ { {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
++ {6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54 } ,
++ {0,4*3,8*3,12*3,18*3,24*3,32*3,42*3,56*3,74*3,100*3,132*3,174*3,192*3} ,
++ {4,4,4,6,6,8,10,14,18,26,32,42,18 } } ,
++
++ { {0,6,12,18,24,30,36,44,54,66,80,96,114,136,162,194,232,278,330,394,464,540,576},
++ {6,6,6,6,6,6,8,10,12,14,16,18,22,26,32,38,46,52,64,70,76,36 } ,
++ {0,4*3,8*3,12*3,18*3,26*3,36*3,48*3,62*3,80*3,104*3,136*3,180*3,192*3} ,
++ {4,4,4,6,8,10,12,14,18,24,32,44,12 } } ,
++
++ { {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576},
++ {6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54 },
++ {0,4*3,8*3,12*3,18*3,26*3,36*3,48*3,62*3,80*3,104*3,134*3,174*3,192*3},
++ {4,4,4,6,8,10,12,14,18,24,30,40,18 } } ,
++/* MPEG 2.5 */
++ { {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576} ,
++ {6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54},
++ {0,12,24,36,54,78,108,144,186,240,312,402,522,576},
++ {4,4,4,6,8,10,12,14,18,24,30,40,18} },
++ { {0,6,12,18,24,30,36,44,54,66,80,96,116,140,168,200,238,284,336,396,464,522,576} ,
++ {6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54},
++ {0,12,24,36,54,78,108,144,186,240,312,402,522,576},
++ {4,4,4,6,8,10,12,14,18,24,30,40,18} },
++ { {0,12,24,36,48,60,72,88,108,132,160,192,232,280,336,400,476,566,568,570,572,574,576},
++ {12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2},
++ {0, 24, 48, 72,108,156,216,288,372,480,486,492,498,576},
++ {8,8,8,12,16,20,24,28,36,2,2,2,26} } ,
++};
++
++static int mapbuf0[9][152];
++static int mapbuf1[9][156];
++static int mapbuf2[9][44];
++static int *map[9][3];
++static int *mapend[9][3];
++
++static unsigned int n_slen2[512]; /* MPEG 2.0 slen for 'normal' mode */
++static unsigned int i_slen2[256]; /* MPEG 2.0 slen for intensity stereo */
++
++static real tan1_1[16],tan2_1[16],tan1_2[16],tan2_2[16];
++static real pow1_1[2][16],pow2_1[2][16],pow1_2[2][16],pow2_2[2][16];
++
++/*
++ * init constant tables for layer-3
++ */
++void init_layer3_const(void)
++{
++ int i,j,k,l;
++
++ for(i=-256;i<118+4;i++)
++ gainpow2[i+256] = pow((double)2.0,-0.25 * (double) (i+210) );
++
++ for(i=0;i<8207;i++)
++ ispow[i] = pow((double)i,(double)4.0/3.0);
++
++ for (i=0;i<8;i++)
++ {
++ static double Ci[8]={-0.6,-0.535,-0.33,-0.185,-0.095,-0.041,-0.0142,-0.0037};
++ double sq=sqrt(1.0+Ci[i]*Ci[i]);
++ aa_cs[i] = 1.0/sq;
++ aa_ca[i] = Ci[i]/sq;
++ }
++
++ for(i=0;i<18;i++)
++ {
++ win[0][i] = win[1][i] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+0) +1) ) / cos ( M_PI * (double) (2*(i+0) +19) / 72.0 );
++ win[0][i+18] = win[3][i+18] = 0.5 * sin( M_PI / 72.0 * (double) (2*(i+18)+1) ) / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 );
++ }
++ for(i=0;i<6;i++)
++ {
++ win[1][i+18] = 0.5 / cos ( M_PI * (double) (2*(i+18)+19) / 72.0 );
++ win[3][i+12] = 0.5 / cos ( M_PI * (double) (2*(i+12)+19) / 72.0 );
++ win[1][i+24] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+13) ) / cos ( M_PI * (double) (2*(i+24)+19) / 72.0 );
++ win[1][i+30] = win[3][i] = 0.0;
++ win[3][i+6 ] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*(i+6 )+19) / 72.0 );
++ }
++
++ for(i=0;i<9;i++)
++ COS9[i] = cos( M_PI / 18.0 * (double) i);
++
++ for(i=0;i<9;i++)
++ tfcos36[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 36.0 );
++ for(i=0;i<3;i++)
++ tfcos12[i] = 0.5 / cos ( M_PI * (double) (i*2+1) / 12.0 );
++
++ COS6_1 = cos( M_PI / 6.0 * (double) 1);
++ COS6_2 = cos( M_PI / 6.0 * (double) 2);
++
++ for(i=0;i<12;i++)
++ {
++ win[2][i] = 0.5 * sin( M_PI / 24.0 * (double) (2*i+1) ) / cos ( M_PI * (double) (2*i+7) / 24.0 );
++ for(j=0;j<6;j++)
++ COS1[i][j] = cos( M_PI / 24.0 * (double) ((2*i+7)*(2*j+1)) );
++ }
++
++ for(j=0;j<4;j++) {
++ static int len[4] = { 36,36,12,36 };
++ for(i=0;i<len[j];i+=2)
++ win1[j][i] = + win[j][i];
++ for(i=1;i<len[j];i+=2)
++ win1[j][i] = - win[j][i];
++ }
++
++ for(i=0;i<16;i++)
++ {
++ double t = tan( (double) i * M_PI / 12.0 );
++ tan1_1[i] = t / (1.0+t);
++ tan2_1[i] = 1.0 / (1.0 + t);
++ tan1_2[i] = M_SQRT2 * t / (1.0+t);
++ tan2_2[i] = M_SQRT2 / (1.0 + t);
++
++ for(j=0;j<2;j++) {
++ double base = pow(2.0,-0.25*(j+1.0));
++ double p1=1.0,p2=1.0;
++ if(i > 0) {
++ if( i & 1 )
++ p1 = pow(base,(i+1.0)*0.5);
++ else
++ p2 = pow(base,i*0.5);
++ }
++ pow1_1[j][i] = p1;
++ pow2_1[j][i] = p2;
++ pow1_2[j][i] = M_SQRT2 * p1;
++ pow2_2[j][i] = M_SQRT2 * p2;
++ }
++ }
++
++ for(j=0;j<9;j++)
++ {
++ struct bandInfoStruct *bi = &bandInfo[j];
++ int *mp;
++ int cb,lwin;
++ short *bdf;
++
++ mp = map[j][0] = mapbuf0[j];
++ bdf = bi->longDiff;
++ for(i=0,cb = 0; cb < 8 ; cb++,i+=*bdf++) {
++ *mp++ = (*bdf) >> 1;
++ *mp++ = i;
++ *mp++ = 3;
++ *mp++ = cb;
++ }
++ bdf = bi->shortDiff+3;
++ for(cb=3;cb<13;cb++) {
++ int l = (*bdf++) >> 1;
++ for(lwin=0;lwin<3;lwin++) {
++ *mp++ = l;
++ *mp++ = i + lwin;
++ *mp++ = lwin;
++ *mp++ = cb;
++ }
++ i += 6*l;
++ }
++ mapend[j][0] = mp;
++
++ mp = map[j][1] = mapbuf1[j];
++ bdf = bi->shortDiff+0;
++ for(i=0,cb=0;cb<13;cb++) {
++ int l = (*bdf++) >> 1;
++ for(lwin=0;lwin<3;lwin++) {
++ *mp++ = l;
++ *mp++ = i + lwin;
++ *mp++ = lwin;
++ *mp++ = cb;
++ }
++ i += 6*l;
++ }
++ mapend[j][1] = mp;
++
++ mp = map[j][2] = mapbuf2[j];
++ bdf = bi->longDiff;
++ for(cb = 0; cb < 22 ; cb++) {
++ *mp++ = (*bdf++) >> 1;
++ *mp++ = cb;
++ }
++ mapend[j][2] = mp;
++
++ }
++
++ for(i=0;i<5;i++) {
++ for(j=0;j<6;j++) {
++ for(k=0;k<6;k++) {
++ int n = k + j * 6 + i * 36;
++ i_slen2[n] = i|(j<<3)|(k<<6)|(3<<12);
++ }
++ }
++ }
++ for(i=0;i<4;i++) {
++ for(j=0;j<4;j++) {
++ for(k=0;k<4;k++) {
++ int n = k + j * 4 + i * 16;
++ i_slen2[n+180] = i|(j<<3)|(k<<6)|(4<<12);
++ }
++ }
++ }
++ for(i=0;i<4;i++) {
++ for(j=0;j<3;j++) {
++ int n = j + i * 3;
++ i_slen2[n+244] = i|(j<<3) | (5<<12);
++ n_slen2[n+500] = i|(j<<3) | (2<<12) | (1<<15);
++ }
++ }
++
++ for(i=0;i<5;i++) {
++ for(j=0;j<5;j++) {
++ for(k=0;k<4;k++) {
++ for(l=0;l<4;l++) {
++ int n = l + k * 4 + j * 16 + i * 80;
++ n_slen2[n] = i|(j<<3)|(k<<6)|(l<<9)|(0<<12);
++ }
++ }
++ }
++ }
++ for(i=0;i<5;i++) {
++ for(j=0;j<5;j++) {
++ for(k=0;k<4;k++) {
++ int n = k + j * 4 + i * 20;
++ n_slen2[n+400] = i|(j<<3)|(k<<6)|(1<<12);
++ }
++ }
++ }
++}
++
++/* MP3 file specific rates */
++void init_layer3_sample_limits(struct mpstr *mp, int down_sample_sblimit)
++{
++ int i,j;
++ for(j=0;j<9;j++) {
++ for(i=0;i<23;i++) {
++ (mp->longLimit)[j][i] = (bandInfo[j].longIdx[i] - 1 + 8) / 18 + 1;
++ if((mp->longLimit)[j][i] > (down_sample_sblimit) )
++ (mp->longLimit)[j][i] = down_sample_sblimit;
++ }
++ for(i=0;i<14;i++) {
++ (mp->shortLimit)[j][i] = (bandInfo[j].shortIdx[i] - 1) / 18 + 1;
++ if((mp->shortLimit)[j][i] > (down_sample_sblimit) )
++ (mp->shortLimit)[j][i] = down_sample_sblimit;
++ }
++ }
++}
++
++
++
++/*
++ * read additional side information
++ */
++#ifdef MPEG1
++static int III_get_side_info_1(struct mpstr *mp, struct III_sideinfo *si,int stereo,
++ int ms_stereo,long sfreq,int single)
++{
++ int ch, gr;
++ int powdiff = (single == 3) ? 4 : 0;
++
++ si->main_data_begin = getbits(mp, 9);
++ if (stereo == 1)
++ si->private_bits = getbits_fast(mp, 5);
++ else
++ si->private_bits = getbits_fast(mp, 3);
++
++ for (ch=0; ch<stereo; ch++) {
++ si->ch[ch].gr[0].scfsi = -1;
++ si->ch[ch].gr[1].scfsi = getbits_fast(mp, 4);
++ }
++
++ for (gr=0; gr<2; gr++)
++ {
++ for (ch=0; ch<stereo; ch++)
++ {
++ register struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]);
++
++ gr_info->part2_3_length = getbits(mp, 12);
++ gr_info->big_values = getbits_fast(mp, 9);
++ if(gr_info->big_values > 288) {
++ ast_log(LOG_WARNING,"big_values too large!\n");
++ gr_info->big_values = 288;
++ }
++ gr_info->pow2gain = gainpow2+256 - getbits_fast(mp, 8) + powdiff;
++ if(ms_stereo)
++ gr_info->pow2gain += 2;
++ gr_info->scalefac_compress = getbits_fast(mp, 4);
++/* window-switching flag == 1 for block_Type != 0 .. and block-type == 0 -> win-sw-flag = 0 */
++ if(get1bit(mp))
++ {
++ int i;
++ gr_info->block_type = getbits_fast(mp, 2);
++ gr_info->mixed_block_flag = get1bit(mp);
++ gr_info->table_select[0] = getbits_fast(mp, 5);
++ gr_info->table_select[1] = getbits_fast(mp, 5);
++ /*
++ * table_select[2] not needed, because there is no region2,
++ * but to satisfy some verifications tools we set it either.
++ */
++ gr_info->table_select[2] = 0;
++ for(i=0;i<3;i++)
++ gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(mp, 3)<<3);
++
++ if(gr_info->block_type == 0) {
++ ast_log(LOG_WARNING,"Blocktype == 0 and window-switching == 1 not allowed.\n");
++ return (1);
++ }
++ /* region_count/start parameters are implicit in this case. */
++ gr_info->region1start = 36>>1;
++ gr_info->region2start = 576>>1;
++ }
++ else
++ {
++ int i,r0c,r1c;
++ for (i=0; i<3; i++)
++ gr_info->table_select[i] = getbits_fast(mp, 5);
++ r0c = getbits_fast(mp, 4);
++ r1c = getbits_fast(mp, 3);
++ gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
++ gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
++ gr_info->block_type = 0;
++ gr_info->mixed_block_flag = 0;
++ }
++ gr_info->preflag = get1bit(mp);
++ gr_info->scalefac_scale = get1bit(mp);
++ gr_info->count1table_select = get1bit(mp);
++ }
++ }
++ return (0);
++
++}
++#endif
++
++/*
++ * Side Info for MPEG 2.0 / LSF
++ */
++static int III_get_side_info_2(struct mpstr *mp, struct III_sideinfo *si,int stereo,
++ int ms_stereo,long sfreq,int single)
++{
++ int ch;
++ int powdiff = (single == 3) ? 4 : 0;
++
++ si->main_data_begin = getbits(mp, 8);
++ if (stereo == 1)
++ si->private_bits = get1bit(mp);
++ else
++ si->private_bits = getbits_fast(mp, 2);
++
++ for (ch=0; ch<stereo; ch++)
++ {
++ register struct gr_info_s *gr_info = &(si->ch[ch].gr[0]);
++
++ gr_info->part2_3_length = getbits(mp, 12);
++ gr_info->big_values = getbits_fast(mp, 9);
++ if(gr_info->big_values > 288) {
++ ast_log(LOG_WARNING,"big_values too large!\n");
++ gr_info->big_values = 288;
++ }
++ gr_info->pow2gain = gainpow2+256 - getbits_fast(mp, 8) + powdiff;
++ if(ms_stereo)
++ gr_info->pow2gain += 2;
++ gr_info->scalefac_compress = getbits(mp, 9);
++/* window-switching flag == 1 for block_Type != 0 .. and block-type == 0 -> win-sw-flag = 0 */
++ if(get1bit(mp))
++ {
++ int i;
++ gr_info->block_type = getbits_fast(mp, 2);
++ gr_info->mixed_block_flag = get1bit(mp);
++ gr_info->table_select[0] = getbits_fast(mp, 5);
++ gr_info->table_select[1] = getbits_fast(mp, 5);
++ /*
++ * table_select[2] not needed, because there is no region2,
++ * but to satisfy some verifications tools we set it either.
++ */
++ gr_info->table_select[2] = 0;
++ for(i=0;i<3;i++)
++ gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(mp, 3)<<3);
++
++ if(gr_info->block_type == 0) {
++ ast_log(LOG_WARNING,"Blocktype == 0 and window-switching == 1 not allowed.\n");
++ return (1);
++ }
++ /* region_count/start parameters are implicit in this case. */
++/* check this again! */
++ if(gr_info->block_type == 2)
++ gr_info->region1start = 36>>1;
++ else if(sfreq == 8)
++/* check this for 2.5 and sfreq=8 */
++ gr_info->region1start = 108>>1;
++ else
++ gr_info->region1start = 54>>1;
++ gr_info->region2start = 576>>1;
++ }
++ else
++ {
++ int i,r0c,r1c;
++ for (i=0; i<3; i++)
++ gr_info->table_select[i] = getbits_fast(mp, 5);
++ r0c = getbits_fast(mp, 4);
++ r1c = getbits_fast(mp, 3);
++ gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
++ gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
++ gr_info->block_type = 0;
++ gr_info->mixed_block_flag = 0;
++ }
++ gr_info->scalefac_scale = get1bit(mp);
++ gr_info->count1table_select = get1bit(mp);
++ }
++ return (0);
++}
++
++/*
++ * read scalefactors
++ */
++#ifdef MPEG1
++static int III_get_scale_factors_1(struct mpstr *mp, int *scf,struct gr_info_s *gr_info)
++{
++ static unsigned char slen[2][16] = {
++ {0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4},
++ {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}
++ };
++ int numbits;
++ int num0 = slen[0][gr_info->scalefac_compress];
++ int num1 = slen[1][gr_info->scalefac_compress];
++
++ if (gr_info->block_type == 2)
++ {
++ int i=18;
++ numbits = (num0 + num1) * 18;
++
++ if (gr_info->mixed_block_flag) {
++ for (i=8;i;i--)
++ *scf++ = getbits_fast(mp, num0);
++ i = 9;
++ numbits -= num0; /* num0 * 17 + num1 * 18 */
++ }
++
++ for (;i;i--)
++ *scf++ = getbits_fast(mp, num0);
++ for (i = 18; i; i--)
++ *scf++ = getbits_fast(mp, num1);
++ *scf++ = 0; *scf++ = 0; *scf++ = 0; /* short[13][0..2] = 0 */
++ }
++ else
++ {
++ int i;
++ int scfsi = gr_info->scfsi;
++
++ if(scfsi < 0) { /* scfsi < 0 => granule == 0 */
++ for(i=11;i;i--)
++ *scf++ = getbits_fast(mp, num0);
++ for(i=10;i;i--)
++ *scf++ = getbits_fast(mp, num1);
++ numbits = (num0 + num1) * 10 + num0;
++ }
++ else {
++ numbits = 0;
++ if(!(scfsi & 0x8)) {
++ for (i=6;i;i--)
++ *scf++ = getbits_fast(mp, num0);
++ numbits += num0 * 6;
++ }
++ else {
++ *scf++ = 0; *scf++ = 0; *scf++ = 0; /* set to ZERO necessary? */
++ *scf++ = 0; *scf++ = 0; *scf++ = 0;
++ }
++
++ if(!(scfsi & 0x4)) {
++ for (i=5;i;i--)
++ *scf++ = getbits_fast(mp, num0);
++ numbits += num0 * 5;
++ }
++ else {
++ *scf++ = 0; *scf++ = 0; *scf++ = 0; /* set to ZERO necessary? */
++ *scf++ = 0; *scf++ = 0;
++ }
++
++ if(!(scfsi & 0x2)) {
++ for(i=5;i;i--)
++ *scf++ = getbits_fast(mp, num1);
++ numbits += num1 * 5;
++ }
++ else {
++ *scf++ = 0; *scf++ = 0; *scf++ = 0; /* set to ZERO necessary? */
++ *scf++ = 0; *scf++ = 0;
++ }
++
++ if(!(scfsi & 0x1)) {
++ for (i=5;i;i--)
++ *scf++ = getbits_fast(mp, num1);
++ numbits += num1 * 5;
++ }
++ else {
++ *scf++ = 0; *scf++ = 0; *scf++ = 0; /* set to ZERO necessary? */
++ *scf++ = 0; *scf++ = 0;
++ }
++ }
++
++ *scf++ = 0; /* no l[21] in original sources */
++ }
++ return numbits;
++}
++#endif
++
++static int III_get_scale_factors_2(struct mpstr *mp, int *scf,struct gr_info_s *gr_info,int i_stereo)
++{
++ unsigned char *pnt;
++ int i,j;
++ unsigned int slen;
++ int n = 0;
++ int numbits = 0;
++
++ static unsigned char stab[3][6][4] = {
++ { { 6, 5, 5,5 } , { 6, 5, 7,3 } , { 11,10,0,0} ,
++ { 7, 7, 7,0 } , { 6, 6, 6,3 } , { 8, 8,5,0} } ,
++ { { 9, 9, 9,9 } , { 9, 9,12,6 } , { 18,18,0,0} ,
++ {12,12,12,0 } , {12, 9, 9,6 } , { 15,12,9,0} } ,
++ { { 6, 9, 9,9 } , { 6, 9,12,6 } , { 15,18,0,0} ,
++ { 6,15,12,0 } , { 6,12, 9,6 } , { 6,18,9,0} } };
++
++ if(i_stereo) /* i_stereo AND second channel -> do_layer3() checks this */
++ slen = i_slen2[gr_info->scalefac_compress>>1];
++ else
++ slen = n_slen2[gr_info->scalefac_compress];
++
++ gr_info->preflag = (slen>>15) & 0x1;
++
++ n = 0;
++ if( gr_info->block_type == 2 ) {
++ n++;
++ if(gr_info->mixed_block_flag)
++ n++;
++ }
++
++ pnt = stab[n][(slen>>12)&0x7];
++
++ for(i=0;i<4;i++) {
++ int num = slen & 0x7;
++ slen >>= 3;
++ if(num) {
++ for(j=0;j<(int)(pnt[i]);j++)
++ *scf++ = getbits_fast(mp, num);
++ numbits += pnt[i] * num;
++ }
++ else {
++ for(j=0;j<(int)(pnt[i]);j++)
++ *scf++ = 0;
++ }
++ }
++
++ n = (n << 1) + 1;
++ for(i=0;i<n;i++)
++ *scf++ = 0;
++
++ return numbits;
++}
++
++static int pretab1[22] = {0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0};
++static int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
++
++/*
++ * don't forget to apply the same changes to III_dequantize_sample_ms() !!!
++ */
++static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT],int *scf,
++ struct gr_info_s *gr_info,int sfreq,int part2bits)
++{
++ int shift = 1 + gr_info->scalefac_scale;
++ real *xrpnt = (real *) xr;
++ int l[3],l3;
++ int part2remain = gr_info->part2_3_length - part2bits;
++ int *me;
++
++ {
++ int bv = gr_info->big_values;
++ int region1 = gr_info->region1start;
++ int region2 = gr_info->region2start;
++
++ l3 = ((576>>1)-bv)>>1;
++/*
++ * we may lose the 'odd' bit here !!
++ * check this later again
++ */
++ if(bv <= region1) {
++ l[0] = bv; l[1] = 0; l[2] = 0;
++ }
++ else {
++ l[0] = region1;
++ if(bv <= region2) {
++ l[1] = bv - l[0]; l[2] = 0;
++ }
++ else {
++ l[1] = region2 - l[0]; l[2] = bv - region2;
++ }
++ }
++ }
++
++ if(gr_info->block_type == 2) {
++ /*
++ * decoding with short or mixed mode BandIndex table
++ */
++ int i,max[4];
++ int step=0,lwin=0,cb=0;
++ register real v = 0.0;
++ register int *m,mc;
++
++ if(gr_info->mixed_block_flag) {
++ max[3] = -1;
++ max[0] = max[1] = max[2] = 2;
++ m = map[sfreq][0];
++ me = mapend[sfreq][0];
++ }
++ else {
++ max[0] = max[1] = max[2] = max[3] = -1;
++ /* max[3] not really needed in this case */
++ m = map[sfreq][1];
++ me = mapend[sfreq][1];
++ }
++
++ mc = 0;
++ for(i=0;i<2;i++) {
++ int lp = l[i];
++ struct newhuff *h = ht+gr_info->table_select[i];
++ for(;lp;lp--,mc--) {
++ register int x,y;
++ if( (!mc) ) {
++ mc = *m++;
++ xrpnt = ((real *) xr) + (*m++);
++ lwin = *m++;
++ cb = *m++;
++ if(lwin == 3) {
++ v = gr_info->pow2gain[(*scf++) << shift];
++ step = 1;
++ }
++ else {
++ v = gr_info->full_gain[lwin][(*scf++) << shift];
++ step = 3;
++ }
++ }
++ {
++ register short *val = h->table;
++ while((y=*val++)<0) {
++ if (get1bit(mp))
++ val -= y;
++ part2remain--;
++ }
++ x = y >> 4;
++ y &= 0xf;
++ }
++ if(x == 15) {
++ max[lwin] = cb;
++ part2remain -= h->linbits+1;
++ x += getbits(mp, h->linbits);
++ if(get1bit(mp))
++ *xrpnt = -ispow[x] * v;
++ else
++ *xrpnt = ispow[x] * v;
++ }
++ else if(x) {
++ max[lwin] = cb;
++ if(get1bit(mp))
++ *xrpnt = -ispow[x] * v;
++ else
++ *xrpnt = ispow[x] * v;
++ part2remain--;
++ }
++ else
++ *xrpnt = 0.0;
++ xrpnt += step;
++ if(y == 15) {
++ max[lwin] = cb;
++ part2remain -= h->linbits+1;
++ y += getbits(mp, h->linbits);
++ if(get1bit(mp))
++ *xrpnt = -ispow[y] * v;
++ else
++ *xrpnt = ispow[y] * v;
++ }
++ else if(y) {
++ max[lwin] = cb;
++ if(get1bit(mp))
++ *xrpnt = -ispow[y] * v;
++ else
++ *xrpnt = ispow[y] * v;
++ part2remain--;
++ }
++ else
++ *xrpnt = 0.0;
++ xrpnt += step;
++ }
++ }
++ for(;l3 && (part2remain > 0);l3--) {
++ struct newhuff *h = htc+gr_info->count1table_select;
++ register short *val = h->table,a;
++
++ while((a=*val++)<0) {
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ a = 0;
++ break;
++ }
++ if (get1bit(mp))
++ val -= a;
++ }
++
++ for(i=0;i<4;i++) {
++ if(!(i & 1)) {
++ if(!mc) {
++ mc = *m++;
++ xrpnt = ((real *) xr) + (*m++);
++ lwin = *m++;
++ cb = *m++;
++ if(lwin == 3) {
++ v = gr_info->pow2gain[(*scf++) << shift];
++ step = 1;
++ }
++ else {
++ v = gr_info->full_gain[lwin][(*scf++) << shift];
++ step = 3;
++ }
++ }
++ mc--;
++ }
++ if( (a & (0x8>>i)) ) {
++ max[lwin] = cb;
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ break;
++ }
++ if(get1bit(mp))
++ *xrpnt = -v;
++ else
++ *xrpnt = v;
++ }
++ else
++ *xrpnt = 0.0;
++ xrpnt += step;
++ }
++ }
++
++ while( m < me ) {
++ if(!mc) {
++ mc = *m++;
++ xrpnt = ((real *) xr) + *m++;
++ if( (*m++) == 3)
++ step = 1;
++ else
++ step = 3;
++ m++; /* cb */
++ }
++ mc--;
++ *xrpnt = 0.0;
++ xrpnt += step;
++ *xrpnt = 0.0;
++ xrpnt += step;
++/* we could add a little opt. here:
++ * if we finished a band for window 3 or a long band
++ * further bands could copied in a simple loop without a
++ * special 'map' decoding
++ */
++ }
++
++ gr_info->maxband[0] = max[0]+1;
++ gr_info->maxband[1] = max[1]+1;
++ gr_info->maxband[2] = max[2]+1;
++ gr_info->maxbandl = max[3]+1;
++
++ {
++ int rmax = max[0] > max[1] ? max[0] : max[1];
++ rmax = (rmax > max[2] ? rmax : max[2]) + 1;
++ gr_info->maxb = rmax ? (mp->shortLimit)[sfreq][rmax] : (mp->longLimit)[sfreq][max[3]+1];
++ }
++
++ }
++ else {
++ /*
++ * decoding with 'long' BandIndex table (block_type != 2)
++ */
++ int *pretab = gr_info->preflag ? pretab1 : pretab2;
++ int i,max = -1;
++ int cb = 0;
++ register int *m = map[sfreq][2];
++ register real v = 0.0;
++ register int mc = 0;
++#if 0
++ me = mapend[sfreq][2];
++#endif
++
++ /*
++ * long hash table values
++ */
++ for(i=0;i<3;i++) {
++ int lp = l[i];
++ struct newhuff *h = ht+gr_info->table_select[i];
++
++ for(;lp;lp--,mc--) {
++ int x,y;
++
++ if(!mc) {
++ mc = *m++;
++ v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
++ cb = *m++;
++ }
++ {
++ register short *val = h->table;
++ while((y=*val++)<0) {
++ if (get1bit(mp))
++ val -= y;
++ part2remain--;
++ }
++ x = y >> 4;
++ y &= 0xf;
++ }
++ if (x == 15) {
++ max = cb;
++ part2remain -= h->linbits+1;
++ x += getbits(mp, h->linbits);
++ if(get1bit(mp))
++ *xrpnt++ = -ispow[x] * v;
++ else
++ *xrpnt++ = ispow[x] * v;
++ }
++ else if(x) {
++ max = cb;
++ if(get1bit(mp))
++ *xrpnt++ = -ispow[x] * v;
++ else
++ *xrpnt++ = ispow[x] * v;
++ part2remain--;
++ }
++ else
++ *xrpnt++ = 0.0;
++
++ if (y == 15) {
++ max = cb;
++ part2remain -= h->linbits+1;
++ y += getbits(mp, h->linbits);
++ if(get1bit(mp))
++ *xrpnt++ = -ispow[y] * v;
++ else
++ *xrpnt++ = ispow[y] * v;
++ }
++ else if(y) {
++ max = cb;
++ if(get1bit(mp))
++ *xrpnt++ = -ispow[y] * v;
++ else
++ *xrpnt++ = ispow[y] * v;
++ part2remain--;
++ }
++ else
++ *xrpnt++ = 0.0;
++ }
++ }
++
++ /*
++ * short (count1table) values
++ */
++ for(;l3 && (part2remain > 0);l3--) {
++ struct newhuff *h = htc+gr_info->count1table_select;
++ register short *val = h->table,a;
++
++ while((a=*val++)<0) {
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ a = 0;
++ break;
++ }
++ if (get1bit(mp))
++ val -= a;
++ }
++
++ for(i=0;i<4;i++) {
++ if(!(i & 1)) {
++ if(!mc) {
++ mc = *m++;
++ cb = *m++;
++ v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
++ }
++ mc--;
++ }
++ if ( (a & (0x8>>i)) ) {
++ max = cb;
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ break;
++ }
++ if(get1bit(mp))
++ *xrpnt++ = -v;
++ else
++ *xrpnt++ = v;
++ }
++ else
++ *xrpnt++ = 0.0;
++ }
++ }
++
++ /*
++ * zero part
++ */
++ for(i=(&xr[SBLIMIT][0]-xrpnt)>>1;i;i--) {
++ *xrpnt++ = 0.0;
++ *xrpnt++ = 0.0;
++ }
++
++ gr_info->maxbandl = max+1;
++ gr_info->maxb = (mp->longLimit)[sfreq][gr_info->maxbandl];
++ }
++
++ while( part2remain > 16 ) {
++ getbits(mp, 16); /* Dismiss stuffing Bits */
++ part2remain -= 16;
++ }
++ if(part2remain > 0)
++ getbits(mp, part2remain);
++ else if(part2remain < 0) {
++ ast_log(LOG_WARNING,"mpg123: Can't rewind stream by %d bits!\n",-part2remain);
++ return 1; /* -> error */
++ }
++ return 0;
++}
++
++#if 0
++static int III_dequantize_sample_ms(real xr[2][SBLIMIT][SSLIMIT],int *scf,
++ struct gr_info_s *gr_info,int sfreq,int part2bits)
++{
++ int shift = 1 + gr_info->scalefac_scale;
++ real *xrpnt = (real *) xr[1];
++ real *xr0pnt = (real *) xr[0];
++ int l[3],l3;
++ int part2remain = gr_info->part2_3_length - part2bits;
++ int *me;
++
++ {
++ int bv = gr_info->big_values;
++ int region1 = gr_info->region1start;
++ int region2 = gr_info->region2start;
++
++ l3 = ((576>>1)-bv)>>1;
++/*
++ * we may lose the 'odd' bit here !!
++ * check this later gain
++ */
++ if(bv <= region1) {
++ l[0] = bv; l[1] = 0; l[2] = 0;
++ }
++ else {
++ l[0] = region1;
++ if(bv <= region2) {
++ l[1] = bv - l[0]; l[2] = 0;
++ }
++ else {
++ l[1] = region2 - l[0]; l[2] = bv - region2;
++ }
++ }
++ }
++
++ if(gr_info->block_type == 2) {
++ int i,max[4];
++ int step=0,lwin=0,cb=0;
++ register real v = 0.0;
++ register int *m,mc = 0;
++
++ if(gr_info->mixed_block_flag) {
++ max[3] = -1;
++ max[0] = max[1] = max[2] = 2;
++ m = map[sfreq][0];
++ me = mapend[sfreq][0];
++ }
++ else {
++ max[0] = max[1] = max[2] = max[3] = -1;
++ /* max[3] not really needed in this case */
++ m = map[sfreq][1];
++ me = mapend[sfreq][1];
++ }
++
++ for(i=0;i<2;i++) {
++ int lp = l[i];
++ struct newhuff *h = ht+gr_info->table_select[i];
++ for(;lp;lp--,mc--) {
++ int x,y;
++
++ if(!mc) {
++ mc = *m++;
++ xrpnt = ((real *) xr[1]) + *m;
++ xr0pnt = ((real *) xr[0]) + *m++;
++ lwin = *m++;
++ cb = *m++;
++ if(lwin == 3) {
++ v = gr_info->pow2gain[(*scf++) << shift];
++ step = 1;
++ }
++ else {
++ v = gr_info->full_gain[lwin][(*scf++) << shift];
++ step = 3;
++ }
++ }
++ {
++ register short *val = h->table;
++ while((y=*val++)<0) {
++ if (get1bit(mp))
++ val -= y;
++ part2remain--;
++ }
++ x = y >> 4;
++ y &= 0xf;
++ }
++ if(x == 15) {
++ max[lwin] = cb;
++ part2remain -= h->linbits+1;
++ x += getbits(mp, h->linbits);
++ if(get1bit(mp)) {
++ real a = ispow[x] * v;
++ *xrpnt = *xr0pnt + a;
++ *xr0pnt -= a;
++ }
++ else {
++ real a = ispow[x] * v;
++ *xrpnt = *xr0pnt - a;
++ *xr0pnt += a;
++ }
++ }
++ else if(x) {
++ max[lwin] = cb;
++ if(get1bit(mp)) {
++ real a = ispow[x] * v;
++ *xrpnt = *xr0pnt + a;
++ *xr0pnt -= a;
++ }
++ else {
++ real a = ispow[x] * v;
++ *xrpnt = *xr0pnt - a;
++ *xr0pnt += a;
++ }
++ part2remain--;
++ }
++ else
++ *xrpnt = *xr0pnt;
++ xrpnt += step;
++ xr0pnt += step;
++
++ if(y == 15) {
++ max[lwin] = cb;
++ part2remain -= h->linbits+1;
++ y += getbits(mp, h->linbits);
++ if(get1bit(mp)) {
++ real a = ispow[y] * v;
++ *xrpnt = *xr0pnt + a;
++ *xr0pnt -= a;
++ }
++ else {
++ real a = ispow[y] * v;
++ *xrpnt = *xr0pnt - a;
++ *xr0pnt += a;
++ }
++ }
++ else if(y) {
++ max[lwin] = cb;
++ if(get1bit(mp)) {
++ real a = ispow[y] * v;
++ *xrpnt = *xr0pnt + a;
++ *xr0pnt -= a;
++ }
++ else {
++ real a = ispow[y] * v;
++ *xrpnt = *xr0pnt - a;
++ *xr0pnt += a;
++ }
++ part2remain--;
++ }
++ else
++ *xrpnt = *xr0pnt;
++ xrpnt += step;
++ xr0pnt += step;
++ }
++ }
++
++ for(;l3 && (part2remain > 0);l3--) {
++ struct newhuff *h = htc+gr_info->count1table_select;
++ register short *val = h->table,a;
++
++ while((a=*val++)<0) {
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ a = 0;
++ break;
++ }
++ if (get1bit(mp))
++ val -= a;
++ }
++
++ for(i=0;i<4;i++) {
++ if(!(i & 1)) {
++ if(!mc) {
++ mc = *m++;
++ xrpnt = ((real *) xr[1]) + *m;
++ xr0pnt = ((real *) xr[0]) + *m++;
++ lwin = *m++;
++ cb = *m++;
++ if(lwin == 3) {
++ v = gr_info->pow2gain[(*scf++) << shift];
++ step = 1;
++ }
++ else {
++ v = gr_info->full_gain[lwin][(*scf++) << shift];
++ step = 3;
++ }
++ }
++ mc--;
++ }
++ if( (a & (0x8>>i)) ) {
++ max[lwin] = cb;
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ break;
++ }
++ if(get1bit(mp)) {
++ *xrpnt = *xr0pnt + v;
++ *xr0pnt -= v;
++ }
++ else {
++ *xrpnt = *xr0pnt - v;
++ *xr0pnt += v;
++ }
++ }
++ else
++ *xrpnt = *xr0pnt;
++ xrpnt += step;
++ xr0pnt += step;
++ }
++ }
++
++ while( m < me ) {
++ if(!mc) {
++ mc = *m++;
++ xrpnt = ((real *) xr[1]) + *m;
++ xr0pnt = ((real *) xr[0]) + *m++;
++ if(*m++ == 3)
++ step = 1;
++ else
++ step = 3;
++ m++; /* cb */
++ }
++ mc--;
++ *xrpnt = *xr0pnt;
++ xrpnt += step;
++ xr0pnt += step;
++ *xrpnt = *xr0pnt;
++ xrpnt += step;
++ xr0pnt += step;
++/* we could add a little opt. here:
++ * if we finished a band for window 3 or a long band
++ * further bands could copied in a simple loop without a
++ * special 'map' decoding
++ */
++ }
++
++ gr_info->maxband[0] = max[0]+1;
++ gr_info->maxband[1] = max[1]+1;
++ gr_info->maxband[2] = max[2]+1;
++ gr_info->maxbandl = max[3]+1;
++
++ {
++ int rmax = max[0] > max[1] ? max[0] : max[1];
++ rmax = (rmax > max[2] ? rmax : max[2]) + 1;
++ gr_info->maxb = rmax ? (mp->shortLimit)[sfreq][rmax] : (mp->longLimit)[sfreq][max[3]+1];
++ }
++ }
++ else {
++ int *pretab = gr_info->preflag ? pretab1 : pretab2;
++ int i,max = -1;
++ int cb = 0;
++ register int mc=0,*m = map[sfreq][2];
++ register real v = 0.0;
++#if 0
++ me = mapend[sfreq][2];
++#endif
++
++ for(i=0;i<3;i++) {
++ int lp = l[i];
++ struct newhuff *h = ht+gr_info->table_select[i];
++
++ for(;lp;lp--,mc--) {
++ int x,y;
++ if(!mc) {
++ mc = *m++;
++ cb = *m++;
++ v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
++ }
++ {
++ register short *val = h->table;
++ while((y=*val++)<0) {
++ if (get1bit(mp))
++ val -= y;
++ part2remain--;
++ }
++ x = y >> 4;
++ y &= 0xf;
++ }
++ if (x == 15) {
++ max = cb;
++ part2remain -= h->linbits+1;
++ x += getbits(mp, h->linbits);
++ if(get1bit(mp)) {
++ real a = ispow[x] * v;
++ *xrpnt++ = *xr0pnt + a;
++ *xr0pnt++ -= a;
++ }
++ else {
++ real a = ispow[x] * v;
++ *xrpnt++ = *xr0pnt - a;
++ *xr0pnt++ += a;
++ }
++ }
++ else if(x) {
++ max = cb;
++ if(get1bit(mp)) {
++ real a = ispow[x] * v;
++ *xrpnt++ = *xr0pnt + a;
++ *xr0pnt++ -= a;
++ }
++ else {
++ real a = ispow[x] * v;
++ *xrpnt++ = *xr0pnt - a;
++ *xr0pnt++ += a;
++ }
++ part2remain--;
++ }
++ else
++ *xrpnt++ = *xr0pnt++;
++
++ if (y == 15) {
++ max = cb;
++ part2remain -= h->linbits+1;
++ y += getbits(mp, h->linbits);
++ if(get1bit(mp)) {
++ real a = ispow[y] * v;
++ *xrpnt++ = *xr0pnt + a;
++ *xr0pnt++ -= a;
++ }
++ else {
++ real a = ispow[y] * v;
++ *xrpnt++ = *xr0pnt - a;
++ *xr0pnt++ += a;
++ }
++ }
++ else if(y) {
++ max = cb;
++ if(get1bit(mp)) {
++ real a = ispow[y] * v;
++ *xrpnt++ = *xr0pnt + a;
++ *xr0pnt++ -= a;
++ }
++ else {
++ real a = ispow[y] * v;
++ *xrpnt++ = *xr0pnt - a;
++ *xr0pnt++ += a;
++ }
++ part2remain--;
++ }
++ else
++ *xrpnt++ = *xr0pnt++;
++ }
++ }
++
++ for(;l3 && (part2remain > 0);l3--) {
++ struct newhuff *h = htc+gr_info->count1table_select;
++ register short *val = h->table,a;
++
++ while((a=*val++)<0) {
++ part2remain--;
++ if(part2remain < 0) {
++ part2remain++;
++ a = 0;
++ break;
++ }
++ if (get1bit(mp))
++ val -= a;
++ }
++
++ for(i=0;i<4;i++) {
++ if(!(i & 1)) {
++ if(!mc) {
++ mc = *m++;
++ cb = *m++;
++ v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
++ }
++ mc--;
++ }
++ if ( (a & (0x8>>i)) ) {
++ max = cb;
++ part2remain--;
++ if(part2remain <= 0) {
++ part2remain++;
++ break;
++ }
++ if(get1bit(mp)) {
++ *xrpnt++ = *xr0pnt + v;
++ *xr0pnt++ -= v;
++ }
++ else {
++ *xrpnt++ = *xr0pnt - v;
++ *xr0pnt++ += v;
++ }
++ }
++ else
++ *xrpnt++ = *xr0pnt++;
++ }
++ }
++ for(i=(&xr[1][SBLIMIT][0]-xrpnt)>>1;i;i--) {
++ *xrpnt++ = *xr0pnt++;
++ *xrpnt++ = *xr0pnt++;
++ }
++
++ gr_info->maxbandl = max+1;
++ gr_info->maxb = longLimit[sfreq][gr_info->maxbandl];
++ }
++
++ while ( part2remain > 16 ) {
++ getbits(mp, 16); /* Dismiss stuffing Bits */
++ part2remain -= 16;
++ }
++ if(part2remain > 0 )
++ getbits(mp, part2remain);
++ else if(part2remain < 0) {
++ ast_log(LOG_WARNING,"mpg123_ms: Can't rewind stream by %d bits!\n",-part2remain);
++ return 1; /* -> error */
++ }
++ return 0;
++}
++#endif
++
++/*
++ * III_stereo: calculate real channel values for Joint-I-Stereo-mode
++ */
++static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT],int *scalefac,
++ struct gr_info_s *gr_info,int sfreq,int ms_stereo,int lsf)
++{
++ real (*xr)[SBLIMIT*SSLIMIT] = (real (*)[SBLIMIT*SSLIMIT] ) xr_buf;
++ struct bandInfoStruct *bi = &bandInfo[sfreq];
++ real *tab1,*tab2;
++
++ if(lsf) {
++ int p = gr_info->scalefac_compress & 0x1;
++ if(ms_stereo) {
++ tab1 = pow1_2[p]; tab2 = pow2_2[p];
++ }
++ else {
++ tab1 = pow1_1[p]; tab2 = pow2_1[p];
++ }
++ }
++ else {
++ if(ms_stereo) {
++ tab1 = tan1_2; tab2 = tan2_2;
++ }
++ else {
++ tab1 = tan1_1; tab2 = tan2_1;
++ }
++ }
++
++ if (gr_info->block_type == 2)
++ {
++ int lwin,do_l = 0;
++ if( gr_info->mixed_block_flag )
++ do_l = 1;
++
++ for (lwin=0;lwin<3;lwin++) /* process each window */
++ {
++ /* get first band with zero values */
++ int is_p,sb,idx,sfb = gr_info->maxband[lwin]; /* sfb is minimal 3 for mixed mode */
++ if(sfb > 3)
++ do_l = 0;
++
++ for(;sfb<12;sfb++)
++ {
++ is_p = scalefac[sfb*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */
++ if(is_p != 7) {
++ real t1,t2;
++ sb = bi->shortDiff[sfb];
++ idx = bi->shortIdx[sfb] + lwin;
++ t1 = tab1[is_p]; t2 = tab2[is_p];
++ for (; sb > 0; sb--,idx+=3)
++ {
++ real v = xr[0][idx];
++ xr[0][idx] = v * t1;
++ xr[1][idx] = v * t2;
++ }
++ }
++ }
++
++#if 1
++/* in the original: copy 10 to 11 , here: copy 11 to 12
++maybe still wrong??? (copy 12 to 13?) */
++ is_p = scalefac[11*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */
++ sb = bi->shortDiff[12];
++ idx = bi->shortIdx[12] + lwin;
++#else
++ is_p = scalefac[10*3+lwin-gr_info->mixed_block_flag]; /* scale: 0-15 */
++ sb = bi->shortDiff[11];
++ idx = bi->shortIdx[11] + lwin;
++#endif
++ if(is_p != 7)
++ {
++ real t1,t2;
++ t1 = tab1[is_p]; t2 = tab2[is_p];
++ for ( ; sb > 0; sb--,idx+=3 )
++ {
++ real v = xr[0][idx];
++ xr[0][idx] = v * t1;
++ xr[1][idx] = v * t2;
++ }
++ }
++ } /* end for(lwin; .. ; . ) */
++
++ if (do_l)
++ {
++/* also check l-part, if ALL bands in the three windows are 'empty'
++ * and mode = mixed_mode
++ */
++ int sfb = gr_info->maxbandl;
++ int idx = bi->longIdx[sfb];
++
++ for ( ; sfb<8; sfb++ )
++ {
++ int sb = bi->longDiff[sfb];
++ int is_p = scalefac[sfb]; /* scale: 0-15 */
++ if(is_p != 7) {
++ real t1,t2;
++ t1 = tab1[is_p]; t2 = tab2[is_p];
++ for ( ; sb > 0; sb--,idx++)
++ {
++ real v = xr[0][idx];
++ xr[0][idx] = v * t1;
++ xr[1][idx] = v * t2;
++ }
++ }
++ else
++ idx += sb;
++ }
++ }
++ }
++ else /* ((gr_info->block_type != 2)) */
++ {
++ int sfb = gr_info->maxbandl;
++ int is_p,idx = bi->longIdx[sfb];
++ for ( ; sfb<21; sfb++)
++ {
++ int sb = bi->longDiff[sfb];
++ is_p = scalefac[sfb]; /* scale: 0-15 */
++ if(is_p != 7) {
++ real t1,t2;
++ t1 = tab1[is_p]; t2 = tab2[is_p];
++ for ( ; sb > 0; sb--,idx++)
++ {
++ real v = xr[0][idx];
++ xr[0][idx] = v * t1;
++ xr[1][idx] = v * t2;
++ }
++ }
++ else
++ idx += sb;
++ }
++
++ is_p = scalefac[20]; /* copy l-band 20 to l-band 21 */
++ if(is_p != 7)
++ {
++ int sb;
++ real t1 = tab1[is_p],t2 = tab2[is_p];
++
++ for ( sb = bi->longDiff[21]; sb > 0; sb--,idx++ )
++ {
++ real v = xr[0][idx];
++ xr[0][idx] = v * t1;
++ xr[1][idx] = v * t2;
++ }
++ }
++ } /* ... */
++}
++
++static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info)
++{
++ int sblim;
++
++ if(gr_info->block_type == 2)
++ {
++ if(!gr_info->mixed_block_flag)
++ return;
++ sblim = 1;
++ }
++ else {
++ sblim = gr_info->maxb-1;
++ }
++
++ /* 31 alias-reduction operations between each pair of sub-bands */
++ /* with 8 butterflies between each pair */
++
++ {
++ int sb;
++ real *xr1=(real *) xr[1];
++
++ for(sb=sblim;sb;sb--,xr1+=10)
++ {
++ int ss;
++ real *cs=aa_cs,*ca=aa_ca;
++ real *xr2 = xr1;
++
++ for(ss=7;ss>=0;ss--)
++ { /* upper and lower butterfly inputs */
++ register real bu = *--xr2,bd = *xr1;
++ *xr2 = (bu * (*cs) ) - (bd * (*ca) );
++ *xr1++ = (bd * (*cs++) ) + (bu * (*ca++) );
++ }
++ }
++ }
++}
++
++/*
++ DCT insipired by Jeff Tsay's DCT from the maplay package
++ this is an optimized version with manual unroll.
++
++ References:
++ [1] S. Winograd: "On Computing the Discrete Fourier Transform",
++ Mathematics of Computation, Volume 32, Number 141, January 1978,
++ Pages 175-199
++*/
++
++static void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
++{
++ {
++ register real *in = inbuf;
++
++ in[17]+=in[16]; in[16]+=in[15]; in[15]+=in[14];
++ in[14]+=in[13]; in[13]+=in[12]; in[12]+=in[11];
++ in[11]+=in[10]; in[10]+=in[9]; in[9] +=in[8];
++ in[8] +=in[7]; in[7] +=in[6]; in[6] +=in[5];
++ in[5] +=in[4]; in[4] +=in[3]; in[3] +=in[2];
++ in[2] +=in[1]; in[1] +=in[0];
++
++ in[17]+=in[15]; in[15]+=in[13]; in[13]+=in[11]; in[11]+=in[9];
++ in[9] +=in[7]; in[7] +=in[5]; in[5] +=in[3]; in[3] +=in[1];
++
++
++ {
++
++#define MACRO0(v) { \
++ real tmp; \
++ out2[9+(v)] = (tmp = sum0 + sum1) * w[27+(v)]; \
++ out2[8-(v)] = tmp * w[26-(v)]; } \
++ sum0 -= sum1; \
++ ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)]; \
++ ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)];
++#define MACRO1(v) { \
++ real sum0,sum1; \
++ sum0 = tmp1a + tmp2a; \
++ sum1 = (tmp1b + tmp2b) * tfcos36[(v)]; \
++ MACRO0(v); }
++#define MACRO2(v) { \
++ real sum0,sum1; \
++ sum0 = tmp2a - tmp1a; \
++ sum1 = (tmp2b - tmp1b) * tfcos36[(v)]; \
++ MACRO0(v); }
++
++ register const real *c = COS9;
++ register real *out2 = o2;
++ register real *w = wintab;
++ register real *out1 = o1;
++ register real *ts = tsbuf;
++
++ real ta33,ta66,tb33,tb66;
++
++ ta33 = in[2*3+0] * c[3];
++ ta66 = in[2*6+0] * c[6];
++ tb33 = in[2*3+1] * c[3];
++ tb66 = in[2*6+1] * c[6];
++
++ {
++ real tmp1a,tmp2a,tmp1b,tmp2b;
++ tmp1a = in[2*1+0] * c[1] + ta33 + in[2*5+0] * c[5] + in[2*7+0] * c[7];
++ tmp1b = in[2*1+1] * c[1] + tb33 + in[2*5+1] * c[5] + in[2*7+1] * c[7];
++ tmp2a = in[2*0+0] + in[2*2+0] * c[2] + in[2*4+0] * c[4] + ta66 + in[2*8+0] * c[8];
++ tmp2b = in[2*0+1] + in[2*2+1] * c[2] + in[2*4+1] * c[4] + tb66 + in[2*8+1] * c[8];
++
++ MACRO1(0);
++ MACRO2(8);
++ }
++
++ {
++ real tmp1a,tmp2a,tmp1b,tmp2b;
++ tmp1a = ( in[2*1+0] - in[2*5+0] - in[2*7+0] ) * c[3];
++ tmp1b = ( in[2*1+1] - in[2*5+1] - in[2*7+1] ) * c[3];
++ tmp2a = ( in[2*2+0] - in[2*4+0] - in[2*8+0] ) * c[6] - in[2*6+0] + in[2*0+0];
++ tmp2b = ( in[2*2+1] - in[2*4+1] - in[2*8+1] ) * c[6] - in[2*6+1] + in[2*0+1];
++
++ MACRO1(1);
++ MACRO2(7);
++ }
++
++ {
++ real tmp1a,tmp2a,tmp1b,tmp2b;
++ tmp1a = in[2*1+0] * c[5] - ta33 - in[2*5+0] * c[7] + in[2*7+0] * c[1];
++ tmp1b = in[2*1+1] * c[5] - tb33 - in[2*5+1] * c[7] + in[2*7+1] * c[1];
++ tmp2a = in[2*0+0] - in[2*2+0] * c[8] - in[2*4+0] * c[2] + ta66 + in[2*8+0] * c[4];
++ tmp2b = in[2*0+1] - in[2*2+1] * c[8] - in[2*4+1] * c[2] + tb66 + in[2*8+1] * c[4];
++
++ MACRO1(2);
++ MACRO2(6);
++ }
++
++ {
++ real tmp1a,tmp2a,tmp1b,tmp2b;
++ tmp1a = in[2*1+0] * c[7] - ta33 + in[2*5+0] * c[1] - in[2*7+0] * c[5];
++ tmp1b = in[2*1+1] * c[7] - tb33 + in[2*5+1] * c[1] - in[2*7+1] * c[5];
++ tmp2a = in[2*0+0] - in[2*2+0] * c[4] + in[2*4+0] * c[8] + ta66 - in[2*8+0] * c[2];
++ tmp2b = in[2*0+1] - in[2*2+1] * c[4] + in[2*4+1] * c[8] + tb66 - in[2*8+1] * c[2];
++
++ MACRO1(3);
++ MACRO2(5);
++ }
++
++ {
++ real sum0,sum1;
++ sum0 = in[2*0+0] - in[2*2+0] + in[2*4+0] - in[2*6+0] + in[2*8+0];
++ sum1 = (in[2*0+1] - in[2*2+1] + in[2*4+1] - in[2*6+1] + in[2*8+1] ) * tfcos36[4];
++ MACRO0(4);
++ }
++ }
++
++ }
++}
++
++/*
++ * new DCT12
++ */
++static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,register real *ts)
++{
++#define DCT12_PART1 \
++ in5 = in[5*3]; \
++ in5 += (in4 = in[4*3]); \
++ in4 += (in3 = in[3*3]); \
++ in3 += (in2 = in[2*3]); \
++ in2 += (in1 = in[1*3]); \
++ in1 += (in0 = in[0*3]); \
++ \
++ in5 += in3; in3 += in1; \
++ \
++ in2 *= COS6_1; \
++ in3 *= COS6_1; \
++
++#define DCT12_PART2 \
++ in0 += in4 * COS6_2; \
++ \
++ in4 = in0 + in2; \
++ in0 -= in2; \
++ \
++ in1 += in5 * COS6_2; \
++ \
++ in5 = (in1 + in3) * tfcos12[0]; \
++ in1 = (in1 - in3) * tfcos12[2]; \
++ \
++ in3 = in4 + in5; \
++ in4 -= in5; \
++ \
++ in2 = in0 + in1; \
++ in0 -= in1;
++
++
++ {
++ real in0,in1,in2,in3,in4,in5;
++ register real *out1 = rawout1;
++ ts[SBLIMIT*0] = out1[0]; ts[SBLIMIT*1] = out1[1]; ts[SBLIMIT*2] = out1[2];
++ ts[SBLIMIT*3] = out1[3]; ts[SBLIMIT*4] = out1[4]; ts[SBLIMIT*5] = out1[5];
++
++ DCT12_PART1
++
++ {
++ real tmp0,tmp1 = (in0 - in4);
++ {
++ real tmp2 = (in1 - in5) * tfcos12[1];
++ tmp0 = tmp1 + tmp2;
++ tmp1 -= tmp2;
++ }
++ ts[(17-1)*SBLIMIT] = out1[17-1] + tmp0 * wi[11-1];
++ ts[(12+1)*SBLIMIT] = out1[12+1] + tmp0 * wi[6+1];
++ ts[(6 +1)*SBLIMIT] = out1[6 +1] + tmp1 * wi[1];
++ ts[(11-1)*SBLIMIT] = out1[11-1] + tmp1 * wi[5-1];
++ }
++
++ DCT12_PART2
++
++ ts[(17-0)*SBLIMIT] = out1[17-0] + in2 * wi[11-0];
++ ts[(12+0)*SBLIMIT] = out1[12+0] + in2 * wi[6+0];
++ ts[(12+2)*SBLIMIT] = out1[12+2] + in3 * wi[6+2];
++ ts[(17-2)*SBLIMIT] = out1[17-2] + in3 * wi[11-2];
++
++ ts[(6+0)*SBLIMIT] = out1[6+0] + in0 * wi[0];
++ ts[(11-0)*SBLIMIT] = out1[11-0] + in0 * wi[5-0];
++ ts[(6+2)*SBLIMIT] = out1[6+2] + in4 * wi[2];
++ ts[(11-2)*SBLIMIT] = out1[11-2] + in4 * wi[5-2];
++ }
++
++ in++;
++
++ {
++ real in0,in1,in2,in3,in4,in5;
++ register real *out2 = rawout2;
++
++ DCT12_PART1
++
++ {
++ real tmp0,tmp1 = (in0 - in4);
++ {
++ real tmp2 = (in1 - in5) * tfcos12[1];
++ tmp0 = tmp1 + tmp2;
++ tmp1 -= tmp2;
++ }
++ out2[5-1] = tmp0 * wi[11-1];
++ out2[0+1] = tmp0 * wi[6+1];
++ ts[(12+1)*SBLIMIT] += tmp1 * wi[1];
++ ts[(17-1)*SBLIMIT] += tmp1 * wi[5-1];
++ }
++
++ DCT12_PART2
++
++ out2[5-0] = in2 * wi[11-0];
++ out2[0+0] = in2 * wi[6+0];
++ out2[0+2] = in3 * wi[6+2];
++ out2[5-2] = in3 * wi[11-2];
++
++ ts[(12+0)*SBLIMIT] += in0 * wi[0];
++ ts[(17-0)*SBLIMIT] += in0 * wi[5-0];
++ ts[(12+2)*SBLIMIT] += in4 * wi[2];
++ ts[(17-2)*SBLIMIT] += in4 * wi[5-2];
++ }
++
++ in++;
++
++ {
++ real in0,in1,in2,in3,in4,in5;
++ register real *out2 = rawout2;
++ out2[12]=out2[13]=out2[14]=out2[15]=out2[16]=out2[17]=0.0;
++
++ DCT12_PART1
++
++ {
++ real tmp0,tmp1 = (in0 - in4);
++ {
++ real tmp2 = (in1 - in5) * tfcos12[1];
++ tmp0 = tmp1 + tmp2;
++ tmp1 -= tmp2;
++ }
++ out2[11-1] = tmp0 * wi[11-1];
++ out2[6 +1] = tmp0 * wi[6+1];
++ out2[0+1] += tmp1 * wi[1];
++ out2[5-1] += tmp1 * wi[5-1];
++ }
++
++ DCT12_PART2
++
++ out2[11-0] = in2 * wi[11-0];
++ out2[6 +0] = in2 * wi[6+0];
++ out2[6 +2] = in3 * wi[6+2];
++ out2[11-2] = in3 * wi[11-2];
++
++ out2[0+0] += in0 * wi[0];
++ out2[5-0] += in0 * wi[5-0];
++ out2[0+2] += in4 * wi[2];
++ out2[5-2] += in4 * wi[5-2];
++ }
++}
++
++/*
++ * III_hybrid
++ */
++static void III_hybrid(struct mpstr *mp, real fsIn[SBLIMIT][SSLIMIT],real tsOut[SSLIMIT][SBLIMIT],
++ int ch,struct gr_info_s *gr_info)
++{
++ real *tspnt = (real *) tsOut;
++ real (*block)[2][SBLIMIT*SSLIMIT] = mp->hybrid_block;
++ int *blc = mp->hybrid_blc;
++ real *rawout1,*rawout2;
++ int bt;
++ int sb = 0;
++
++ {
++ int b = blc[ch];
++ rawout1=block[b][ch];
++ b=-b+1;
++ rawout2=block[b][ch];
++ blc[ch] = b;
++ }
++
++
++ if(gr_info->mixed_block_flag) {
++ sb = 2;
++ dct36(fsIn[0],rawout1,rawout2,win[0],tspnt);
++ dct36(fsIn[1],rawout1+18,rawout2+18,win1[0],tspnt+1);
++ rawout1 += 36; rawout2 += 36; tspnt += 2;
++ }
++
++ bt = gr_info->block_type;
++ if(bt == 2) {
++ for (; sb<gr_info->maxb; sb+=2,tspnt+=2,rawout1+=36,rawout2+=36) {
++ dct12(fsIn[sb],rawout1,rawout2,win[2],tspnt);
++ dct12(fsIn[sb+1],rawout1+18,rawout2+18,win1[2],tspnt+1);
++ }
++ }
++ else {
++ for (; sb<gr_info->maxb; sb+=2,tspnt+=2,rawout1+=36,rawout2+=36) {
++ dct36(fsIn[sb],rawout1,rawout2,win[bt],tspnt);
++ dct36(fsIn[sb+1],rawout1+18,rawout2+18,win1[bt],tspnt+1);
++ }
++ }
++
++ for(;sb<SBLIMIT;sb++,tspnt++) {
++ int i;
++ for(i=0;i<SSLIMIT;i++) {
++ tspnt[i*SBLIMIT] = *rawout1++;
++ *rawout2++ = 0.0;
++ }
++ }
++}
++
++/*
++ * main layer3 handler
++ */
++int do_layer3(struct mpstr *mp,unsigned char *pcm_sample,int *pcm_point)
++{
++
++ int gr, ch, ss,clip=0;
++ int scalefacs[39]; /* max 39 for short[13][3] mode, mixed: 38, long: 22 */
++ struct III_sideinfo sideinfo;
++ struct frame *fr;
++ int stereo, single, sfreq;
++ int ms_stereo,i_stereo;
++ int stereo1,granules;
++
++ fr = &(mp->fr);
++ stereo = fr->stereo;
++ single = fr->single;
++ sfreq = fr->sampling_frequency;
++
++
++
++ if(stereo == 1) { /* stream is mono */
++ stereo1 = 1;
++ single = 0;
++ }
++ else if(single >= 0) /* stream is stereo, but force to mono */
++ stereo1 = 1;
++ else
++ stereo1 = 2;
++
++ if(fr->mode == MPG_MD_JOINT_STEREO) {
++ ms_stereo = fr->mode_ext & 0x2;
++ i_stereo = fr->mode_ext & 0x1;
++ }
++ else
++ ms_stereo = i_stereo = 0;
++
++ if(fr->lsf) {
++ granules = 1;
++ if (III_get_side_info_2(mp, &sideinfo,stereo,ms_stereo,sfreq,single))
++ return (MP3_ERR);
++ }
++ else {
++ granules = 2;
++#ifdef MPEG1
++ if ( III_get_side_info_1(mp, &sideinfo,stereo,ms_stereo,sfreq,single))
++ return (MP3_ERR);
++
++#else
++ ast_log(LOG_WARNING,"Not supported\n");
++#endif
++ }
++
++ if(set_pointer(mp, sideinfo.main_data_begin) == MP3_ERR)
++ return 0;
++
++ for (gr=0;gr<granules;gr++)
++ {
++ static real hybridIn[2][SBLIMIT][SSLIMIT];
++ static real hybridOut[2][SSLIMIT][SBLIMIT];
++
++ {
++ struct gr_info_s *gr_info = &(sideinfo.ch[0].gr[gr]);
++ long part2bits;
++ if(fr->lsf)
++ part2bits = III_get_scale_factors_2(mp, scalefacs,gr_info,0);
++ else {
++#ifdef MPEG1
++ part2bits = III_get_scale_factors_1(mp, scalefacs,gr_info);
++#else
++ ast_log(LOG_WARNING,"Not supported\n");
++#endif
++ }
++ if(III_dequantize_sample(mp, hybridIn[0], scalefacs,gr_info,sfreq,part2bits))
++ return (MP3_ERR);
++ }
++ if(stereo == 2) {
++ struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]);
++ long part2bits;
++ if(fr->lsf)
++ part2bits = III_get_scale_factors_2(mp, scalefacs,gr_info,i_stereo);
++ else {
++#ifdef MPEG1
++ part2bits = III_get_scale_factors_1(mp, scalefacs,gr_info);
++#else
++ ast_log(LOG_WARNING,"Not supported\n");
++#endif
++ }
++
++ if(III_dequantize_sample(mp, hybridIn[1],scalefacs,gr_info,sfreq,part2bits))
++ return (MP3_ERR);
++
++ if(ms_stereo) {
++ int i;
++ for(i=0;i<SBLIMIT*SSLIMIT;i++) {
++ real tmp0,tmp1;
++ tmp0 = ((real *) hybridIn[0])[i];
++ tmp1 = ((real *) hybridIn[1])[i];
++ ((real *) hybridIn[1])[i] = tmp0 - tmp1;
++ ((real *) hybridIn[0])[i] = tmp0 + tmp1;
++ }
++ }
++
++ if(i_stereo)
++ III_i_stereo(hybridIn,scalefacs,gr_info,sfreq,ms_stereo,fr->lsf);
++
++ if(ms_stereo || i_stereo || (single == 3) ) {
++ if(gr_info->maxb > sideinfo.ch[0].gr[gr].maxb)
++ sideinfo.ch[0].gr[gr].maxb = gr_info->maxb;
++ else
++ gr_info->maxb = sideinfo.ch[0].gr[gr].maxb;
++ }
++
++ switch(single) {
++ case 3:
++ {
++ register int i;
++ register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
++ for(i=0;i<SSLIMIT*gr_info->maxb;i++,in0++)
++ *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */
++ }
++ break;
++ case 1:
++ {
++ register int i;
++ register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
++ for(i=0;i<SSLIMIT*gr_info->maxb;i++)
++ *in0++ = *in1++;
++ }
++ break;
++ }
++ }
++
++ for(ch=0;ch<stereo1;ch++) {
++ struct gr_info_s *gr_info = &(sideinfo.ch[ch].gr[gr]);
++ III_antialias(hybridIn[ch],gr_info);
++ III_hybrid(mp, hybridIn[ch], hybridOut[ch], ch,gr_info);
++ }
++
++ for(ss=0;ss<SSLIMIT;ss++) {
++ if(single >= 0) {
++ clip += synth_ntom_mono(mp,hybridOut[0][ss],pcm_sample,pcm_point);
++ }
++ else {
++ int p1 = *pcm_point;
++ clip += synth_ntom(mp,hybridOut[0][ss],0,pcm_sample,&p1);
++ clip += synth_ntom(mp,hybridOut[1][ss],1,pcm_sample,pcm_point);
++ }
++ }
++ }
++
++ return 0;
++}
++
++
+diff -ruN a/addons.orig/mp3/mpg123.h b/addons/mp3/mpg123.h
+--- a/addons.orig/mp3/mpg123.h 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/mpg123.h 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,132 @@
++#include <stdio.h>
++#include <string.h>
++#include <signal.h>
++
++#ifndef WIN32
++#include <sys/signal.h>
++#include <unistd.h>
++#endif
++
++#include <math.h>
++
++#ifdef _WIN32
++# undef WIN32
++# define WIN32
++
++# define M_PI 3.14159265358979323846
++# define M_SQRT2 1.41421356237309504880
++# define REAL_IS_FLOAT
++# define NEW_DCT9
++
++# define random rand
++# define srandom srand
++
++#endif
++
++#ifdef REAL_IS_FLOAT
++# define real float
++#elif defined(REAL_IS_LONG_DOUBLE)
++# define real long double
++#else
++# define real double
++#endif
++
++#ifdef __GNUC__
++#define INLINE inline
++#else
++#define INLINE
++#endif
++
++/* AUDIOBUFSIZE = n*64 with n=1,2,3 ... */
++#define AUDIOBUFSIZE 16384
++
++#define FALSE 0
++#define TRUE 1
++
++#define SBLIMIT 32
++#define SSLIMIT 18
++
++#define MPG_MD_STEREO 0
++#define MPG_MD_JOINT_STEREO 1
++#define MPG_MD_DUAL_CHANNEL 2
++#define MPG_MD_MONO 3
++
++#define MAXFRAMESIZE 1792
++
++
++/* Pre Shift fo 16 to 8 bit converter table */
++#define AUSHIFT (3)
++
++struct frame {
++ int stereo;
++ int jsbound;
++ int single;
++ int lsf;
++ int mpeg25;
++ int header_change;
++ int lay;
++ int error_protection;
++ int bitrate_index;
++ int sampling_frequency;
++ int padding;
++ int extension;
++ int mode;
++ int mode_ext;
++ int copyright;
++ int original;
++ int emphasis;
++ int framesize; /* computed framesize */
++};
++
++struct parameter {
++ int quiet; /* shut up! */
++ int tryresync; /* resync stream after error */
++ int verbose; /* verbose level */
++ int checkrange;
++};
++
++extern int decode_header(struct frame *fr,unsigned long newhead);
++
++
++
++struct gr_info_s {
++ int scfsi;
++ unsigned part2_3_length;
++ unsigned big_values;
++ unsigned scalefac_compress;
++ unsigned block_type;
++ unsigned mixed_block_flag;
++ unsigned table_select[3];
++ unsigned subblock_gain[3];
++ unsigned maxband[3];
++ unsigned maxbandl;
++ unsigned maxb;
++ unsigned region1start;
++ unsigned region2start;
++ unsigned preflag;
++ unsigned scalefac_scale;
++ unsigned count1table_select;
++ real *full_gain[3];
++ real *pow2gain;
++};
++
++struct III_sideinfo
++{
++ unsigned main_data_begin;
++ unsigned private_bits;
++ struct {
++ struct gr_info_s gr[2];
++ } ch[2];
++};
++
++struct pcm_workingsample
++{
++ int bitindex;
++ unsigned char *wordpointer;
++};
++
++
++extern long freqs[9];
++extern struct parameter param;
++extern real *pnts[5];
++
+diff -ruN a/addons.orig/mp3/mpglib.h b/addons/mp3/mpglib.h
+--- a/addons.orig/mp3/mpglib.h 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/mpglib.h 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,75 @@
++
++struct buf {
++ unsigned char *pnt;
++ long size;
++ long pos;
++ struct buf *next;
++ struct buf *prev;
++};
++
++struct framebuf {
++ struct buf *buf;
++ long pos;
++ struct frame *next;
++ struct frame *prev;
++};
++
++struct mpstr {
++ struct buf *head,*tail;
++ int bsize;
++ int framesize;
++ int fsizeold;
++ struct frame fr;
++ unsigned char bsspace[2][MAXFRAMESIZE+512]; /* MAXFRAMESIZE */
++ real hybrid_block[2][2][SBLIMIT*SSLIMIT];
++ int hybrid_blc[2];
++ unsigned long header;
++ int bsnum;
++ real synth_buffs[2][2][0x110];
++ int synth_bo;
++ long outscale; /* volume control default value 32768 */
++ long outsamplerate; /* raw output rate default same as mp3 sample rate*/
++ struct pcm_workingsample worksample; /* keep the state of the working sample for threads */
++ int initmp3; /* flag for first initialisation */
++ int longLimit[9][23]; /*sample limits re setting volume */
++ int shortLimit[9][14];
++ real decwin[512+32]; /* scale table */
++
++ };
++
++#define BOOL int
++
++#define MP3_ERR -1
++#define MP3_OK 0
++#define MP3_NEED_MORE 1
++
++
++void InitMP3Constants(void);
++BOOL InitMP3(struct mpstr *mp, long outscale);
++int decodeMP3(struct mpstr *mp,char *inmemory,int inmemsize,
++ char *outmemory,int outmemsize,int *done);
++void ExitMP3(struct mpstr *mp);
++
++extern int synth_ntom_set_step(long,long);
++extern int synth_ntom(struct mpstr *mp, real *bandPtr,int channel,unsigned char *out,int *pnt);
++extern int synth_ntom_mono (struct mpstr *mp, real *bandPtr,unsigned char *samples,int *pnt);
++extern int synth_ntom_8bit (real *,int,unsigned char *,int *);
++extern int synth_ntom_mono2stereo (real *,unsigned char *,int *);
++extern int synth_ntom_8bit_mono (real *,unsigned char *,int *);
++extern int synth_ntom_8bit_mono2stereo (real *,unsigned char *,int *);
++
++extern void init_layer3_sample_limits(struct mpstr *mp, int down_sample_sblimit);
++extern void init_layer3_const(void);
++extern int do_layer3(struct mpstr *mp,unsigned char *,int *);
++
++extern void make_decode_tables_scale(struct mpstr *mp, long scaleval);
++extern void make_decode_tables_const(void);
++extern void make_conv16to8_table(int);
++
++extern void dct64(real *,real *,real *);
++
++extern unsigned int get1bit(struct mpstr *mp);
++extern unsigned int getbits(struct mpstr *mp, int);
++extern unsigned int getbits_fast(struct mpstr *mp, int);
++extern int set_pointer(struct mpstr *mp, long backstep);
++
+diff -ruN a/addons.orig/mp3/tabinit.c b/addons/mp3/tabinit.c
+--- a/addons.orig/mp3/tabinit.c 1970-01-01 02:00:00.000000000 -0200
++++ b/addons/mp3/tabinit.c 2014-08-06 08:45:08.170617276 -0300
+@@ -0,0 +1,81 @@
++
++#include <stdlib.h>
++
++#include "mpg123.h"
++#include "mpglib.h"
++
++static real cos64[16],cos32[8],cos16[4],cos8[2],cos4[1];
++real *pnts[] = { cos64,cos32,cos16,cos8,cos4 };
++
++static long intwinbase[] = {
++ 0, -1, -1, -1, -1, -1, -1, -2, -2, -2,
++ -2, -3, -3, -4, -4, -5, -5, -6, -7, -7,
++ -8, -9, -10, -11, -13, -14, -16, -17, -19, -21,
++ -24, -26, -29, -31, -35, -38, -41, -45, -49, -53,
++ -58, -63, -68, -73, -79, -85, -91, -97, -104, -111,
++ -117, -125, -132, -139, -147, -154, -161, -169, -176, -183,
++ -190, -196, -202, -208, -213, -218, -222, -225, -227, -228,
++ -228, -227, -224, -221, -215, -208, -200, -189, -177, -163,
++ -146, -127, -106, -83, -57, -29, 2, 36, 72, 111,
++ 153, 197, 244, 294, 347, 401, 459, 519, 581, 645,
++ 711, 779, 848, 919, 991, 1064, 1137, 1210, 1283, 1356,
++ 1428, 1498, 1567, 1634, 1698, 1759, 1817, 1870, 1919, 1962,
++ 2001, 2032, 2057, 2075, 2085, 2087, 2080, 2063, 2037, 2000,
++ 1952, 1893, 1822, 1739, 1644, 1535, 1414, 1280, 1131, 970,
++ 794, 605, 402, 185, -45, -288, -545, -814, -1095, -1388,
++ -1692, -2006, -2330, -2663, -3004, -3351, -3705, -4063, -4425, -4788,
++ -5153, -5517, -5879, -6237, -6589, -6935, -7271, -7597, -7910, -8209,
++ -8491, -8755, -8998, -9219, -9416, -9585, -9727, -9838, -9916, -9959,
++ -9966, -9935, -9863, -9750, -9592, -9389, -9139, -8840, -8492, -8092,
++ -7640, -7134, -6574, -5959, -5288, -4561, -3776, -2935, -2037, -1082,
++ -70, 998, 2122, 3300, 4533, 5818, 7154, 8540, 9975, 11455,
++ 12980, 14548, 16155, 17799, 19478, 21189, 22929, 24694, 26482, 28289,
++ 30112, 31947, 33791, 35640, 37489, 39336, 41176, 43006, 44821, 46617,
++ 48390, 50137, 51853, 53534, 55178, 56778, 58333, 59838, 61289, 62684,
++ 64019, 65290, 66494, 67629, 68692, 69679, 70590, 71420, 72169, 72835,
++ 73415, 73908, 74313, 74630, 74856, 74992, 75038 };
++
++void make_decode_tables_const(void)
++{
++ int i,k,kr,divv;
++ real *costab;
++
++ for(i=0;i<5;i++)
++ {
++ kr=0x10>>i; divv=0x40>>i;
++ costab = pnts[i];
++ for(k=0;k<kr;k++)
++ costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv));
++ }
++
++}
++
++void make_decode_tables_scale(struct mpstr *mp, long scaleval)
++{
++ int i,j;
++ real *table;
++
++ table = mp->decwin;
++ scaleval = -scaleval;
++ for(i=0,j=0;i<256;i++,j++,table+=32)
++ {
++ if(table < (mp->decwin)+512+16)
++ table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
++ if(i % 32 == 31)
++ table -= 1023;
++ if(i % 64 == 63)
++ scaleval = - scaleval;
++ }
++
++ for( /* i=256 */ ;i<512;i++,j--,table+=32)
++ {
++ if(table < (mp->decwin)+512+16)
++ table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
++ if(i % 32 == 31)
++ table -= 1023;
++ if(i % 64 == 63)
++ scaleval = - scaleval;
++ }
++}
++
++
diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash
new file mode 100644
index 0000000..65f5a93
--- /dev/null
+++ b/package/asterisk/asterisk.hash
@@ -0,0 +1,2 @@
+# From http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.3.2.sha256
+sha256 ff87592a49156e2f7c03a39a12d099a610e71c3135ca9548429b4066fc76aaa5 asterisk-13.3.2.tar.gz
diff --git a/package/asterisk/asterisk.makeopts-13 b/package/asterisk/asterisk.makeopts-13
new file mode 100644
index 0000000..938a5c6
--- /dev/null
+++ b/package/asterisk/asterisk.makeopts-13
@@ -0,0 +1,54 @@
+MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql cdr_mysql
+MENUSELECT_APPS=app_page app_skel app_fax app_ivrdemo app_jack app_osplookup app_saycounted app_meetme app_setcallerid
+MENUSELECT_BRIDGES=
+MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite
+MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds
+MENUSELECT_CHANNELS=chan_alsa chan_console chan_misdn chan_nbs chan_vpb
+MENUSELECT_CODECS=codec_speex
+MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_FUNCS=func_odbc func_speex
+MENUSELECT_PBX=pbx_lua
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_config_ldap res_config_pgsql res_config_sqlite res_pktccops res_snmp res_timing_kqueue
+MENUSELECT_TESTS=
+MENUSELECT_CFLAGS=LOADABLE_MODULES
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
+MENUSELECT_UTILS=astdb2sqlite3
+MENUSELECT_AGIS=
+MENUSELECT_EMBED=
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
+MENUSELECT_MOH=-MOH-OPSOUND-WAV
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
new file mode 100644
index 0000000..a38d92b
--- /dev/null
+++ b/package/asterisk/asterisk.mk
@@ -0,0 +1,106 @@
+################################################################################
+#
+# asterisk
+#
+################################################################################
+
+ASTERISK_VERSION = 13.3.2
+ASTERISK_SITE = http://downloads.asterisk.org/pub/telephony/asterisk/releases
+ASTERISK_LICENSE = GPLv2
+ASTERISK_LICENSE_FILES = LICENSE
+ASTERISK_DEPENDENCIES = \
+ host-libxml2 \
+ jansson \
+ libical \
+ libedit \
+ libspandsp \
+ libsrtp \
+ libxml2 \
+ neon \
+ ncurses \
+ libpjsip \
+ util-linux \
+ zlib
+
+ifeq ($(BR2_PACKAGE_ASTERISK_FREERADIUS),y)
+ASTERISK_DEPENDENCIES += freeradius-client
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_LIBCURL),y)
+ASTERISK_DEPENDENCIES += libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_LIBVORBIS),y)
+ASTERISK_DEPENDENCIES += libvorbis
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_OPENSSL),y)
+ASTERISK_DEPENDENCIES += openssl
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_OPUS),y)
+ASTERISK_DEPENDENCIES += opus
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_PORTAUDIO),y)
+ASTERISK_DEPENDENCIES += portaudio
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_SPEEX),y)
+ASTERISK_DEPENDENCIES += speex
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_SQLITE),y)
+ASTERISK_DEPENDENCIES += sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_ASTERISK_UNIXODBC),y)
+ASTERISK_DEPENDENCIES += unixodbc
+endif
+
+ASTERISK_CONF_ENV += \
+ USE_GETIFADDRS=no \
+ NOISY_BUILD=yes \
+ CONFIG_NEON=$(STAGING_DIR)/usr/bin/neon-config \
+ CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config
+
+ASTERISK_CONF_OPTS += \
+ --disable-xmldoc
+
+# ASTERISK_AUTORECONF is broken,
+# needed because 0001-configure-cross-fix.patch patches configure.ac
+define ASTERISK_BOOTSTRAP
+ cd $(@D) && PATH=$(BR_PATH) ./bootstrap.sh
+endef
+ASTERISK_PRE_CONFIGURE_HOOKS += ASTERISK_BOOTSTRAP
+
+define ASTERISK_MENUSELECT
+ $(SED) 's/NATIVE_ARCH=/NATIVE_ARCH=0/' $(@D)/build_tools/menuselect-deps
+ (cd $(@D)/menuselect; \
+ ./bootstrap; \
+ $(HOST_CONFIGURE_OPTS) ./configure \
+ )
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
+ GLOBAL_MAKEOPTS=$(TOPDIR)/package/asterisk/asterisk.makeopts-13 \
+ menuselect.makeopts
+ (cd $(@D) && \
+ menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts && \
+ menuselect/menuselect --disable astcanary menuselect.makeopts && \
+ menuselect/menuselect --disable astdb2sqlite3 menuselect.makeopts && \
+ menuselect/menuselect --disable astdb2bdb menuselect.makeopts \
+ menuselect/menuselect --disable chan_alsa menuselect.makeopts \
+ menuselect/menuselect --disable chan_oss menuselect.makeopts \
+ menuselect/menuselect --enable app_ivrdemo menuselect.makeopts \
+ menuselect/menuselect --enable app_meetme menuselect.makeopts \
+ menuselect/menuselect --enable format_mp3 menuselect.makeopts \
+ menuselect/menuselect --enable chan_ooh323 menuselect.makeopts \
+ menuselect/menuselect --enable res_calendar_caldav menuselect.makeopts \
+ menuselect/menuselect --enable res_fax menuselect.makeopts \
+ menuselect/menuselect --enable res_fax_spandsp menuselect.makeopts \
+ )
+endef
+ASTERISK_POST_CONFIGURE_HOOKS += ASTERISK_MENUSELECT
+
+ASTERISK_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install config samples
+
+$(eval $(autotools-package))
--
1.7.10.4
More information about the buildroot
mailing list