* #31630: added libgsm
diff --git a/jni/Android.mk b/jni/Android.mk
index 8cc1eb5..d6d37c2 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -17,15 +17,16 @@
TARGET_NAME=arm-unknown-linux-androideabi
MY_PJPROJECT=pjproject-android
-MY_COMMONCPP=commoncpp2-1.8.1-android
-MY_CCRTP=ccrtp-1.8.0-android
-MY_LIBSAMPLE=libsamplerate-0.1.8
+MY_COMMONCPP=commoncpp2-android
+MY_CCRTP=ccrtp-android
+MY_LIBSAMPLE=libsamplerate
MY_SPEEX=speex
MY_OPENSSL=openssl
MY_LIBYAML=libyaml
MY_LIBEXPAT=libexpat
MY_OPUS=libopus
-MY_LIBSNDFILE=libsndfile-1.0.25
+MY_LIBSNDFILE=libsndfile
+MY_LIBGSM=libgsm
MY_JNI_WRAP := $(LOCAL_SRC_PATH)/client/android/callmanager_wrap.cpp
include $(CLEAR_VARS)
@@ -119,7 +120,6 @@
$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include \
$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/include \
$(APP_PROJECT_PATH)/jni/$(MY_LIBEXPAT) \
- $(APP_PROJECT_PATH)/jni/$(MY_SPEEX)/include \
$(APP_PROJECT_PATH)/jni/$(MY_LIBSNDFILE)/src
LOCAL_MODULE := libsflphone
@@ -185,13 +185,15 @@
LOCAL_SHARED_LIBRARIES += libccrtp1 \
- libexpat_shared \
- libsamplerate \
- libcodec_ulaw \
- libcodec_alaw \
- libspeexresampler \
- libyaml \
- libsndfile
+ libexpat_shared \
+ libsamplerate \
+ libcodec_ulaw \
+ libcodec_alaw \
+ libcodec_g722 \
+ libcodec_opus \
+ libspeexresampler \
+ libyaml \
+ libsndfile
include $(BUILD_SHARED_LIBRARY)
@@ -353,8 +355,35 @@
############# libgsm ###############
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(LOCAL_CODECS_PATH)/gsmcodec.cpp \
+ $(LOCAL_CODECS_PATH)/audiocodec.cpp
+
+LOCAL_C_INCLUDES += $(LOCAL_CODECS_PATH)/.. \
+ $(LOCAL_CODECS_PATH)/../.. \
+ $(LOCAL_CODECS_PATH)/../../.. \
+ $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \
+ $(APP_PROJECT_PATH)/jni/$(MY_LIBGSM)/inc \
+ $(APP_PROJECT_PATH)/jni/$(MY_LIBGSM)/src
+
+LOCAL_MODULE := libcodec_gsm
+
+LOCAL_LDLIBS := -llog
+
+LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
+ -DCCPP_PREFIX \
+ -DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \
+ -DPREFIX=\"$(MY_PREFIX)\" \
+ -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \
+ -DHAVE_COFIG_H \
+ -std=c++11 -frtti -fpermissive -fexceptions \
+ -DAPP_NAME=\"codecfactory\"
+
+include $(BUILD_SHARED_LIBRARY)
+
############# libopus ###############
include $(CLEAR_VARS)
@@ -652,12 +681,13 @@
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := speexcodec_nb.cpp \
- audiocodec.cpp
+LOCAL_SRC_FILES := speexcodec_nb.cpp \
+ audiocodec.cpp
LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../.. \
+ $(LOCAL_SPEEX_PATH)/include \
$(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \
$(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc
@@ -735,42 +765,6 @@
include $(BUILD_SHARED_LIBRARY)
-########### opensl #############
-
-
-# FIXME
-MY_COMMONCPP=commoncpp2-1.8.1-android
-MY_CCRTP=ccrtp-1.8.0-android
-MY_LIBSAMPLE=libsamplerate-0.1.8
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := opensllayer.cpp
-
-# FIXME
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
- $(LOCAL_PATH)/../.. \
- $(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \
- $(APP_PROJECT_PATH)/jni/$(MY_CCRTP)/src \
- $(APP_PROJECT_PATH)/jni/$(MY_LIBSAMPLE)/src
-
-
-
-LOCAL_MODULE := libopensl
-LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
- -DCCPP_PREFIX \
- -DPREFIX=\"$(MY_PREFIX)\" \
- -DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \
- -DHAVE_CONFIG_H \
- -std=c++11 -frtti -fpermissive \
- -DAPP_NAME=\"openSL\"
-
-LOCAL_SHARED_LIBRARIES += libOpenSLES
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-
################# common cpp ####################
include $(CLEAR_VARS)
@@ -779,7 +773,7 @@
LT_RELEASE = "1.8"
SHARED_FLAGS = "-no-undefined"
-LOCAL_COMMONCPP_PATH = commoncpp2-1.8.1-android/src
+LOCAL_COMMONCPP_PATH = commoncpp2-android/src
LOCAL_CPPFLAGS += -std=c++11 -Wno-psabi -frtti -pthread -fexceptions
LOCAL_MODULE := libccgnu2
@@ -833,21 +827,21 @@
# We need to build this for both the device (as a shared library)
# and the host (as a static library for tools to use).
-common_SRC_FILES := libsamplerate-0.1.8/src/samplerate.c \
- libsamplerate-0.1.8/src/src_sinc.c \
- libsamplerate-0.1.8/src/src_zoh.c \
- libsamplerate-0.1.8/src/src_linear.c
-
-# For the device
-# =====================================================
-
# Device shared library
include $(CLEAR_VARS)
+common_SRC_FILES := $(MY_LIBSAMPLE)/src/samplerate.c \
+ $(MY_LIBSAMPLE)/src/src_sinc.c \
+ $(MY_LIBSAMPLE)/src/src_zoh.c \
+ $(MY_LIBSAMPLE)/src/src_linear.c
+
+
+
+
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += -Werror -g
LOCAL_LDFLAGS :=
-LOCAL_C_INCLUDES += libsamplerate-0.1.8/
+LOCAL_C_INCLUDES += $(MY_LIBSAMPLE)/
LOCAL_MODULE:= libsamplerate
@@ -923,7 +917,7 @@
include $(CLEAR_VARS)
-LOCAL_CCRTP1_PATH = ccrtp-1.8.0-android/src
+LOCAL_CCRTP1_PATH = $(MY_CCRTP)/src
LT_VERSION =
LT_RELEASE =
@@ -934,11 +928,14 @@
#LOCAL_CPPFLAGS += -Wno-psabi -frtti -pthread -fexceptions
LOCAL_CPPFLAGS += -std=c++11 -fexceptions
LOCAL_C_INCLUDES += $(LOCAL_CCRTP1_PATH) \
- $(LOCAL_CCRTP1_PATH)/../../commoncpp2-1.8.1-android/inc \
- $(LOCAL_CCRTP1_PATH)/../../openssl/include
+ $(MY_COMMONCPP)/inc \
+ $(MY_OPENSSL)/include
+
LOCAL_MODULE := libccrtp1
+
LOCAL_SHARED_LIBRARIES += libccgnu2 \
libssl_shared
+
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib \
-L$(APP_PROJECT_PATH)/obj/local/armeabi-v7a \
-llog
diff --git a/jni/Application.mk b/jni/Application.mk
index dd40689..91b9563 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -26,6 +26,7 @@
APP_MODULES += libcodec_alaw
APP_MODULES += libcodec_g722
APP_MODULES += libcodec_opus
+#APP_MODULES += libcodec_gsm
#APP_MODULES += libcodec_speex_nb
#APP_MODULES += libcodec_speex_ub
#APP_MODULES += libcodec_speex_wb
diff --git a/jni/ccrtp-1.8.0-android/AUTHORS b/jni/ccrtp-android/AUTHORS
similarity index 100%
rename from jni/ccrtp-1.8.0-android/AUTHORS
rename to jni/ccrtp-android/AUTHORS
diff --git a/jni/ccrtp-1.8.0-android/Android.mk b/jni/ccrtp-android/Android.mk
similarity index 100%
rename from jni/ccrtp-1.8.0-android/Android.mk
rename to jni/ccrtp-android/Android.mk
diff --git a/jni/ccrtp-1.8.0-android/COPYING b/jni/ccrtp-android/COPYING
similarity index 100%
rename from jni/ccrtp-1.8.0-android/COPYING
rename to jni/ccrtp-android/COPYING
diff --git a/jni/ccrtp-1.8.0-android/COPYING.addendum b/jni/ccrtp-android/COPYING.addendum
similarity index 100%
rename from jni/ccrtp-1.8.0-android/COPYING.addendum
rename to jni/ccrtp-android/COPYING.addendum
diff --git a/jni/ccrtp-1.8.0-android/ChangeLog b/jni/ccrtp-android/ChangeLog
similarity index 100%
rename from jni/ccrtp-1.8.0-android/ChangeLog
rename to jni/ccrtp-android/ChangeLog
diff --git a/jni/ccrtp-1.8.0-android/INSTALL b/jni/ccrtp-android/INSTALL
similarity index 100%
rename from jni/ccrtp-1.8.0-android/INSTALL
rename to jni/ccrtp-android/INSTALL
diff --git a/jni/ccrtp-1.8.0-android/Makefile b/jni/ccrtp-android/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/Makefile
rename to jni/ccrtp-android/Makefile
diff --git a/jni/ccrtp-1.8.0-android/Makefile.am b/jni/ccrtp-android/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/Makefile.am
rename to jni/ccrtp-android/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/Makefile.in b/jni/ccrtp-android/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/Makefile.in
rename to jni/ccrtp-android/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/NEWS b/jni/ccrtp-android/NEWS
similarity index 100%
rename from jni/ccrtp-1.8.0-android/NEWS
rename to jni/ccrtp-android/NEWS
diff --git a/jni/ccrtp-1.8.0-android/README b/jni/ccrtp-android/README
similarity index 100%
rename from jni/ccrtp-1.8.0-android/README
rename to jni/ccrtp-android/README
diff --git a/jni/ccrtp-1.8.0-android/THANKS b/jni/ccrtp-android/THANKS
similarity index 100%
rename from jni/ccrtp-1.8.0-android/THANKS
rename to jni/ccrtp-android/THANKS
diff --git a/jni/ccrtp-1.8.0-android/TODO b/jni/ccrtp-android/TODO
similarity index 100%
rename from jni/ccrtp-1.8.0-android/TODO
rename to jni/ccrtp-android/TODO
diff --git a/jni/ccrtp-1.8.0-android/aclocal.m4 b/jni/ccrtp-android/aclocal.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/aclocal.m4
rename to jni/ccrtp-android/aclocal.m4
diff --git a/jni/ccrtp-1.8.0-android/autoconf/config.guess b/jni/ccrtp-android/autoconf/config.guess
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/config.guess
rename to jni/ccrtp-android/autoconf/config.guess
diff --git a/jni/ccrtp-1.8.0-android/autoconf/config.sub b/jni/ccrtp-android/autoconf/config.sub
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/config.sub
rename to jni/ccrtp-android/autoconf/config.sub
diff --git a/jni/ccrtp-1.8.0-android/autoconf/install-sh b/jni/ccrtp-android/autoconf/install-sh
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/install-sh
rename to jni/ccrtp-android/autoconf/install-sh
diff --git a/jni/ccrtp-1.8.0-android/autoconf/ltmain.sh b/jni/ccrtp-android/autoconf/ltmain.sh
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/ltmain.sh
rename to jni/ccrtp-android/autoconf/ltmain.sh
diff --git a/jni/ccrtp-1.8.0-android/autoconf/missing b/jni/ccrtp-android/autoconf/missing
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/missing
rename to jni/ccrtp-android/autoconf/missing
diff --git a/jni/ccrtp-1.8.0-android/autoconf/texinfo.tex b/jni/ccrtp-android/autoconf/texinfo.tex
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autoconf/texinfo.tex
rename to jni/ccrtp-android/autoconf/texinfo.tex
diff --git a/jni/ccrtp-1.8.0-android/autogen.sh b/jni/ccrtp-android/autogen.sh
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autogen.sh
rename to jni/ccrtp-android/autogen.sh
diff --git a/jni/ccrtp-1.8.0-android/autom4te.cache/output.0 b/jni/ccrtp-android/autom4te.cache/output.0
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autom4te.cache/output.0
rename to jni/ccrtp-android/autom4te.cache/output.0
diff --git a/jni/ccrtp-1.8.0-android/autom4te.cache/output.1 b/jni/ccrtp-android/autom4te.cache/output.1
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autom4te.cache/output.1
rename to jni/ccrtp-android/autom4te.cache/output.1
diff --git a/jni/ccrtp-1.8.0-android/autom4te.cache/requests b/jni/ccrtp-android/autom4te.cache/requests
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autom4te.cache/requests
rename to jni/ccrtp-android/autom4te.cache/requests
diff --git a/jni/ccrtp-1.8.0-android/autom4te.cache/traces.0 b/jni/ccrtp-android/autom4te.cache/traces.0
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autom4te.cache/traces.0
rename to jni/ccrtp-android/autom4te.cache/traces.0
diff --git a/jni/ccrtp-1.8.0-android/autom4te.cache/traces.1 b/jni/ccrtp-android/autom4te.cache/traces.1
similarity index 100%
rename from jni/ccrtp-1.8.0-android/autom4te.cache/traces.1
rename to jni/ccrtp-android/autom4te.cache/traces.1
diff --git a/jni/ccrtp-1.8.0-android/ccrtp.list b/jni/ccrtp-android/ccrtp.list
similarity index 100%
rename from jni/ccrtp-1.8.0-android/ccrtp.list
rename to jni/ccrtp-android/ccrtp.list
diff --git a/jni/ccrtp-1.8.0-android/ccrtp.list.in b/jni/ccrtp-android/ccrtp.list.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/ccrtp.list.in
rename to jni/ccrtp-android/ccrtp.list.in
diff --git a/jni/ccrtp-1.8.0-android/ccrtp.spec b/jni/ccrtp-android/ccrtp.spec
similarity index 100%
rename from jni/ccrtp-1.8.0-android/ccrtp.spec
rename to jni/ccrtp-android/ccrtp.spec
diff --git a/jni/ccrtp-1.8.0-android/ccrtp.spec.in b/jni/ccrtp-android/ccrtp.spec.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/ccrtp.spec.in
rename to jni/ccrtp-android/ccrtp.spec.in
diff --git a/jni/ccrtp-1.8.0-android/config.log b/jni/ccrtp-android/config.log
similarity index 100%
rename from jni/ccrtp-1.8.0-android/config.log
rename to jni/ccrtp-android/config.log
diff --git a/jni/ccrtp-1.8.0-android/config.status b/jni/ccrtp-android/config.status
similarity index 100%
rename from jni/ccrtp-1.8.0-android/config.status
rename to jni/ccrtp-android/config.status
diff --git a/jni/ccrtp-1.8.0-android/configure b/jni/ccrtp-android/configure
similarity index 100%
rename from jni/ccrtp-1.8.0-android/configure
rename to jni/ccrtp-android/configure
diff --git a/jni/ccrtp-1.8.0-android/configure.ac b/jni/ccrtp-android/configure.ac
similarity index 100%
rename from jni/ccrtp-1.8.0-android/configure.ac
rename to jni/ccrtp-android/configure.ac
diff --git a/jni/ccrtp-1.8.0-android/demo/Makefile b/jni/ccrtp-android/demo/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/Makefile
rename to jni/ccrtp-android/demo/Makefile
diff --git a/jni/ccrtp-1.8.0-android/demo/Makefile.am b/jni/ccrtp-android/demo/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/Makefile.am
rename to jni/ccrtp-android/demo/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/demo/Makefile.in b/jni/ccrtp-android/demo/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/Makefile.in
rename to jni/ccrtp-android/demo/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/demo/README b/jni/ccrtp-android/demo/README
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/README
rename to jni/ccrtp-android/demo/README
diff --git a/jni/ccrtp-1.8.0-android/demo/audio.h b/jni/ccrtp-android/demo/audio.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/audio.h
rename to jni/ccrtp-android/demo/audio.h
diff --git a/jni/ccrtp-1.8.0-android/demo/audiorx.cpp b/jni/ccrtp-android/demo/audiorx.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/audiorx.cpp
rename to jni/ccrtp-android/demo/audiorx.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/audiotx.cpp b/jni/ccrtp-android/demo/audiotx.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/audiotx.cpp
rename to jni/ccrtp-android/demo/audiotx.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/ccrtptest.cpp b/jni/ccrtp-android/demo/ccrtptest.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/ccrtptest.cpp
rename to jni/ccrtp-android/demo/ccrtptest.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/ccsrtptest.cpp b/jni/ccrtp-android/demo/ccsrtptest.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/ccsrtptest.cpp
rename to jni/ccrtp-android/demo/ccsrtptest.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/rtpduphello.cpp b/jni/ccrtp-android/demo/rtpduphello.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/rtpduphello.cpp
rename to jni/ccrtp-android/demo/rtpduphello.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/rtphello.cpp b/jni/ccrtp-android/demo/rtphello.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/rtphello.cpp
rename to jni/ccrtp-android/demo/rtphello.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/rtplisten.cpp b/jni/ccrtp-android/demo/rtplisten.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/rtplisten.cpp
rename to jni/ccrtp-android/demo/rtplisten.cpp
diff --git a/jni/ccrtp-1.8.0-android/demo/rtpsend.cpp b/jni/ccrtp-android/demo/rtpsend.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/demo/rtpsend.cpp
rename to jni/ccrtp-android/demo/rtpsend.cpp
diff --git a/jni/ccrtp-1.8.0-android/doc/Doxyfile b/jni/ccrtp-android/doc/Doxyfile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/Doxyfile
rename to jni/ccrtp-android/doc/Doxyfile
diff --git a/jni/ccrtp-1.8.0-android/doc/Doxymini b/jni/ccrtp-android/doc/Doxymini
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/Doxymini
rename to jni/ccrtp-android/doc/Doxymini
diff --git a/jni/ccrtp-1.8.0-android/doc/Makefile b/jni/ccrtp-android/doc/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/Makefile
rename to jni/ccrtp-android/doc/Makefile
diff --git a/jni/ccrtp-1.8.0-android/doc/Makefile.am b/jni/ccrtp-android/doc/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/Makefile.am
rename to jni/ccrtp-android/doc/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/doc/Makefile.in b/jni/ccrtp-android/doc/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/Makefile.in
rename to jni/ccrtp-android/doc/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/doc/ccrtp.info b/jni/ccrtp-android/doc/ccrtp.info
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/ccrtp.info
rename to jni/ccrtp-android/doc/ccrtp.info
Binary files differ
diff --git a/jni/ccrtp-1.8.0-android/doc/ccrtp.texi b/jni/ccrtp-android/doc/ccrtp.texi
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/ccrtp.texi
rename to jni/ccrtp-android/doc/ccrtp.texi
diff --git a/jni/ccrtp-1.8.0-android/doc/fdl.texi b/jni/ccrtp-android/doc/fdl.texi
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/fdl.texi
rename to jni/ccrtp-android/doc/fdl.texi
diff --git a/jni/ccrtp-1.8.0-android/doc/fdlnotice.texi b/jni/ccrtp-android/doc/fdlnotice.texi
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/fdlnotice.texi
rename to jni/ccrtp-android/doc/fdlnotice.texi
diff --git a/jni/ccrtp-1.8.0-android/doc/gpl.texi b/jni/ccrtp-android/doc/gpl.texi
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/gpl.texi
rename to jni/ccrtp-android/doc/gpl.texi
diff --git a/jni/ccrtp-1.8.0-android/doc/srcmodel.dia b/jni/ccrtp-android/doc/srcmodel.dia
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/srcmodel.dia
rename to jni/ccrtp-android/doc/srcmodel.dia
Binary files differ
diff --git a/jni/ccrtp-1.8.0-android/doc/srcmodel.txt b/jni/ccrtp-android/doc/srcmodel.txt
similarity index 100%
rename from jni/ccrtp-1.8.0-android/doc/srcmodel.txt
rename to jni/ccrtp-android/doc/srcmodel.txt
diff --git a/jni/ccrtp-1.8.0-android/envsetup.sh b/jni/ccrtp-android/envsetup.sh
similarity index 100%
rename from jni/ccrtp-1.8.0-android/envsetup.sh
rename to jni/ccrtp-android/envsetup.sh
diff --git a/jni/ccrtp-1.8.0-android/libccrtp.spec b/jni/ccrtp-android/libccrtp.spec
similarity index 100%
rename from jni/ccrtp-1.8.0-android/libccrtp.spec
rename to jni/ccrtp-android/libccrtp.spec
diff --git a/jni/ccrtp-1.8.0-android/libccrtp.spec.in b/jni/ccrtp-android/libccrtp.spec.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/libccrtp.spec.in
rename to jni/ccrtp-android/libccrtp.spec.in
diff --git a/jni/ccrtp-1.8.0-android/libccrtp1.pc b/jni/ccrtp-android/libccrtp1.pc
similarity index 100%
rename from jni/ccrtp-1.8.0-android/libccrtp1.pc
rename to jni/ccrtp-android/libccrtp1.pc
diff --git a/jni/ccrtp-1.8.0-android/libccrtp1.pc.in b/jni/ccrtp-android/libccrtp1.pc.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/libccrtp1.pc.in
rename to jni/ccrtp-android/libccrtp1.pc.in
diff --git a/jni/ccrtp-1.8.0-android/libtool b/jni/ccrtp-android/libtool
similarity index 100%
rename from jni/ccrtp-1.8.0-android/libtool
rename to jni/ccrtp-android/libtool
diff --git a/jni/ccrtp-1.8.0-android/m4/Makefile b/jni/ccrtp-android/m4/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/Makefile
rename to jni/ccrtp-android/m4/Makefile
diff --git a/jni/ccrtp-1.8.0-android/m4/Makefile.am b/jni/ccrtp-android/m4/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/Makefile.am
rename to jni/ccrtp-android/m4/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/m4/Makefile.in b/jni/ccrtp-android/m4/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/Makefile.in
rename to jni/ccrtp-android/m4/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/m4/libgcrypt_local.m4 b/jni/ccrtp-android/m4/libgcrypt_local.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/libgcrypt_local.m4
rename to jni/ccrtp-android/m4/libgcrypt_local.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/libtool.m4 b/jni/ccrtp-android/m4/libtool.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/libtool.m4
rename to jni/ccrtp-android/m4/libtool.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ltoptions.m4 b/jni/ccrtp-android/m4/ltoptions.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ltoptions.m4
rename to jni/ccrtp-android/m4/ltoptions.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ltsugar.m4 b/jni/ccrtp-android/m4/ltsugar.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ltsugar.m4
rename to jni/ccrtp-android/m4/ltsugar.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ltversion.m4 b/jni/ccrtp-android/m4/ltversion.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ltversion.m4
rename to jni/ccrtp-android/m4/ltversion.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/lt~obsolete.m4 b/jni/ccrtp-android/m4/lt~obsolete.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/lt~obsolete.m4
rename to jni/ccrtp-android/m4/lt~obsolete.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ost_debug.m4 b/jni/ccrtp-android/m4/ost_debug.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ost_debug.m4
rename to jni/ccrtp-android/m4/ost_debug.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ost_maint.m4 b/jni/ccrtp-android/m4/ost_maint.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ost_maint.m4
rename to jni/ccrtp-android/m4/ost_maint.m4
diff --git a/jni/ccrtp-1.8.0-android/m4/ost_prog.m4 b/jni/ccrtp-android/m4/ost_prog.m4
similarity index 100%
rename from jni/ccrtp-1.8.0-android/m4/ost_prog.m4
rename to jni/ccrtp-android/m4/ost_prog.m4
diff --git a/jni/ccrtp-1.8.0-android/phone/Makefile b/jni/ccrtp-android/phone/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/Makefile
rename to jni/ccrtp-android/phone/Makefile
diff --git a/jni/ccrtp-1.8.0-android/phone/Makefile.am b/jni/ccrtp-android/phone/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/Makefile.am
rename to jni/ccrtp-android/phone/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/phone/Makefile.in b/jni/ccrtp-android/phone/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/Makefile.in
rename to jni/ccrtp-android/phone/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/phone/config.cpp b/jni/ccrtp-android/phone/config.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/config.cpp
rename to jni/ccrtp-android/phone/config.cpp
diff --git a/jni/ccrtp-1.8.0-android/phone/phone.conf b/jni/ccrtp-android/phone/phone.conf
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/phone.conf
rename to jni/ccrtp-android/phone/phone.conf
diff --git a/jni/ccrtp-1.8.0-android/phone/phone.cpp b/jni/ccrtp-android/phone/phone.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/phone.cpp
rename to jni/ccrtp-android/phone/phone.cpp
diff --git a/jni/ccrtp-1.8.0-android/phone/phone.h b/jni/ccrtp-android/phone/phone.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/phone.h
rename to jni/ccrtp-android/phone/phone.h
diff --git a/jni/ccrtp-1.8.0-android/phone/rtp.cpp b/jni/ccrtp-android/phone/rtp.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/rtp.cpp
rename to jni/ccrtp-android/phone/rtp.cpp
diff --git a/jni/ccrtp-1.8.0-android/phone/server.cpp b/jni/ccrtp-android/phone/server.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/server.cpp
rename to jni/ccrtp-android/phone/server.cpp
diff --git a/jni/ccrtp-1.8.0-android/phone/server.h b/jni/ccrtp-android/phone/server.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/phone/server.h
rename to jni/ccrtp-android/phone/server.h
diff --git a/jni/ccrtp-1.8.0-android/src/Android.mk b/jni/ccrtp-android/src/Android.mk
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/Android.mk
rename to jni/ccrtp-android/src/Android.mk
diff --git a/jni/ccrtp-1.8.0-android/src/CryptoContext.cxx b/jni/ccrtp-android/src/CryptoContext.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/CryptoContext.cxx
rename to jni/ccrtp-android/src/CryptoContext.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/Makefile b/jni/ccrtp-android/src/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/Makefile
rename to jni/ccrtp-android/src/Makefile
diff --git a/jni/ccrtp-1.8.0-android/src/Makefile.am b/jni/ccrtp-android/src/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/Makefile.am
rename to jni/ccrtp-android/src/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/src/Makefile.in b/jni/ccrtp-android/src/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/Makefile.in
rename to jni/ccrtp-android/src/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/CryptoContext.h b/jni/ccrtp-android/src/ccrtp/CryptoContext.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/CryptoContext.h
rename to jni/ccrtp-android/src/ccrtp/CryptoContext.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/Makefile b/jni/ccrtp-android/src/ccrtp/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/Makefile
rename to jni/ccrtp-android/src/ccrtp/Makefile
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/Makefile.am b/jni/ccrtp-android/src/ccrtp/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/Makefile.am
rename to jni/ccrtp-android/src/ccrtp/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/Makefile.in b/jni/ccrtp-android/src/ccrtp/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/Makefile.in
rename to jni/ccrtp-android/src/ccrtp/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/base.h b/jni/ccrtp-android/src/ccrtp/base.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/base.h
rename to jni/ccrtp-android/src/ccrtp/base.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/channel.h b/jni/ccrtp-android/src/ccrtp/channel.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/channel.h
rename to jni/ccrtp-android/src/ccrtp/channel.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/cqueue.h b/jni/ccrtp-android/src/ccrtp/cqueue.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/cqueue.h
rename to jni/ccrtp-android/src/ccrtp/cqueue.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/AesSrtp.h b/jni/ccrtp-android/src/ccrtp/crypto/AesSrtp.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/AesSrtp.h
rename to jni/ccrtp-android/src/ccrtp/crypto/AesSrtp.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile b/jni/ccrtp-android/src/ccrtp/crypto/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile
rename to jni/ccrtp-android/src/ccrtp/crypto/Makefile
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile.am b/jni/ccrtp-android/src/ccrtp/crypto/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile.am
rename to jni/ccrtp-android/src/ccrtp/crypto/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile.in b/jni/ccrtp-android/src/ccrtp/crypto/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/Makefile.in
rename to jni/ccrtp-android/src/ccrtp/crypto/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/brg_endian.h b/jni/ccrtp-android/src/ccrtp/crypto/brg_endian.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/brg_endian.h
rename to jni/ccrtp-android/src/ccrtp/crypto/brg_endian.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/brg_types.h b/jni/ccrtp-android/src/ccrtp/crypto/brg_types.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/brg_types.h
rename to jni/ccrtp-android/src/ccrtp/crypto/brg_types.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx b/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
rename to jni/ccrtp-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx b/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
rename to jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx b/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
rename to jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/hmac.h b/jni/ccrtp-android/src/ccrtp/crypto/hmac.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/hmac.h
rename to jni/ccrtp-android/src/ccrtp/crypto/hmac.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/macSkein.cpp b/jni/ccrtp-android/src/ccrtp/crypto/macSkein.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/macSkein.cpp
rename to jni/ccrtp-android/src/ccrtp/crypto/macSkein.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/macSkein.h b/jni/ccrtp-android/src/ccrtp/crypto/macSkein.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/macSkein.h
rename to jni/ccrtp-android/src/ccrtp/crypto/macSkein.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/AesSrtp.cxx b/jni/ccrtp-android/src/ccrtp/crypto/openssl/AesSrtp.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/AesSrtp.cxx
rename to jni/ccrtp-android/src/ccrtp/crypto/openssl/AesSrtp.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx b/jni/ccrtp-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
rename to jni/ccrtp-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/hmac.cpp b/jni/ccrtp-android/src/ccrtp/crypto/openssl/hmac.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/openssl/hmac.cpp
rename to jni/ccrtp-android/src/ccrtp/crypto/openssl/hmac.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein.c b/jni/ccrtp-android/src/ccrtp/crypto/skein.c
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein.c
rename to jni/ccrtp-android/src/ccrtp/crypto/skein.c
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein.h b/jni/ccrtp-android/src/ccrtp/crypto/skein.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein.h
rename to jni/ccrtp-android/src/ccrtp/crypto/skein.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skeinApi.c b/jni/ccrtp-android/src/ccrtp/crypto/skeinApi.c
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skeinApi.c
rename to jni/ccrtp-android/src/ccrtp/crypto/skeinApi.c
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skeinApi.h b/jni/ccrtp-android/src/ccrtp/crypto/skeinApi.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skeinApi.h
rename to jni/ccrtp-android/src/ccrtp/crypto/skeinApi.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_block.c b/jni/ccrtp-android/src/ccrtp/crypto/skein_block.c
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_block.c
rename to jni/ccrtp-android/src/ccrtp/crypto/skein_block.c
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_iv.h b/jni/ccrtp-android/src/ccrtp/crypto/skein_iv.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_iv.h
rename to jni/ccrtp-android/src/ccrtp/crypto/skein_iv.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_port.h b/jni/ccrtp-android/src/ccrtp/crypto/skein_port.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/crypto/skein_port.h
rename to jni/ccrtp-android/src/ccrtp/crypto/skein_port.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/ext.h b/jni/ccrtp-android/src/ccrtp/ext.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/ext.h
rename to jni/ccrtp-android/src/ccrtp/ext.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/formats.h b/jni/ccrtp-android/src/ccrtp/formats.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/formats.h
rename to jni/ccrtp-android/src/ccrtp/formats.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/ioqueue.h b/jni/ccrtp-android/src/ccrtp/ioqueue.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/ioqueue.h
rename to jni/ccrtp-android/src/ccrtp/ioqueue.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/iqueue.h b/jni/ccrtp-android/src/ccrtp/iqueue.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/iqueue.h
rename to jni/ccrtp-android/src/ccrtp/iqueue.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/oqueue.h b/jni/ccrtp-android/src/ccrtp/oqueue.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/oqueue.h
rename to jni/ccrtp-android/src/ccrtp/oqueue.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/pool.h b/jni/ccrtp-android/src/ccrtp/pool.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/pool.h
rename to jni/ccrtp-android/src/ccrtp/pool.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/queuebase.h b/jni/ccrtp-android/src/ccrtp/queuebase.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/queuebase.h
rename to jni/ccrtp-android/src/ccrtp/queuebase.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/rtcppkt.h b/jni/ccrtp-android/src/ccrtp/rtcppkt.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/rtcppkt.h
rename to jni/ccrtp-android/src/ccrtp/rtcppkt.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/rtp.h b/jni/ccrtp-android/src/ccrtp/rtp.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/rtp.h
rename to jni/ccrtp-android/src/ccrtp/rtp.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/rtppkt.h b/jni/ccrtp-android/src/ccrtp/rtppkt.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/rtppkt.h
rename to jni/ccrtp-android/src/ccrtp/rtppkt.h
diff --git a/jni/ccrtp-1.8.0-android/src/ccrtp/sources.h b/jni/ccrtp-android/src/ccrtp/sources.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/ccrtp/sources.h
rename to jni/ccrtp-android/src/ccrtp/sources.h
diff --git a/jni/ccrtp-1.8.0-android/src/config.h b/jni/ccrtp-android/src/config.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/config.h
rename to jni/ccrtp-android/src/config.h
diff --git a/jni/ccrtp-1.8.0-android/src/config.h.in b/jni/ccrtp-android/src/config.h.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/config.h.in
rename to jni/ccrtp-android/src/config.h.in
diff --git a/jni/ccrtp-1.8.0-android/src/control.cpp b/jni/ccrtp-android/src/control.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/control.cpp
rename to jni/ccrtp-android/src/control.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/data.cpp b/jni/ccrtp-android/src/data.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/data.cpp
rename to jni/ccrtp-android/src/data.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/duplex.cpp b/jni/ccrtp-android/src/duplex.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/duplex.cpp
rename to jni/ccrtp-android/src/duplex.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/incqueue.cpp b/jni/ccrtp-android/src/incqueue.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/incqueue.cpp
rename to jni/ccrtp-android/src/incqueue.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/members.cpp b/jni/ccrtp-android/src/members.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/members.cpp
rename to jni/ccrtp-android/src/members.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/outqueue.cpp b/jni/ccrtp-android/src/outqueue.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/outqueue.cpp
rename to jni/ccrtp-android/src/outqueue.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/pool.cpp b/jni/ccrtp-android/src/pool.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/pool.cpp
rename to jni/ccrtp-android/src/pool.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/private.h b/jni/ccrtp-android/src/private.h
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/private.h
rename to jni/ccrtp-android/src/private.h
diff --git a/jni/ccrtp-1.8.0-android/src/queue.cpp b/jni/ccrtp-android/src/queue.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/queue.cpp
rename to jni/ccrtp-android/src/queue.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/rtcppkt.cpp b/jni/ccrtp-android/src/rtcppkt.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/rtcppkt.cpp
rename to jni/ccrtp-android/src/rtcppkt.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/rtppkt.cpp b/jni/ccrtp-android/src/rtppkt.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/rtppkt.cpp
rename to jni/ccrtp-android/src/rtppkt.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/socket.cpp b/jni/ccrtp-android/src/socket.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/socket.cpp
rename to jni/ccrtp-android/src/socket.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/source.cpp b/jni/ccrtp-android/src/source.cpp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/source.cpp
rename to jni/ccrtp-android/src/source.cpp
diff --git a/jni/ccrtp-1.8.0-android/src/stamp-h1 b/jni/ccrtp-android/src/stamp-h1
similarity index 100%
rename from jni/ccrtp-1.8.0-android/src/stamp-h1
rename to jni/ccrtp-android/src/stamp-h1
diff --git a/jni/ccrtp-1.8.0-android/w32/Makefile b/jni/ccrtp-android/w32/Makefile
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/Makefile
rename to jni/ccrtp-android/w32/Makefile
diff --git a/jni/ccrtp-1.8.0-android/w32/Makefile.am b/jni/ccrtp-android/w32/Makefile.am
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/Makefile.am
rename to jni/ccrtp-android/w32/Makefile.am
diff --git a/jni/ccrtp-1.8.0-android/w32/Makefile.in b/jni/ccrtp-android/w32/Makefile.in
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/Makefile.in
rename to jni/ccrtp-android/w32/Makefile.in
diff --git a/jni/ccrtp-1.8.0-android/w32/README b/jni/ccrtp-android/w32/README
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/README
rename to jni/ccrtp-android/w32/README
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.dsp b/jni/ccrtp-android/w32/cape/ccrtp1.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.dsp
rename to jni/ccrtp-android/w32/cape/ccrtp1.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.dsw b/jni/ccrtp-android/w32/cape/ccrtp1.dsw
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.dsw
rename to jni/ccrtp-android/w32/cape/ccrtp1.dsw
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.sln b/jni/ccrtp-android/w32/cape/ccrtp1.sln
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.sln
rename to jni/ccrtp-android/w32/cape/ccrtp1.sln
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.vcproj b/jni/ccrtp-android/w32/cape/ccrtp1.vcproj
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/ccrtp1.vcproj
rename to jni/ccrtp-android/w32/cape/ccrtp1.vcproj
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtphello.dsp b/jni/ccrtp-android/w32/cape/rtphello.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtphello.dsp
rename to jni/ccrtp-android/w32/cape/rtphello.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtphello.vcproj b/jni/ccrtp-android/w32/cape/rtphello.vcproj
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtphello.vcproj
rename to jni/ccrtp-android/w32/cape/rtphello.vcproj
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtplisten.dsp b/jni/ccrtp-android/w32/cape/rtplisten.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtplisten.dsp
rename to jni/ccrtp-android/w32/cape/rtplisten.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtplisten.vcproj b/jni/ccrtp-android/w32/cape/rtplisten.vcproj
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtplisten.vcproj
rename to jni/ccrtp-android/w32/cape/rtplisten.vcproj
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtpsend.dsp b/jni/ccrtp-android/w32/cape/rtpsend.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtpsend.dsp
rename to jni/ccrtp-android/w32/cape/rtpsend.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/cape/rtpsend.vcproj b/jni/ccrtp-android/w32/cape/rtpsend.vcproj
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/cape/rtpsend.vcproj
rename to jni/ccrtp-android/w32/cape/rtpsend.vcproj
diff --git a/jni/ccrtp-1.8.0-android/w32/common/ccext2.dsp b/jni/ccrtp-android/w32/common/ccext2.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/common/ccext2.dsp
rename to jni/ccrtp-android/w32/common/ccext2.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/common/ccgnu2.dsp b/jni/ccrtp-android/w32/common/ccgnu2.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/common/ccgnu2.dsp
rename to jni/ccrtp-android/w32/common/ccgnu2.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/mingw32/Makefile.gcc b/jni/ccrtp-android/w32/mingw32/Makefile.gcc
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/mingw32/Makefile.gcc
rename to jni/ccrtp-android/w32/mingw32/Makefile.gcc
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/ccRTPdemo.dsw b/jni/ccrtp-android/w32/msvcpp/ccRTPdemo.dsw
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/ccRTPdemo.dsw
rename to jni/ccrtp-android/w32/msvcpp/ccRTPdemo.dsw
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/ccrtp1.dsp b/jni/ccrtp-android/w32/msvcpp/ccrtp1.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/ccrtp1.dsp
rename to jni/ccrtp-android/w32/msvcpp/ccrtp1.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/ccrtp1.dsw b/jni/ccrtp-android/w32/msvcpp/ccrtp1.dsw
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/ccrtp1.dsw
rename to jni/ccrtp-android/w32/msvcpp/ccrtp1.dsw
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtphello.dsp b/jni/ccrtp-android/w32/msvcpp/demo/rtphello.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtphello.dsp
rename to jni/ccrtp-android/w32/msvcpp/demo/rtphello.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtplisten.dsp b/jni/ccrtp-android/w32/msvcpp/demo/rtplisten.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtplisten.dsp
rename to jni/ccrtp-android/w32/msvcpp/demo/rtplisten.dsp
diff --git a/jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtpsend.dsp b/jni/ccrtp-android/w32/msvcpp/demo/rtpsend.dsp
similarity index 100%
rename from jni/ccrtp-1.8.0-android/w32/msvcpp/demo/rtpsend.dsp
rename to jni/ccrtp-android/w32/msvcpp/demo/rtpsend.dsp
diff --git a/jni/commoncpp2-1.8.1-android/0003-android-adapt-commoncpp.patch b/jni/commoncpp2-android/0003-android-adapt-commoncpp.patch
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/0003-android-adapt-commoncpp.patch
rename to jni/commoncpp2-android/0003-android-adapt-commoncpp.patch
diff --git a/jni/commoncpp2-1.8.1-android/AUTHORS b/jni/commoncpp2-android/AUTHORS
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/AUTHORS
rename to jni/commoncpp2-android/AUTHORS
diff --git a/jni/commoncpp2-1.8.1-android/Android.mk b/jni/commoncpp2-android/Android.mk
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/Android.mk
rename to jni/commoncpp2-android/Android.mk
diff --git a/jni/commoncpp2-1.8.1-android/COPYING b/jni/commoncpp2-android/COPYING
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/COPYING
rename to jni/commoncpp2-android/COPYING
diff --git a/jni/commoncpp2-1.8.1-android/COPYING.addendum b/jni/commoncpp2-android/COPYING.addendum
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/COPYING.addendum
rename to jni/commoncpp2-android/COPYING.addendum
diff --git a/jni/commoncpp2-1.8.1-android/ChangeLog b/jni/commoncpp2-android/ChangeLog
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/ChangeLog
rename to jni/commoncpp2-android/ChangeLog
diff --git a/jni/commoncpp2-1.8.1-android/INSTALL b/jni/commoncpp2-android/INSTALL
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/INSTALL
rename to jni/commoncpp2-android/INSTALL
diff --git a/jni/commoncpp2-1.8.1-android/INSTALL.w32 b/jni/commoncpp2-android/INSTALL.w32
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/INSTALL.w32
rename to jni/commoncpp2-android/INSTALL.w32
diff --git a/jni/commoncpp2-1.8.1-android/Makefile b/jni/commoncpp2-android/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/Makefile
rename to jni/commoncpp2-android/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/Makefile.am b/jni/commoncpp2-android/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/Makefile.am
rename to jni/commoncpp2-android/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/Makefile.in b/jni/commoncpp2-android/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/Makefile.in
rename to jni/commoncpp2-android/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/NEWS b/jni/commoncpp2-android/NEWS
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/NEWS
rename to jni/commoncpp2-android/NEWS
diff --git a/jni/commoncpp2-1.8.1-android/README b/jni/commoncpp2-android/README
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/README
rename to jni/commoncpp2-android/README
diff --git a/jni/commoncpp2-1.8.1-android/SUPPORT b/jni/commoncpp2-android/SUPPORT
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/SUPPORT
rename to jni/commoncpp2-android/SUPPORT
diff --git a/jni/commoncpp2-1.8.1-android/THANKS b/jni/commoncpp2-android/THANKS
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/THANKS
rename to jni/commoncpp2-android/THANKS
diff --git a/jni/commoncpp2-1.8.1-android/TODO b/jni/commoncpp2-android/TODO
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/TODO
rename to jni/commoncpp2-android/TODO
diff --git a/jni/commoncpp2-1.8.1-android/aclocal.m4 b/jni/commoncpp2-android/aclocal.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/aclocal.m4
rename to jni/commoncpp2-android/aclocal.m4
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/config.guess b/jni/commoncpp2-android/autoconf/config.guess
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/config.guess
rename to jni/commoncpp2-android/autoconf/config.guess
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/config.sub b/jni/commoncpp2-android/autoconf/config.sub
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/config.sub
rename to jni/commoncpp2-android/autoconf/config.sub
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/depcomp b/jni/commoncpp2-android/autoconf/depcomp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/depcomp
rename to jni/commoncpp2-android/autoconf/depcomp
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/install-sh b/jni/commoncpp2-android/autoconf/install-sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/install-sh
rename to jni/commoncpp2-android/autoconf/install-sh
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/ltmain.sh b/jni/commoncpp2-android/autoconf/ltmain.sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/ltmain.sh
rename to jni/commoncpp2-android/autoconf/ltmain.sh
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/missing b/jni/commoncpp2-android/autoconf/missing
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/missing
rename to jni/commoncpp2-android/autoconf/missing
diff --git a/jni/commoncpp2-1.8.1-android/autoconf/texinfo.tex b/jni/commoncpp2-android/autoconf/texinfo.tex
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autoconf/texinfo.tex
rename to jni/commoncpp2-android/autoconf/texinfo.tex
diff --git a/jni/commoncpp2-1.8.1-android/autogen.sh b/jni/commoncpp2-android/autogen.sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autogen.sh
rename to jni/commoncpp2-android/autogen.sh
diff --git a/jni/commoncpp2-1.8.1-android/autom4te.cache/output.0 b/jni/commoncpp2-android/autom4te.cache/output.0
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autom4te.cache/output.0
rename to jni/commoncpp2-android/autom4te.cache/output.0
diff --git a/jni/commoncpp2-1.8.1-android/autom4te.cache/output.1 b/jni/commoncpp2-android/autom4te.cache/output.1
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autom4te.cache/output.1
rename to jni/commoncpp2-android/autom4te.cache/output.1
diff --git a/jni/commoncpp2-1.8.1-android/autom4te.cache/requests b/jni/commoncpp2-android/autom4te.cache/requests
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autom4te.cache/requests
rename to jni/commoncpp2-android/autom4te.cache/requests
diff --git a/jni/commoncpp2-1.8.1-android/autom4te.cache/traces.0 b/jni/commoncpp2-android/autom4te.cache/traces.0
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autom4te.cache/traces.0
rename to jni/commoncpp2-android/autom4te.cache/traces.0
diff --git a/jni/commoncpp2-1.8.1-android/autom4te.cache/traces.1 b/jni/commoncpp2-android/autom4te.cache/traces.1
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/autom4te.cache/traces.1
rename to jni/commoncpp2-android/autom4te.cache/traces.1
diff --git a/jni/commoncpp2-1.8.1-android/commoncpp2.list b/jni/commoncpp2-android/commoncpp2.list
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/commoncpp2.list
rename to jni/commoncpp2-android/commoncpp2.list
diff --git a/jni/commoncpp2-1.8.1-android/commoncpp2.list.in b/jni/commoncpp2-android/commoncpp2.list.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/commoncpp2.list.in
rename to jni/commoncpp2-android/commoncpp2.list.in
diff --git a/jni/commoncpp2-1.8.1-android/commoncpp2.lsm.in b/jni/commoncpp2-android/commoncpp2.lsm.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/commoncpp2.lsm.in
rename to jni/commoncpp2-android/commoncpp2.lsm.in
diff --git a/jni/commoncpp2-1.8.1-android/commoncpp2.spec b/jni/commoncpp2-android/commoncpp2.spec
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/commoncpp2.spec
rename to jni/commoncpp2-android/commoncpp2.spec
diff --git a/jni/commoncpp2-1.8.1-android/commoncpp2.spec.in b/jni/commoncpp2-android/commoncpp2.spec.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/commoncpp2.spec.in
rename to jni/commoncpp2-android/commoncpp2.spec.in
diff --git a/jni/commoncpp2-1.8.1-android/config.h b/jni/commoncpp2-android/config.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/config.h
rename to jni/commoncpp2-android/config.h
diff --git a/jni/commoncpp2-1.8.1-android/config.h.android b/jni/commoncpp2-android/config.h.android
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/config.h.android
rename to jni/commoncpp2-android/config.h.android
diff --git a/jni/commoncpp2-1.8.1-android/config.h.in b/jni/commoncpp2-android/config.h.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/config.h.in
rename to jni/commoncpp2-android/config.h.in
diff --git a/jni/commoncpp2-1.8.1-android/config.log b/jni/commoncpp2-android/config.log
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/config.log
rename to jni/commoncpp2-android/config.log
diff --git a/jni/commoncpp2-1.8.1-android/config.status b/jni/commoncpp2-android/config.status
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/config.status
rename to jni/commoncpp2-android/config.status
diff --git a/jni/commoncpp2-1.8.1-android/configure b/jni/commoncpp2-android/configure
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/configure
rename to jni/commoncpp2-android/configure
diff --git a/jni/commoncpp2-1.8.1-android/configure.ac b/jni/commoncpp2-android/configure.ac
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/configure.ac
rename to jni/commoncpp2-android/configure.ac
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/SampleSocketPort.Po b/jni/commoncpp2-android/demo/.deps/SampleSocketPort.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/SampleSocketPort.Po
rename to jni/commoncpp2-android/demo/.deps/SampleSocketPort.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/buffer.Po b/jni/commoncpp2-android/demo/.deps/buffer.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/buffer.Po
rename to jni/commoncpp2-android/demo/.deps/buffer.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/cmdlineopt.Po b/jni/commoncpp2-android/demo/.deps/cmdlineopt.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/cmdlineopt.Po
rename to jni/commoncpp2-android/demo/.deps/cmdlineopt.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/crc32.Po b/jni/commoncpp2-android/demo/.deps/crc32.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/crc32.Po
rename to jni/commoncpp2-android/demo/.deps/crc32.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/dccpclient.Po b/jni/commoncpp2-android/demo/.deps/dccpclient.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/dccpclient.Po
rename to jni/commoncpp2-android/demo/.deps/dccpclient.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/dccpserver.Po b/jni/commoncpp2-android/demo/.deps/dccpserver.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/dccpserver.Po
rename to jni/commoncpp2-android/demo/.deps/dccpserver.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/dir.Po b/jni/commoncpp2-android/demo/.deps/dir.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/dir.Po
rename to jni/commoncpp2-android/demo/.deps/dir.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/keydump.Po b/jni/commoncpp2-android/demo/.deps/keydump.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/keydump.Po
rename to jni/commoncpp2-android/demo/.deps/keydump.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/netdevices.Po b/jni/commoncpp2-android/demo/.deps/netdevices.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/netdevices.Po
rename to jni/commoncpp2-android/demo/.deps/netdevices.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/serialecho.Po b/jni/commoncpp2-android/demo/.deps/serialecho.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/serialecho.Po
rename to jni/commoncpp2-android/demo/.deps/serialecho.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/serialmain.Po b/jni/commoncpp2-android/demo/.deps/serialmain.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/serialmain.Po
rename to jni/commoncpp2-android/demo/.deps/serialmain.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/slogTest.Po b/jni/commoncpp2-android/demo/.deps/slogTest.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/slogTest.Po
rename to jni/commoncpp2-android/demo/.deps/slogTest.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/str.Po b/jni/commoncpp2-android/demo/.deps/str.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/str.Po
rename to jni/commoncpp2-android/demo/.deps/str.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/tcp.Po b/jni/commoncpp2-android/demo/.deps/tcp.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/tcp.Po
rename to jni/commoncpp2-android/demo/.deps/tcp.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/tcpservice.Po b/jni/commoncpp2-android/demo/.deps/tcpservice.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/tcpservice.Po
rename to jni/commoncpp2-android/demo/.deps/tcpservice.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/tcpthread.Po b/jni/commoncpp2-android/demo/.deps/tcpthread.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/tcpthread.Po
rename to jni/commoncpp2-android/demo/.deps/tcpthread.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/test_alog.Po b/jni/commoncpp2-android/demo/.deps/test_alog.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/test_alog.Po
rename to jni/commoncpp2-android/demo/.deps/test_alog.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/timer.Po b/jni/commoncpp2-android/demo/.deps/timer.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/timer.Po
rename to jni/commoncpp2-android/demo/.deps/timer.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/urlfetch.Po b/jni/commoncpp2-android/demo/.deps/urlfetch.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/urlfetch.Po
rename to jni/commoncpp2-android/demo/.deps/urlfetch.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/.deps/xmlfetch.Po b/jni/commoncpp2-android/demo/.deps/xmlfetch.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/.deps/xmlfetch.Po
rename to jni/commoncpp2-android/demo/.deps/xmlfetch.Po
diff --git a/jni/commoncpp2-1.8.1-android/demo/Makefile b/jni/commoncpp2-android/demo/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/Makefile
rename to jni/commoncpp2-android/demo/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/demo/Makefile.am b/jni/commoncpp2-android/demo/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/Makefile.am
rename to jni/commoncpp2-android/demo/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/demo/Makefile.bcc b/jni/commoncpp2-android/demo/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/Makefile.bcc
rename to jni/commoncpp2-android/demo/Makefile.bcc
diff --git a/jni/commoncpp2-1.8.1-android/demo/Makefile.in b/jni/commoncpp2-android/demo/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/Makefile.in
rename to jni/commoncpp2-android/demo/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/demo/README b/jni/commoncpp2-android/demo/README
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/README
rename to jni/commoncpp2-android/demo/README
diff --git a/jni/commoncpp2-1.8.1-android/demo/SampleSocketPort.cpp b/jni/commoncpp2-android/demo/SampleSocketPort.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/SampleSocketPort.cpp
rename to jni/commoncpp2-android/demo/SampleSocketPort.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/SampleSocketPort.h b/jni/commoncpp2-android/demo/SampleSocketPort.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/SampleSocketPort.h
rename to jni/commoncpp2-android/demo/SampleSocketPort.h
diff --git a/jni/commoncpp2-1.8.1-android/demo/buffer.cpp b/jni/commoncpp2-android/demo/buffer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/buffer.cpp
rename to jni/commoncpp2-android/demo/buffer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/cmdlineopt.cpp b/jni/commoncpp2-android/demo/cmdlineopt.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/cmdlineopt.cpp
rename to jni/commoncpp2-android/demo/cmdlineopt.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/crc32.cpp b/jni/commoncpp2-android/demo/crc32.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/crc32.cpp
rename to jni/commoncpp2-android/demo/crc32.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/dccpclient.cpp b/jni/commoncpp2-android/demo/dccpclient.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/dccpclient.cpp
rename to jni/commoncpp2-android/demo/dccpclient.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/dccpserver.cpp b/jni/commoncpp2-android/demo/dccpserver.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/dccpserver.cpp
rename to jni/commoncpp2-android/demo/dccpserver.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/dir.cpp b/jni/commoncpp2-android/demo/dir.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/dir.cpp
rename to jni/commoncpp2-android/demo/dir.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/keydump.cpp b/jni/commoncpp2-android/demo/keydump.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/keydump.cpp
rename to jni/commoncpp2-android/demo/keydump.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/netdevices.cpp b/jni/commoncpp2-android/demo/netdevices.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/netdevices.cpp
rename to jni/commoncpp2-android/demo/netdevices.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/serialecho.cpp b/jni/commoncpp2-android/demo/serialecho.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/serialecho.cpp
rename to jni/commoncpp2-android/demo/serialecho.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/serialecho.h b/jni/commoncpp2-android/demo/serialecho.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/serialecho.h
rename to jni/commoncpp2-android/demo/serialecho.h
diff --git a/jni/commoncpp2-1.8.1-android/demo/serialmain.cpp b/jni/commoncpp2-android/demo/serialmain.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/serialmain.cpp
rename to jni/commoncpp2-android/demo/serialmain.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/slogTest.cpp b/jni/commoncpp2-android/demo/slogTest.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/slogTest.cpp
rename to jni/commoncpp2-android/demo/slogTest.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/str.cpp b/jni/commoncpp2-android/demo/str.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/str.cpp
rename to jni/commoncpp2-android/demo/str.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/tcp.cpp b/jni/commoncpp2-android/demo/tcp.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/tcp.cpp
rename to jni/commoncpp2-android/demo/tcp.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/tcpservice.cpp b/jni/commoncpp2-android/demo/tcpservice.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/tcpservice.cpp
rename to jni/commoncpp2-android/demo/tcpservice.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/tcpthread.cpp b/jni/commoncpp2-android/demo/tcpthread.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/tcpthread.cpp
rename to jni/commoncpp2-android/demo/tcpthread.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/test.xml b/jni/commoncpp2-android/demo/test.xml
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/test.xml
rename to jni/commoncpp2-android/demo/test.xml
diff --git a/jni/commoncpp2-1.8.1-android/demo/test_alog.cpp b/jni/commoncpp2-android/demo/test_alog.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/test_alog.cpp
rename to jni/commoncpp2-android/demo/test_alog.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/timer.cpp b/jni/commoncpp2-android/demo/timer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/timer.cpp
rename to jni/commoncpp2-android/demo/timer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/urlfetch.cpp b/jni/commoncpp2-android/demo/urlfetch.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/urlfetch.cpp
rename to jni/commoncpp2-android/demo/urlfetch.cpp
diff --git a/jni/commoncpp2-1.8.1-android/demo/xmlfetch.cpp b/jni/commoncpp2-android/demo/xmlfetch.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/demo/xmlfetch.cpp
rename to jni/commoncpp2-android/demo/xmlfetch.cpp
diff --git a/jni/commoncpp2-1.8.1-android/doc/Doxyfile b/jni/commoncpp2-android/doc/Doxyfile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/Doxyfile
rename to jni/commoncpp2-android/doc/Doxyfile
diff --git a/jni/commoncpp2-1.8.1-android/doc/Doxyfile.in b/jni/commoncpp2-android/doc/Doxyfile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/Doxyfile.in
rename to jni/commoncpp2-android/doc/Doxyfile.in
diff --git a/jni/commoncpp2-1.8.1-android/doc/Makefile b/jni/commoncpp2-android/doc/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/Makefile
rename to jni/commoncpp2-android/doc/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/doc/Makefile.am b/jni/commoncpp2-android/doc/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/Makefile.am
rename to jni/commoncpp2-android/doc/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/doc/Makefile.in b/jni/commoncpp2-android/doc/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/Makefile.in
rename to jni/commoncpp2-android/doc/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/doc/commoncpp2.info b/jni/commoncpp2-android/doc/commoncpp2.info
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/commoncpp2.info
rename to jni/commoncpp2-android/doc/commoncpp2.info
Binary files differ
diff --git a/jni/commoncpp2-1.8.1-android/doc/commoncpp2.texi b/jni/commoncpp2-android/doc/commoncpp2.texi
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/commoncpp2.texi
rename to jni/commoncpp2-android/doc/commoncpp2.texi
diff --git a/jni/commoncpp2-1.8.1-android/doc/fdl.texi b/jni/commoncpp2-android/doc/fdl.texi
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/fdl.texi
rename to jni/commoncpp2-android/doc/fdl.texi
diff --git a/jni/commoncpp2-1.8.1-android/doc/fdlnotice.texi b/jni/commoncpp2-android/doc/fdlnotice.texi
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/fdlnotice.texi
rename to jni/commoncpp2-android/doc/fdlnotice.texi
diff --git a/jni/commoncpp2-1.8.1-android/doc/gpl.texi b/jni/commoncpp2-android/doc/gpl.texi
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/doc/gpl.texi
rename to jni/commoncpp2-android/doc/gpl.texi
diff --git a/jni/commoncpp2-1.8.1-android/envsetup.sh b/jni/commoncpp2-android/envsetup.sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/envsetup.sh
rename to jni/commoncpp2-android/envsetup.sh
diff --git a/jni/commoncpp2-1.8.1-android/inc/Makefile b/jni/commoncpp2-android/inc/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/Makefile
rename to jni/commoncpp2-android/inc/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/inc/Makefile.am b/jni/commoncpp2-android/inc/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/Makefile.am
rename to jni/commoncpp2-android/inc/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/inc/Makefile.in b/jni/commoncpp2-android/inc/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/Makefile.in
rename to jni/commoncpp2-android/inc/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/Makefile b/jni/commoncpp2-android/inc/cc++/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/Makefile
rename to jni/commoncpp2-android/inc/cc++/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/Makefile.am b/jni/commoncpp2-android/inc/cc++/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/Makefile.am
rename to jni/commoncpp2-android/inc/cc++/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/Makefile.in b/jni/commoncpp2-android/inc/cc++/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/Makefile.in
rename to jni/commoncpp2-android/inc/cc++/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/address.h b/jni/commoncpp2-android/inc/cc++/address.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/address.h
rename to jni/commoncpp2-android/inc/cc++/address.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/applog.h b/jni/commoncpp2-android/inc/cc++/applog.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/applog.h
rename to jni/commoncpp2-android/inc/cc++/applog.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/buffer.h b/jni/commoncpp2-android/inc/cc++/buffer.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/buffer.h
rename to jni/commoncpp2-android/inc/cc++/buffer.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/cmdoptns.h b/jni/commoncpp2-android/inc/cc++/cmdoptns.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/cmdoptns.h
rename to jni/commoncpp2-android/inc/cc++/cmdoptns.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/common.h b/jni/commoncpp2-android/inc/cc++/common.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/common.h
rename to jni/commoncpp2-android/inc/cc++/common.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/config.h b/jni/commoncpp2-android/inc/cc++/config.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/config.h
rename to jni/commoncpp2-android/inc/cc++/config.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/config.h.android b/jni/commoncpp2-android/inc/cc++/config.h.android
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/config.h.android
rename to jni/commoncpp2-android/inc/cc++/config.h.android
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/counter.h b/jni/commoncpp2-android/inc/cc++/counter.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/counter.h
rename to jni/commoncpp2-android/inc/cc++/counter.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/digest.h b/jni/commoncpp2-android/inc/cc++/digest.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/digest.h
rename to jni/commoncpp2-android/inc/cc++/digest.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/exception.h b/jni/commoncpp2-android/inc/cc++/exception.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/exception.h
rename to jni/commoncpp2-android/inc/cc++/exception.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/export.h b/jni/commoncpp2-android/inc/cc++/export.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/export.h
rename to jni/commoncpp2-android/inc/cc++/export.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/file.h b/jni/commoncpp2-android/inc/cc++/file.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/file.h
rename to jni/commoncpp2-android/inc/cc++/file.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/functions.h b/jni/commoncpp2-android/inc/cc++/functions.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/functions.h
rename to jni/commoncpp2-android/inc/cc++/functions.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/mime.h b/jni/commoncpp2-android/inc/cc++/mime.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/mime.h
rename to jni/commoncpp2-android/inc/cc++/mime.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/misc.h b/jni/commoncpp2-android/inc/cc++/misc.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/misc.h
rename to jni/commoncpp2-android/inc/cc++/misc.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/missing.h b/jni/commoncpp2-android/inc/cc++/missing.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/missing.h
rename to jni/commoncpp2-android/inc/cc++/missing.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/network.h b/jni/commoncpp2-android/inc/cc++/network.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/network.h
rename to jni/commoncpp2-android/inc/cc++/network.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/numbers.h b/jni/commoncpp2-android/inc/cc++/numbers.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/numbers.h
rename to jni/commoncpp2-android/inc/cc++/numbers.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/objcount.h b/jni/commoncpp2-android/inc/cc++/objcount.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/objcount.h
rename to jni/commoncpp2-android/inc/cc++/objcount.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/object.h b/jni/commoncpp2-android/inc/cc++/object.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/object.h
rename to jni/commoncpp2-android/inc/cc++/object.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/objlink.h b/jni/commoncpp2-android/inc/cc++/objlink.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/objlink.h
rename to jni/commoncpp2-android/inc/cc++/objlink.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/objmap.h b/jni/commoncpp2-android/inc/cc++/objmap.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/objmap.h
rename to jni/commoncpp2-android/inc/cc++/objmap.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/objsync.h b/jni/commoncpp2-android/inc/cc++/objsync.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/objsync.h
rename to jni/commoncpp2-android/inc/cc++/objsync.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/oststring.h b/jni/commoncpp2-android/inc/cc++/oststring.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/oststring.h
rename to jni/commoncpp2-android/inc/cc++/oststring.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/persist.h b/jni/commoncpp2-android/inc/cc++/persist.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/persist.h
rename to jni/commoncpp2-android/inc/cc++/persist.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/pointer.h b/jni/commoncpp2-android/inc/cc++/pointer.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/pointer.h
rename to jni/commoncpp2-android/inc/cc++/pointer.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/process.h b/jni/commoncpp2-android/inc/cc++/process.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/process.h
rename to jni/commoncpp2-android/inc/cc++/process.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/serial.h b/jni/commoncpp2-android/inc/cc++/serial.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/serial.h
rename to jni/commoncpp2-android/inc/cc++/serial.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/slog.h b/jni/commoncpp2-android/inc/cc++/slog.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/slog.h
rename to jni/commoncpp2-android/inc/cc++/slog.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/socket.h b/jni/commoncpp2-android/inc/cc++/socket.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/socket.h
rename to jni/commoncpp2-android/inc/cc++/socket.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/socketport.h b/jni/commoncpp2-android/inc/cc++/socketport.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/socketport.h
rename to jni/commoncpp2-android/inc/cc++/socketport.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/ssl.h b/jni/commoncpp2-android/inc/cc++/ssl.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/ssl.h
rename to jni/commoncpp2-android/inc/cc++/ssl.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/strchar.h b/jni/commoncpp2-android/inc/cc++/strchar.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/strchar.h
rename to jni/commoncpp2-android/inc/cc++/strchar.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/string.h b/jni/commoncpp2-android/inc/cc++/string.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/string.h
rename to jni/commoncpp2-android/inc/cc++/string.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/template.h b/jni/commoncpp2-android/inc/cc++/template.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/template.h
rename to jni/commoncpp2-android/inc/cc++/template.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/thread.h b/jni/commoncpp2-android/inc/cc++/thread.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/thread.h
rename to jni/commoncpp2-android/inc/cc++/thread.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/tokenizer.h b/jni/commoncpp2-android/inc/cc++/tokenizer.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/tokenizer.h
rename to jni/commoncpp2-android/inc/cc++/tokenizer.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/unix.h b/jni/commoncpp2-android/inc/cc++/unix.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/unix.h
rename to jni/commoncpp2-android/inc/cc++/unix.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/url.h b/jni/commoncpp2-android/inc/cc++/url.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/url.h
rename to jni/commoncpp2-android/inc/cc++/url.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/xml.h b/jni/commoncpp2-android/inc/cc++/xml.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/xml.h
rename to jni/commoncpp2-android/inc/cc++/xml.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/cc++/zstream.h b/jni/commoncpp2-android/inc/cc++/zstream.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/cc++/zstream.h
rename to jni/commoncpp2-android/inc/cc++/zstream.h
diff --git a/jni/commoncpp2-1.8.1-android/inc/config.tmp b/jni/commoncpp2-android/inc/config.tmp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/inc/config.tmp
rename to jni/commoncpp2-android/inc/config.tmp
diff --git a/jni/commoncpp2-1.8.1-android/libtool b/jni/commoncpp2-android/libtool
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/libtool
rename to jni/commoncpp2-android/libtool
diff --git a/jni/commoncpp2-1.8.1-android/m4/Makefile b/jni/commoncpp2-android/m4/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/Makefile
rename to jni/commoncpp2-android/m4/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/m4/Makefile.am b/jni/commoncpp2-android/m4/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/Makefile.am
rename to jni/commoncpp2-android/m4/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/m4/Makefile.in b/jni/commoncpp2-android/m4/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/Makefile.in
rename to jni/commoncpp2-android/m4/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/m4/libtool.m4 b/jni/commoncpp2-android/m4/libtool.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/libtool.m4
rename to jni/commoncpp2-android/m4/libtool.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ltoptions.m4 b/jni/commoncpp2-android/m4/ltoptions.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ltoptions.m4
rename to jni/commoncpp2-android/m4/ltoptions.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ltsugar.m4 b/jni/commoncpp2-android/m4/ltsugar.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ltsugar.m4
rename to jni/commoncpp2-android/m4/ltsugar.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ltversion.m4 b/jni/commoncpp2-android/m4/ltversion.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ltversion.m4
rename to jni/commoncpp2-android/m4/ltversion.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/lt~obsolete.m4 b/jni/commoncpp2-android/m4/lt~obsolete.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/lt~obsolete.m4
rename to jni/commoncpp2-android/m4/lt~obsolete.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_cxx.m4 b/jni/commoncpp2-android/m4/ost_cxx.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_cxx.m4
rename to jni/commoncpp2-android/m4/ost_cxx.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_debug.m4 b/jni/commoncpp2-android/m4/ost_debug.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_debug.m4
rename to jni/commoncpp2-android/m4/ost_debug.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_dynamic.m4 b/jni/commoncpp2-android/m4/ost_dynamic.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_dynamic.m4
rename to jni/commoncpp2-android/m4/ost_dynamic.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_endian.m4 b/jni/commoncpp2-android/m4/ost_endian.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_endian.m4
rename to jni/commoncpp2-android/m4/ost_endian.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_getopt.m4 b/jni/commoncpp2-android/m4/ost_getopt.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_getopt.m4
rename to jni/commoncpp2-android/m4/ost_getopt.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_maint.m4 b/jni/commoncpp2-android/m4/ost_maint.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_maint.m4
rename to jni/commoncpp2-android/m4/ost_maint.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_misc.m4 b/jni/commoncpp2-android/m4/ost_misc.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_misc.m4
rename to jni/commoncpp2-android/m4/ost_misc.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_poll.m4 b/jni/commoncpp2-android/m4/ost_poll.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_poll.m4
rename to jni/commoncpp2-android/m4/ost_poll.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_posix.m4 b/jni/commoncpp2-android/m4/ost_posix.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_posix.m4
rename to jni/commoncpp2-android/m4/ost_posix.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_prog.m4 b/jni/commoncpp2-android/m4/ost_prog.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_prog.m4
rename to jni/commoncpp2-android/m4/ost_prog.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_pthread.m4 b/jni/commoncpp2-android/m4/ost_pthread.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_pthread.m4
rename to jni/commoncpp2-android/m4/ost_pthread.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_reentrant.m4 b/jni/commoncpp2-android/m4/ost_reentrant.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_reentrant.m4
rename to jni/commoncpp2-android/m4/ost_reentrant.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_signal.m4 b/jni/commoncpp2-android/m4/ost_signal.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_signal.m4
rename to jni/commoncpp2-android/m4/ost_signal.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_socket.m4 b/jni/commoncpp2-android/m4/ost_socket.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_socket.m4
rename to jni/commoncpp2-android/m4/ost_socket.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_ssl.m4 b/jni/commoncpp2-android/m4/ost_ssl.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_ssl.m4
rename to jni/commoncpp2-android/m4/ost_ssl.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_stlport.m4 b/jni/commoncpp2-android/m4/ost_stlport.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_stlport.m4
rename to jni/commoncpp2-android/m4/ost_stlport.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_string.m4 b/jni/commoncpp2-android/m4/ost_string.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_string.m4
rename to jni/commoncpp2-android/m4/ost_string.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_systime.m4 b/jni/commoncpp2-android/m4/ost_systime.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_systime.m4
rename to jni/commoncpp2-android/m4/ost_systime.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_types.m4 b/jni/commoncpp2-android/m4/ost_types.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_types.m4
rename to jni/commoncpp2-android/m4/ost_types.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/ost_win32.m4 b/jni/commoncpp2-android/m4/ost_win32.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/ost_win32.m4
rename to jni/commoncpp2-android/m4/ost_win32.m4
diff --git a/jni/commoncpp2-1.8.1-android/m4/win32msc.m4 b/jni/commoncpp2-android/m4/win32msc.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/m4/win32msc.m4
rename to jni/commoncpp2-android/m4/win32msc.m4
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/applog.Plo b/jni/commoncpp2-android/src/.deps/applog.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/applog.Plo
rename to jni/commoncpp2-android/src/.deps/applog.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/assoc.Plo b/jni/commoncpp2-android/src/.deps/assoc.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/assoc.Plo
rename to jni/commoncpp2-android/src/.deps/assoc.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/buffer.Plo b/jni/commoncpp2-android/src/.deps/buffer.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/buffer.Plo
rename to jni/commoncpp2-android/src/.deps/buffer.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/cidr.Plo b/jni/commoncpp2-android/src/.deps/cidr.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/cidr.Plo
rename to jni/commoncpp2-android/src/.deps/cidr.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/cmdoptns.Plo b/jni/commoncpp2-android/src/.deps/cmdoptns.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/cmdoptns.Plo
rename to jni/commoncpp2-android/src/.deps/cmdoptns.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/date.Plo b/jni/commoncpp2-android/src/.deps/date.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/date.Plo
rename to jni/commoncpp2-android/src/.deps/date.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/digest.Plo b/jni/commoncpp2-android/src/.deps/digest.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/digest.Plo
rename to jni/commoncpp2-android/src/.deps/digest.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/dir.Plo b/jni/commoncpp2-android/src/.deps/dir.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/dir.Plo
rename to jni/commoncpp2-android/src/.deps/dir.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/dso.Plo b/jni/commoncpp2-android/src/.deps/dso.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/dso.Plo
rename to jni/commoncpp2-android/src/.deps/dso.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/engine.Plo b/jni/commoncpp2-android/src/.deps/engine.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/engine.Plo
rename to jni/commoncpp2-android/src/.deps/engine.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/event.Plo b/jni/commoncpp2-android/src/.deps/event.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/event.Plo
rename to jni/commoncpp2-android/src/.deps/event.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/exception.Plo b/jni/commoncpp2-android/src/.deps/exception.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/exception.Plo
rename to jni/commoncpp2-android/src/.deps/exception.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/file.Plo b/jni/commoncpp2-android/src/.deps/file.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/file.Plo
rename to jni/commoncpp2-android/src/.deps/file.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/friends.Plo b/jni/commoncpp2-android/src/.deps/friends.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/friends.Plo
rename to jni/commoncpp2-android/src/.deps/friends.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/getopt.Plo b/jni/commoncpp2-android/src/.deps/getopt.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/getopt.Plo
rename to jni/commoncpp2-android/src/.deps/getopt.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/getopt1.Plo b/jni/commoncpp2-android/src/.deps/getopt1.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/getopt1.Plo
rename to jni/commoncpp2-android/src/.deps/getopt1.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/in6addr.Plo b/jni/commoncpp2-android/src/.deps/in6addr.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/in6addr.Plo
rename to jni/commoncpp2-android/src/.deps/in6addr.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/inaddr.Plo b/jni/commoncpp2-android/src/.deps/inaddr.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/inaddr.Plo
rename to jni/commoncpp2-android/src/.deps/inaddr.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/keydata.Plo b/jni/commoncpp2-android/src/.deps/keydata.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/keydata.Plo
rename to jni/commoncpp2-android/src/.deps/keydata.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/linked.Plo b/jni/commoncpp2-android/src/.deps/linked.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/linked.Plo
rename to jni/commoncpp2-android/src/.deps/linked.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/lockfile.Plo b/jni/commoncpp2-android/src/.deps/lockfile.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/lockfile.Plo
rename to jni/commoncpp2-android/src/.deps/lockfile.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/map.Plo b/jni/commoncpp2-android/src/.deps/map.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/map.Plo
rename to jni/commoncpp2-android/src/.deps/map.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/md5.Plo b/jni/commoncpp2-android/src/.deps/md5.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/md5.Plo
rename to jni/commoncpp2-android/src/.deps/md5.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/mempager.Plo b/jni/commoncpp2-android/src/.deps/mempager.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/mempager.Plo
rename to jni/commoncpp2-android/src/.deps/mempager.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/mime.Plo b/jni/commoncpp2-android/src/.deps/mime.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/mime.Plo
rename to jni/commoncpp2-android/src/.deps/mime.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/missing.Plo b/jni/commoncpp2-android/src/.deps/missing.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/missing.Plo
rename to jni/commoncpp2-android/src/.deps/missing.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/mutex.Plo b/jni/commoncpp2-android/src/.deps/mutex.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/mutex.Plo
rename to jni/commoncpp2-android/src/.deps/mutex.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/nat.Plo b/jni/commoncpp2-android/src/.deps/nat.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/nat.Plo
rename to jni/commoncpp2-android/src/.deps/nat.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/network.Plo b/jni/commoncpp2-android/src/.deps/network.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/network.Plo
rename to jni/commoncpp2-android/src/.deps/network.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/numbers.Plo b/jni/commoncpp2-android/src/.deps/numbers.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/numbers.Plo
rename to jni/commoncpp2-android/src/.deps/numbers.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/peer.Plo b/jni/commoncpp2-android/src/.deps/peer.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/peer.Plo
rename to jni/commoncpp2-android/src/.deps/peer.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/persist.Plo b/jni/commoncpp2-android/src/.deps/persist.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/persist.Plo
rename to jni/commoncpp2-android/src/.deps/persist.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/pointer.Plo b/jni/commoncpp2-android/src/.deps/pointer.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/pointer.Plo
rename to jni/commoncpp2-android/src/.deps/pointer.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/process.Plo b/jni/commoncpp2-android/src/.deps/process.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/process.Plo
rename to jni/commoncpp2-android/src/.deps/process.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/runlist.Plo b/jni/commoncpp2-android/src/.deps/runlist.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/runlist.Plo
rename to jni/commoncpp2-android/src/.deps/runlist.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/semaphore.Plo b/jni/commoncpp2-android/src/.deps/semaphore.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/semaphore.Plo
rename to jni/commoncpp2-android/src/.deps/semaphore.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/serial.Plo b/jni/commoncpp2-android/src/.deps/serial.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/serial.Plo
rename to jni/commoncpp2-android/src/.deps/serial.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/simplesocket.Plo b/jni/commoncpp2-android/src/.deps/simplesocket.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/simplesocket.Plo
rename to jni/commoncpp2-android/src/.deps/simplesocket.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/slog.Plo b/jni/commoncpp2-android/src/.deps/slog.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/slog.Plo
rename to jni/commoncpp2-android/src/.deps/slog.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/socket.Plo b/jni/commoncpp2-android/src/.deps/socket.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/socket.Plo
rename to jni/commoncpp2-android/src/.deps/socket.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/socketport.Plo b/jni/commoncpp2-android/src/.deps/socketport.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/socketport.Plo
rename to jni/commoncpp2-android/src/.deps/socketport.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/ssl.Plo b/jni/commoncpp2-android/src/.deps/ssl.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/ssl.Plo
rename to jni/commoncpp2-android/src/.deps/ssl.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/strchar.Plo b/jni/commoncpp2-android/src/.deps/strchar.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/strchar.Plo
rename to jni/commoncpp2-android/src/.deps/strchar.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/string.Plo b/jni/commoncpp2-android/src/.deps/string.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/string.Plo
rename to jni/commoncpp2-android/src/.deps/string.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/thread.Plo b/jni/commoncpp2-android/src/.deps/thread.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/thread.Plo
rename to jni/commoncpp2-android/src/.deps/thread.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/threadkey.Plo b/jni/commoncpp2-android/src/.deps/threadkey.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/threadkey.Plo
rename to jni/commoncpp2-android/src/.deps/threadkey.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/timer.Plo b/jni/commoncpp2-android/src/.deps/timer.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/timer.Plo
rename to jni/commoncpp2-android/src/.deps/timer.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/tokenizer.Plo b/jni/commoncpp2-android/src/.deps/tokenizer.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/tokenizer.Plo
rename to jni/commoncpp2-android/src/.deps/tokenizer.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/unix.Plo b/jni/commoncpp2-android/src/.deps/unix.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/unix.Plo
rename to jni/commoncpp2-android/src/.deps/unix.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/url.Plo b/jni/commoncpp2-android/src/.deps/url.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/url.Plo
rename to jni/commoncpp2-android/src/.deps/url.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/urlstring.Plo b/jni/commoncpp2-android/src/.deps/urlstring.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/urlstring.Plo
rename to jni/commoncpp2-android/src/.deps/urlstring.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/xml.Plo b/jni/commoncpp2-android/src/.deps/xml.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/xml.Plo
rename to jni/commoncpp2-android/src/.deps/xml.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/.deps/zstream.Plo b/jni/commoncpp2-android/src/.deps/zstream.Plo
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/.deps/zstream.Plo
rename to jni/commoncpp2-android/src/.deps/zstream.Plo
diff --git a/jni/commoncpp2-1.8.1-android/src/Android.mk b/jni/commoncpp2-android/src/Android.mk
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/Android.mk
rename to jni/commoncpp2-android/src/Android.mk
diff --git a/jni/commoncpp2-1.8.1-android/src/Makefile b/jni/commoncpp2-android/src/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/Makefile
rename to jni/commoncpp2-android/src/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/src/Makefile.am b/jni/commoncpp2-android/src/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/Makefile.am
rename to jni/commoncpp2-android/src/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/src/Makefile.in b/jni/commoncpp2-android/src/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/Makefile.in
rename to jni/commoncpp2-android/src/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/src/applog.cpp b/jni/commoncpp2-android/src/applog.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/applog.cpp
rename to jni/commoncpp2-android/src/applog.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/assoc.cpp b/jni/commoncpp2-android/src/assoc.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/assoc.cpp
rename to jni/commoncpp2-android/src/assoc.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/buffer.cpp b/jni/commoncpp2-android/src/buffer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/buffer.cpp
rename to jni/commoncpp2-android/src/buffer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/ccgnu2-config b/jni/commoncpp2-android/src/ccgnu2-config
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/ccgnu2-config
rename to jni/commoncpp2-android/src/ccgnu2-config
diff --git a/jni/commoncpp2-1.8.1-android/src/ccgnu2-config.in b/jni/commoncpp2-android/src/ccgnu2-config.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/ccgnu2-config.in
rename to jni/commoncpp2-android/src/ccgnu2-config.in
diff --git a/jni/commoncpp2-1.8.1-android/src/cidr.cpp b/jni/commoncpp2-android/src/cidr.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/cidr.cpp
rename to jni/commoncpp2-android/src/cidr.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/cmdoptns.cpp b/jni/commoncpp2-android/src/cmdoptns.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/cmdoptns.cpp
rename to jni/commoncpp2-android/src/cmdoptns.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/date.cpp b/jni/commoncpp2-android/src/date.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/date.cpp
rename to jni/commoncpp2-android/src/date.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/digest.cpp b/jni/commoncpp2-android/src/digest.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/digest.cpp
rename to jni/commoncpp2-android/src/digest.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/dir.cpp b/jni/commoncpp2-android/src/dir.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/dir.cpp
rename to jni/commoncpp2-android/src/dir.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/dso.cpp b/jni/commoncpp2-android/src/dso.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/dso.cpp
rename to jni/commoncpp2-android/src/dso.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/engine.cpp b/jni/commoncpp2-android/src/engine.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/engine.cpp
rename to jni/commoncpp2-android/src/engine.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/event.cpp b/jni/commoncpp2-android/src/event.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/event.cpp
rename to jni/commoncpp2-android/src/event.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/exception.cpp b/jni/commoncpp2-android/src/exception.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/exception.cpp
rename to jni/commoncpp2-android/src/exception.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/file.cpp b/jni/commoncpp2-android/src/file.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/file.cpp
rename to jni/commoncpp2-android/src/file.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/friends.cpp b/jni/commoncpp2-android/src/friends.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/friends.cpp
rename to jni/commoncpp2-android/src/friends.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/getopt.c b/jni/commoncpp2-android/src/getopt.c
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/getopt.c
rename to jni/commoncpp2-android/src/getopt.c
diff --git a/jni/commoncpp2-1.8.1-android/src/getopt.h b/jni/commoncpp2-android/src/getopt.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/getopt.h
rename to jni/commoncpp2-android/src/getopt.h
diff --git a/jni/commoncpp2-1.8.1-android/src/getopt1.c b/jni/commoncpp2-android/src/getopt1.c
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/getopt1.c
rename to jni/commoncpp2-android/src/getopt1.c
diff --git a/jni/commoncpp2-1.8.1-android/src/in6addr.cpp b/jni/commoncpp2-android/src/in6addr.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/in6addr.cpp
rename to jni/commoncpp2-android/src/in6addr.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/inaddr.cpp b/jni/commoncpp2-android/src/inaddr.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/inaddr.cpp
rename to jni/commoncpp2-android/src/inaddr.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/keydata.cpp b/jni/commoncpp2-android/src/keydata.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/keydata.cpp
rename to jni/commoncpp2-android/src/keydata.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/libccext2.pc b/jni/commoncpp2-android/src/libccext2.pc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/libccext2.pc
rename to jni/commoncpp2-android/src/libccext2.pc
diff --git a/jni/commoncpp2-1.8.1-android/src/libccext2.pc.in b/jni/commoncpp2-android/src/libccext2.pc.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/libccext2.pc.in
rename to jni/commoncpp2-android/src/libccext2.pc.in
diff --git a/jni/commoncpp2-1.8.1-android/src/libccgnu2.pc b/jni/commoncpp2-android/src/libccgnu2.pc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/libccgnu2.pc
rename to jni/commoncpp2-android/src/libccgnu2.pc
diff --git a/jni/commoncpp2-1.8.1-android/src/libccgnu2.pc.in b/jni/commoncpp2-android/src/libccgnu2.pc.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/libccgnu2.pc.in
rename to jni/commoncpp2-android/src/libccgnu2.pc.in
diff --git a/jni/commoncpp2-1.8.1-android/src/linked.cpp b/jni/commoncpp2-android/src/linked.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/linked.cpp
rename to jni/commoncpp2-android/src/linked.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/lockfile.cpp b/jni/commoncpp2-android/src/lockfile.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/lockfile.cpp
rename to jni/commoncpp2-android/src/lockfile.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/map.cpp b/jni/commoncpp2-android/src/map.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/map.cpp
rename to jni/commoncpp2-android/src/map.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/md5.cpp b/jni/commoncpp2-android/src/md5.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/md5.cpp
rename to jni/commoncpp2-android/src/md5.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/mempager.cpp b/jni/commoncpp2-android/src/mempager.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/mempager.cpp
rename to jni/commoncpp2-android/src/mempager.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/mime.cpp b/jni/commoncpp2-android/src/mime.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/mime.cpp
rename to jni/commoncpp2-android/src/mime.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/missing.cpp b/jni/commoncpp2-android/src/missing.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/missing.cpp
rename to jni/commoncpp2-android/src/missing.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/mutex.cpp b/jni/commoncpp2-android/src/mutex.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/mutex.cpp
rename to jni/commoncpp2-android/src/mutex.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/nat.cpp b/jni/commoncpp2-android/src/nat.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/nat.cpp
rename to jni/commoncpp2-android/src/nat.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/nat.h b/jni/commoncpp2-android/src/nat.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/nat.h
rename to jni/commoncpp2-android/src/nat.h
diff --git a/jni/commoncpp2-1.8.1-android/src/network.cpp b/jni/commoncpp2-android/src/network.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/network.cpp
rename to jni/commoncpp2-android/src/network.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/numbers.cpp b/jni/commoncpp2-android/src/numbers.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/numbers.cpp
rename to jni/commoncpp2-android/src/numbers.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/ost_check2.m4 b/jni/commoncpp2-android/src/ost_check2.m4
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/ost_check2.m4
rename to jni/commoncpp2-android/src/ost_check2.m4
diff --git a/jni/commoncpp2-1.8.1-android/src/peer.cpp b/jni/commoncpp2-android/src/peer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/peer.cpp
rename to jni/commoncpp2-android/src/peer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/persist.cpp b/jni/commoncpp2-android/src/persist.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/persist.cpp
rename to jni/commoncpp2-android/src/persist.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/pointer.cpp b/jni/commoncpp2-android/src/pointer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/pointer.cpp
rename to jni/commoncpp2-android/src/pointer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/private.h b/jni/commoncpp2-android/src/private.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/private.h
rename to jni/commoncpp2-android/src/private.h
diff --git a/jni/commoncpp2-1.8.1-android/src/process.cpp b/jni/commoncpp2-android/src/process.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/process.cpp
rename to jni/commoncpp2-android/src/process.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/runlist.cpp b/jni/commoncpp2-android/src/runlist.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/runlist.cpp
rename to jni/commoncpp2-android/src/runlist.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/semaphore.cpp b/jni/commoncpp2-android/src/semaphore.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/semaphore.cpp
rename to jni/commoncpp2-android/src/semaphore.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/serial.cpp b/jni/commoncpp2-android/src/serial.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/serial.cpp
rename to jni/commoncpp2-android/src/serial.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/simplesocket.cpp b/jni/commoncpp2-android/src/simplesocket.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/simplesocket.cpp
rename to jni/commoncpp2-android/src/simplesocket.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/slog.cpp b/jni/commoncpp2-android/src/slog.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/slog.cpp
rename to jni/commoncpp2-android/src/slog.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/socket.cpp b/jni/commoncpp2-android/src/socket.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/socket.cpp
rename to jni/commoncpp2-android/src/socket.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/socketport.cpp b/jni/commoncpp2-android/src/socketport.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/socketport.cpp
rename to jni/commoncpp2-android/src/socketport.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/ssl.cpp b/jni/commoncpp2-android/src/ssl.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/ssl.cpp
rename to jni/commoncpp2-android/src/ssl.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/strchar.cpp b/jni/commoncpp2-android/src/strchar.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/strchar.cpp
rename to jni/commoncpp2-android/src/strchar.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/string.cpp b/jni/commoncpp2-android/src/string.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/string.cpp
rename to jni/commoncpp2-android/src/string.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/thread.cpp b/jni/commoncpp2-android/src/thread.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/thread.cpp
rename to jni/commoncpp2-android/src/thread.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/threadkey.cpp b/jni/commoncpp2-android/src/threadkey.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/threadkey.cpp
rename to jni/commoncpp2-android/src/threadkey.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/timer.cpp b/jni/commoncpp2-android/src/timer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/timer.cpp
rename to jni/commoncpp2-android/src/timer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/tokenizer.cpp b/jni/commoncpp2-android/src/tokenizer.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/tokenizer.cpp
rename to jni/commoncpp2-android/src/tokenizer.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/unix.cpp b/jni/commoncpp2-android/src/unix.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/unix.cpp
rename to jni/commoncpp2-android/src/unix.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/url.cpp b/jni/commoncpp2-android/src/url.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/url.cpp
rename to jni/commoncpp2-android/src/url.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/urlstring.cpp b/jni/commoncpp2-android/src/urlstring.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/urlstring.cpp
rename to jni/commoncpp2-android/src/urlstring.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/xml.cpp b/jni/commoncpp2-android/src/xml.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/xml.cpp
rename to jni/commoncpp2-android/src/xml.cpp
diff --git a/jni/commoncpp2-1.8.1-android/src/zstream.cpp b/jni/commoncpp2-android/src/zstream.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/src/zstream.cpp
rename to jni/commoncpp2-android/src/zstream.cpp
diff --git a/jni/commoncpp2-1.8.1-android/stamp-h1 b/jni/commoncpp2-android/stamp-h1
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/stamp-h1
rename to jni/commoncpp2-android/stamp-h1
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/SampleObject.Po b/jni/commoncpp2-android/tests/.deps/SampleObject.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/SampleObject.Po
rename to jni/commoncpp2-android/tests/.deps/SampleObject.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/SampleSubObject.Po b/jni/commoncpp2-android/tests/.deps/SampleSubObject.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/SampleSubObject.Po
rename to jni/commoncpp2-android/tests/.deps/SampleSubObject.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/Test_Date.Po b/jni/commoncpp2-android/tests/.deps/Test_Date.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/Test_Date.Po
rename to jni/commoncpp2-android/tests/.deps/Test_Date.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/Test_Engine.Po b/jni/commoncpp2-android/tests/.deps/Test_Engine.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/Test_Engine.Po
rename to jni/commoncpp2-android/tests/.deps/Test_Engine.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/Test_TCPStream.Po b/jni/commoncpp2-android/tests/.deps/Test_TCPStream.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/Test_TCPStream.Po
rename to jni/commoncpp2-android/tests/.deps/Test_TCPStream.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/Test_URLString.Po b/jni/commoncpp2-android/tests/.deps/Test_URLString.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/Test_URLString.Po
rename to jni/commoncpp2-android/tests/.deps/Test_URLString.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/bug1.Po b/jni/commoncpp2-android/tests/.deps/bug1.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/bug1.Po
rename to jni/commoncpp2-android/tests/.deps/bug1.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/bug2.Po b/jni/commoncpp2-android/tests/.deps/bug2.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/bug2.Po
rename to jni/commoncpp2-android/tests/.deps/bug2.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/ccxx_tests.Po b/jni/commoncpp2-android/tests/.deps/ccxx_tests.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/ccxx_tests.Po
rename to jni/commoncpp2-android/tests/.deps/ccxx_tests.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/digest.Po b/jni/commoncpp2-android/tests/.deps/digest.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/digest.Po
rename to jni/commoncpp2-android/tests/.deps/digest.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/forever.Po b/jni/commoncpp2-android/tests/.deps/forever.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/forever.Po
rename to jni/commoncpp2-android/tests/.deps/forever.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/tcpstr1.Po b/jni/commoncpp2-android/tests/.deps/tcpstr1.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/tcpstr1.Po
rename to jni/commoncpp2-android/tests/.deps/tcpstr1.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/thread1.Po b/jni/commoncpp2-android/tests/.deps/thread1.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/thread1.Po
rename to jni/commoncpp2-android/tests/.deps/thread1.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/thread2.Po b/jni/commoncpp2-android/tests/.deps/thread2.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/thread2.Po
rename to jni/commoncpp2-android/tests/.deps/thread2.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/thread3.Po b/jni/commoncpp2-android/tests/.deps/thread3.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/thread3.Po
rename to jni/commoncpp2-android/tests/.deps/thread3.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/.deps/url1.Po b/jni/commoncpp2-android/tests/.deps/url1.Po
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/.deps/url1.Po
rename to jni/commoncpp2-android/tests/.deps/url1.Po
diff --git a/jni/commoncpp2-1.8.1-android/tests/Makefile b/jni/commoncpp2-android/tests/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Makefile
rename to jni/commoncpp2-android/tests/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/tests/Makefile.am b/jni/commoncpp2-android/tests/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Makefile.am
rename to jni/commoncpp2-android/tests/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/tests/Makefile.bcc b/jni/commoncpp2-android/tests/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Makefile.bcc
rename to jni/commoncpp2-android/tests/Makefile.bcc
diff --git a/jni/commoncpp2-1.8.1-android/tests/Makefile.in b/jni/commoncpp2-android/tests/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Makefile.in
rename to jni/commoncpp2-android/tests/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/tests/README b/jni/commoncpp2-android/tests/README
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/README
rename to jni/commoncpp2-android/tests/README
diff --git a/jni/commoncpp2-1.8.1-android/tests/SampleObject.cpp b/jni/commoncpp2-android/tests/SampleObject.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/SampleObject.cpp
rename to jni/commoncpp2-android/tests/SampleObject.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/SampleObject.h b/jni/commoncpp2-android/tests/SampleObject.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/SampleObject.h
rename to jni/commoncpp2-android/tests/SampleObject.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/SampleSubObject.cpp b/jni/commoncpp2-android/tests/SampleSubObject.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/SampleSubObject.cpp
rename to jni/commoncpp2-android/tests/SampleSubObject.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/SampleSubObject.h b/jni/commoncpp2-android/tests/SampleSubObject.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/SampleSubObject.h
rename to jni/commoncpp2-android/tests/SampleSubObject.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_Date.cpp b/jni/commoncpp2-android/tests/Test_Date.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_Date.cpp
rename to jni/commoncpp2-android/tests/Test_Date.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_Date.h b/jni/commoncpp2-android/tests/Test_Date.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_Date.h
rename to jni/commoncpp2-android/tests/Test_Date.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_Digest.h b/jni/commoncpp2-android/tests/Test_Digest.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_Digest.h
rename to jni/commoncpp2-android/tests/Test_Digest.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_Engine.cpp b/jni/commoncpp2-android/tests/Test_Engine.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_Engine.cpp
rename to jni/commoncpp2-android/tests/Test_Engine.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_Engine.h b/jni/commoncpp2-android/tests/Test_Engine.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_Engine.h
rename to jni/commoncpp2-android/tests/Test_Engine.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_SHATumbler.h b/jni/commoncpp2-android/tests/Test_SHATumbler.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_SHATumbler.h
rename to jni/commoncpp2-android/tests/Test_SHATumbler.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_TCPStream.cpp b/jni/commoncpp2-android/tests/Test_TCPStream.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_TCPStream.cpp
rename to jni/commoncpp2-android/tests/Test_TCPStream.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_TCPStream.h b/jni/commoncpp2-android/tests/Test_TCPStream.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_TCPStream.h
rename to jni/commoncpp2-android/tests/Test_TCPStream.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_URLString.cpp b/jni/commoncpp2-android/tests/Test_URLString.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_URLString.cpp
rename to jni/commoncpp2-android/tests/Test_URLString.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/Test_URLString.h b/jni/commoncpp2-android/tests/Test_URLString.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/Test_URLString.h
rename to jni/commoncpp2-android/tests/Test_URLString.h
diff --git a/jni/commoncpp2-1.8.1-android/tests/bug1.cpp b/jni/commoncpp2-android/tests/bug1.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/bug1.cpp
rename to jni/commoncpp2-android/tests/bug1.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/bug2.cpp b/jni/commoncpp2-android/tests/bug2.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/bug2.cpp
rename to jni/commoncpp2-android/tests/bug2.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/ccxx_tests.cpp b/jni/commoncpp2-android/tests/ccxx_tests.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/ccxx_tests.cpp
rename to jni/commoncpp2-android/tests/ccxx_tests.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/digest.cpp b/jni/commoncpp2-android/tests/digest.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/digest.cpp
rename to jni/commoncpp2-android/tests/digest.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/dotests.sh b/jni/commoncpp2-android/tests/dotests.sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/dotests.sh
rename to jni/commoncpp2-android/tests/dotests.sh
diff --git a/jni/commoncpp2-1.8.1-android/tests/forever.cpp b/jni/commoncpp2-android/tests/forever.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/forever.cpp
rename to jni/commoncpp2-android/tests/forever.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/output.txt b/jni/commoncpp2-android/tests/output.txt
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/output.txt
rename to jni/commoncpp2-android/tests/output.txt
diff --git a/jni/commoncpp2-1.8.1-android/tests/tcpstr1.cpp b/jni/commoncpp2-android/tests/tcpstr1.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/tcpstr1.cpp
rename to jni/commoncpp2-android/tests/tcpstr1.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/test.sh b/jni/commoncpp2-android/tests/test.sh
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/test.sh
rename to jni/commoncpp2-android/tests/test.sh
diff --git a/jni/commoncpp2-1.8.1-android/tests/thread1.cpp b/jni/commoncpp2-android/tests/thread1.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/thread1.cpp
rename to jni/commoncpp2-android/tests/thread1.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/thread2.cpp b/jni/commoncpp2-android/tests/thread2.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/thread2.cpp
rename to jni/commoncpp2-android/tests/thread2.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/thread3.cpp b/jni/commoncpp2-android/tests/thread3.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/thread3.cpp
rename to jni/commoncpp2-android/tests/thread3.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/url1.cpp b/jni/commoncpp2-android/tests/url1.cpp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/url1.cpp
rename to jni/commoncpp2-android/tests/url1.cpp
diff --git a/jni/commoncpp2-1.8.1-android/tests/vc6.mak b/jni/commoncpp2-android/tests/vc6.mak
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/tests/vc6.mak
rename to jni/commoncpp2-android/tests/vc6.mak
diff --git a/jni/commoncpp2-1.8.1-android/w32/Makefile b/jni/commoncpp2-android/w32/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/Makefile
rename to jni/commoncpp2-android/w32/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/w32/Makefile.am b/jni/commoncpp2-android/w32/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/Makefile.am
rename to jni/commoncpp2-android/w32/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/w32/Makefile.bcc b/jni/commoncpp2-android/w32/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/Makefile.bcc
rename to jni/commoncpp2-android/w32/Makefile.bcc
diff --git a/jni/commoncpp2-1.8.1-android/w32/Makefile.gcc b/jni/commoncpp2-android/w32/Makefile.gcc
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/Makefile.gcc
rename to jni/commoncpp2-android/w32/Makefile.gcc
diff --git a/jni/commoncpp2-1.8.1-android/w32/Makefile.in b/jni/commoncpp2-android/w32/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/Makefile.in
rename to jni/commoncpp2-android/w32/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/cc++/config.h b/jni/commoncpp2-android/w32/cc++/config.h
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/cc++/config.h
rename to jni/commoncpp2-android/w32/cc++/config.h
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccext2.dsp b/jni/commoncpp2-android/w32/ccext2.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccext2.dsp
rename to jni/commoncpp2-android/w32/ccext2.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccext2.dsp.in b/jni/commoncpp2-android/w32/ccext2.dsp.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccext2.dsp.in
rename to jni/commoncpp2-android/w32/ccext2.dsp.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccext2.vcproj b/jni/commoncpp2-android/w32/ccext2.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccext2.vcproj
rename to jni/commoncpp2-android/w32/ccext2.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccext2.vcproj.in b/jni/commoncpp2-android/w32/ccext2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccext2.vcproj.in
rename to jni/commoncpp2-android/w32/ccext2.vcproj.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccgnu2.dsp b/jni/commoncpp2-android/w32/ccgnu2.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccgnu2.dsp
rename to jni/commoncpp2-android/w32/ccgnu2.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccgnu2.dsp.in b/jni/commoncpp2-android/w32/ccgnu2.dsp.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccgnu2.dsp.in
rename to jni/commoncpp2-android/w32/ccgnu2.dsp.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccgnu2.vcproj b/jni/commoncpp2-android/w32/ccgnu2.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccgnu2.vcproj
rename to jni/commoncpp2-android/w32/ccgnu2.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/ccgnu2.vcproj.in b/jni/commoncpp2-android/w32/ccgnu2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/ccgnu2.vcproj.in
rename to jni/commoncpp2-android/w32/ccgnu2.vcproj.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/common.dsw b/jni/commoncpp2-android/w32/common.dsw
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/common.dsw
rename to jni/commoncpp2-android/w32/common.dsw
diff --git a/jni/commoncpp2-1.8.1-android/w32/common.reg b/jni/commoncpp2-android/w32/common.reg
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/common.reg
rename to jni/commoncpp2-android/w32/common.reg
diff --git a/jni/commoncpp2-1.8.1-android/w32/common.sln b/jni/commoncpp2-android/w32/common.sln
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/common.sln
rename to jni/commoncpp2-android/w32/common.sln
diff --git a/jni/commoncpp2-1.8.1-android/w32/debug.bat b/jni/commoncpp2-android/w32/debug.bat
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/debug.bat
rename to jni/commoncpp2-android/w32/debug.bat
Binary files differ
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/SampleSocketPort.dsp b/jni/commoncpp2-android/w32/demo/SampleSocketPort.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/SampleSocketPort.dsp
rename to jni/commoncpp2-android/w32/demo/SampleSocketPort.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/SampleSocketPort.vcproj b/jni/commoncpp2-android/w32/demo/SampleSocketPort.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/SampleSocketPort.vcproj
rename to jni/commoncpp2-android/w32/demo/SampleSocketPort.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/buffer.dsp b/jni/commoncpp2-android/w32/demo/buffer.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/buffer.dsp
rename to jni/commoncpp2-android/w32/demo/buffer.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/buffer.vcproj b/jni/commoncpp2-android/w32/demo/buffer.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/buffer.vcproj
rename to jni/commoncpp2-android/w32/demo/buffer.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/crc32.dsp b/jni/commoncpp2-android/w32/demo/crc32.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/crc32.dsp
rename to jni/commoncpp2-android/w32/demo/crc32.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/crc32.vcproj b/jni/commoncpp2-android/w32/demo/crc32.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/crc32.vcproj
rename to jni/commoncpp2-android/w32/demo/crc32.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/netdevices.dsp b/jni/commoncpp2-android/w32/demo/netdevices.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/netdevices.dsp
rename to jni/commoncpp2-android/w32/demo/netdevices.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/netdevices.vcproj b/jni/commoncpp2-android/w32/demo/netdevices.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/netdevices.vcproj
rename to jni/commoncpp2-android/w32/demo/netdevices.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/slogTest.dsp b/jni/commoncpp2-android/w32/demo/slogTest.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/slogTest.dsp
rename to jni/commoncpp2-android/w32/demo/slogTest.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/slogTest.vcproj b/jni/commoncpp2-android/w32/demo/slogTest.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/slogTest.vcproj
rename to jni/commoncpp2-android/w32/demo/slogTest.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcp.dsp b/jni/commoncpp2-android/w32/demo/tcp.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcp.dsp
rename to jni/commoncpp2-android/w32/demo/tcp.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcp.vcproj b/jni/commoncpp2-android/w32/demo/tcp.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcp.vcproj
rename to jni/commoncpp2-android/w32/demo/tcp.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcpservice.dsp b/jni/commoncpp2-android/w32/demo/tcpservice.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcpservice.dsp
rename to jni/commoncpp2-android/w32/demo/tcpservice.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcpservice.vcproj b/jni/commoncpp2-android/w32/demo/tcpservice.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcpservice.vcproj
rename to jni/commoncpp2-android/w32/demo/tcpservice.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcpthread.dsp b/jni/commoncpp2-android/w32/demo/tcpthread.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcpthread.dsp
rename to jni/commoncpp2-android/w32/demo/tcpthread.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/tcpthread.vcproj b/jni/commoncpp2-android/w32/demo/tcpthread.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/tcpthread.vcproj
rename to jni/commoncpp2-android/w32/demo/tcpthread.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/urlfetch.dsp b/jni/commoncpp2-android/w32/demo/urlfetch.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/urlfetch.dsp
rename to jni/commoncpp2-android/w32/demo/urlfetch.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/urlfetch.vcproj b/jni/commoncpp2-android/w32/demo/urlfetch.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/urlfetch.vcproj
rename to jni/commoncpp2-android/w32/demo/urlfetch.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/xmlfetch.dsp b/jni/commoncpp2-android/w32/demo/xmlfetch.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/xmlfetch.dsp
rename to jni/commoncpp2-android/w32/demo/xmlfetch.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/demo/xmlfetch.vcproj b/jni/commoncpp2-android/w32/demo/xmlfetch.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/demo/xmlfetch.vcproj
rename to jni/commoncpp2-android/w32/demo/xmlfetch.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/bug1.dsp b/jni/commoncpp2-android/w32/tests/bug1.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/bug1.dsp
rename to jni/commoncpp2-android/w32/tests/bug1.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/bug2.dsp b/jni/commoncpp2-android/w32/tests/bug2.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/bug2.dsp
rename to jni/commoncpp2-android/w32/tests/bug2.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/ccxx_testsuite.dsp b/jni/commoncpp2-android/w32/tests/ccxx_testsuite.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/ccxx_testsuite.dsp
rename to jni/commoncpp2-android/w32/tests/ccxx_testsuite.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/digest.dsp b/jni/commoncpp2-android/w32/tests/digest.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/digest.dsp
rename to jni/commoncpp2-android/w32/tests/digest.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/tcpstr1.dsp b/jni/commoncpp2-android/w32/tests/tcpstr1.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/tcpstr1.dsp
rename to jni/commoncpp2-android/w32/tests/tcpstr1.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/thread1.dsp b/jni/commoncpp2-android/w32/tests/thread1.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/thread1.dsp
rename to jni/commoncpp2-android/w32/tests/thread1.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/thread2.dsp b/jni/commoncpp2-android/w32/tests/thread2.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/thread2.dsp
rename to jni/commoncpp2-android/w32/tests/thread2.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/tests/url1.dsp b/jni/commoncpp2-android/w32/tests/url1.dsp
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/tests/url1.dsp
rename to jni/commoncpp2-android/w32/tests/url1.dsp
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile b/jni/commoncpp2-android/w32/vs2008/Makefile
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile
rename to jni/commoncpp2-android/w32/vs2008/Makefile
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile.am b/jni/commoncpp2-android/w32/vs2008/Makefile.am
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile.am
rename to jni/commoncpp2-android/w32/vs2008/Makefile.am
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile.in b/jni/commoncpp2-android/w32/vs2008/Makefile.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/Makefile.in
rename to jni/commoncpp2-android/w32/vs2008/Makefile.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/ccext2.vcproj b/jni/commoncpp2-android/w32/vs2008/ccext2.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/ccext2.vcproj
rename to jni/commoncpp2-android/w32/vs2008/ccext2.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/ccext2.vcproj.in b/jni/commoncpp2-android/w32/vs2008/ccext2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/ccext2.vcproj.in
rename to jni/commoncpp2-android/w32/vs2008/ccext2.vcproj.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/ccgnu2.vcproj b/jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/ccgnu2.vcproj
rename to jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/ccgnu2.vcproj.in b/jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/ccgnu2.vcproj.in
rename to jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj.in
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/common.sln b/jni/commoncpp2-android/w32/vs2008/common.sln
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/common.sln
rename to jni/commoncpp2-android/w32/vs2008/common.sln
Binary files differ
diff --git a/jni/commoncpp2-1.8.1-android/w32/vs2008/common.sln.in b/jni/commoncpp2-android/w32/vs2008/common.sln.in
similarity index 100%
rename from jni/commoncpp2-1.8.1-android/w32/vs2008/common.sln.in
rename to jni/commoncpp2-android/w32/vs2008/common.sln.in
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/COPYRIGHT b/jni/libgsm/COPYRIGHT
similarity index 100%
copy from jni/libsndfile-1.0.25/src/GSM610/COPYRIGHT
copy to jni/libgsm/COPYRIGHT
diff --git a/jni/libgsm/ChangeLog b/jni/libgsm/ChangeLog
new file mode 100644
index 0000000..4cf467d
--- /dev/null
+++ b/jni/libgsm/ChangeLog
@@ -0,0 +1,80 @@
+
+Fri Jul 5 19:26:37 1996 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 10
+ src/toast_alaw.c: exchanged A-law tables for something
+ slightly more A-law.
+
+Tue Jul 2 12:18:20 1996 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 9
+ src/long_term.c: in FLOAT_MUL mode, an array was accessed past its end
+ src/gsm_option.c: three options related to WAV #49 packing
+ src/gsm_encode.c: support WAV #49-style encoding.
+ src/gsm_decode.c: support WAV #49-style decoding.
+ tls/sour.c: generate the WAV bit shifting code, encode
+ tls/ginger.c: generate the WAV bit shifting code, decode
+ The WAV code goes back to an inofficial patch #8 that
+ Jeff Chilton sent us (hence the jump from 7 to 9).
+ src/toast.c: add _fsetmode() calls to set stdin/stdout to
+ binary (from an OS/2 port by Arnd Gronenberg.)
+
+Tue Mar 7 01:55:10 1995 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 7
+ src/long_term.c: Yet another 16-bit overflow
+ src/toast.c: -C option to toast, cuts LPC time
+ src/gsm_option.c: corresponding LPC_CUT option to GSM library
+
+Fri Dec 30 23:33:50 1994 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 6
+ src/lpc.c: fixed 16-bit addition overflow in Autocorrelation code
+ src/add.c: gsm_L_asl should fall back on gsm_L_asr, not gsm_asr
+
+Mon Nov 28 20:49:57 1994 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 5
+ src/toast_audio.c: initialization should return -1 on error
+ src/gsm_destroy.c: #include configuration header file
+ src/add.c: gsm_sub should cast its parameters to longword
+ man/*: bug reports to {jutta,cabo}@cs.tu-berlin.de, not to toast@tub
+ inc/private.h: longword long by default, not int
+ inc/toast.h: read/write fopen modes "rb" and "wb", not just "r"
+ src/toast.c: better (or different, anyway) error handling in process()
+
+Tue May 10 19:41:34 1994 Jutta Degener (jutta at kugelbus)
+
+ * Release 1.0 Patchlevel 4
+ inc/private.h: GSM_ADD should cast to ulongword, not to unsigned.
+ src/long_term.c: missing cast to longword.
+ add-test/add_test.c: Test macros too, not only functions,
+ thanks to Simao Ferraz de Campos Neto, simao@dragon.cpqd.ansp.br
+ General cleanup: remove unused variables, add function prototypes.
+
+Tue Jan 25 22:53:40 1994 Jutta Degener (jutta at kugelbus)
+
+ * Release 1.0 Patchlevel 3
+ changed rpe.c's STEP macro to work with 16-bit integers,
+ thanks to Dr Alex Lee (alexlee@solomon.technet.sg);
+ removed non-fatal bugs from add-test.dta, private.h
+ and toast_audio.c, thanks to P. Emanuelsson.
+
+Fri Jan 29 19:02:12 1993 Jutta Degener (jutta at kraftbus)
+
+ * Release 1.0 Patchlevel 2
+ fixed L_add(0,-1) in src/add.c and inc/private.h,
+ thanks to Raphael Trommer at AT&T Bell Laboratories;
+ various other ANSI C compatibility details
+
+Fri Oct 30 17:58:54 1992 Jutta Degener (jutta at kraftbus)
+
+ * Release 1.0 Patchlevel 1
+ Switched uid/gid in toast's [f]chown calls.
+
+Wed Oct 28 14:12:35 1992 Carsten Bormann (cabo at kubus)
+
+ * Release 1.0: released
+ Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
diff --git a/jni/libgsm/ChangeLog.orig b/jni/libgsm/ChangeLog.orig
new file mode 100644
index 0000000..c2c0b44
--- /dev/null
+++ b/jni/libgsm/ChangeLog.orig
@@ -0,0 +1,73 @@
+Tue Jul 2 12:18:20 1996 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 9
+ src/long_term.c: in FLOAT_MUL mode, an array was accessed past its end
+ src/gsm_option.c: three options related to WAV #49 packing
+ src/gsm_encode.c: support WAV #49-style encoding.
+ src/gsm_decode.c: support WAV #49-style decoding.
+ tls/sour.c: generate the WAV bit shifting code, encode
+ tls/ginger.c: generate the WAV bit shifting code, decode
+ The WAV code goes back to an inofficial patch #8 that
+ Jeff Chilton sent us (hence the jump from 7 to 9).
+ src/toast.c: add _fsetmode() calls to set stdin/stdout to
+ binary (from an OS/2 port by Arnd Gronenberg.)
+
+Tue Mar 7 01:55:10 1995 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 7
+ src/long_term.c: Yet another 16-bit overflow
+ src/toast.c: -C option to toast, cuts LPC time
+ src/gsm_option.c: corresponding LPC_CUT option to GSM library
+
+Fri Dec 30 23:33:50 1994 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 6
+ src/lpc.c: fixed 16-bit addition overflow in Autocorrelation code
+ src/add.c: gsm_L_asl should fall back on gsm_L_asr, not gsm_asr
+
+Mon Nov 28 20:49:57 1994 Jutta Degener (jutta@cs.tu-berlin.de)
+
+ * Release 1.0 Patchlevel 5
+ src/toast_audio.c: initialization should return -1 on error
+ src/gsm_destroy.c: #include configuration header file
+ src/add.c: gsm_sub should cast its parameters to longword
+ man/*: bug reports to {jutta,cabo}@cs.tu-berlin.de, not to toast@tub
+ inc/private.h: longword long by default, not int
+ inc/toast.h: read/write fopen modes "rb" and "wb", not just "r"
+ src/toast.c: better (or different, anyway) error handling in process()
+
+Tue May 10 19:41:34 1994 Jutta Degener (jutta at kugelbus)
+
+ * Release 1.0 Patchlevel 4
+ inc/private.h: GSM_ADD should cast to ulongword, not to unsigned.
+ src/long_term.c: missing cast to longword.
+ add-test/add_test.c: Test macros too, not only functions,
+ thanks to Simao Ferraz de Campos Neto, simao@dragon.cpqd.ansp.br
+ General cleanup: remove unused variables, add function prototypes.
+
+Tue Jan 25 22:53:40 1994 Jutta Degener (jutta at kugelbus)
+
+ * Release 1.0 Patchlevel 3
+ changed rpe.c's STEP macro to work with 16-bit integers,
+ thanks to Dr Alex Lee (alexlee@solomon.technet.sg);
+ removed non-fatal bugs from add-test.dta, private.h
+ and toast_audio.c, thanks to P. Emanuelsson.
+
+Fri Jan 29 19:02:12 1993 Jutta Degener (jutta at kraftbus)
+
+ * Release 1.0 Patchlevel 2
+ fixed L_add(0,-1) in src/add.c and inc/private.h,
+ thanks to Raphael Trommer at AT&T Bell Laboratories;
+ various other ANSI C compatibility details
+
+Fri Oct 30 17:58:54 1992 Jutta Degener (jutta at kraftbus)
+
+ * Release 1.0 Patchlevel 1
+ Switched uid/gid in toast's [f]chown calls.
+
+Wed Oct 28 14:12:35 1992 Carsten Bormann (cabo at kubus)
+
+ * Release 1.0: released
+ Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
diff --git a/jni/libgsm/INSTALL b/jni/libgsm/INSTALL
new file mode 100644
index 0000000..5850304
--- /dev/null
+++ b/jni/libgsm/INSTALL
@@ -0,0 +1,99 @@
+How to get started:
+
+ Edit the Makefile.
+
+ You should configure a few machine-dependencies and what
+ compiler you want to use.
+
+ The code works both with ANSI and K&R-C. Use
+ -DNeedFunctionPrototypes to compile with, or
+ -UNeedFunctionPrototypes to compile without, function
+ prototypes in the header files.
+
+ Make addtst
+
+ The "add" program that will be compiled and run checks whether
+ the basic math functions of the gsm library work with your
+ compiler. If it prints anything to stderr, complain (to us).
+
+ Edit inc/config.h.
+
+ Make
+
+ Local versions of the gsm library and the "compress"-like filters
+ toast, untoast and tcat will be generated.
+
+ If the compilation aborts because of a missing function,
+ declaration, or header file, see if there's something in
+ inc/config.h to work around it. If not, complain.
+
+ Try it
+
+ Grab an audio file from somewhere (raw u-law or Sun .au is fine,
+ linear 16-bit in host byte order will do), copy it, toast it,
+ untoast it, and listen to the result.
+
+ The GSM-encoded and -decoded audio should have the quality
+ of a good phone line. If the resulting audio is noisier than
+ your original, or if you hear compression artifacts, complain;
+ that's a bug in our software, not a bug in the GSM encoding
+ standard itself.
+
+Installation
+
+ You can install the gsm library interface, or the toast binaries,
+ or both.
+
+ Edit the Makefile
+
+ Fill in the directories where you want to install the
+ library, header files, manual pages, and binaries.
+
+ Turn off the installation of one half of the distribution
+ (i.e., gsm library or toast binaries) by not setting the
+ corresponding directory root Makefile macro.
+
+ make install
+
+ will install the programs "toast" with two links named
+ "tcat" and "untoast", and the gsm library "libgsm.a" with
+ a "gsm.h" header file, and their respective manual pages.
+
+
+Optimizing
+
+ This code was developed on a machine without an integer
+ multiplication instruction, where we obtained the fastest result by
+ replacing some of the integer multiplications with floating point
+ multiplications.
+
+ If your machine does multiply integers fast enough,
+ leave USE_FLOAT_MUL undefined. The results should be the
+ same in both cases.
+
+ On machines with fast floating point arithmetic, defining
+ both USE_FLOAT_MUL and FAST makes a run-time library
+ option available that will (in a few crucial places) use
+ ``native'' floating point operations rather than the bit-by-bit
+ defined ones of the GSM standard. If you use this fast
+ option, the outcome will not be bitwise identical to the
+ results prescribed by the standard, but it is compatible with
+ the standard encoding, and a user is unlikely to notice a
+ difference.
+
+
+Bug Reports
+
+ Please direct bug reports, questions, and comments to
+ jutta@cs.tu-berlin.de and cabo@informatik.uni-bremen.de.
+
+
+Good luck,
+
+ Jutta Degener,
+ Carsten Bormann
+
+--
+Copyright 1992, 1993, 1994, by Jutta Degener and Carsten Bormann,
+Technische Universitaet Berlin. See the accompanying file "COPYRIGHT"
+for details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
diff --git a/jni/libgsm/MACHINES b/jni/libgsm/MACHINES
new file mode 100644
index 0000000..4adafd2
--- /dev/null
+++ b/jni/libgsm/MACHINES
@@ -0,0 +1,11 @@
+The gsm library has been tested successfully on the following platforms:
+
+- Various Sun4's running SunOS 4.1.2
+- SPARC1 (SunOS 4.1.1)
+- Integrated Solutions 68k Optimum running 4.3BSD UNIX with a Green Hills cc
+- NeXTstation running NeXT-OS/Mach 3.0
+- No-name AT/386 with Xenix 2.3.2 (using -DSTUPID_COMPILER)
+- RS/6000-350 running AIX 3.2.0
+- RS/6000-320 running AIX 3.1.5
+- Alliant FX80 (Concentrix 5.7)
+- SGI Indigo XS4000 (IRIX 4.0.5F)
diff --git a/jni/libgsm/MANIFEST b/jni/libgsm/MANIFEST
new file mode 100644
index 0000000..6db3b2a
--- /dev/null
+++ b/jni/libgsm/MANIFEST
@@ -0,0 +1,59 @@
+gsm-1.0/COPYRIGHT
+gsm-1.0/ChangeLog
+gsm-1.0/INSTALL
+gsm-1.0/MACHINES
+gsm-1.0/MANIFEST
+gsm-1.0/Makefile
+gsm-1.0/README
+gsm-1.0/add-test/add_test.c
+gsm-1.0/add-test/add_test.dta
+gsm-1.0/inc/gsm.h
+gsm-1.0/inc/proto.h
+gsm-1.0/inc/unproto.h
+gsm-1.0/inc/config.h
+gsm-1.0/inc/private.h
+gsm-1.0/inc/toast.h
+gsm-1.0/man/bitter.1
+gsm-1.0/man/gsm.3
+gsm-1.0/man/gsm_explode.3
+gsm-1.0/man/gsm_print.3
+gsm-1.0/man/gsm_option.3
+gsm-1.0/man/toast.1
+gsm-1.0/src/add.c
+gsm-1.0/src/code.c
+gsm-1.0/src/debug.c
+gsm-1.0/src/decode.c
+gsm-1.0/src/gsm_destroy.c
+gsm-1.0/src/gsm_decode.c
+gsm-1.0/src/gsm_encode.c
+gsm-1.0/src/gsm_explode.c
+gsm-1.0/src/gsm_implode.c
+gsm-1.0/src/gsm_create.c
+gsm-1.0/src/gsm_print.c
+gsm-1.0/src/gsm_option.c
+gsm-1.0/src/long_term.c
+gsm-1.0/src/lpc.c
+gsm-1.0/src/preprocess.c
+gsm-1.0/src/rpe.c
+gsm-1.0/src/short_term.c
+gsm-1.0/src/table.c
+gsm-1.0/src/toast.c
+gsm-1.0/src/toast_alaw.c
+gsm-1.0/src/toast_audio.c
+gsm-1.0/src/toast_lin.c
+gsm-1.0/src/toast_ulaw.c
+gsm-1.0/tls/bitter.c
+gsm-1.0/tls/bitter.dta
+gsm-1.0/tls/taste.c
+gsm-1.0/tls/taste.h
+gsm-1.0/tls/sweet.c
+gsm-1.0/tls/sour.c
+gsm-1.0/tls/sour1.dta
+gsm-1.0/tls/sour2.dta
+gsm-1.0/tls/ginger.c
+gsm-1.0/tst/cod2lin.c
+gsm-1.0/tst/cod2txt.c
+gsm-1.0/tst/gsm2cod.c
+gsm-1.0/tst/lin2cod.c
+gsm-1.0/tst/lin2txt.c
+gsm-1.0/tst/run
diff --git a/jni/libgsm/Makefile b/jni/libgsm/Makefile
new file mode 100644
index 0000000..fa613fa
--- /dev/null
+++ b/jni/libgsm/Makefile
@@ -0,0 +1,494 @@
+# Copyright 1992-1996 by Jutta Degener and Carsten Bormann, Technische
+# Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+# details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+
+# Machine- or installation dependent flags you should configure to port
+
+SASR = -DSASR
+######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
+
+MULHACK = -DUSE_FLOAT_MUL
+######### Define this if your host multiplies floats faster than integers,
+######### e.g. on a SPARCstation.
+
+FAST = -DFAST
+######### Define together with USE_FLOAT_MUL to enable the GSM library's
+######### approximation option for incorrect, but good-enough results.
+
+# LTP_CUT = -DLTP_CUT
+LTP_CUT =
+######### Define to enable the GSM library's long-term correlation
+######### approximation option---faster, but worse; works for
+######### both integer and floating point multiplications.
+######### This flag is still in the experimental stage.
+
+#WAV49 = -DWAV49
+WAV49 =
+######### Define to enable the GSM library's option to pack GSM frames
+######### in the style used by the WAV #49 format. If you want to write
+######### a tool that produces .WAV files which contain GSM-encoded data,
+######### define this, and read about the GSM_OPT_WAV49 option in the
+######### manual page on gsm_option(3).
+
+# Choose a compiler. The code works both with ANSI and K&R-C.
+# Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to
+# compile without, function prototypes in the header files.
+#
+# You can use the -DSTUPID_COMPILER to circumvent some compilers'
+# static limits regarding the number of subexpressions in a statement.
+
+# CC = cc
+# CCFLAGS = -c -DSTUPID_COMPILER
+
+# CC = /usr/lang/acc
+# CCFLAGS = -c -O
+
+CC = gcc -ansi -pedantic
+CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
+
+LD = $(CC)
+
+# LD = gcc
+# LDFLAGS =
+
+
+# If your compiler needs additional flags/libraries, regardless of
+# the source compiled, configure them here.
+
+# CCINC = -I/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1/include
+######### Includes needed by $(CC)
+
+# LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
+######### Library paths needed by $(LD)
+
+# LDLIB = -lgcc
+######### Additional libraries needed by $(LD)
+
+
+# Where do you want to install libraries, binaries, a header file
+# and the manual pages?
+#
+# Leave INSTALL_ROOT empty (or just don't execute "make install") to
+# not install gsm and toast outside of this directory.
+
+INSTALL_ROOT =
+
+# Where do you want to install the gsm library, header file, and manpages?
+#
+# Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of
+# this directory.
+
+GSM_INSTALL_ROOT = $(INSTALL_ROOT)
+GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
+
+
+# Where do you want to install the toast binaries and their manpage?
+#
+# Leave TOAST_INSTALL_ROOT empty to not install the toast binaries outside
+# of this directory.
+
+TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
+TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
+
+# Other tools
+
+SHELL = /bin/sh
+LN = ln
+BASENAME = basename
+AR = ar
+ARFLAGS = cr
+RMFLAGS =
+FIND = find
+COMPRESS = compress
+COMPRESSFLAGS =
+# RANLIB = true
+RANLIB = ranlib
+
+#
+# You shouldn't have to configure below this line if you're porting.
+#
+
+
+# Local Directories
+
+ROOT = .
+ADDTST = $(ROOT)/add-test
+TST = $(ROOT)/tst
+MAN = $(ROOT)/man
+BIN = $(ROOT)/bin
+SRC = $(ROOT)/src
+LIB = $(ROOT)/lib
+TLS = $(ROOT)/tls
+INC = $(ROOT)/inc
+
+# Flags
+
+# DEBUG = -DNDEBUG
+######### Remove -DNDEBUG to enable assertions.
+
+CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+ $(WAV49) $(CCINC) -I$(INC)
+######### It's $(CC) $(CFLAGS)
+
+LFLAGS = $(LDFLAGS) $(LDINC)
+######### It's $(LD) $(LFLAGS)
+
+
+# Targets
+
+LIBGSM = $(LIB)/libgsm.a
+
+TOAST = $(BIN)/toast
+UNTOAST = $(BIN)/untoast
+TCAT = $(BIN)/tcat
+
+# Headers
+
+GSM_HEADERS = $(INC)/gsm.h
+
+HEADERS = $(INC)/proto.h \
+ $(INC)/unproto.h \
+ $(INC)/config.h \
+ $(INC)/private.h \
+ $(INC)/gsm.h \
+ $(INC)/toast.h \
+ $(TLS)/taste.h
+
+# Sources
+
+GSM_SOURCES = $(SRC)/add.c \
+ $(SRC)/code.c \
+ $(SRC)/debug.c \
+ $(SRC)/decode.c \
+ $(SRC)/long_term.c \
+ $(SRC)/lpc.c \
+ $(SRC)/preprocess.c \
+ $(SRC)/rpe.c \
+ $(SRC)/gsm_destroy.c \
+ $(SRC)/gsm_decode.c \
+ $(SRC)/gsm_encode.c \
+ $(SRC)/gsm_explode.c \
+ $(SRC)/gsm_implode.c \
+ $(SRC)/gsm_create.c \
+ $(SRC)/gsm_print.c \
+ $(SRC)/gsm_option.c \
+ $(SRC)/short_term.c \
+ $(SRC)/table.c
+
+TOAST_SOURCES = $(SRC)/toast.c \
+ $(SRC)/toast_lin.c \
+ $(SRC)/toast_ulaw.c \
+ $(SRC)/toast_alaw.c \
+ $(SRC)/toast_audio.c
+
+SOURCES = $(GSM_SOURCES) \
+ $(TOAST_SOURCES) \
+ $(ADDTST)/add_test.c \
+ $(TLS)/sour.c \
+ $(TLS)/ginger.c \
+ $(TLS)/sour1.dta \
+ $(TLS)/sour2.dta \
+ $(TLS)/bitter.c \
+ $(TLS)/bitter.dta \
+ $(TLS)/taste.c \
+ $(TLS)/sweet.c \
+ $(TST)/cod2lin.c \
+ $(TST)/cod2txt.c \
+ $(TST)/gsm2cod.c \
+ $(TST)/lin2cod.c \
+ $(TST)/lin2txt.c
+
+# Object files
+
+GSM_OBJECTS = $(SRC)/add.o \
+ $(SRC)/code.o \
+ $(SRC)/debug.o \
+ $(SRC)/decode.o \
+ $(SRC)/long_term.o \
+ $(SRC)/lpc.o \
+ $(SRC)/preprocess.o \
+ $(SRC)/rpe.o \
+ $(SRC)/gsm_destroy.o \
+ $(SRC)/gsm_decode.o \
+ $(SRC)/gsm_encode.o \
+ $(SRC)/gsm_explode.o \
+ $(SRC)/gsm_implode.o \
+ $(SRC)/gsm_create.o \
+ $(SRC)/gsm_print.o \
+ $(SRC)/gsm_option.o \
+ $(SRC)/short_term.o \
+ $(SRC)/table.o
+
+TOAST_OBJECTS = $(SRC)/toast.o \
+ $(SRC)/toast_lin.o \
+ $(SRC)/toast_ulaw.o \
+ $(SRC)/toast_alaw.o \
+ $(SRC)/toast_audio.o
+
+OBJECTS = $(GSM_OBJECTS) $(TOAST_OBJECTS)
+
+# Manuals
+
+GSM_MANUALS = $(MAN)/gsm.3 \
+ $(MAN)/gsm_explode.3 \
+ $(MAN)/gsm_option.3 \
+ $(MAN)/gsm_print.3
+
+TOAST_MANUALS = $(MAN)/toast.1
+
+MANUALS = $(GSM_MANUALS) $(TOAST_MANUALS) $(MAN)/bitter.1
+
+# Other stuff in the distribution
+
+STUFF = ChangeLog \
+ INSTALL \
+ MACHINES \
+ MANIFEST \
+ Makefile \
+ README \
+ $(ADDTST)/add_test.dta \
+ $(TLS)/bitter.dta \
+ $(TST)/run
+
+
+# Install targets
+
+GSM_INSTALL_TARGETS = \
+ $(GSM_INSTALL_LIB)/libgsm.a \
+ $(GSM_INSTALL_INC)/gsm.h \
+ $(GSM_INSTALL_MAN)/gsm.3 \
+ $(GSM_INSTALL_MAN)/gsm_explode.3 \
+ $(GSM_INSTALL_MAN)/gsm_option.3 \
+ $(GSM_INSTALL_MAN)/gsm_print.3
+
+TOAST_INSTALL_TARGETS = \
+ $(TOAST_INSTALL_BIN)/toast \
+ $(TOAST_INSTALL_BIN)/tcat \
+ $(TOAST_INSTALL_BIN)/untoast \
+ $(TOAST_INSTALL_MAN)/toast.1
+
+
+# Default rules
+
+.c.o:
+ $(CC) $(CFLAGS) $?
+ @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+
+# Target rules
+
+all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
+ @-echo $(ROOT): Done.
+
+tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+ @-echo tst: Done.
+
+addtst: $(ADDTST)/add $(ADDTST)/add_test.dta
+ $(ADDTST)/add < $(ADDTST)/add_test.dta > /dev/null
+ @-echo addtst: Done.
+
+misc: $(TLS)/sweet $(TLS)/bitter $(TLS)/sour $(TLS)/ginger \
+ $(TST)/lin2txt $(TST)/cod2txt $(TST)/gsm2cod
+ @-echo misc: Done.
+
+install: toastinstall gsminstall
+ @-echo install: Done.
+
+
+# The basic API: libgsm
+
+$(LIBGSM): $(LIB) $(GSM_OBJECTS)
+ -rm $(RMFLAGS) $(LIBGSM)
+ $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ $(RANLIB) $(LIBGSM)
+
+
+# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+
+$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
+
+$(UNTOAST): $(BIN) $(TOAST)
+ -rm $(RMFLAGS) $(UNTOAST)
+ $(LN) $(TOAST) $(UNTOAST)
+
+$(TCAT): $(BIN) $(TOAST)
+ -rm $(RMFLAGS) $(TCAT)
+ $(LN) $(TOAST) $(TCAT)
+
+
+# The local bin and lib directories
+
+$(BIN):
+ if [ ! -d $(BIN) ] ; then mkdir $(BIN) ; fi
+
+$(LIB):
+ if [ ! -d $(LIB) ] ; then mkdir $(LIB) ; fi
+
+
+# Installation
+
+gsminstall:
+ -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
+ make $(GSM_INSTALL_TARGETS) ; \
+ fi
+
+toastinstall:
+ -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
+ make $(TOAST_INSTALL_TARGETS); \
+ fi
+
+gsmuninstall:
+ -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
+ rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \
+ fi
+
+toastuninstall:
+ -if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then \
+ rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \
+ fi
+
+$(TOAST_INSTALL_BIN)/toast: $(TOAST)
+ -rm $@
+ cp $(TOAST) $@
+ chmod 755 $@
+
+$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
+ -rm $@
+ ln $? $@
+
+$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
+ -rm $@
+ ln $? $@
+
+$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+ -rm $@
+ cp $? $@
+ chmod 444 $@
+
+
+# Distribution
+
+dist: gsm-1.0.tar.Z
+ @echo dist: Done.
+
+gsm-1.0.tar.Z: $(STUFF) $(SOURCES) $(HEADERS) $(MANUALS)
+ ( cd $(ROOT)/..; \
+ tar cvf - `cat $(ROOT)/gsm-1.0/MANIFEST \
+ | sed '/^#/d'` \
+ ) | $(COMPRESS) $(COMPRESSFLAGS) > $(ROOT)/gsm-1.0.tar.Z
+
+# Clean
+
+uninstall: toastuninstall gsmuninstall
+ @-echo uninstall: Done.
+
+semi-clean:
+ -rm $(RMFLAGS) */*.o \
+ $(TST)/lin2cod $(TST)/lin2txt \
+ $(TST)/cod2lin $(TST)/cod2txt \
+ $(TST)/gsm2cod \
+ $(TST)/*.*.*
+ -$(FIND) . \( -name core -o -name foo \) \
+ -print | xargs rm $(RMFLAGS)
+
+clean: semi-clean
+ -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
+ $(TOAST) $(TCAT) $(UNTOAST) \
+ $(ROOT)/gsm-1.0.tar.Z
+
+
+# Two tools that helped me generate gsm_encode.c and gsm_decode.c,
+# but aren't generally needed to port this.
+
+$(TLS)/sweet: $(TLS)/sweet.o $(TLS)/taste.o
+ $(LD) $(LFLAGS) -o $(TLS)/sweet \
+ $(TLS)/sweet.o $(TLS)/taste.o $(LDLIB)
+
+$(TLS)/bitter: $(TLS)/bitter.o $(TLS)/taste.o
+ $(LD) $(LFLAGS) -o $(TLS)/bitter \
+ $(TLS)/bitter.o $(TLS)/taste.o $(LDLIB)
+
+# A version of the same family that Jeff Chilton used to implement
+# the WAV #49 GSM format.
+
+$(TLS)/ginger: $(TLS)/ginger.o $(TLS)/taste.o
+ $(LD) $(LFLAGS) -o $(TLS)/ginger \
+ $(TLS)/ginger.o $(TLS)/taste.o $(LDLIB)
+
+$(TLS)/sour: $(TLS)/sour.o $(TLS)/taste.o
+ $(LD) $(LFLAGS) -o $(TLS)/sour \
+ $(TLS)/sour.o $(TLS)/taste.o $(LDLIB)
+
+# Run $(ADDTST)/add < $(ADDTST)/add_test.dta to make sure the
+# basic arithmetic functions work as intended.
+
+$(ADDTST)/add: $(ADDTST)/add_test.o
+ $(LD) $(LFLAGS) -o $(ADDTST)/add $(ADDTST)/add_test.o $(LDLIB)
+
+
+# Various conversion programs between linear, text, .gsm and the code
+# format used by the tests we ran (.cod). We paid for the test data,
+# so I guess we can't just provide them with this package. Still,
+# if you happen to have them lying around, here's the code.
+#
+# You can use gsm2cod | cod2txt independently to look at what's
+# coded inside the compressed frames, although this shouldn't be
+# hard to roll on your own using the gsm_print() function from
+# the API.
+
+
+$(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
+ ( cd $(TST); ./run )
+
+$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TST)/lin2txt \
+ $(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
+
+$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TST)/lin2cod \
+ $(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
+
+$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TST)/gsm2cod \
+ $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
+
+$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TST)/cod2txt \
+ $(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
+
+$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TST)/cod2lin \
+ $(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
diff --git a/jni/libgsm/README b/jni/libgsm/README
new file mode 100644
index 0000000..cb6af85
--- /dev/null
+++ b/jni/libgsm/README
@@ -0,0 +1,37 @@
+
+GSM 06.10 13 kbit/s RPE/LTP speech compression available
+--------------------------------------------------------
+
+The Communications and Operating Systems Research Group (KBS) at the
+Technische Universitaet Berlin is currently working on a set of
+UNIX-based tools for computer-mediated telecooperation that will be
+made freely available.
+
+As part of this effort we are publishing an implementation of the
+European GSM 06.10 provisional standard for full-rate speech
+transcoding, prI-ETS 300 036, which uses RPE/LTP (residual pulse
+excitation/long term prediction) coding at 13 kbit/s.
+
+GSM 06.10 compresses frames of 160 13-bit samples (8 kHz sampling
+rate, i.e. a frame rate of 50 Hz) into 260 bits; for compatibility
+with typical UNIX applications, our implementation turns frames of 160
+16-bit linear samples into 33-byte frames (1650 Bytes/s).
+The quality of the algorithm is good enough for reliable speaker
+recognition; even music often survives transcoding in recognizable
+form (given the bandwidth limitations of 8 kHz sampling rate).
+
+The interfaces offered are a front end modelled after compress(1), and
+a library API. Compression and decompression run faster than realtime
+on most SPARCstations. The implementation has been verified against the
+ETSI standard test patterns.
+
+Jutta Degener (jutta@cs.tu-berlin.de)
+Carsten Bormann (cabo@cs.tu-berlin.de)
+
+Communications and Operating Systems Research Group, TU Berlin
+Fax: +49.30.31425156, Phone: +49.30.31424315
+
+--
+Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
diff --git a/jni/libgsm/add-test/add_test.c b/jni/libgsm/add-test/add_test.c
new file mode 100644
index 0000000..8e832df
--- /dev/null
+++ b/jni/libgsm/add-test/add_test.c
@@ -0,0 +1,353 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/add_test.c,v 1.2 1994/05/10 20:18:17 jutta Exp $ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "gsm.h"
+
+#include "../src/add.c"
+
+int interactive = 1;
+
+char * opname;
+longword L_op1, L_op2, L_expect;
+word op1, op2, expect;
+int do_expect;
+
+word M_gsm_add P((word op1, word op2));
+word M_gsm_sub P((word op1, word op2));
+word M_gsm_mult P((word op1, word op2));
+word M_gsm_mult_r P((word op1, word op2));
+word M_gsm_abs P((word op1));
+longword M_gsm_L_mult P((word op1, word op2));
+longword M_gsm_L_add P((longword op1, longword op2));
+
+help()
+{
+puts( " add a b sub a b mult a b div a b" );
+puts( "L_add A B L_sub A B L_mult A B mult_r a b" );
+puts( "" );
+puts( "abs a norm a >> a b << a b" );
+puts( " L_>> A B L_<< A B" );
+
+}
+
+char * strtek P2((str, sep), char * str, char * sep) {
+
+ static char * S = (char *)0;
+ char * c, * base;
+
+ if (str) S = str;
+
+ if (!S || !*S) return (char *)0;
+
+ /* Skip delimiters.
+ */
+ while (*S) {
+ for (c = sep; *c && *c != *S; c++) ;
+ if (*c) *S++ = 0;
+ else break;
+ }
+
+ base = S;
+
+ /* Skip non-delimiters.
+ */
+ for (base = S; *S; S++) {
+
+ for (c = sep; *c; c++)
+ if (*c == *S) {
+ *S++ = 0;
+ return base;
+ }
+ }
+
+ return base == S ? (char *)0 : base;
+}
+
+long value P1((s), char * s)
+{
+ switch (*s) {
+ case '-': switch (s[1]) {
+ case '\0': return MIN_WORD;
+ case '-': return MIN_LONGWORD;
+ default: break;
+ }
+ break;
+
+ case '+': switch (s[1]) {
+ case '\0': return MAX_WORD;
+ case '+': return MAX_LONGWORD;
+ default: break;
+ }
+ default: break;
+ }
+
+ return strtol(s, (char **)0, 0);
+}
+
+char * parse P1((buf), char * buf)
+{
+ char * s, * a;
+ long l;
+
+ if (a = strchr(buf, '=')) *a++ = 0;
+
+ opname = s = strtek(buf, " \t(");
+ if (!s) return (char *)0;
+
+ op1 = op2 = L_op1 = L_op2 = 0;
+
+ if (s = strtek( (char *)0, "( \t,")) {
+ op1 = L_op1 = value(s);
+ if (s = strtek( (char *)0, ", \t)")) op2 = L_op2 = value(s);
+ }
+
+ if (a) {
+ do_expect = 1;
+ while (*a == ' ' || *a == '\t') a++;
+ expect = L_expect = value(a);
+ }
+
+ return opname;
+}
+
+void fprint_word P2((f, w), FILE * f, word w)
+{
+ if (!w) putc('0', f);
+ else fprintf(f, "0x%4.4x (%d%s)",
+ (unsigned int)w,
+ (int)w,
+ w == MIN_WORD? "/-" : (w == MAX_WORD ? "/+" : ""));
+}
+
+void print_word P1((w), word w)
+{
+ fprint_word( stdout, w );
+}
+
+void fprint_longword P2((f, w), FILE * f, longword w)
+{
+ if (!w) putc('0', f);
+ else fprintf(f, "0x%8.8x (%ld%s)",
+ w, w, w == MIN_WORD ? "/-"
+ : (w == MAX_WORD ? "/+"
+ : (w == MIN_LONGWORD ? "/--"
+ : (w == MAX_LONGWORD ? "/++" : ""))));
+}
+
+void print_longword P1((w),longword w)
+{
+ fprint_longword(stdout, w);
+}
+
+void do_longword P1((w), longword w)
+{
+ if (interactive) print_longword(w);
+ if (do_expect) {
+ if (w != L_expect) {
+ if (!interactive) fprint_longword(stderr, w);
+ fprintf(stderr, " != %s (%ld, %ld) -- expected ",
+ opname, L_op1, L_op2 );
+ fprint_longword(stderr, L_expect);
+ putc( '\n', stderr );
+ }
+ } else if (interactive) putchar('\n');
+}
+
+void do_word P1((w), word w )
+{
+ if (interactive) print_word(w);
+ if (do_expect) {
+ if (w != expect) {
+ if (!interactive) fprint_word(stderr, w);
+ fprintf(stderr, " != %s (%ld, %ld) -- expected ",
+ opname, L_op1, L_op2 );
+ fprint_word(stderr, expect);
+ putc('\n', stderr);
+ }
+ } else if (interactive) putchar('\n');
+}
+
+int main(ac, av) char ** av;
+{
+ char buf[299];
+ char * c;
+ FILE * in;
+
+ if (ac > 2) {
+ fprintf(stderr, "Usage: %s [filename]\n", av[0]);
+fail:
+#ifdef EXIT_FAILURE
+ exit(EXIT_FAILURE);
+#else
+ exit(1);
+#endif
+ }
+ if (ac < 2) in = stdin;
+ else if (!(in = fopen(av[1], "r"))) {
+ perror(av[1]);
+ fprintf(stderr, "%s: cannot open file \"%s\" for reading\n",
+ av[0], av[1]);
+ goto fail;
+ }
+
+ interactive = isatty(fileno(in));
+
+ for (;;) {
+ if (interactive) fprintf(stderr, "? ");
+
+ if (!fgets(buf, sizeof(buf), in)) exit(0);
+ if (c = strchr(buf, '\n')) *c = 0;
+
+ if (*buf == ';' || *buf == '#') continue;
+ if (*buf == '\'') {
+ puts(buf + 1);
+ continue;
+ }
+ if (*buf == '\"') {
+ fprintf(stderr, "%s\n", buf + 1);
+ continue;
+ }
+
+ c = parse(buf);
+
+ if (!c) continue;
+ if (!strcmp(c, "add")) {
+ do_word( gsm_add( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "M_add")) {
+ do_word( M_gsm_add( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "sub")) {
+ do_word( gsm_sub( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "M_sub")) {
+ do_word( M_gsm_sub( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "mult")) {
+ do_word( gsm_mult( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "M_mult")) {
+ do_word( M_gsm_mult( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "mult_r")) {
+ do_word( gsm_mult_r(op1, op2));
+ continue;
+ }
+ if (!strcmp(c, "M_mult_r")) {
+ do_word( M_gsm_mult_r(op1, op2));
+ continue;
+ }
+ if (!strcmp(c, "abs" )) {
+ do_word( gsm_abs(op1) );
+ continue;
+ }
+ if (!strcmp(c, "M_abs" )) {
+ do_word( M_gsm_abs(op1) );
+ continue;
+ }
+ if (!strcmp(c, "div" )) {
+ do_word( gsm_div( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "norm" )) {
+ do_word( gsm_norm(L_op1));
+ continue;
+ }
+ if (!strcmp(c, "<<" )) {
+ do_word( gsm_asl( op1, op2));
+ continue;
+ }
+ if (!strcmp(c, ">>" )) {
+ do_word( gsm_asr( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "L_mult")) {
+ do_longword( gsm_L_mult( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "M_L_mult")) {
+ do_longword( M_gsm_L_mult( op1, op2 ));
+ continue;
+ }
+ if (!strcmp(c, "L_add" )) {
+ do_longword( gsm_L_add( L_op1, L_op2 ));
+ continue;
+ }
+ if (!strcmp(c, "M_L_add" )) {
+ do_longword( M_gsm_L_add( L_op1, L_op2 ));
+ continue;
+ }
+ if (!strcmp(c, "L_sub" )) {
+ do_longword( gsm_L_sub( L_op1, L_op2 ));
+ continue;
+ }
+ if (!strcmp(c, "L_<<" )) {
+ do_longword( gsm_L_asl( L_op1, L_op2 ));
+ continue;
+ }
+ if (!strcmp(c, "L_>>")) {
+ do_longword( gsm_L_asr( L_op1, L_op2 ));
+ continue;
+ }
+ help();
+ }
+}
+
+#include "private.h"
+
+/*
+ * Function stubs for macro implementations of commonly used
+ * math functions
+ */
+word M_gsm_add P2((op1, op2),word op1, word op2)
+{
+ longword ltmp;
+ return GSM_ADD(op1, op2);
+}
+
+word M_gsm_sub P2((op1, op2), word op1, word op2)
+{
+ longword ltmp;
+ return GSM_SUB(op1, op2);
+}
+
+word M_gsm_mult P2((op1, op2), word op1, word op2)
+{
+ return GSM_MULT(op1, op2);
+}
+
+word M_gsm_mult_r P2((op1, op2), word op1, word op2)
+{
+ return GSM_MULT_R(op1, op2);
+}
+
+word M_gsm_abs P1((op1), word op1)
+{
+ return GSM_ABS(op1);
+}
+
+longword M_gsm_L_mult P2((op1, op2), word op1, word op2)
+{
+ return GSM_L_MULT(op1, op2);
+}
+
+longword M_gsm_L_add P2((op1, op2), longword op1, longword op2)
+{
+ ulongword utmp;
+ return GSM_L_ADD(op1, op2);
+}
diff --git a/jni/libgsm/add-test/add_test.dta b/jni/libgsm/add-test/add_test.dta
new file mode 100644
index 0000000..fe7402d
--- /dev/null
+++ b/jni/libgsm/add-test/add_test.dta
@@ -0,0 +1,683 @@
+;
+; Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+; Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+; details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+;
+;
+; Lines starting with ' (in the first col) are echoed.
+; Lines starting with " (in the first col) are echoed to stderr.
+; Lines starting with ; or empty lines are ignored.
+;
+; The part after (including) a trailing '=' is what you expect;
+; there will be output if the result is different.
+;
+; - and + by itself mean MIN_WORD and MAX_WORD, respectively;
+; -- and ++ mean MIN_LONGWORD and MAX_LONGWORD.
+;
+
+'test the basic arithmetic operations used for the rpe-ltd filtering.
+'
+'add ================
+' basic
+
+ add 0 0 = 0
+ add 7 4 = 11
+ add 4 6 = 10
+ add 1 1 = 2
+
+' negative operands
+
+ add -7 4 = -3
+ add 4 -6 = -2
+ add -1 -3 = -4
+ add 7 -4 = 3
+ add -4 6 = 2
+
+' positive overflow
+; (max-word = 32767)
+ add + 1 = +
+ add + + = +
+ add -1 + = 32766
+ add 32766 2 = +
+ add 1 32766 = +
+
+' underflow
+; (min-word = 32768)
+
+ add - -1 = -
+ add - - = -
+ add 1 - = -32767
+ add -32767 -2 = -
+ add -1 -32766 = -32767
+ add -32767 -1 = -
+ add - + = -1
+ add + - = -1
+ add 0 - = -
+ add 0 + = +
+'
+
+'L_add ================
+' basic
+
+ L_add 0 0 = 0
+ L_add 7 4 = 11
+ L_add 4 6 = 10
+ L_add 1 1 = 2
+
+' negative operands
+
+ L_add -7 4 = -3
+ L_add 4 -6 = -2
+ L_add -1 -3 = -4
+ L_add 7 -4 = 3
+ L_add -4 6 = 2
+ L_add 0 -1 = -1
+
+' positive overflow
+; (max-longword = 2147483647)
+ L_add ++ 1 = ++
+ L_add ++ ++ = ++
+ L_add -1 ++ = 2147483646
+ L_add 2147483646 2 = ++
+ L_add 1 2147483645 = 2147483646
+
+' underflow
+; (min-longword = -2147483648)
+
+ L_add -- -1 = --
+ L_add -- -- = --
+ L_add 1 -- = -2147483647
+ L_add -2147483647 -2 = --
+ L_add -1 -2147483646 = -2147483647
+ L_add -2147483647 -1 = --
+ L_add -- ++ = -1
+ L_add ++ -- = -1
+ L_add 0 -- = --
+ L_add 0 ++ = ++
+'
+
+'sub ================
+' basic
+
+ sub 0 0 = 0
+ sub 7 4 = 3
+ sub 4 6 = -2
+ sub 1 0 = 1
+
+' negative operands
+
+ sub -7 4 = -11
+ sub 4 -6 = 10
+ sub -1 -3 = 2
+ sub 7 -4 = 11
+ sub -4 6 = -10
+
+' positive overflow
+; (max-word = 32767)
+ sub 1 - = +
+ sub + + = 0
+ sub + 0 = +
+ sub + -1 = +
+ sub + 1 = 32766
+ sub 1 + = -32766
+ sub 0 + = -32767
+
+' underflow
+; (min-word = 32768)
+
+ sub - -1 = -32767
+ sub - 1 = -
+ sub - - = 0
+ sub - + = -
+ sub + - = +
+ sub 1 - = +
+ sub -1 - = +
+ sub -32767 2 = -
+ sub 0 - = +
+'
+
+'L_sub ================
+' basic
+
+ L_sub 0 0 = 0
+ L_sub 7 4 = 3
+ L_sub 4 6 = -2
+ L_sub 1 0 = 1
+
+' negative operands
+
+ L_sub -7 4 = -11
+ L_sub 4 -6 = 10
+ L_sub -1 -3 = 2
+ L_sub 7 -4 = 11
+ L_sub -4 6 = -10
+
+' positive overflow
+ L_sub 1 -- = ++
+ L_sub ++ ++ = 0
+ L_sub ++ 0 = ++
+ L_sub ++ -1 = ++
+ L_sub ++ 1 = 2147483646
+ L_sub 1 ++ = -2147483646
+ L_sub 0 ++ = -2147483647
+
+' underflow
+
+ L_sub -- -1 = -2147483647
+ L_sub -- 1 = --
+ L_sub -- -- = 0
+ L_sub -- ++ = --
+ L_sub + -- = ++
+ L_sub 1 -- = ++
+ L_sub -1 -- = ++
+ L_sub -2147483647 2 = --
+ L_sub 0 -- = ++
+
+'
+'abs ================
+' basic
+
+ abs 0 = 0
+ abs 2 = 2
+ abs -459 = 459
+
+' overflow
+
+ abs + = +
+ abs - = +
+ abs -32767 = +
+ abs 32766 = 32766
+ abs -32766 = 32766
+
+'
+'mult ================
+; actually, a * b >> 15
+
+' basic
+ mult 0 0 = 0
+ mult 0x100 0x100 = 2
+ mult 4711 0x4000 = 2355
+
+' negative operands
+ mult -1 0 = 0
+
+ mult -0x100 0x100 = -2
+ mult 0x100 -0x100 = -2
+ mult -0x100 -0x100 = 2
+
+ mult -4711 0x4000 = -2356
+ mult 4711 -0x4000 = -2356
+ mult -4711 -0x4000 = 2355
+
+' overflow
+ mult + + = 32766
+ mult + 0x4000 = 0x3fff
+ mult 0x4000 + = 0x3fff
+ mult + 1 = 0
+ mult + 2 = 1
+ mult + 3 = 2
+
+' underflow
+ mult - - = +
+ mult - + = -32767
+ mult + - = -32767
+ mult - 1 = -1
+ mult - 2 = -2
+ mult - 3 = -3
+
+'
+'mult_r ================
+; actually, (a * b + 16384) >> 15
+
+' basic
+ mult_r 0 0 = 0
+ mult_r 0x100 0x100 = 2
+ mult_r 4711 0x4000 = 2356
+
+' negative operands
+ mult_r -1 0 = 0
+
+ mult_r -0x100 0x100 = -2
+ mult_r 0x100 -0x100 = -2
+ mult_r -0x100 -0x100 = 2
+
+ mult_r -4711 0x4000 = -2355
+ mult_r 4711 -0x4000 = -2355
+ mult_r -4711 -0x4000 = 2356
+
+' overflow
+ mult_r + + = 32766
+ mult_r + 32766 = 32765
+ mult_r 32766 + = 32765
+ mult_r + 0x4000 = 0x4000
+ mult_r 0x4000 + = 0x4000
+ mult_r + 0x4001 = 0x4000
+ mult_r 0x4001 + = 0x4000
+ mult_r + 2 = 2
+ mult_r + 1 = 1
+ mult_r 1 + = 1
+ mult_r + 0 = 0
+ mult_r 0 + = 0
+
+' underflow
+ mult_r - - = +
+ mult_r - + = -32767
+ mult_r + - = -32767
+ mult_r - 1 = -1
+ mult_r - 2 = -2
+ mult_r - 3 = -3
+
+'
+'L_mult ================
+; actually, (a * b) << 1
+; assert (a != MIN_WORD && b != MIN_WORD)
+
+' basic
+ L_mult 0 0 = 0
+ L_mult 2 3 = 12
+ L_mult 4711 5 = 47110
+
+' negative operands
+
+ L_mult -2 3 = -12
+ L_mult 2 -3 = -12
+ L_mult -2 -3 = 12
+ L_mult -4711 5 = -47110
+ L_mult 4711 -5 = -47110
+ L_mult -4711 -5 = 47110
+
+' overflow
+ L_mult + + = 2147352578
+ L_mult + -32767 = -2147352578
+ L_mult -32767 + = -2147352578
+ L_mult + 2 = 131068
+ L_mult + 1 = 65534
+ L_mult 1 + = 65534
+ L_mult + 0 = 0
+ L_mult 0 + = 0
+
+'
+'div ================
+; actually, (32767 * a) / b
+; assert (a > 0 && b >= a)
+
+' basic
+ div 1 1 = +
+ div 4711 4711 = +
+ div 5 10 = 0x4000
+ div 5 20 = 0x2000
+ div 5 40 = 0x1000
+
+' overflow
+ div + + = +
+ div 0x4000 + = 0x4000
+ div 1 + = 1
+ div 1 2 = 0x4000
+'
+'norm ================
+
+' positive
+ norm 1 = 30
+ norm 2 = 29
+ norm 3 = 29
+ norm 4 = 28
+ norm 5 = 28
+; etc, etc...
+ norm 0x08000000 = 3
+ norm 0x10000000 = 2
+ norm 0x20000000 = 1
+ norm 0x20000001 = 1
+ norm 0x3fffffff = 1
+ norm 0x40000000 = 0
+ norm 0x40000001 = 0
+ norm 0x4ffffffe = 0
+ norm ++ = 0
+
+' negative
+ norm -1 = 31
+ norm -2 = 30
+ norm -3 = 29
+ norm -4 = 29
+ norm -5 = 28
+; etc, etc...
+ norm 0x4fffffff = 0
+ norm -- = 0
+'
+'>> ================
+
+' basic
+ >> 1 1 = 0
+ >> 4 2 = 1
+ >> 0x1100 5 = 0x88
+
+' negative operand
+
+ >> 1 -1 = 2
+ >> 1 -2 = 4
+ >> 0x88 -5 = 0x1100
+
+' overflow
+ >> -1 4711 = -1
+ >> 1 4711 = 0
+ >> -4711 4711 = -1
+ >> 4711 4711 = 0
+ >> + 1 = 16383
+ >> - 1 = -16384
+'
+'L_>> ================
+
+' basic
+ L_>> 1 1 = 0
+ L_>> 4 2 = 1
+ L_>> 0x1100 5 = 0x88
+
+' negative operand
+
+ L_>> 1 -1 = 2
+ L_>> 1 -2 = 4
+ L_>> 0x88 -5 = 0x1100
+
+' overflow
+ L_>> -1 4711 = -1
+ L_>> 1 4711 = 0
+ L_>> -4711 4711 = -1
+ L_>> 4711 4711 = 0
+ L_>> ++ 1 = 1073741823
+ L_>> -- 1 = -1073741824
+
+'
+'<< ================
+
+' basic
+ << 1 1 = 2
+ << 4 2 = 16
+ << 0x0088 5 = 0x1100
+
+' negative operand
+
+ << 1 -1 = 0
+ << 4 -2 = 1
+ << 0x1100 -5 = 0x0088
+
+' overflow
+ << -1 4711 = 0
+ << 1 4711 = 0
+ << -4711 4711 = 0
+ << 4711 4711 = 0
+ << 4711 -4711 = 0
+ << -4711 -4711 = -1
+ << + 1 = 0xfffe
+ << -1 1 = 0xfffe
+ << - 1 = 0
+'
+'L_<< ================
+
+' basic
+ L_<< 1 1 = 2
+ L_<< 4 2 = 16
+ L_<< 0x0088 5 = 0x1100
+
+' negative operand
+
+ L_<< 1 -1 = 0
+ L_<< 4 -2 = 1
+ L_<< 0x1100 -5 = 0x0088
+
+' overflow
+ L_<< -1 4711 = 0
+ L_<< 1 4711 = 0
+ L_<< -4711 4711 = 0
+ L_<< 4711 4711 = 0
+ L_<< 4711 -4711 = 0
+ L_<< -4711 -4711 = -1
+ L_<< ++ 1 = -2
+ L_<< -1 1 = -2
+ L_<< -- 1 = 0
+
+'macros
+'
+'add ================
+' basic
+
+ M_add 0 0 = 0
+ M_add 7 4 = 11
+ M_add 4 6 = 10
+ M_add 1 1 = 2
+
+' negative operands
+
+ M_add -7 4 = -3
+ M_add 4 -6 = -2
+ M_add -1 -3 = -4
+ M_add 7 -4 = 3
+ M_add -4 6 = 2
+
+' positive overflow
+; (max-word = 32767)
+ M_add + 1 = +
+ M_add + + = +
+ M_add -1 + = 32766
+ M_add 32766 2 = +
+ M_add 1 32766 = +
+
+' underflow
+; (min-word = 32768)
+
+ M_add - -1 = -
+ M_add - - = -
+ M_add 1 - = -32767
+ M_add -32767 -2 = -
+ M_add -1 -32766 = -32767
+ M_add -32767 -1 = -
+ M_add - + = -1
+ M_add + - = -1
+ M_add 0 - = -
+ M_add 0 + = +
+'
+
+'L_add ================
+' basic
+
+ M_L_add 0 0 = 0
+ M_L_add 7 4 = 11
+ M_L_add 4 6 = 10
+ M_L_add 1 1 = 2
+
+' negative operands
+
+ M_L_add -7 4 = -3
+ M_L_add 4 -6 = -2
+ M_L_add -1 -3 = -4
+ M_L_add 7 -4 = 3
+ M_L_add -4 6 = 2
+ M_L_add 0 -1 = -1
+
+' positive overflow
+; (max-longword = 2147483647)
+ M_L_add ++ 1 = ++
+ M_L_add ++ ++ = ++
+ M_L_add -1 ++ = 2147483646
+ M_L_add 2147483646 2 = ++
+ M_L_add 1 2147483645 = 2147483646
+
+' underflow
+; (min-longword = -2147483648)
+
+ M_L_add -- -1 = --
+ M_L_add -- -- = --
+ M_L_add 1 -- = -2147483647
+ M_L_add -2147483647 -2 = --
+ M_L_add -1 -2147483646 = -2147483647
+ M_L_add -2147483647 -1 = --
+ M_L_add -- ++ = -1
+ M_L_add ++ -- = -1
+ M_L_add 0 -- = --
+ M_L_add 0 ++ = ++
+'
+
+'sub ================
+' basic
+
+ M_sub 0 0 = 0
+ M_sub 7 4 = 3
+ M_sub 4 6 = -2
+ M_sub 1 0 = 1
+
+' negative operands
+
+ M_sub -7 4 = -11
+ M_sub 4 -6 = 10
+ M_sub -1 -3 = 2
+ M_sub 7 -4 = 11
+ M_sub -4 6 = -10
+
+' positive overflow
+; (max-word = 32767)
+ M_sub 1 - = +
+ M_sub + + = 0
+ M_sub + 0 = +
+ M_sub + -1 = +
+ M_sub + 1 = 32766
+ M_sub 1 + = -32766
+ M_sub 0 + = -32767
+
+' underflow
+; (min-word = 32768)
+
+ M_sub - -1 = -32767
+ M_sub - 1 = -
+ M_sub - - = 0
+ M_sub - + = -
+ M_sub + - = +
+ M_sub 1 - = +
+ M_sub -1 - = +
+ M_sub -32767 2 = -
+ M_sub 0 - = +
+'
+'
+'abs ================
+' basic
+
+ M_abs 0 = 0
+ M_abs 2 = 2
+ M_abs -459 = 459
+
+' overflow
+
+ M_abs + = +
+ M_abs - = +
+ M_abs -32767 = +
+ M_abs 32766 = 32766
+ M_abs -32766 = 32766
+
+'
+'mult ================
+; actually, a * b >> 15
+
+' basic
+ M_mult 0 0 = 0
+ M_mult 0x100 0x100 = 2
+ M_mult 4711 0x4000 = 2355
+
+' negative operands
+ M_mult -1 0 = 0
+
+ M_mult -0x100 0x100 = -2
+ M_mult 0x100 -0x100 = -2
+ M_mult -0x100 -0x100 = 2
+
+ M_mult -4711 0x4000 = -2356
+ M_mult 4711 -0x4000 = -2356
+ M_mult -4711 -0x4000 = 2355
+
+' overflow
+ M_mult + + = 32766
+ M_mult + 0x4000 = 0x3fff
+ M_mult 0x4000 + = 0x3fff
+ M_mult + 1 = 0
+ M_mult + 2 = 1
+ M_mult + 3 = 2
+
+' underflow
+; M_mult - - = + assert !(a == b && b == MIN_WORD)
+ M_mult - -32767 = +
+ M_mult -32767 - = +
+ M_mult - + = -32767
+ M_mult + - = -32767
+ M_mult - 1 = -1
+ M_mult - 2 = -2
+ M_mult - 3 = -3
+
+'
+'mult_r ================
+; actually, (a * b + 16384) >> 15
+
+' basic
+ M_mult_r 0 0 = 0
+ M_mult_r 0x100 0x100 = 2
+ M_mult_r 4711 0x4000 = 2356
+
+' negative operands
+ M_mult_r -1 0 = 0
+
+ M_mult_r -0x100 0x100 = -2
+ M_mult_r 0x100 -0x100 = -2
+ M_mult_r -0x100 -0x100 = 2
+
+ M_mult_r -4711 0x4000 = -2355
+ M_mult_r 4711 -0x4000 = -2355
+ M_mult_r -4711 -0x4000 = 2356
+
+' overflow
+ M_mult_r + + = 32766
+ M_mult_r + 32766 = 32765
+ M_mult_r 32766 + = 32765
+ M_mult_r + 0x4000 = 0x4000
+ M_mult_r 0x4000 + = 0x4000
+ M_mult_r + 0x4001 = 0x4000
+ M_mult_r 0x4001 + = 0x4000
+ M_mult_r + 2 = 2
+ M_mult_r + 1 = 1
+ M_mult_r 1 + = 1
+ M_mult_r + 0 = 0
+ M_mult_r 0 + = 0
+
+' underflow
+; M_mult_r - - = + assert !(a == b && b == MIN_WORD)
+ M_mult_r - -32767 = +
+ M_mult_r -32767 - = +
+ M_mult_r - + = -32767
+ M_mult_r + - = -32767
+ M_mult_r - 1 = -1
+ M_mult_r - 2 = -2
+ M_mult_r - 3 = -3
+
+'
+'L_mult ================
+; actually, (a * b) << 1
+; assert (a != MIN_WORD && b != MIN_WORD)
+
+' basic
+ M_L_mult 0 0 = 0
+ M_L_mult 2 3 = 12
+ M_L_mult 4711 5 = 47110
+
+' negative operands
+
+ M_L_mult -2 3 = -12
+ M_L_mult 2 -3 = -12
+ M_L_mult -2 -3 = 12
+ M_L_mult -4711 5 = -47110
+ M_L_mult 4711 -5 = -47110
+ M_L_mult -4711 -5 = 47110
+
+' overflow
+ M_L_mult + + = 2147352578
+ M_L_mult + -32767 = -2147352578
+ M_L_mult -32767 + = -2147352578
+ M_L_mult + 2 = 131068
+ M_L_mult + 1 = 65534
+ M_L_mult 1 + = 65534
+ M_L_mult + 0 = 0
+ M_L_mult 0 + = 0
+
diff --git a/jni/libgsm/inc/config.h b/jni/libgsm/inc/config.h
new file mode 100644
index 0000000..6aec1ae
--- /dev/null
+++ b/jni/libgsm/inc/config.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+/*efine SIGHANDLER_T int /* signal handlers are void */
+/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
+
+#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
+/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */
+#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */
+/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */
+
+#define HAS_FSTAT 1 /* fstat syscall */
+#define HAS_FCHMOD 1 /* fchmod syscall */
+#define HAS_CHMOD 1 /* chmod syscall */
+#define HAS_FCHOWN 1 /* fchown syscall */
+#define HAS_CHOWN 1 /* chown syscall */
+/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
+
+#define HAS_STRING_H 1 /* /usr/include/string.h */
+/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
+
+#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */
+#define HAS_UTIME 1 /* POSIX utime(path, times) */
+/*efine HAS_UTIMES 1 /* use utimes() syscall instead */
+#define HAS_UTIME_H 1 /* UTIME header file */
+/*efine HAS_UTIMBUF 1 /* struct utimbuf */
+/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
+
+#endif /* CONFIG_H */
diff --git a/jni/libgsm/inc/gsm.h b/jni/libgsm/inc/gsm.h
new file mode 100644
index 0000000..4714ab6
--- /dev/null
+++ b/jni/libgsm/inc/gsm.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /home/kbs/jutta/src/gsm/gsm-1.0/inc/RCS/gsm.h,v 1.11 1996/07/05 18:02:56 jutta Exp $*/
+
+#ifndef GSM_H
+#define GSM_H
+
+#ifdef __cplusplus
+# define NeedFunctionPrototypes 1
+#endif
+
+#if __STDC__
+# define NeedFunctionPrototypes 1
+#endif
+
+#ifdef _NO_PROTO
+# undef NeedFunctionPrototypes
+#endif
+
+#ifdef NeedFunctionPrototypes
+# include <stdio.h> /* for FILE * */
+#endif
+
+#undef GSM_P
+#if NeedFunctionPrototypes
+# define GSM_P( protos ) protos
+#else
+# define GSM_P( protos ) ( /* protos */ )
+#endif
+
+/*
+ * Interface
+ */
+
+typedef struct gsm_state * gsm;
+typedef short gsm_signal; /* signed 16 bit */
+typedef unsigned char gsm_byte;
+typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */
+
+#define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */
+
+#define GSM_PATCHLEVEL 10
+#define GSM_MINOR 0
+#define GSM_MAJOR 1
+
+#define GSM_OPT_VERBOSE 1
+#define GSM_OPT_FAST 2
+#define GSM_OPT_LTP_CUT 3
+#define GSM_OPT_WAV49 4
+#define GSM_OPT_FRAME_INDEX 5
+#define GSM_OPT_FRAME_CHAIN 6
+
+extern gsm gsm_create GSM_P((void));
+extern void gsm_destroy GSM_P((gsm));
+
+extern int gsm_print GSM_P((FILE *, gsm, gsm_byte *));
+extern int gsm_option GSM_P((gsm, int, int *));
+
+extern void gsm_encode GSM_P((gsm, gsm_signal *, gsm_byte *));
+extern int gsm_decode GSM_P((gsm, gsm_byte *, gsm_signal *));
+
+extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *));
+extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *));
+
+#undef GSM_P
+
+#endif /* GSM_H */
diff --git a/jni/libgsm/inc/gsm.h.orig b/jni/libgsm/inc/gsm.h.orig
new file mode 100644
index 0000000..bfb96e9
--- /dev/null
+++ b/jni/libgsm/inc/gsm.h.orig
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm.h,v 1.10 1996/07/02 10:15:22 jutta Exp $*/
+
+#ifndef GSM_H
+#define GSM_H
+
+#ifdef __cplusplus
+# define NeedFunctionPrototypes 1
+#endif
+
+#if __STDC__
+# define NeedFunctionPrototypes 1
+#endif
+
+#ifdef _NO_PROTO
+# undef NeedFunctionPrototypes
+#endif
+
+#ifdef NeedFunctionPrototypes
+# include <stdio.h> /* for FILE * */
+#endif
+
+#undef GSM_P
+#if NeedFunctionPrototypes
+# define GSM_P( protos ) protos
+#else
+# define GSM_P( protos ) ( /* protos */ )
+#endif
+
+/*
+ * Interface
+ */
+
+typedef struct gsm_state * gsm;
+typedef short gsm_signal; /* signed 16 bit */
+typedef unsigned char gsm_byte;
+typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */
+
+#define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */
+
+#define GSM_PATCHLEVEL 9
+#define GSM_MINOR 0
+#define GSM_MAJOR 1
+
+#define GSM_OPT_VERBOSE 1
+#define GSM_OPT_FAST 2
+#define GSM_OPT_LTP_CUT 3
+#define GSM_OPT_WAV49 4
+#define GSM_OPT_FRAME_INDEX 5
+#define GSM_OPT_FRAME_CHAIN 6
+
+extern gsm gsm_create GSM_P((void));
+extern void gsm_destroy GSM_P((gsm));
+
+extern int gsm_print GSM_P((FILE *, gsm, gsm_byte *));
+extern int gsm_option GSM_P((gsm, int, int *));
+
+extern void gsm_encode GSM_P((gsm, gsm_signal *, gsm_byte *));
+extern int gsm_decode GSM_P((gsm, gsm_byte *, gsm_signal *));
+
+extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *));
+extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *));
+
+#undef GSM_P
+
+#endif /* GSM_H */
diff --git a/jni/libgsm/inc/private.h b/jni/libgsm/inc/private.h
new file mode 100644
index 0000000..fea5694
--- /dev/null
+++ b/jni/libgsm/inc/private.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/private.h,v 1.6 1996/07/02 10:15:26 jutta Exp $*/
+
+#ifndef PRIVATE_H
+#define PRIVATE_H
+
+typedef short word; /* 16 bit signed int */
+typedef long longword; /* 32 bit signed int */
+
+typedef unsigned short uword; /* unsigned word */
+typedef unsigned long ulongword; /* unsigned longword */
+
+struct gsm_state {
+
+ word dp0[ 280 ];
+
+ word z1; /* preprocessing.c, Offset_com. */
+ longword L_z2; /* Offset_com. */
+ int mp; /* Preemphasis */
+
+ word u[8]; /* short_term_aly_filter.c */
+ word LARpp[2][8]; /* */
+ word j; /* */
+
+ word ltp_cut; /* long_term.c, LTP crosscorr. */
+ word nrp; /* 40 */ /* long_term.c, synthesis */
+ word v[9]; /* short_term.c, synthesis */
+ word msr; /* decoder.c, Postprocessing */
+
+ char verbose; /* only used if !NDEBUG */
+ char fast; /* only used if FAST */
+
+ char wav_fmt; /* only used if WAV49 defined */
+ unsigned char frame_index; /* odd/even chaining */
+ unsigned char frame_chain; /* half-byte to carry forward */
+};
+
+
+#define MIN_WORD (-32767 - 1)
+#define MAX_WORD 32767
+
+#define MIN_LONGWORD (-2147483647 - 1)
+#define MAX_LONGWORD 2147483647
+
+#ifdef SASR /* flag: >> is a signed arithmetic shift right */
+#undef SASR
+#define SASR(x, by) ((x) >> (by))
+#else
+#define SASR(x, by) ((x) >= 0 ? (x) >> (by) : (~(-((x) + 1) >> (by))))
+#endif /* SASR */
+
+#include "proto.h"
+
+/*
+ * Prototypes from add.c
+ */
+extern word gsm_mult P((word a, word b));
+extern longword gsm_L_mult P((word a, word b));
+extern word gsm_mult_r P((word a, word b));
+
+extern word gsm_div P((word num, word denum));
+
+extern word gsm_add P(( word a, word b ));
+extern longword gsm_L_add P(( longword a, longword b ));
+
+extern word gsm_sub P((word a, word b));
+extern longword gsm_L_sub P((longword a, longword b));
+
+extern word gsm_abs P((word a));
+
+extern word gsm_norm P(( longword a ));
+
+extern longword gsm_L_asl P((longword a, int n));
+extern word gsm_asl P((word a, int n));
+
+extern longword gsm_L_asr P((longword a, int n));
+extern word gsm_asr P((word a, int n));
+
+/*
+ * Inlined functions from add.h
+ */
+
+/*
+ * #define GSM_MULT_R(a, b) (* word a, word b, !(a == b == MIN_WORD) *) \
+ * (0x0FFFF & SASR(((longword)(a) * (longword)(b) + 16384), 15))
+ */
+#define GSM_MULT_R(a, b) /* word a, word b, !(a == b == MIN_WORD) */ \
+ (SASR( ((longword)(a) * (longword)(b) + 16384), 15 ))
+
+# define GSM_MULT(a,b) /* word a, word b, !(a == b == MIN_WORD) */ \
+ (SASR( ((longword)(a) * (longword)(b)), 15 ))
+
+# define GSM_L_MULT(a, b) /* word a, word b */ \
+ (((longword)(a) * (longword)(b)) << 1)
+
+# define GSM_L_ADD(a, b) \
+ ( (a) < 0 ? ( (b) >= 0 ? (a) + (b) \
+ : (utmp = (ulongword)-((a) + 1) + (ulongword)-((b) + 1)) \
+ >= MAX_LONGWORD ? MIN_LONGWORD : -(longword)utmp-2 ) \
+ : ((b) <= 0 ? (a) + (b) \
+ : (utmp = (ulongword)(a) + (ulongword)(b)) >= MAX_LONGWORD \
+ ? MAX_LONGWORD : utmp))
+
+/*
+ * # define GSM_ADD(a, b) \
+ * ((ltmp = (longword)(a) + (longword)(b)) >= MAX_WORD \
+ * ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp)
+ */
+/* Nonportable, but faster: */
+
+#define GSM_ADD(a, b) \
+ ((ulongword)((ltmp = (longword)(a) + (longword)(b)) - MIN_WORD) > \
+ MAX_WORD - MIN_WORD ? (ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp)
+
+# define GSM_SUB(a, b) \
+ ((ltmp = (longword)(a) - (longword)(b)) >= MAX_WORD \
+ ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp)
+
+# define GSM_ABS(a) ((a) < 0 ? ((a) == MIN_WORD ? MAX_WORD : -(a)) : (a))
+
+/* Use these if necessary:
+
+# define GSM_MULT_R(a, b) gsm_mult_r(a, b)
+# define GSM_MULT(a, b) gsm_mult(a, b)
+# define GSM_L_MULT(a, b) gsm_L_mult(a, b)
+
+# define GSM_L_ADD(a, b) gsm_L_add(a, b)
+# define GSM_ADD(a, b) gsm_add(a, b)
+# define GSM_SUB(a, b) gsm_sub(a, b)
+
+# define GSM_ABS(a) gsm_abs(a)
+
+*/
+
+/*
+ * More prototypes from implementations..
+ */
+extern void Gsm_Coder P((
+ struct gsm_state * S,
+ word * s, /* [0..159] samples IN */
+ word * LARc, /* [0..7] LAR coefficients OUT */
+ word * Nc, /* [0..3] LTP lag OUT */
+ word * bc, /* [0..3] coded LTP gain OUT */
+ word * Mc, /* [0..3] RPE grid selection OUT */
+ word * xmaxc,/* [0..3] Coded maximum amplitude OUT */
+ word * xMc /* [13*4] normalized RPE samples OUT */));
+
+extern void Gsm_Long_Term_Predictor P(( /* 4x for 160 samples */
+ struct gsm_state * S,
+ word * d, /* [0..39] residual signal IN */
+ word * dp, /* [-120..-1] d' IN */
+ word * e, /* [0..40] OUT */
+ word * dpp, /* [0..40] OUT */
+ word * Nc, /* correlation lag OUT */
+ word * bc /* gain factor OUT */));
+
+extern void Gsm_LPC_Analysis P((
+ struct gsm_state * S,
+ word * s, /* 0..159 signals IN/OUT */
+ word * LARc)); /* 0..7 LARc's OUT */
+
+extern void Gsm_Preprocess P((
+ struct gsm_state * S,
+ word * s, word * so));
+
+extern void Gsm_Encoding P((
+ struct gsm_state * S,
+ word * e,
+ word * ep,
+ word * xmaxc,
+ word * Mc,
+ word * xMc));
+
+extern void Gsm_Short_Term_Analysis_Filter P((
+ struct gsm_state * S,
+ word * LARc, /* coded log area ratio [0..7] IN */
+ word * d /* st res. signal [0..159] IN/OUT */));
+
+extern void Gsm_Decoder P((
+ struct gsm_state * S,
+ word * LARcr, /* [0..7] IN */
+ word * Ncr, /* [0..3] IN */
+ word * bcr, /* [0..3] IN */
+ word * Mcr, /* [0..3] IN */
+ word * xmaxcr, /* [0..3] IN */
+ word * xMcr, /* [0..13*4] IN */
+ word * s)); /* [0..159] OUT */
+
+extern void Gsm_Decoding P((
+ struct gsm_state * S,
+ word xmaxcr,
+ word Mcr,
+ word * xMcr, /* [0..12] IN */
+ word * erp)); /* [0..39] OUT */
+
+extern void Gsm_Long_Term_Synthesis_Filtering P((
+ struct gsm_state* S,
+ word Ncr,
+ word bcr,
+ word * erp, /* [0..39] IN */
+ word * drp)); /* [-120..-1] IN, [0..40] OUT */
+
+void Gsm_RPE_Decoding P((
+ struct gsm_state *S,
+ word xmaxcr,
+ word Mcr,
+ word * xMcr, /* [0..12], 3 bits IN */
+ word * erp)); /* [0..39] OUT */
+
+void Gsm_RPE_Encoding P((
+ struct gsm_state * S,
+ word * e, /* -5..-1][0..39][40..44 IN/OUT */
+ word * xmaxc, /* OUT */
+ word * Mc, /* OUT */
+ word * xMc)); /* [0..12] OUT */
+
+extern void Gsm_Short_Term_Synthesis_Filter P((
+ struct gsm_state * S,
+ word * LARcr, /* log area ratios [0..7] IN */
+ word * drp, /* received d [0...39] IN */
+ word * s)); /* signal s [0..159] OUT */
+
+extern void Gsm_Update_of_reconstructed_short_time_residual_signal P((
+ word * dpp, /* [0...39] IN */
+ word * ep, /* [0...39] IN */
+ word * dp)); /* [-120...-1] IN/OUT */
+
+/*
+ * Tables from table.c
+ */
+#ifndef GSM_TABLE_C
+
+extern word gsm_A[8], gsm_B[8], gsm_MIC[8], gsm_MAC[8];
+extern word gsm_INVA[8];
+extern word gsm_DLB[4], gsm_QLB[4];
+extern word gsm_H[11];
+extern word gsm_NRFAC[8];
+extern word gsm_FAC[8];
+
+#endif /* GSM_TABLE_C */
+
+/*
+ * Debugging
+ */
+#ifdef NDEBUG
+
+# define gsm_debug_words(a, b, c, d) /* nil */
+# define gsm_debug_longwords(a, b, c, d) /* nil */
+# define gsm_debug_word(a, b) /* nil */
+# define gsm_debug_longword(a, b) /* nil */
+
+#else /* !NDEBUG => DEBUG */
+
+ extern void gsm_debug_words P((char * name, int, int, word *));
+ extern void gsm_debug_longwords P((char * name, int, int, longword *));
+ extern void gsm_debug_longword P((char * name, longword));
+ extern void gsm_debug_word P((char * name, word));
+
+#endif /* !NDEBUG */
+
+#include "unproto.h"
+
+#endif /* PRIVATE_H */
diff --git a/jni/libgsm/inc/proto.h b/jni/libgsm/inc/proto.h
new file mode 100644
index 0000000..2851c08
--- /dev/null
+++ b/jni/libgsm/inc/proto.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/proto.h,v 1.1 1992/10/28 00:11:08 jutta Exp $*/
+
+#ifndef PROTO_H
+#define PROTO_H
+
+#if __cplusplus
+# define NeedFunctionPrototypes 1
+#endif
+
+#if __STDC__
+# define NeedFunctionPrototypes 1
+#endif
+
+#ifdef _NO_PROTO
+# undef NeedFunctionPrototypes
+#endif
+
+#undef P /* gnu stdio.h actually defines this... */
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef P4
+#undef P5
+#undef P6
+#undef P7
+#undef P8
+
+#if NeedFunctionPrototypes
+
+# define P( protos ) protos
+
+# define P0() (void)
+# define P1(x, a) (a)
+# define P2(x, a, b) (a, b)
+# define P3(x, a, b, c) (a, b, c)
+# define P4(x, a, b, c, d) (a, b, c, d)
+# define P5(x, a, b, c, d, e) (a, b, c, d, e)
+# define P6(x, a, b, c, d, e, f) (a, b, c, d, e, f)
+# define P7(x, a, b, c, d, e, f, g) (a, b, c, d, e, f, g)
+# define P8(x, a, b, c, d, e, f, g, h) (a, b, c, d, e, f, g, h)
+
+#else /* !NeedFunctionPrototypes */
+
+# define P( protos ) ( /* protos */ )
+
+# define P0() ()
+# define P1(x, a) x a;
+# define P2(x, a, b) x a; b;
+# define P3(x, a, b, c) x a; b; c;
+# define P4(x, a, b, c, d) x a; b; c; d;
+# define P5(x, a, b, c, d, e) x a; b; c; d; e;
+# define P6(x, a, b, c, d, e, f) x a; b; c; d; e; f;
+# define P7(x, a, b, c, d, e, f, g) x a; b; c; d; e; f; g;
+# define P8(x, a, b, c, d, e, f, g, h) x a; b; c; d; e; f; g; h;
+
+#endif /* !NeedFunctionPrototypes */
+
+#endif /* PROTO_H */
diff --git a/jni/libgsm/inc/toast.h b/jni/libgsm/inc/toast.h
new file mode 100644
index 0000000..b42d9ae
--- /dev/null
+++ b/jni/libgsm/inc/toast.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast.h,v 1.4 1995/03/07 21:26:16 jutta Exp $ */
+
+#ifndef TOAST_H
+#define TOAST_H /* Guard against multiple includes */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+
+#include <errno.h>
+#ifndef HAS_ERRNO_DECL
+ extern int errno;
+#endif
+
+#ifdef HAS_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifdef HAS_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAS_UTIME
+# ifdef HAS_UTIME_H
+# include <utime.h>
+# endif
+#endif
+
+#include "gsm.h"
+
+#ifndef S_ISREG
+#define S_ISREG(x) ((x) & S_IFREG)
+#endif /* S_ISREG */
+
+
+# define READ "rb"
+# define WRITE "wb"
+#ifdef O_BINARY
+# define O_WRITE_EXCL O_WRONLY|O_CREAT|O_EXCL|O_BINARY
+#else
+# define O_WRITE_EXCL O_WRONLY|O_CREAT|O_EXCL
+#endif
+
+#ifndef SIGHANDLER_T
+#define SIGHANDLER_T void /* what does a signal handler return? */
+#endif
+
+
+#ifdef HAS_STRING_H
+#include <string.h>
+#else
+# ifdef HAS_STRINGS_H
+# include <strings.h>
+# else
+# include "proto.h"
+
+ extern int strlen P((char *));
+ extern char * strcpy P((char *, char *));
+ extern char * strcat P((char *, char *));
+ extern char * strrchr P((char *, int));
+
+# include "unproto.h"
+# endif
+#endif
+
+
+#ifdef HAS_STDLIB_H
+#include <stdlib.h>
+#else
+# include "proto.h"
+# ifdef HAS_MALLOC_H
+# include <malloc.h>
+# else
+ extern char * malloc P((unsigned));
+# endif
+ extern int exit P((int));
+# include "unproto.h"
+#endif
+
+
+#ifdef HAS_UNISTD_H
+# include <unistd.h>
+#endif
+
+/*
+ * This suffix is tacked onto/removed from filenames
+ * similar to the way freeze and compress do it.
+ */
+#define SUFFIX_TOASTED ".gsm"
+
+#include "proto.h"
+
+extern int audio_init_input P((void)), audio_init_output P((void));
+extern int ulaw_input P((gsm_signal*)), ulaw_output P((gsm_signal *));
+extern int alaw_input P((gsm_signal*)), alaw_output P((gsm_signal *));
+extern int linear_input P((gsm_signal*)), linear_output P((gsm_signal *));
+
+#endif /* TOAST_H */
diff --git a/jni/libgsm/inc/unproto.h b/jni/libgsm/inc/unproto.h
new file mode 100644
index 0000000..eaf866f
--- /dev/null
+++ b/jni/libgsm/inc/unproto.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/unproto.h,v 1.1 1992/10/28 00:11:08 jutta Exp $*/
+
+#ifdef PROTO_H /* sic */
+#undef PROTO_H
+
+#undef P
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef P4
+#undef P5
+#undef P6
+#undef P7
+#undef P8
+
+#endif /* PROTO_H */
diff --git a/jni/libgsm/man/bitter.1 b/jni/libgsm/man/bitter.1
new file mode 100644
index 0000000..2dad78b
--- /dev/null
+++ b/jni/libgsm/man/bitter.1
@@ -0,0 +1,70 @@
+.\"
+.\" Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.PU
+.TH BITTER 1
+.SH NAME
+bitter, sweet \(em code-generators for packing bits
+.SH SYNOPSIS
+bitter < input > output
+.br
+sweet < input > output
+.SH "DESCRIPTION"
+Bitter and sweet are two filters which turn a description of the
+form
+.nf
+ name number-of-bits
+ name number-of-bits
+ ...
+.nf
+into code.
+.PP
+Bitter generates code that packs the specified bits from their
+variables into an array of unsigned char referenced by an
+advancing pointer c.
+.PP
+Sweet generates code that unpacks the specified bits from an array
+of unsigned char referenced by a mutable pointer c into the
+named variables.
+.\" .SH OPTIONS
+.\" .SH "RETURN VALUE"
+.\" .SH ERRORS
+.SH EXAMPLES
+.nf
+% cat in
+amaretto 1
+banana 2
+cherry 3
+strawberry 4
+vanilla 15
+walnut 15
+
+% bitter < in
+ *c++ = ((amaretto & 0x1) << 7)
+ | ((banana & 0x3) << 5)
+ | ((cherry & 0x7) << 2)
+ | ((strawberry >> 2) & 0x3);
+ *c++ = ((strawberry & 0x3) << 6)
+ | ((vanilla >> 9) & 0x3F);
+ *c++ = ((vanilla >> 1) & 0xFF);
+ *c++ = ((vanilla & 0x1) << 7)
+ | ((walnut >> 8) & 0x7F);
+ *c++ = walnut & 0xFF;
+
+% sweet < in
+ amaretto = (*c >> 7) & 0x1;
+ banana = (*c >> 5) & 0x3;
+ cherry = (*c >> 2) & 0x7;
+ strawberry = (*c++ & 0x3) << 2;
+ strawberry |= (*c >> 6) & 0x3;
+ vanilla = (*c++ & 0x3F) << 9;
+ vanilla |= (*c++ & 0xFF) << 1;
+ vanilla |= (*c >> 7) & 0x1;
+ walnut = (*c++ & 0x7F) << 8;
+ walnut |= *c++;
+.SH NOTES
+This is a quick hack for the gsm_encode() and gsm_decode() routines.
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de and cabo@cs.tu-berlin.de.
diff --git a/jni/libgsm/man/gsm.3 b/jni/libgsm/man/gsm.3
new file mode 100644
index 0000000..e465762
--- /dev/null
+++ b/jni/libgsm/man/gsm.3
@@ -0,0 +1,105 @@
+.\"
+.\" Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.PU
+.TH GSM 3
+.SH NAME
+gsm_create, gsm_destroy, gsm_encode, gsm_decode \(em GSM\ 06.10 lossy sound compression
+.SH SYNOPSIS
+.PP
+#include "gsm.h"
+.PP
+gsm gsm_create();
+.PP
+void gsm_encode(handle, src, dst)
+.br
+gsm handle;
+.br
+gsm_signal src[160];
+.br
+gsm_frame dst;
+.PP
+int gsm_decode(handle, src, dst)
+.br
+gsm handle;
+.br
+gsm_frame src;
+.br
+gsm_signal dst[160];
+.PP
+void gsm_destroy(handle)
+.br
+gsm handle;
+.br
+.SH "DESCRIPTION"
+Gsm is an implementation of the final draft GSM 06.10
+standard for full-rate speech transcoding.
+.PP
+gsm_create() initializes a gsm pass and returns a 'gsm' object
+which can be used as a handle in subsequent calls to gsm_decode(),
+gsm_encode() or gsm_destroy().
+.PP
+gsm_encode() encodes an array of 160 13-bit samples (given as
+gsm_signal's, signed integral values of at least 16 bits) into
+a gsm_frame of 33 bytes.
+(gsm_frame is a type defined as an array of 33 gsm_bytes in gsm.h.)
+.PP
+gsm_decode() decodes a gsm_frame into an array of 160 13-bit samples
+(given as gsm_signals), which sound rather like what you handed to
+gsm_encode() on the other side of the wire.
+.PP
+gsm_destroy() finishes a gsm pass and frees all storage associated
+with it.
+.SS "Sample format"
+The following scaling is assumed for input to the algorithm:
+.br
+.nf
+ 0 1 11 12
+ S..v..v..v..v..v..v..v..v..v..v..v..v..*..*..*
+.nf
+.br
+Only the top 13 bits are used as a signed input value.
+The output of gsm_decode() has the three lower bits set to zero.
+.\" .SH OPTIONS
+.SH "RETURN VALUE"
+gsm_create() returns an opaque handle object of type gsm, or 0 on error.
+gsm_decode() returns -1 if the passed frame is invalid, else 0.
+.SH EXAMPLE
+.nf
+#include "gsm.h"
+
+gsm handle;
+gsm_frame buf;
+gsm_signal sample[160];
+int cc, soundfd;
+
+play() { /* read compressed data from standard input, write to soundfd */
+
+ if (!(handle = gsm_create())) error...
+ while (cc = read(0, (char *)buf, sizeof buf)) {
+ if (cc != sizeof buf) error...
+ if (gsm_decode(handle, buf, sample) < 0) error...
+ if (write(soundfd, sample, sizeof sample) != sizeof sample)
+ error...
+ }
+ gsm_destroy(handle);
+}
+
+record() { /* read from soundfd, write compressed to standard output */
+
+ if (!(handle = gsm_create())) error...
+ while (cc = read(soundfd, sample, sizeof sample)) {
+ if (cc != sizeof sample) error...
+ gsm_encode(handle, sample, buf);
+ if (write(1, (char *)buf, sizeof buf) != sizeof sample)
+ error...
+ }
+ gsm_destroy(handle);
+}
+.nf
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de and cabo@cs.tu-berlin.de.
+.SH "SEE ALSO"
+toast(1), gsm_print(3), gsm_explode(3), gsm_option(3)
diff --git a/jni/libgsm/man/gsm_explode.3 b/jni/libgsm/man/gsm_explode.3
new file mode 100644
index 0000000..ef89984
--- /dev/null
+++ b/jni/libgsm/man/gsm_explode.3
@@ -0,0 +1,47 @@
+.\"
+.\" Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.PU
+.TH GSM_EXPLODE 3
+.SH NAME
+gsm_explode, gsm_implode \(em GSM\ 06.10 supplementary
+functions for testing
+.SH SYNOPSIS
+#include "gsm.h"
+.PP
+void gsm_explode(g, frame, xframe)
+.br
+gsm g;
+.br
+gsm_frame frame;
+.br
+gsm_signal xframe[ 76 ];
+.PP
+void gsm_implode(g, xframe, frame)
+.br
+gsm g;
+.br
+gsm_signal xframe[ 76 ];
+.br
+gsm_frame frame;
+.SH "DESCRIPTION"
+Gsm is an implementation of the final draft GSM 06.10
+standard for full-rate speech transcoding.
+Test data for implementations of this particular document
+can be bought and used to verify an implementation.
+.PP
+The encoded test data uses a format different from what
+one would use to transmit frames with the least number
+of bits.
+Gsm_explode() and gsm_implode() convert between the
+internal, small, 33-byte format and the 76-word format
+used by the test data.
+.PP
+.SH "RETURN VALUE"
+gsm_explode() returns -1 if the passed frame is invalid, else 0.
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de and cabo@cs.tu-berlin.de.
+.SH "SEE ALSO"
+gsm(3)
diff --git a/jni/libgsm/man/gsm_option.3 b/jni/libgsm/man/gsm_option.3
new file mode 100644
index 0000000..8df7da0
--- /dev/null
+++ b/jni/libgsm/man/gsm_option.3
@@ -0,0 +1,183 @@
+.\"
+.\" Copyright 1992-1995 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.PU
+.TH GSM_OPTION 3
+.SH NAME
+gsm_option \(em customizing the GSM 06.10 implementation
+.SH SYNOPSIS
+#include "gsm.h"
+.PP
+int gsm_option(handle, option, valueP);
+.br
+gsm handle;
+.br
+int option;
+.br
+int * valueP;
+.SH "DESCRIPTION"
+The gsm library is an implementation of the final draft GSM 06.10
+standard for full-rate speech transcoding, a lossy
+speech compression algorithm.
+.PP
+The gsm_option() function can be used to set and query various
+options or flags that are not needed for regular GSM 06.10 encoding
+or decoding, but might be of interest in special cases.
+.PP
+The second argument to gsm_option specifies what parameter
+should be changed or queried.
+The third argument is either a null pointer, in which case
+the current value of that parameter is returned;
+or it is a pointer to an integer containing the value
+you want to set, in which case the previous value will
+be returned.
+.PP
+The following options are defined:
+.PP
+.I GSM_OPT_VERBOSE
+Verbosity level.
+.br
+.in+5
+This option is only supported if the library was compiled
+with debugging turned on, and may be used by developers of
+compression algorithms to aid debugging.
+.br
+The verbosity level can be changed at any time during encoding or decoding.
+.in-5
+.sp
+.PP
+.I GSM_OPT_FAST
+Faster compression algorithm.
+.br
+.in+5
+This implementation offers a not strictly standard-compliant, but
+faster compression algorithm that is compatible with the regular
+method and does not noticably degrade audio quality.
+.br
+The value passed to
+.br
+.nf
+ gsm_option(handle, GSM_OPT_FAST, & value)
+.fi
+.br
+functions as a boolean flag; if it is zero, the regular algorithm
+will be used, if not, the faster version will be used.
+.br
+The availability of this option depends on the hardware used;
+if it is not available, gsm_option will return -1 on an attempt
+to set or query it.
+.br
+This option can be set any time during encoding or decoding.
+.in-5
+.ne 5
+.sp
+.PP
+.I GSM_OPT_LTP_CUT
+Enable, disable, or query the LTP cut-off optimization.
+.br
+.in+5
+During encoding, the search for the long-term correlation
+lag forms the bottleneck of the algorithm.
+The ltp-cut option enables an approximation that disregards most
+of the samples for purposes of finding that correlation,
+and hence speeds up the encoding at a noticable loss in quality.
+.br
+The value passed to
+.br
+.nf
+ gsm_option(handle, GSM_OPT_LTP_CUT, & value)
+.fi
+.br
+turns the optimization on if nonzero, and off if zero.
+.br
+This option can be set any time during encoding
+or decoding; it will only affect the encoding pass, not
+the decoding.
+.sp
+.PP
+.I GSM_OPT_WAV49
+WAV-style byte ordering.
+.br
+.in+5
+A WAV file of type #49 contains GSM 06.10-encoded frames.
+Unfortunately, the framing and code ordering of the WAV version
+are incompatible with the native ones of this GSM 06.10 library.
+The GSM_OPT_WAV49 option turns on a different packing
+algorithm that produces alternating frames of 32 and 33 bytes
+(or makes it consume alternating frames of 33 and 32 bytes, note
+the opposite order of the two numbers) which, when concatenated,
+can be used in the body of a WAV #49 frame.
+It is up to the user program to write a WAV header, if any;
+neither the library itself nor the toast program produce
+complete WAV files.
+.br
+The value passed to
+.br
+.nf
+ gsm_option(handle, GSM_OPT_WAV49, & value)
+.fi
+.br
+functions as a boolean flag; if it is zero, the library's native
+framing algorithm will be used, if nonzero, WAV-type packing is in effect.
+.br
+This option should be used before any frames are encoded.
+Whether or not it is supported at all depends on a
+compile-time switch, WAV49.
+Both option and compile time switch are new to the library
+as of patchlevel 9, and are considerably less tested than the
+well-worn rest of the it.
+.br
+Thanks to Jeff Chilton for the detective work and first free
+implementation of this version of the GSM 06.10 encoding.
+.sp
+.PP
+.I GSM_OPT_FRAME_CHAIN
+Query or set the chaining byte.
+.br
+.in+5
+Between the two frames of a WAV-style encoding, the GSM 06.10 library
+must keep track of one half-byte that is technically part of the first
+frame, but will be written as the first four bits of the second.
+This half-byte are the lowest four bits of the value returned by,
+and optionally set by,
+.br
+.nf
+ gsm_option(handle, GSM_OPT_FRAME_CHAIN, & value)
+.fi
+.br
+This option can be queried and set at any time.
+.sp
+.PP
+.I GSM_OPT_FRAME_INDEX
+Query or set the current frame's index in a format's
+alternating list of frames.
+.br
+.in+5
+The WAV #49 framing uses two alternating types of frames.
+Which type the next GSM-coded frame belongs to can be queried, or,
+when decoding, announced, using
+.br
+.nf
+ gsm_option(handle, GSM_OPT_FRAME_INDEX, & value)
+.fi
+.br
+For WAV-style framing, the value should be 0 or 1; the first frame
+of an encoding has an index of 0.
+At library initialization, the index is set to zero.
+.br
+The frame index can be queried and set at any time.
+Used in combination with the
+.IR GSM_OPT_FRAME_CHAIN ,
+option, it can be used to position on arbitrary GSM frames
+within a format like WAV #49 (not accounting for the lost
+internal GSM state).
+.in-5
+.SH "RETURN VALUE"
+gsm_option() returns -1 if an option is not supported, the
+previous value of the option otherwise.
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de and cabo@cs.tu-berlin.de.
+.SH "SEE ALSO"
+toast(1), gsm(3), gsm_explode(3), gsm_print(3)
diff --git a/jni/libgsm/man/gsm_print.3 b/jni/libgsm/man/gsm_print.3
new file mode 100644
index 0000000..48d6883
--- /dev/null
+++ b/jni/libgsm/man/gsm_print.3
@@ -0,0 +1,52 @@
+.\"
+.\" Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.PU
+.TH GSM_PRINT 3
+.SH NAME
+gsm_print \(em GSM\ 06.10 supplementary function for debugging
+.SH SYNOPSIS
+#include "gsm.h"
+#include <stdio.h>
+
+int gsm_print(f, g, frame);
+.br
+FILE * f;
+.br
+gsm g;
+.br
+gsm_frame frame;
+.SH "DESCRIPTION"
+Gsm is an implementation of the final draft GSM 06.10
+standard for full-rate speech transcoding, a lossy
+speech compression algorithm.
+The compressed form involves 76 variables with different numbers
+of significant bits packed into 33 bytes.
+.PP
+If you are interested in investigating the details of this
+coding scheme, gsm_print() can be used to dump the contents
+of individual gsm_frames to a file pointer provided by
+the application.
+.PP
+.SH "RETURN VALUE"
+gsm_print() returns -1 if the frame is invalid, else 0.
+.SH EXAMPLE
+A single frame looks like this:
+.br
+.nf
+LARc: 29 32 20 11 08 05 06 07
+#1: Nc 0040 bc 0 Mc 1 xmaxc 60
+ 06 04 00 03 03 06 04 02 02 04 05 04 01
+#2: Nc 0045 bc 1 Mc 1 xmaxc 48
+ 03 07 01 03 04 04 07 01 03 02 04 05 03
+#3: Nc 0091 bc 1 Mc 1 xmaxc 46
+ 00 03 03 07 01 06 02 04 05 03 03 02 04
+#4: Nc 0120 bc 0 Mc 1 xmaxc 47
+ 07 03 06 00 03 03 06 05 00 03 02 07 04
+.nf
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de and cabo@cs.tu-berlin.de.
+.SH "SEE ALSO"
+gsm(3), gsm_explode(3)
diff --git a/jni/libgsm/man/toast.1 b/jni/libgsm/man/toast.1
new file mode 100644
index 0000000..e54647b
--- /dev/null
+++ b/jni/libgsm/man/toast.1
@@ -0,0 +1,156 @@
+.\"
+.\" Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+.\" Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+.\" details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+.\"
+.if n .ds mU u
+.if t .ds mU \(*m
+.\"
+.TH TOAST 1 local
+.SH NAME
+toast \(em GSM\ 06.10 lossy sound compression
+.SH SYNOPSIS
+.ll +8
+.B toast
+[
+.B \-cdfpvhualsFC
+] [
+.I "filename...\&"
+]
+.LP
+.B untoast
+[
+.B \-cfpvhuaslF
+] [
+.I "filename...\&"
+]
+.LP
+.B tcat
+[
+.B \-vhuaslF
+] [
+.I "filename...\&"
+]
+.ll -8
+.SH DESCRIPTION
+Toast compresses the sound files given on its command line.
+Each file is replaced by a file with the extension
+.I \&.gsm .
+If no files are specified, the compression is applied to the
+standard input, and its result is written to standard output.
+.PP
+Toasted files can be restored to something not quite unlike
+their original form by running toast
+.I "\-d"
+, or
+.I untoast
+, on the \&.gsm-files or standard input.
+.PP
+The program
+.I tcat
+(the same as running
+.I "untoast \-c"
+) uncompresses its input on standard output,
+but leaves the compressed .gsm\-files alone.
+.PP
+When files are compressed or uncompressed into other files,
+the ownership (if run by root), modes, accessed and modified times
+are maintained between both versions.
+.SH OPTIONS
+.TP
+.B \-c
+(cat)
+Write to the standard output; no files are changed.
+.TP
+.B \-d
+(decode)
+Decode, rather than encode, the files.
+.TP
+.B \-f
+(force)
+Force replacement of output files if they exist.
+If \-f is omitted and toast (or untoast) is run interactively from
+a terminal, the user is prompted as to whether the file should be replaced.
+.TP
+.B \-p
+(precious)
+Do not delete the source files.
+Source files are implicitly left alone whenever \-c is
+specified or tcat is run.
+.TP
+.B \-C
+(LTP cut-off)
+Ignore most sample values when calculating the GSM long-term
+correlation lag during encoding.
+(The multiplications that do this are a bottleneck
+of the algorithm.)
+The resulting encoding process will not produce
+exactly the same results as GSM 06.10 would,
+but remains close enough to be compatible.
+.br
+The
+.B \-C
+option applies only to the encoder and is silently
+ignored by the decoder.
+.TP
+.B \-F
+(fast)
+On systems with a floating point processor, but without
+a multiplication instruction, \-F sacrifices standard conformance to
+performance and nearly doubles the speed of the algorithm.
+.br
+The resulting encoding and decoding process will not produce
+exactly the same results as GSM 06.10 would, but remains close
+enough to be compatible.
+.br
+The default is standard-conforming operation.
+.TP
+.B \-v
+(version)\
+outputs the version of toast (or untoast or tcat) to stdout and exits.
+.TP
+.B \-h
+(help)\
+prints a short overview of the options.
+.PP
+Toast, untoast and tcat try to guess the appropriate audio data
+format from the file suffix.
+Command line options can also specify a format to be used for
+all files.
+.br
+The following formats are supported:
+.TP
+.B "\-u"
+(\(*mU-law)
+8 kHz, 8 bit \(*mU-law encoding (file suffix .u)
+.TP
+.B "\-a"
+(A-law)
+8 kHz, 8 bit A-law encoding (file suffix .A)
+.TP
+.B "\-s"
+(Sun audio)
+8 kHz, 8 bit \(*mU-law encoding with audio header (file suffix .au)
+.TP
+.B "-l"
+(linear)
+8 kHz, 16 bit signed linear encoding in host byte order
+with 13 significant bits (file suffix .l)
+.PP
+In absence of options or suffixes to specify a format,
+\(*mU-law encoding as forced by \-u is assumed.
+.PP
+.SH PECULIARITIES
+A four bit magic number is prefixed to each 32 1/2-byte GSM frame,
+mainly because 32 1/2-bytes are rather clumsy to handle.
+.SH WARNING
+The compression algorithm used is a lossy compression algorithm
+devised especially for speech; on no account should it be used
+for text, pictures or any other non-speech-data you consider
+valuable.
+.SH BUGS
+Please direct bug reports to jutta@cs.tu-berlin.de.
+.SH "SEE ALSO"
+gsm(3)
+.\"
+.\" Toast is dedicated to Bill Sienkiewicz, author of "Stray Toasters".
diff --git a/jni/libgsm/src/add.c b/jni/libgsm/src/add.c
new file mode 100644
index 0000000..258a6fc
--- /dev/null
+++ b/jni/libgsm/src/add.c
@@ -0,0 +1,235 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/add.c,v 1.6 1996/07/02 09:57:33 jutta Exp $ */
+
+/*
+ * See private.h for the more commonly used macro versions.
+ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+#include "gsm.h"
+#include "proto.h"
+
+#define saturate(x) \
+ ((x) < MIN_WORD ? MIN_WORD : (x) > MAX_WORD ? MAX_WORD: (x))
+
+word gsm_add P2((a,b), word a, word b)
+{
+ longword sum = (longword)a + (longword)b;
+ return saturate(sum);
+}
+
+word gsm_sub P2((a,b), word a, word b)
+{
+ longword diff = (longword)a - (longword)b;
+ return saturate(diff);
+}
+
+word gsm_mult P2((a,b), word a, word b)
+{
+ if (a == MIN_WORD && b == MIN_WORD) return MAX_WORD;
+ else return SASR( (longword)a * (longword)b, 15 );
+}
+
+word gsm_mult_r P2((a,b), word a, word b)
+{
+ if (b == MIN_WORD && a == MIN_WORD) return MAX_WORD;
+ else {
+ longword prod = (longword)a * (longword)b + 16384;
+ prod >>= 15;
+ return prod & 0xFFFF;
+ }
+}
+
+word gsm_abs P1((a), word a)
+{
+ return a < 0 ? (a == MIN_WORD ? MAX_WORD : -a) : a;
+}
+
+longword gsm_L_mult P2((a,b),word a, word b)
+{
+ assert( a != MIN_WORD || b != MIN_WORD );
+ return ((longword)a * (longword)b) << 1;
+}
+
+longword gsm_L_add P2((a,b), longword a, longword b)
+{
+ if (a < 0) {
+ if (b >= 0) return a + b;
+ else {
+ ulongword A = (ulongword)-(a + 1) + (ulongword)-(b + 1);
+ return A >= MAX_LONGWORD ? MIN_LONGWORD :-(longword)A-2;
+ }
+ }
+ else if (b <= 0) return a + b;
+ else {
+ ulongword A = (ulongword)a + (ulongword)b;
+ return A > MAX_LONGWORD ? MAX_LONGWORD : A;
+ }
+}
+
+longword gsm_L_sub P2((a,b), longword a, longword b)
+{
+ if (a >= 0) {
+ if (b >= 0) return a - b;
+ else {
+ /* a>=0, b<0 */
+
+ ulongword A = (ulongword)a + -(b + 1);
+ return A >= MAX_LONGWORD ? MAX_LONGWORD : (A + 1);
+ }
+ }
+ else if (b <= 0) return a - b;
+ else {
+ /* a<0, b>0 */
+
+ ulongword A = (ulongword)-(a + 1) + b;
+ return A >= MAX_LONGWORD ? MIN_LONGWORD : -(longword)A - 1;
+ }
+}
+
+static unsigned char const bitoff[ 256 ] = {
+ 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+word gsm_norm P1((a), longword a )
+/*
+ * the number of left shifts needed to normalize the 32 bit
+ * variable L_var1 for positive values on the interval
+ *
+ * with minimum of
+ * minimum of 1073741824 (01000000000000000000000000000000) and
+ * maximum of 2147483647 (01111111111111111111111111111111)
+ *
+ *
+ * and for negative values on the interval with
+ * minimum of -2147483648 (-10000000000000000000000000000000) and
+ * maximum of -1073741824 ( -1000000000000000000000000000000).
+ *
+ * in order to normalize the result, the following
+ * operation must be done: L_norm_var1 = L_var1 << norm( L_var1 );
+ *
+ * (That's 'ffs', only from the left, not the right..)
+ */
+{
+ assert(a != 0);
+
+ if (a < 0) {
+ if (a <= -1073741824) return 0;
+ a = ~a;
+ }
+
+ return a & 0xffff0000
+ ? ( a & 0xff000000
+ ? -1 + bitoff[ 0xFF & (a >> 24) ]
+ : 7 + bitoff[ 0xFF & (a >> 16) ] )
+ : ( a & 0xff00
+ ? 15 + bitoff[ 0xFF & (a >> 8) ]
+ : 23 + bitoff[ 0xFF & a ] );
+}
+
+longword gsm_L_asl P2((a,n), longword a, int n)
+{
+ if (n >= 32) return 0;
+ if (n <= -32) return -(a < 0);
+ if (n < 0) return gsm_L_asr(a, -n);
+ return a << n;
+}
+
+word gsm_asl P2((a,n), word a, int n)
+{
+ if (n >= 16) return 0;
+ if (n <= -16) return -(a < 0);
+ if (n < 0) return gsm_asr(a, -n);
+ return a << n;
+}
+
+longword gsm_L_asr P2((a,n), longword a, int n)
+{
+ if (n >= 32) return -(a < 0);
+ if (n <= -32) return 0;
+ if (n < 0) return a << -n;
+
+# ifdef SASR
+ return a >> n;
+# else
+ if (a >= 0) return a >> n;
+ else return -(longword)( -(ulongword)a >> n );
+# endif
+}
+
+word gsm_asr P2((a,n), word a, int n)
+{
+ if (n >= 16) return -(a < 0);
+ if (n <= -16) return 0;
+ if (n < 0) return a << -n;
+
+# ifdef SASR
+ return a >> n;
+# else
+ if (a >= 0) return a >> n;
+ else return -(word)( -(uword)a >> n );
+# endif
+}
+
+/*
+ * (From p. 46, end of section 4.2.5)
+ *
+ * NOTE: The following lines gives [sic] one correct implementation
+ * of the div(num, denum) arithmetic operation. Compute div
+ * which is the integer division of num by denum: with denum
+ * >= num > 0
+ */
+
+word gsm_div P2((num,denum), word num, word denum)
+{
+ longword L_num = num;
+ longword L_denum = denum;
+ word div = 0;
+ int k = 15;
+
+ /* The parameter num sometimes becomes zero.
+ * Although this is explicitly guarded against in 4.2.5,
+ * we assume that the result should then be zero as well.
+ */
+
+ /* assert(num != 0); */
+
+ assert(num >= 0 && denum >= num);
+ if (num == 0)
+ return 0;
+
+ while (k--) {
+ div <<= 1;
+ L_num <<= 1;
+
+ if (L_num >= L_denum) {
+ L_num -= L_denum;
+ div++;
+ }
+ }
+
+ return div;
+}
diff --git a/jni/libgsm/src/code.c b/jni/libgsm/src/code.c
new file mode 100644
index 0000000..73ccebf
--- /dev/null
+++ b/jni/libgsm/src/code.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */
+
+#include "config.h"
+
+
+#ifdef HAS_STDLIB_H
+#include <stdlib.h>
+#else
+# include "proto.h"
+ extern char * memcpy P((char *, char *, int));
+#endif
+
+#include "private.h"
+#include "gsm.h"
+#include "proto.h"
+
+/*
+ * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER
+ */
+
+void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc),
+
+ struct gsm_state * S,
+
+ word * s, /* [0..159] samples IN */
+
+/*
+ * The RPE-LTD coder works on a frame by frame basis. The length of
+ * the frame is equal to 160 samples. Some computations are done
+ * once per frame to produce at the output of the coder the
+ * LARc[1..8] parameters which are the coded LAR coefficients and
+ * also to realize the inverse filtering operation for the entire
+ * frame (160 samples of signal d[0..159]). These parts produce at
+ * the output of the coder:
+ */
+
+ word * LARc, /* [0..7] LAR coefficients OUT */
+
+/*
+ * Procedure 4.2.11 to 4.2.18 are to be executed four times per
+ * frame. That means once for each sub-segment RPE-LTP analysis of
+ * 40 samples. These parts produce at the output of the coder:
+ */
+
+ word * Nc, /* [0..3] LTP lag OUT */
+ word * bc, /* [0..3] coded LTP gain OUT */
+ word * Mc, /* [0..3] RPE grid selection OUT */
+ word * xmaxc,/* [0..3] Coded maximum amplitude OUT */
+ word * xMc /* [13*4] normalized RPE samples OUT */
+)
+{
+ int k;
+ word * dp = S->dp0 + 120; /* [ -120...-1 ] */
+ word * dpp = dp; /* [ 0...39 ] */
+
+ static word e[50];
+
+ word so[160];
+
+ Gsm_Preprocess (S, s, so);
+ Gsm_LPC_Analysis (S, so, LARc);
+ Gsm_Short_Term_Analysis_Filter (S, LARc, so);
+
+ for (k = 0; k <= 3; k++, xMc += 13) {
+
+ Gsm_Long_Term_Predictor ( S,
+ so+k*40, /* d [0..39] IN */
+ dp, /* dp [-120..-1] IN */
+ e + 5, /* e [0..39] OUT */
+ dpp, /* dpp [0..39] OUT */
+ Nc++,
+ bc++);
+
+ Gsm_RPE_Encoding ( S,
+ e + 5, /* e ][0..39][ IN/OUT */
+ xmaxc++, Mc++, xMc );
+ /*
+ * Gsm_Update_of_reconstructed_short_time_residual_signal
+ * ( dpp, e + 5, dp );
+ */
+
+ { register int i;
+ register longword ltmp;
+ for (i = 0; i <= 39; i++)
+ dp[ i ] = GSM_ADD( e[5 + i], dpp[i] );
+ }
+ dp += 40;
+ dpp += 40;
+
+ }
+ (void)memcpy( (char *)S->dp0, (char *)(S->dp0 + 160),
+ 120 * sizeof(*S->dp0) );
+}
diff --git a/jni/libgsm/src/debug.c b/jni/libgsm/src/debug.c
new file mode 100644
index 0000000..04c3907
--- /dev/null
+++ b/jni/libgsm/src/debug.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/debug.c,v 1.2 1993/01/29 18:22:20 jutta Exp $ */
+
+#include "private.h"
+
+#ifndef NDEBUG
+
+/* If NDEBUG _is_ defined and no debugging should be performed,
+ * calls to functions in this module are #defined to nothing
+ * in private.h.
+ */
+
+#include <stdio.h>
+#include "proto.h"
+
+void gsm_debug_words P4( (name, from, to, ptr),
+ char * name,
+ int from,
+ int to,
+ word * ptr)
+{
+ int nprinted = 0;
+
+ fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
+ while (from <= to) {
+ fprintf(stderr, "%d ", ptr[ from ] );
+ from++;
+ if (nprinted++ >= 7) {
+ nprinted = 0;
+ if (from < to) putc('\n', stderr);
+ }
+ }
+ putc('\n', stderr);
+}
+
+void gsm_debug_longwords P4( (name, from, to, ptr),
+ char * name,
+ int from,
+ int to,
+ longword * ptr)
+{
+ int nprinted = 0;
+
+ fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
+ while (from <= to) {
+
+ fprintf(stderr, "%d ", ptr[ from ] );
+ from++;
+ if (nprinted++ >= 7) {
+ nprinted = 0;
+ if (from < to) putc('\n', stderr);
+ }
+ }
+ putc('\n', stderr);
+}
+
+void gsm_debug_longword P2( (name, value),
+ char * name,
+ longword value )
+{
+ fprintf(stderr, "%s: %d\n", name, (long)value );
+}
+
+void gsm_debug_word P2( (name, value),
+ char * name,
+ word value )
+{
+ fprintf(stderr, "%s: %d\n", name, (long)value);
+}
+
+#endif
diff --git a/jni/libgsm/src/decode.c b/jni/libgsm/src/decode.c
new file mode 100644
index 0000000..d51c54a
--- /dev/null
+++ b/jni/libgsm/src/decode.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/decode.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+#include <stdio.h>
+
+#include "private.h"
+#include "gsm.h"
+#include "proto.h"
+
+/*
+ * 4.3 FIXED POINT IMPLEMENTATION OF THE RPE-LTP DECODER
+ */
+
+static void Postprocessing P2((S,s),
+ struct gsm_state * S,
+ register word * s)
+{
+ register int k;
+ register word msr = S->msr;
+ register longword ltmp; /* for GSM_ADD */
+ register word tmp;
+
+ for (k = 160; k--; s++) {
+ tmp = GSM_MULT_R( msr, 28180 );
+ msr = GSM_ADD(*s, tmp); /* Deemphasis */
+ *s = GSM_ADD(msr, msr) & 0xFFF8; /* Truncation & Upscaling */
+ }
+ S->msr = msr;
+}
+
+void Gsm_Decoder P8((S,LARcr, Ncr,bcr,Mcr,xmaxcr,xMcr,s),
+ struct gsm_state * S,
+
+ word * LARcr, /* [0..7] IN */
+
+ word * Ncr, /* [0..3] IN */
+ word * bcr, /* [0..3] IN */
+ word * Mcr, /* [0..3] IN */
+ word * xmaxcr, /* [0..3] IN */
+ word * xMcr, /* [0..13*4] IN */
+
+ word * s) /* [0..159] OUT */
+{
+ int j, k;
+ word erp[40], wt[160];
+ word * drp = S->dp0 + 120;
+
+ for (j=0; j <= 3; j++, xmaxcr++, bcr++, Ncr++, Mcr++, xMcr += 13) {
+
+ Gsm_RPE_Decoding( S, *xmaxcr, *Mcr, xMcr, erp );
+ Gsm_Long_Term_Synthesis_Filtering( S, *Ncr, *bcr, erp, drp );
+
+ for (k = 0; k <= 39; k++) wt[ j * 40 + k ] = drp[ k ];
+ }
+
+ Gsm_Short_Term_Synthesis_Filter( S, LARcr, wt, s );
+ Postprocessing(S, s);
+}
diff --git a/jni/libgsm/src/gsm_create.c b/jni/libgsm/src/gsm_create.c
new file mode 100644
index 0000000..a0bf634
--- /dev/null
+++ b/jni/libgsm/src/gsm_create.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+static char const ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $";
+
+#include "config.h"
+
+#ifdef HAS_STRING_H
+#include <string.h>
+#else
+# include "proto.h"
+ extern char * memset P((char *, int, int));
+#endif
+
+#ifdef HAS_STDLIB_H
+# include <stdlib.h>
+#else
+# ifdef HAS_MALLOC_H
+# include <malloc.h>
+# else
+ extern char * malloc();
+# endif
+#endif
+
+#include <stdio.h>
+
+#include "gsm.h"
+#include "private.h"
+#include "proto.h"
+
+gsm gsm_create P0()
+{
+ gsm r;
+
+ r = (gsm)malloc(sizeof(struct gsm_state));
+ if (!r) return r;
+
+ memset((char *)r, 0, sizeof(*r));
+ r->nrp = 40;
+
+ return r;
+}
diff --git a/jni/libgsm/src/gsm_decode.c b/jni/libgsm/src/gsm_decode.c
new file mode 100644
index 0000000..973c08b
--- /dev/null
+++ b/jni/libgsm/src/gsm_decode.c
@@ -0,0 +1,361 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_decode.c,v 1.2 1996/07/02 09:59:05 jutta Exp $ */
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+int gsm_decode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target)
+{
+ word LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
+
+#ifdef WAV49
+ if (s->wav_fmt) {
+
+ uword sr = 0;
+
+ s->frame_index = !s->frame_index;
+ if (s->frame_index) {
+
+ sr = *c++;
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 2;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 4;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 2;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2; /* 5 */
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+ xmc[0] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 10 */
+ xmc[6] = sr & 0x7; sr >>= 3;
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+ xmc[13] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 15 */
+ xmc[14] = sr & 0x7; sr >>= 3;
+ xmc[15] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4; /* 20 */
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+ xmc[26] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 25 */
+ xmc[35] = sr & 0x7; sr >>= 3;
+ xmc[36] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+ xmc[39] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 30 */
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ xmc[44] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+
+ s->frame_chain = sr & 0xf;
+ }
+ else {
+ sr = s->frame_chain;
+ sr |= (uword)*c++ << 4; /* 1 */
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr = *c++;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 3;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 5 */
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+ xmc[0] = sr & 0x7; sr >>= 3;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ xmc[6] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 10 */
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+ xmc[13] = sr & 0x7; sr >>= 3;
+ xmc[14] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 15 */
+ xmc[15] = sr & 0x7; sr >>= 3;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1; /* 20 */
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+ xmc[26] = sr & 0x7; sr >>= 3;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ xmc[35] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 25 */
+ xmc[36] = sr & 0x7; sr >>= 3;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+ xmc[39] = sr & 0x7; sr >>= 3;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 30 */
+ xmc[44] = sr & 0x7; sr >>= 3;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+ }
+ }
+ else
+#endif
+ {
+ /* GSM_MAGIC = (*c >> 4) & 0xF; */
+
+ if (((*c >> 4) & 0x0F) != GSM_MAGIC) return -1;
+
+ LARc[0] = (*c++ & 0xF) << 2; /* 1 */
+ LARc[0] |= (*c >> 6) & 0x3;
+ LARc[1] = *c++ & 0x3F;
+ LARc[2] = (*c >> 3) & 0x1F;
+ LARc[3] = (*c++ & 0x7) << 2;
+ LARc[3] |= (*c >> 6) & 0x3;
+ LARc[4] = (*c >> 2) & 0xF;
+ LARc[5] = (*c++ & 0x3) << 2;
+ LARc[5] |= (*c >> 6) & 0x3;
+ LARc[6] = (*c >> 3) & 0x7;
+ LARc[7] = *c++ & 0x7;
+ Nc[0] = (*c >> 1) & 0x7F;
+ bc[0] = (*c++ & 0x1) << 1;
+ bc[0] |= (*c >> 7) & 0x1;
+ Mc[0] = (*c >> 5) & 0x3;
+ xmaxc[0] = (*c++ & 0x1F) << 1;
+ xmaxc[0] |= (*c >> 7) & 0x1;
+ xmc[0] = (*c >> 4) & 0x7;
+ xmc[1] = (*c >> 1) & 0x7;
+ xmc[2] = (*c++ & 0x1) << 2;
+ xmc[2] |= (*c >> 6) & 0x3;
+ xmc[3] = (*c >> 3) & 0x7;
+ xmc[4] = *c++ & 0x7;
+ xmc[5] = (*c >> 5) & 0x7;
+ xmc[6] = (*c >> 2) & 0x7;
+ xmc[7] = (*c++ & 0x3) << 1; /* 10 */
+ xmc[7] |= (*c >> 7) & 0x1;
+ xmc[8] = (*c >> 4) & 0x7;
+ xmc[9] = (*c >> 1) & 0x7;
+ xmc[10] = (*c++ & 0x1) << 2;
+ xmc[10] |= (*c >> 6) & 0x3;
+ xmc[11] = (*c >> 3) & 0x7;
+ xmc[12] = *c++ & 0x7;
+ Nc[1] = (*c >> 1) & 0x7F;
+ bc[1] = (*c++ & 0x1) << 1;
+ bc[1] |= (*c >> 7) & 0x1;
+ Mc[1] = (*c >> 5) & 0x3;
+ xmaxc[1] = (*c++ & 0x1F) << 1;
+ xmaxc[1] |= (*c >> 7) & 0x1;
+ xmc[13] = (*c >> 4) & 0x7;
+ xmc[14] = (*c >> 1) & 0x7;
+ xmc[15] = (*c++ & 0x1) << 2;
+ xmc[15] |= (*c >> 6) & 0x3;
+ xmc[16] = (*c >> 3) & 0x7;
+ xmc[17] = *c++ & 0x7;
+ xmc[18] = (*c >> 5) & 0x7;
+ xmc[19] = (*c >> 2) & 0x7;
+ xmc[20] = (*c++ & 0x3) << 1;
+ xmc[20] |= (*c >> 7) & 0x1;
+ xmc[21] = (*c >> 4) & 0x7;
+ xmc[22] = (*c >> 1) & 0x7;
+ xmc[23] = (*c++ & 0x1) << 2;
+ xmc[23] |= (*c >> 6) & 0x3;
+ xmc[24] = (*c >> 3) & 0x7;
+ xmc[25] = *c++ & 0x7;
+ Nc[2] = (*c >> 1) & 0x7F;
+ bc[2] = (*c++ & 0x1) << 1; /* 20 */
+ bc[2] |= (*c >> 7) & 0x1;
+ Mc[2] = (*c >> 5) & 0x3;
+ xmaxc[2] = (*c++ & 0x1F) << 1;
+ xmaxc[2] |= (*c >> 7) & 0x1;
+ xmc[26] = (*c >> 4) & 0x7;
+ xmc[27] = (*c >> 1) & 0x7;
+ xmc[28] = (*c++ & 0x1) << 2;
+ xmc[28] |= (*c >> 6) & 0x3;
+ xmc[29] = (*c >> 3) & 0x7;
+ xmc[30] = *c++ & 0x7;
+ xmc[31] = (*c >> 5) & 0x7;
+ xmc[32] = (*c >> 2) & 0x7;
+ xmc[33] = (*c++ & 0x3) << 1;
+ xmc[33] |= (*c >> 7) & 0x1;
+ xmc[34] = (*c >> 4) & 0x7;
+ xmc[35] = (*c >> 1) & 0x7;
+ xmc[36] = (*c++ & 0x1) << 2;
+ xmc[36] |= (*c >> 6) & 0x3;
+ xmc[37] = (*c >> 3) & 0x7;
+ xmc[38] = *c++ & 0x7;
+ Nc[3] = (*c >> 1) & 0x7F;
+ bc[3] = (*c++ & 0x1) << 1;
+ bc[3] |= (*c >> 7) & 0x1;
+ Mc[3] = (*c >> 5) & 0x3;
+ xmaxc[3] = (*c++ & 0x1F) << 1;
+ xmaxc[3] |= (*c >> 7) & 0x1;
+ xmc[39] = (*c >> 4) & 0x7;
+ xmc[40] = (*c >> 1) & 0x7;
+ xmc[41] = (*c++ & 0x1) << 2;
+ xmc[41] |= (*c >> 6) & 0x3;
+ xmc[42] = (*c >> 3) & 0x7;
+ xmc[43] = *c++ & 0x7; /* 30 */
+ xmc[44] = (*c >> 5) & 0x7;
+ xmc[45] = (*c >> 2) & 0x7;
+ xmc[46] = (*c++ & 0x3) << 1;
+ xmc[46] |= (*c >> 7) & 0x1;
+ xmc[47] = (*c >> 4) & 0x7;
+ xmc[48] = (*c >> 1) & 0x7;
+ xmc[49] = (*c++ & 0x1) << 2;
+ xmc[49] |= (*c >> 6) & 0x3;
+ xmc[50] = (*c >> 3) & 0x7;
+ xmc[51] = *c & 0x7; /* 33 */
+ }
+
+ Gsm_Decoder(s, LARc, Nc, bc, Mc, xmaxc, xmc, target);
+
+ return 0;
+}
diff --git a/jni/libgsm/src/gsm_destroy.c b/jni/libgsm/src/gsm_destroy.c
new file mode 100644
index 0000000..03c8659
--- /dev/null
+++ b/jni/libgsm/src/gsm_destroy.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */
+
+#include "gsm.h"
+#include "config.h"
+#include "proto.h"
+
+#ifdef HAS_STDLIB_H
+# include <stdlib.h>
+#else
+# ifdef HAS_MALLOC_H
+# include <malloc.h>
+# else
+ extern void free();
+# endif
+#endif
+
+void gsm_destroy P1((S), gsm S)
+{
+ if (S) free((char *)S);
+}
diff --git a/jni/libgsm/src/gsm_encode.c b/jni/libgsm/src/gsm_encode.c
new file mode 100644
index 0000000..51bc556
--- /dev/null
+++ b/jni/libgsm/src/gsm_encode.c
@@ -0,0 +1,451 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_encode.c,v 1.2 1996/07/02 09:59:05 jutta Exp $ */
+
+#include "private.h"
+#include "gsm.h"
+#include "proto.h"
+
+void gsm_encode P3((s, source, c), gsm s, gsm_signal * source, gsm_byte * c)
+{
+ word LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
+
+ Gsm_Coder(s, source, LARc, Nc, bc, Mc, xmaxc, xmc);
+
+
+ /* variable size
+
+ GSM_MAGIC 4
+
+ LARc[0] 6
+ LARc[1] 6
+ LARc[2] 5
+ LARc[3] 5
+ LARc[4] 4
+ LARc[5] 4
+ LARc[6] 3
+ LARc[7] 3
+
+ Nc[0] 7
+ bc[0] 2
+ Mc[0] 2
+ xmaxc[0] 6
+ xmc[0] 3
+ xmc[1] 3
+ xmc[2] 3
+ xmc[3] 3
+ xmc[4] 3
+ xmc[5] 3
+ xmc[6] 3
+ xmc[7] 3
+ xmc[8] 3
+ xmc[9] 3
+ xmc[10] 3
+ xmc[11] 3
+ xmc[12] 3
+
+ Nc[1] 7
+ bc[1] 2
+ Mc[1] 2
+ xmaxc[1] 6
+ xmc[13] 3
+ xmc[14] 3
+ xmc[15] 3
+ xmc[16] 3
+ xmc[17] 3
+ xmc[18] 3
+ xmc[19] 3
+ xmc[20] 3
+ xmc[21] 3
+ xmc[22] 3
+ xmc[23] 3
+ xmc[24] 3
+ xmc[25] 3
+
+ Nc[2] 7
+ bc[2] 2
+ Mc[2] 2
+ xmaxc[2] 6
+ xmc[26] 3
+ xmc[27] 3
+ xmc[28] 3
+ xmc[29] 3
+ xmc[30] 3
+ xmc[31] 3
+ xmc[32] 3
+ xmc[33] 3
+ xmc[34] 3
+ xmc[35] 3
+ xmc[36] 3
+ xmc[37] 3
+ xmc[38] 3
+
+ Nc[3] 7
+ bc[3] 2
+ Mc[3] 2
+ xmaxc[3] 6
+ xmc[39] 3
+ xmc[40] 3
+ xmc[41] 3
+ xmc[42] 3
+ xmc[43] 3
+ xmc[44] 3
+ xmc[45] 3
+ xmc[46] 3
+ xmc[47] 3
+ xmc[48] 3
+ xmc[49] 3
+ xmc[50] 3
+ xmc[51] 3
+ */
+
+#ifdef WAV49
+
+ if (s->wav_fmt) {
+ s->frame_index = !s->frame_index;
+ if (s->frame_index) {
+
+ uword sr;
+
+ sr = 0;
+ sr = sr >> 6 | LARc[0] << 10;
+ sr = sr >> 6 | LARc[1] << 10;
+ *c++ = sr >> 4;
+ sr = sr >> 5 | LARc[2] << 11;
+ *c++ = sr >> 7;
+ sr = sr >> 5 | LARc[3] << 11;
+ sr = sr >> 4 | LARc[4] << 12;
+ *c++ = sr >> 6;
+ sr = sr >> 4 | LARc[5] << 12;
+ sr = sr >> 3 | LARc[6] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | LARc[7] << 13;
+ sr = sr >> 7 | Nc[0] << 9;
+ *c++ = sr >> 5;
+ sr = sr >> 2 | bc[0] << 14;
+ sr = sr >> 2 | Mc[0] << 14;
+ sr = sr >> 6 | xmaxc[0] << 10;
+ *c++ = sr >> 3;
+ sr = sr >> 3 | xmc[0] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[1] << 13;
+ sr = sr >> 3 | xmc[2] << 13;
+ sr = sr >> 3 | xmc[3] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[4] << 13;
+ sr = sr >> 3 | xmc[5] << 13;
+ sr = sr >> 3 | xmc[6] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[7] << 13;
+ sr = sr >> 3 | xmc[8] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[9] << 13;
+ sr = sr >> 3 | xmc[10] << 13;
+ sr = sr >> 3 | xmc[11] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[12] << 13;
+ sr = sr >> 7 | Nc[1] << 9;
+ *c++ = sr >> 5;
+ sr = sr >> 2 | bc[1] << 14;
+ sr = sr >> 2 | Mc[1] << 14;
+ sr = sr >> 6 | xmaxc[1] << 10;
+ *c++ = sr >> 3;
+ sr = sr >> 3 | xmc[13] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[14] << 13;
+ sr = sr >> 3 | xmc[15] << 13;
+ sr = sr >> 3 | xmc[16] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[17] << 13;
+ sr = sr >> 3 | xmc[18] << 13;
+ sr = sr >> 3 | xmc[19] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[20] << 13;
+ sr = sr >> 3 | xmc[21] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[22] << 13;
+ sr = sr >> 3 | xmc[23] << 13;
+ sr = sr >> 3 | xmc[24] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[25] << 13;
+ sr = sr >> 7 | Nc[2] << 9;
+ *c++ = sr >> 5;
+ sr = sr >> 2 | bc[2] << 14;
+ sr = sr >> 2 | Mc[2] << 14;
+ sr = sr >> 6 | xmaxc[2] << 10;
+ *c++ = sr >> 3;
+ sr = sr >> 3 | xmc[26] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[27] << 13;
+ sr = sr >> 3 | xmc[28] << 13;
+ sr = sr >> 3 | xmc[29] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[30] << 13;
+ sr = sr >> 3 | xmc[31] << 13;
+ sr = sr >> 3 | xmc[32] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[33] << 13;
+ sr = sr >> 3 | xmc[34] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[35] << 13;
+ sr = sr >> 3 | xmc[36] << 13;
+ sr = sr >> 3 | xmc[37] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[38] << 13;
+ sr = sr >> 7 | Nc[3] << 9;
+ *c++ = sr >> 5;
+ sr = sr >> 2 | bc[3] << 14;
+ sr = sr >> 2 | Mc[3] << 14;
+ sr = sr >> 6 | xmaxc[3] << 10;
+ *c++ = sr >> 3;
+ sr = sr >> 3 | xmc[39] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[40] << 13;
+ sr = sr >> 3 | xmc[41] << 13;
+ sr = sr >> 3 | xmc[42] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[43] << 13;
+ sr = sr >> 3 | xmc[44] << 13;
+ sr = sr >> 3 | xmc[45] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[46] << 13;
+ sr = sr >> 3 | xmc[47] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[48] << 13;
+ sr = sr >> 3 | xmc[49] << 13;
+ sr = sr >> 3 | xmc[50] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[51] << 13;
+ sr = sr >> 4;
+ *c = sr >> 8;
+ s->frame_chain = *c;
+ }
+ else {
+ uword sr;
+
+ sr = 0;
+ sr = sr >> 4 | s->frame_chain << 12;
+ sr = sr >> 6 | LARc[0] << 10;
+ *c++ = sr >> 6;
+ sr = sr >> 6 | LARc[1] << 10;
+ *c++ = sr >> 8;
+ sr = sr >> 5 | LARc[2] << 11;
+ sr = sr >> 5 | LARc[3] << 11;
+ *c++ = sr >> 6;
+ sr = sr >> 4 | LARc[4] << 12;
+ sr = sr >> 4 | LARc[5] << 12;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | LARc[6] << 13;
+ sr = sr >> 3 | LARc[7] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 7 | Nc[0] << 9;
+ sr = sr >> 2 | bc[0] << 14;
+ *c++ = sr >> 7;
+ sr = sr >> 2 | Mc[0] << 14;
+ sr = sr >> 6 | xmaxc[0] << 10;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[0] << 13;
+ sr = sr >> 3 | xmc[1] << 13;
+ sr = sr >> 3 | xmc[2] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[3] << 13;
+ sr = sr >> 3 | xmc[4] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[5] << 13;
+ sr = sr >> 3 | xmc[6] << 13;
+ sr = sr >> 3 | xmc[7] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[8] << 13;
+ sr = sr >> 3 | xmc[9] << 13;
+ sr = sr >> 3 | xmc[10] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[11] << 13;
+ sr = sr >> 3 | xmc[12] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 7 | Nc[1] << 9;
+ sr = sr >> 2 | bc[1] << 14;
+ *c++ = sr >> 7;
+ sr = sr >> 2 | Mc[1] << 14;
+ sr = sr >> 6 | xmaxc[1] << 10;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[13] << 13;
+ sr = sr >> 3 | xmc[14] << 13;
+ sr = sr >> 3 | xmc[15] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[16] << 13;
+ sr = sr >> 3 | xmc[17] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[18] << 13;
+ sr = sr >> 3 | xmc[19] << 13;
+ sr = sr >> 3 | xmc[20] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[21] << 13;
+ sr = sr >> 3 | xmc[22] << 13;
+ sr = sr >> 3 | xmc[23] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[24] << 13;
+ sr = sr >> 3 | xmc[25] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 7 | Nc[2] << 9;
+ sr = sr >> 2 | bc[2] << 14;
+ *c++ = sr >> 7;
+ sr = sr >> 2 | Mc[2] << 14;
+ sr = sr >> 6 | xmaxc[2] << 10;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[26] << 13;
+ sr = sr >> 3 | xmc[27] << 13;
+ sr = sr >> 3 | xmc[28] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[29] << 13;
+ sr = sr >> 3 | xmc[30] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[31] << 13;
+ sr = sr >> 3 | xmc[32] << 13;
+ sr = sr >> 3 | xmc[33] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[34] << 13;
+ sr = sr >> 3 | xmc[35] << 13;
+ sr = sr >> 3 | xmc[36] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[37] << 13;
+ sr = sr >> 3 | xmc[38] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 7 | Nc[3] << 9;
+ sr = sr >> 2 | bc[3] << 14;
+ *c++ = sr >> 7;
+ sr = sr >> 2 | Mc[3] << 14;
+ sr = sr >> 6 | xmaxc[3] << 10;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[39] << 13;
+ sr = sr >> 3 | xmc[40] << 13;
+ sr = sr >> 3 | xmc[41] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[42] << 13;
+ sr = sr >> 3 | xmc[43] << 13;
+ *c++ = sr >> 8;
+ sr = sr >> 3 | xmc[44] << 13;
+ sr = sr >> 3 | xmc[45] << 13;
+ sr = sr >> 3 | xmc[46] << 13;
+ *c++ = sr >> 7;
+ sr = sr >> 3 | xmc[47] << 13;
+ sr = sr >> 3 | xmc[48] << 13;
+ sr = sr >> 3 | xmc[49] << 13;
+ *c++ = sr >> 6;
+ sr = sr >> 3 | xmc[50] << 13;
+ sr = sr >> 3 | xmc[51] << 13;
+ *c++ = sr >> 8;
+ }
+ }
+
+ else
+
+#endif /* WAV49 */
+ {
+
+ *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */
+ | ((LARc[0] >> 2) & 0xF);
+ *c++ = ((LARc[0] & 0x3) << 6)
+ | (LARc[1] & 0x3F);
+ *c++ = ((LARc[2] & 0x1F) << 3)
+ | ((LARc[3] >> 2) & 0x7);
+ *c++ = ((LARc[3] & 0x3) << 6)
+ | ((LARc[4] & 0xF) << 2)
+ | ((LARc[5] >> 2) & 0x3);
+ *c++ = ((LARc[5] & 0x3) << 6)
+ | ((LARc[6] & 0x7) << 3)
+ | (LARc[7] & 0x7);
+ *c++ = ((Nc[0] & 0x7F) << 1)
+ | ((bc[0] >> 1) & 0x1);
+ *c++ = ((bc[0] & 0x1) << 7)
+ | ((Mc[0] & 0x3) << 5)
+ | ((xmaxc[0] >> 1) & 0x1F);
+ *c++ = ((xmaxc[0] & 0x1) << 7)
+ | ((xmc[0] & 0x7) << 4)
+ | ((xmc[1] & 0x7) << 1)
+ | ((xmc[2] >> 2) & 0x1);
+ *c++ = ((xmc[2] & 0x3) << 6)
+ | ((xmc[3] & 0x7) << 3)
+ | (xmc[4] & 0x7);
+ *c++ = ((xmc[5] & 0x7) << 5) /* 10 */
+ | ((xmc[6] & 0x7) << 2)
+ | ((xmc[7] >> 1) & 0x3);
+ *c++ = ((xmc[7] & 0x1) << 7)
+ | ((xmc[8] & 0x7) << 4)
+ | ((xmc[9] & 0x7) << 1)
+ | ((xmc[10] >> 2) & 0x1);
+ *c++ = ((xmc[10] & 0x3) << 6)
+ | ((xmc[11] & 0x7) << 3)
+ | (xmc[12] & 0x7);
+ *c++ = ((Nc[1] & 0x7F) << 1)
+ | ((bc[1] >> 1) & 0x1);
+ *c++ = ((bc[1] & 0x1) << 7)
+ | ((Mc[1] & 0x3) << 5)
+ | ((xmaxc[1] >> 1) & 0x1F);
+ *c++ = ((xmaxc[1] & 0x1) << 7)
+ | ((xmc[13] & 0x7) << 4)
+ | ((xmc[14] & 0x7) << 1)
+ | ((xmc[15] >> 2) & 0x1);
+ *c++ = ((xmc[15] & 0x3) << 6)
+ | ((xmc[16] & 0x7) << 3)
+ | (xmc[17] & 0x7);
+ *c++ = ((xmc[18] & 0x7) << 5)
+ | ((xmc[19] & 0x7) << 2)
+ | ((xmc[20] >> 1) & 0x3);
+ *c++ = ((xmc[20] & 0x1) << 7)
+ | ((xmc[21] & 0x7) << 4)
+ | ((xmc[22] & 0x7) << 1)
+ | ((xmc[23] >> 2) & 0x1);
+ *c++ = ((xmc[23] & 0x3) << 6)
+ | ((xmc[24] & 0x7) << 3)
+ | (xmc[25] & 0x7);
+ *c++ = ((Nc[2] & 0x7F) << 1) /* 20 */
+ | ((bc[2] >> 1) & 0x1);
+ *c++ = ((bc[2] & 0x1) << 7)
+ | ((Mc[2] & 0x3) << 5)
+ | ((xmaxc[2] >> 1) & 0x1F);
+ *c++ = ((xmaxc[2] & 0x1) << 7)
+ | ((xmc[26] & 0x7) << 4)
+ | ((xmc[27] & 0x7) << 1)
+ | ((xmc[28] >> 2) & 0x1);
+ *c++ = ((xmc[28] & 0x3) << 6)
+ | ((xmc[29] & 0x7) << 3)
+ | (xmc[30] & 0x7);
+ *c++ = ((xmc[31] & 0x7) << 5)
+ | ((xmc[32] & 0x7) << 2)
+ | ((xmc[33] >> 1) & 0x3);
+ *c++ = ((xmc[33] & 0x1) << 7)
+ | ((xmc[34] & 0x7) << 4)
+ | ((xmc[35] & 0x7) << 1)
+ | ((xmc[36] >> 2) & 0x1);
+ *c++ = ((xmc[36] & 0x3) << 6)
+ | ((xmc[37] & 0x7) << 3)
+ | (xmc[38] & 0x7);
+ *c++ = ((Nc[3] & 0x7F) << 1)
+ | ((bc[3] >> 1) & 0x1);
+ *c++ = ((bc[3] & 0x1) << 7)
+ | ((Mc[3] & 0x3) << 5)
+ | ((xmaxc[3] >> 1) & 0x1F);
+ *c++ = ((xmaxc[3] & 0x1) << 7)
+ | ((xmc[39] & 0x7) << 4)
+ | ((xmc[40] & 0x7) << 1)
+ | ((xmc[41] >> 2) & 0x1);
+ *c++ = ((xmc[41] & 0x3) << 6) /* 30 */
+ | ((xmc[42] & 0x7) << 3)
+ | (xmc[43] & 0x7);
+ *c++ = ((xmc[44] & 0x7) << 5)
+ | ((xmc[45] & 0x7) << 2)
+ | ((xmc[46] >> 1) & 0x3);
+ *c++ = ((xmc[46] & 0x1) << 7)
+ | ((xmc[47] & 0x7) << 4)
+ | ((xmc[48] & 0x7) << 1)
+ | ((xmc[49] >> 2) & 0x1);
+ *c++ = ((xmc[49] & 0x3) << 6)
+ | ((xmc[50] & 0x7) << 3)
+ | (xmc[51] & 0x7);
+
+ }
+}
diff --git a/jni/libgsm/src/gsm_explode.c b/jni/libgsm/src/gsm_explode.c
new file mode 100644
index 0000000..ca48f9b
--- /dev/null
+++ b/jni/libgsm/src/gsm_explode.c
@@ -0,0 +1,417 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_explode.c,v 1.2 1996/07/02 14:32:42 jutta Exp jutta $ */
+
+#include "private.h"
+#include "gsm.h"
+#include "proto.h"
+
+int gsm_explode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target)
+{
+# define LARc target
+# define Nc *((gsm_signal (*) [17])(target + 8))
+# define bc *((gsm_signal (*) [17])(target + 9))
+# define Mc *((gsm_signal (*) [17])(target + 10))
+# define xmaxc *((gsm_signal (*) [17])(target + 11))
+
+
+#ifdef WAV49
+ if (s->wav_fmt) {
+
+ uword sr = 0;
+
+ if (s->frame_index == 1) {
+
+ sr = *c++;
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 2;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 4;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 2;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2; /* 5 */
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 12)
+ xmc[0] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 10 */
+ xmc[6] = sr & 0x7; sr >>= 3;
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 29 - 13)
+
+ xmc[13] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 15 */
+ xmc[14] = sr & 0x7; sr >>= 3;
+ xmc[15] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4; /* 20 */
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+
+#undef xmc
+#define xmc (target + 46 - 26)
+
+ xmc[26] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 25 */
+ xmc[35] = sr & 0x7; sr >>= 3;
+ xmc[36] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 63 - 39)
+
+ xmc[39] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 30 */
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ xmc[44] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+
+ s->frame_chain = sr & 0xf;
+ }
+ else {
+ sr = s->frame_chain;
+ sr |= (uword)*c++ << 4; /* 1 */
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr = *c++;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 3;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 5 */
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 12)
+ xmc[0] = sr & 0x7; sr >>= 3;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ xmc[6] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 10 */
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 29 - 13)
+
+ xmc[13] = sr & 0x7; sr >>= 3;
+ xmc[14] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 15 */
+ xmc[15] = sr & 0x7; sr >>= 3;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1; /* 20 */
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (target + 46 - 26)
+ xmc[26] = sr & 0x7; sr >>= 3;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ xmc[35] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 25 */
+ xmc[36] = sr & 0x7; sr >>= 3;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+
+#undef xmc
+#define xmc (target + 63 - 39)
+
+ xmc[39] = sr & 0x7; sr >>= 3;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 30 */
+ xmc[44] = sr & 0x7; sr >>= 3;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+ }
+ }
+ else
+#endif
+ {
+ /* GSM_MAGIC = (*c >> 4) & 0xF; */
+
+ if (((*c >> 4) & 0x0F) != GSM_MAGIC) return -1;
+
+ LARc[0] = (*c++ & 0xF) << 2; /* 1 */
+ LARc[0] |= (*c >> 6) & 0x3;
+ LARc[1] = *c++ & 0x3F;
+ LARc[2] = (*c >> 3) & 0x1F;
+ LARc[3] = (*c++ & 0x7) << 2;
+ LARc[3] |= (*c >> 6) & 0x3;
+ LARc[4] = (*c >> 2) & 0xF;
+ LARc[5] = (*c++ & 0x3) << 2;
+ LARc[5] |= (*c >> 6) & 0x3;
+ LARc[6] = (*c >> 3) & 0x7;
+ LARc[7] = *c++ & 0x7;
+
+ Nc[0] = (*c >> 1) & 0x7F;
+
+ bc[0] = (*c++ & 0x1) << 1;
+ bc[0] |= (*c >> 7) & 0x1;
+
+ Mc[0] = (*c >> 5) & 0x3;
+
+ xmaxc[0] = (*c++ & 0x1F) << 1;
+ xmaxc[0] |= (*c >> 7) & 0x1;
+
+#undef xmc
+#define xmc (target + 12)
+
+ xmc[0] = (*c >> 4) & 0x7;
+ xmc[1] = (*c >> 1) & 0x7;
+ xmc[2] = (*c++ & 0x1) << 2;
+ xmc[2] |= (*c >> 6) & 0x3;
+ xmc[3] = (*c >> 3) & 0x7;
+ xmc[4] = *c++ & 0x7;
+ xmc[5] = (*c >> 5) & 0x7;
+ xmc[6] = (*c >> 2) & 0x7;
+ xmc[7] = (*c++ & 0x3) << 1; /* 10 */
+ xmc[7] |= (*c >> 7) & 0x1;
+ xmc[8] = (*c >> 4) & 0x7;
+ xmc[9] = (*c >> 1) & 0x7;
+ xmc[10] = (*c++ & 0x1) << 2;
+ xmc[10] |= (*c >> 6) & 0x3;
+ xmc[11] = (*c >> 3) & 0x7;
+ xmc[12] = *c++ & 0x7;
+
+ Nc[1] = (*c >> 1) & 0x7F;
+
+ bc[1] = (*c++ & 0x1) << 1;
+ bc[1] |= (*c >> 7) & 0x1;
+
+ Mc[1] = (*c >> 5) & 0x3;
+
+ xmaxc[1] = (*c++ & 0x1F) << 1;
+ xmaxc[1] |= (*c >> 7) & 0x1;
+
+#undef xmc
+#define xmc (target + 29 - 13)
+
+ xmc[13] = (*c >> 4) & 0x7;
+ xmc[14] = (*c >> 1) & 0x7;
+ xmc[15] = (*c++ & 0x1) << 2;
+ xmc[15] |= (*c >> 6) & 0x3;
+ xmc[16] = (*c >> 3) & 0x7;
+ xmc[17] = *c++ & 0x7;
+ xmc[18] = (*c >> 5) & 0x7;
+ xmc[19] = (*c >> 2) & 0x7;
+ xmc[20] = (*c++ & 0x3) << 1;
+ xmc[20] |= (*c >> 7) & 0x1;
+ xmc[21] = (*c >> 4) & 0x7;
+ xmc[22] = (*c >> 1) & 0x7;
+ xmc[23] = (*c++ & 0x1) << 2;
+ xmc[23] |= (*c >> 6) & 0x3;
+ xmc[24] = (*c >> 3) & 0x7;
+ xmc[25] = *c++ & 0x7;
+
+ Nc[2] = (*c >> 1) & 0x7F;
+
+ bc[2] = (*c++ & 0x1) << 1; /* 20 */
+ bc[2] |= (*c >> 7) & 0x1;
+
+ Mc[2] = (*c >> 5) & 0x3;
+
+ xmaxc[2] = (*c++ & 0x1F) << 1;
+ xmaxc[2] |= (*c >> 7) & 0x1;
+
+#undef xmc
+#define xmc (target + 46 - 26)
+
+ xmc[26] = (*c >> 4) & 0x7;
+ xmc[27] = (*c >> 1) & 0x7;
+ xmc[28] = (*c++ & 0x1) << 2;
+ xmc[28] |= (*c >> 6) & 0x3;
+ xmc[29] = (*c >> 3) & 0x7;
+ xmc[30] = *c++ & 0x7;
+ xmc[31] = (*c >> 5) & 0x7;
+ xmc[32] = (*c >> 2) & 0x7;
+ xmc[33] = (*c++ & 0x3) << 1;
+ xmc[33] |= (*c >> 7) & 0x1;
+ xmc[34] = (*c >> 4) & 0x7;
+ xmc[35] = (*c >> 1) & 0x7;
+ xmc[36] = (*c++ & 0x1) << 2;
+ xmc[36] |= (*c >> 6) & 0x3;
+ xmc[37] = (*c >> 3) & 0x7;
+ xmc[38] = *c++ & 0x7;
+
+ Nc[3] = (*c >> 1) & 0x7F;
+
+ bc[3] = (*c++ & 0x1) << 1;
+ bc[3] |= (*c >> 7) & 0x1;
+
+ Mc[3] = (*c >> 5) & 0x3;
+
+ xmaxc[3] = (*c++ & 0x1F) << 1;
+ xmaxc[3] |= (*c >> 7) & 0x1;
+
+#undef xmc
+#define xmc (target + 63 - 39)
+
+ xmc[39] = (*c >> 4) & 0x7;
+ xmc[40] = (*c >> 1) & 0x7;
+ xmc[41] = (*c++ & 0x1) << 2;
+ xmc[41] |= (*c >> 6) & 0x3;
+ xmc[42] = (*c >> 3) & 0x7;
+ xmc[43] = *c++ & 0x7; /* 30 */
+ xmc[44] = (*c >> 5) & 0x7;
+ xmc[45] = (*c >> 2) & 0x7;
+ xmc[46] = (*c++ & 0x3) << 1;
+ xmc[46] |= (*c >> 7) & 0x1;
+ xmc[47] = (*c >> 4) & 0x7;
+ xmc[48] = (*c >> 1) & 0x7;
+ xmc[49] = (*c++ & 0x1) << 2;
+ xmc[49] |= (*c >> 6) & 0x3;
+ xmc[50] = (*c >> 3) & 0x7;
+ xmc[51] = *c & 0x7; /* 33 */
+ }
+
+ return 0;
+}
diff --git a/jni/libgsm/src/gsm_implode.c b/jni/libgsm/src/gsm_implode.c
new file mode 100644
index 0000000..39b79cb
--- /dev/null
+++ b/jni/libgsm/src/gsm_implode.c
@@ -0,0 +1,515 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_implode.c,v 1.2 1996/07/02 14:32:43 jutta Exp jutta $ */
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+void gsm_implode P3((s, source, c), gsm s, gsm_signal * source, gsm_byte * c)
+{
+ /* variable size index
+
+ GSM_MAGIC 4 -
+
+ LARc[0] 6 0
+ LARc[1] 6 1
+ LARc[2] 5 2
+ LARc[3] 5 3
+ LARc[4] 4 4
+ LARc[5] 4 5
+ LARc[6] 3 6
+ LARc[7] 3 7
+
+ Nc[0] 7 8
+ bc[0] 2 9
+ Mc[0] 2 10
+ xmaxc[0] 6 11
+ xmc[0] 3 12
+ xmc[1] 3 13
+ xmc[2] 3 14
+ xmc[3] 3 15
+ xmc[4] 3 16
+ xmc[5] 3 17
+ xmc[6] 3 18
+ xmc[7] 3 19
+ xmc[8] 3 20
+ xmc[9] 3 21
+ xmc[10] 3 22
+ xmc[11] 3 23
+ xmc[12] 3 24
+
+ Nc[1] 7 25
+ bc[1] 2 26
+ Mc[1] 2 27
+ xmaxc[1] 6 28
+ xmc[13] 3 29
+ xmc[14] 3 30
+ xmc[15] 3 31
+ xmc[16] 3 32
+ xmc[17] 3 33
+ xmc[18] 3 34
+ xmc[19] 3 35
+ xmc[20] 3 36
+ xmc[21] 3 37
+ xmc[22] 3 38
+ xmc[23] 3 39
+ xmc[24] 3 40
+ xmc[25] 3 41
+
+ Nc[2] 7 42
+ bc[2] 2 43
+ Mc[2] 2 44
+ xmaxc[2] 6 45
+ xmc[26] 3 46
+ xmc[27] 3 47
+ xmc[28] 3 48
+ xmc[29] 3 49
+ xmc[30] 3 50
+ xmc[31] 3 51
+ xmc[32] 3 52
+ xmc[33] 3 53
+ xmc[34] 3 54
+ xmc[35] 3 55
+ xmc[36] 3 56
+ xmc[37] 3 57
+ xmc[38] 3 58
+
+ Nc[3] 7 59
+ bc[3] 2 60
+ Mc[3] 2 61
+ xmaxc[3] 6 62
+ xmc[39] 3 63
+ xmc[40] 3 64
+ xmc[41] 3 65
+ xmc[42] 3 66
+ xmc[43] 3 67
+ xmc[44] 3 68
+ xmc[45] 3 69
+ xmc[46] 3 70
+ xmc[47] 3 71
+ xmc[48] 3 72
+ xmc[49] 3 73
+ xmc[50] 3 74
+ xmc[51] 3 75
+ */
+
+ /* There are 76 parameters per frame. The first eight are
+ * unique. The remaining 68 are four identical subframes of
+ * 17 parameters each. gsm_implode converts from a representation
+ * of these parameters as values in one array of signed words
+ * to the "packed" version of a GSM frame.
+ */
+
+# define LARc source
+# define Nc *((gsm_signal (*) [17])(source + 8))
+# define bc *((gsm_signal (*) [17])(source + 9))
+# define Mc *((gsm_signal (*) [17])(source + 10))
+# define xmaxc *((gsm_signal (*) [17])(source + 11))
+
+#ifdef WAV49
+ if (s->wav_fmt) {
+
+ uword sr = 0;
+ if (s->frame_index == 0) {
+
+ sr = *c++;
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 2;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr |= (uword)*c++ << 4;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 2;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2; /* 5 */
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 12)
+ xmc[0] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 10 */
+ xmc[6] = sr & 0x7; sr >>= 3;
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 29 - 13)
+ xmc[13] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 15 */
+ xmc[14] = sr & 0x7; sr >>= 3;
+ xmc[15] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4; /* 20 */
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 46 - 26)
+ xmc[26] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 25 */
+ xmc[35] = sr & 0x7; sr >>= 3;
+ xmc[36] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 4;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 1;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 63 - 39)
+
+ xmc[39] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 30 */
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ xmc[44] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+
+ s->frame_chain = sr & 0xf;
+ }
+ else {
+ sr = s->frame_chain;
+ sr |= (uword)*c++ << 4; /* 1 */
+ LARc[0] = sr & 0x3f; sr >>= 6;
+ LARc[1] = sr & 0x3f; sr >>= 6;
+ sr = *c++;
+ LARc[2] = sr & 0x1f; sr >>= 5;
+ sr |= (uword)*c++ << 3;
+ LARc[3] = sr & 0x1f; sr >>= 5;
+ LARc[4] = sr & 0xf; sr >>= 4;
+ sr |= (uword)*c++ << 2;
+ LARc[5] = sr & 0xf; sr >>= 4;
+ LARc[6] = sr & 0x7; sr >>= 3;
+ LARc[7] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 5 */
+ Nc[0] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[0] = sr & 0x3; sr >>= 2;
+ Mc[0] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[0] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 12)
+ xmc[0] = sr & 0x7; sr >>= 3;
+ xmc[1] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[2] = sr & 0x7; sr >>= 3;
+ xmc[3] = sr & 0x7; sr >>= 3;
+ xmc[4] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[5] = sr & 0x7; sr >>= 3;
+ xmc[6] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2; /* 10 */
+ xmc[7] = sr & 0x7; sr >>= 3;
+ xmc[8] = sr & 0x7; sr >>= 3;
+ xmc[9] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[10] = sr & 0x7; sr >>= 3;
+ xmc[11] = sr & 0x7; sr >>= 3;
+ xmc[12] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[1] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[1] = sr & 0x3; sr >>= 2;
+ Mc[1] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[1] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 29 - 13)
+ xmc[13] = sr & 0x7; sr >>= 3;
+ xmc[14] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 15 */
+ xmc[15] = sr & 0x7; sr >>= 3;
+ xmc[16] = sr & 0x7; sr >>= 3;
+ xmc[17] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[18] = sr & 0x7; sr >>= 3;
+ xmc[19] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[20] = sr & 0x7; sr >>= 3;
+ xmc[21] = sr & 0x7; sr >>= 3;
+ xmc[22] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[23] = sr & 0x7; sr >>= 3;
+ xmc[24] = sr & 0x7; sr >>= 3;
+ xmc[25] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[2] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1; /* 20 */
+ bc[2] = sr & 0x3; sr >>= 2;
+ Mc[2] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[2] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 46 - 26)
+ xmc[26] = sr & 0x7; sr >>= 3;
+ xmc[27] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[28] = sr & 0x7; sr >>= 3;
+ xmc[29] = sr & 0x7; sr >>= 3;
+ xmc[30] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ xmc[31] = sr & 0x7; sr >>= 3;
+ xmc[32] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[33] = sr & 0x7; sr >>= 3;
+ xmc[34] = sr & 0x7; sr >>= 3;
+ xmc[35] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1; /* 25 */
+ xmc[36] = sr & 0x7; sr >>= 3;
+ xmc[37] = sr & 0x7; sr >>= 3;
+ xmc[38] = sr & 0x7; sr >>= 3;
+ sr = *c++;
+ Nc[3] = sr & 0x7f; sr >>= 7;
+ sr |= (uword)*c++ << 1;
+ bc[3] = sr & 0x3; sr >>= 2;
+ Mc[3] = sr & 0x3; sr >>= 2;
+ sr |= (uword)*c++ << 5;
+ xmaxc[3] = sr & 0x3f; sr >>= 6;
+#undef xmc
+#define xmc (source + 63 - 39)
+
+ xmc[39] = sr & 0x7; sr >>= 3;
+ xmc[40] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[41] = sr & 0x7; sr >>= 3;
+ xmc[42] = sr & 0x7; sr >>= 3;
+ xmc[43] = sr & 0x7; sr >>= 3;
+ sr = *c++; /* 30 */
+ xmc[44] = sr & 0x7; sr >>= 3;
+ xmc[45] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 2;
+ xmc[46] = sr & 0x7; sr >>= 3;
+ xmc[47] = sr & 0x7; sr >>= 3;
+ xmc[48] = sr & 0x7; sr >>= 3;
+ sr |= (uword)*c++ << 1;
+ xmc[49] = sr & 0x7; sr >>= 3;
+ xmc[50] = sr & 0x7; sr >>= 3;
+ xmc[51] = sr & 0x7; sr >>= 3;
+ }
+ }
+ else
+#endif
+ {
+
+ *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */
+ | ((LARc[0] >> 2) & 0xF);
+ *c++ = ((LARc[0] & 0x3) << 6)
+ | (LARc[1] & 0x3F);
+ *c++ = ((LARc[2] & 0x1F) << 3)
+ | ((LARc[3] >> 2) & 0x7);
+ *c++ = ((LARc[3] & 0x3) << 6)
+ | ((LARc[4] & 0xF) << 2)
+ | ((LARc[5] >> 2) & 0x3);
+ *c++ = ((LARc[5] & 0x3) << 6)
+ | ((LARc[6] & 0x7) << 3)
+ | (LARc[7] & 0x7);
+
+
+ *c++ = ((Nc[0] & 0x7F) << 1)
+
+
+ | ((bc[0] >> 1) & 0x1);
+ *c++ = ((bc[0] & 0x1) << 7)
+
+
+ | ((Mc[0] & 0x3) << 5)
+
+ | ((xmaxc[0] >> 1) & 0x1F);
+ *c++ = ((xmaxc[0] & 0x1) << 7)
+
+#undef xmc
+#define xmc (source + 12)
+
+ | ((xmc[0] & 0x7) << 4)
+ | ((xmc[1] & 0x7) << 1)
+ | ((xmc[2] >> 2) & 0x1);
+ *c++ = ((xmc[2] & 0x3) << 6)
+ | ((xmc[3] & 0x7) << 3)
+ | (xmc[4] & 0x7);
+ *c++ = ((xmc[5] & 0x7) << 5) /* 10 */
+ | ((xmc[6] & 0x7) << 2)
+ | ((xmc[7] >> 1) & 0x3);
+ *c++ = ((xmc[7] & 0x1) << 7)
+ | ((xmc[8] & 0x7) << 4)
+ | ((xmc[9] & 0x7) << 1)
+ | ((xmc[10] >> 2) & 0x1);
+ *c++ = ((xmc[10] & 0x3) << 6)
+ | ((xmc[11] & 0x7) << 3)
+ | (xmc[12] & 0x7);
+
+
+ *c++ = ((Nc[1] & 0x7F) << 1)
+
+
+ | ((bc[1] >> 1) & 0x1);
+ *c++ = ((bc[1] & 0x1) << 7)
+
+
+ | ((Mc[1] & 0x3) << 5)
+
+
+ | ((xmaxc[1] >> 1) & 0x1F);
+ *c++ = ((xmaxc[1] & 0x1) << 7)
+
+#undef xmc
+#define xmc (source + 29 - 13)
+
+ | ((xmc[13] & 0x7) << 4)
+ | ((xmc[14] & 0x7) << 1)
+ | ((xmc[15] >> 2) & 0x1);
+ *c++ = ((xmc[15] & 0x3) << 6)
+ | ((xmc[16] & 0x7) << 3)
+ | (xmc[17] & 0x7);
+ *c++ = ((xmc[18] & 0x7) << 5)
+ | ((xmc[19] & 0x7) << 2)
+ | ((xmc[20] >> 1) & 0x3);
+ *c++ = ((xmc[20] & 0x1) << 7)
+ | ((xmc[21] & 0x7) << 4)
+ | ((xmc[22] & 0x7) << 1)
+ | ((xmc[23] >> 2) & 0x1);
+ *c++ = ((xmc[23] & 0x3) << 6)
+ | ((xmc[24] & 0x7) << 3)
+ | (xmc[25] & 0x7);
+
+
+ *c++ = ((Nc[2] & 0x7F) << 1) /* 20 */
+
+
+ | ((bc[2] >> 1) & 0x1);
+ *c++ = ((bc[2] & 0x1) << 7)
+
+
+ | ((Mc[2] & 0x3) << 5)
+
+
+ | ((xmaxc[2] >> 1) & 0x1F);
+ *c++ = ((xmaxc[2] & 0x1) << 7)
+
+#undef xmc
+#define xmc (source + 46 - 26)
+
+ | ((xmc[26] & 0x7) << 4)
+ | ((xmc[27] & 0x7) << 1)
+ | ((xmc[28] >> 2) & 0x1);
+ *c++ = ((xmc[28] & 0x3) << 6)
+ | ((xmc[29] & 0x7) << 3)
+ | (xmc[30] & 0x7);
+ *c++ = ((xmc[31] & 0x7) << 5)
+ | ((xmc[32] & 0x7) << 2)
+ | ((xmc[33] >> 1) & 0x3);
+ *c++ = ((xmc[33] & 0x1) << 7)
+ | ((xmc[34] & 0x7) << 4)
+ | ((xmc[35] & 0x7) << 1)
+ | ((xmc[36] >> 2) & 0x1);
+ *c++ = ((xmc[36] & 0x3) << 6)
+ | ((xmc[37] & 0x7) << 3)
+ | (xmc[38] & 0x7);
+
+
+ *c++ = ((Nc[3] & 0x7F) << 1)
+
+
+ | ((bc[3] >> 1) & 0x1);
+ *c++ = ((bc[3] & 0x1) << 7)
+
+
+ | ((Mc[3] & 0x3) << 5)
+
+
+ | ((xmaxc[3] >> 1) & 0x1F);
+ *c++ = ((xmaxc[3] & 0x1) << 7)
+
+#undef xmc
+#define xmc (source + 63 - 39)
+
+ | ((xmc[39] & 0x7) << 4)
+ | ((xmc[40] & 0x7) << 1)
+ | ((xmc[41] >> 2) & 0x1);
+ *c++ = ((xmc[41] & 0x3) << 6) /* 30 */
+ | ((xmc[42] & 0x7) << 3)
+ | (xmc[43] & 0x7);
+ *c++ = ((xmc[44] & 0x7) << 5)
+ | ((xmc[45] & 0x7) << 2)
+ | ((xmc[46] >> 1) & 0x3);
+ *c++ = ((xmc[46] & 0x1) << 7)
+ | ((xmc[47] & 0x7) << 4)
+ | ((xmc[48] & 0x7) << 1)
+ | ((xmc[49] >> 2) & 0x1);
+ *c++ = ((xmc[49] & 0x3) << 6)
+ | ((xmc[50] & 0x7) << 3)
+ | (xmc[51] & 0x7);
+ }
+}
diff --git a/jni/libgsm/src/gsm_option.c b/jni/libgsm/src/gsm_option.c
new file mode 100644
index 0000000..274b7b1
--- /dev/null
+++ b/jni/libgsm/src/gsm_option.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_option.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+int gsm_option P3((r, opt, val), gsm r, int opt, int * val)
+{
+ int result = -1;
+
+ switch (opt) {
+ case GSM_OPT_LTP_CUT:
+#ifdef LTP_CUT
+ result = r->ltp_cut;
+ if (val) r->ltp_cut = *val;
+#endif
+ break;
+
+ case GSM_OPT_VERBOSE:
+#ifndef NDEBUG
+ result = r->verbose;
+ if (val) r->verbose = *val;
+#endif
+ break;
+
+ case GSM_OPT_FAST:
+
+#if defined(FAST) && defined(USE_FLOAT_MUL)
+ result = r->fast;
+ if (val) r->fast = !!*val;
+#endif
+ break;
+
+ case GSM_OPT_FRAME_CHAIN:
+
+#ifdef WAV49
+ result = r->frame_chain;
+ if (val) r->frame_chain = *val;
+#endif
+ break;
+
+ case GSM_OPT_FRAME_INDEX:
+
+#ifdef WAV49
+ result = r->frame_index;
+ if (val) r->frame_index = *val;
+#endif
+ break;
+
+ case GSM_OPT_WAV49:
+
+#ifdef WAV49
+ result = r->wav_fmt;
+ if (val) r->wav_fmt = !!*val;
+#endif
+ break;
+
+ default:
+ break;
+ }
+ return result;
+}
diff --git a/jni/libgsm/src/gsm_print.c b/jni/libgsm/src/gsm_print.c
new file mode 100644
index 0000000..47f753b
--- /dev/null
+++ b/jni/libgsm/src/gsm_print.c
@@ -0,0 +1,167 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_print.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+#include <stdio.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+int gsm_print P3((f, s, c), FILE * f, gsm s, gsm_byte * c)
+{
+ word LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
+
+ /* GSM_MAGIC = (*c >> 4) & 0xF; */
+
+ if (((*c >> 4) & 0x0F) != GSM_MAGIC) return -1;
+
+ LARc[0] = (*c++ & 0xF) << 2; /* 1 */
+ LARc[0] |= (*c >> 6) & 0x3;
+ LARc[1] = *c++ & 0x3F;
+ LARc[2] = (*c >> 3) & 0x1F;
+ LARc[3] = (*c++ & 0x7) << 2;
+ LARc[3] |= (*c >> 6) & 0x3;
+ LARc[4] = (*c >> 2) & 0xF;
+ LARc[5] = (*c++ & 0x3) << 2;
+ LARc[5] |= (*c >> 6) & 0x3;
+ LARc[6] = (*c >> 3) & 0x7;
+ LARc[7] = *c++ & 0x7;
+
+
+ Nc[0] = (*c >> 1) & 0x7F;
+ bc[0] = (*c++ & 0x1) << 1;
+ bc[0] |= (*c >> 7) & 0x1;
+ Mc[0] = (*c >> 5) & 0x3;
+ xmaxc[0] = (*c++ & 0x1F) << 1;
+ xmaxc[0] |= (*c >> 7) & 0x1;
+ xmc[0] = (*c >> 4) & 0x7;
+ xmc[1] = (*c >> 1) & 0x7;
+ xmc[2] = (*c++ & 0x1) << 2;
+ xmc[2] |= (*c >> 6) & 0x3;
+ xmc[3] = (*c >> 3) & 0x7;
+ xmc[4] = *c++ & 0x7;
+ xmc[5] = (*c >> 5) & 0x7;
+ xmc[6] = (*c >> 2) & 0x7;
+ xmc[7] = (*c++ & 0x3) << 1; /* 10 */
+ xmc[7] |= (*c >> 7) & 0x1;
+ xmc[8] = (*c >> 4) & 0x7;
+ xmc[9] = (*c >> 1) & 0x7;
+ xmc[10] = (*c++ & 0x1) << 2;
+ xmc[10] |= (*c >> 6) & 0x3;
+ xmc[11] = (*c >> 3) & 0x7;
+ xmc[12] = *c++ & 0x7;
+
+ Nc[1] = (*c >> 1) & 0x7F;
+ bc[1] = (*c++ & 0x1) << 1;
+ bc[1] |= (*c >> 7) & 0x1;
+ Mc[1] = (*c >> 5) & 0x3;
+ xmaxc[1] = (*c++ & 0x1F) << 1;
+ xmaxc[1] |= (*c >> 7) & 0x1;
+ xmc[13] = (*c >> 4) & 0x7;
+ xmc[14] = (*c >> 1) & 0x7;
+ xmc[15] = (*c++ & 0x1) << 2;
+ xmc[15] |= (*c >> 6) & 0x3;
+ xmc[16] = (*c >> 3) & 0x7;
+ xmc[17] = *c++ & 0x7;
+ xmc[18] = (*c >> 5) & 0x7;
+ xmc[19] = (*c >> 2) & 0x7;
+ xmc[20] = (*c++ & 0x3) << 1;
+ xmc[20] |= (*c >> 7) & 0x1;
+ xmc[21] = (*c >> 4) & 0x7;
+ xmc[22] = (*c >> 1) & 0x7;
+ xmc[23] = (*c++ & 0x1) << 2;
+ xmc[23] |= (*c >> 6) & 0x3;
+ xmc[24] = (*c >> 3) & 0x7;
+ xmc[25] = *c++ & 0x7;
+
+
+ Nc[2] = (*c >> 1) & 0x7F;
+ bc[2] = (*c++ & 0x1) << 1; /* 20 */
+ bc[2] |= (*c >> 7) & 0x1;
+ Mc[2] = (*c >> 5) & 0x3;
+ xmaxc[2] = (*c++ & 0x1F) << 1;
+ xmaxc[2] |= (*c >> 7) & 0x1;
+ xmc[26] = (*c >> 4) & 0x7;
+ xmc[27] = (*c >> 1) & 0x7;
+ xmc[28] = (*c++ & 0x1) << 2;
+ xmc[28] |= (*c >> 6) & 0x3;
+ xmc[29] = (*c >> 3) & 0x7;
+ xmc[30] = *c++ & 0x7;
+ xmc[31] = (*c >> 5) & 0x7;
+ xmc[32] = (*c >> 2) & 0x7;
+ xmc[33] = (*c++ & 0x3) << 1;
+ xmc[33] |= (*c >> 7) & 0x1;
+ xmc[34] = (*c >> 4) & 0x7;
+ xmc[35] = (*c >> 1) & 0x7;
+ xmc[36] = (*c++ & 0x1) << 2;
+ xmc[36] |= (*c >> 6) & 0x3;
+ xmc[37] = (*c >> 3) & 0x7;
+ xmc[38] = *c++ & 0x7;
+
+ Nc[3] = (*c >> 1) & 0x7F;
+ bc[3] = (*c++ & 0x1) << 1;
+ bc[3] |= (*c >> 7) & 0x1;
+ Mc[3] = (*c >> 5) & 0x3;
+ xmaxc[3] = (*c++ & 0x1F) << 1;
+ xmaxc[3] |= (*c >> 7) & 0x1;
+
+ xmc[39] = (*c >> 4) & 0x7;
+ xmc[40] = (*c >> 1) & 0x7;
+ xmc[41] = (*c++ & 0x1) << 2;
+ xmc[41] |= (*c >> 6) & 0x3;
+ xmc[42] = (*c >> 3) & 0x7;
+ xmc[43] = *c++ & 0x7; /* 30 */
+ xmc[44] = (*c >> 5) & 0x7;
+ xmc[45] = (*c >> 2) & 0x7;
+ xmc[46] = (*c++ & 0x3) << 1;
+ xmc[46] |= (*c >> 7) & 0x1;
+ xmc[47] = (*c >> 4) & 0x7;
+ xmc[48] = (*c >> 1) & 0x7;
+ xmc[49] = (*c++ & 0x1) << 2;
+ xmc[49] |= (*c >> 6) & 0x3;
+ xmc[50] = (*c >> 3) & 0x7;
+ xmc[51] = *c & 0x7; /* 33 */
+
+ fprintf(f,
+ "LARc:\t%2.2d %2.2d %2.2d %2.2d %2.2d %2.2d %2.2d %2.2d\n",
+ LARc[0],LARc[1],LARc[2],LARc[3],LARc[4],LARc[5],LARc[6],LARc[7]);
+
+ fprintf(f, "#1: Nc %4.4d bc %d Mc %d xmaxc %d\n",
+ Nc[0], bc[0], Mc[0], xmaxc[0]);
+ fprintf(f,
+"\t%.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d\n",
+ xmc[0],xmc[1],xmc[2],xmc[3],xmc[4],xmc[5],xmc[6],
+ xmc[7],xmc[8],xmc[9],xmc[10],xmc[11],xmc[12] );
+
+ fprintf(f, "#2: Nc %4.4d bc %d Mc %d xmaxc %d\n",
+ Nc[1], bc[1], Mc[1], xmaxc[1]);
+ fprintf(f,
+"\t%.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d\n",
+ xmc[13+0],xmc[13+1],xmc[13+2],xmc[13+3],xmc[13+4],xmc[13+5],
+ xmc[13+6], xmc[13+7],xmc[13+8],xmc[13+9],xmc[13+10],xmc[13+11],
+ xmc[13+12] );
+
+ fprintf(f, "#3: Nc %4.4d bc %d Mc %d xmaxc %d\n",
+ Nc[2], bc[2], Mc[2], xmaxc[2]);
+ fprintf(f,
+"\t%.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d\n",
+ xmc[26+0],xmc[26+1],xmc[26+2],xmc[26+3],xmc[26+4],xmc[26+5],
+ xmc[26+6], xmc[26+7],xmc[26+8],xmc[26+9],xmc[26+10],xmc[26+11],
+ xmc[26+12] );
+
+ fprintf(f, "#4: Nc %4.4d bc %d Mc %d xmaxc %d\n",
+ Nc[3], bc[3], Mc[3], xmaxc[3]);
+ fprintf(f,
+"\t%.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d %.2d\n",
+ xmc[39+0],xmc[39+1],xmc[39+2],xmc[39+3],xmc[39+4],xmc[39+5],
+ xmc[39+6], xmc[39+7],xmc[39+8],xmc[39+9],xmc[39+10],xmc[39+11],
+ xmc[39+12] );
+
+ return 0;
+}
diff --git a/jni/libgsm/src/long_term.c b/jni/libgsm/src/long_term.c
new file mode 100644
index 0000000..b2d2d3f
--- /dev/null
+++ b/jni/libgsm/src/long_term.c
@@ -0,0 +1,949 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/long_term.c,v 1.6 1996/07/02 12:33:19 jutta Exp $ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+/*
+ * 4.2.11 .. 4.2.12 LONG TERM PREDICTOR (LTP) SECTION
+ */
+
+
+/*
+ * This module computes the LTP gain (bc) and the LTP lag (Nc)
+ * for the long term analysis filter. This is done by calculating a
+ * maximum of the cross-correlation function between the current
+ * sub-segment short term residual signal d[0..39] (output of
+ * the short term analysis filter; for simplification the index
+ * of this array begins at 0 and ends at 39 for each sub-segment of the
+ * RPE-LTP analysis) and the previous reconstructed short term
+ * residual signal dp[ -120 .. -1 ]. A dynamic scaling must be
+ * performed to avoid overflow.
+ */
+
+ /* The next procedure exists in six versions. First two integer
+ * version (if USE_FLOAT_MUL is not defined); then four floating
+ * point versions, twice with proper scaling (USE_FLOAT_MUL defined),
+ * once without (USE_FLOAT_MUL and FAST defined, and fast run-time
+ * option used). Every pair has first a Cut version (see the -C
+ * option to toast or the LTP_CUT option to gsm_option()), then the
+ * uncut one. (For a detailed explanation of why this is altogether
+ * a bad idea, see Henry Spencer and Geoff Collyer, ``#ifdef Considered
+ * Harmful''.)
+ */
+
+#ifndef USE_FLOAT_MUL
+
+#ifdef LTP_CUT
+
+static void Cut_Calculation_of_the_LTP_parameters P5((st, d,dp,bc_out,Nc_out),
+
+ struct gsm_state * st,
+
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ word Nc, bc;
+ word wt[40];
+
+ longword L_result;
+ longword L_max, L_power;
+ word R, S, dmax, scal, best_k;
+ word ltp_cut;
+
+ register word temp, wt_k;
+
+ /* Search of the optimum scaling of d[0..39].
+ */
+ dmax = 0;
+ for (k = 0; k <= 39; k++) {
+ temp = d[k];
+ temp = GSM_ABS( temp );
+ if (temp > dmax) {
+ dmax = temp;
+ best_k = k;
+ }
+ }
+ temp = 0;
+ if (dmax == 0) scal = 0;
+ else {
+ assert(dmax > 0);
+ temp = gsm_norm( (longword)dmax << 16 );
+ }
+ if (temp > 6) scal = 0;
+ else scal = 6 - temp;
+ assert(scal >= 0);
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+ wt_k = SASR(d[best_k], scal);
+
+ for (lambda = 40; lambda <= 120; lambda++) {
+ L_result = (longword)wt_k * dp[best_k - lambda];
+ if (L_result > L_max) {
+ Nc = lambda;
+ L_max = L_result;
+ }
+ }
+ *Nc_out = Nc;
+ L_max <<= 1;
+
+ /* Rescaling of L_max
+ */
+ assert(scal <= 100 && scal >= -100);
+ L_max = L_max >> (6 - scal); /* sub(6, scal) */
+
+ assert( Nc <= 120 && Nc >= 40);
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ L_power = 0;
+ for (k = 0; k <= 39; k++) {
+
+ register longword L_temp;
+
+ L_temp = SASR( dp[k - Nc], 3 );
+ L_power += L_temp * L_temp;
+ }
+ L_power <<= 1; /* from L_MULT */
+
+ /* Normalization of L_max and L_power
+ */
+
+ if (L_max <= 0) {
+ *bc_out = 0;
+ return;
+ }
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ temp = gsm_norm( L_power );
+
+ R = SASR( L_max << temp, 16 );
+ S = SASR( L_power << temp, 16 );
+
+ /* Coding of the LTP gain
+ */
+
+ /* Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break;
+ *bc_out = bc;
+}
+
+#endif /* LTP_CUT */
+
+static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ word Nc, bc;
+ word wt[40];
+
+ longword L_max, L_power;
+ word R, S, dmax, scal;
+ register word temp;
+
+ /* Search of the optimum scaling of d[0..39].
+ */
+ dmax = 0;
+
+ for (k = 0; k <= 39; k++) {
+ temp = d[k];
+ temp = GSM_ABS( temp );
+ if (temp > dmax) dmax = temp;
+ }
+
+ temp = 0;
+ if (dmax == 0) scal = 0;
+ else {
+ assert(dmax > 0);
+ temp = gsm_norm( (longword)dmax << 16 );
+ }
+
+ if (temp > 6) scal = 0;
+ else scal = 6 - temp;
+
+ assert(scal >= 0);
+
+ /* Initialization of a working array wt
+ */
+
+ for (k = 0; k <= 39; k++) wt[k] = SASR( d[k], scal );
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+
+ for (lambda = 40; lambda <= 120; lambda++) {
+
+# undef STEP
+# define STEP(k) (longword)wt[k] * dp[k - lambda]
+
+ register longword L_result;
+
+ L_result = STEP(0) ; L_result += STEP(1) ;
+ L_result += STEP(2) ; L_result += STEP(3) ;
+ L_result += STEP(4) ; L_result += STEP(5) ;
+ L_result += STEP(6) ; L_result += STEP(7) ;
+ L_result += STEP(8) ; L_result += STEP(9) ;
+ L_result += STEP(10) ; L_result += STEP(11) ;
+ L_result += STEP(12) ; L_result += STEP(13) ;
+ L_result += STEP(14) ; L_result += STEP(15) ;
+ L_result += STEP(16) ; L_result += STEP(17) ;
+ L_result += STEP(18) ; L_result += STEP(19) ;
+ L_result += STEP(20) ; L_result += STEP(21) ;
+ L_result += STEP(22) ; L_result += STEP(23) ;
+ L_result += STEP(24) ; L_result += STEP(25) ;
+ L_result += STEP(26) ; L_result += STEP(27) ;
+ L_result += STEP(28) ; L_result += STEP(29) ;
+ L_result += STEP(30) ; L_result += STEP(31) ;
+ L_result += STEP(32) ; L_result += STEP(33) ;
+ L_result += STEP(34) ; L_result += STEP(35) ;
+ L_result += STEP(36) ; L_result += STEP(37) ;
+ L_result += STEP(38) ; L_result += STEP(39) ;
+
+ if (L_result > L_max) {
+
+ Nc = lambda;
+ L_max = L_result;
+ }
+ }
+
+ *Nc_out = Nc;
+
+ L_max <<= 1;
+
+ /* Rescaling of L_max
+ */
+ assert(scal <= 100 && scal >= -100);
+ L_max = L_max >> (6 - scal); /* sub(6, scal) */
+
+ assert( Nc <= 120 && Nc >= 40);
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ L_power = 0;
+ for (k = 0; k <= 39; k++) {
+
+ register longword L_temp;
+
+ L_temp = SASR( dp[k - Nc], 3 );
+ L_power += L_temp * L_temp;
+ }
+ L_power <<= 1; /* from L_MULT */
+
+ /* Normalization of L_max and L_power
+ */
+
+ if (L_max <= 0) {
+ *bc_out = 0;
+ return;
+ }
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ temp = gsm_norm( L_power );
+
+ R = SASR( L_max << temp, 16 );
+ S = SASR( L_power << temp, 16 );
+
+ /* Coding of the LTP gain
+ */
+
+ /* Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break;
+ *bc_out = bc;
+}
+
+#else /* USE_FLOAT_MUL */
+
+#ifdef LTP_CUT
+
+static void Cut_Calculation_of_the_LTP_parameters P5((st, d,dp,bc_out,Nc_out),
+ struct gsm_state * st, /* IN */
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ word Nc, bc;
+ word ltp_cut;
+
+ float wt_float[40];
+ float dp_float_base[120], * dp_float = dp_float_base + 120;
+
+ longword L_max, L_power;
+ word R, S, dmax, scal;
+ register word temp;
+
+ /* Search of the optimum scaling of d[0..39].
+ */
+ dmax = 0;
+
+ for (k = 0; k <= 39; k++) {
+ temp = d[k];
+ temp = GSM_ABS( temp );
+ if (temp > dmax) dmax = temp;
+ }
+
+ temp = 0;
+ if (dmax == 0) scal = 0;
+ else {
+ assert(dmax > 0);
+ temp = gsm_norm( (longword)dmax << 16 );
+ }
+
+ if (temp > 6) scal = 0;
+ else scal = 6 - temp;
+
+ assert(scal >= 0);
+ ltp_cut = (longword)SASR(dmax, scal) * st->ltp_cut / 100;
+
+
+ /* Initialization of a working array wt
+ */
+
+ for (k = 0; k < 40; k++) {
+ register word w = SASR( d[k], scal );
+ if (w < 0 ? w > -ltp_cut : w < ltp_cut) {
+ wt_float[k] = 0.0;
+ }
+ else {
+ wt_float[k] = w;
+ }
+ }
+ for (k = -120; k < 0; k++) dp_float[k] = dp[k];
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+
+ for (lambda = 40; lambda <= 120; lambda += 9) {
+
+ /* Calculate L_result for l = lambda .. lambda + 9.
+ */
+ register float *lp = dp_float - lambda;
+
+ register float W;
+ register float a = lp[-8], b = lp[-7], c = lp[-6],
+ d = lp[-5], e = lp[-4], f = lp[-3],
+ g = lp[-2], h = lp[-1];
+ register float E;
+ register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0,
+ S5 = 0, S6 = 0, S7 = 0, S8 = 0;
+
+# undef STEP
+# define STEP(K, a, b, c, d, e, f, g, h) \
+ if ((W = wt_float[K]) != 0.0) { \
+ E = W * a; S8 += E; \
+ E = W * b; S7 += E; \
+ E = W * c; S6 += E; \
+ E = W * d; S5 += E; \
+ E = W * e; S4 += E; \
+ E = W * f; S3 += E; \
+ E = W * g; S2 += E; \
+ E = W * h; S1 += E; \
+ a = lp[K]; \
+ E = W * a; S0 += E; } else (a = lp[K])
+
+# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h)
+# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a)
+# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b)
+# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c)
+# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d)
+# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e)
+# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f)
+# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g)
+
+ STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3);
+ STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7);
+
+ STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11);
+ STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15);
+
+ STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19);
+ STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23);
+
+ STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27);
+ STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31);
+
+ STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35);
+ STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39);
+
+ if (S0 > L_max) { L_max = S0; Nc = lambda; }
+ if (S1 > L_max) { L_max = S1; Nc = lambda + 1; }
+ if (S2 > L_max) { L_max = S2; Nc = lambda + 2; }
+ if (S3 > L_max) { L_max = S3; Nc = lambda + 3; }
+ if (S4 > L_max) { L_max = S4; Nc = lambda + 4; }
+ if (S5 > L_max) { L_max = S5; Nc = lambda + 5; }
+ if (S6 > L_max) { L_max = S6; Nc = lambda + 6; }
+ if (S7 > L_max) { L_max = S7; Nc = lambda + 7; }
+ if (S8 > L_max) { L_max = S8; Nc = lambda + 8; }
+
+ }
+ *Nc_out = Nc;
+
+ L_max <<= 1;
+
+ /* Rescaling of L_max
+ */
+ assert(scal <= 100 && scal >= -100);
+ L_max = L_max >> (6 - scal); /* sub(6, scal) */
+
+ assert( Nc <= 120 && Nc >= 40);
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ L_power = 0;
+ for (k = 0; k <= 39; k++) {
+
+ register longword L_temp;
+
+ L_temp = SASR( dp[k - Nc], 3 );
+ L_power += L_temp * L_temp;
+ }
+ L_power <<= 1; /* from L_MULT */
+
+ /* Normalization of L_max and L_power
+ */
+
+ if (L_max <= 0) {
+ *bc_out = 0;
+ return;
+ }
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ temp = gsm_norm( L_power );
+
+ R = SASR( L_max << temp, 16 );
+ S = SASR( L_power << temp, 16 );
+
+ /* Coding of the LTP gain
+ */
+
+ /* Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break;
+ *bc_out = bc;
+}
+
+#endif /* LTP_CUT */
+
+static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ word Nc, bc;
+
+ float wt_float[40];
+ float dp_float_base[120], * dp_float = dp_float_base + 120;
+
+ longword L_max, L_power;
+ word R, S, dmax, scal;
+ register word temp;
+
+ /* Search of the optimum scaling of d[0..39].
+ */
+ dmax = 0;
+
+ for (k = 0; k <= 39; k++) {
+ temp = d[k];
+ temp = GSM_ABS( temp );
+ if (temp > dmax) dmax = temp;
+ }
+
+ temp = 0;
+ if (dmax == 0) scal = 0;
+ else {
+ assert(dmax > 0);
+ temp = gsm_norm( (longword)dmax << 16 );
+ }
+
+ if (temp > 6) scal = 0;
+ else scal = 6 - temp;
+
+ assert(scal >= 0);
+
+ /* Initialization of a working array wt
+ */
+
+ for (k = 0; k < 40; k++) wt_float[k] = SASR( d[k], scal );
+ for (k = -120; k < 0; k++) dp_float[k] = dp[k];
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+
+ for (lambda = 40; lambda <= 120; lambda += 9) {
+
+ /* Calculate L_result for l = lambda .. lambda + 9.
+ */
+ register float *lp = dp_float - lambda;
+
+ register float W;
+ register float a = lp[-8], b = lp[-7], c = lp[-6],
+ d = lp[-5], e = lp[-4], f = lp[-3],
+ g = lp[-2], h = lp[-1];
+ register float E;
+ register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0,
+ S5 = 0, S6 = 0, S7 = 0, S8 = 0;
+
+# undef STEP
+# define STEP(K, a, b, c, d, e, f, g, h) \
+ W = wt_float[K]; \
+ E = W * a; S8 += E; \
+ E = W * b; S7 += E; \
+ E = W * c; S6 += E; \
+ E = W * d; S5 += E; \
+ E = W * e; S4 += E; \
+ E = W * f; S3 += E; \
+ E = W * g; S2 += E; \
+ E = W * h; S1 += E; \
+ a = lp[K]; \
+ E = W * a; S0 += E
+
+# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h)
+# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a)
+# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b)
+# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c)
+# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d)
+# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e)
+# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f)
+# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g)
+
+ STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3);
+ STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7);
+
+ STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11);
+ STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15);
+
+ STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19);
+ STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23);
+
+ STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27);
+ STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31);
+
+ STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35);
+ STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39);
+
+ if (S0 > L_max) { L_max = S0; Nc = lambda; }
+ if (S1 > L_max) { L_max = S1; Nc = lambda + 1; }
+ if (S2 > L_max) { L_max = S2; Nc = lambda + 2; }
+ if (S3 > L_max) { L_max = S3; Nc = lambda + 3; }
+ if (S4 > L_max) { L_max = S4; Nc = lambda + 4; }
+ if (S5 > L_max) { L_max = S5; Nc = lambda + 5; }
+ if (S6 > L_max) { L_max = S6; Nc = lambda + 6; }
+ if (S7 > L_max) { L_max = S7; Nc = lambda + 7; }
+ if (S8 > L_max) { L_max = S8; Nc = lambda + 8; }
+ }
+ *Nc_out = Nc;
+
+ L_max <<= 1;
+
+ /* Rescaling of L_max
+ */
+ assert(scal <= 100 && scal >= -100);
+ L_max = L_max >> (6 - scal); /* sub(6, scal) */
+
+ assert( Nc <= 120 && Nc >= 40);
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ L_power = 0;
+ for (k = 0; k <= 39; k++) {
+
+ register longword L_temp;
+
+ L_temp = SASR( dp[k - Nc], 3 );
+ L_power += L_temp * L_temp;
+ }
+ L_power <<= 1; /* from L_MULT */
+
+ /* Normalization of L_max and L_power
+ */
+
+ if (L_max <= 0) {
+ *bc_out = 0;
+ return;
+ }
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ temp = gsm_norm( L_power );
+
+ R = SASR( L_max << temp, 16 );
+ S = SASR( L_power << temp, 16 );
+
+ /* Coding of the LTP gain
+ */
+
+ /* Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ for (bc = 0; bc <= 2; bc++) if (R <= gsm_mult(S, gsm_DLB[bc])) break;
+ *bc_out = bc;
+}
+
+#ifdef FAST
+#ifdef LTP_CUT
+
+static void Cut_Fast_Calculation_of_the_LTP_parameters P5((st,
+ d,dp,bc_out,Nc_out),
+ struct gsm_state * st, /* IN */
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ register float wt_float;
+ word Nc, bc;
+ word wt_max, best_k, ltp_cut;
+
+ float dp_float_base[120], * dp_float = dp_float_base + 120;
+
+ register float L_result, L_max, L_power;
+
+ wt_max = 0;
+
+ for (k = 0; k < 40; ++k) {
+ if ( d[k] > wt_max) wt_max = d[best_k = k];
+ else if (-d[k] > wt_max) wt_max = -d[best_k = k];
+ }
+
+ assert(wt_max >= 0);
+ wt_float = (float)wt_max;
+
+ for (k = -120; k < 0; ++k) dp_float[k] = (float)dp[k];
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+
+ for (lambda = 40; lambda <= 120; lambda++) {
+ L_result = wt_float * dp_float[best_k - lambda];
+ if (L_result > L_max) {
+ Nc = lambda;
+ L_max = L_result;
+ }
+ }
+
+ *Nc_out = Nc;
+ if (L_max <= 0.) {
+ *bc_out = 0;
+ return;
+ }
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ dp_float -= Nc;
+ L_power = 0;
+ for (k = 0; k < 40; ++k) {
+ register float f = dp_float[k];
+ L_power += f * f;
+ }
+
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ /* Coding of the LTP gain
+ * Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ lambda = L_max / L_power * 32768.;
+ for (bc = 0; bc <= 2; ++bc) if (lambda <= gsm_DLB[bc]) break;
+ *bc_out = bc;
+}
+
+#endif /* LTP_CUT */
+
+static void Fast_Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
+ register word * d, /* [0..39] IN */
+ register word * dp, /* [-120..-1] IN */
+ word * bc_out, /* OUT */
+ word * Nc_out /* OUT */
+)
+{
+ register int k, lambda;
+ word Nc, bc;
+
+ float wt_float[40];
+ float dp_float_base[120], * dp_float = dp_float_base + 120;
+
+ register float L_max, L_power;
+
+ for (k = 0; k < 40; ++k) wt_float[k] = (float)d[k];
+ for (k = -120; k < 0; ++k) dp_float[k] = (float)dp[k];
+
+ /* Search for the maximum cross-correlation and coding of the LTP lag
+ */
+ L_max = 0;
+ Nc = 40; /* index for the maximum cross-correlation */
+
+ for (lambda = 40; lambda <= 120; lambda += 9) {
+
+ /* Calculate L_result for l = lambda .. lambda + 9.
+ */
+ register float *lp = dp_float - lambda;
+
+ register float W;
+ register float a = lp[-8], b = lp[-7], c = lp[-6],
+ d = lp[-5], e = lp[-4], f = lp[-3],
+ g = lp[-2], h = lp[-1];
+ register float E;
+ register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0,
+ S5 = 0, S6 = 0, S7 = 0, S8 = 0;
+
+# undef STEP
+# define STEP(K, a, b, c, d, e, f, g, h) \
+ W = wt_float[K]; \
+ E = W * a; S8 += E; \
+ E = W * b; S7 += E; \
+ E = W * c; S6 += E; \
+ E = W * d; S5 += E; \
+ E = W * e; S4 += E; \
+ E = W * f; S3 += E; \
+ E = W * g; S2 += E; \
+ E = W * h; S1 += E; \
+ a = lp[K]; \
+ E = W * a; S0 += E
+
+# define STEP_A(K) STEP(K, a, b, c, d, e, f, g, h)
+# define STEP_B(K) STEP(K, b, c, d, e, f, g, h, a)
+# define STEP_C(K) STEP(K, c, d, e, f, g, h, a, b)
+# define STEP_D(K) STEP(K, d, e, f, g, h, a, b, c)
+# define STEP_E(K) STEP(K, e, f, g, h, a, b, c, d)
+# define STEP_F(K) STEP(K, f, g, h, a, b, c, d, e)
+# define STEP_G(K) STEP(K, g, h, a, b, c, d, e, f)
+# define STEP_H(K) STEP(K, h, a, b, c, d, e, f, g)
+
+ STEP_A( 0); STEP_B( 1); STEP_C( 2); STEP_D( 3);
+ STEP_E( 4); STEP_F( 5); STEP_G( 6); STEP_H( 7);
+
+ STEP_A( 8); STEP_B( 9); STEP_C(10); STEP_D(11);
+ STEP_E(12); STEP_F(13); STEP_G(14); STEP_H(15);
+
+ STEP_A(16); STEP_B(17); STEP_C(18); STEP_D(19);
+ STEP_E(20); STEP_F(21); STEP_G(22); STEP_H(23);
+
+ STEP_A(24); STEP_B(25); STEP_C(26); STEP_D(27);
+ STEP_E(28); STEP_F(29); STEP_G(30); STEP_H(31);
+
+ STEP_A(32); STEP_B(33); STEP_C(34); STEP_D(35);
+ STEP_E(36); STEP_F(37); STEP_G(38); STEP_H(39);
+
+ if (S0 > L_max) { L_max = S0; Nc = lambda; }
+ if (S1 > L_max) { L_max = S1; Nc = lambda + 1; }
+ if (S2 > L_max) { L_max = S2; Nc = lambda + 2; }
+ if (S3 > L_max) { L_max = S3; Nc = lambda + 3; }
+ if (S4 > L_max) { L_max = S4; Nc = lambda + 4; }
+ if (S5 > L_max) { L_max = S5; Nc = lambda + 5; }
+ if (S6 > L_max) { L_max = S6; Nc = lambda + 6; }
+ if (S7 > L_max) { L_max = S7; Nc = lambda + 7; }
+ if (S8 > L_max) { L_max = S8; Nc = lambda + 8; }
+ }
+ *Nc_out = Nc;
+
+ if (L_max <= 0.) {
+ *bc_out = 0;
+ return;
+ }
+
+ /* Compute the power of the reconstructed short term residual
+ * signal dp[..]
+ */
+ dp_float -= Nc;
+ L_power = 0;
+ for (k = 0; k < 40; ++k) {
+ register float f = dp_float[k];
+ L_power += f * f;
+ }
+
+ if (L_max >= L_power) {
+ *bc_out = 3;
+ return;
+ }
+
+ /* Coding of the LTP gain
+ * Table 4.3a must be used to obtain the level DLB[i] for the
+ * quantization of the LTP gain b to get the coded version bc.
+ */
+ lambda = L_max / L_power * 32768.;
+ for (bc = 0; bc <= 2; ++bc) if (lambda <= gsm_DLB[bc]) break;
+ *bc_out = bc;
+}
+
+#endif /* FAST */
+#endif /* USE_FLOAT_MUL */
+
+
+/* 4.2.12 */
+
+static void Long_term_analysis_filtering P6((bc,Nc,dp,d,dpp,e),
+ word bc, /* IN */
+ word Nc, /* IN */
+ register word * dp, /* previous d [-120..-1] IN */
+ register word * d, /* d [0..39] IN */
+ register word * dpp, /* estimate [0..39] OUT */
+ register word * e /* long term res. signal [0..39] OUT */
+)
+/*
+ * In this part, we have to decode the bc parameter to compute
+ * the samples of the estimate dpp[0..39]. The decoding of bc needs the
+ * use of table 4.3b. The long term residual signal e[0..39]
+ * is then calculated to be fed to the RPE encoding section.
+ */
+{
+ register int k;
+ register longword ltmp;
+
+# undef STEP
+# define STEP(BP) \
+ for (k = 0; k <= 39; k++) { \
+ dpp[k] = GSM_MULT_R( BP, dp[k - Nc]); \
+ e[k] = GSM_SUB( d[k], dpp[k] ); \
+ }
+
+ switch (bc) {
+ case 0: STEP( 3277 ); break;
+ case 1: STEP( 11469 ); break;
+ case 2: STEP( 21299 ); break;
+ case 3: STEP( 32767 ); break;
+ }
+}
+
+void Gsm_Long_Term_Predictor P7((S,d,dp,e,dpp,Nc,bc), /* 4x for 160 samples */
+
+ struct gsm_state * S,
+
+ word * d, /* [0..39] residual signal IN */
+ word * dp, /* [-120..-1] d' IN */
+
+ word * e, /* [0..39] OUT */
+ word * dpp, /* [0..39] OUT */
+ word * Nc, /* correlation lag OUT */
+ word * bc /* gain factor OUT */
+)
+{
+ assert( d ); assert( dp ); assert( e );
+ assert( dpp); assert( Nc ); assert( bc );
+
+#if defined(FAST) && defined(USE_FLOAT_MUL)
+ if (S->fast)
+#if defined (LTP_CUT)
+ if (S->ltp_cut)
+ Cut_Fast_Calculation_of_the_LTP_parameters(S,
+ d, dp, bc, Nc);
+ else
+#endif /* LTP_CUT */
+ Fast_Calculation_of_the_LTP_parameters(d, dp, bc, Nc );
+ else
+#endif /* FAST & USE_FLOAT_MUL */
+#ifdef LTP_CUT
+ if (S->ltp_cut)
+ Cut_Calculation_of_the_LTP_parameters(S, d, dp, bc, Nc);
+ else
+#endif
+ Calculation_of_the_LTP_parameters(d, dp, bc, Nc);
+
+ Long_term_analysis_filtering( *bc, *Nc, dp, d, dpp, e );
+}
+
+/* 4.3.2 */
+void Gsm_Long_Term_Synthesis_Filtering P5((S,Ncr,bcr,erp,drp),
+ struct gsm_state * S,
+
+ word Ncr,
+ word bcr,
+ register word * erp, /* [0..39] IN */
+ register word * drp /* [-120..-1] IN, [-120..40] OUT */
+)
+/*
+ * This procedure uses the bcr and Ncr parameter to realize the
+ * long term synthesis filtering. The decoding of bcr needs
+ * table 4.3b.
+ */
+{
+ register longword ltmp; /* for ADD */
+ register int k;
+ word brp, drpp, Nr;
+
+ /* Check the limits of Nr.
+ */
+ Nr = Ncr < 40 || Ncr > 120 ? S->nrp : Ncr;
+ S->nrp = Nr;
+ assert(Nr >= 40 && Nr <= 120);
+
+ /* Decoding of the LTP gain bcr
+ */
+ brp = gsm_QLB[ bcr ];
+
+ /* Computation of the reconstructed short term residual
+ * signal drp[0..39]
+ */
+ assert(brp != MIN_WORD);
+
+ for (k = 0; k <= 39; k++) {
+ drpp = GSM_MULT_R( brp, drp[ k - Nr ] );
+ drp[k] = GSM_ADD( erp[k], drpp );
+ }
+
+ /*
+ * Update of the reconstructed short term residual signal
+ * drp[ -1..-120 ]
+ */
+
+ for (k = 0; k <= 119; k++) drp[ -120 + k ] = drp[ -80 + k ];
+}
diff --git a/jni/libgsm/src/lpc.c b/jni/libgsm/src/lpc.c
new file mode 100644
index 0000000..21b9faf
--- /dev/null
+++ b/jni/libgsm/src/lpc.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/lpc.c,v 1.5 1994/12/30 23:14:54 jutta Exp $ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+#undef P
+
+/*
+ * 4.2.4 .. 4.2.7 LPC ANALYSIS SECTION
+ */
+
+/* 4.2.4 */
+
+
+static void Autocorrelation P2((s, L_ACF),
+ word * s, /* [0..159] IN/OUT */
+ longword * L_ACF) /* [0..8] OUT */
+/*
+ * The goal is to compute the array L_ACF[k]. The signal s[i] must
+ * be scaled in order to avoid an overflow situation.
+ */
+{
+ register int k, i;
+
+ word temp, smax, scalauto;
+
+#ifdef USE_FLOAT_MUL
+ float float_s[160];
+#endif
+
+ /* Dynamic scaling of the array s[0..159]
+ */
+
+ /* Search for the maximum.
+ */
+ smax = 0;
+ for (k = 0; k <= 159; k++) {
+ temp = GSM_ABS( s[k] );
+ if (temp > smax) smax = temp;
+ }
+
+ /* Computation of the scaling factor.
+ */
+ if (smax == 0) scalauto = 0;
+ else {
+ assert(smax > 0);
+ scalauto = 4 - gsm_norm( (longword)smax << 16 );/* sub(4,..) */
+ }
+
+ /* Scaling of the array s[0...159]
+ */
+
+ if (scalauto > 0) {
+
+# ifdef USE_FLOAT_MUL
+# define SCALE(n) \
+ case n: for (k = 0; k <= 159; k++) \
+ float_s[k] = (float) \
+ (s[k] = GSM_MULT_R(s[k], 16384 >> (n-1)));\
+ break;
+# else
+# define SCALE(n) \
+ case n: for (k = 0; k <= 159; k++) \
+ s[k] = GSM_MULT_R( s[k], 16384 >> (n-1) );\
+ break;
+# endif /* USE_FLOAT_MUL */
+
+ switch (scalauto) {
+ SCALE(1)
+ SCALE(2)
+ SCALE(3)
+ SCALE(4)
+ }
+# undef SCALE
+ }
+# ifdef USE_FLOAT_MUL
+ else for (k = 0; k <= 159; k++) float_s[k] = (float) s[k];
+# endif
+
+ /* Compute the L_ACF[..].
+ */
+ {
+# ifdef USE_FLOAT_MUL
+ register float * sp = float_s;
+ register float sl = *sp;
+
+# define STEP(k) L_ACF[k] += (longword)(sl * sp[ -(k) ]);
+# else
+ word * sp = s;
+ word sl = *sp;
+
+# define STEP(k) L_ACF[k] += ((longword)sl * sp[ -(k) ]);
+# endif
+
+# define NEXTI sl = *++sp
+
+
+ for (k = 9; k--; L_ACF[k] = 0) ;
+
+ STEP (0);
+ NEXTI;
+ STEP(0); STEP(1);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2); STEP(3);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2); STEP(3); STEP(4);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5); STEP(6);
+ NEXTI;
+ STEP(0); STEP(1); STEP(2); STEP(3); STEP(4); STEP(5); STEP(6); STEP(7);
+
+ for (i = 8; i <= 159; i++) {
+
+ NEXTI;
+
+ STEP(0);
+ STEP(1); STEP(2); STEP(3); STEP(4);
+ STEP(5); STEP(6); STEP(7); STEP(8);
+ }
+
+ for (k = 9; k--; L_ACF[k] <<= 1) ;
+
+ }
+ /* Rescaling of the array s[0..159]
+ */
+ if (scalauto > 0) {
+ assert(scalauto <= 4);
+ for (k = 160; k--; *s++ <<= scalauto) ;
+ }
+}
+
+#if defined(USE_FLOAT_MUL) && defined(FAST)
+
+static void Fast_Autocorrelation P2((s, L_ACF),
+ word * s, /* [0..159] IN/OUT */
+ longword * L_ACF) /* [0..8] OUT */
+{
+ register int k, i;
+ float f_L_ACF[9];
+ float scale;
+
+ float s_f[160];
+ register float *sf = s_f;
+
+ for (i = 0; i < 160; ++i) sf[i] = s[i];
+ for (k = 0; k <= 8; k++) {
+ register float L_temp2 = 0;
+ register float *sfl = sf - k;
+ for (i = k; i < 160; ++i) L_temp2 += sf[i] * sfl[i];
+ f_L_ACF[k] = L_temp2;
+ }
+ scale = MAX_LONGWORD / f_L_ACF[0];
+
+ for (k = 0; k <= 8; k++) {
+ L_ACF[k] = f_L_ACF[k] * scale;
+ }
+}
+#endif /* defined (USE_FLOAT_MUL) && defined (FAST) */
+
+/* 4.2.5 */
+
+static void Reflection_coefficients P2( (L_ACF, r),
+ longword * L_ACF, /* 0...8 IN */
+ register word * r /* 0...7 OUT */
+)
+{
+ register int i, m, n;
+ register word temp;
+ register longword ltmp;
+ word ACF[9]; /* 0..8 */
+ word P[ 9]; /* 0..8 */
+ word K[ 9]; /* 2..8 */
+
+ /* Schur recursion with 16 bits arithmetic.
+ */
+
+ if (L_ACF[0] == 0) {
+ for (i = 8; i--; *r++ = 0) ;
+ return;
+ }
+
+ assert( L_ACF[0] != 0 );
+ temp = gsm_norm( L_ACF[0] );
+
+ assert(temp >= 0 && temp < 32);
+
+ /* ? overflow ? */
+ for (i = 0; i <= 8; i++) ACF[i] = SASR( L_ACF[i] << temp, 16 );
+
+ /* Initialize array P[..] and K[..] for the recursion.
+ */
+
+ for (i = 1; i <= 7; i++) K[ i ] = ACF[ i ];
+ for (i = 0; i <= 8; i++) P[ i ] = ACF[ i ];
+
+ /* Compute reflection coefficients
+ */
+ for (n = 1; n <= 8; n++, r++) {
+
+ temp = P[1];
+ temp = GSM_ABS(temp);
+ if (P[0] < temp) {
+ for (i = n; i <= 8; i++) *r++ = 0;
+ return;
+ }
+
+ *r = gsm_div( temp, P[0] );
+
+ assert(*r >= 0);
+ if (P[1] > 0) *r = -*r; /* r[n] = sub(0, r[n]) */
+ assert (*r != MIN_WORD);
+ if (n == 8) return;
+
+ /* Schur recursion
+ */
+ temp = GSM_MULT_R( P[1], *r );
+ P[0] = GSM_ADD( P[0], temp );
+
+ for (m = 1; m <= 8 - n; m++) {
+ temp = GSM_MULT_R( K[ m ], *r );
+ P[m] = GSM_ADD( P[ m+1 ], temp );
+
+ temp = GSM_MULT_R( P[ m+1 ], *r );
+ K[m] = GSM_ADD( K[ m ], temp );
+ }
+ }
+}
+
+/* 4.2.6 */
+
+static void Transformation_to_Log_Area_Ratios P1((r),
+ register word * r /* 0..7 IN/OUT */
+)
+/*
+ * The following scaling for r[..] and LAR[..] has been used:
+ *
+ * r[..] = integer( real_r[..]*32768. ); -1 <= real_r < 1.
+ * LAR[..] = integer( real_LAR[..] * 16384 );
+ * with -1.625 <= real_LAR <= 1.625
+ */
+{
+ register word temp;
+ register int i;
+
+
+ /* Computation of the LAR[0..7] from the r[0..7]
+ */
+ for (i = 1; i <= 8; i++, r++) {
+
+ temp = *r;
+ temp = GSM_ABS(temp);
+ assert(temp >= 0);
+
+ if (temp < 22118) {
+ temp >>= 1;
+ } else if (temp < 31130) {
+ assert( temp >= 11059 );
+ temp -= 11059;
+ } else {
+ assert( temp >= 26112 );
+ temp -= 26112;
+ temp <<= 2;
+ }
+
+ *r = *r < 0 ? -temp : temp;
+ assert( *r != MIN_WORD );
+ }
+}
+
+/* 4.2.7 */
+
+static void Quantization_and_coding P1((LAR),
+ register word * LAR /* [0..7] IN/OUT */
+)
+{
+ register word temp;
+ longword ltmp;
+
+
+ /* This procedure needs four tables; the following equations
+ * give the optimum scaling for the constants:
+ *
+ * A[0..7] = integer( real_A[0..7] * 1024 )
+ * B[0..7] = integer( real_B[0..7] * 512 )
+ * MAC[0..7] = maximum of the LARc[0..7]
+ * MIC[0..7] = minimum of the LARc[0..7]
+ */
+
+# undef STEP
+# define STEP( A, B, MAC, MIC ) \
+ temp = GSM_MULT( A, *LAR ); \
+ temp = GSM_ADD( temp, B ); \
+ temp = GSM_ADD( temp, 256 ); \
+ temp = SASR( temp, 9 ); \
+ *LAR = temp>MAC ? MAC - MIC : (temp<MIC ? 0 : temp - MIC); \
+ LAR++;
+
+ STEP( 20480, 0, 31, -32 );
+ STEP( 20480, 0, 31, -32 );
+ STEP( 20480, 2048, 15, -16 );
+ STEP( 20480, -2560, 15, -16 );
+
+ STEP( 13964, 94, 7, -8 );
+ STEP( 15360, -1792, 7, -8 );
+ STEP( 8534, -341, 3, -4 );
+ STEP( 9036, -1144, 3, -4 );
+
+# undef STEP
+}
+
+void Gsm_LPC_Analysis P3((S, s,LARc),
+ struct gsm_state *S,
+ word * s, /* 0..159 signals IN/OUT */
+ word * LARc) /* 0..7 LARc's OUT */
+{
+ longword L_ACF[9];
+
+#if defined(USE_FLOAT_MUL) && defined(FAST)
+ if (S->fast) Fast_Autocorrelation (s, L_ACF );
+ else
+#endif
+ Autocorrelation (s, L_ACF );
+ Reflection_coefficients (L_ACF, LARc );
+ Transformation_to_Log_Area_Ratios (LARc);
+ Quantization_and_coding (LARc);
+}
diff --git a/jni/libgsm/src/preprocess.c b/jni/libgsm/src/preprocess.c
new file mode 100644
index 0000000..fa16efe
--- /dev/null
+++ b/jni/libgsm/src/preprocess.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/preprocess.c,v 1.2 1994/05/10 20:18:45 jutta Exp $ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+/* 4.2.0 .. 4.2.3 PREPROCESSING SECTION
+ *
+ * After A-law to linear conversion (or directly from the
+ * Ato D converter) the following scaling is assumed for
+ * input to the RPE-LTP algorithm:
+ *
+ * in: 0.1.....................12
+ * S.v.v.v.v.v.v.v.v.v.v.v.v.*.*.*
+ *
+ * Where S is the sign bit, v a valid bit, and * a "don't care" bit.
+ * The original signal is called sop[..]
+ *
+ * out: 0.1................... 12
+ * S.S.v.v.v.v.v.v.v.v.v.v.v.v.0.0
+ */
+
+
+void Gsm_Preprocess P3((S, s, so),
+ struct gsm_state * S,
+ word * s,
+ word * so ) /* [0..159] IN/OUT */
+{
+
+ word z1 = S->z1;
+ longword L_z2 = S->L_z2;
+ word mp = S->mp;
+
+ word s1;
+ longword L_s2;
+
+ longword L_temp;
+
+ word msp, lsp;
+ word SO;
+
+ longword ltmp; /* for ADD */
+ ulongword utmp; /* for L_ADD */
+
+ register int k = 160;
+
+ while (k--) {
+
+ /* 4.2.1 Downscaling of the input signal
+ */
+ SO = SASR( *s, 3 ) << 2;
+ s++;
+
+ assert (SO >= -0x4000); /* downscaled by */
+ assert (SO <= 0x3FFC); /* previous routine. */
+
+
+ /* 4.2.2 Offset compensation
+ *
+ * This part implements a high-pass filter and requires extended
+ * arithmetic precision for the recursive part of this filter.
+ * The input of this procedure is the array so[0...159] and the
+ * output the array sof[ 0...159 ].
+ */
+ /* Compute the non-recursive part
+ */
+
+ s1 = SO - z1; /* s1 = gsm_sub( *so, z1 ); */
+ z1 = SO;
+
+ assert(s1 != MIN_WORD);
+
+ /* Compute the recursive part
+ */
+ L_s2 = s1;
+ L_s2 <<= 15;
+
+ /* Execution of a 31 bv 16 bits multiplication
+ */
+
+ msp = SASR( L_z2, 15 );
+ lsp = L_z2-((longword)msp<<15); /* gsm_L_sub(L_z2,(msp<<15)); */
+
+ L_s2 += GSM_MULT_R( lsp, 32735 );
+ L_temp = (longword)msp * 32735; /* GSM_L_MULT(msp,32735) >> 1;*/
+ L_z2 = GSM_L_ADD( L_temp, L_s2 );
+
+ /* Compute sof[k] with rounding
+ */
+ L_temp = GSM_L_ADD( L_z2, 16384 );
+
+ /* 4.2.3 Preemphasis
+ */
+
+ msp = GSM_MULT_R( mp, -28180 );
+ mp = SASR( L_temp, 15 );
+ *so++ = GSM_ADD( mp, msp );
+ }
+
+ S->z1 = z1;
+ S->L_z2 = L_z2;
+ S->mp = mp;
+}
diff --git a/jni/libgsm/src/rpe.c b/jni/libgsm/src/rpe.c
new file mode 100644
index 0000000..eda4f18
--- /dev/null
+++ b/jni/libgsm/src/rpe.c
@@ -0,0 +1,488 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/rpe.c,v 1.3 1994/05/10 20:18:46 jutta Exp $ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+/* 4.2.13 .. 4.2.17 RPE ENCODING SECTION
+ */
+
+/* 4.2.13 */
+
+static void Weighting_filter P2((e, x),
+ register word * e, /* signal [-5..0.39.44] IN */
+ word * x /* signal [0..39] OUT */
+)
+/*
+ * The coefficients of the weighting filter are stored in a table
+ * (see table 4.4). The following scaling is used:
+ *
+ * H[0..10] = integer( real_H[ 0..10] * 8192 );
+ */
+{
+ /* word wt[ 50 ]; */
+
+ register longword L_result;
+ register int k /* , i */ ;
+
+ /* Initialization of a temporary working array wt[0...49]
+ */
+
+ /* for (k = 0; k <= 4; k++) wt[k] = 0;
+ * for (k = 5; k <= 44; k++) wt[k] = *e++;
+ * for (k = 45; k <= 49; k++) wt[k] = 0;
+ *
+ * (e[-5..-1] and e[40..44] are allocated by the caller,
+ * are initially zero and are not written anywhere.)
+ */
+ e -= 5;
+
+ /* Compute the signal x[0..39]
+ */
+ for (k = 0; k <= 39; k++) {
+
+ L_result = 8192 >> 1;
+
+ /* for (i = 0; i <= 10; i++) {
+ * L_temp = GSM_L_MULT( wt[k+i], gsm_H[i] );
+ * L_result = GSM_L_ADD( L_result, L_temp );
+ * }
+ */
+
+#undef STEP
+#define STEP( i, H ) (e[ k + i ] * (longword)H)
+
+ /* Every one of these multiplications is done twice --
+ * but I don't see an elegant way to optimize this.
+ * Do you?
+ */
+
+#ifdef STUPID_COMPILER
+ L_result += STEP( 0, -134 ) ;
+ L_result += STEP( 1, -374 ) ;
+ /* + STEP( 2, 0 ) */
+ L_result += STEP( 3, 2054 ) ;
+ L_result += STEP( 4, 5741 ) ;
+ L_result += STEP( 5, 8192 ) ;
+ L_result += STEP( 6, 5741 ) ;
+ L_result += STEP( 7, 2054 ) ;
+ /* + STEP( 8, 0 ) */
+ L_result += STEP( 9, -374 ) ;
+ L_result += STEP( 10, -134 ) ;
+#else
+ L_result +=
+ STEP( 0, -134 )
+ + STEP( 1, -374 )
+ /* + STEP( 2, 0 ) */
+ + STEP( 3, 2054 )
+ + STEP( 4, 5741 )
+ + STEP( 5, 8192 )
+ + STEP( 6, 5741 )
+ + STEP( 7, 2054 )
+ /* + STEP( 8, 0 ) */
+ + STEP( 9, -374 )
+ + STEP(10, -134 )
+ ;
+#endif
+
+ /* L_result = GSM_L_ADD( L_result, L_result ); (* scaling(x2) *)
+ * L_result = GSM_L_ADD( L_result, L_result ); (* scaling(x4) *)
+ *
+ * x[k] = SASR( L_result, 16 );
+ */
+
+ /* 2 adds vs. >>16 => 14, minus one shift to compensate for
+ * those we lost when replacing L_MULT by '*'.
+ */
+
+ L_result = SASR( L_result, 13 );
+ x[k] = ( L_result < MIN_WORD ? MIN_WORD
+ : (L_result > MAX_WORD ? MAX_WORD : L_result ));
+ }
+}
+
+/* 4.2.14 */
+
+static void RPE_grid_selection P3((x,xM,Mc_out),
+ word * x, /* [0..39] IN */
+ word * xM, /* [0..12] OUT */
+ word * Mc_out /* OUT */
+)
+/*
+ * The signal x[0..39] is used to select the RPE grid which is
+ * represented by Mc.
+ */
+{
+ /* register word temp1; */
+ register int /* m, */ i;
+ register longword L_result, L_temp;
+ longword EM; /* xxx should be L_EM? */
+ word Mc;
+
+ longword L_common_0_3;
+
+ EM = 0;
+ Mc = 0;
+
+ /* for (m = 0; m <= 3; m++) {
+ * L_result = 0;
+ *
+ *
+ * for (i = 0; i <= 12; i++) {
+ *
+ * temp1 = SASR( x[m + 3*i], 2 );
+ *
+ * assert(temp1 != MIN_WORD);
+ *
+ * L_temp = GSM_L_MULT( temp1, temp1 );
+ * L_result = GSM_L_ADD( L_temp, L_result );
+ * }
+ *
+ * if (L_result > EM) {
+ * Mc = m;
+ * EM = L_result;
+ * }
+ * }
+ */
+
+#undef STEP
+#define STEP( m, i ) L_temp = SASR( x[m + 3 * i], 2 ); \
+ L_result += L_temp * L_temp;
+
+ /* common part of 0 and 3 */
+
+ L_result = 0;
+ STEP( 0, 1 ); STEP( 0, 2 ); STEP( 0, 3 ); STEP( 0, 4 );
+ STEP( 0, 5 ); STEP( 0, 6 ); STEP( 0, 7 ); STEP( 0, 8 );
+ STEP( 0, 9 ); STEP( 0, 10); STEP( 0, 11); STEP( 0, 12);
+ L_common_0_3 = L_result;
+
+ /* i = 0 */
+
+ STEP( 0, 0 );
+ L_result <<= 1; /* implicit in L_MULT */
+ EM = L_result;
+
+ /* i = 1 */
+
+ L_result = 0;
+ STEP( 1, 0 );
+ STEP( 1, 1 ); STEP( 1, 2 ); STEP( 1, 3 ); STEP( 1, 4 );
+ STEP( 1, 5 ); STEP( 1, 6 ); STEP( 1, 7 ); STEP( 1, 8 );
+ STEP( 1, 9 ); STEP( 1, 10); STEP( 1, 11); STEP( 1, 12);
+ L_result <<= 1;
+ if (L_result > EM) {
+ Mc = 1;
+ EM = L_result;
+ }
+
+ /* i = 2 */
+
+ L_result = 0;
+ STEP( 2, 0 );
+ STEP( 2, 1 ); STEP( 2, 2 ); STEP( 2, 3 ); STEP( 2, 4 );
+ STEP( 2, 5 ); STEP( 2, 6 ); STEP( 2, 7 ); STEP( 2, 8 );
+ STEP( 2, 9 ); STEP( 2, 10); STEP( 2, 11); STEP( 2, 12);
+ L_result <<= 1;
+ if (L_result > EM) {
+ Mc = 2;
+ EM = L_result;
+ }
+
+ /* i = 3 */
+
+ L_result = L_common_0_3;
+ STEP( 3, 12 );
+ L_result <<= 1;
+ if (L_result > EM) {
+ Mc = 3;
+ EM = L_result;
+ }
+
+ /**/
+
+ /* Down-sampling by a factor 3 to get the selected xM[0..12]
+ * RPE sequence.
+ */
+ for (i = 0; i <= 12; i ++) xM[i] = x[Mc + 3*i];
+ *Mc_out = Mc;
+}
+
+/* 4.12.15 */
+
+static void APCM_quantization_xmaxc_to_exp_mant P3((xmaxc,exp_out,mant_out),
+ word xmaxc, /* IN */
+ word * exp_out, /* OUT */
+ word * mant_out ) /* OUT */
+{
+ word exp, mant;
+
+ /* Compute exponent and mantissa of the decoded version of xmaxc
+ */
+
+ exp = 0;
+ if (xmaxc > 15) exp = SASR(xmaxc, 3) - 1;
+ mant = xmaxc - (exp << 3);
+
+ if (mant == 0) {
+ exp = -4;
+ mant = 7;
+ }
+ else {
+ while (mant <= 7) {
+ mant = mant << 1 | 1;
+ exp--;
+ }
+ mant -= 8;
+ }
+
+ assert( exp >= -4 && exp <= 6 );
+ assert( mant >= 0 && mant <= 7 );
+
+ *exp_out = exp;
+ *mant_out = mant;
+}
+
+static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out),
+ word * xM, /* [0..12] IN */
+
+ word * xMc, /* [0..12] OUT */
+ word * mant_out, /* OUT */
+ word * exp_out, /* OUT */
+ word * xmaxc_out /* OUT */
+)
+{
+ int i, itest;
+
+ word xmax, xmaxc, temp, temp1, temp2;
+ word exp, mant;
+
+
+ /* Find the maximum absolute value xmax of xM[0..12].
+ */
+
+ xmax = 0;
+ for (i = 0; i <= 12; i++) {
+ temp = xM[i];
+ temp = GSM_ABS(temp);
+ if (temp > xmax) xmax = temp;
+ }
+
+ /* Qantizing and coding of xmax to get xmaxc.
+ */
+
+ exp = 0;
+ temp = SASR( xmax, 9 );
+ itest = 0;
+
+ for (i = 0; i <= 5; i++) {
+
+ itest |= (temp <= 0);
+ temp = SASR( temp, 1 );
+
+ assert(exp <= 5);
+ if (itest == 0) exp++; /* exp = add (exp, 1) */
+ }
+
+ assert(exp <= 6 && exp >= 0);
+ temp = exp + 5;
+
+ assert(temp <= 11 && temp >= 0);
+ xmaxc = gsm_add( SASR(xmax, temp), exp << 3 );
+
+ /* Quantizing and coding of the xM[0..12] RPE sequence
+ * to get the xMc[0..12]
+ */
+
+ APCM_quantization_xmaxc_to_exp_mant( xmaxc, &exp, &mant );
+
+ /* This computation uses the fact that the decoded version of xmaxc
+ * can be calculated by using the exponent and the mantissa part of
+ * xmaxc (logarithmic table).
+ * So, this method avoids any division and uses only a scaling
+ * of the RPE samples by a function of the exponent. A direct
+ * multiplication by the inverse of the mantissa (NRFAC[0..7]
+ * found in table 4.5) gives the 3 bit coded version xMc[0..12]
+ * of the RPE samples.
+ */
+
+
+ /* Direct computation of xMc[0..12] using table 4.5
+ */
+
+ assert( exp <= 4096 && exp >= -4096);
+ assert( mant >= 0 && mant <= 7 );
+
+ temp1 = 6 - exp; /* normalization by the exponent */
+ temp2 = gsm_NRFAC[ mant ]; /* inverse mantissa */
+
+ for (i = 0; i <= 12; i++) {
+
+ assert(temp1 >= 0 && temp1 < 16);
+
+ temp = xM[i] << temp1;
+ temp = GSM_MULT( temp, temp2 );
+ temp = SASR(temp, 12);
+ xMc[i] = temp + 4; /* see note below */
+ }
+
+ /* NOTE: This equation is used to make all the xMc[i] positive.
+ */
+
+ *mant_out = mant;
+ *exp_out = exp;
+ *xmaxc_out = xmaxc;
+}
+
+/* 4.2.16 */
+
+static void APCM_inverse_quantization P4((xMc,mant,exp,xMp),
+ register word * xMc, /* [0..12] IN */
+ word mant,
+ word exp,
+ register word * xMp) /* [0..12] OUT */
+/*
+ * This part is for decoding the RPE sequence of coded xMc[0..12]
+ * samples to obtain the xMp[0..12] array. Table 4.6 is used to get
+ * the mantissa of xmaxc (FAC[0..7]).
+ */
+{
+ int i;
+ word temp, temp1, temp2, temp3;
+ longword ltmp;
+
+ assert( mant >= 0 && mant <= 7 );
+
+ temp1 = gsm_FAC[ mant ]; /* see 4.2-15 for mant */
+ temp2 = gsm_sub( 6, exp ); /* see 4.2-15 for exp */
+ temp3 = gsm_asl( 1, gsm_sub( temp2, 1 ));
+
+ for (i = 13; i--;) {
+
+ assert( *xMc <= 7 && *xMc >= 0 ); /* 3 bit unsigned */
+
+ /* temp = gsm_sub( *xMc++ << 1, 7 ); */
+ temp = (*xMc++ << 1) - 7; /* restore sign */
+ assert( temp <= 7 && temp >= -7 ); /* 4 bit signed */
+
+ temp <<= 12; /* 16 bit signed */
+ temp = GSM_MULT_R( temp1, temp );
+ temp = GSM_ADD( temp, temp3 );
+ *xMp++ = gsm_asr( temp, temp2 );
+ }
+}
+
+/* 4.2.17 */
+
+static void RPE_grid_positioning P3((Mc,xMp,ep),
+ word Mc, /* grid position IN */
+ register word * xMp, /* [0..12] IN */
+ register word * ep /* [0..39] OUT */
+)
+/*
+ * This procedure computes the reconstructed long term residual signal
+ * ep[0..39] for the LTP analysis filter. The inputs are the Mc
+ * which is the grid position selection and the xMp[0..12] decoded
+ * RPE samples which are upsampled by a factor of 3 by inserting zero
+ * values.
+ */
+{
+ int i = 13;
+
+ assert(0 <= Mc && Mc <= 3);
+
+ switch (Mc) {
+ case 3: *ep++ = 0;
+ case 2: do {
+ *ep++ = 0;
+ case 1: *ep++ = 0;
+ case 0: *ep++ = *xMp++;
+ } while (--i);
+ }
+ while (++Mc < 4) *ep++ = 0;
+
+ /*
+
+ int i, k;
+ for (k = 0; k <= 39; k++) ep[k] = 0;
+ for (i = 0; i <= 12; i++) {
+ ep[ Mc + (3*i) ] = xMp[i];
+ }
+ */
+}
+
+/* 4.2.18 */
+
+/* This procedure adds the reconstructed long term residual signal
+ * ep[0..39] to the estimated signal dpp[0..39] from the long term
+ * analysis filter to compute the reconstructed short term residual
+ * signal dp[-40..-1]; also the reconstructed short term residual
+ * array dp[-120..-41] is updated.
+ */
+
+#if 0 /* Has been inlined in code.c */
+void Gsm_Update_of_reconstructed_short_time_residual_signal P3((dpp, ep, dp),
+ word * dpp, /* [0...39] IN */
+ word * ep, /* [0...39] IN */
+ word * dp) /* [-120...-1] IN/OUT */
+{
+ int k;
+
+ for (k = 0; k <= 79; k++)
+ dp[ -120 + k ] = dp[ -80 + k ];
+
+ for (k = 0; k <= 39; k++)
+ dp[ -40 + k ] = gsm_add( ep[k], dpp[k] );
+}
+#endif /* Has been inlined in code.c */
+
+void Gsm_RPE_Encoding P5((S,e,xmaxc,Mc,xMc),
+
+ struct gsm_state * S,
+
+ word * e, /* -5..-1][0..39][40..44 IN/OUT */
+ word * xmaxc, /* OUT */
+ word * Mc, /* OUT */
+ word * xMc) /* [0..12] OUT */
+{
+ word x[40];
+ word xM[13], xMp[13];
+ word mant, exp;
+
+ Weighting_filter(e, x);
+ RPE_grid_selection(x, xM, Mc);
+
+ APCM_quantization( xM, xMc, &mant, &exp, xmaxc);
+ APCM_inverse_quantization( xMc, mant, exp, xMp);
+
+ RPE_grid_positioning( *Mc, xMp, e );
+
+}
+
+void Gsm_RPE_Decoding P5((S, xmaxcr, Mcr, xMcr, erp),
+ struct gsm_state * S,
+
+ word xmaxcr,
+ word Mcr,
+ word * xMcr, /* [0..12], 3 bits IN */
+ word * erp /* [0..39] OUT */
+)
+{
+ word exp, mant;
+ word xMp[ 13 ];
+
+ APCM_quantization_xmaxc_to_exp_mant( xmaxcr, &exp, &mant );
+ APCM_inverse_quantization( xMcr, mant, exp, xMp );
+ RPE_grid_positioning( Mcr, xMp, erp );
+
+}
diff --git a/jni/libgsm/src/short_term.c b/jni/libgsm/src/short_term.c
new file mode 100644
index 0000000..f7829ba
--- /dev/null
+++ b/jni/libgsm/src/short_term.c
@@ -0,0 +1,429 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/short_term.c,v 1.2 1994/05/10 20:18:47 jutta Exp $ */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "private.h"
+
+#include "gsm.h"
+#include "proto.h"
+
+/*
+ * SHORT TERM ANALYSIS FILTERING SECTION
+ */
+
+/* 4.2.8 */
+
+static void Decoding_of_the_coded_Log_Area_Ratios P2((LARc,LARpp),
+ word * LARc, /* coded log area ratio [0..7] IN */
+ word * LARpp) /* out: decoded .. */
+{
+ register word temp1 /* , temp2 */;
+ register long ltmp; /* for GSM_ADD */
+
+ /* This procedure requires for efficient implementation
+ * two tables.
+ *
+ * INVA[1..8] = integer( (32768 * 8) / real_A[1..8])
+ * MIC[1..8] = minimum value of the LARc[1..8]
+ */
+
+ /* Compute the LARpp[1..8]
+ */
+
+ /* for (i = 1; i <= 8; i++, B++, MIC++, INVA++, LARc++, LARpp++) {
+ *
+ * temp1 = GSM_ADD( *LARc, *MIC ) << 10;
+ * temp2 = *B << 1;
+ * temp1 = GSM_SUB( temp1, temp2 );
+ *
+ * assert(*INVA != MIN_WORD);
+ *
+ * temp1 = GSM_MULT_R( *INVA, temp1 );
+ * *LARpp = GSM_ADD( temp1, temp1 );
+ * }
+ */
+
+#undef STEP
+#define STEP( B, MIC, INVA ) \
+ temp1 = GSM_ADD( *LARc++, MIC ) << 10; \
+ temp1 = GSM_SUB( temp1, B << 1 ); \
+ temp1 = GSM_MULT_R( INVA, temp1 ); \
+ *LARpp++ = GSM_ADD( temp1, temp1 );
+
+ STEP( 0, -32, 13107 );
+ STEP( 0, -32, 13107 );
+ STEP( 2048, -16, 13107 );
+ STEP( -2560, -16, 13107 );
+
+ STEP( 94, -8, 19223 );
+ STEP( -1792, -8, 17476 );
+ STEP( -341, -4, 31454 );
+ STEP( -1144, -4, 29708 );
+
+ /* NOTE: the addition of *MIC is used to restore
+ * the sign of *LARc.
+ */
+}
+
+/* 4.2.9 */
+/* Computation of the quantized reflection coefficients
+ */
+
+/* 4.2.9.1 Interpolation of the LARpp[1..8] to get the LARp[1..8]
+ */
+
+/*
+ * Within each frame of 160 analyzed speech samples the short term
+ * analysis and synthesis filters operate with four different sets of
+ * coefficients, derived from the previous set of decoded LARs(LARpp(j-1))
+ * and the actual set of decoded LARs (LARpp(j))
+ *
+ * (Initial value: LARpp(j-1)[1..8] = 0.)
+ */
+
+static void Coefficients_0_12 P3((LARpp_j_1, LARpp_j, LARp),
+ register word * LARpp_j_1,
+ register word * LARpp_j,
+ register word * LARp)
+{
+ register int i;
+ register longword ltmp;
+
+ for (i = 1; i <= 8; i++, LARp++, LARpp_j_1++, LARpp_j++) {
+ *LARp = GSM_ADD( SASR( *LARpp_j_1, 2 ), SASR( *LARpp_j, 2 ));
+ *LARp = GSM_ADD( *LARp, SASR( *LARpp_j_1, 1));
+ }
+}
+
+static void Coefficients_13_26 P3((LARpp_j_1, LARpp_j, LARp),
+ register word * LARpp_j_1,
+ register word * LARpp_j,
+ register word * LARp)
+{
+ register int i;
+ register longword ltmp;
+ for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) {
+ *LARp = GSM_ADD( SASR( *LARpp_j_1, 1), SASR( *LARpp_j, 1 ));
+ }
+}
+
+static void Coefficients_27_39 P3((LARpp_j_1, LARpp_j, LARp),
+ register word * LARpp_j_1,
+ register word * LARpp_j,
+ register word * LARp)
+{
+ register int i;
+ register longword ltmp;
+
+ for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) {
+ *LARp = GSM_ADD( SASR( *LARpp_j_1, 2 ), SASR( *LARpp_j, 2 ));
+ *LARp = GSM_ADD( *LARp, SASR( *LARpp_j, 1 ));
+ }
+}
+
+
+static void Coefficients_40_159 P2((LARpp_j, LARp),
+ register word * LARpp_j,
+ register word * LARp)
+{
+ register int i;
+
+ for (i = 1; i <= 8; i++, LARp++, LARpp_j++)
+ *LARp = *LARpp_j;
+}
+
+/* 4.2.9.2 */
+
+static void LARp_to_rp P1((LARp),
+ register word * LARp) /* [0..7] IN/OUT */
+/*
+ * The input of this procedure is the interpolated LARp[0..7] array.
+ * The reflection coefficients, rp[i], are used in the analysis
+ * filter and in the synthesis filter.
+ */
+{
+ register int i;
+ register word temp;
+ register longword ltmp;
+
+ for (i = 1; i <= 8; i++, LARp++) {
+
+ /* temp = GSM_ABS( *LARp );
+ *
+ * if (temp < 11059) temp <<= 1;
+ * else if (temp < 20070) temp += 11059;
+ * else temp = GSM_ADD( temp >> 2, 26112 );
+ *
+ * *LARp = *LARp < 0 ? -temp : temp;
+ */
+
+ if (*LARp < 0) {
+ temp = *LARp == MIN_WORD ? MAX_WORD : -(*LARp);
+ *LARp = - ((temp < 11059) ? temp << 1
+ : ((temp < 20070) ? temp + 11059
+ : GSM_ADD( temp >> 2, 26112 )));
+ } else {
+ temp = *LARp;
+ *LARp = (temp < 11059) ? temp << 1
+ : ((temp < 20070) ? temp + 11059
+ : GSM_ADD( temp >> 2, 26112 ));
+ }
+ }
+}
+
+
+/* 4.2.10 */
+static void Short_term_analysis_filtering P4((S,rp,k_n,s),
+ struct gsm_state * S,
+ register word * rp, /* [0..7] IN */
+ register int k_n, /* k_end - k_start */
+ register word * s /* [0..n-1] IN/OUT */
+)
+/*
+ * This procedure computes the short term residual signal d[..] to be fed
+ * to the RPE-LTP loop from the s[..] signal and from the local rp[..]
+ * array (quantized reflection coefficients). As the call of this
+ * procedure can be done in many ways (see the interpolation of the LAR
+ * coefficient), it is assumed that the computation begins with index
+ * k_start (for arrays d[..] and s[..]) and stops with index k_end
+ * (k_start and k_end are defined in 4.2.9.1). This procedure also
+ * needs to keep the array u[0..7] in memory for each call.
+ */
+{
+ register word * u = S->u;
+ register int i;
+ register word di, zzz, ui, sav, rpi;
+ register longword ltmp;
+
+ for (; k_n--; s++) {
+
+ di = sav = *s;
+
+ for (i = 0; i < 8; i++) { /* YYY */
+
+ ui = u[i];
+ rpi = rp[i];
+ u[i] = sav;
+
+ zzz = GSM_MULT_R(rpi, di);
+ sav = GSM_ADD( ui, zzz);
+
+ zzz = GSM_MULT_R(rpi, ui);
+ di = GSM_ADD( di, zzz );
+ }
+
+ *s = di;
+ }
+}
+
+#if defined(USE_FLOAT_MUL) && defined(FAST)
+
+static void Fast_Short_term_analysis_filtering P4((S,rp,k_n,s),
+ struct gsm_state * S,
+ register word * rp, /* [0..7] IN */
+ register int k_n, /* k_end - k_start */
+ register word * s /* [0..n-1] IN/OUT */
+)
+{
+ register word * u = S->u;
+ register int i;
+
+ float uf[8],
+ rpf[8];
+
+ register float scalef = 3.0517578125e-5;
+ register float sav, di, temp;
+
+ for (i = 0; i < 8; ++i) {
+ uf[i] = u[i];
+ rpf[i] = rp[i] * scalef;
+ }
+ for (; k_n--; s++) {
+ sav = di = *s;
+ for (i = 0; i < 8; ++i) {
+ register float rpfi = rpf[i];
+ register float ufi = uf[i];
+
+ uf[i] = sav;
+ temp = rpfi * di + ufi;
+ di += rpfi * ufi;
+ sav = temp;
+ }
+ *s = di;
+ }
+ for (i = 0; i < 8; ++i) u[i] = uf[i];
+}
+#endif /* ! (defined (USE_FLOAT_MUL) && defined (FAST)) */
+
+static void Short_term_synthesis_filtering P5((S,rrp,k,wt,sr),
+ struct gsm_state * S,
+ register word * rrp, /* [0..7] IN */
+ register int k, /* k_end - k_start */
+ register word * wt, /* [0..k-1] IN */
+ register word * sr /* [0..k-1] OUT */
+)
+{
+ register word * v = S->v;
+ register int i;
+ register word sri, tmp1, tmp2;
+ register longword ltmp; /* for GSM_ADD & GSM_SUB */
+
+ while (k--) {
+ sri = *wt++;
+ for (i = 8; i--;) {
+
+ /* sri = GSM_SUB( sri, gsm_mult_r( rrp[i], v[i] ) );
+ */
+ tmp1 = rrp[i];
+ tmp2 = v[i];
+ tmp2 = ( tmp1 == MIN_WORD && tmp2 == MIN_WORD
+ ? MAX_WORD
+ : 0x0FFFF & (( (longword)tmp1 * (longword)tmp2
+ + 16384) >> 15)) ;
+
+ sri = GSM_SUB( sri, tmp2 );
+
+ /* v[i+1] = GSM_ADD( v[i], gsm_mult_r( rrp[i], sri ) );
+ */
+ tmp1 = ( tmp1 == MIN_WORD && sri == MIN_WORD
+ ? MAX_WORD
+ : 0x0FFFF & (( (longword)tmp1 * (longword)sri
+ + 16384) >> 15)) ;
+
+ v[i+1] = GSM_ADD( v[i], tmp1);
+ }
+ *sr++ = v[0] = sri;
+ }
+}
+
+
+#if defined(FAST) && defined(USE_FLOAT_MUL)
+
+static void Fast_Short_term_synthesis_filtering P5((S,rrp,k,wt,sr),
+ struct gsm_state * S,
+ register word * rrp, /* [0..7] IN */
+ register int k, /* k_end - k_start */
+ register word * wt, /* [0..k-1] IN */
+ register word * sr /* [0..k-1] OUT */
+)
+{
+ register word * v = S->v;
+ register int i;
+
+ float va[9], rrpa[8];
+ register float scalef = 3.0517578125e-5, temp;
+
+ for (i = 0; i < 8; ++i) {
+ va[i] = v[i];
+ rrpa[i] = (float)rrp[i] * scalef;
+ }
+ while (k--) {
+ register float sri = *wt++;
+ for (i = 8; i--;) {
+ sri -= rrpa[i] * va[i];
+ if (sri < -32768.) sri = -32768.;
+ else if (sri > 32767.) sri = 32767.;
+
+ temp = va[i] + rrpa[i] * sri;
+ if (temp < -32768.) temp = -32768.;
+ else if (temp > 32767.) temp = 32767.;
+ va[i+1] = temp;
+ }
+ *sr++ = va[0] = sri;
+ }
+ for (i = 0; i < 9; ++i) v[i] = va[i];
+}
+
+#endif /* defined(FAST) && defined(USE_FLOAT_MUL) */
+
+void Gsm_Short_Term_Analysis_Filter P3((S,LARc,s),
+
+ struct gsm_state * S,
+
+ word * LARc, /* coded log area ratio [0..7] IN */
+ word * s /* signal [0..159] IN/OUT */
+)
+{
+ word * LARpp_j = S->LARpp[ S->j ];
+ word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
+
+ word LARp[8];
+
+#undef FILTER
+#if defined(FAST) && defined(USE_FLOAT_MUL)
+# define FILTER (* (S->fast \
+ ? Fast_Short_term_analysis_filtering \
+ : Short_term_analysis_filtering ))
+
+#else
+# define FILTER Short_term_analysis_filtering
+#endif
+
+ Decoding_of_the_coded_Log_Area_Ratios( LARc, LARpp_j );
+
+ Coefficients_0_12( LARpp_j_1, LARpp_j, LARp );
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 13, s);
+
+ Coefficients_13_26( LARpp_j_1, LARpp_j, LARp);
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 14, s + 13);
+
+ Coefficients_27_39( LARpp_j_1, LARpp_j, LARp);
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 13, s + 27);
+
+ Coefficients_40_159( LARpp_j, LARp);
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 120, s + 40);
+}
+
+void Gsm_Short_Term_Synthesis_Filter P4((S, LARcr, wt, s),
+ struct gsm_state * S,
+
+ word * LARcr, /* received log area ratios [0..7] IN */
+ word * wt, /* received d [0..159] IN */
+
+ word * s /* signal s [0..159] OUT */
+)
+{
+ word * LARpp_j = S->LARpp[ S->j ];
+ word * LARpp_j_1 = S->LARpp[ S->j ^=1 ];
+
+ word LARp[8];
+
+#undef FILTER
+#if defined(FAST) && defined(USE_FLOAT_MUL)
+
+# define FILTER (* (S->fast \
+ ? Fast_Short_term_synthesis_filtering \
+ : Short_term_synthesis_filtering ))
+#else
+# define FILTER Short_term_synthesis_filtering
+#endif
+
+ Decoding_of_the_coded_Log_Area_Ratios( LARcr, LARpp_j );
+
+ Coefficients_0_12( LARpp_j_1, LARpp_j, LARp );
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 13, wt, s );
+
+ Coefficients_13_26( LARpp_j_1, LARpp_j, LARp);
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 14, wt + 13, s + 13 );
+
+ Coefficients_27_39( LARpp_j_1, LARpp_j, LARp);
+ LARp_to_rp( LARp );
+ FILTER( S, LARp, 13, wt + 27, s + 27 );
+
+ Coefficients_40_159( LARpp_j, LARp );
+ LARp_to_rp( LARp );
+ FILTER(S, LARp, 120, wt + 40, s + 40);
+}
diff --git a/jni/libgsm/src/table.c b/jni/libgsm/src/table.c
new file mode 100644
index 0000000..0ed6f70
--- /dev/null
+++ b/jni/libgsm/src/table.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/table.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+/* Most of these tables are inlined at their point of use.
+ */
+
+/* 4.4 TABLES USED IN THE FIXED POINT IMPLEMENTATION OF THE RPE-LTP
+ * CODER AND DECODER
+ *
+ * (Most of them inlined, so watch out.)
+ */
+
+#define GSM_TABLE_C
+#include "private.h"
+#include "gsm.h"
+
+/* Table 4.1 Quantization of the Log.-Area Ratios
+ */
+/* i 1 2 3 4 5 6 7 8 */
+word gsm_A[8] = {20480, 20480, 20480, 20480, 13964, 15360, 8534, 9036};
+word gsm_B[8] = { 0, 0, 2048, -2560, 94, -1792, -341, -1144};
+word gsm_MIC[8] = { -32, -32, -16, -16, -8, -8, -4, -4 };
+word gsm_MAC[8] = { 31, 31, 15, 15, 7, 7, 3, 3 };
+
+
+/* Table 4.2 Tabulation of 1/A[1..8]
+ */
+word gsm_INVA[8]={ 13107, 13107, 13107, 13107, 19223, 17476, 31454, 29708 };
+
+
+/* Table 4.3a Decision level of the LTP gain quantizer
+ */
+/* bc 0 1 2 3 */
+word gsm_DLB[4] = { 6554, 16384, 26214, 32767 };
+
+
+/* Table 4.3b Quantization levels of the LTP gain quantizer
+ */
+/* bc 0 1 2 3 */
+word gsm_QLB[4] = { 3277, 11469, 21299, 32767 };
+
+
+/* Table 4.4 Coefficients of the weighting filter
+ */
+/* i 0 1 2 3 4 5 6 7 8 9 10 */
+word gsm_H[11] = {-134, -374, 0, 2054, 5741, 8192, 5741, 2054, 0, -374, -134 };
+
+
+/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax
+ */
+/* i 0 1 2 3 4 5 6 7 */
+word gsm_NRFAC[8] = { 29128, 26215, 23832, 21846, 20165, 18725, 17476, 16384 };
+
+
+/* Table 4.6 Normalized direct mantissa used to compute xM/xmax
+ */
+/* i 0 1 2 3 4 5 6 7 */
+word gsm_FAC[8] = { 18431, 20479, 22527, 24575, 26623, 28671, 30719, 32767 };
diff --git a/jni/libgsm/src/toast.c b/jni/libgsm/src/toast.c
new file mode 100644
index 0000000..9823642
--- /dev/null
+++ b/jni/libgsm/src/toast.c
@@ -0,0 +1,800 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast.c,v 1.8 1996/07/02 10:41:04 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast -- lossy sound compression using the gsm library.
+ */
+
+char * progname;
+
+int f_decode = 0; /* decode rather than encode (-d) */
+int f_cat = 0; /* write to stdout; implies -p (-c) */
+int f_force = 0; /* don't ask about replacements (-f) */
+int f_precious = 0; /* avoid deletion of original (-p) */
+int f_fast = 0; /* use faster fpt algorithm (-F) */
+int f_verbose = 0; /* debugging (-V) */
+int f_ltp_cut = 0; /* LTP cut-off margin (-C) */
+
+struct stat instat; /* stat (inname) */
+
+FILE *in, *out;
+char *inname, *outname;
+
+/*
+ * The function (*output)() writes a frame of 160 samples given as
+ * 160 signed 16 bit values (gsm_signals) to <out>.
+ * The function (*input)() reads one such frame from <in>.
+ * The function (*init_output)() begins output (e.g. writes a header).,
+ * The function (*init_input)() begins input (e.g. skips a header).
+ *
+ * There are different versions of input, output, init_input and init_output
+ * for different formats understood by toast; which ones are used
+ * depends on the command line arguments and, in their absence, the
+ * filename; the fallback is #defined in toast.h
+ *
+ * The specific implementations of input, output, init_input and init_output
+ * for a format `foo' live in toast_foo.c.
+ */
+
+int (*output ) P((gsm_signal *)),
+ (*input ) P((gsm_signal *));
+int (*init_input) P((void)),
+ (*init_output) P((void));
+
+static int generic_init P0() { return 0; } /* NOP */
+
+struct fmtdesc {
+
+ char * name, * longname, * suffix;
+
+ int (* init_input ) P((void)),
+ (* init_output) P((void));
+
+ int (* input ) P((gsm_signal * )),
+ (* output) P((gsm_signal * ));
+
+} f_audio = {
+ "audio",
+ "8 kHz, 8 bit u-law encoding with Sun audio header", ".au",
+ audio_init_input,
+ audio_init_output,
+ ulaw_input,
+ ulaw_output
+}, f_ulaw = {
+ "u-law", "plain 8 kHz, 8 bit u-law encoding", ".u",
+ generic_init,
+ generic_init,
+ ulaw_input,
+ ulaw_output
+
+}, f_alaw = {
+ "A-law", "8 kHz, 8 bit A-law encoding", ".A",
+ generic_init,
+ generic_init,
+ alaw_input,
+ alaw_output
+
+}, f_linear = {
+ "linear",
+ "16 bit (13 significant) signed 8 kHz signal", ".l",
+ generic_init,
+ generic_init,
+ linear_input,
+ linear_output
+};
+
+struct fmtdesc * alldescs[] = {
+ &f_audio,
+ &f_alaw,
+ &f_ulaw,
+ &f_linear,
+ (struct fmtdesc *)NULL
+};
+
+#define DEFAULT_FORMAT f_ulaw /* default audio format, others */
+ /* are: f_alaw,f_audio,f_linear */
+struct fmtdesc * f_format = 0;
+
+/*
+ * basename + suffix of a pathname
+ */
+static char * endname P1((name), char * name)
+{
+ if (name) {
+ char * s = strrchr(name, '/');
+ if (s && s[1]) name = s + 1;
+ }
+ return name;
+
+}
+
+/*
+ * Try to figure out what we're supposed to do from the argv[0], if
+ * any, and set the parameters accordingly.
+ */
+static void parse_argv0 P1((av0), char * av0 )
+{
+ int l;
+
+ progname = av0 = endname(av0 ? av0 : "toast");
+
+ /* If the name starts with `un', we want to decode, not code.
+ * If the name ends in `cat', we want to write to stdout,
+ * and decode as well.
+ */
+
+ if (!strncmp(av0, "un", 2)) f_decode = 1;
+ if ( (l = strlen(av0)) >= 3 /* strlen("cat") */
+ && !strcmp( av0 + l - 3, "cat" )) f_cat = f_decode = 1;
+}
+
+
+/*
+ * Check whether the name (possibly generated by appending
+ * .gsm to something else) is short enough for this system.
+ */
+static int length_okay P1((name), char * name)
+{
+ long max_filename_length = 0;
+ char * end;
+
+ /* If our _pathname_ is too long, we'll usually not be
+ * able to open the file at all -- don't worry about that.
+ *
+ * But if the _filename_ is too long, there is danger of
+ * silent truncation on some systems, which results
+ * in the target replacing the source!
+ */
+
+ if (!name) return 0;
+ end = endname(name);
+
+#ifdef NAME_MAX
+ max_filename_length = NAME_MAX;
+#else
+#ifdef _PC_NAME_MAX
+#ifdef USE_PATHCONF
+ { char * s, tmp;
+
+ /* s = dirname(name)
+ */
+ if ((s = end) > name) {
+ if (s > name + 1) s--;
+ tmp = s;
+ *s = 0;
+ }
+
+ errno = 0;
+ max_filename_length = pathconf(s > name ? name : ".",
+ _PC_NAME_MAX);
+ if (max_filename_length == -1 && errno) {
+ perror( s > name ? name : "." );
+ fprintf(stderr,
+ "%s: cannot get dynamic filename length limit for %s.\n",
+ progname, s > name ? name : ".");
+ return 0;
+ }
+ if (s > name) *s = tmp;
+ }
+#endif /* USE_PATHCONF */
+#endif /* _PC_NAME_MAX */
+#endif /* !NAME_MAX */
+
+ if (max_filename_length > 0 && strlen(end) > max_filename_length) {
+ fprintf(stderr,
+ "%s: filename \"%s\" is too long (maximum is %ld)\n",
+ progname, endname(name), max_filename_length );
+ return 0;
+ }
+
+ return 1;
+}
+
+/*
+ * Return a pointer the suffix of a string, if any.
+ * A suffix alone has no suffix, an empty suffix can not be had.
+ */
+static char * suffix P2((name, suf), char *name, char * suf)
+{
+ size_t nlen = strlen(name);
+ size_t slen = strlen(suf);
+
+ if (!slen || nlen <= slen) return (char *)0;
+ name += nlen - slen;
+ return memcmp(name, suf, slen) ? (char *)0 : name;
+}
+
+
+static void catch_signals P1((fun), SIGHANDLER_T (*fun) ())
+{
+#ifdef SIGHUP
+ signal( SIGHUP, fun );
+#endif
+#ifdef SIGINT
+ signal( SIGINT, fun );
+#endif
+#ifdef SIGPIPE
+ signal( SIGPIPE, fun );
+#endif
+#ifdef SIGTERM
+ signal( SIGTERM, fun );
+#endif
+#ifdef SIGXFSZ
+ signal( SIGXFSZ, fun );
+#endif
+}
+
+static SIGHANDLER_T onintr P0()
+{
+ char * tmp = outname;
+
+#ifdef HAS_SYSV_SIGNALS
+ catch_signals( SIG_IGN );
+#endif
+
+ outname = (char *)0;
+ if (tmp) (void)unlink(tmp);
+
+ exit(1);
+}
+
+/*
+ * Allocate some memory and complain if it fails.
+ */
+static char * emalloc P1((len), size_t len)
+{
+ char * s;
+ if (!(s = malloc(len))) {
+ fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n",
+ progname, len);
+ onintr();
+ exit(1);
+ }
+ return s;
+}
+
+static char* normalname P3((name, want, cut), char *name, char *want,char *cut)
+{
+ size_t maxlen;
+ char * s, * p;
+
+ p = (char *)0;
+ if (!name) return p;
+
+ maxlen = strlen(name) + 1 + strlen(want) + strlen(cut);
+ p = strcpy(emalloc(maxlen), name);
+
+ if (s = suffix(p, cut)) strcpy(s, want);
+ else if (*want && !suffix(p, want)) strcat(p, want);
+
+ return p;
+}
+
+/*
+ * Generate a `plain' (non-encoded) name from a given name.
+ */
+static char * plainname P1((name), char *name)
+{
+ return normalname(name, "", SUFFIX_TOASTED );
+}
+
+/*
+ * Generate a `code' name from a given name.
+ */
+static char * codename P1((name), char *name)
+{
+ return normalname( name, SUFFIX_TOASTED, "" );
+}
+
+/*
+ * If we're supposed to ask (fileno (stderr) is a tty, and f_force not
+ * set), ask the user whether to overwrite a file or not.
+ */
+static int ok_to_replace P1(( name ), char * name)
+{
+ int reply, c;
+
+ if (f_force) return 1; /* YES, do replace */
+ if (!isatty(fileno(stderr))) return 0; /* NO, don't replace */
+
+ fprintf(stderr,
+ "%s already exists; do you wish to overwrite %s (y or n)? ",
+ name, name);
+ fflush(stderr);
+
+ for (c = reply = getchar(); c != '\n' && c != EOF; c = getchar()) ;
+ if (reply == 'y') return 1;
+
+ fprintf(stderr, "\tnot overwritten\n");
+ return 0;
+}
+
+static void update_mode P0()
+{
+ if (!instat.st_nlink) return; /* couldn't stat in */
+
+#ifdef HAS_FCHMOD
+ if (fchmod(fileno(out), instat.st_mode & 07777)) {
+ perror(outname);
+ fprintf(stderr, "%s: could not change file mode of \"%s\"\n",
+ progname, outname);
+ }
+#else
+#ifdef HAS_CHMOD
+ if (outname && chmod(outname, instat.st_mode & 07777)) {
+ perror(outname);
+ fprintf(stderr, "%s: could not change file mode of \"%s\"\n",
+ progname, outname);
+ }
+#endif /* HAS_CHMOD */
+#endif /* HAS_FCHMOD */
+}
+
+static void update_own P0()
+{
+ if (!instat.st_nlink) return; /* couldn't stat in */
+#ifdef HAS_FCHOWN
+ (void)fchown(fileno(out), instat.st_uid, instat.st_gid);
+#else
+#ifdef HAS_CHOWN
+ (void)chown(outname, instat.st_uid, instat.st_gid);
+#endif /* HAS_CHOWN */
+#endif /* HAS_FCHOWN */
+}
+
+static void update_times P0()
+{
+ if (!instat.st_nlink) return; /* couldn't stat in */
+
+#ifdef HAS_UTIMES
+ if (outname) {
+ struct timeval tv[2];
+
+ tv[0].tv_sec = instat.st_atime;
+ tv[1].tv_sec = instat.st_mtime;
+ tv[0].tv_usec = tv[1].tv_usec = 0;
+ (void) utimes(outname, tv);
+ }
+#else
+#ifdef HAS_UTIME
+
+ if (outname) {
+
+#ifdef HAS_UTIMBUF
+ struct utimbuf ut;
+
+ ut.actime = instat.st_atime;
+ ut.modtime = instat.st_mtime;
+
+# ifdef HAS_UTIMEUSEC
+ ut.acusec = instat.st_ausec;
+ ut.modusec = instat.st_musec;
+# endif /* HAS_UTIMEUSEC */
+
+ (void) utime(outname, &ut);
+
+#else /* UTIMBUF */
+
+ time_t ut[2];
+
+ ut[0] = instat.st_atime;
+ ut[1] = instat.st_mtime;
+
+ (void) utime(outname, ut);
+
+#endif /* UTIMBUF */
+ }
+#endif /* HAS_UTIME */
+#endif /* HAS_UTIMES */
+}
+
+
+static int okay_as_input P3((name,f,st), char* name, FILE* f, struct stat * st)
+{
+# ifdef HAS_FSTAT
+ if (fstat(fileno(f), st) < 0)
+# else
+ if (stat(name, st) < 0)
+# endif
+ {
+ perror(name);
+ fprintf(stderr, "%s: cannot stat \"%s\"\n", progname, name);
+ return 0;
+ }
+
+ if (!S_ISREG(st->st_mode)) {
+ fprintf(stderr,
+ "%s: \"%s\" is not a regular file -- unchanged.\n",
+ progname, name);
+ return 0;
+ }
+ if (st->st_nlink > 1 && !f_cat && !f_precious) {
+ fprintf(stderr,
+ "%s: \"%s\" has %s other link%s -- unchanged.\n",
+ progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2));
+ return 0;
+ }
+ return 1;
+}
+
+static void prepare_io P1(( desc), struct fmtdesc * desc)
+{
+ output = desc->output;
+ input = desc->input;
+
+ init_input = desc->init_input;
+ init_output = desc->init_output;
+}
+
+static struct fmtdesc * grok_format P1((name), char * name)
+{
+ char * c;
+ struct fmtdesc ** f;
+
+ if (name) {
+ c = plainname(name);
+
+ for (f = alldescs; *f; f++) {
+ if ( (*f)->suffix
+ && *(*f)->suffix
+ && suffix(c, (*f)->suffix)) {
+
+ free(c);
+ return *f;
+ }
+ }
+
+ free(c);
+ }
+ return (struct fmtdesc *)0;
+}
+
+static int open_input P2((name, st), char * name, struct stat * st)
+{
+ struct fmtdesc * f = f_format;
+
+ st->st_nlink = 0; /* indicates `undefined' value */
+ if (!name) {
+ inname = (char *)NULL;
+ in = stdin;
+#ifdef HAS__FSETMODE
+ _fsetmode(in, "b");
+#endif
+ }
+ else {
+ if (f_decode) inname = codename(name);
+ else {
+ if (!f_cat && suffix(name, SUFFIX_TOASTED)) {
+ fprintf(stderr,
+ "%s: %s already has \"%s\" suffix -- unchanged.\n",
+ progname, name, SUFFIX_TOASTED );
+ return 0;
+ }
+ inname = strcpy(emalloc(strlen(name)+1), name);
+ }
+ if (!(in = fopen(inname, READ))) {
+ perror(inname); /* not guaranteed to be valid here */
+ fprintf(stderr, "%s: cannot open \"%s\" for reading\n",
+ progname, inname);
+ return 0;
+ }
+ if (!okay_as_input(inname, in, st)) return 0;
+ if (!f) f = grok_format(inname);
+ }
+ prepare_io( f ? f : & DEFAULT_FORMAT );
+ return 1;
+}
+
+static int open_output P1((name), char *name)
+{
+ if (!name || f_cat) {
+ out = stdout;
+ outname = (char *)NULL;
+#ifdef HAS__FSETMODE
+ _fsetmode(out, "b");
+#endif
+ }
+ else {
+ int outfd = -1;
+ char * o;
+
+ o = (*(f_decode ? plainname : codename))(name);
+ if (!length_okay(o)) return 0;
+ if ((outfd = open(o, O_WRITE_EXCL, 0666)) >= 0)
+ out = fdopen(outfd, WRITE);
+ else if (errno != EEXIST) out = (FILE *)NULL;
+ else if (ok_to_replace(o)) out = fopen(o, WRITE);
+ else return 0;
+
+ if (!out) {
+ perror(o);
+ fprintf(stderr,
+ "%s: can't open \"%s\" for writing\n",
+ progname, o);
+ if (outfd >= 0) (void)close(outfd);
+ return 0;
+ }
+
+ outname = o;
+ }
+ return 1;
+}
+
+static int process_encode P0()
+{
+ gsm r;
+ gsm_signal s[ 160 ];
+ gsm_frame d;
+
+ int cc;
+
+ if (!(r = gsm_create())) {
+ perror(progname);
+ return -1;
+ }
+ (void)gsm_option(r, GSM_OPT_FAST, &f_fast);
+ (void)gsm_option(r, GSM_OPT_VERBOSE, &f_verbose);
+ (void)gsm_option(r, GSM_OPT_LTP_CUT, &f_ltp_cut);
+
+ while ((cc = (*input)(s)) > 0) {
+ if (cc < sizeof(s) / sizeof(*s))
+ memset((char *)(s+cc), 0, sizeof(s)-(cc * sizeof(*s)));
+ gsm_encode(r, s, d);
+ if (fwrite((char *)d, sizeof(d), 1, out) != 1) {
+ perror(outname ? outname : "stdout");
+ fprintf(stderr, "%s: error writing to %s\n",
+ progname, outname ? outname : "stdout");
+ gsm_destroy(r);
+ return -1;
+ }
+ }
+ if (cc < 0) {
+ perror(inname ? inname : "stdin");
+ fprintf(stderr, "%s: error reading from %s\n",
+ progname, inname ? inname : "stdin");
+ gsm_destroy(r);
+ return -1;
+ }
+ gsm_destroy(r);
+
+ return 0;
+}
+
+static int process_decode P0()
+{
+ gsm r;
+ gsm_frame s;
+ gsm_signal d[ 160 ];
+
+ int cc;
+
+ if (!(r = gsm_create())) { /* malloc failed */
+ perror(progname);
+ return -1;
+ }
+ (void)gsm_option(r, GSM_OPT_FAST, &f_fast);
+ (void)gsm_option(r, GSM_OPT_VERBOSE, &f_verbose);
+
+ while ((cc = fread(s, 1, sizeof(s), in)) > 0) {
+
+ if (cc != sizeof(s)) {
+ if (cc >= 0) fprintf(stderr,
+ "%s: incomplete frame (%d byte%s missing) from %s\n",
+ progname, sizeof(s) - cc,
+ "s" + (sizeof(s) - cc == 1),
+ inname ? inname : "stdin" );
+ gsm_destroy(r);
+ errno = 0;
+ return -1;
+ }
+ if (gsm_decode(r, s, d)) {
+ fprintf(stderr, "%s: bad frame in %s\n",
+ progname, inname ? inname : "stdin");
+ gsm_destroy(r);
+ errno = 0;
+ return -1;
+ }
+
+ if ((*output)(d) < 0) {
+ perror(outname);
+ fprintf(stderr, "%s: error writing to %s\n",
+ progname, outname);
+ gsm_destroy(r);
+ return -1;
+ }
+ }
+
+ if (cc < 0) {
+ perror(inname ? inname : "stdin" );
+ fprintf(stderr, "%s: error reading from %s\n", progname,
+ inname ? inname : "stdin");
+ gsm_destroy(r);
+ return -1;
+ }
+
+ gsm_destroy(r);
+ return 0;
+}
+
+static int process P1((name), char * name)
+{
+ int step = 0;
+
+ out = (FILE *)0;
+ in = (FILE *)0;
+
+ outname = (char *)0;
+ inname = (char *)0;
+
+ if (!open_input(name, &instat) || !open_output(name))
+ goto err;
+
+ if ((*(f_decode ? init_output : init_input))()) {
+ fprintf(stderr, "%s: error %s %s\n",
+ progname,
+ f_decode ? "writing header to" : "reading header from",
+ f_decode ? (outname ? outname : "stdout")
+ : (inname ? inname : "stdin"));
+ goto err;
+ }
+
+ if ((*(f_decode ? process_decode : process_encode))())
+ goto err;
+
+ if (fflush(out) < 0 || ferror(out)) {
+ perror(outname ? outname : "stdout");
+ fprintf(stderr, "%s: error writing \"%s\"\n", progname,
+ outname ? outname:"stdout");
+ goto err;
+ }
+
+ if (out != stdout) {
+
+ update_times();
+ update_mode ();
+ update_own ();
+
+ if (fclose(out) < 0) {
+ perror(outname);
+ fprintf(stderr, "%s: error writing \"%s\"\n",
+ progname, outname);
+ goto err;
+ }
+ if (outname != name) free(outname);
+ outname = (char *)0;
+ }
+ out = (FILE *)0;
+ if (in != stdin) {
+ (void)fclose(in), in = (FILE *)0;
+ if (!f_cat && !f_precious) {
+ if (unlink(inname) < 0) {
+ perror(inname);
+ fprintf(stderr,
+ "%s: source \"%s\" not deleted.\n",
+ progname, inname);
+ }
+ goto err;
+ }
+ if (inname != name) free(inname);
+ inname = (char *)0;
+ }
+ return 0;
+
+ /*
+ * Error handling and cleanup.
+ */
+err:
+ if (out && out != stdout) {
+ (void)fclose(out), out = (FILE *)0;
+ if (unlink(outname) < 0 && errno != ENOENT && errno != EINTR) {
+ perror(outname);
+ fprintf(stderr, "%s: could not unlink \"%s\"\n",
+ progname, outname);
+ }
+ }
+ if (in && in != stdin) (void)fclose(in), in = (FILE *)0;
+
+ if (inname && inname != name) free(inname);
+ if (outname && outname != name) free(outname);
+
+ return -1;
+}
+
+static void version P0()
+{
+ printf( "%s 1.0, version %s\n",
+ progname,
+ "$Id: toast.c,v 1.8 1996/07/02 10:41:04 jutta Exp $" );
+}
+
+static void help P0()
+{
+ printf("Usage: %s [-fcpdhvaulsFC] [files...]\n", progname);
+ printf("\n");
+
+ printf(" -f force Replace existing files without asking\n");
+ printf(" -c cat Write to stdout, do not remove source files\n");
+ printf(" -d decode Decode data (default is encode)\n");
+ printf(" -p precious Do not delete the source\n");
+ printf("\n");
+
+ printf(" -u u-law Force 8 kHz/8 bit u-law in/output format\n");
+ printf(" -s sun .au Force Sun .au u-law in/output format\n");
+ printf(" -a A-law Force 8 kHz/8 bit A-law in/output format\n");
+ printf(" -l linear Force 16 bit linear in/output format\n");
+ printf("\n");
+
+ printf(" -F fast Sacrifice conformance to performance\n");
+ printf(" -C cutoff Ignore most samples during LTP\n");
+ printf(" -v version Show version information\n");
+ printf(" -h help Print this text\n");
+ printf("\n");
+}
+
+
+static void set_format P1((f), struct fmtdesc * f)
+{
+ if (f_format && f_format != f) {
+ fprintf( stderr,
+ "%s: only one of -[uals] is possible (%s -h for help)\n",
+ progname, progname);
+ exit(1);
+ }
+
+ f_format = f;
+}
+
+int main P2((ac, av), int ac, char **av)
+{
+ int opt;
+ extern int optind;
+ extern char * optarg;
+
+ parse_argv0(*av);
+
+ while ((opt = getopt(ac, av, "fcdpvhuaslVFC:")) != EOF) switch (opt) {
+
+ case 'd': f_decode = 1; break;
+ case 'f': f_force = 1; break;
+ case 'c': f_cat = 1; break;
+ case 'p': f_precious = 1; break;
+ case 'F': f_fast = 1; break;
+ case 'C': f_ltp_cut = 100; break;
+#ifndef NDEBUG
+ case 'V': f_verbose = 1; break; /* undocumented */
+#endif
+
+ case 'u': set_format( &f_ulaw ); break;
+ case 'l': set_format( &f_linear ); break;
+ case 'a': set_format( &f_alaw ); break;
+ case 's': set_format( &f_audio ); break;
+
+ case 'v': version(); exit(0);
+ case 'h': help(); exit(0);
+
+ default:
+ usage:
+ fprintf(stderr,
+ "Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n",
+ progname);
+ exit(1);
+ }
+
+ f_precious |= f_cat;
+
+ av += optind;
+ ac -= optind;
+
+ catch_signals(onintr);
+
+ if (ac <= 0) process( (char *)0 );
+ else while (ac--) process( *av++ );
+
+ exit(0);
+}
diff --git a/jni/libgsm/src/toast_alaw.c b/jni/libgsm/src/toast_alaw.c
new file mode 100644
index 0000000..7799342
--- /dev/null
+++ b/jni/libgsm/src/toast_alaw.c
@@ -0,0 +1,334 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /home/kbs/jutta/src/gsm/gsm-1.0/src/RCS/toast_alaw.c,v 1.2 1996/07/05 17:23:46 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast_alaw.c -- manipulate A-law encoded sound.
+ */
+
+extern FILE * in, * out;
+
+#define A2S(x) (a2s[ (unsigned char )(x) ])
+#define S2A(x) (s2a[ ((unsigned short)(x)) >> 4 ])
+
+static unsigned short a2s[] = {
+
+ 60032, 60288, 59520, 59776, 61056, 61312, 60544, 60800,
+ 57984, 58240, 57472, 57728, 59008, 59264, 58496, 58752,
+ 62784, 62912, 62528, 62656, 63296, 63424, 63040, 63168,
+ 61760, 61888, 61504, 61632, 62272, 62400, 62016, 62144,
+ 43520, 44544, 41472, 42496, 47616, 48640, 45568, 46592,
+ 35328, 36352, 33280, 34304, 39424, 40448, 37376, 38400,
+ 54528, 55040, 53504, 54016, 56576, 57088, 55552, 56064,
+ 50432, 50944, 49408, 49920, 52480, 52992, 51456, 51968,
+ 65192, 65208, 65160, 65176, 65256, 65272, 65224, 65240,
+ 65064, 65080, 65032, 65048, 65128, 65144, 65096, 65112,
+ 65448, 65464, 65416, 65432, 65512, 65528, 65480, 65496,
+ 65320, 65336, 65288, 65304, 65384, 65400, 65352, 65368,
+ 64160, 64224, 64032, 64096, 64416, 64480, 64288, 64352,
+ 63648, 63712, 63520, 63584, 63904, 63968, 63776, 63840,
+ 64848, 64880, 64784, 64816, 64976, 65008, 64912, 64944,
+ 64592, 64624, 64528, 64560, 64720, 64752, 64656, 64688,
+ 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736,
+ 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784,
+ 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368,
+ 3776, 3648, 4032, 3904, 3264, 3136, 3520, 3392,
+ 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
+ 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136,
+ 11008, 10496, 12032, 11520, 8960, 8448, 9984, 9472,
+ 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568,
+ 344, 328, 376, 360, 280, 264, 312, 296,
+ 472, 456, 504, 488, 408, 392, 440, 424,
+ 88, 72, 120, 104, 24, 8, 56, 40,
+ 216, 200, 248, 232, 152, 136, 184, 168,
+ 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184,
+ 1888, 1824, 2016, 1952, 1632, 1568, 1760, 1696,
+ 688, 656, 752, 720, 560, 528, 624, 592,
+ 944, 912, 1008, 976, 816, 784, 880, 848
+
+};
+
+
+static unsigned char s2a[] = {
+
+ 213,212,215,214,209,208,211,210,221,220,223,222,217,216,219,218,
+ 197,196,199,198,193,192,195,194,205,204,207,206,201,200,203,202,
+ 245,245,244,244,247,247,246,246,241,241,240,240,243,243,242,242,
+ 253,253,252,252,255,255,254,254,249,249,248,248,251,251,250,250,
+ 229,229,229,229,228,228,228,228,231,231,231,231,230,230,230,230,
+ 225,225,225,225,224,224,224,224,227,227,227,227,226,226,226,226,
+ 237,237,237,237,236,236,236,236,239,239,239,239,238,238,238,238,
+ 233,233,233,233,232,232,232,232,235,235,235,235,234,234,234,234,
+ 149,149,149,149,149,149,149,149,148,148,148,148,148,148,148,148,
+ 151,151,151,151,151,151,151,151,150,150,150,150,150,150,150,150,
+ 145,145,145,145,145,145,145,145,144,144,144,144,144,144,144,144,
+ 147,147,147,147,147,147,147,147,146,146,146,146,146,146,146,146,
+ 157,157,157,157,157,157,157,157,156,156,156,156,156,156,156,156,
+ 159,159,159,159,159,159,159,159,158,158,158,158,158,158,158,158,
+ 153,153,153,153,153,153,153,153,152,152,152,152,152,152,152,152,
+ 155,155,155,155,155,155,155,155,154,154,154,154,154,154,154,154,
+ 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+ 132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
+ 135,135,135,135,135,135,135,135,135,135,135,135,135,135,135,135,
+ 134,134,134,134,134,134,134,134,134,134,134,134,134,134,134,134,
+ 129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,
+ 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,
+ 131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,
+ 130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
+ 141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,
+ 140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,
+ 143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
+ 142,142,142,142,142,142,142,142,142,142,142,142,142,142,142,142,
+ 137,137,137,137,137,137,137,137,137,137,137,137,137,137,137,137,
+ 136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
+ 139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,
+ 138,138,138,138,138,138,138,138,138,138,138,138,138,138,138,138,
+ 181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 183,183,183,183,183,183,183,183,183,183,183,183,183,183,183,183,
+ 183,183,183,183,183,183,183,183,183,183,183,183,183,183,183,183,
+ 182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,
+ 182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,
+ 177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
+ 177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
+ 176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+ 176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+ 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
+ 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
+ 178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,
+ 178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,178,
+ 189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
+ 189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
+ 188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,
+ 188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,
+ 191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,
+ 191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,
+ 190,190,190,190,190,190,190,190,190,190,190,190,190,190,190,190,
+ 190,190,190,190,190,190,190,190,190,190,190,190,190,190,190,190,
+ 185,185,185,185,185,185,185,185,185,185,185,185,185,185,185,185,
+ 185,185,185,185,185,185,185,185,185,185,185,185,185,185,185,185,
+ 184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
+ 184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,
+ 187,187,187,187,187,187,187,187,187,187,187,187,187,187,187,187,
+ 187,187,187,187,187,187,187,187,187,187,187,187,187,187,187,187,
+ 186,186,186,186,186,186,186,186,186,186,186,186,186,186,186,186,
+ 186,186,186,186,186,186,186,186,186,186,186,186,186,186,186,186,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,
+ 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,
+ 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,
+ 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,
+ 166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,
+ 166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,
+ 166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,
+ 166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,166,
+ 161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,
+ 161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,
+ 161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,
+ 161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,
+ 160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
+ 160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
+ 160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
+ 160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,
+ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+ 162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,
+ 162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,
+ 162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,
+ 162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,
+ 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
+ 172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
+ 172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
+ 172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
+ 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+ 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+ 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+ 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+ 174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+ 174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+ 174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+ 174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+ 169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,
+ 169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,
+ 169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,
+ 169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,
+ 168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,
+ 168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,
+ 168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,
+ 168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,168,
+ 171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
+ 171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
+ 171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
+ 171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,
+ 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+ 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+ 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+ 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+ 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+ 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+ 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+ 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+ 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+ 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+ 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+ 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+ 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+ 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+ 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25,
+ 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+ 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29,
+ 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19,
+ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17,
+ 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+ 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21,
+ 106,106,106,106,107,107,107,107,104,104,104,104,105,105,105,105,
+ 110,110,110,110,111,111,111,111,108,108,108,108,109,109,109,109,
+ 98, 98, 98, 98, 99, 99, 99, 99, 96, 96, 96, 96, 97, 97, 97, 97,
+ 102,102,102,102,103,103,103,103,100,100,100,100,101,101,101,101,
+ 122,122,123,123,120,120,121,121,126,126,127,127,124,124,125,125,
+ 114,114,115,115,112,112,113,113,118,118,119,119,116,116,117,117,
+ 74, 75, 72, 73, 78, 79, 76, 77, 66, 67, 64, 65, 70, 71, 68, 69,
+ 90, 91, 88, 89, 94, 95, 92, 93, 82, 83, 80, 81, 86, 87, 84, 85
+};
+
+int alaw_input P1((buf), gsm_signal * buf)
+{
+ int i, c;
+
+ for (i = 0; i < 160 && (c = fgetc(in)) != EOF; i++) buf[i] = A2S( c );
+ if (c == EOF && ferror(in)) return -1;
+ return i;
+}
+
+int alaw_output P1((buf), gsm_signal * buf)
+{
+ int i;
+
+ for (i = 0; i < 160; i++, buf++)
+ if (fputc( S2A( *buf ), out) == EOF) return -1;
+ return 0;
+}
+
diff --git a/jni/libgsm/src/toast_alaw.c.orig b/jni/libgsm/src/toast_alaw.c.orig
new file mode 100644
index 0000000..714021b
--- /dev/null
+++ b/jni/libgsm/src/toast_alaw.c.orig
@@ -0,0 +1,333 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast_alaw.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast_alaw.c -- manipulate A-law encoded sound.
+ */
+
+extern FILE * in, * out;
+
+#define A2S(x) (a2s[ (unsigned char )(x) ])
+#define S2A(x) (s2a[ ((unsigned short)(x)) >> 4 ])
+
+static unsigned short a2s[] = {
+
+ 5120,60160, 320,65200,20480,44032, 1280,64192,
+ 2560,62848, 64,65456,10240,54784, 640,64864,
+ 7168,58112, 448,65072,28672,35840, 1792,63680,
+ 3584,61824, 192,65328,14336,50688, 896,64608,
+ 4096,61184, 256,65264,16384,48128, 1024,64448,
+ 2048,63360, 0,65520, 8192,56832, 512,64992,
+ 6144,59136, 384,65136,24576,39936, 1536,63936,
+ 3072,62336, 128,65392,12288,52736, 768,64736,
+ 5632,59648, 352,65168,22528,41984, 1408,64064,
+ 2816,62592, 96,65424,11264,53760, 704,64800,
+ 7680,57600, 480,65040,30720,33792, 1920,63552,
+ 3840,61568, 224,65296,15360,49664, 960,64544,
+ 4608,60672, 288,65232,18432,46080, 1152,64320,
+ 2304,63104, 32,65488, 9216,55808, 576,64928,
+ 6656,58624, 416,65104,26624,37888, 1664,63808,
+ 3328,62080, 160,65360,13312,51712, 832,64672,
+ 5376,59904, 336,65184,21504,43008, 1344,64128,
+ 2688,62720, 80,65440,10752,54272, 672,64832,
+ 7424,57856, 464,65056,29696,34816, 1856,63616,
+ 3712,61696, 208,65312,14848,50176, 928,64576,
+ 4352,60928, 272,65248,17408,47104, 1088,64384,
+ 2176,63232, 16,65504, 8704,56320, 544,64960,
+ 6400,58880, 400,65120,25600,38912, 1600,63872,
+ 3200,62208, 144,65376,12800,52224, 800,64704,
+ 5888,59392, 368,65152,23552,40960, 1472,64000,
+ 2944,62464, 112,65408,11776,53248, 736,64768,
+ 7936,57344, 496,65024,31744,32768, 1984,63488,
+ 3968,61440, 240,65280,15872,49152, 992,64512,
+ 4864,60416, 304,65216,19456,45056, 1216,64256,
+ 2432,62976, 48,65472, 9728,55296, 608,64896,
+ 6912,58368, 432,65088,27648,36864, 1728,63744,
+ 3456,61952, 176,65344,13824,51200, 864,64640
+};
+
+
+static unsigned char s2a[] = {
+
+ 170, 42,234,106,138, 10,202, 74,186, 58,250,122,154, 26,218, 90,
+ 162, 34,226, 98,130, 2,194, 66,178, 50,242,114,146, 18,210, 82,
+ 174, 46, 46,238,238,110,110,142,142, 14, 14,206,206, 78, 78,190,
+ 190, 62, 62,254,254,126,126,158,158, 30, 30,222,222, 94, 94,166,
+ 166, 38, 38, 38, 38,230,230,230,230,102,102,102,102,134,134,134,
+ 134, 6, 6, 6, 6,198,198,198,198, 70, 70, 70, 70,182,182,182,
+ 182, 54, 54, 54, 54,246,246,246,246,118,118,118,118,150,150,150,
+ 150, 22, 22, 22, 22,214,214,214,214, 86, 86, 86, 86,168,168,168,
+ 168, 40, 40, 40, 40, 40, 40, 40, 40,232,232,232,232,232,232,232,
+ 232,104,104,104,104,104,104,104,104,136,136,136,136,136,136,136,
+ 136, 8, 8, 8, 8, 8, 8, 8, 8,200,200,200,200,200,200,200,
+ 200, 72, 72, 72, 72, 72, 72, 72, 72,184,184,184,184,184,184,184,
+ 184, 56, 56, 56, 56, 56, 56, 56, 56,248,248,248,248,248,248,248,
+ 248,120,120,120,120,120,120,120,120,152,152,152,152,152,152,152,
+ 152, 24, 24, 24, 24, 24, 24, 24, 24,216,216,216,216,216,216,216,
+ 216, 88, 88, 88, 88, 88, 88, 88, 88,160,160,160,160,160,160,160,
+ 160, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 32,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,
+ 224, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+ 96,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,
+ 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,
+ 192, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+ 176, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+ 48,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+ 240,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+ 112,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
+ 144, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16,208,208,208,208,208,208,208,208,208,208,208,208,208,208,208,
+ 208, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+ 80,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,
+ 172, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+ 44,236,236,236,236,236,236,236,236,236,236,236,236,236,236,236,
+ 236,236,236,236,236,236,236,236,236,236,236,236,236,236,236,236,
+ 236,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,
+ 108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,
+ 108,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,
+ 140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,
+ 140, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
+ 204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
+ 204, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+ 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76,
+ 76,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,
+ 188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,
+ 188, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,
+ 252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,
+ 252,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,
+ 124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,
+ 124,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,
+ 156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,
+ 156, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+ 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+ 28,220,220,220,220,220,220,220,220,220,220,220,220,220,220,220,
+ 220,220,220,220,220,220,220,220,220,220,220,220,220,220,220,220,
+ 220, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+ 164, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,
+ 228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,
+ 228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,
+ 228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,228,
+ 228,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+ 100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+ 100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+ 100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+ 100,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
+ 132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
+ 132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
+ 132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,132,
+ 132, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+ 196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+ 196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+ 196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+ 196, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+ 68,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,
+ 180, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+ 52,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,
+ 244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,
+ 244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,
+ 244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,
+ 244,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,
+ 116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,
+ 116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,
+ 116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,
+ 116,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
+ 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
+ 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
+ 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,
+ 148, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+ 20,212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,
+ 212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,
+ 212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,
+ 212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,212,
+ 212, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,
+ 213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,
+ 213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,
+ 213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,213,
+ 213, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+ 21,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+ 149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+ 149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+ 149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+ 149,117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,
+ 117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,
+ 117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,
+ 117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,117,
+ 117,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,
+ 245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,
+ 245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,
+ 245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,245,
+ 245, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 53,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,
+ 181, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+ 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+ 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+ 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+ 69,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,
+ 197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,
+ 197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,
+ 197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,
+ 197, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+ 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+ 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+ 133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+ 133,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,
+ 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,
+ 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,
+ 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,
+ 101,229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,
+ 229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,
+ 229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,
+ 229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,229,
+ 229, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+ 37,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,165,
+ 165, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93,221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,
+ 221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,
+ 221, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+ 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+ 29,157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,
+ 157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,
+ 157,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,
+ 125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,
+ 125,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,
+ 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,
+ 253, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 61,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
+ 189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,189,
+ 189, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+ 77,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,
+ 205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,
+ 205, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,
+ 141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,
+ 141,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
+ 109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
+ 109,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,
+ 237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,
+ 237, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,
+ 173, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 81,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,
+ 209, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+ 145,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,
+ 113,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+ 241, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
+ 177, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+ 65,193,193,193,193,193,193,193,193,193,193,193,193,193,193,193,
+ 193, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,
+ 129, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,
+ 97,225,225,225,225,225,225,225,225,225,225,225,225,225,225,225,
+ 225, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+ 33,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,
+ 161, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89,217,217,217,217,217,217,217,217, 25, 25, 25, 25, 25, 25, 25,
+ 25,153,153,153,153,153,153,153,153,121,121,121,121,121,121,121,
+ 121,249,249,249,249,249,249,249,249, 57, 57, 57, 57, 57, 57, 57,
+ 57,185,185,185,185,185,185,185,185, 73, 73, 73, 73, 73, 73, 73,
+ 73,201,201,201,201,201,201,201,201, 9, 9, 9, 9, 9, 9, 9,
+ 9,137,137,137,137,137,137,137,137,105,105,105,105,105,105,105,
+ 105,233,233,233,233,233,233,233,233, 41, 41, 41, 41, 41, 41, 41,
+ 41,169,169,169,169,169,169,169,169, 87, 87, 87, 87, 87, 87, 87,
+ 87,215,215,215,215, 23, 23, 23, 23,151,151,151,151,119,119,119,
+ 119,247,247,247,247, 55, 55, 55, 55,183,183,183,183, 71, 71, 71,
+ 71,199,199,199,199, 7, 7, 7, 7,135,135,135,135,103,103,103,
+ 103,231,231,231,231, 39, 39, 39, 39,167,167,167,167, 95, 95, 95,
+ 95,223,223, 31, 31,159,159,127,127,255,255, 63, 63,191,191, 79,
+ 79,207,207, 15, 15,143,143,111,111,239,239, 47, 47,175,175, 83,
+ 83,211, 19,147,115,243, 51,179, 67,195, 3,131, 99,227, 35,163,
+ 91,219, 27,155,123,251, 59,187, 75,203, 11,139,107,235, 43,171
+};
+
+int alaw_input P1((buf), gsm_signal * buf)
+{
+ int i, c;
+
+ for (i = 0; i < 160 && (c = fgetc(in)) != EOF; i++) buf[i] = A2S( c );
+ if (c == EOF && ferror(in)) return -1;
+ return i;
+}
+
+int alaw_output P1((buf), gsm_signal * buf)
+{
+ int i;
+
+ for (i = 0; i < 160; i++, buf++)
+ if (fputc( S2A( *buf ), out) == EOF) return -1;
+ return 0;
+}
+
diff --git a/jni/libgsm/src/toast_audio.c b/jni/libgsm/src/toast_audio.c
new file mode 100644
index 0000000..f090f23
--- /dev/null
+++ b/jni/libgsm/src/toast_audio.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast_audio.c,v 1.6 1995/03/07 21:21:24 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast_audio -- functions to manipulate SunOS audio files.
+ *
+ * This is reverse engineered from our present soundfiles
+ * and in no way portable, durable or aesthetically pleasing.
+ */
+
+extern FILE * in, * out;
+extern char * inname;
+extern char * progname;
+
+extern int (*output) P((gsm_signal *)),
+ (*input ) P((gsm_signal *));
+
+extern int alaw_input P((gsm_signal *)),
+ ulaw_input P((gsm_signal *)),
+ linear_input P((gsm_signal *));
+
+extern int ulaw_output P((gsm_signal *));
+
+static int put_u32 P2((f, u), FILE * f, unsigned long u)
+{
+ /* Write a 32-bit unsigned value msb first.
+ */
+ if ( putc( (char)((u>>24) & 0x0FF), f) == EOF
+ || putc( (char)((u>>16) & 0x0FF), f) == EOF
+ || putc( (char)((u>> 8) & 0x0FF), f) == EOF
+ || putc( (char)( u & 0x0FF), f) == EOF) return -1;
+
+ return 0;
+}
+
+static int get_u32 P2((f, up), FILE * f, unsigned long * up)
+{
+ /* Read a 32-bit unsigned value msb first.
+ */
+ int i;
+ unsigned long u;
+
+ if ( (i = getc(f)) == EOF
+ || ((u = (unsigned char)i), (i = getc(f)) == EOF)
+ || ((u = (u<<8)|(unsigned char)i), (i = getc(f)) == EOF)
+ || ((u = (u<<8)|(unsigned char)i), (i = getc(f)) == EOF)) return -1;
+ *up = (u<<8)|(unsigned char)i;
+ return 0;
+}
+
+int audio_init_input P0()
+{
+ unsigned long len, enc; /* unsigned 32 bits */
+
+ if ( fgetc(in) != '.'
+ || fgetc(in) != 's'
+ || fgetc(in) != 'n'
+ || fgetc(in) != 'd'
+ || get_u32( in, &len )
+ || get_u32( in, &enc ) /* skip this */
+ || get_u32( in, &enc )) {
+ fprintf(stderr,
+ "%s: bad (missing?) header in Sun audio file \"%s\";\n\
+ Try one of -u, -a, -l instead (%s -h for help).\n",
+ progname, inname ? inname : "stdin", progname);
+ return -1;
+ }
+
+ switch (enc) {
+ case 1: input = ulaw_input; break;
+ case 2: input = alaw_input; break;
+ case 3: input = linear_input; break;
+ default:
+ fprintf(stderr,
+"%s: warning: file format #%lu for %s not implemented, defaulting to u-law.\n",
+ progname, enc, inname);
+ input = ulaw_input;
+ break;
+ }
+
+ while (len > 4*4)
+ if (getc(in) == EOF) {
+ fprintf(stderr,
+ "%s: EOF in header of Sun audio file \"%s\";\n\
+ Try one of -u, -a, -l instead (%s -h for help).\n",
+ progname, inname ? inname : "stdin", progname);
+ return -1;
+ }
+ else len--;
+
+ return 0;
+}
+
+int audio_init_output P0()
+{
+ if ( fputs(".snd", out) == EOF
+ || put_u32(out, 32)
+ || put_u32(out, ~(unsigned long)0)
+ || put_u32(out, 1)
+ || put_u32(out, 8000)
+ || put_u32(out, 1)
+ || put_u32(out, 0)
+ || put_u32(out, 0)) return -1;
+
+ return 0;
+}
+
diff --git a/jni/libgsm/src/toast_lin.c b/jni/libgsm/src/toast_lin.c
new file mode 100644
index 0000000..7b5f845
--- /dev/null
+++ b/jni/libgsm/src/toast_lin.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast_lin.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast_linear.c -- read and write 16 bit linear sound in host byte order.
+ */
+
+extern FILE *in, *out;
+
+int linear_input (buf) gsm_signal * buf;
+{
+ return fread( (char *)buf, sizeof(*buf), 160, in );
+}
+
+int linear_output P1((buf), gsm_signal * buf)
+{
+ return -( fwrite( (char *)buf, sizeof(*buf), 160, out ) != 160 );
+}
diff --git a/jni/libgsm/src/toast_ulaw.c b/jni/libgsm/src/toast_ulaw.c
new file mode 100644
index 0000000..14ef2d0
--- /dev/null
+++ b/jni/libgsm/src/toast_ulaw.c
@@ -0,0 +1,621 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast_ulaw.c,v 1.1 1992/10/28 00:15:50 jutta Exp $ */
+
+#include "toast.h"
+
+/* toast_ulaw -- functions to manipulate u-law encoded sound.
+ */
+
+extern FILE *in, *out;
+
+#define U2S(x) (u2s[ (unsigned char)(x) ])
+#define S2U(x) (s2u[ ((unsigned short)(x)) >> 3 ])
+
+static unsigned short u2s[] = {
+ 33280, 34308, 35336, 36364, 37393, 38421, 39449, 40477,
+ 41505, 42534, 43562, 44590, 45618, 46647, 47675, 48703,
+ 49474, 49988, 50503, 51017, 51531, 52045, 52559, 53073,
+ 53587, 54101, 54616, 55130, 55644, 56158, 56672, 57186,
+ 57572, 57829, 58086, 58343, 58600, 58857, 59114, 59371,
+ 59628, 59885, 60142, 60399, 60656, 60913, 61171, 61428,
+ 61620, 61749, 61877, 62006, 62134, 62263, 62392, 62520,
+ 62649, 62777, 62906, 63034, 63163, 63291, 63420, 63548,
+ 63645, 63709, 63773, 63838, 63902, 63966, 64030, 64095,
+ 64159, 64223, 64287, 64352, 64416, 64480, 64544, 64609,
+ 64657, 64689, 64721, 64753, 64785, 64818, 64850, 64882,
+ 64914, 64946, 64978, 65010, 65042, 65075, 65107, 65139,
+ 65163, 65179, 65195, 65211, 65227, 65243, 65259, 65275,
+ 65291, 65308, 65324, 65340, 65356, 65372, 65388, 65404,
+ 65416, 65424, 65432, 65440, 65448, 65456, 65464, 65472,
+ 65480, 65488, 65496, 65504, 65512, 65520, 65528, 0,
+ 32256, 31228, 30200, 29172, 28143, 27115, 26087, 25059,
+ 24031, 23002, 21974, 20946, 19918, 18889, 17861, 16833,
+ 16062, 15548, 15033, 14519, 14005, 13491, 12977, 12463,
+ 11949, 11435, 10920, 10406, 9892, 9378, 8864, 8350,
+ 7964, 7707, 7450, 7193, 6936, 6679, 6422, 6165,
+ 5908, 5651, 5394, 5137, 4880, 4623, 4365, 4108,
+ 3916, 3787, 3659, 3530, 3402, 3273, 3144, 3016,
+ 2887, 2759, 2630, 2502, 2373, 2245, 2116, 1988,
+ 1891, 1827, 1763, 1698, 1634, 1570, 1506, 1441,
+ 1377, 1313, 1249, 1184, 1120, 1056, 992, 927,
+ 879, 847, 815, 783, 751, 718, 686, 654,
+ 622, 590, 558, 526, 494, 461, 429, 397,
+ 373, 357, 341, 325, 309, 293, 277, 261,
+ 245, 228, 212, 196, 180, 164, 148, 132,
+ 120, 112, 104, 96, 88, 80, 72, 64,
+ 56, 48, 40, 32, 24, 16, 8, 0
+};
+
+static unsigned char s2u[] = {
+0377,0376,0375,0374,0373,0372,0371,0370,0367,0366,0365,0364,0363,0362,0361,
+0360,0357,0357,0356,0356,0355,0355,0354,0354,0353,0353,0352,0352,0351,0351,
+0350,0350,0347,0347,0346,0346,0345,0345,0344,0344,0343,0343,0342,0342,0341,
+0341,0340,0340,0337,0337,0337,0337,0336,0336,0336,0336,0335,0335,0335,0335,
+0334,0334,0334,0334,0333,0333,0333,0333,0332,0332,0332,0332,0331,0331,0331,
+0331,0330,0330,0330,0330,0327,0327,0327,0327,0326,0326,0326,0326,0325,0325,
+0325,0325,0324,0324,0324,0324,0323,0323,0323,0323,0322,0322,0322,0322,0321,
+0321,0321,0321,0320,0320,0320,0320,0317,0317,0317,0317,0317,0317,0317,0317,
+0316,0316,0316,0316,0316,0316,0316,0316,0315,0315,0315,0315,0315,0315,0315,
+0315,0314,0314,0314,0314,0314,0314,0314,0314,0313,0313,0313,0313,0313,0313,
+0313,0313,0312,0312,0312,0312,0312,0312,0312,0312,0311,0311,0311,0311,0311,
+0311,0311,0311,0310,0310,0310,0310,0310,0310,0310,0310,0307,0307,0307,0307,
+0307,0307,0307,0307,0306,0306,0306,0306,0306,0306,0306,0306,0305,0305,0305,
+0305,0305,0305,0305,0305,0304,0304,0304,0304,0304,0304,0304,0304,0303,0303,
+0303,0303,0303,0303,0303,0303,0303,0302,0302,0302,0302,0302,0302,0302,0302,
+0301,0301,0301,0301,0301,0301,0301,0301,0300,0300,0300,0300,0300,0300,0300,
+0300,0277,0277,0277,0277,0277,0277,0277,0277,0277,0277,0277,0277,0277,0277,
+0277,0277,0276,0276,0276,0276,0276,0276,0276,0276,0276,0276,0276,0276,0276,
+0276,0276,0276,0275,0275,0275,0275,0275,0275,0275,0275,0275,0275,0275,0275,
+0275,0275,0275,0275,0274,0274,0274,0274,0274,0274,0274,0274,0274,0274,0274,
+0274,0274,0274,0274,0274,0273,0273,0273,0273,0273,0273,0273,0273,0273,0273,
+0273,0273,0273,0273,0273,0273,0272,0272,0272,0272,0272,0272,0272,0272,0272,
+0272,0272,0272,0272,0272,0272,0272,0271,0271,0271,0271,0271,0271,0271,0271,
+0271,0271,0271,0271,0271,0271,0271,0271,0270,0270,0270,0270,0270,0270,0270,
+0270,0270,0270,0270,0270,0270,0270,0270,0270,0267,0267,0267,0267,0267,0267,
+0267,0267,0267,0267,0267,0267,0267,0267,0267,0267,0266,0266,0266,0266,0266,
+0266,0266,0266,0266,0266,0266,0266,0266,0266,0266,0266,0265,0265,0265,0265,
+0265,0265,0265,0265,0265,0265,0265,0265,0265,0265,0265,0265,0264,0264,0264,
+0264,0264,0264,0264,0264,0264,0264,0264,0264,0264,0264,0264,0264,0263,0263,
+0263,0263,0263,0263,0263,0263,0263,0263,0263,0263,0263,0263,0263,0263,0262,
+0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,0262,
+0262,0261,0261,0261,0261,0261,0261,0261,0261,0261,0261,0261,0261,0261,0261,
+0261,0261,0260,0260,0260,0260,0260,0260,0260,0260,0260,0260,0260,0260,0260,
+0260,0260,0260,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,
+0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,0257,
+0257,0257,0257,0257,0257,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,
+0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,0256,
+0256,0256,0256,0256,0256,0256,0256,0255,0255,0255,0255,0255,0255,0255,0255,
+0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,0255,
+0255,0255,0255,0255,0255,0255,0255,0255,0255,0254,0254,0254,0254,0254,0254,
+0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,
+0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0254,0253,0253,0253,0253,
+0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,
+0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0253,0252,0252,
+0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,
+0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,0252,
+0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,
+0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,0251,
+0251,0251,0251,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,
+0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,0250,
+0250,0250,0250,0250,0250,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,
+0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,0247,
+0247,0247,0247,0247,0247,0247,0247,0246,0246,0246,0246,0246,0246,0246,0246,
+0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,0246,
+0246,0246,0246,0246,0246,0246,0246,0246,0246,0245,0245,0245,0245,0245,0245,
+0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,
+0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0245,0244,0244,0244,0244,
+0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,
+0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0244,0243,0243,
+0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,
+0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,0243,
+0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,
+0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,0242,
+0242,0242,0242,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,
+0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,0241,
+0241,0241,0241,0241,0241,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,
+0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,0240,
+0240,0240,0240,0240,0240,0240,0240,0237,0237,0237,0237,0237,0237,0237,0237,
+0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,
+0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,
+0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,
+0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0237,0236,0236,0236,0236,
+0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,
+0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,
+0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,
+0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,0236,
+0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,
+0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,
+0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,
+0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,0235,
+0235,0235,0235,0235,0235,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,
+0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,
+0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,
+0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,0234,
+0234,0234,0234,0234,0234,0234,0234,0234,0234,0233,0233,0233,0233,0233,0233,
+0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,
+0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,
+0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,
+0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0233,0232,0232,
+0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,
+0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,
+0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,
+0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,0232,
+0232,0232,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,
+0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,
+0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,
+0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,0231,
+0231,0231,0231,0231,0231,0231,0231,0230,0230,0230,0230,0230,0230,0230,0230,
+0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,
+0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,
+0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,
+0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0230,0227,0227,0227,0227,
+0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,
+0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,
+0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,
+0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,0227,
+0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,
+0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,
+0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,
+0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,0226,
+0226,0226,0226,0226,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,
+0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,
+0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,
+0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,0225,
+0225,0225,0225,0225,0225,0225,0225,0225,0225,0224,0224,0224,0224,0224,0224,
+0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,
+0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,
+0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,
+0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0224,0223,0223,
+0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,
+0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,
+0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,
+0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,0223,
+0223,0223,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,
+0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,
+0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,
+0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,0222,
+0222,0222,0222,0222,0222,0222,0221,0221,0221,0221,0221,0221,0221,0221,0221,
+0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,
+0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,
+0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,
+0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0221,0220,0220,0220,0220,
+0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,
+0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,
+0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,
+0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,0220,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,0217,
+0217,0217,0217,0217,0217,0217,0217,0217,0217,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,0216,
+0216,0216,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,
+0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0215,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,0214,
+0214,0214,0214,0214,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,
+0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0213,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,0212,
+0212,0212,0212,0212,0212,0212,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,0211,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,0210,
+0210,0210,0210,0210,0210,0210,0210,0210,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,0207,
+0207,0207,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,
+0206,0206,0206,0206,0206,0206,0206,0206,0206,0206,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,0205,
+0205,0205,0205,0205,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,
+0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0204,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,0203,
+0203,0203,0203,0203,0203,0203,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,
+0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0202,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,0201,
+0201,0201,0201,0201,0201,0201,0201,0201,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,0200,
+0200,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,
+0000,0000,0000,0000,0000,0000,0000,0000,0000,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,0001,
+0001,0001,0001,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,
+0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0002,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,0003,
+0003,0003,0003,0003,0003,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,
+0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0004,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,0005,
+0005,0005,0005,0005,0005,0005,0005,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,0006,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,0007,
+0007,0007,0007,0007,0007,0007,0007,0007,0007,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,0010,
+0010,0010,0010,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,
+0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0011,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,0012,
+0012,0012,0012,0012,0012,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,
+0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0013,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,0014,
+0014,0014,0014,0014,0014,0014,0014,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,0015,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,0016,
+0016,0016,0016,0016,0016,0016,0016,0016,0016,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,0017,
+0017,0017,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,
+0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,
+0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,
+0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,0020,
+0020,0020,0020,0020,0020,0020,0021,0021,0021,0021,0021,0021,0021,0021,0021,
+0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,
+0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,
+0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,
+0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0021,0022,0022,0022,0022,
+0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,
+0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,
+0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,
+0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,0022,
+0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,
+0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,
+0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,
+0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,0023,
+0023,0023,0023,0023,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,
+0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,
+0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,
+0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,0024,
+0024,0024,0024,0024,0024,0024,0024,0024,0024,0025,0025,0025,0025,0025,0025,
+0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,
+0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,
+0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,
+0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0025,0026,0026,
+0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,
+0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,
+0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,
+0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,0026,
+0026,0026,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,
+0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,
+0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,
+0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,0027,
+0027,0027,0027,0027,0027,0027,0030,0030,0030,0030,0030,0030,0030,0030,0030,
+0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,
+0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,
+0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,
+0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0030,0031,0031,0031,0031,
+0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,
+0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,
+0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,
+0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,0031,
+0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,
+0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,
+0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,
+0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,0032,
+0032,0032,0032,0032,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,
+0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,
+0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,
+0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,0033,
+0033,0033,0033,0033,0033,0033,0033,0033,0034,0034,0034,0034,0034,0034,0034,
+0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,
+0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,
+0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,
+0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0034,0035,0035,
+0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,
+0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,
+0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,
+0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,0035,
+0035,0035,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,
+0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,
+0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,
+0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,0036,
+0036,0036,0036,0036,0036,0036,0037,0037,0037,0037,0037,0037,0037,0037,0037,
+0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,
+0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,
+0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,
+0037,0037,0037,0037,0037,0037,0037,0037,0037,0037,0040,0040,0040,0040,0040,
+0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,
+0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0040,0041,0041,
+0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,
+0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,0041,
+0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,
+0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,0042,
+0042,0042,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,
+0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,0043,
+0043,0043,0043,0043,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,
+0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,0044,
+0044,0044,0044,0044,0044,0044,0045,0045,0045,0045,0045,0045,0045,0045,0045,
+0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,0045,
+0045,0045,0045,0045,0045,0045,0045,0045,0046,0046,0046,0046,0046,0046,0046,
+0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,
+0046,0046,0046,0046,0046,0046,0046,0046,0046,0046,0047,0047,0047,0047,0047,
+0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,
+0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0047,0050,0050,
+0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,
+0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,0050,
+0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,
+0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,0051,
+0051,0051,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,
+0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,0052,
+0052,0052,0052,0052,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,
+0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,0053,
+0053,0053,0053,0053,0053,0053,0054,0054,0054,0054,0054,0054,0054,0054,0054,
+0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,0054,
+0054,0054,0054,0054,0054,0054,0054,0054,0055,0055,0055,0055,0055,0055,0055,
+0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,
+0055,0055,0055,0055,0055,0055,0055,0055,0055,0055,0056,0056,0056,0056,0056,
+0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,
+0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0056,0057,0057,0057,
+0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,
+0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,0057,
+0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,0060,
+0060,0061,0061,0061,0061,0061,0061,0061,0061,0061,0061,0061,0061,0061,0061,
+0061,0061,0062,0062,0062,0062,0062,0062,0062,0062,0062,0062,0062,0062,0062,
+0062,0062,0062,0063,0063,0063,0063,0063,0063,0063,0063,0063,0063,0063,0063,
+0063,0063,0063,0063,0064,0064,0064,0064,0064,0064,0064,0064,0064,0064,0064,
+0064,0064,0064,0064,0064,0065,0065,0065,0065,0065,0065,0065,0065,0065,0065,
+0065,0065,0065,0065,0065,0065,0066,0066,0066,0066,0066,0066,0066,0066,0066,
+0066,0066,0066,0066,0066,0066,0066,0067,0067,0067,0067,0067,0067,0067,0067,
+0067,0067,0067,0067,0067,0067,0067,0067,0070,0070,0070,0070,0070,0070,0070,
+0070,0070,0070,0070,0070,0070,0070,0070,0070,0071,0071,0071,0071,0071,0071,
+0071,0071,0071,0071,0071,0071,0071,0071,0071,0071,0072,0072,0072,0072,0072,
+0072,0072,0072,0072,0072,0072,0072,0072,0072,0072,0072,0073,0073,0073,0073,
+0073,0073,0073,0073,0073,0073,0073,0073,0073,0073,0073,0073,0074,0074,0074,
+0074,0074,0074,0074,0074,0074,0074,0074,0074,0074,0074,0074,0074,0075,0075,
+0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,0075,
+0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,0076,
+0076,0077,0077,0077,0077,0077,0077,0077,0077,0077,0077,0077,0077,0077,0077,
+0077,0077,0100,0100,0100,0100,0100,0100,0100,0100,0101,0101,0101,0101,0101,
+0101,0101,0101,0102,0102,0102,0102,0102,0102,0102,0102,0103,0103,0103,0103,
+0103,0103,0103,0103,0104,0104,0104,0104,0104,0104,0104,0104,0105,0105,0105,
+0105,0105,0105,0105,0105,0106,0106,0106,0106,0106,0106,0106,0106,0107,0107,
+0107,0107,0107,0107,0107,0107,0110,0110,0110,0110,0110,0110,0110,0110,0111,
+0111,0111,0111,0111,0111,0111,0111,0112,0112,0112,0112,0112,0112,0112,0112,
+0113,0113,0113,0113,0113,0113,0113,0113,0114,0114,0114,0114,0114,0114,0114,
+0114,0115,0115,0115,0115,0115,0115,0115,0115,0116,0116,0116,0116,0116,0116,
+0116,0116,0117,0117,0117,0117,0117,0117,0117,0117,0120,0120,0120,0120,0121,
+0121,0121,0121,0122,0122,0122,0122,0123,0123,0123,0123,0124,0124,0124,0124,
+0125,0125,0125,0125,0126,0126,0126,0126,0127,0127,0127,0127,0130,0130,0130,
+0130,0131,0131,0131,0131,0132,0132,0132,0132,0133,0133,0133,0133,0134,0134,
+0134,0134,0135,0135,0135,0135,0136,0136,0136,0136,0137,0137,0137,0137,0140,
+0140,0141,0141,0142,0142,0143,0143,0144,0144,0145,0145,0146,0146,0147,0147,
+0150,0150,0150,0151,0151,0152,0152,0153,0153,0154,0154,0155,0155,0156,0156,
+0157,0157,0160,0161,0162,0163,0164,0165,0166,0167,0170,0171,0172,0173,0174,
+0175,0176
+};
+
+int ulaw_input P1((buf), gsm_signal * buf)
+{
+ int i, c;
+
+ for (i = 0; i < 160 && (c = fgetc(in)) != EOF; i++) buf[i] = U2S(c);
+ if (c == EOF && ferror(in)) return -1;
+ return i;
+}
+
+int ulaw_output P1((buf), gsm_signal * buf)
+{
+ int i;
+
+ for(i = 0; i < 160; i++, buf++)
+ if (fputc( (char)S2U( (unsigned short)*buf ), out) == EOF)
+ return -1;
+ return 0;
+}
diff --git a/jni/libgsm/tls/bitter.c b/jni/libgsm/tls/bitter.c
new file mode 100644
index 0000000..602d8d6
--- /dev/null
+++ b/jni/libgsm/tls/bitter.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/bitter.c,v 1.1 1992/10/28 00:28:39 jutta Exp $*/
+
+/* Generate code to pack a bit array from a name:#bits description */
+
+#include <stdio.h>
+#include "taste.h"
+#include "proto.h"
+
+void write_code P2((s_spex, n_spex), struct spex * s_spex, int n_spex)
+{
+ struct spex * sp = s_spex;
+ int bits = 8;
+ int vars;
+
+ if (!n_spex) return;
+
+ vars = sp->varsize;
+
+ while (n_spex) {
+
+ if (bits == 8) printf("\t*c++ = ");
+ else printf("\t | ");
+
+ if (vars == bits) {
+
+ printf( (bits==8? "%s & 0x%lX;\n" : "(%s & 0x%lX);\n"),
+ sp->var,
+ ~(0xfffffffe << (bits - 1)));
+ if (!-- n_spex) break;
+ sp++;
+
+ vars = sp->varsize;
+ bits = 8;
+
+ } else if (vars < bits) {
+
+ printf( "((%s & 0x%lX) << %d)",
+ sp->var,
+ ~(0xfffffffe << (vars - 1)),
+ bits - vars);
+ bits -= vars;
+ if (!--n_spex) {
+ puts(";");
+ break;
+ }
+ else putchar('\n');
+ sp++;
+ vars = sp->varsize;
+
+ } else {
+ printf("((%s >> %d) & 0x%X);\n",
+ sp->var,
+ vars - bits,
+ ~(0xfffffffe << (bits - 1)));
+
+ vars -= bits;
+ bits = 8;
+ }
+ }
+}
diff --git a/jni/libgsm/tls/bitter.dta b/jni/libgsm/tls/bitter.dta
new file mode 100644
index 0000000..d1c42e4
--- /dev/null
+++ b/jni/libgsm/tls/bitter.dta
@@ -0,0 +1,90 @@
+;
+; Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+; Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+; details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+;
+;
+; Variable Size
+
+GSM_MAGIC 4
+
+LARc[0] 6
+LARc[1] 6
+LARc[2] 5
+LARc[3] 5
+LARc[4] 4
+LARc[5] 4
+LARc[6] 3
+LARc[7] 3
+
+Nc[0] 7
+bc[0] 2
+Mc[0] 2
+xmaxc[0] 6
+xmc[0] 3
+xmc[1] 3
+xmc[2] 3
+xmc[3] 3
+xmc[4] 3
+xmc[5] 3
+xmc[6] 3
+xmc[7] 3
+xmc[8] 3
+xmc[9] 3
+xmc[10] 3
+xmc[11] 3
+xmc[12] 3
+
+Nc[1] 7
+bc[1] 2
+Mc[1] 2
+xmaxc[1] 6
+xmc[13] 3
+xmc[14] 3
+xmc[15] 3
+xmc[16] 3
+xmc[17] 3
+xmc[18] 3
+xmc[19] 3
+xmc[20] 3
+xmc[21] 3
+xmc[22] 3
+xmc[23] 3
+xmc[24] 3
+xmc[25] 3
+
+Nc[2] 7
+bc[2] 2
+Mc[2] 2
+xmaxc[2] 6
+xmc[26] 3
+xmc[27] 3
+xmc[28] 3
+xmc[29] 3
+xmc[30] 3
+xmc[31] 3
+xmc[32] 3
+xmc[33] 3
+xmc[34] 3
+xmc[35] 3
+xmc[36] 3
+xmc[37] 3
+xmc[38] 3
+
+Nc[3] 7
+bc[3] 2
+Mc[3] 2
+xmaxc[3] 6
+xmc[39] 3
+xmc[40] 3
+xmc[41] 3
+xmc[42] 3
+xmc[43] 3
+xmc[44] 3
+xmc[45] 3
+xmc[46] 3
+xmc[47] 3
+xmc[48] 3
+xmc[49] 3
+xmc[50] 3
+xmc[51] 3
diff --git a/jni/libgsm/tls/ginger.c b/jni/libgsm/tls/ginger.c
new file mode 100644
index 0000000..579e4cf
--- /dev/null
+++ b/jni/libgsm/tls/ginger.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright 1996 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header*/
+
+/* Generate code to pack a bit array from a name:#bits description */
+
+#include <stdio.h>
+#include "taste.h"
+#include "proto.h"
+#include <limits.h>
+
+/* This module is the opposite of sour. Sweet was already taken,
+ * that's why it's called ginger. (Add one point if that reminds
+ * you of Gary Larson.)
+ */
+
+#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the
+ * target architecture---if this isn't 16,
+ * you're in trouble with this library anyway.
+ */
+
+#define CHAR_BITS 8 /* CHAR_BIT on the target architecture---
+ * if this isn't 8, you're in *deep* trouble.
+ */
+
+void write_code P2((s_spex, n_spex), struct spex * s_spex, int n_spex)
+{
+ struct spex * sp = s_spex;
+ int n_in = 0;
+
+ printf("uword sr = 0;\n");
+
+ for (; n_spex > 0; n_spex--, sp++) {
+
+ while (n_in < sp->varsize) {
+ if (n_in) printf("sr |= (uword)*c++ << %d;\n", n_in);
+ else printf("sr = *c++;\n");
+ n_in += CHAR_BITS;
+ }
+
+ printf("%s = sr & %#x; sr >>= %d;\n",
+ sp->var, ~(~0U << sp->varsize), sp->varsize);
+
+ n_in -= sp->varsize;
+ }
+
+ if (n_in > 0) {
+ fprintf(stderr, "%d bits left over\n", n_in);
+ }
+}
diff --git a/jni/libgsm/tls/sour.c b/jni/libgsm/tls/sour.c
new file mode 100644
index 0000000..1eae53e
--- /dev/null
+++ b/jni/libgsm/tls/sour.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright 1996 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header*/
+
+/* Generate code to pack a bit array from a name:#bits description */
+
+#include <stdio.h>
+#include "taste.h"
+#include "proto.h"
+#include <limits.h>
+
+/* This module goes back to one Jeff Chilton used for his implementation
+ * of the #49 WAV GSM format. (In his original patch 8, it replaced
+ * bitter.c.)
+ *
+ * In Microsoft's WAV #49 version of the GSM format, two 32 1/2
+ * byte GSM frames are packed together to make one WAV frame, and
+ * the GSM parameters are packed into bytes right-to-left rather
+ * than left-to-right.
+ *
+ * That is, where toast's GSM format writes
+ *
+ * aaaaaabb bbbbcccc cdddddee ...
+ * ___1____ ___2____ ___3____
+ *
+ * for parameters a (6 bits), b (6 bits), c (5 bits), d (5 bits), e ..
+ * the WAV format has
+ *
+ * bbaaaaaa ccccbbbb eedddddc ...
+ * ___1____ ___2____ ___3____
+ *
+ * (This format looks a lot prettier if one pictures octets coming
+ * in through a fifo queue from the left, rather than waiting in the
+ * right-hand remainder of a C array.)
+ */
+
+#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the
+ * target architecture---if this isn't 16,
+ * you're in trouble with this library anyway.
+ */
+
+#define CHAR_BITS 8 /* CHAR_BIT on the target architecture---
+ * if this isn't 8, you're in *deep* trouble.
+ */
+
+void write_code P2((s_spex, n_spex), struct spex * s_spex, int n_spex)
+{
+ struct spex * sp = s_spex;
+ int n_in = 0;
+
+ printf("uword sr = 0;\n");
+
+ for (; n_spex > 0; n_spex--, sp++) {
+
+ /* insert old
+ * new var value unused
+ * here
+ *
+ * [____________xxxxxx**********]
+ *
+ * <----- n_in ------>
+ */
+ printf("sr = sr >> %d | %s << %d;\n",
+ sp->varsize,
+ sp->var,
+ WORD_BITS - sp->varsize);
+
+ n_in += sp->varsize;
+
+ while (n_in >= CHAR_BIT) {
+ printf("*c++ = sr >> %d;\n",
+ WORD_BITS - n_in);
+ n_in -= CHAR_BIT;
+ }
+ }
+
+ while (n_in >= CHAR_BIT) {
+ printf("*c++ = sr >> %d;\n", WORD_BITS - n_in);
+ n_in -= CHAR_BIT;
+ }
+
+ if (n_in > 0) {
+ fprintf(stderr, "warning: %d bits left over\n", n_in);
+ }
+}
diff --git a/jni/libgsm/tls/sour1.dta b/jni/libgsm/tls/sour1.dta
new file mode 100644
index 0000000..770b24c
--- /dev/null
+++ b/jni/libgsm/tls/sour1.dta
@@ -0,0 +1,88 @@
+;
+; Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+; Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+; details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+;
+;
+; Variable Size
+
+LARc[0] 6
+LARc[1] 6
+LARc[2] 5
+LARc[3] 5
+LARc[4] 4
+LARc[5] 4
+LARc[6] 3
+LARc[7] 3
+
+Nc[0] 7
+bc[0] 2
+Mc[0] 2
+xmaxc[0] 6
+xmc[0] 3
+xmc[1] 3
+xmc[2] 3
+xmc[3] 3
+xmc[4] 3
+xmc[5] 3
+xmc[6] 3
+xmc[7] 3
+xmc[8] 3
+xmc[9] 3
+xmc[10] 3
+xmc[11] 3
+xmc[12] 3
+
+Nc[1] 7
+bc[1] 2
+Mc[1] 2
+xmaxc[1] 6
+xmc[13] 3
+xmc[14] 3
+xmc[15] 3
+xmc[16] 3
+xmc[17] 3
+xmc[18] 3
+xmc[19] 3
+xmc[20] 3
+xmc[21] 3
+xmc[22] 3
+xmc[23] 3
+xmc[24] 3
+xmc[25] 3
+
+Nc[2] 7
+bc[2] 2
+Mc[2] 2
+xmaxc[2] 6
+xmc[26] 3
+xmc[27] 3
+xmc[28] 3
+xmc[29] 3
+xmc[30] 3
+xmc[31] 3
+xmc[32] 3
+xmc[33] 3
+xmc[34] 3
+xmc[35] 3
+xmc[36] 3
+xmc[37] 3
+xmc[38] 3
+
+Nc[3] 7
+bc[3] 2
+Mc[3] 2
+xmaxc[3] 6
+xmc[39] 3
+xmc[40] 3
+xmc[41] 3
+xmc[42] 3
+xmc[43] 3
+xmc[44] 3
+xmc[45] 3
+xmc[46] 3
+xmc[47] 3
+xmc[48] 3
+xmc[49] 3
+xmc[50] 3
+xmc[51] 3
diff --git a/jni/libgsm/tls/sour2.dta b/jni/libgsm/tls/sour2.dta
new file mode 100644
index 0000000..f56545c
--- /dev/null
+++ b/jni/libgsm/tls/sour2.dta
@@ -0,0 +1,90 @@
+;
+; Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+; Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+; details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+;
+;
+; Variable Size
+
+g->chain 4
+
+LARc[0] 6
+LARc[1] 6
+LARc[2] 5
+LARc[3] 5
+LARc[4] 4
+LARc[5] 4
+LARc[6] 3
+LARc[7] 3
+
+Nc[0] 7
+bc[0] 2
+Mc[0] 2
+xmaxc[0] 6
+xmc[0] 3
+xmc[1] 3
+xmc[2] 3
+xmc[3] 3
+xmc[4] 3
+xmc[5] 3
+xmc[6] 3
+xmc[7] 3
+xmc[8] 3
+xmc[9] 3
+xmc[10] 3
+xmc[11] 3
+xmc[12] 3
+
+Nc[1] 7
+bc[1] 2
+Mc[1] 2
+xmaxc[1] 6
+xmc[13] 3
+xmc[14] 3
+xmc[15] 3
+xmc[16] 3
+xmc[17] 3
+xmc[18] 3
+xmc[19] 3
+xmc[20] 3
+xmc[21] 3
+xmc[22] 3
+xmc[23] 3
+xmc[24] 3
+xmc[25] 3
+
+Nc[2] 7
+bc[2] 2
+Mc[2] 2
+xmaxc[2] 6
+xmc[26] 3
+xmc[27] 3
+xmc[28] 3
+xmc[29] 3
+xmc[30] 3
+xmc[31] 3
+xmc[32] 3
+xmc[33] 3
+xmc[34] 3
+xmc[35] 3
+xmc[36] 3
+xmc[37] 3
+xmc[38] 3
+
+Nc[3] 7
+bc[3] 2
+Mc[3] 2
+xmaxc[3] 6
+xmc[39] 3
+xmc[40] 3
+xmc[41] 3
+xmc[42] 3
+xmc[43] 3
+xmc[44] 3
+xmc[45] 3
+xmc[46] 3
+xmc[47] 3
+xmc[48] 3
+xmc[49] 3
+xmc[50] 3
+xmc[51] 3
diff --git a/jni/libgsm/tls/sweet.c b/jni/libgsm/tls/sweet.c
new file mode 100644
index 0000000..6a6fb29
--- /dev/null
+++ b/jni/libgsm/tls/sweet.c
@@ -0,0 +1,66 @@
+ /*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/sweet.c,v 1.2 1996/07/02 10:15:53 jutta Exp $*/
+
+/* Generate code to unpack a bit array from name:#bits description */
+
+#include <stdio.h>
+#include "taste.h"
+#include "proto.h"
+
+void write_code P2((s_spex, n_spex), struct spex * s_spex, int n_spex)
+{
+ struct spex * sp = s_spex;
+ int bits = 8;
+ int vars;
+
+ if (!n_spex) return;
+
+ vars = sp->varsize;
+
+ while (n_spex) {
+
+ if (vars == sp->varsize) {
+ printf("\t%s = ", sp->var);
+ } else printf("\t%s |= ", sp->var);
+
+ if (vars == bits) {
+
+ if (bits == 8) printf( "*c++;\n" );
+ else printf( "*c++ & 0x%lX;\n",
+ ~(0xfffffffe << (bits - 1)) );
+
+ if (!-- n_spex) break;
+ sp++;
+ vars = sp->varsize;
+ bits = 8;
+
+ } else if (vars < bits) {
+
+ printf( "(*c >> %d) & 0x%lX;\n",
+ bits - vars,
+ ~(0xfffffffe << (vars - 1)));
+
+ bits -= vars;
+ if (!--n_spex) break;
+ sp++;
+ vars = sp->varsize;
+
+ } else {
+ /* vars > bits. We're eating lower-all of c,
+ * but we must shift it.
+ */
+ printf( "(*c++ & 0x%X) << %d;\n",
+ ~(0xfffffffe << (bits - 1)),
+ vars - bits );
+
+ vars -= bits;
+ bits = 8;
+ }
+ }
+}
+
diff --git a/jni/libgsm/tls/taste.c b/jni/libgsm/tls/taste.c
new file mode 100644
index 0000000..640ff16
--- /dev/null
+++ b/jni/libgsm/tls/taste.c
@@ -0,0 +1,134 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/taste.c,v 1.1 1992/10/28 00:28:39 jutta Exp $*/
+
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+
+#include "config.h"
+
+#ifdef HAS_STDLIB_H
+# include <stdlib.h>
+#else
+#include "proto.h"
+# ifdef HAS_MALLOC_H
+# include <malloc.h>
+# else
+ extern char * malloc P((char *)), * realloc P((char *,int));
+# endif
+ extern int exit P((int));
+#endif
+
+#include "proto.h"
+
+/*
+ * common code to sweet.c and bitter.c: read the name:#bits description.
+ */
+
+#include "taste.h"
+
+static struct spex * s_spex;
+static int n_spex, m_spex;
+
+extern void write_code P((struct spex *, int));
+
+char * strsave P1((str), char * str) /* strdup() + errors */
+{
+ int n = strlen(str) + 1;
+ char * s = malloc(n);
+ if (!s) {
+ fprintf(stderr, "Failed to malloc %d bytes, abort\n",
+ strlen(str) + 1);
+ exit(1);
+ }
+ return memcpy(s, str, n);
+}
+
+struct spex * new_spex P0()
+{
+ if (n_spex >= m_spex) {
+ m_spex += 500;
+ if (!(s_spex = (struct spex *)(n_spex
+ ? realloc((char *)s_spex, m_spex * sizeof(*s_spex))
+ : malloc( m_spex * sizeof(*s_spex))))) {
+ fprintf(stderr, "Failed to malloc %d bytes, abort\n",
+ m_spex * sizeof(*s_spex));
+ exit(1);
+ }
+ }
+ return s_spex + n_spex;
+}
+
+char * strtek P2((str, sep), char * str, char * sep) {
+
+ static char * S = (char *)0;
+ char * c, * base;
+
+ if (str) S = str;
+
+ if (!S || !*S) return (char *)0;
+
+ /* Skip delimiters.
+ */
+ while (*S) {
+ for (c = sep; *c && *c != *S; c++) ;
+ if (*c) *S++ = 0;
+ else break;
+ }
+
+ base = S;
+
+ /* Skip non-delimiters.
+ */
+ for (base = S; *S; S++) {
+
+ for (c = sep; *c; c++)
+ if (*c == *S) {
+ *S++ = 0;
+ return base;
+ }
+ }
+
+ return base == S ? (char *)0 : base;
+}
+
+int read_spex P0()
+{
+ char buf[200];
+ char * s, *t;
+ struct spex * sp = s_spex;
+
+ while (gets(buf)) {
+
+ if (!*buf || *buf == ';') continue;
+ s = strtek(buf, " \t");
+ if (!s) {
+ fprintf(stderr, "? %s\n", buf);
+ continue;
+ }
+ sp = new_spex();
+ sp->var = strsave(s);
+ s = strtek((char*)0, " \t");
+ if (!s) {
+ fprintf(stderr, "varsize?\n");
+ continue;
+ }
+ sp->varsize = strtol(s, (char *)0, 0);
+ n_spex++;
+ }
+
+ return sp - s_spex;
+}
+
+int main P0()
+{
+ read_spex();
+ write_code(s_spex, n_spex);
+
+ exit(0);
+}
diff --git a/jni/libgsm/tls/taste.h b/jni/libgsm/tls/taste.h
new file mode 100644
index 0000000..2fc85ef
--- /dev/null
+++ b/jni/libgsm/tls/taste.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*
+ * common code to sweet.c and bitter.c
+ */
+
+#ifndef TASTE_H
+#define TASTE_H
+
+struct spex {
+
+ char * var;
+ int varsize;
+} ;
+
+#endif /* TASTE_H */
diff --git a/jni/libgsm/tst/cod2lin.c b/jni/libgsm/tst/cod2lin.c
new file mode 100644
index 0000000..07a9510
--- /dev/null
+++ b/jni/libgsm/tst/cod2lin.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/cod2lin.c,v 1.2 1996/07/02 14:33:10 jutta Exp jutta $*/
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "gsm.h"
+#include "proto.h"
+
+char * pname;
+
+int debug = 0;
+int verbosity = 0;
+int fast = 0;
+int wav = 0;
+int error = 0;
+
+usage P0()
+{
+ fprintf(stderr, "Usage: %s [-vwF] [files...]\n", pname);
+ exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+ gsm_frame buf;
+ gsm_signal source[160];
+
+ int cc;
+ gsm r;
+
+ (void)memset(source, 0x00, sizeof(source));
+
+ if (!(r = gsm_create())) {
+ perror("gsm_create");
+ error = 1;
+ return ;
+ }
+ gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+ gsm_option(r, GSM_OPT_FAST, &fast);
+ gsm_option(r, GSM_OPT_WAV49, &wav);
+ for (;;) {
+ cc = fread((char *)source, sizeof(*source), 76, f);
+ if (cc == 0) {
+ gsm_destroy(r);
+ return;
+ }
+ if (cc != 76) {
+ error = 1;
+ fprintf(stderr,
+ "%s: %s -- %d trailing bytes ignored\n",
+ pname, filename, cc);
+ gsm_destroy(r);
+ return;
+ }
+
+ gsm_implode(r, source, buf);
+ gsm_decode(r, buf, source);
+
+ if (write(1, source, sizeof(source)) != sizeof(source)) {
+ perror("write");
+ error = 1;
+ gsm_destroy(r);
+ return;
+ }
+ }
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+ int opt;
+ extern char * optarg;
+ extern int optind;
+
+ FILE * f;
+
+ if (!(pname = av[0])) pname = "cod2out";
+
+ while ((opt = getopt(ac, av, "vwF")) != EOF) switch (opt) {
+ case 'v': verbosity++; break;
+ case 'w': wav++; break;
+ case 'F': fast++; break;
+ default: usage();
+ }
+
+ ac -= optind;
+ av += optind;
+
+ if (!ac) process(stdin, "*stdin*");
+ else for (; *av; av++) {
+ if (!(f = fopen(*av, "r"))) perror(*av);
+ else {
+ process(f, *av);
+ fclose(f);
+ }
+ }
+
+ exit(error);
+}
diff --git a/jni/libgsm/tst/cod2txt.c b/jni/libgsm/tst/cod2txt.c
new file mode 100644
index 0000000..71c362e
--- /dev/null
+++ b/jni/libgsm/tst/cod2txt.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/cod2txt.c,v 1.1 1994/10/21 20:52:11 jutta Exp $*/
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "gsm.h"
+#include "proto.h"
+
+char * pname;
+
+int debug = 0;
+int verbosity = 0;
+int error = 0;
+
+usage P0()
+{
+ fprintf(stderr, "Usage: %s [files...]\n", pname);
+ exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+ gsm_frame buf;
+ gsm_signal source[160];
+
+ int cc;
+ gsm r;
+ int nr=0;
+
+ (void)memset(source, 0, sizeof(source));
+
+ if (!(r = gsm_create())) {
+ perror("gsm_create");
+ error = 1;
+ return ;
+ }
+ gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+ for (;;) {
+ cc = fread((char *)source, sizeof(*source), 76, f);
+ if (cc == 0) {
+ gsm_destroy(r);
+ return;
+ }
+ if (cc != 76) {
+ error = 1;
+ fprintf(stderr,
+ "%s: %s -- %d trailing bytes ignored\n",
+ pname, filename, cc);
+ gsm_destroy(r);
+ return;
+ }
+
+ gsm_implode(r, source, buf);
+ printf("[%d] ", ++nr);
+ if (gsm_print(stdout, r, buf)) {
+ fprintf(stderr,
+ "%s: %s: bad magic\n", pname, filename);
+ gsm_destroy(r);
+ return;
+
+ }
+ }
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+ int opt;
+ extern char * optarg;
+ extern int optind;
+
+ FILE * f;
+
+ if (!(pname = av[0])) pname = "cod2txt";
+
+ ac--;
+ av++;
+
+ if (!ac) process(stdin, "*stdin*");
+ else for (; *av; av++) {
+ if (!(f = fopen(*av, "r"))) perror(*av);
+ else {
+ process(f, *av);
+ fclose(f);
+ }
+ }
+
+ exit(error);
+}
diff --git a/jni/libgsm/tst/gsm2cod.c b/jni/libgsm/tst/gsm2cod.c
new file mode 100644
index 0000000..f2e7c2c
--- /dev/null
+++ b/jni/libgsm/tst/gsm2cod.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm2cod.c,v 1.1 1994/10/21 20:52:11 jutta Exp $*/
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "gsm.h"
+#include "proto.h"
+
+char * pname;
+
+int debug = 0;
+int verbosity = 0;
+int error = 0;
+
+usage P0()
+{
+ fprintf(stderr, "Usage: %s [files...]\n", pname);
+ exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+ gsm_frame buf;
+ gsm_signal source[76];
+
+ int cc;
+ gsm r;
+ int nr=0;
+
+ (void)memset(source, 0, sizeof(source));
+
+ if (!(r = gsm_create())) {
+ perror("gsm_create");
+ error = 1;
+ return ;
+ }
+ gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+ for (;;) {
+ cc = fread((char *)buf, sizeof(buf), 1, f);
+ if (cc == 0) {
+ gsm_destroy(r);
+ return;
+ }
+ if (cc != 1) {
+ error = 1;
+ fprintf(stderr,
+ "%s: %s -- trailing bytes ignored\n",
+ pname, filename);
+ gsm_destroy(r);
+ return;
+ }
+
+ gsm_explode(r, buf, source);
+ if (write(1, (char *)source, sizeof(source))!= sizeof(source)) {
+
+ perror("write");
+ error = 1;
+ gsm_destroy(r);
+ return;
+ }
+ }
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+ int opt;
+ extern char * optarg;
+ extern int optind;
+
+ FILE * f;
+
+ if (!(pname = av[0])) pname = "gsm2cod";
+
+ ac--;
+ av++;
+
+ if (!ac) process(stdin, "*stdin*");
+ else for (; *av; av++) {
+ if (!(f = fopen(*av, "r"))) perror(*av);
+ else {
+ process(f, *av);
+ fclose(f);
+ }
+ }
+
+ exit(error);
+}
diff --git a/jni/libgsm/tst/lin2cod.c b/jni/libgsm/tst/lin2cod.c
new file mode 100644
index 0000000..2c42b10
--- /dev/null
+++ b/jni/libgsm/tst/lin2cod.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/lin2cod.c,v 1.2 1996/07/02 14:33:13 jutta Exp jutta $*/
+
+#include <stdio.h>
+
+#include "gsm.h"
+#include "proto.h"
+
+char * pname;
+
+int debug = 0;
+int verbosity = 0;
+int fast = 0;
+int wav = 0;
+int error = 0;
+
+usage P0()
+{
+ fprintf(stderr, "Usage: %s [-vwF] [files...]\n", pname);
+ exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+ gsm_frame buf;
+ short source[160];
+ int cc;
+ gsm r;
+
+ if (!(r = gsm_create())) {
+ perror("gsm_create");
+ error = 1;
+ return ;
+ }
+ gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+ gsm_option(r, GSM_OPT_FAST, &fast);
+ gsm_option(r, GSM_OPT_WAV49, &wav);
+ for (;;) {
+
+ if ((cc = fread((char *)source, 1, sizeof(source), f)) == 0) {
+ gsm_destroy(r);
+#ifdef COUNT_OVERFLOW
+ dump_overflow(stderr);
+#endif
+ return;
+ }
+
+ if (cc != sizeof(source)) {
+ error = 1;
+ perror(filename);
+ fprintf(stderr, "%s: cannot read input from %s\n",
+ pname, filename);
+ gsm_destroy(r);
+ return;
+ }
+
+ gsm_encode(r, source, buf);
+ gsm_explode(r, buf, source); /* 76 shorts */
+ if (write(1, source, sizeof(*source) * 76)
+ != sizeof(*source) * 76) {
+
+ perror("write");
+ error = 1;
+ gsm_destroy(r);
+ return;
+ }
+ }
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+ int opt;
+ extern char * optarg;
+ extern int optind;
+
+ FILE * f;
+
+ if (!(pname = av[0])) pname = "inp2cod";
+
+ while ((opt = getopt(ac, av, "vwF")) != EOF) switch (opt) {
+ case 'v': verbosity++; break;
+ case 'w': wav++; break;
+ case 'F': fast++; break;
+ default: usage();
+ }
+
+ ac -= optind;
+ av += optind;
+
+ if (!ac) process(stdin, "*stdin*");
+ else for (; *av; av++) {
+ if (!(f = fopen(*av, "r"))) perror(*av);
+ else {
+ process(f, *av);
+ fclose(f);
+ }
+ }
+
+ exit(error);
+}
diff --git a/jni/libgsm/tst/lin2txt.c b/jni/libgsm/tst/lin2txt.c
new file mode 100644
index 0000000..fb39504
--- /dev/null
+++ b/jni/libgsm/tst/lin2txt.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/lin2txt.c,v 1.1 1994/10/21 20:52:11 jutta Exp $*/
+
+#include <stdio.h>
+
+#include "gsm.h"
+#include "proto.h"
+
+char * pname;
+
+int debug = 0;
+int verbosity = 0;
+int error = 0;
+
+usage P0()
+{
+ fprintf(stderr, "Usage: %s [-v] [files...]\n", pname);
+ exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+ short source[160];
+ int cc, j, k;
+ gsm r;
+
+ if (!(r = gsm_create())) {
+ perror("gsm_create");
+ error = 1;
+ return ;
+ }
+ gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+ for (;;) {
+
+ if ((cc = fread((char *)source, 1, sizeof(source), f)) == 0) {
+ gsm_destroy(r);
+#ifdef COUNT_OVERFLOW
+ dump_overflow(stderr);
+#endif
+ return;
+ }
+
+ printf("{\t");
+ for (j = 0; j < 4; j++) {
+ printf("{\t");
+ for (k = 0; k < 40; k++) {
+ printf("%d", (int)source[ j * 40 + k ]);
+ if (k < 39) {
+ printf(", ");
+ if (k % 4 == 3) printf("\n\t\t");
+ } else {
+ printf("\t}");
+ if (j == 3) printf("\t},\n");
+ else printf(",\n\t");
+ }
+ }
+ }
+ }
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+ int opt;
+ extern char * optarg;
+ extern int optind;
+
+ FILE * f;
+
+ if (!(pname = av[0])) pname = "inp2txt";
+
+ while ((opt = getopt(ac, av, "v")) != EOF) switch (opt) {
+ case 'v': verbosity++; break;
+ default: usage();
+ }
+
+ ac -= optind;
+ av += optind;
+
+ if (!ac) process(stdin, "*stdin*");
+ else for (; *av; av++) {
+ if (!(f = fopen(*av, "r"))) perror(*av);
+ else {
+ process(f, *av);
+ fclose(f);
+ }
+ }
+
+ exit(error);
+}
diff --git a/jni/libgsm/tst/run b/jni/libgsm/tst/run
new file mode 100755
index 0000000..5eec3b2
--- /dev/null
+++ b/jni/libgsm/tst/run
@@ -0,0 +1,34 @@
+:
+#
+# Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+# Universitaet Berlin. See the accompanying file "COPYRIGHT" for
+# details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+#
+if [ ! -f 1.inp ] ; then
+ echo Sorry, but we cannot provide the test data with this release.
+ exit
+fi
+
+echo -n 'Linear to code: '
+for i in 1 2 3 4
+do
+ echo -n $i..
+ ./lin2cod < $i.inp | cmp - $i.cod
+done
+echo ""
+
+echo -n 'Code to linear: '
+for i in 1 2 3 4
+do
+ echo -n $i..
+ ./cod2lin < $i.cod | cmp - $i.out
+done
+echo ""
+
+echo -n 'Toast: '
+for i in 1 2 3 4
+do
+ echo -n $i..
+ ../bin/toast -l < $i.inp | ../bin/toast -dl | cmp - $i.out
+done
+echo ""
diff --git a/jni/libsamplerate-0.1.8/AUTHORS b/jni/libsamplerate/AUTHORS
similarity index 100%
rename from jni/libsamplerate-0.1.8/AUTHORS
rename to jni/libsamplerate/AUTHORS
diff --git a/jni/libsamplerate-0.1.8/Android.mk b/jni/libsamplerate/Android.mk
similarity index 100%
rename from jni/libsamplerate-0.1.8/Android.mk
rename to jni/libsamplerate/Android.mk
diff --git a/jni/libsamplerate-0.1.8/COPYING b/jni/libsamplerate/COPYING
similarity index 100%
rename from jni/libsamplerate-0.1.8/COPYING
rename to jni/libsamplerate/COPYING
diff --git a/jni/libsamplerate-0.1.8/Cfg/compile b/jni/libsamplerate/Cfg/compile
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/compile
rename to jni/libsamplerate/Cfg/compile
diff --git a/jni/libsamplerate-0.1.8/Cfg/config.guess b/jni/libsamplerate/Cfg/config.guess
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/config.guess
rename to jni/libsamplerate/Cfg/config.guess
diff --git a/jni/libsamplerate-0.1.8/Cfg/config.sub b/jni/libsamplerate/Cfg/config.sub
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/config.sub
rename to jni/libsamplerate/Cfg/config.sub
diff --git a/jni/libsamplerate-0.1.8/Cfg/depcomp b/jni/libsamplerate/Cfg/depcomp
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/depcomp
rename to jni/libsamplerate/Cfg/depcomp
diff --git a/jni/libsamplerate-0.1.8/Cfg/install-sh b/jni/libsamplerate/Cfg/install-sh
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/install-sh
rename to jni/libsamplerate/Cfg/install-sh
diff --git a/jni/libsamplerate-0.1.8/Cfg/ltmain.sh b/jni/libsamplerate/Cfg/ltmain.sh
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/ltmain.sh
rename to jni/libsamplerate/Cfg/ltmain.sh
diff --git a/jni/libsamplerate-0.1.8/Cfg/missing b/jni/libsamplerate/Cfg/missing
similarity index 100%
rename from jni/libsamplerate-0.1.8/Cfg/missing
rename to jni/libsamplerate/Cfg/missing
diff --git a/jni/libsamplerate-0.1.8/ChangeLog b/jni/libsamplerate/ChangeLog
similarity index 100%
rename from jni/libsamplerate-0.1.8/ChangeLog
rename to jni/libsamplerate/ChangeLog
diff --git a/jni/libsamplerate-0.1.8/INSTALL b/jni/libsamplerate/INSTALL
similarity index 100%
rename from jni/libsamplerate-0.1.8/INSTALL
rename to jni/libsamplerate/INSTALL
diff --git a/jni/libsamplerate-0.1.8/M4/Makefile.am b/jni/libsamplerate/M4/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/Makefile.am
rename to jni/libsamplerate/M4/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/M4/Makefile.in b/jni/libsamplerate/M4/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/Makefile.in
rename to jni/libsamplerate/M4/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/M4/add_cflags.m4 b/jni/libsamplerate/M4/add_cflags.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/add_cflags.m4
rename to jni/libsamplerate/M4/add_cflags.m4
diff --git a/jni/libsamplerate-0.1.8/M4/check_signal.m4 b/jni/libsamplerate/M4/check_signal.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/check_signal.m4
rename to jni/libsamplerate/M4/check_signal.m4
diff --git a/jni/libsamplerate-0.1.8/M4/clip_mode.m4 b/jni/libsamplerate/M4/clip_mode.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/clip_mode.m4
rename to jni/libsamplerate/M4/clip_mode.m4
diff --git a/jni/libsamplerate-0.1.8/M4/endian.m4 b/jni/libsamplerate/M4/endian.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/endian.m4
rename to jni/libsamplerate/M4/endian.m4
diff --git a/jni/libsamplerate-0.1.8/M4/libtool.m4 b/jni/libsamplerate/M4/libtool.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/libtool.m4
rename to jni/libsamplerate/M4/libtool.m4
diff --git a/jni/libsamplerate-0.1.8/M4/lrint.m4 b/jni/libsamplerate/M4/lrint.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/lrint.m4
rename to jni/libsamplerate/M4/lrint.m4
diff --git a/jni/libsamplerate-0.1.8/M4/lrintf.m4 b/jni/libsamplerate/M4/lrintf.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/lrintf.m4
rename to jni/libsamplerate/M4/lrintf.m4
diff --git a/jni/libsamplerate-0.1.8/M4/ltoptions.m4 b/jni/libsamplerate/M4/ltoptions.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/ltoptions.m4
rename to jni/libsamplerate/M4/ltoptions.m4
diff --git a/jni/libsamplerate-0.1.8/M4/ltsugar.m4 b/jni/libsamplerate/M4/ltsugar.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/ltsugar.m4
rename to jni/libsamplerate/M4/ltsugar.m4
diff --git a/jni/libsamplerate-0.1.8/M4/ltversion.m4 b/jni/libsamplerate/M4/ltversion.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/ltversion.m4
rename to jni/libsamplerate/M4/ltversion.m4
diff --git a/jni/libsamplerate-0.1.8/M4/lt~obsolete.m4 b/jni/libsamplerate/M4/lt~obsolete.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/M4/lt~obsolete.m4
rename to jni/libsamplerate/M4/lt~obsolete.m4
diff --git a/jni/libsamplerate-0.1.8/Make.bat b/jni/libsamplerate/Make.bat
similarity index 100%
rename from jni/libsamplerate-0.1.8/Make.bat
rename to jni/libsamplerate/Make.bat
diff --git a/jni/libsamplerate-0.1.8/Makefile.am b/jni/libsamplerate/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/Makefile.am
rename to jni/libsamplerate/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/Makefile.in b/jni/libsamplerate/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/Makefile.in
rename to jni/libsamplerate/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/NEWS b/jni/libsamplerate/NEWS
similarity index 100%
rename from jni/libsamplerate-0.1.8/NEWS
rename to jni/libsamplerate/NEWS
diff --git a/jni/libsamplerate-0.1.8/README b/jni/libsamplerate/README
similarity index 100%
rename from jni/libsamplerate-0.1.8/README
rename to jni/libsamplerate/README
diff --git a/jni/libsamplerate-0.1.8/Win32/Makefile.am b/jni/libsamplerate/Win32/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/Makefile.am
rename to jni/libsamplerate/Win32/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/Win32/Makefile.in b/jni/libsamplerate/Win32/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/Makefile.in
rename to jni/libsamplerate/Win32/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/Win32/Makefile.mingw.in b/jni/libsamplerate/Win32/Makefile.mingw.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/Makefile.mingw.in
rename to jni/libsamplerate/Win32/Makefile.mingw.in
diff --git a/jni/libsamplerate-0.1.8/Win32/Makefile.msvc b/jni/libsamplerate/Win32/Makefile.msvc
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/Makefile.msvc
rename to jni/libsamplerate/Win32/Makefile.msvc
diff --git a/jni/libsamplerate-0.1.8/Win32/config.h b/jni/libsamplerate/Win32/config.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/config.h
rename to jni/libsamplerate/Win32/config.h
diff --git a/jni/libsamplerate-0.1.8/Win32/libsamplerate-0.def b/jni/libsamplerate/Win32/libsamplerate-0.def
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/libsamplerate-0.def
rename to jni/libsamplerate/Win32/libsamplerate-0.def
diff --git a/jni/libsamplerate-0.1.8/Win32/unistd.h b/jni/libsamplerate/Win32/unistd.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/Win32/unistd.h
rename to jni/libsamplerate/Win32/unistd.h
diff --git a/jni/libsamplerate-0.1.8/aclocal.m4 b/jni/libsamplerate/aclocal.m4
similarity index 100%
rename from jni/libsamplerate-0.1.8/aclocal.m4
rename to jni/libsamplerate/aclocal.m4
diff --git a/jni/libsamplerate-0.1.8/autogen.sh b/jni/libsamplerate/autogen.sh
similarity index 100%
rename from jni/libsamplerate-0.1.8/autogen.sh
rename to jni/libsamplerate/autogen.sh
diff --git a/jni/libsamplerate-0.1.8/autom4te.cache/output.0 b/jni/libsamplerate/autom4te.cache/output.0
similarity index 100%
rename from jni/libsamplerate-0.1.8/autom4te.cache/output.0
rename to jni/libsamplerate/autom4te.cache/output.0
diff --git a/jni/libsamplerate-0.1.8/autom4te.cache/output.1 b/jni/libsamplerate/autom4te.cache/output.1
similarity index 100%
rename from jni/libsamplerate-0.1.8/autom4te.cache/output.1
rename to jni/libsamplerate/autom4te.cache/output.1
diff --git a/jni/libsamplerate-0.1.8/autom4te.cache/requests b/jni/libsamplerate/autom4te.cache/requests
similarity index 100%
rename from jni/libsamplerate-0.1.8/autom4te.cache/requests
rename to jni/libsamplerate/autom4te.cache/requests
diff --git a/jni/libsamplerate-0.1.8/autom4te.cache/traces.0 b/jni/libsamplerate/autom4te.cache/traces.0
similarity index 100%
rename from jni/libsamplerate-0.1.8/autom4te.cache/traces.0
rename to jni/libsamplerate/autom4te.cache/traces.0
diff --git a/jni/libsamplerate-0.1.8/autom4te.cache/traces.1 b/jni/libsamplerate/autom4te.cache/traces.1
similarity index 100%
rename from jni/libsamplerate-0.1.8/autom4te.cache/traces.1
rename to jni/libsamplerate/autom4te.cache/traces.1
diff --git a/jni/libsamplerate-0.1.8/config.h b/jni/libsamplerate/config.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/config.h
rename to jni/libsamplerate/config.h
diff --git a/jni/libsamplerate-0.1.8/config.log b/jni/libsamplerate/config.log
similarity index 100%
rename from jni/libsamplerate-0.1.8/config.log
rename to jni/libsamplerate/config.log
diff --git a/jni/libsamplerate-0.1.8/configure b/jni/libsamplerate/configure
similarity index 100%
rename from jni/libsamplerate-0.1.8/configure
rename to jni/libsamplerate/configure
diff --git a/jni/libsamplerate-0.1.8/configure.ac b/jni/libsamplerate/configure.ac
similarity index 100%
rename from jni/libsamplerate-0.1.8/configure.ac
rename to jni/libsamplerate/configure.ac
diff --git a/jni/libsamplerate-0.1.8/doc/ChangeLog b/jni/libsamplerate/doc/ChangeLog
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/ChangeLog
rename to jni/libsamplerate/doc/ChangeLog
diff --git a/jni/libsamplerate-0.1.8/doc/Makefile.am b/jni/libsamplerate/doc/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/Makefile.am
rename to jni/libsamplerate/doc/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/doc/Makefile.in b/jni/libsamplerate/doc/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/Makefile.in
rename to jni/libsamplerate/doc/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/doc/NEWS b/jni/libsamplerate/doc/NEWS
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/NEWS
rename to jni/libsamplerate/doc/NEWS
diff --git a/jni/libsamplerate-0.1.8/doc/SRC.css b/jni/libsamplerate/doc/SRC.css
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/SRC.css
rename to jni/libsamplerate/doc/SRC.css
diff --git a/jni/libsamplerate-0.1.8/doc/SRC.png b/jni/libsamplerate/doc/SRC.png
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/SRC.png
rename to jni/libsamplerate/doc/SRC.png
Binary files differ
diff --git a/jni/libsamplerate-0.1.8/doc/api.html b/jni/libsamplerate/doc/api.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/api.html
rename to jni/libsamplerate/doc/api.html
diff --git a/jni/libsamplerate-0.1.8/doc/api_callback.html b/jni/libsamplerate/doc/api_callback.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/api_callback.html
rename to jni/libsamplerate/doc/api_callback.html
diff --git a/jni/libsamplerate-0.1.8/doc/api_full.html b/jni/libsamplerate/doc/api_full.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/api_full.html
rename to jni/libsamplerate/doc/api_full.html
diff --git a/jni/libsamplerate-0.1.8/doc/api_misc.html b/jni/libsamplerate/doc/api_misc.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/api_misc.html
rename to jni/libsamplerate/doc/api_misc.html
diff --git a/jni/libsamplerate-0.1.8/doc/api_simple.html b/jni/libsamplerate/doc/api_simple.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/api_simple.html
rename to jni/libsamplerate/doc/api_simple.html
diff --git a/jni/libsamplerate-0.1.8/doc/download.html b/jni/libsamplerate/doc/download.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/download.html
rename to jni/libsamplerate/doc/download.html
diff --git a/jni/libsamplerate-0.1.8/doc/faq.html b/jni/libsamplerate/doc/faq.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/faq.html
rename to jni/libsamplerate/doc/faq.html
diff --git a/jni/libsamplerate-0.1.8/doc/history.html b/jni/libsamplerate/doc/history.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/history.html
rename to jni/libsamplerate/doc/history.html
diff --git a/jni/libsamplerate-0.1.8/doc/index.html b/jni/libsamplerate/doc/index.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/index.html
rename to jni/libsamplerate/doc/index.html
diff --git a/jni/libsamplerate-0.1.8/doc/license.html b/jni/libsamplerate/doc/license.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/license.html
rename to jni/libsamplerate/doc/license.html
diff --git a/jni/libsamplerate-0.1.8/doc/lists.html b/jni/libsamplerate/doc/lists.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/lists.html
rename to jni/libsamplerate/doc/lists.html
diff --git a/jni/libsamplerate-0.1.8/doc/quality.html b/jni/libsamplerate/doc/quality.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/quality.html
rename to jni/libsamplerate/doc/quality.html
diff --git a/jni/libsamplerate-0.1.8/doc/win32.html b/jni/libsamplerate/doc/win32.html
similarity index 100%
rename from jni/libsamplerate-0.1.8/doc/win32.html
rename to jni/libsamplerate/doc/win32.html
diff --git a/jni/libsamplerate-0.1.8/examples/Makefile.am b/jni/libsamplerate/examples/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/Makefile.am
rename to jni/libsamplerate/examples/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/examples/Makefile.in b/jni/libsamplerate/examples/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/Makefile.in
rename to jni/libsamplerate/examples/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/examples/audio_out.c b/jni/libsamplerate/examples/audio_out.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/audio_out.c
rename to jni/libsamplerate/examples/audio_out.c
diff --git a/jni/libsamplerate-0.1.8/examples/audio_out.h b/jni/libsamplerate/examples/audio_out.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/audio_out.h
rename to jni/libsamplerate/examples/audio_out.h
diff --git a/jni/libsamplerate-0.1.8/examples/sndfile-resample.c b/jni/libsamplerate/examples/sndfile-resample.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/sndfile-resample.c
rename to jni/libsamplerate/examples/sndfile-resample.c
diff --git a/jni/libsamplerate-0.1.8/examples/timewarp-file.c b/jni/libsamplerate/examples/timewarp-file.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/timewarp-file.c
rename to jni/libsamplerate/examples/timewarp-file.c
diff --git a/jni/libsamplerate-0.1.8/examples/varispeed-play.c b/jni/libsamplerate/examples/varispeed-play.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/examples/varispeed-play.c
rename to jni/libsamplerate/examples/varispeed-play.c
diff --git a/jni/libsamplerate-0.1.8/libsamplerate.spec.in b/jni/libsamplerate/libsamplerate.spec.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/libsamplerate.spec.in
rename to jni/libsamplerate/libsamplerate.spec.in
diff --git a/jni/libsamplerate-0.1.8/samplerate.pc.in b/jni/libsamplerate/samplerate.pc.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/samplerate.pc.in
rename to jni/libsamplerate/samplerate.pc.in
diff --git a/jni/libsamplerate-0.1.8/src/Android.mk b/jni/libsamplerate/src/Android.mk
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/Android.mk
rename to jni/libsamplerate/src/Android.mk
diff --git a/jni/libsamplerate-0.1.8/src/Makefile.am b/jni/libsamplerate/src/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/Makefile.am
rename to jni/libsamplerate/src/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/src/Makefile.in b/jni/libsamplerate/src/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/Makefile.in
rename to jni/libsamplerate/src/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/src/Version_script.in b/jni/libsamplerate/src/Version_script.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/Version_script.in
rename to jni/libsamplerate/src/Version_script.in
diff --git a/jni/libsamplerate-0.1.8/src/check_asm.sh b/jni/libsamplerate/src/check_asm.sh
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/check_asm.sh
rename to jni/libsamplerate/src/check_asm.sh
diff --git a/jni/libsamplerate-0.1.8/src/common.h b/jni/libsamplerate/src/common.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/common.h
rename to jni/libsamplerate/src/common.h
diff --git a/jni/libsamplerate-0.1.8/src/config.h.in b/jni/libsamplerate/src/config.h.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/config.h.in
rename to jni/libsamplerate/src/config.h.in
diff --git a/jni/libsamplerate-0.1.8/src/fastest_coeffs.h b/jni/libsamplerate/src/fastest_coeffs.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/fastest_coeffs.h
rename to jni/libsamplerate/src/fastest_coeffs.h
diff --git a/jni/libsamplerate-0.1.8/src/float_cast.h b/jni/libsamplerate/src/float_cast.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/float_cast.h
rename to jni/libsamplerate/src/float_cast.h
diff --git a/jni/libsamplerate-0.1.8/src/high_qual_coeffs.h b/jni/libsamplerate/src/high_qual_coeffs.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/high_qual_coeffs.h
rename to jni/libsamplerate/src/high_qual_coeffs.h
diff --git a/jni/libsamplerate-0.1.8/src/mid_qual_coeffs.h b/jni/libsamplerate/src/mid_qual_coeffs.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/mid_qual_coeffs.h
rename to jni/libsamplerate/src/mid_qual_coeffs.h
diff --git a/jni/libsamplerate-0.1.8/src/samplerate.c b/jni/libsamplerate/src/samplerate.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/samplerate.c
rename to jni/libsamplerate/src/samplerate.c
diff --git a/jni/libsamplerate-0.1.8/src/samplerate.h b/jni/libsamplerate/src/samplerate.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/samplerate.h
rename to jni/libsamplerate/src/samplerate.h
diff --git a/jni/libsamplerate-0.1.8/src/src_linear.c b/jni/libsamplerate/src/src_linear.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/src_linear.c
rename to jni/libsamplerate/src/src_linear.c
diff --git a/jni/libsamplerate-0.1.8/src/src_sinc.c b/jni/libsamplerate/src/src_sinc.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/src_sinc.c
rename to jni/libsamplerate/src/src_sinc.c
diff --git a/jni/libsamplerate-0.1.8/src/src_zoh.c b/jni/libsamplerate/src/src_zoh.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/src/src_zoh.c
rename to jni/libsamplerate/src/src_zoh.c
diff --git a/jni/libsamplerate-0.1.8/tests/Makefile.am b/jni/libsamplerate/tests/Makefile.am
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/Makefile.am
rename to jni/libsamplerate/tests/Makefile.am
diff --git a/jni/libsamplerate-0.1.8/tests/Makefile.in b/jni/libsamplerate/tests/Makefile.in
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/Makefile.in
rename to jni/libsamplerate/tests/Makefile.in
diff --git a/jni/libsamplerate-0.1.8/tests/calc_snr.c b/jni/libsamplerate/tests/calc_snr.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/calc_snr.c
rename to jni/libsamplerate/tests/calc_snr.c
diff --git a/jni/libsamplerate-0.1.8/tests/callback_hang_test.c b/jni/libsamplerate/tests/callback_hang_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/callback_hang_test.c
rename to jni/libsamplerate/tests/callback_hang_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/callback_test.c b/jni/libsamplerate/tests/callback_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/callback_test.c
rename to jni/libsamplerate/tests/callback_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/downsample_test.c b/jni/libsamplerate/tests/downsample_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/downsample_test.c
rename to jni/libsamplerate/tests/downsample_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/float_short_test.c b/jni/libsamplerate/tests/float_short_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/float_short_test.c
rename to jni/libsamplerate/tests/float_short_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/misc_test.c b/jni/libsamplerate/tests/misc_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/misc_test.c
rename to jni/libsamplerate/tests/misc_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/multi_channel_test.c b/jni/libsamplerate/tests/multi_channel_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/multi_channel_test.c
rename to jni/libsamplerate/tests/multi_channel_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/multichan_throughput_test.c b/jni/libsamplerate/tests/multichan_throughput_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/multichan_throughput_test.c
rename to jni/libsamplerate/tests/multichan_throughput_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/reset_test.c b/jni/libsamplerate/tests/reset_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/reset_test.c
rename to jni/libsamplerate/tests/reset_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/simple_test.c b/jni/libsamplerate/tests/simple_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/simple_test.c
rename to jni/libsamplerate/tests/simple_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/snr_bw_test.c b/jni/libsamplerate/tests/snr_bw_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/snr_bw_test.c
rename to jni/libsamplerate/tests/snr_bw_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/src-evaluate.c b/jni/libsamplerate/tests/src-evaluate.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/src-evaluate.c
rename to jni/libsamplerate/tests/src-evaluate.c
diff --git a/jni/libsamplerate-0.1.8/tests/termination_test.c b/jni/libsamplerate/tests/termination_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/termination_test.c
rename to jni/libsamplerate/tests/termination_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/throughput_test.c b/jni/libsamplerate/tests/throughput_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/throughput_test.c
rename to jni/libsamplerate/tests/throughput_test.c
diff --git a/jni/libsamplerate-0.1.8/tests/util.c b/jni/libsamplerate/tests/util.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/util.c
rename to jni/libsamplerate/tests/util.c
diff --git a/jni/libsamplerate-0.1.8/tests/util.h b/jni/libsamplerate/tests/util.h
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/util.h
rename to jni/libsamplerate/tests/util.h
diff --git a/jni/libsamplerate-0.1.8/tests/varispeed_test.c b/jni/libsamplerate/tests/varispeed_test.c
similarity index 100%
rename from jni/libsamplerate-0.1.8/tests/varispeed_test.c
rename to jni/libsamplerate/tests/varispeed_test.c
diff --git a/jni/libsndfile-1.0.25/examples/generate.o b/jni/libsndfile-1.0.25/examples/generate.o
deleted file mode 100644
index a6cc497..0000000
--- a/jni/libsndfile-1.0.25/examples/generate.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/list_formats.o b/jni/libsndfile-1.0.25/examples/list_formats.o
deleted file mode 100644
index 3755632..0000000
--- a/jni/libsndfile-1.0.25/examples/list_formats.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/make_sine.o b/jni/libsndfile-1.0.25/examples/make_sine.o
deleted file mode 100644
index 98de895..0000000
--- a/jni/libsndfile-1.0.25/examples/make_sine.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/sfprocess.o b/jni/libsndfile-1.0.25/examples/sfprocess.o
deleted file mode 100644
index 36ad1db..0000000
--- a/jni/libsndfile-1.0.25/examples/sfprocess.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/sndfile-to-text.o b/jni/libsndfile-1.0.25/examples/sndfile-to-text.o
deleted file mode 100644
index 809a0db..0000000
--- a/jni/libsndfile-1.0.25/examples/sndfile-to-text.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/sndfilehandle.o b/jni/libsndfile-1.0.25/examples/sndfilehandle.o
deleted file mode 100644
index d818c28..0000000
--- a/jni/libsndfile-1.0.25/examples/sndfilehandle.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/common.o b/jni/libsndfile-1.0.25/programs/common.o
deleted file mode 100644
index 3540025..0000000
--- a/jni/libsndfile-1.0.25/programs/common.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-cmp.o b/jni/libsndfile-1.0.25/programs/sndfile-cmp.o
deleted file mode 100644
index 82b8784..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-cmp.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-concat.o b/jni/libsndfile-1.0.25/programs/sndfile-concat.o
deleted file mode 100644
index a51ee38..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-concat.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-convert.o b/jni/libsndfile-1.0.25/programs/sndfile-convert.o
deleted file mode 100644
index 26b4371..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-convert.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-deinterleave.o b/jni/libsndfile-1.0.25/programs/sndfile-deinterleave.o
deleted file mode 100644
index 6bcaa34..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-deinterleave.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-info.o b/jni/libsndfile-1.0.25/programs/sndfile-info.o
deleted file mode 100644
index 17b7468..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-info.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-interleave.o b/jni/libsndfile-1.0.25/programs/sndfile-interleave.o
deleted file mode 100644
index daf4c6c..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-interleave.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-get.o b/jni/libsndfile-1.0.25/programs/sndfile-metadata-get.o
deleted file mode 100644
index e5ccc3f..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-metadata-get.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-set.o b/jni/libsndfile-1.0.25/programs/sndfile-metadata-set.o
deleted file mode 100644
index dc0b0cd..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-metadata-set.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-play.o b/jni/libsndfile-1.0.25/programs/sndfile-play.o
deleted file mode 100644
index b0ba63c..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-play.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-salvage.o b/jni/libsndfile-1.0.25/programs/sndfile-salvage.o
deleted file mode 100644
index 0d067cd..0000000
--- a/jni/libsndfile-1.0.25/programs/sndfile-salvage.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/regtest/checksum.o b/jni/libsndfile-1.0.25/regtest/checksum.o
deleted file mode 100644
index c389523..0000000
--- a/jni/libsndfile-1.0.25/regtest/checksum.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/regtest/database.o b/jni/libsndfile-1.0.25/regtest/database.o
deleted file mode 100644
index f6a1bd8..0000000
--- a/jni/libsndfile-1.0.25/regtest/database.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/regtest/sndfile-regtest.o b/jni/libsndfile-1.0.25/regtest/sndfile-regtest.o
deleted file mode 100644
index 15fa410..0000000
--- a/jni/libsndfile-1.0.25/regtest/sndfile-regtest.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/aiff.o b/jni/libsndfile-1.0.25/src/.libs/aiff.o
deleted file mode 100644
index ccefb46..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/aiff.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/alaw.o b/jni/libsndfile-1.0.25/src/.libs/alaw.o
deleted file mode 100644
index 20352b7..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/alaw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/au.o b/jni/libsndfile-1.0.25/src/.libs/au.o
deleted file mode 100644
index d080826..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/au.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/audio_detect.o b/jni/libsndfile-1.0.25/src/.libs/audio_detect.o
deleted file mode 100644
index 4b0ac83..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/audio_detect.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/avr.o b/jni/libsndfile-1.0.25/src/.libs/avr.o
deleted file mode 100644
index 2086f80..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/avr.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/broadcast.o b/jni/libsndfile-1.0.25/src/.libs/broadcast.o
deleted file mode 100644
index ff10feb..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/broadcast.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/caf.o b/jni/libsndfile-1.0.25/src/.libs/caf.o
deleted file mode 100644
index f7e2c6e..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/caf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/chanmap.o b/jni/libsndfile-1.0.25/src/.libs/chanmap.o
deleted file mode 100644
index 9fdf482..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/chanmap.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/chunk.o b/jni/libsndfile-1.0.25/src/.libs/chunk.o
deleted file mode 100644
index b017fa7..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/chunk.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/command.o b/jni/libsndfile-1.0.25/src/.libs/command.o
deleted file mode 100644
index e0af80c..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/command.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/common.o b/jni/libsndfile-1.0.25/src/.libs/common.o
deleted file mode 100644
index e4af3ba..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/common.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/dither.o b/jni/libsndfile-1.0.25/src/.libs/dither.o
deleted file mode 100644
index fbe2210..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/dither.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/double64.o b/jni/libsndfile-1.0.25/src/.libs/double64.o
deleted file mode 100644
index fcf5a2d..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/double64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/dwd.o b/jni/libsndfile-1.0.25/src/.libs/dwd.o
deleted file mode 100644
index bbf4f53..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/dwd.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/dwvw.o b/jni/libsndfile-1.0.25/src/.libs/dwvw.o
deleted file mode 100644
index 78e59e4..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/dwvw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/file_io.o b/jni/libsndfile-1.0.25/src/.libs/file_io.o
deleted file mode 100644
index 5b4d298..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/file_io.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/flac.o b/jni/libsndfile-1.0.25/src/.libs/flac.o
deleted file mode 100644
index 6e714be..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/flac.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/float32.o b/jni/libsndfile-1.0.25/src/.libs/float32.o
deleted file mode 100644
index 45874f5..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/float32.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/g72x.o b/jni/libsndfile-1.0.25/src/.libs/g72x.o
deleted file mode 100644
index fc58640..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/g72x.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/gsm610.o b/jni/libsndfile-1.0.25/src/.libs/gsm610.o
deleted file mode 100644
index 11d133e..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/gsm610.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/htk.o b/jni/libsndfile-1.0.25/src/.libs/htk.o
deleted file mode 100644
index d7bdece..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/htk.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/id3.o b/jni/libsndfile-1.0.25/src/.libs/id3.o
deleted file mode 100644
index 2540047..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/id3.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ima_adpcm.o b/jni/libsndfile-1.0.25/src/.libs/ima_adpcm.o
deleted file mode 100644
index 2e3e9df..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ima_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ima_oki_adpcm.o b/jni/libsndfile-1.0.25/src/.libs/ima_oki_adpcm.o
deleted file mode 100644
index 22a34d7..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ima_oki_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/interleave.o b/jni/libsndfile-1.0.25/src/.libs/interleave.o
deleted file mode 100644
index 586d543..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/interleave.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ircam.o b/jni/libsndfile-1.0.25/src/.libs/ircam.o
deleted file mode 100644
index d335598..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ircam.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/macbinary3.o b/jni/libsndfile-1.0.25/src/.libs/macbinary3.o
deleted file mode 100644
index 185752d..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/macbinary3.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/macos.o b/jni/libsndfile-1.0.25/src/.libs/macos.o
deleted file mode 100644
index 70593a7..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/macos.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/mat4.o b/jni/libsndfile-1.0.25/src/.libs/mat4.o
deleted file mode 100644
index 2a8dc4d..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/mat4.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/mat5.o b/jni/libsndfile-1.0.25/src/.libs/mat5.o
deleted file mode 100644
index 0222bab..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/mat5.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/mpc2k.o b/jni/libsndfile-1.0.25/src/.libs/mpc2k.o
deleted file mode 100644
index 701f299..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/mpc2k.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ms_adpcm.o b/jni/libsndfile-1.0.25/src/.libs/ms_adpcm.o
deleted file mode 100644
index 8b4cad4..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ms_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/nist.o b/jni/libsndfile-1.0.25/src/.libs/nist.o
deleted file mode 100644
index 304a553..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/nist.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ogg.o b/jni/libsndfile-1.0.25/src/.libs/ogg.o
deleted file mode 100644
index 22be08b..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ogg.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ogg_pcm.o b/jni/libsndfile-1.0.25/src/.libs/ogg_pcm.o
deleted file mode 100644
index 178af8c..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ogg_pcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ogg_speex.o b/jni/libsndfile-1.0.25/src/.libs/ogg_speex.o
deleted file mode 100644
index 78bf60a..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ogg_speex.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ogg_vorbis.o b/jni/libsndfile-1.0.25/src/.libs/ogg_vorbis.o
deleted file mode 100644
index 5a1134f..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ogg_vorbis.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/paf.o b/jni/libsndfile-1.0.25/src/.libs/paf.o
deleted file mode 100644
index 382ad64..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/paf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/pcm.o b/jni/libsndfile-1.0.25/src/.libs/pcm.o
deleted file mode 100644
index 065a45c..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/pcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/pvf.o b/jni/libsndfile-1.0.25/src/.libs/pvf.o
deleted file mode 100644
index ef90507..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/pvf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/raw.o b/jni/libsndfile-1.0.25/src/.libs/raw.o
deleted file mode 100644
index 96aff43..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/raw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/rf64.o b/jni/libsndfile-1.0.25/src/.libs/rf64.o
deleted file mode 100644
index 00f1ea7..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/rf64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/rx2.o b/jni/libsndfile-1.0.25/src/.libs/rx2.o
deleted file mode 100644
index 344d66c..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/rx2.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/sd2.o b/jni/libsndfile-1.0.25/src/.libs/sd2.o
deleted file mode 100644
index 541aef9..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/sd2.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/sds.o b/jni/libsndfile-1.0.25/src/.libs/sds.o
deleted file mode 100644
index 49dac99..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/sds.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/sndfile.o b/jni/libsndfile-1.0.25/src/.libs/sndfile.o
deleted file mode 100644
index 0e02b32..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/sndfile.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/strings.o b/jni/libsndfile-1.0.25/src/.libs/strings.o
deleted file mode 100644
index b5cfe76..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/strings.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/svx.o b/jni/libsndfile-1.0.25/src/.libs/svx.o
deleted file mode 100644
index 171d3c1..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/svx.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/txw.o b/jni/libsndfile-1.0.25/src/.libs/txw.o
deleted file mode 100644
index 07fc6b1..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/txw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/ulaw.o b/jni/libsndfile-1.0.25/src/.libs/ulaw.o
deleted file mode 100644
index 50dd3ce..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/ulaw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/voc.o b/jni/libsndfile-1.0.25/src/.libs/voc.o
deleted file mode 100644
index 2007b28..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/voc.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/vox_adpcm.o b/jni/libsndfile-1.0.25/src/.libs/vox_adpcm.o
deleted file mode 100644
index 031dcf9..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/vox_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/w64.o b/jni/libsndfile-1.0.25/src/.libs/w64.o
deleted file mode 100644
index 7ede10b..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/w64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/wav.o b/jni/libsndfile-1.0.25/src/.libs/wav.o
deleted file mode 100644
index 3aa67e2..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/wav.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/wav_w64.o b/jni/libsndfile-1.0.25/src/.libs/wav_w64.o
deleted file mode 100644
index 1e8be78..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/wav_w64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/windows.o b/jni/libsndfile-1.0.25/src/.libs/windows.o
deleted file mode 100644
index ccd9b1f..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/windows.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/wve.o b/jni/libsndfile-1.0.25/src/.libs/wve.o
deleted file mode 100644
index 6828152..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/wve.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/xi.o b/jni/libsndfile-1.0.25/src/.libs/xi.o
deleted file mode 100644
index 871129d..0000000
--- a/jni/libsndfile-1.0.25/src/.libs/xi.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/g721.o b/jni/libsndfile-1.0.25/src/G72x/.libs/g721.o
deleted file mode 100644
index 1583c9f..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/.libs/g721.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_16.o b/jni/libsndfile-1.0.25/src/G72x/.libs/g723_16.o
deleted file mode 100644
index 0cabd81..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_16.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_24.o b/jni/libsndfile-1.0.25/src/G72x/.libs/g723_24.o
deleted file mode 100644
index d97a362..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_24.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_40.o b/jni/libsndfile-1.0.25/src/G72x/.libs/g723_40.o
deleted file mode 100644
index 614d183..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/.libs/g723_40.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/g72x.o b/jni/libsndfile-1.0.25/src/G72x/.libs/g72x.o
deleted file mode 100644
index aa35abf..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/.libs/g72x.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/g721.o b/jni/libsndfile-1.0.25/src/G72x/g721.o
deleted file mode 100644
index 00be76e..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/g721.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_16.o b/jni/libsndfile-1.0.25/src/G72x/g723_16.o
deleted file mode 100644
index 601dfa0..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/g723_16.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_24.o b/jni/libsndfile-1.0.25/src/G72x/g723_24.o
deleted file mode 100644
index f420014..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/g723_24.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_40.o b/jni/libsndfile-1.0.25/src/G72x/g723_40.o
deleted file mode 100644
index a41a6b6..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/g723_40.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x.o b/jni/libsndfile-1.0.25/src/G72x/g72x.o
deleted file mode 100644
index 3ce8025..0000000
--- a/jni/libsndfile-1.0.25/src/G72x/g72x.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/add.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/add.o
deleted file mode 100644
index 92fa6d5..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/add.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/code.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/code.o
deleted file mode 100644
index ec28da9..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/code.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/decode.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/decode.o
deleted file mode 100644
index 1395b85..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/decode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_create.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_create.o
deleted file mode 100644
index bae5258..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_create.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_decode.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_decode.o
deleted file mode 100644
index 509732a..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_decode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_destroy.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_destroy.o
deleted file mode 100644
index aa943bf..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_destroy.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_encode.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_encode.o
deleted file mode 100644
index 5c9b7c3..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_encode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_option.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_option.o
deleted file mode 100644
index aed87f1..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/gsm_option.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/long_term.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/long_term.o
deleted file mode 100644
index 571b4b3..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/long_term.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/lpc.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/lpc.o
deleted file mode 100644
index e93e780..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/lpc.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/preprocess.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/preprocess.o
deleted file mode 100644
index d7c8118..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/preprocess.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/rpe.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/rpe.o
deleted file mode 100644
index d90284c..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/rpe.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/short_term.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/short_term.o
deleted file mode 100644
index 21c036c..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/short_term.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/table.o b/jni/libsndfile-1.0.25/src/GSM610/.libs/table.o
deleted file mode 100644
index 04cb449..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/.libs/table.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/add.o b/jni/libsndfile-1.0.25/src/GSM610/add.o
deleted file mode 100644
index b8536c3..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/add.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/code.o b/jni/libsndfile-1.0.25/src/GSM610/code.o
deleted file mode 100644
index a8a626e..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/code.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/decode.o b/jni/libsndfile-1.0.25/src/GSM610/decode.o
deleted file mode 100644
index a51d445..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/decode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_create.o b/jni/libsndfile-1.0.25/src/GSM610/gsm_create.o
deleted file mode 100644
index c3885ee..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/gsm_create.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_decode.o b/jni/libsndfile-1.0.25/src/GSM610/gsm_decode.o
deleted file mode 100644
index 44ae5bc..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/gsm_decode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.o b/jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.o
deleted file mode 100644
index aa06fa6..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_encode.o b/jni/libsndfile-1.0.25/src/GSM610/gsm_encode.o
deleted file mode 100644
index 0d5e0d2..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/gsm_encode.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_option.o b/jni/libsndfile-1.0.25/src/GSM610/gsm_option.o
deleted file mode 100644
index 2c47e98..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/gsm_option.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/long_term.o b/jni/libsndfile-1.0.25/src/GSM610/long_term.o
deleted file mode 100644
index 885c89d..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/long_term.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/lpc.o b/jni/libsndfile-1.0.25/src/GSM610/lpc.o
deleted file mode 100644
index fe4f0d8..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/lpc.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/preprocess.o b/jni/libsndfile-1.0.25/src/GSM610/preprocess.o
deleted file mode 100644
index d00d22a..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/preprocess.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/rpe.o b/jni/libsndfile-1.0.25/src/GSM610/rpe.o
deleted file mode 100644
index 16efa23..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/rpe.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/short_term.o b/jni/libsndfile-1.0.25/src/GSM610/short_term.o
deleted file mode 100644
index 53fcee3..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/short_term.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/table.o b/jni/libsndfile-1.0.25/src/GSM610/table.o
deleted file mode 100644
index 00f8165..0000000
--- a/jni/libsndfile-1.0.25/src/GSM610/table.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/aiff.o b/jni/libsndfile-1.0.25/src/aiff.o
deleted file mode 100644
index 55f16ec..0000000
--- a/jni/libsndfile-1.0.25/src/aiff.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/alaw.o b/jni/libsndfile-1.0.25/src/alaw.o
deleted file mode 100644
index 8659679..0000000
--- a/jni/libsndfile-1.0.25/src/alaw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/au.o b/jni/libsndfile-1.0.25/src/au.o
deleted file mode 100644
index 5343fef..0000000
--- a/jni/libsndfile-1.0.25/src/au.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/audio_detect.o b/jni/libsndfile-1.0.25/src/audio_detect.o
deleted file mode 100644
index 8c5a207..0000000
--- a/jni/libsndfile-1.0.25/src/audio_detect.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/avr.o b/jni/libsndfile-1.0.25/src/avr.o
deleted file mode 100644
index 54809a4..0000000
--- a/jni/libsndfile-1.0.25/src/avr.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/broadcast.o b/jni/libsndfile-1.0.25/src/broadcast.o
deleted file mode 100644
index 7ba82f6..0000000
--- a/jni/libsndfile-1.0.25/src/broadcast.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/caf.o b/jni/libsndfile-1.0.25/src/caf.o
deleted file mode 100644
index 7440a23..0000000
--- a/jni/libsndfile-1.0.25/src/caf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/chanmap.o b/jni/libsndfile-1.0.25/src/chanmap.o
deleted file mode 100644
index 1ea23b2..0000000
--- a/jni/libsndfile-1.0.25/src/chanmap.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/chunk.o b/jni/libsndfile-1.0.25/src/chunk.o
deleted file mode 100644
index 63cb0ad..0000000
--- a/jni/libsndfile-1.0.25/src/chunk.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/command.o b/jni/libsndfile-1.0.25/src/command.o
deleted file mode 100644
index aa42c03..0000000
--- a/jni/libsndfile-1.0.25/src/command.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/common.o b/jni/libsndfile-1.0.25/src/common.o
deleted file mode 100644
index 13880f3..0000000
--- a/jni/libsndfile-1.0.25/src/common.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/dither.o b/jni/libsndfile-1.0.25/src/dither.o
deleted file mode 100644
index 2b4b41d..0000000
--- a/jni/libsndfile-1.0.25/src/dither.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/double64.o b/jni/libsndfile-1.0.25/src/double64.o
deleted file mode 100644
index d3f1765..0000000
--- a/jni/libsndfile-1.0.25/src/double64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/dwd.o b/jni/libsndfile-1.0.25/src/dwd.o
deleted file mode 100644
index 0e66c34..0000000
--- a/jni/libsndfile-1.0.25/src/dwd.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/dwvw.o b/jni/libsndfile-1.0.25/src/dwvw.o
deleted file mode 100644
index f09b031..0000000
--- a/jni/libsndfile-1.0.25/src/dwvw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/file_io.o b/jni/libsndfile-1.0.25/src/file_io.o
deleted file mode 100644
index 9c06876..0000000
--- a/jni/libsndfile-1.0.25/src/file_io.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/flac.o b/jni/libsndfile-1.0.25/src/flac.o
deleted file mode 100644
index 81d07fd..0000000
--- a/jni/libsndfile-1.0.25/src/flac.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/float32.o b/jni/libsndfile-1.0.25/src/float32.o
deleted file mode 100644
index 881c0af..0000000
--- a/jni/libsndfile-1.0.25/src/float32.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/g72x.o b/jni/libsndfile-1.0.25/src/g72x.o
deleted file mode 100644
index c98ba3a..0000000
--- a/jni/libsndfile-1.0.25/src/g72x.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/gsm610.o b/jni/libsndfile-1.0.25/src/gsm610.o
deleted file mode 100644
index 6ac2e2b..0000000
--- a/jni/libsndfile-1.0.25/src/gsm610.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/htk.o b/jni/libsndfile-1.0.25/src/htk.o
deleted file mode 100644
index 0799a95..0000000
--- a/jni/libsndfile-1.0.25/src/htk.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/id3.o b/jni/libsndfile-1.0.25/src/id3.o
deleted file mode 100644
index 217eda4..0000000
--- a/jni/libsndfile-1.0.25/src/id3.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ima_adpcm.o b/jni/libsndfile-1.0.25/src/ima_adpcm.o
deleted file mode 100644
index 625862c..0000000
--- a/jni/libsndfile-1.0.25/src/ima_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ima_oki_adpcm.o b/jni/libsndfile-1.0.25/src/ima_oki_adpcm.o
deleted file mode 100644
index b0c6fbd..0000000
--- a/jni/libsndfile-1.0.25/src/ima_oki_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/interleave.o b/jni/libsndfile-1.0.25/src/interleave.o
deleted file mode 100644
index 222cab4..0000000
--- a/jni/libsndfile-1.0.25/src/interleave.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ircam.o b/jni/libsndfile-1.0.25/src/ircam.o
deleted file mode 100644
index d802633..0000000
--- a/jni/libsndfile-1.0.25/src/ircam.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/macbinary3.o b/jni/libsndfile-1.0.25/src/macbinary3.o
deleted file mode 100644
index c982704..0000000
--- a/jni/libsndfile-1.0.25/src/macbinary3.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/macos.o b/jni/libsndfile-1.0.25/src/macos.o
deleted file mode 100644
index b89e5f0..0000000
--- a/jni/libsndfile-1.0.25/src/macos.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/mat4.o b/jni/libsndfile-1.0.25/src/mat4.o
deleted file mode 100644
index 9ac45c8..0000000
--- a/jni/libsndfile-1.0.25/src/mat4.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/mat5.o b/jni/libsndfile-1.0.25/src/mat5.o
deleted file mode 100644
index 1b9939a..0000000
--- a/jni/libsndfile-1.0.25/src/mat5.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/mpc2k.o b/jni/libsndfile-1.0.25/src/mpc2k.o
deleted file mode 100644
index a71b685..0000000
--- a/jni/libsndfile-1.0.25/src/mpc2k.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ms_adpcm.o b/jni/libsndfile-1.0.25/src/ms_adpcm.o
deleted file mode 100644
index 1a95e3c..0000000
--- a/jni/libsndfile-1.0.25/src/ms_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/nist.o b/jni/libsndfile-1.0.25/src/nist.o
deleted file mode 100644
index 2303003..0000000
--- a/jni/libsndfile-1.0.25/src/nist.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ogg.o b/jni/libsndfile-1.0.25/src/ogg.o
deleted file mode 100644
index 6a6ae49..0000000
--- a/jni/libsndfile-1.0.25/src/ogg.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ogg_pcm.o b/jni/libsndfile-1.0.25/src/ogg_pcm.o
deleted file mode 100644
index 9e47c55..0000000
--- a/jni/libsndfile-1.0.25/src/ogg_pcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ogg_speex.o b/jni/libsndfile-1.0.25/src/ogg_speex.o
deleted file mode 100644
index 7a8f9a2..0000000
--- a/jni/libsndfile-1.0.25/src/ogg_speex.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ogg_vorbis.o b/jni/libsndfile-1.0.25/src/ogg_vorbis.o
deleted file mode 100644
index 2bb4942..0000000
--- a/jni/libsndfile-1.0.25/src/ogg_vorbis.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/paf.o b/jni/libsndfile-1.0.25/src/paf.o
deleted file mode 100644
index 08aa5b6..0000000
--- a/jni/libsndfile-1.0.25/src/paf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/pcm.o b/jni/libsndfile-1.0.25/src/pcm.o
deleted file mode 100644
index e006889..0000000
--- a/jni/libsndfile-1.0.25/src/pcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/pvf.o b/jni/libsndfile-1.0.25/src/pvf.o
deleted file mode 100644
index 3c8fbc5..0000000
--- a/jni/libsndfile-1.0.25/src/pvf.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/raw.o b/jni/libsndfile-1.0.25/src/raw.o
deleted file mode 100644
index 2ec1372..0000000
--- a/jni/libsndfile-1.0.25/src/raw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/rf64.o b/jni/libsndfile-1.0.25/src/rf64.o
deleted file mode 100644
index 4fcb2dd..0000000
--- a/jni/libsndfile-1.0.25/src/rf64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/rx2.o b/jni/libsndfile-1.0.25/src/rx2.o
deleted file mode 100644
index 8768079..0000000
--- a/jni/libsndfile-1.0.25/src/rx2.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/sd2.o b/jni/libsndfile-1.0.25/src/sd2.o
deleted file mode 100644
index b274c1f..0000000
--- a/jni/libsndfile-1.0.25/src/sd2.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/sds.o b/jni/libsndfile-1.0.25/src/sds.o
deleted file mode 100644
index 3dd2eff..0000000
--- a/jni/libsndfile-1.0.25/src/sds.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/sndfile.o b/jni/libsndfile-1.0.25/src/sndfile.o
deleted file mode 100644
index 67c6c1f..0000000
--- a/jni/libsndfile-1.0.25/src/sndfile.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/strings.o b/jni/libsndfile-1.0.25/src/strings.o
deleted file mode 100644
index 9afaa1e..0000000
--- a/jni/libsndfile-1.0.25/src/strings.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/svx.o b/jni/libsndfile-1.0.25/src/svx.o
deleted file mode 100644
index a21a38b..0000000
--- a/jni/libsndfile-1.0.25/src/svx.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/txw.o b/jni/libsndfile-1.0.25/src/txw.o
deleted file mode 100644
index a09eb88..0000000
--- a/jni/libsndfile-1.0.25/src/txw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/ulaw.o b/jni/libsndfile-1.0.25/src/ulaw.o
deleted file mode 100644
index b0b5ade..0000000
--- a/jni/libsndfile-1.0.25/src/ulaw.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/voc.o b/jni/libsndfile-1.0.25/src/voc.o
deleted file mode 100644
index 2ef4acf..0000000
--- a/jni/libsndfile-1.0.25/src/voc.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/vox_adpcm.o b/jni/libsndfile-1.0.25/src/vox_adpcm.o
deleted file mode 100644
index d768d89..0000000
--- a/jni/libsndfile-1.0.25/src/vox_adpcm.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/w64.o b/jni/libsndfile-1.0.25/src/w64.o
deleted file mode 100644
index 5e21209..0000000
--- a/jni/libsndfile-1.0.25/src/w64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/wav.o b/jni/libsndfile-1.0.25/src/wav.o
deleted file mode 100644
index aebc48a..0000000
--- a/jni/libsndfile-1.0.25/src/wav.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/wav_w64.o b/jni/libsndfile-1.0.25/src/wav_w64.o
deleted file mode 100644
index 9779bcd..0000000
--- a/jni/libsndfile-1.0.25/src/wav_w64.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/windows.o b/jni/libsndfile-1.0.25/src/windows.o
deleted file mode 100644
index ccd9b1f..0000000
--- a/jni/libsndfile-1.0.25/src/windows.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/wve.o b/jni/libsndfile-1.0.25/src/wve.o
deleted file mode 100644
index c2d2991..0000000
--- a/jni/libsndfile-1.0.25/src/wve.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/xi.o b/jni/libsndfile-1.0.25/src/xi.o
deleted file mode 100644
index 19a1337..0000000
--- a/jni/libsndfile-1.0.25/src/xi.o
+++ /dev/null
Binary files differ
diff --git a/jni/libsndfile-1.0.25/AUTHORS b/jni/libsndfile/AUTHORS
similarity index 100%
rename from jni/libsndfile-1.0.25/AUTHORS
rename to jni/libsndfile/AUTHORS
diff --git a/jni/libsndfile-1.0.25/COPYING b/jni/libsndfile/COPYING
similarity index 100%
rename from jni/libsndfile-1.0.25/COPYING
rename to jni/libsndfile/COPYING
diff --git a/jni/libsndfile-1.0.25/Cfg/compile b/jni/libsndfile/Cfg/compile
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/compile
rename to jni/libsndfile/Cfg/compile
diff --git a/jni/libsndfile-1.0.25/Cfg/config.guess b/jni/libsndfile/Cfg/config.guess
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/config.guess
rename to jni/libsndfile/Cfg/config.guess
diff --git a/jni/libsndfile-1.0.25/Cfg/config.sub b/jni/libsndfile/Cfg/config.sub
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/config.sub
rename to jni/libsndfile/Cfg/config.sub
diff --git a/jni/libsndfile-1.0.25/Cfg/depcomp b/jni/libsndfile/Cfg/depcomp
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/depcomp
rename to jni/libsndfile/Cfg/depcomp
diff --git a/jni/libsndfile-1.0.25/Cfg/install-sh b/jni/libsndfile/Cfg/install-sh
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/install-sh
rename to jni/libsndfile/Cfg/install-sh
diff --git a/jni/libsndfile-1.0.25/Cfg/ltmain.sh b/jni/libsndfile/Cfg/ltmain.sh
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/ltmain.sh
rename to jni/libsndfile/Cfg/ltmain.sh
diff --git a/jni/libsndfile-1.0.25/Cfg/missing b/jni/libsndfile/Cfg/missing
similarity index 100%
rename from jni/libsndfile-1.0.25/Cfg/missing
rename to jni/libsndfile/Cfg/missing
diff --git a/jni/libsndfile-1.0.25/ChangeLog b/jni/libsndfile/ChangeLog
similarity index 100%
rename from jni/libsndfile-1.0.25/ChangeLog
rename to jni/libsndfile/ChangeLog
diff --git a/jni/libsndfile-1.0.25/INSTALL b/jni/libsndfile/INSTALL
similarity index 100%
rename from jni/libsndfile-1.0.25/INSTALL
rename to jni/libsndfile/INSTALL
diff --git a/jni/libsndfile-1.0.25/M4/Makefile b/jni/libsndfile/M4/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/Makefile
rename to jni/libsndfile/M4/Makefile
diff --git a/jni/libsndfile-1.0.25/M4/Makefile.am b/jni/libsndfile/M4/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/Makefile.am
rename to jni/libsndfile/M4/Makefile.am
diff --git a/jni/libsndfile-1.0.25/M4/Makefile.in b/jni/libsndfile/M4/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/Makefile.in
rename to jni/libsndfile/M4/Makefile.in
diff --git a/jni/libsndfile-1.0.25/M4/add_cflags.m4 b/jni/libsndfile/M4/add_cflags.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/add_cflags.m4
rename to jni/libsndfile/M4/add_cflags.m4
diff --git a/jni/libsndfile-1.0.25/M4/add_cxxflags.m4 b/jni/libsndfile/M4/add_cxxflags.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/add_cxxflags.m4
rename to jni/libsndfile/M4/add_cxxflags.m4
diff --git a/jni/libsndfile-1.0.25/M4/clip_mode.m4 b/jni/libsndfile/M4/clip_mode.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/clip_mode.m4
rename to jni/libsndfile/M4/clip_mode.m4
diff --git a/jni/libsndfile-1.0.25/M4/endian.m4 b/jni/libsndfile/M4/endian.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/endian.m4
rename to jni/libsndfile/M4/endian.m4
diff --git a/jni/libsndfile-1.0.25/M4/extra_largefile.m4 b/jni/libsndfile/M4/extra_largefile.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/extra_largefile.m4
rename to jni/libsndfile/M4/extra_largefile.m4
diff --git a/jni/libsndfile-1.0.25/M4/extra_pkg.m4 b/jni/libsndfile/M4/extra_pkg.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/extra_pkg.m4
rename to jni/libsndfile/M4/extra_pkg.m4
diff --git a/jni/libsndfile-1.0.25/M4/flexible_array.m4 b/jni/libsndfile/M4/flexible_array.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/flexible_array.m4
rename to jni/libsndfile/M4/flexible_array.m4
diff --git a/jni/libsndfile-1.0.25/M4/gcc_version.m4 b/jni/libsndfile/M4/gcc_version.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/gcc_version.m4
rename to jni/libsndfile/M4/gcc_version.m4
diff --git a/jni/libsndfile-1.0.25/M4/libtool.m4 b/jni/libsndfile/M4/libtool.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/libtool.m4
rename to jni/libsndfile/M4/libtool.m4
diff --git a/jni/libsndfile-1.0.25/M4/llrint.m4 b/jni/libsndfile/M4/llrint.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/llrint.m4
rename to jni/libsndfile/M4/llrint.m4
diff --git a/jni/libsndfile-1.0.25/M4/lrint.m4 b/jni/libsndfile/M4/lrint.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/lrint.m4
rename to jni/libsndfile/M4/lrint.m4
diff --git a/jni/libsndfile-1.0.25/M4/lrintf.m4 b/jni/libsndfile/M4/lrintf.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/lrintf.m4
rename to jni/libsndfile/M4/lrintf.m4
diff --git a/jni/libsndfile-1.0.25/M4/ltoptions.m4 b/jni/libsndfile/M4/ltoptions.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/ltoptions.m4
rename to jni/libsndfile/M4/ltoptions.m4
diff --git a/jni/libsndfile-1.0.25/M4/ltsugar.m4 b/jni/libsndfile/M4/ltsugar.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/ltsugar.m4
rename to jni/libsndfile/M4/ltsugar.m4
diff --git a/jni/libsndfile-1.0.25/M4/ltversion.m4 b/jni/libsndfile/M4/ltversion.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/ltversion.m4
rename to jni/libsndfile/M4/ltversion.m4
diff --git a/jni/libsndfile-1.0.25/M4/lt~obsolete.m4 b/jni/libsndfile/M4/lt~obsolete.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/lt~obsolete.m4
rename to jni/libsndfile/M4/lt~obsolete.m4
diff --git a/jni/libsndfile-1.0.25/M4/mkoctfile_version.m4 b/jni/libsndfile/M4/mkoctfile_version.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/mkoctfile_version.m4
rename to jni/libsndfile/M4/mkoctfile_version.m4
diff --git a/jni/libsndfile-1.0.25/M4/octave.m4 b/jni/libsndfile/M4/octave.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/M4/octave.m4
rename to jni/libsndfile/M4/octave.m4
diff --git a/jni/libsndfile-1.0.25/Makefile b/jni/libsndfile/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/Makefile
rename to jni/libsndfile/Makefile
diff --git a/jni/libsndfile-1.0.25/Makefile.am b/jni/libsndfile/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/Makefile.am
rename to jni/libsndfile/Makefile.am
diff --git a/jni/libsndfile-1.0.25/Makefile.in b/jni/libsndfile/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/Makefile.in
rename to jni/libsndfile/Makefile.in
diff --git a/jni/libsndfile-1.0.25/NEWS b/jni/libsndfile/NEWS
similarity index 100%
rename from jni/libsndfile-1.0.25/NEWS
rename to jni/libsndfile/NEWS
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile b/jni/libsndfile/Octave/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/Makefile
rename to jni/libsndfile/Octave/Makefile
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile.am b/jni/libsndfile/Octave/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/Makefile.am
rename to jni/libsndfile/Octave/Makefile.am
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile.in b/jni/libsndfile/Octave/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/Makefile.in
rename to jni/libsndfile/Octave/Makefile.in
diff --git a/jni/libsndfile-1.0.25/Octave/PKG_ADD b/jni/libsndfile/Octave/PKG_ADD
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/PKG_ADD
rename to jni/libsndfile/Octave/PKG_ADD
diff --git a/jni/libsndfile-1.0.25/Octave/octave_test.m b/jni/libsndfile/Octave/octave_test.m
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/octave_test.m
rename to jni/libsndfile/Octave/octave_test.m
diff --git a/jni/libsndfile-1.0.25/Octave/octave_test.sh b/jni/libsndfile/Octave/octave_test.sh
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/octave_test.sh
rename to jni/libsndfile/Octave/octave_test.sh
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile.cc b/jni/libsndfile/Octave/sndfile.cc
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/sndfile.cc
rename to jni/libsndfile/Octave/sndfile.cc
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_load.m b/jni/libsndfile/Octave/sndfile_load.m
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/sndfile_load.m
rename to jni/libsndfile/Octave/sndfile_load.m
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_play.m b/jni/libsndfile/Octave/sndfile_play.m
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/sndfile_play.m
rename to jni/libsndfile/Octave/sndfile_play.m
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_save.m b/jni/libsndfile/Octave/sndfile_save.m
similarity index 100%
rename from jni/libsndfile-1.0.25/Octave/sndfile_save.m
rename to jni/libsndfile/Octave/sndfile_save.m
diff --git a/jni/libsndfile-1.0.25/README b/jni/libsndfile/README
similarity index 100%
rename from jni/libsndfile-1.0.25/README
rename to jni/libsndfile/README
diff --git a/jni/libsndfile-1.0.25/Win32/Makefile b/jni/libsndfile/Win32/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/Win32/Makefile
rename to jni/libsndfile/Win32/Makefile
diff --git a/jni/libsndfile-1.0.25/Win32/Makefile.am b/jni/libsndfile/Win32/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/Win32/Makefile.am
rename to jni/libsndfile/Win32/Makefile.am
diff --git a/jni/libsndfile-1.0.25/Win32/Makefile.in b/jni/libsndfile/Win32/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/Win32/Makefile.in
rename to jni/libsndfile/Win32/Makefile.in
diff --git a/jni/libsndfile-1.0.25/Win32/README-precompiled-dll.txt b/jni/libsndfile/Win32/README-precompiled-dll.txt
similarity index 100%
rename from jni/libsndfile-1.0.25/Win32/README-precompiled-dll.txt
rename to jni/libsndfile/Win32/README-precompiled-dll.txt
diff --git a/jni/libsndfile-1.0.25/Win32/testprog.c b/jni/libsndfile/Win32/testprog.c
similarity index 100%
rename from jni/libsndfile-1.0.25/Win32/testprog.c
rename to jni/libsndfile/Win32/testprog.c
diff --git a/jni/libsndfile-1.0.25/aclocal.m4 b/jni/libsndfile/aclocal.m4
similarity index 100%
rename from jni/libsndfile-1.0.25/aclocal.m4
rename to jni/libsndfile/aclocal.m4
diff --git a/jni/libsndfile-1.0.25/build-test-tarball.mk b/jni/libsndfile/build-test-tarball.mk
similarity index 100%
rename from jni/libsndfile-1.0.25/build-test-tarball.mk
rename to jni/libsndfile/build-test-tarball.mk
diff --git a/jni/libsndfile-1.0.25/build-test-tarball.mk.in b/jni/libsndfile/build-test-tarball.mk.in
similarity index 100%
rename from jni/libsndfile-1.0.25/build-test-tarball.mk.in
rename to jni/libsndfile/build-test-tarball.mk.in
diff --git a/jni/libsndfile-1.0.25/config.log b/jni/libsndfile/config.log
similarity index 100%
rename from jni/libsndfile-1.0.25/config.log
rename to jni/libsndfile/config.log
diff --git a/jni/libsndfile-1.0.25/config.status b/jni/libsndfile/config.status
similarity index 100%
rename from jni/libsndfile-1.0.25/config.status
rename to jni/libsndfile/config.status
diff --git a/jni/libsndfile-1.0.25/configure b/jni/libsndfile/configure
similarity index 100%
rename from jni/libsndfile-1.0.25/configure
rename to jni/libsndfile/configure
diff --git a/jni/libsndfile-1.0.25/configure.ac b/jni/libsndfile/configure.ac
similarity index 100%
rename from jni/libsndfile-1.0.25/configure.ac
rename to jni/libsndfile/configure.ac
diff --git a/jni/libsndfile-1.0.25/doc/AUTHORS b/jni/libsndfile/doc/AUTHORS
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/AUTHORS
rename to jni/libsndfile/doc/AUTHORS
diff --git a/jni/libsndfile-1.0.25/doc/ChangeLog b/jni/libsndfile/doc/ChangeLog
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/ChangeLog
rename to jni/libsndfile/doc/ChangeLog
diff --git a/jni/libsndfile-1.0.25/doc/FAQ.html b/jni/libsndfile/doc/FAQ.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/FAQ.html
rename to jni/libsndfile/doc/FAQ.html
diff --git a/jni/libsndfile-1.0.25/doc/Makefile b/jni/libsndfile/doc/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/Makefile
rename to jni/libsndfile/doc/Makefile
diff --git a/jni/libsndfile-1.0.25/doc/Makefile.am b/jni/libsndfile/doc/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/Makefile.am
rename to jni/libsndfile/doc/Makefile.am
diff --git a/jni/libsndfile-1.0.25/doc/Makefile.in b/jni/libsndfile/doc/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/Makefile.in
rename to jni/libsndfile/doc/Makefile.in
diff --git a/jni/libsndfile-1.0.25/doc/NEWS b/jni/libsndfile/doc/NEWS
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/NEWS
rename to jni/libsndfile/doc/NEWS
diff --git a/jni/libsndfile-1.0.25/doc/README b/jni/libsndfile/doc/README
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/README
rename to jni/libsndfile/doc/README
diff --git a/jni/libsndfile-1.0.25/doc/api.html b/jni/libsndfile/doc/api.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/api.html
rename to jni/libsndfile/doc/api.html
diff --git a/jni/libsndfile-1.0.25/doc/bugs.html b/jni/libsndfile/doc/bugs.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/bugs.html
rename to jni/libsndfile/doc/bugs.html
diff --git a/jni/libsndfile-1.0.25/doc/command.html b/jni/libsndfile/doc/command.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/command.html
rename to jni/libsndfile/doc/command.html
diff --git a/jni/libsndfile-1.0.25/doc/dither.html b/jni/libsndfile/doc/dither.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/dither.html
rename to jni/libsndfile/doc/dither.html
diff --git a/jni/libsndfile-1.0.25/doc/embedded_files.html b/jni/libsndfile/doc/embedded_files.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/embedded_files.html
rename to jni/libsndfile/doc/embedded_files.html
diff --git a/jni/libsndfile-1.0.25/doc/index.html b/jni/libsndfile/doc/index.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/index.html
rename to jni/libsndfile/doc/index.html
diff --git a/jni/libsndfile-1.0.25/doc/libsndfile.css b/jni/libsndfile/doc/libsndfile.css
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/libsndfile.css
rename to jni/libsndfile/doc/libsndfile.css
diff --git a/jni/libsndfile-1.0.25/doc/libsndfile.css.in b/jni/libsndfile/doc/libsndfile.css.in
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/libsndfile.css.in
rename to jni/libsndfile/doc/libsndfile.css.in
diff --git a/jni/libsndfile-1.0.25/doc/libsndfile.jpg b/jni/libsndfile/doc/libsndfile.jpg
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/libsndfile.jpg
rename to jni/libsndfile/doc/libsndfile.jpg
Binary files differ
diff --git a/jni/libsndfile-1.0.25/doc/lists.html b/jni/libsndfile/doc/lists.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/lists.html
rename to jni/libsndfile/doc/lists.html
diff --git a/jni/libsndfile-1.0.25/doc/new_file_type.HOWTO b/jni/libsndfile/doc/new_file_type.HOWTO
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/new_file_type.HOWTO
rename to jni/libsndfile/doc/new_file_type.HOWTO
diff --git a/jni/libsndfile-1.0.25/doc/octave.html b/jni/libsndfile/doc/octave.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/octave.html
rename to jni/libsndfile/doc/octave.html
diff --git a/jni/libsndfile-1.0.25/doc/pkgconfig.html b/jni/libsndfile/doc/pkgconfig.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/pkgconfig.html
rename to jni/libsndfile/doc/pkgconfig.html
diff --git a/jni/libsndfile-1.0.25/doc/sndfile_info.html b/jni/libsndfile/doc/sndfile_info.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/sndfile_info.html
rename to jni/libsndfile/doc/sndfile_info.html
diff --git a/jni/libsndfile-1.0.25/doc/tutorial.html b/jni/libsndfile/doc/tutorial.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/tutorial.html
rename to jni/libsndfile/doc/tutorial.html
diff --git a/jni/libsndfile-1.0.25/doc/win32.html b/jni/libsndfile/doc/win32.html
similarity index 100%
rename from jni/libsndfile-1.0.25/doc/win32.html
rename to jni/libsndfile/doc/win32.html
diff --git a/jni/libsndfile-1.0.25/examples/.deps/generate.Po b/jni/libsndfile/examples/.deps/generate.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/generate.Po
rename to jni/libsndfile/examples/.deps/generate.Po
diff --git a/jni/libsndfile-1.0.25/examples/.deps/list_formats.Po b/jni/libsndfile/examples/.deps/list_formats.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/list_formats.Po
rename to jni/libsndfile/examples/.deps/list_formats.Po
diff --git a/jni/libsndfile-1.0.25/examples/.deps/make_sine.Po b/jni/libsndfile/examples/.deps/make_sine.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/make_sine.Po
rename to jni/libsndfile/examples/.deps/make_sine.Po
diff --git a/jni/libsndfile-1.0.25/examples/.deps/sfprocess.Po b/jni/libsndfile/examples/.deps/sfprocess.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/sfprocess.Po
rename to jni/libsndfile/examples/.deps/sfprocess.Po
diff --git a/jni/libsndfile-1.0.25/examples/.deps/sndfile-to-text.Po b/jni/libsndfile/examples/.deps/sndfile-to-text.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/sndfile-to-text.Po
rename to jni/libsndfile/examples/.deps/sndfile-to-text.Po
diff --git a/jni/libsndfile-1.0.25/examples/.deps/sndfilehandle.Po b/jni/libsndfile/examples/.deps/sndfilehandle.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.deps/sndfilehandle.Po
rename to jni/libsndfile/examples/.deps/sndfilehandle.Po
diff --git a/jni/libsndfile-1.0.25/examples/.libs/generate b/jni/libsndfile/examples/.libs/generate
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/generate
rename to jni/libsndfile/examples/.libs/generate
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/.libs/list_formats b/jni/libsndfile/examples/.libs/list_formats
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/list_formats
rename to jni/libsndfile/examples/.libs/list_formats
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/.libs/make_sine b/jni/libsndfile/examples/.libs/make_sine
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/make_sine
rename to jni/libsndfile/examples/.libs/make_sine
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/.libs/sfprocess b/jni/libsndfile/examples/.libs/sfprocess
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/sfprocess
rename to jni/libsndfile/examples/.libs/sfprocess
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/.libs/sndfile-to-text b/jni/libsndfile/examples/.libs/sndfile-to-text
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/sndfile-to-text
rename to jni/libsndfile/examples/.libs/sndfile-to-text
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/.libs/sndfilehandle b/jni/libsndfile/examples/.libs/sndfilehandle
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/.libs/sndfilehandle
rename to jni/libsndfile/examples/.libs/sndfilehandle
Binary files differ
diff --git a/jni/libsndfile-1.0.25/examples/Makefile b/jni/libsndfile/examples/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/Makefile
rename to jni/libsndfile/examples/Makefile
diff --git a/jni/libsndfile-1.0.25/examples/Makefile.am b/jni/libsndfile/examples/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/Makefile.am
rename to jni/libsndfile/examples/Makefile.am
diff --git a/jni/libsndfile-1.0.25/examples/Makefile.in b/jni/libsndfile/examples/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/Makefile.in
rename to jni/libsndfile/examples/Makefile.in
diff --git a/jni/libsndfile-1.0.25/examples/generate b/jni/libsndfile/examples/generate
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/generate
rename to jni/libsndfile/examples/generate
diff --git a/jni/libsndfile-1.0.25/examples/generate.c b/jni/libsndfile/examples/generate.c
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/generate.c
rename to jni/libsndfile/examples/generate.c
diff --git a/jni/libsndfile-1.0.25/examples/list_formats b/jni/libsndfile/examples/list_formats
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/list_formats
rename to jni/libsndfile/examples/list_formats
diff --git a/jni/libsndfile-1.0.25/examples/list_formats.c b/jni/libsndfile/examples/list_formats.c
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/list_formats.c
rename to jni/libsndfile/examples/list_formats.c
diff --git a/jni/libsndfile-1.0.25/examples/make_sine b/jni/libsndfile/examples/make_sine
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/make_sine
rename to jni/libsndfile/examples/make_sine
diff --git a/jni/libsndfile-1.0.25/examples/make_sine.c b/jni/libsndfile/examples/make_sine.c
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/make_sine.c
rename to jni/libsndfile/examples/make_sine.c
diff --git a/jni/libsndfile-1.0.25/examples/sfprocess b/jni/libsndfile/examples/sfprocess
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sfprocess
rename to jni/libsndfile/examples/sfprocess
diff --git a/jni/libsndfile-1.0.25/examples/sfprocess.c b/jni/libsndfile/examples/sfprocess.c
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sfprocess.c
rename to jni/libsndfile/examples/sfprocess.c
diff --git a/jni/libsndfile-1.0.25/examples/sndfile-to-text b/jni/libsndfile/examples/sndfile-to-text
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sndfile-to-text
rename to jni/libsndfile/examples/sndfile-to-text
diff --git a/jni/libsndfile-1.0.25/examples/sndfile-to-text.c b/jni/libsndfile/examples/sndfile-to-text.c
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sndfile-to-text.c
rename to jni/libsndfile/examples/sndfile-to-text.c
diff --git a/jni/libsndfile-1.0.25/examples/sndfilehandle b/jni/libsndfile/examples/sndfilehandle
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sndfilehandle
rename to jni/libsndfile/examples/sndfilehandle
diff --git a/jni/libsndfile-1.0.25/examples/sndfilehandle.cc b/jni/libsndfile/examples/sndfilehandle.cc
similarity index 100%
rename from jni/libsndfile-1.0.25/examples/sndfilehandle.cc
rename to jni/libsndfile/examples/sndfilehandle.cc
diff --git a/jni/libsndfile-1.0.25/libsndfile.spec b/jni/libsndfile/libsndfile.spec
similarity index 100%
rename from jni/libsndfile-1.0.25/libsndfile.spec
rename to jni/libsndfile/libsndfile.spec
diff --git a/jni/libsndfile-1.0.25/libsndfile.spec.in b/jni/libsndfile/libsndfile.spec.in
similarity index 100%
rename from jni/libsndfile-1.0.25/libsndfile.spec.in
rename to jni/libsndfile/libsndfile.spec.in
diff --git a/jni/libsndfile-1.0.25/libtool b/jni/libsndfile/libtool
similarity index 100%
rename from jni/libsndfile-1.0.25/libtool
rename to jni/libsndfile/libtool
diff --git a/jni/libsndfile-1.0.25/man/Makefile b/jni/libsndfile/man/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/man/Makefile
rename to jni/libsndfile/man/Makefile
diff --git a/jni/libsndfile-1.0.25/man/Makefile.am b/jni/libsndfile/man/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/man/Makefile.am
rename to jni/libsndfile/man/Makefile.am
diff --git a/jni/libsndfile-1.0.25/man/Makefile.in b/jni/libsndfile/man/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/man/Makefile.in
rename to jni/libsndfile/man/Makefile.in
diff --git a/jni/libsndfile-1.0.25/man/sndfile-cmp.1 b/jni/libsndfile/man/sndfile-cmp.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-cmp.1
rename to jni/libsndfile/man/sndfile-cmp.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-concat.1 b/jni/libsndfile/man/sndfile-concat.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-concat.1
rename to jni/libsndfile/man/sndfile-concat.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-convert.1 b/jni/libsndfile/man/sndfile-convert.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-convert.1
rename to jni/libsndfile/man/sndfile-convert.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-deinterleave.1 b/jni/libsndfile/man/sndfile-deinterleave.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-deinterleave.1
rename to jni/libsndfile/man/sndfile-deinterleave.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-info.1 b/jni/libsndfile/man/sndfile-info.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-info.1
rename to jni/libsndfile/man/sndfile-info.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-interleave.1 b/jni/libsndfile/man/sndfile-interleave.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-interleave.1
rename to jni/libsndfile/man/sndfile-interleave.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-metadata-get.1 b/jni/libsndfile/man/sndfile-metadata-get.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-metadata-get.1
rename to jni/libsndfile/man/sndfile-metadata-get.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-metadata-set.1 b/jni/libsndfile/man/sndfile-metadata-set.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-metadata-set.1
rename to jni/libsndfile/man/sndfile-metadata-set.1
diff --git a/jni/libsndfile-1.0.25/man/sndfile-play.1 b/jni/libsndfile/man/sndfile-play.1
similarity index 100%
rename from jni/libsndfile-1.0.25/man/sndfile-play.1
rename to jni/libsndfile/man/sndfile-play.1
diff --git a/jni/libsndfile-1.0.25/programs/.deps/common.Po b/jni/libsndfile/programs/.deps/common.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/common.Po
rename to jni/libsndfile/programs/.deps/common.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-cmp.Po b/jni/libsndfile/programs/.deps/sndfile-cmp.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-cmp.Po
rename to jni/libsndfile/programs/.deps/sndfile-cmp.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-concat.Po b/jni/libsndfile/programs/.deps/sndfile-concat.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-concat.Po
rename to jni/libsndfile/programs/.deps/sndfile-concat.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-convert.Po b/jni/libsndfile/programs/.deps/sndfile-convert.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-convert.Po
rename to jni/libsndfile/programs/.deps/sndfile-convert.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-deinterleave.Po b/jni/libsndfile/programs/.deps/sndfile-deinterleave.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-deinterleave.Po
rename to jni/libsndfile/programs/.deps/sndfile-deinterleave.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-info.Po b/jni/libsndfile/programs/.deps/sndfile-info.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-info.Po
rename to jni/libsndfile/programs/.deps/sndfile-info.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-interleave.Po b/jni/libsndfile/programs/.deps/sndfile-interleave.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-interleave.Po
rename to jni/libsndfile/programs/.deps/sndfile-interleave.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-metadata-get.Po b/jni/libsndfile/programs/.deps/sndfile-metadata-get.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-metadata-get.Po
rename to jni/libsndfile/programs/.deps/sndfile-metadata-get.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-metadata-set.Po b/jni/libsndfile/programs/.deps/sndfile-metadata-set.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-metadata-set.Po
rename to jni/libsndfile/programs/.deps/sndfile-metadata-set.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-play.Po b/jni/libsndfile/programs/.deps/sndfile-play.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-play.Po
rename to jni/libsndfile/programs/.deps/sndfile-play.Po
diff --git a/jni/libsndfile-1.0.25/programs/.deps/sndfile-salvage.Po b/jni/libsndfile/programs/.deps/sndfile-salvage.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.deps/sndfile-salvage.Po
rename to jni/libsndfile/programs/.deps/sndfile-salvage.Po
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-cmp b/jni/libsndfile/programs/.libs/sndfile-cmp
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-cmp
rename to jni/libsndfile/programs/.libs/sndfile-cmp
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-concat b/jni/libsndfile/programs/.libs/sndfile-concat
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-concat
rename to jni/libsndfile/programs/.libs/sndfile-concat
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-convert b/jni/libsndfile/programs/.libs/sndfile-convert
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-convert
rename to jni/libsndfile/programs/.libs/sndfile-convert
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-deinterleave b/jni/libsndfile/programs/.libs/sndfile-deinterleave
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-deinterleave
rename to jni/libsndfile/programs/.libs/sndfile-deinterleave
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-info b/jni/libsndfile/programs/.libs/sndfile-info
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-info
rename to jni/libsndfile/programs/.libs/sndfile-info
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-interleave b/jni/libsndfile/programs/.libs/sndfile-interleave
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-interleave
rename to jni/libsndfile/programs/.libs/sndfile-interleave
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-metadata-get b/jni/libsndfile/programs/.libs/sndfile-metadata-get
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-metadata-get
rename to jni/libsndfile/programs/.libs/sndfile-metadata-get
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-metadata-set b/jni/libsndfile/programs/.libs/sndfile-metadata-set
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-metadata-set
rename to jni/libsndfile/programs/.libs/sndfile-metadata-set
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-play b/jni/libsndfile/programs/.libs/sndfile-play
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-play
rename to jni/libsndfile/programs/.libs/sndfile-play
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/.libs/sndfile-salvage b/jni/libsndfile/programs/.libs/sndfile-salvage
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/.libs/sndfile-salvage
rename to jni/libsndfile/programs/.libs/sndfile-salvage
Binary files differ
diff --git a/jni/libsndfile-1.0.25/programs/Makefile b/jni/libsndfile/programs/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/Makefile
rename to jni/libsndfile/programs/Makefile
diff --git a/jni/libsndfile-1.0.25/programs/Makefile.am b/jni/libsndfile/programs/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/Makefile.am
rename to jni/libsndfile/programs/Makefile.am
diff --git a/jni/libsndfile-1.0.25/programs/Makefile.in b/jni/libsndfile/programs/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/Makefile.in
rename to jni/libsndfile/programs/Makefile.in
diff --git a/jni/libsndfile-1.0.25/programs/common.c b/jni/libsndfile/programs/common.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/common.c
rename to jni/libsndfile/programs/common.c
diff --git a/jni/libsndfile-1.0.25/programs/common.h b/jni/libsndfile/programs/common.h
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/common.h
rename to jni/libsndfile/programs/common.h
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-cmp b/jni/libsndfile/programs/sndfile-cmp
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-cmp
rename to jni/libsndfile/programs/sndfile-cmp
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-cmp.c b/jni/libsndfile/programs/sndfile-cmp.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-cmp.c
rename to jni/libsndfile/programs/sndfile-cmp.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-concat b/jni/libsndfile/programs/sndfile-concat
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-concat
rename to jni/libsndfile/programs/sndfile-concat
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-concat.c b/jni/libsndfile/programs/sndfile-concat.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-concat.c
rename to jni/libsndfile/programs/sndfile-concat.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-convert b/jni/libsndfile/programs/sndfile-convert
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-convert
rename to jni/libsndfile/programs/sndfile-convert
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-convert.c b/jni/libsndfile/programs/sndfile-convert.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-convert.c
rename to jni/libsndfile/programs/sndfile-convert.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-deinterleave b/jni/libsndfile/programs/sndfile-deinterleave
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-deinterleave
rename to jni/libsndfile/programs/sndfile-deinterleave
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-deinterleave.c b/jni/libsndfile/programs/sndfile-deinterleave.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-deinterleave.c
rename to jni/libsndfile/programs/sndfile-deinterleave.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-info b/jni/libsndfile/programs/sndfile-info
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-info
rename to jni/libsndfile/programs/sndfile-info
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-info.c b/jni/libsndfile/programs/sndfile-info.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-info.c
rename to jni/libsndfile/programs/sndfile-info.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-interleave b/jni/libsndfile/programs/sndfile-interleave
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-interleave
rename to jni/libsndfile/programs/sndfile-interleave
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-interleave.c b/jni/libsndfile/programs/sndfile-interleave.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-interleave.c
rename to jni/libsndfile/programs/sndfile-interleave.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-get b/jni/libsndfile/programs/sndfile-metadata-get
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-metadata-get
rename to jni/libsndfile/programs/sndfile-metadata-get
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-get.c b/jni/libsndfile/programs/sndfile-metadata-get.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-metadata-get.c
rename to jni/libsndfile/programs/sndfile-metadata-get.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-set b/jni/libsndfile/programs/sndfile-metadata-set
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-metadata-set
rename to jni/libsndfile/programs/sndfile-metadata-set
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-metadata-set.c b/jni/libsndfile/programs/sndfile-metadata-set.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-metadata-set.c
rename to jni/libsndfile/programs/sndfile-metadata-set.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-play b/jni/libsndfile/programs/sndfile-play
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-play
rename to jni/libsndfile/programs/sndfile-play
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-play-beos.cpp b/jni/libsndfile/programs/sndfile-play-beos.cpp
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-play-beos.cpp
rename to jni/libsndfile/programs/sndfile-play-beos.cpp
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-play.c b/jni/libsndfile/programs/sndfile-play.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-play.c
rename to jni/libsndfile/programs/sndfile-play.c
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-salvage b/jni/libsndfile/programs/sndfile-salvage
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-salvage
rename to jni/libsndfile/programs/sndfile-salvage
diff --git a/jni/libsndfile-1.0.25/programs/sndfile-salvage.c b/jni/libsndfile/programs/sndfile-salvage.c
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/sndfile-salvage.c
rename to jni/libsndfile/programs/sndfile-salvage.c
diff --git a/jni/libsndfile-1.0.25/programs/test-sndfile-metadata-set.py b/jni/libsndfile/programs/test-sndfile-metadata-set.py
similarity index 100%
rename from jni/libsndfile-1.0.25/programs/test-sndfile-metadata-set.py
rename to jni/libsndfile/programs/test-sndfile-metadata-set.py
diff --git a/jni/libsndfile-1.0.25/regtest/.deps/checksum.Po b/jni/libsndfile/regtest/.deps/checksum.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/.deps/checksum.Po
rename to jni/libsndfile/regtest/.deps/checksum.Po
diff --git a/jni/libsndfile-1.0.25/regtest/.deps/database.Po b/jni/libsndfile/regtest/.deps/database.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/.deps/database.Po
rename to jni/libsndfile/regtest/.deps/database.Po
diff --git a/jni/libsndfile-1.0.25/regtest/.deps/sndfile-regtest.Po b/jni/libsndfile/regtest/.deps/sndfile-regtest.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/.deps/sndfile-regtest.Po
rename to jni/libsndfile/regtest/.deps/sndfile-regtest.Po
diff --git a/jni/libsndfile-1.0.25/regtest/.libs/sndfile-regtest b/jni/libsndfile/regtest/.libs/sndfile-regtest
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/.libs/sndfile-regtest
rename to jni/libsndfile/regtest/.libs/sndfile-regtest
Binary files differ
diff --git a/jni/libsndfile-1.0.25/regtest/Makefile b/jni/libsndfile/regtest/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/Makefile
rename to jni/libsndfile/regtest/Makefile
diff --git a/jni/libsndfile-1.0.25/regtest/Makefile.am b/jni/libsndfile/regtest/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/Makefile.am
rename to jni/libsndfile/regtest/Makefile.am
diff --git a/jni/libsndfile-1.0.25/regtest/Makefile.in b/jni/libsndfile/regtest/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/Makefile.in
rename to jni/libsndfile/regtest/Makefile.in
diff --git a/jni/libsndfile-1.0.25/regtest/checksum.c b/jni/libsndfile/regtest/checksum.c
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/checksum.c
rename to jni/libsndfile/regtest/checksum.c
diff --git a/jni/libsndfile-1.0.25/regtest/database.c b/jni/libsndfile/regtest/database.c
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/database.c
rename to jni/libsndfile/regtest/database.c
diff --git a/jni/libsndfile-1.0.25/regtest/regtest.h b/jni/libsndfile/regtest/regtest.h
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/regtest.h
rename to jni/libsndfile/regtest/regtest.h
diff --git a/jni/libsndfile-1.0.25/regtest/sndfile-regtest b/jni/libsndfile/regtest/sndfile-regtest
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/sndfile-regtest
rename to jni/libsndfile/regtest/sndfile-regtest
diff --git a/jni/libsndfile-1.0.25/regtest/sndfile-regtest.c b/jni/libsndfile/regtest/sndfile-regtest.c
similarity index 100%
rename from jni/libsndfile-1.0.25/regtest/sndfile-regtest.c
rename to jni/libsndfile/regtest/sndfile-regtest.c
diff --git a/jni/libsndfile-1.0.25/sndfile.pc b/jni/libsndfile/sndfile.pc
similarity index 100%
rename from jni/libsndfile-1.0.25/sndfile.pc
rename to jni/libsndfile/sndfile.pc
diff --git a/jni/libsndfile-1.0.25/sndfile.pc.in b/jni/libsndfile/sndfile.pc.in
similarity index 100%
rename from jni/libsndfile-1.0.25/sndfile.pc.in
rename to jni/libsndfile/sndfile.pc.in
diff --git a/jni/libsndfile-1.0.25/src/.deps/aiff.Plo b/jni/libsndfile/src/.deps/aiff.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/aiff.Plo
rename to jni/libsndfile/src/.deps/aiff.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/alaw.Plo b/jni/libsndfile/src/.deps/alaw.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/alaw.Plo
rename to jni/libsndfile/src/.deps/alaw.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/au.Plo b/jni/libsndfile/src/.deps/au.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/au.Plo
rename to jni/libsndfile/src/.deps/au.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/audio_detect.Plo b/jni/libsndfile/src/.deps/audio_detect.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/audio_detect.Plo
rename to jni/libsndfile/src/.deps/audio_detect.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/avr.Plo b/jni/libsndfile/src/.deps/avr.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/avr.Plo
rename to jni/libsndfile/src/.deps/avr.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/broadcast.Plo b/jni/libsndfile/src/.deps/broadcast.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/broadcast.Plo
rename to jni/libsndfile/src/.deps/broadcast.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/caf.Plo b/jni/libsndfile/src/.deps/caf.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/caf.Plo
rename to jni/libsndfile/src/.deps/caf.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/chanmap.Plo b/jni/libsndfile/src/.deps/chanmap.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/chanmap.Plo
rename to jni/libsndfile/src/.deps/chanmap.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/chunk.Plo b/jni/libsndfile/src/.deps/chunk.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/chunk.Plo
rename to jni/libsndfile/src/.deps/chunk.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/command.Plo b/jni/libsndfile/src/.deps/command.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/command.Plo
rename to jni/libsndfile/src/.deps/command.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/common.Plo b/jni/libsndfile/src/.deps/common.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/common.Plo
rename to jni/libsndfile/src/.deps/common.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/dither.Plo b/jni/libsndfile/src/.deps/dither.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/dither.Plo
rename to jni/libsndfile/src/.deps/dither.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/double64.Plo b/jni/libsndfile/src/.deps/double64.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/double64.Plo
rename to jni/libsndfile/src/.deps/double64.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/dwd.Plo b/jni/libsndfile/src/.deps/dwd.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/dwd.Plo
rename to jni/libsndfile/src/.deps/dwd.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/dwvw.Plo b/jni/libsndfile/src/.deps/dwvw.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/dwvw.Plo
rename to jni/libsndfile/src/.deps/dwvw.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/file_io.Plo b/jni/libsndfile/src/.deps/file_io.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/file_io.Plo
rename to jni/libsndfile/src/.deps/file_io.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/flac.Plo b/jni/libsndfile/src/.deps/flac.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/flac.Plo
rename to jni/libsndfile/src/.deps/flac.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/float32.Plo b/jni/libsndfile/src/.deps/float32.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/float32.Plo
rename to jni/libsndfile/src/.deps/float32.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/g72x.Plo b/jni/libsndfile/src/.deps/g72x.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/g72x.Plo
rename to jni/libsndfile/src/.deps/g72x.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/gsm610.Plo b/jni/libsndfile/src/.deps/gsm610.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/gsm610.Plo
rename to jni/libsndfile/src/.deps/gsm610.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/htk.Plo b/jni/libsndfile/src/.deps/htk.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/htk.Plo
rename to jni/libsndfile/src/.deps/htk.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/id3.Plo b/jni/libsndfile/src/.deps/id3.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/id3.Plo
rename to jni/libsndfile/src/.deps/id3.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ima_adpcm.Plo b/jni/libsndfile/src/.deps/ima_adpcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ima_adpcm.Plo
rename to jni/libsndfile/src/.deps/ima_adpcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ima_oki_adpcm.Plo b/jni/libsndfile/src/.deps/ima_oki_adpcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ima_oki_adpcm.Plo
rename to jni/libsndfile/src/.deps/ima_oki_adpcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/interleave.Plo b/jni/libsndfile/src/.deps/interleave.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/interleave.Plo
rename to jni/libsndfile/src/.deps/interleave.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ircam.Plo b/jni/libsndfile/src/.deps/ircam.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ircam.Plo
rename to jni/libsndfile/src/.deps/ircam.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/macbinary3.Plo b/jni/libsndfile/src/.deps/macbinary3.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/macbinary3.Plo
rename to jni/libsndfile/src/.deps/macbinary3.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/macos.Plo b/jni/libsndfile/src/.deps/macos.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/macos.Plo
rename to jni/libsndfile/src/.deps/macos.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/mat4.Plo b/jni/libsndfile/src/.deps/mat4.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/mat4.Plo
rename to jni/libsndfile/src/.deps/mat4.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/mat5.Plo b/jni/libsndfile/src/.deps/mat5.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/mat5.Plo
rename to jni/libsndfile/src/.deps/mat5.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/mpc2k.Plo b/jni/libsndfile/src/.deps/mpc2k.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/mpc2k.Plo
rename to jni/libsndfile/src/.deps/mpc2k.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ms_adpcm.Plo b/jni/libsndfile/src/.deps/ms_adpcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ms_adpcm.Plo
rename to jni/libsndfile/src/.deps/ms_adpcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/nist.Plo b/jni/libsndfile/src/.deps/nist.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/nist.Plo
rename to jni/libsndfile/src/.deps/nist.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ogg.Plo b/jni/libsndfile/src/.deps/ogg.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ogg.Plo
rename to jni/libsndfile/src/.deps/ogg.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ogg_pcm.Plo b/jni/libsndfile/src/.deps/ogg_pcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ogg_pcm.Plo
rename to jni/libsndfile/src/.deps/ogg_pcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ogg_speex.Plo b/jni/libsndfile/src/.deps/ogg_speex.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ogg_speex.Plo
rename to jni/libsndfile/src/.deps/ogg_speex.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ogg_vorbis.Plo b/jni/libsndfile/src/.deps/ogg_vorbis.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ogg_vorbis.Plo
rename to jni/libsndfile/src/.deps/ogg_vorbis.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/paf.Plo b/jni/libsndfile/src/.deps/paf.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/paf.Plo
rename to jni/libsndfile/src/.deps/paf.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/pcm.Plo b/jni/libsndfile/src/.deps/pcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/pcm.Plo
rename to jni/libsndfile/src/.deps/pcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/pvf.Plo b/jni/libsndfile/src/.deps/pvf.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/pvf.Plo
rename to jni/libsndfile/src/.deps/pvf.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/raw.Plo b/jni/libsndfile/src/.deps/raw.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/raw.Plo
rename to jni/libsndfile/src/.deps/raw.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/rf64.Plo b/jni/libsndfile/src/.deps/rf64.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/rf64.Plo
rename to jni/libsndfile/src/.deps/rf64.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/rx2.Plo b/jni/libsndfile/src/.deps/rx2.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/rx2.Plo
rename to jni/libsndfile/src/.deps/rx2.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/sd2.Plo b/jni/libsndfile/src/.deps/sd2.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/sd2.Plo
rename to jni/libsndfile/src/.deps/sd2.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/sds.Plo b/jni/libsndfile/src/.deps/sds.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/sds.Plo
rename to jni/libsndfile/src/.deps/sds.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/sndfile.Plo b/jni/libsndfile/src/.deps/sndfile.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/sndfile.Plo
rename to jni/libsndfile/src/.deps/sndfile.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/strings.Plo b/jni/libsndfile/src/.deps/strings.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/strings.Plo
rename to jni/libsndfile/src/.deps/strings.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/svx.Plo b/jni/libsndfile/src/.deps/svx.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/svx.Plo
rename to jni/libsndfile/src/.deps/svx.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_audio_detect.Po b/jni/libsndfile/src/.deps/test_audio_detect.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_audio_detect.Po
rename to jni/libsndfile/src/.deps/test_audio_detect.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_broadcast_var.Po b/jni/libsndfile/src/.deps/test_broadcast_var.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_broadcast_var.Po
rename to jni/libsndfile/src/.deps/test_broadcast_var.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_conversions.Po b/jni/libsndfile/src/.deps/test_conversions.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_conversions.Po
rename to jni/libsndfile/src/.deps/test_conversions.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_endswap.Po b/jni/libsndfile/src/.deps/test_endswap.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_endswap.Po
rename to jni/libsndfile/src/.deps/test_endswap.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_file_io.Po b/jni/libsndfile/src/.deps/test_file_io.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_file_io.Po
rename to jni/libsndfile/src/.deps/test_file_io.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_float.Po b/jni/libsndfile/src/.deps/test_float.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_float.Po
rename to jni/libsndfile/src/.deps/test_float.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_ima_oki_adpcm.Po b/jni/libsndfile/src/.deps/test_ima_oki_adpcm.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_ima_oki_adpcm.Po
rename to jni/libsndfile/src/.deps/test_ima_oki_adpcm.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_log_printf.Po b/jni/libsndfile/src/.deps/test_log_printf.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_log_printf.Po
rename to jni/libsndfile/src/.deps/test_log_printf.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_main.Po b/jni/libsndfile/src/.deps/test_main.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_main.Po
rename to jni/libsndfile/src/.deps/test_main.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/test_strncpy_crlf.Po b/jni/libsndfile/src/.deps/test_strncpy_crlf.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/test_strncpy_crlf.Po
rename to jni/libsndfile/src/.deps/test_strncpy_crlf.Po
diff --git a/jni/libsndfile-1.0.25/src/.deps/txw.Plo b/jni/libsndfile/src/.deps/txw.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/txw.Plo
rename to jni/libsndfile/src/.deps/txw.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/ulaw.Plo b/jni/libsndfile/src/.deps/ulaw.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/ulaw.Plo
rename to jni/libsndfile/src/.deps/ulaw.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/voc.Plo b/jni/libsndfile/src/.deps/voc.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/voc.Plo
rename to jni/libsndfile/src/.deps/voc.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/vox_adpcm.Plo b/jni/libsndfile/src/.deps/vox_adpcm.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/vox_adpcm.Plo
rename to jni/libsndfile/src/.deps/vox_adpcm.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/w64.Plo b/jni/libsndfile/src/.deps/w64.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/w64.Plo
rename to jni/libsndfile/src/.deps/w64.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/wav.Plo b/jni/libsndfile/src/.deps/wav.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/wav.Plo
rename to jni/libsndfile/src/.deps/wav.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/wav_w64.Plo b/jni/libsndfile/src/.deps/wav_w64.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/wav_w64.Plo
rename to jni/libsndfile/src/.deps/wav_w64.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/windows.Plo b/jni/libsndfile/src/.deps/windows.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/windows.Plo
rename to jni/libsndfile/src/.deps/windows.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/wve.Plo b/jni/libsndfile/src/.deps/wve.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/wve.Plo
rename to jni/libsndfile/src/.deps/wve.Plo
diff --git a/jni/libsndfile-1.0.25/src/.deps/xi.Plo b/jni/libsndfile/src/.deps/xi.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.deps/xi.Plo
rename to jni/libsndfile/src/.deps/xi.Plo
diff --git a/jni/libsndfile-1.0.25/src/.libs/libcommon.a b/jni/libsndfile/src/.libs/libcommon.a
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libcommon.a
rename to jni/libsndfile/src/.libs/libcommon.a
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/libcommon.la b/jni/libsndfile/src/.libs/libcommon.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libcommon.la
rename to jni/libsndfile/src/.libs/libcommon.la
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.a b/jni/libsndfile/src/.libs/libsndfile.a
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.a
rename to jni/libsndfile/src/.libs/libsndfile.a
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.la b/jni/libsndfile/src/.libs/libsndfile.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.la
rename to jni/libsndfile/src/.libs/libsndfile.la
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.lai b/jni/libsndfile/src/.libs/libsndfile.lai
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.lai
rename to jni/libsndfile/src/.libs/libsndfile.lai
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.so b/jni/libsndfile/src/.libs/libsndfile.so
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.so
rename to jni/libsndfile/src/.libs/libsndfile.so
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.so.1 b/jni/libsndfile/src/.libs/libsndfile.so.1
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.so.1
rename to jni/libsndfile/src/.libs/libsndfile.so.1
diff --git a/jni/libsndfile-1.0.25/src/.libs/libsndfile.so.1.0.25 b/jni/libsndfile/src/.libs/libsndfile.so.1.0.25
similarity index 100%
rename from jni/libsndfile-1.0.25/src/.libs/libsndfile.so.1.0.25
rename to jni/libsndfile/src/.libs/libsndfile.so.1.0.25
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/.dirstamp b/jni/libsndfile/src/G72x/.deps/.dirstamp
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/.dirstamp
rename to jni/libsndfile/src/G72x/.deps/.dirstamp
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g721.Plo b/jni/libsndfile/src/G72x/.deps/g721.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g721.Plo
rename to jni/libsndfile/src/G72x/.deps/g721.Plo
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g723_16.Plo b/jni/libsndfile/src/G72x/.deps/g723_16.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g723_16.Plo
rename to jni/libsndfile/src/G72x/.deps/g723_16.Plo
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g723_24.Plo b/jni/libsndfile/src/G72x/.deps/g723_24.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g723_24.Plo
rename to jni/libsndfile/src/G72x/.deps/g723_24.Plo
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g723_40.Plo b/jni/libsndfile/src/G72x/.deps/g723_40.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g723_40.Plo
rename to jni/libsndfile/src/G72x/.deps/g723_40.Plo
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g72x.Plo b/jni/libsndfile/src/G72x/.deps/g72x.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g72x.Plo
rename to jni/libsndfile/src/G72x/.deps/g72x.Plo
diff --git a/jni/libsndfile-1.0.25/src/G72x/.deps/g72x_test.Po b/jni/libsndfile/src/G72x/.deps/g72x_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.deps/g72x_test.Po
rename to jni/libsndfile/src/G72x/.deps/g72x_test.Po
diff --git a/jni/libsndfile-1.0.25/src/G72x/.dirstamp b/jni/libsndfile/src/G72x/.dirstamp
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.dirstamp
rename to jni/libsndfile/src/G72x/.dirstamp
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/libg72x.a b/jni/libsndfile/src/G72x/.libs/libg72x.a
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.libs/libg72x.a
rename to jni/libsndfile/src/G72x/.libs/libg72x.a
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/G72x/.libs/libg72x.la b/jni/libsndfile/src/G72x/.libs/libg72x.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/.libs/libg72x.la
rename to jni/libsndfile/src/G72x/.libs/libg72x.la
diff --git a/jni/libsndfile-1.0.25/src/G72x/ChangeLog b/jni/libsndfile/src/G72x/ChangeLog
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/ChangeLog
rename to jni/libsndfile/src/G72x/ChangeLog
diff --git a/jni/libsndfile-1.0.25/src/G72x/README b/jni/libsndfile/src/G72x/README
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/README
rename to jni/libsndfile/src/G72x/README
diff --git a/jni/libsndfile-1.0.25/src/G72x/README.original b/jni/libsndfile/src/G72x/README.original
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/README.original
rename to jni/libsndfile/src/G72x/README.original
diff --git a/jni/libsndfile-1.0.25/src/G72x/g721.c b/jni/libsndfile/src/G72x/g721.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g721.c
rename to jni/libsndfile/src/G72x/g721.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/g721.lo b/jni/libsndfile/src/G72x/g721.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g721.lo
rename to jni/libsndfile/src/G72x/g721.lo
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_16.c b/jni/libsndfile/src/G72x/g723_16.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_16.c
rename to jni/libsndfile/src/G72x/g723_16.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_16.lo b/jni/libsndfile/src/G72x/g723_16.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_16.lo
rename to jni/libsndfile/src/G72x/g723_16.lo
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_24.c b/jni/libsndfile/src/G72x/g723_24.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_24.c
rename to jni/libsndfile/src/G72x/g723_24.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_24.lo b/jni/libsndfile/src/G72x/g723_24.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_24.lo
rename to jni/libsndfile/src/G72x/g723_24.lo
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_40.c b/jni/libsndfile/src/G72x/g723_40.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_40.c
rename to jni/libsndfile/src/G72x/g723_40.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/g723_40.lo b/jni/libsndfile/src/G72x/g723_40.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g723_40.lo
rename to jni/libsndfile/src/G72x/g723_40.lo
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x.c b/jni/libsndfile/src/G72x/g72x.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g72x.c
rename to jni/libsndfile/src/G72x/g72x.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x.h b/jni/libsndfile/src/G72x/g72x.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g72x.h
rename to jni/libsndfile/src/G72x/g72x.h
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x.lo b/jni/libsndfile/src/G72x/g72x.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g72x.lo
rename to jni/libsndfile/src/G72x/g72x.lo
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x_priv.h b/jni/libsndfile/src/G72x/g72x_priv.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g72x_priv.h
rename to jni/libsndfile/src/G72x/g72x_priv.h
diff --git a/jni/libsndfile-1.0.25/src/G72x/g72x_test.c b/jni/libsndfile/src/G72x/g72x_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/g72x_test.c
rename to jni/libsndfile/src/G72x/g72x_test.c
diff --git a/jni/libsndfile-1.0.25/src/G72x/libg72x.la b/jni/libsndfile/src/G72x/libg72x.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/G72x/libg72x.la
rename to jni/libsndfile/src/G72x/libg72x.la
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/.dirstamp b/jni/libsndfile/src/GSM610/.deps/.dirstamp
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/.dirstamp
rename to jni/libsndfile/src/GSM610/.deps/.dirstamp
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/add.Plo b/jni/libsndfile/src/GSM610/.deps/add.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/add.Plo
rename to jni/libsndfile/src/GSM610/.deps/add.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/code.Plo b/jni/libsndfile/src/GSM610/.deps/code.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/code.Plo
rename to jni/libsndfile/src/GSM610/.deps/code.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/decode.Plo b/jni/libsndfile/src/GSM610/.deps/decode.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/decode.Plo
rename to jni/libsndfile/src/GSM610/.deps/decode.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_create.Plo b/jni/libsndfile/src/GSM610/.deps/gsm_create.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_create.Plo
rename to jni/libsndfile/src/GSM610/.deps/gsm_create.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_decode.Plo b/jni/libsndfile/src/GSM610/.deps/gsm_decode.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_decode.Plo
rename to jni/libsndfile/src/GSM610/.deps/gsm_decode.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_destroy.Plo b/jni/libsndfile/src/GSM610/.deps/gsm_destroy.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_destroy.Plo
rename to jni/libsndfile/src/GSM610/.deps/gsm_destroy.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_encode.Plo b/jni/libsndfile/src/GSM610/.deps/gsm_encode.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_encode.Plo
rename to jni/libsndfile/src/GSM610/.deps/gsm_encode.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_option.Plo b/jni/libsndfile/src/GSM610/.deps/gsm_option.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/gsm_option.Plo
rename to jni/libsndfile/src/GSM610/.deps/gsm_option.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/long_term.Plo b/jni/libsndfile/src/GSM610/.deps/long_term.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/long_term.Plo
rename to jni/libsndfile/src/GSM610/.deps/long_term.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/lpc.Plo b/jni/libsndfile/src/GSM610/.deps/lpc.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/lpc.Plo
rename to jni/libsndfile/src/GSM610/.deps/lpc.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/preprocess.Plo b/jni/libsndfile/src/GSM610/.deps/preprocess.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/preprocess.Plo
rename to jni/libsndfile/src/GSM610/.deps/preprocess.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/rpe.Plo b/jni/libsndfile/src/GSM610/.deps/rpe.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/rpe.Plo
rename to jni/libsndfile/src/GSM610/.deps/rpe.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/short_term.Plo b/jni/libsndfile/src/GSM610/.deps/short_term.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/short_term.Plo
rename to jni/libsndfile/src/GSM610/.deps/short_term.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.deps/table.Plo b/jni/libsndfile/src/GSM610/.deps/table.Plo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.deps/table.Plo
rename to jni/libsndfile/src/GSM610/.deps/table.Plo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.dirstamp b/jni/libsndfile/src/GSM610/.dirstamp
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.dirstamp
rename to jni/libsndfile/src/GSM610/.dirstamp
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/libgsm.a b/jni/libsndfile/src/GSM610/.libs/libgsm.a
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.libs/libgsm.a
rename to jni/libsndfile/src/GSM610/.libs/libgsm.a
Binary files differ
diff --git a/jni/libsndfile-1.0.25/src/GSM610/.libs/libgsm.la b/jni/libsndfile/src/GSM610/.libs/libgsm.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/.libs/libgsm.la
rename to jni/libsndfile/src/GSM610/.libs/libgsm.la
diff --git a/jni/libsndfile-1.0.25/src/GSM610/COPYRIGHT b/jni/libsndfile/src/GSM610/COPYRIGHT
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/COPYRIGHT
rename to jni/libsndfile/src/GSM610/COPYRIGHT
diff --git a/jni/libsndfile-1.0.25/src/GSM610/ChangeLog b/jni/libsndfile/src/GSM610/ChangeLog
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/ChangeLog
rename to jni/libsndfile/src/GSM610/ChangeLog
diff --git a/jni/libsndfile-1.0.25/src/GSM610/README b/jni/libsndfile/src/GSM610/README
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/README
rename to jni/libsndfile/src/GSM610/README
diff --git a/jni/libsndfile-1.0.25/src/GSM610/add.c b/jni/libsndfile/src/GSM610/add.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/add.c
rename to jni/libsndfile/src/GSM610/add.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/add.lo b/jni/libsndfile/src/GSM610/add.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/add.lo
rename to jni/libsndfile/src/GSM610/add.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/code.c b/jni/libsndfile/src/GSM610/code.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/code.c
rename to jni/libsndfile/src/GSM610/code.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/code.lo b/jni/libsndfile/src/GSM610/code.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/code.lo
rename to jni/libsndfile/src/GSM610/code.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/config.h b/jni/libsndfile/src/GSM610/config.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/config.h
rename to jni/libsndfile/src/GSM610/config.h
diff --git a/jni/libsndfile-1.0.25/src/GSM610/decode.c b/jni/libsndfile/src/GSM610/decode.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/decode.c
rename to jni/libsndfile/src/GSM610/decode.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/decode.lo b/jni/libsndfile/src/GSM610/decode.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/decode.lo
rename to jni/libsndfile/src/GSM610/decode.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm.h b/jni/libsndfile/src/GSM610/gsm.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm.h
rename to jni/libsndfile/src/GSM610/gsm.h
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm610_priv.h b/jni/libsndfile/src/GSM610/gsm610_priv.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm610_priv.h
rename to jni/libsndfile/src/GSM610/gsm610_priv.h
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_create.c b/jni/libsndfile/src/GSM610/gsm_create.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_create.c
rename to jni/libsndfile/src/GSM610/gsm_create.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_create.lo b/jni/libsndfile/src/GSM610/gsm_create.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_create.lo
rename to jni/libsndfile/src/GSM610/gsm_create.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_decode.c b/jni/libsndfile/src/GSM610/gsm_decode.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_decode.c
rename to jni/libsndfile/src/GSM610/gsm_decode.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_decode.lo b/jni/libsndfile/src/GSM610/gsm_decode.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_decode.lo
rename to jni/libsndfile/src/GSM610/gsm_decode.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.c b/jni/libsndfile/src/GSM610/gsm_destroy.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.c
rename to jni/libsndfile/src/GSM610/gsm_destroy.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.lo b/jni/libsndfile/src/GSM610/gsm_destroy.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_destroy.lo
rename to jni/libsndfile/src/GSM610/gsm_destroy.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_encode.c b/jni/libsndfile/src/GSM610/gsm_encode.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_encode.c
rename to jni/libsndfile/src/GSM610/gsm_encode.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_encode.lo b/jni/libsndfile/src/GSM610/gsm_encode.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_encode.lo
rename to jni/libsndfile/src/GSM610/gsm_encode.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_option.c b/jni/libsndfile/src/GSM610/gsm_option.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_option.c
rename to jni/libsndfile/src/GSM610/gsm_option.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/gsm_option.lo b/jni/libsndfile/src/GSM610/gsm_option.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/gsm_option.lo
rename to jni/libsndfile/src/GSM610/gsm_option.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/libgsm.la b/jni/libsndfile/src/GSM610/libgsm.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/libgsm.la
rename to jni/libsndfile/src/GSM610/libgsm.la
diff --git a/jni/libsndfile-1.0.25/src/GSM610/long_term.c b/jni/libsndfile/src/GSM610/long_term.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/long_term.c
rename to jni/libsndfile/src/GSM610/long_term.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/long_term.lo b/jni/libsndfile/src/GSM610/long_term.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/long_term.lo
rename to jni/libsndfile/src/GSM610/long_term.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/lpc.c b/jni/libsndfile/src/GSM610/lpc.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/lpc.c
rename to jni/libsndfile/src/GSM610/lpc.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/lpc.lo b/jni/libsndfile/src/GSM610/lpc.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/lpc.lo
rename to jni/libsndfile/src/GSM610/lpc.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/preprocess.c b/jni/libsndfile/src/GSM610/preprocess.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/preprocess.c
rename to jni/libsndfile/src/GSM610/preprocess.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/preprocess.lo b/jni/libsndfile/src/GSM610/preprocess.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/preprocess.lo
rename to jni/libsndfile/src/GSM610/preprocess.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/rpe.c b/jni/libsndfile/src/GSM610/rpe.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/rpe.c
rename to jni/libsndfile/src/GSM610/rpe.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/rpe.lo b/jni/libsndfile/src/GSM610/rpe.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/rpe.lo
rename to jni/libsndfile/src/GSM610/rpe.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/short_term.c b/jni/libsndfile/src/GSM610/short_term.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/short_term.c
rename to jni/libsndfile/src/GSM610/short_term.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/short_term.lo b/jni/libsndfile/src/GSM610/short_term.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/short_term.lo
rename to jni/libsndfile/src/GSM610/short_term.lo
diff --git a/jni/libsndfile-1.0.25/src/GSM610/table.c b/jni/libsndfile/src/GSM610/table.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/table.c
rename to jni/libsndfile/src/GSM610/table.c
diff --git a/jni/libsndfile-1.0.25/src/GSM610/table.lo b/jni/libsndfile/src/GSM610/table.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/GSM610/table.lo
rename to jni/libsndfile/src/GSM610/table.lo
diff --git a/jni/libsndfile-1.0.25/src/Makefile b/jni/libsndfile/src/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Makefile
rename to jni/libsndfile/src/Makefile
diff --git a/jni/libsndfile-1.0.25/src/Makefile.am b/jni/libsndfile/src/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Makefile.am
rename to jni/libsndfile/src/Makefile.am
diff --git a/jni/libsndfile-1.0.25/src/Makefile.in b/jni/libsndfile/src/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Makefile.in
rename to jni/libsndfile/src/Makefile.in
diff --git a/jni/libsndfile-1.0.25/src/Symbols.darwin b/jni/libsndfile/src/Symbols.darwin
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Symbols.darwin
rename to jni/libsndfile/src/Symbols.darwin
diff --git a/jni/libsndfile-1.0.25/src/Symbols.gnu-binutils b/jni/libsndfile/src/Symbols.gnu-binutils
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Symbols.gnu-binutils
rename to jni/libsndfile/src/Symbols.gnu-binutils
diff --git a/jni/libsndfile-1.0.25/src/Symbols.os2 b/jni/libsndfile/src/Symbols.os2
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Symbols.os2
rename to jni/libsndfile/src/Symbols.os2
diff --git a/jni/libsndfile-1.0.25/src/Symbols.static b/jni/libsndfile/src/Symbols.static
similarity index 100%
rename from jni/libsndfile-1.0.25/src/Symbols.static
rename to jni/libsndfile/src/Symbols.static
diff --git a/jni/libsndfile-1.0.25/src/aiff.c b/jni/libsndfile/src/aiff.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/aiff.c
rename to jni/libsndfile/src/aiff.c
diff --git a/jni/libsndfile-1.0.25/src/aiff.lo b/jni/libsndfile/src/aiff.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/aiff.lo
rename to jni/libsndfile/src/aiff.lo
diff --git a/jni/libsndfile-1.0.25/src/alaw.c b/jni/libsndfile/src/alaw.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/alaw.c
rename to jni/libsndfile/src/alaw.c
diff --git a/jni/libsndfile-1.0.25/src/alaw.lo b/jni/libsndfile/src/alaw.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/alaw.lo
rename to jni/libsndfile/src/alaw.lo
diff --git a/jni/libsndfile-1.0.25/src/au.c b/jni/libsndfile/src/au.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/au.c
rename to jni/libsndfile/src/au.c
diff --git a/jni/libsndfile-1.0.25/src/au.lo b/jni/libsndfile/src/au.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/au.lo
rename to jni/libsndfile/src/au.lo
diff --git a/jni/libsndfile-1.0.25/src/audio_detect.c b/jni/libsndfile/src/audio_detect.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/audio_detect.c
rename to jni/libsndfile/src/audio_detect.c
diff --git a/jni/libsndfile-1.0.25/src/audio_detect.lo b/jni/libsndfile/src/audio_detect.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/audio_detect.lo
rename to jni/libsndfile/src/audio_detect.lo
diff --git a/jni/libsndfile-1.0.25/src/avr.c b/jni/libsndfile/src/avr.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/avr.c
rename to jni/libsndfile/src/avr.c
diff --git a/jni/libsndfile-1.0.25/src/avr.lo b/jni/libsndfile/src/avr.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/avr.lo
rename to jni/libsndfile/src/avr.lo
diff --git a/jni/libsndfile-1.0.25/src/binheader_writef_check.py b/jni/libsndfile/src/binheader_writef_check.py
similarity index 100%
rename from jni/libsndfile-1.0.25/src/binheader_writef_check.py
rename to jni/libsndfile/src/binheader_writef_check.py
diff --git a/jni/libsndfile-1.0.25/src/broadcast.c b/jni/libsndfile/src/broadcast.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/broadcast.c
rename to jni/libsndfile/src/broadcast.c
diff --git a/jni/libsndfile-1.0.25/src/broadcast.lo b/jni/libsndfile/src/broadcast.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/broadcast.lo
rename to jni/libsndfile/src/broadcast.lo
diff --git a/jni/libsndfile-1.0.25/src/caf.c b/jni/libsndfile/src/caf.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/caf.c
rename to jni/libsndfile/src/caf.c
diff --git a/jni/libsndfile-1.0.25/src/caf.lo b/jni/libsndfile/src/caf.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/caf.lo
rename to jni/libsndfile/src/caf.lo
diff --git a/jni/libsndfile-1.0.25/src/chanmap.c b/jni/libsndfile/src/chanmap.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/chanmap.c
rename to jni/libsndfile/src/chanmap.c
diff --git a/jni/libsndfile-1.0.25/src/chanmap.h b/jni/libsndfile/src/chanmap.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/chanmap.h
rename to jni/libsndfile/src/chanmap.h
diff --git a/jni/libsndfile-1.0.25/src/chanmap.lo b/jni/libsndfile/src/chanmap.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/chanmap.lo
rename to jni/libsndfile/src/chanmap.lo
diff --git a/jni/libsndfile-1.0.25/src/chunk.c b/jni/libsndfile/src/chunk.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/chunk.c
rename to jni/libsndfile/src/chunk.c
diff --git a/jni/libsndfile-1.0.25/src/chunk.lo b/jni/libsndfile/src/chunk.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/chunk.lo
rename to jni/libsndfile/src/chunk.lo
diff --git a/jni/libsndfile-1.0.25/src/command.c b/jni/libsndfile/src/command.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/command.c
rename to jni/libsndfile/src/command.c
diff --git a/jni/libsndfile-1.0.25/src/command.lo b/jni/libsndfile/src/command.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/command.lo
rename to jni/libsndfile/src/command.lo
diff --git a/jni/libsndfile-1.0.25/src/common.c b/jni/libsndfile/src/common.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/common.c
rename to jni/libsndfile/src/common.c
diff --git a/jni/libsndfile-1.0.25/src/common.h b/jni/libsndfile/src/common.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/common.h
rename to jni/libsndfile/src/common.h
diff --git a/jni/libsndfile-1.0.25/src/common.lo b/jni/libsndfile/src/common.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/common.lo
rename to jni/libsndfile/src/common.lo
diff --git a/jni/libsndfile-1.0.25/src/config.h b/jni/libsndfile/src/config.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/config.h
rename to jni/libsndfile/src/config.h
diff --git a/jni/libsndfile-1.0.25/src/config.h.in b/jni/libsndfile/src/config.h.in
similarity index 100%
rename from jni/libsndfile-1.0.25/src/config.h.in
rename to jni/libsndfile/src/config.h.in
diff --git a/jni/libsndfile-1.0.25/src/create_symbols_file.py b/jni/libsndfile/src/create_symbols_file.py
similarity index 100%
rename from jni/libsndfile-1.0.25/src/create_symbols_file.py
rename to jni/libsndfile/src/create_symbols_file.py
diff --git a/jni/libsndfile-1.0.25/src/dither.c b/jni/libsndfile/src/dither.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dither.c
rename to jni/libsndfile/src/dither.c
diff --git a/jni/libsndfile-1.0.25/src/dither.lo b/jni/libsndfile/src/dither.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dither.lo
rename to jni/libsndfile/src/dither.lo
diff --git a/jni/libsndfile-1.0.25/src/double64.c b/jni/libsndfile/src/double64.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/double64.c
rename to jni/libsndfile/src/double64.c
diff --git a/jni/libsndfile-1.0.25/src/double64.lo b/jni/libsndfile/src/double64.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/double64.lo
rename to jni/libsndfile/src/double64.lo
diff --git a/jni/libsndfile-1.0.25/src/dwd.c b/jni/libsndfile/src/dwd.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dwd.c
rename to jni/libsndfile/src/dwd.c
diff --git a/jni/libsndfile-1.0.25/src/dwd.lo b/jni/libsndfile/src/dwd.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dwd.lo
rename to jni/libsndfile/src/dwd.lo
diff --git a/jni/libsndfile-1.0.25/src/dwvw.c b/jni/libsndfile/src/dwvw.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dwvw.c
rename to jni/libsndfile/src/dwvw.c
diff --git a/jni/libsndfile-1.0.25/src/dwvw.lo b/jni/libsndfile/src/dwvw.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/dwvw.lo
rename to jni/libsndfile/src/dwvw.lo
diff --git a/jni/libsndfile-1.0.25/src/file_io.c b/jni/libsndfile/src/file_io.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/file_io.c
rename to jni/libsndfile/src/file_io.c
diff --git a/jni/libsndfile-1.0.25/src/file_io.lo b/jni/libsndfile/src/file_io.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/file_io.lo
rename to jni/libsndfile/src/file_io.lo
diff --git a/jni/libsndfile-1.0.25/src/flac.c b/jni/libsndfile/src/flac.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/flac.c
rename to jni/libsndfile/src/flac.c
diff --git a/jni/libsndfile-1.0.25/src/flac.lo b/jni/libsndfile/src/flac.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/flac.lo
rename to jni/libsndfile/src/flac.lo
diff --git a/jni/libsndfile-1.0.25/src/float32.c b/jni/libsndfile/src/float32.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/float32.c
rename to jni/libsndfile/src/float32.c
diff --git a/jni/libsndfile-1.0.25/src/float32.lo b/jni/libsndfile/src/float32.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/float32.lo
rename to jni/libsndfile/src/float32.lo
diff --git a/jni/libsndfile-1.0.25/src/g72x.c b/jni/libsndfile/src/g72x.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/g72x.c
rename to jni/libsndfile/src/g72x.c
diff --git a/jni/libsndfile-1.0.25/src/g72x.lo b/jni/libsndfile/src/g72x.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/g72x.lo
rename to jni/libsndfile/src/g72x.lo
diff --git a/jni/libsndfile-1.0.25/src/gsm610.c b/jni/libsndfile/src/gsm610.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/gsm610.c
rename to jni/libsndfile/src/gsm610.c
diff --git a/jni/libsndfile-1.0.25/src/gsm610.lo b/jni/libsndfile/src/gsm610.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/gsm610.lo
rename to jni/libsndfile/src/gsm610.lo
diff --git a/jni/libsndfile-1.0.25/src/htk.c b/jni/libsndfile/src/htk.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/htk.c
rename to jni/libsndfile/src/htk.c
diff --git a/jni/libsndfile-1.0.25/src/htk.lo b/jni/libsndfile/src/htk.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/htk.lo
rename to jni/libsndfile/src/htk.lo
diff --git a/jni/libsndfile-1.0.25/src/id3.c b/jni/libsndfile/src/id3.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/id3.c
rename to jni/libsndfile/src/id3.c
diff --git a/jni/libsndfile-1.0.25/src/id3.lo b/jni/libsndfile/src/id3.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/id3.lo
rename to jni/libsndfile/src/id3.lo
diff --git a/jni/libsndfile-1.0.25/src/ima_adpcm.c b/jni/libsndfile/src/ima_adpcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ima_adpcm.c
rename to jni/libsndfile/src/ima_adpcm.c
diff --git a/jni/libsndfile-1.0.25/src/ima_adpcm.lo b/jni/libsndfile/src/ima_adpcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ima_adpcm.lo
rename to jni/libsndfile/src/ima_adpcm.lo
diff --git a/jni/libsndfile-1.0.25/src/ima_oki_adpcm.c b/jni/libsndfile/src/ima_oki_adpcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ima_oki_adpcm.c
rename to jni/libsndfile/src/ima_oki_adpcm.c
diff --git a/jni/libsndfile-1.0.25/src/ima_oki_adpcm.h b/jni/libsndfile/src/ima_oki_adpcm.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ima_oki_adpcm.h
rename to jni/libsndfile/src/ima_oki_adpcm.h
diff --git a/jni/libsndfile-1.0.25/src/ima_oki_adpcm.lo b/jni/libsndfile/src/ima_oki_adpcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ima_oki_adpcm.lo
rename to jni/libsndfile/src/ima_oki_adpcm.lo
diff --git a/jni/libsndfile-1.0.25/src/interleave.c b/jni/libsndfile/src/interleave.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/interleave.c
rename to jni/libsndfile/src/interleave.c
diff --git a/jni/libsndfile-1.0.25/src/interleave.lo b/jni/libsndfile/src/interleave.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/interleave.lo
rename to jni/libsndfile/src/interleave.lo
diff --git a/jni/libsndfile-1.0.25/src/ircam.c b/jni/libsndfile/src/ircam.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ircam.c
rename to jni/libsndfile/src/ircam.c
diff --git a/jni/libsndfile-1.0.25/src/ircam.lo b/jni/libsndfile/src/ircam.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ircam.lo
rename to jni/libsndfile/src/ircam.lo
diff --git a/jni/libsndfile-1.0.25/src/libcommon.la b/jni/libsndfile/src/libcommon.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/libcommon.la
rename to jni/libsndfile/src/libcommon.la
diff --git a/jni/libsndfile-1.0.25/src/libsndfile-1.def b/jni/libsndfile/src/libsndfile-1.def
similarity index 100%
rename from jni/libsndfile-1.0.25/src/libsndfile-1.def
rename to jni/libsndfile/src/libsndfile-1.def
diff --git a/jni/libsndfile-1.0.25/src/libsndfile.la b/jni/libsndfile/src/libsndfile.la
similarity index 100%
rename from jni/libsndfile-1.0.25/src/libsndfile.la
rename to jni/libsndfile/src/libsndfile.la
diff --git a/jni/libsndfile-1.0.25/src/macbinary3.c b/jni/libsndfile/src/macbinary3.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/macbinary3.c
rename to jni/libsndfile/src/macbinary3.c
diff --git a/jni/libsndfile-1.0.25/src/macbinary3.lo b/jni/libsndfile/src/macbinary3.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/macbinary3.lo
rename to jni/libsndfile/src/macbinary3.lo
diff --git a/jni/libsndfile-1.0.25/src/macos.c b/jni/libsndfile/src/macos.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/macos.c
rename to jni/libsndfile/src/macos.c
diff --git a/jni/libsndfile-1.0.25/src/macos.lo b/jni/libsndfile/src/macos.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/macos.lo
rename to jni/libsndfile/src/macos.lo
diff --git a/jni/libsndfile-1.0.25/src/make-static-lib-hidden-privates.sh b/jni/libsndfile/src/make-static-lib-hidden-privates.sh
similarity index 100%
rename from jni/libsndfile-1.0.25/src/make-static-lib-hidden-privates.sh
rename to jni/libsndfile/src/make-static-lib-hidden-privates.sh
diff --git a/jni/libsndfile-1.0.25/src/mat4.c b/jni/libsndfile/src/mat4.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mat4.c
rename to jni/libsndfile/src/mat4.c
diff --git a/jni/libsndfile-1.0.25/src/mat4.lo b/jni/libsndfile/src/mat4.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mat4.lo
rename to jni/libsndfile/src/mat4.lo
diff --git a/jni/libsndfile-1.0.25/src/mat5.c b/jni/libsndfile/src/mat5.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mat5.c
rename to jni/libsndfile/src/mat5.c
diff --git a/jni/libsndfile-1.0.25/src/mat5.lo b/jni/libsndfile/src/mat5.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mat5.lo
rename to jni/libsndfile/src/mat5.lo
diff --git a/jni/libsndfile-1.0.25/src/mpc2k.c b/jni/libsndfile/src/mpc2k.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mpc2k.c
rename to jni/libsndfile/src/mpc2k.c
diff --git a/jni/libsndfile-1.0.25/src/mpc2k.lo b/jni/libsndfile/src/mpc2k.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/mpc2k.lo
rename to jni/libsndfile/src/mpc2k.lo
diff --git a/jni/libsndfile-1.0.25/src/ms_adpcm.c b/jni/libsndfile/src/ms_adpcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ms_adpcm.c
rename to jni/libsndfile/src/ms_adpcm.c
diff --git a/jni/libsndfile-1.0.25/src/ms_adpcm.lo b/jni/libsndfile/src/ms_adpcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ms_adpcm.lo
rename to jni/libsndfile/src/ms_adpcm.lo
diff --git a/jni/libsndfile-1.0.25/src/nist.c b/jni/libsndfile/src/nist.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/nist.c
rename to jni/libsndfile/src/nist.c
diff --git a/jni/libsndfile-1.0.25/src/nist.lo b/jni/libsndfile/src/nist.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/nist.lo
rename to jni/libsndfile/src/nist.lo
diff --git a/jni/libsndfile-1.0.25/src/ogg.c b/jni/libsndfile/src/ogg.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg.c
rename to jni/libsndfile/src/ogg.c
diff --git a/jni/libsndfile-1.0.25/src/ogg.h b/jni/libsndfile/src/ogg.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg.h
rename to jni/libsndfile/src/ogg.h
diff --git a/jni/libsndfile-1.0.25/src/ogg.lo b/jni/libsndfile/src/ogg.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg.lo
rename to jni/libsndfile/src/ogg.lo
diff --git a/jni/libsndfile-1.0.25/src/ogg_pcm.c b/jni/libsndfile/src/ogg_pcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_pcm.c
rename to jni/libsndfile/src/ogg_pcm.c
diff --git a/jni/libsndfile-1.0.25/src/ogg_pcm.lo b/jni/libsndfile/src/ogg_pcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_pcm.lo
rename to jni/libsndfile/src/ogg_pcm.lo
diff --git a/jni/libsndfile-1.0.25/src/ogg_speex.c b/jni/libsndfile/src/ogg_speex.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_speex.c
rename to jni/libsndfile/src/ogg_speex.c
diff --git a/jni/libsndfile-1.0.25/src/ogg_speex.lo b/jni/libsndfile/src/ogg_speex.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_speex.lo
rename to jni/libsndfile/src/ogg_speex.lo
diff --git a/jni/libsndfile-1.0.25/src/ogg_vorbis.c b/jni/libsndfile/src/ogg_vorbis.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_vorbis.c
rename to jni/libsndfile/src/ogg_vorbis.c
diff --git a/jni/libsndfile-1.0.25/src/ogg_vorbis.lo b/jni/libsndfile/src/ogg_vorbis.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ogg_vorbis.lo
rename to jni/libsndfile/src/ogg_vorbis.lo
diff --git a/jni/libsndfile-1.0.25/src/paf.c b/jni/libsndfile/src/paf.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/paf.c
rename to jni/libsndfile/src/paf.c
diff --git a/jni/libsndfile-1.0.25/src/paf.lo b/jni/libsndfile/src/paf.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/paf.lo
rename to jni/libsndfile/src/paf.lo
diff --git a/jni/libsndfile-1.0.25/src/pcm.c b/jni/libsndfile/src/pcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/pcm.c
rename to jni/libsndfile/src/pcm.c
diff --git a/jni/libsndfile-1.0.25/src/pcm.lo b/jni/libsndfile/src/pcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/pcm.lo
rename to jni/libsndfile/src/pcm.lo
diff --git a/jni/libsndfile-1.0.25/src/pvf.c b/jni/libsndfile/src/pvf.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/pvf.c
rename to jni/libsndfile/src/pvf.c
diff --git a/jni/libsndfile-1.0.25/src/pvf.lo b/jni/libsndfile/src/pvf.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/pvf.lo
rename to jni/libsndfile/src/pvf.lo
diff --git a/jni/libsndfile-1.0.25/src/raw.c b/jni/libsndfile/src/raw.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/raw.c
rename to jni/libsndfile/src/raw.c
diff --git a/jni/libsndfile-1.0.25/src/raw.lo b/jni/libsndfile/src/raw.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/raw.lo
rename to jni/libsndfile/src/raw.lo
diff --git a/jni/libsndfile-1.0.25/src/rf64.c b/jni/libsndfile/src/rf64.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/rf64.c
rename to jni/libsndfile/src/rf64.c
diff --git a/jni/libsndfile-1.0.25/src/rf64.lo b/jni/libsndfile/src/rf64.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/rf64.lo
rename to jni/libsndfile/src/rf64.lo
diff --git a/jni/libsndfile-1.0.25/src/rx2.c b/jni/libsndfile/src/rx2.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/rx2.c
rename to jni/libsndfile/src/rx2.c
diff --git a/jni/libsndfile-1.0.25/src/rx2.lo b/jni/libsndfile/src/rx2.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/rx2.lo
rename to jni/libsndfile/src/rx2.lo
diff --git a/jni/libsndfile-1.0.25/src/sd2.c b/jni/libsndfile/src/sd2.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sd2.c
rename to jni/libsndfile/src/sd2.c
diff --git a/jni/libsndfile-1.0.25/src/sd2.lo b/jni/libsndfile/src/sd2.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sd2.lo
rename to jni/libsndfile/src/sd2.lo
diff --git a/jni/libsndfile-1.0.25/src/sds.c b/jni/libsndfile/src/sds.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sds.c
rename to jni/libsndfile/src/sds.c
diff --git a/jni/libsndfile-1.0.25/src/sds.lo b/jni/libsndfile/src/sds.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sds.lo
rename to jni/libsndfile/src/sds.lo
diff --git a/jni/libsndfile-1.0.25/src/sf_unistd.h b/jni/libsndfile/src/sf_unistd.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sf_unistd.h
rename to jni/libsndfile/src/sf_unistd.h
diff --git a/jni/libsndfile-1.0.25/src/sfconfig.h b/jni/libsndfile/src/sfconfig.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sfconfig.h
rename to jni/libsndfile/src/sfconfig.h
diff --git a/jni/libsndfile-1.0.25/src/sfendian.h b/jni/libsndfile/src/sfendian.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sfendian.h
rename to jni/libsndfile/src/sfendian.h
diff --git a/jni/libsndfile-1.0.25/src/sndfile.c b/jni/libsndfile/src/sndfile.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sndfile.c
rename to jni/libsndfile/src/sndfile.c
diff --git a/jni/libsndfile-1.0.25/src/sndfile.h b/jni/libsndfile/src/sndfile.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sndfile.h
rename to jni/libsndfile/src/sndfile.h
diff --git a/jni/libsndfile-1.0.25/src/sndfile.h.in b/jni/libsndfile/src/sndfile.h.in
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sndfile.h.in
rename to jni/libsndfile/src/sndfile.h.in
diff --git a/jni/libsndfile-1.0.25/src/sndfile.hh b/jni/libsndfile/src/sndfile.hh
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sndfile.hh
rename to jni/libsndfile/src/sndfile.hh
diff --git a/jni/libsndfile-1.0.25/src/sndfile.lo b/jni/libsndfile/src/sndfile.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/sndfile.lo
rename to jni/libsndfile/src/sndfile.lo
diff --git a/jni/libsndfile-1.0.25/src/stamp-h1 b/jni/libsndfile/src/stamp-h1
similarity index 100%
rename from jni/libsndfile-1.0.25/src/stamp-h1
rename to jni/libsndfile/src/stamp-h1
diff --git a/jni/libsndfile-1.0.25/src/strings.c b/jni/libsndfile/src/strings.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/strings.c
rename to jni/libsndfile/src/strings.c
diff --git a/jni/libsndfile-1.0.25/src/strings.lo b/jni/libsndfile/src/strings.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/strings.lo
rename to jni/libsndfile/src/strings.lo
diff --git a/jni/libsndfile-1.0.25/src/svx.c b/jni/libsndfile/src/svx.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/svx.c
rename to jni/libsndfile/src/svx.c
diff --git a/jni/libsndfile-1.0.25/src/svx.lo b/jni/libsndfile/src/svx.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/svx.lo
rename to jni/libsndfile/src/svx.lo
diff --git a/jni/libsndfile-1.0.25/src/test_audio_detect.c b/jni/libsndfile/src/test_audio_detect.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_audio_detect.c
rename to jni/libsndfile/src/test_audio_detect.c
diff --git a/jni/libsndfile-1.0.25/src/test_broadcast_var.c b/jni/libsndfile/src/test_broadcast_var.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_broadcast_var.c
rename to jni/libsndfile/src/test_broadcast_var.c
diff --git a/jni/libsndfile-1.0.25/src/test_conversions.c b/jni/libsndfile/src/test_conversions.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_conversions.c
rename to jni/libsndfile/src/test_conversions.c
diff --git a/jni/libsndfile-1.0.25/src/test_endswap.c b/jni/libsndfile/src/test_endswap.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_endswap.c
rename to jni/libsndfile/src/test_endswap.c
diff --git a/jni/libsndfile-1.0.25/src/test_endswap.def b/jni/libsndfile/src/test_endswap.def
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_endswap.def
rename to jni/libsndfile/src/test_endswap.def
diff --git a/jni/libsndfile-1.0.25/src/test_endswap.tpl b/jni/libsndfile/src/test_endswap.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_endswap.tpl
rename to jni/libsndfile/src/test_endswap.tpl
diff --git a/jni/libsndfile-1.0.25/src/test_file_io.c b/jni/libsndfile/src/test_file_io.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_file_io.c
rename to jni/libsndfile/src/test_file_io.c
diff --git a/jni/libsndfile-1.0.25/src/test_float.c b/jni/libsndfile/src/test_float.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_float.c
rename to jni/libsndfile/src/test_float.c
diff --git a/jni/libsndfile-1.0.25/src/test_ima_oki_adpcm.c b/jni/libsndfile/src/test_ima_oki_adpcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_ima_oki_adpcm.c
rename to jni/libsndfile/src/test_ima_oki_adpcm.c
diff --git a/jni/libsndfile-1.0.25/src/test_log_printf.c b/jni/libsndfile/src/test_log_printf.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_log_printf.c
rename to jni/libsndfile/src/test_log_printf.c
diff --git a/jni/libsndfile-1.0.25/src/test_main.c b/jni/libsndfile/src/test_main.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_main.c
rename to jni/libsndfile/src/test_main.c
diff --git a/jni/libsndfile-1.0.25/src/test_main.h b/jni/libsndfile/src/test_main.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_main.h
rename to jni/libsndfile/src/test_main.h
diff --git a/jni/libsndfile-1.0.25/src/test_strncpy_crlf.c b/jni/libsndfile/src/test_strncpy_crlf.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/test_strncpy_crlf.c
rename to jni/libsndfile/src/test_strncpy_crlf.c
diff --git a/jni/libsndfile-1.0.25/src/txw.c b/jni/libsndfile/src/txw.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/txw.c
rename to jni/libsndfile/src/txw.c
diff --git a/jni/libsndfile-1.0.25/src/txw.lo b/jni/libsndfile/src/txw.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/txw.lo
rename to jni/libsndfile/src/txw.lo
diff --git a/jni/libsndfile-1.0.25/src/ulaw.c b/jni/libsndfile/src/ulaw.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ulaw.c
rename to jni/libsndfile/src/ulaw.c
diff --git a/jni/libsndfile-1.0.25/src/ulaw.lo b/jni/libsndfile/src/ulaw.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/ulaw.lo
rename to jni/libsndfile/src/ulaw.lo
diff --git a/jni/libsndfile-1.0.25/src/version-metadata.rc b/jni/libsndfile/src/version-metadata.rc
similarity index 100%
rename from jni/libsndfile-1.0.25/src/version-metadata.rc
rename to jni/libsndfile/src/version-metadata.rc
diff --git a/jni/libsndfile-1.0.25/src/version-metadata.rc.in b/jni/libsndfile/src/version-metadata.rc.in
similarity index 100%
rename from jni/libsndfile-1.0.25/src/version-metadata.rc.in
rename to jni/libsndfile/src/version-metadata.rc.in
diff --git a/jni/libsndfile-1.0.25/src/voc.c b/jni/libsndfile/src/voc.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/voc.c
rename to jni/libsndfile/src/voc.c
diff --git a/jni/libsndfile-1.0.25/src/voc.lo b/jni/libsndfile/src/voc.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/voc.lo
rename to jni/libsndfile/src/voc.lo
diff --git a/jni/libsndfile-1.0.25/src/vox_adpcm.c b/jni/libsndfile/src/vox_adpcm.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/vox_adpcm.c
rename to jni/libsndfile/src/vox_adpcm.c
diff --git a/jni/libsndfile-1.0.25/src/vox_adpcm.lo b/jni/libsndfile/src/vox_adpcm.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/vox_adpcm.lo
rename to jni/libsndfile/src/vox_adpcm.lo
diff --git a/jni/libsndfile-1.0.25/src/w64.c b/jni/libsndfile/src/w64.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/w64.c
rename to jni/libsndfile/src/w64.c
diff --git a/jni/libsndfile-1.0.25/src/w64.lo b/jni/libsndfile/src/w64.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/w64.lo
rename to jni/libsndfile/src/w64.lo
diff --git a/jni/libsndfile-1.0.25/src/wav.c b/jni/libsndfile/src/wav.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wav.c
rename to jni/libsndfile/src/wav.c
diff --git a/jni/libsndfile-1.0.25/src/wav.lo b/jni/libsndfile/src/wav.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wav.lo
rename to jni/libsndfile/src/wav.lo
diff --git a/jni/libsndfile-1.0.25/src/wav_w64.c b/jni/libsndfile/src/wav_w64.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wav_w64.c
rename to jni/libsndfile/src/wav_w64.c
diff --git a/jni/libsndfile-1.0.25/src/wav_w64.h b/jni/libsndfile/src/wav_w64.h
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wav_w64.h
rename to jni/libsndfile/src/wav_w64.h
diff --git a/jni/libsndfile-1.0.25/src/wav_w64.lo b/jni/libsndfile/src/wav_w64.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wav_w64.lo
rename to jni/libsndfile/src/wav_w64.lo
diff --git a/jni/libsndfile-1.0.25/src/windows.c b/jni/libsndfile/src/windows.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/windows.c
rename to jni/libsndfile/src/windows.c
diff --git a/jni/libsndfile-1.0.25/src/windows.lo b/jni/libsndfile/src/windows.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/windows.lo
rename to jni/libsndfile/src/windows.lo
diff --git a/jni/libsndfile-1.0.25/src/wve.c b/jni/libsndfile/src/wve.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wve.c
rename to jni/libsndfile/src/wve.c
diff --git a/jni/libsndfile-1.0.25/src/wve.lo b/jni/libsndfile/src/wve.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/wve.lo
rename to jni/libsndfile/src/wve.lo
diff --git a/jni/libsndfile-1.0.25/src/xi.c b/jni/libsndfile/src/xi.c
similarity index 100%
rename from jni/libsndfile-1.0.25/src/xi.c
rename to jni/libsndfile/src/xi.c
diff --git a/jni/libsndfile-1.0.25/src/xi.lo b/jni/libsndfile/src/xi.lo
similarity index 100%
rename from jni/libsndfile-1.0.25/src/xi.lo
rename to jni/libsndfile/src/xi.lo
diff --git a/jni/libsndfile-1.0.25/tests/.deps/aiff_rw_test.Po b/jni/libsndfile/tests/.deps/aiff_rw_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/aiff_rw_test.Po
rename to jni/libsndfile/tests/.deps/aiff_rw_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/alaw_test.Po b/jni/libsndfile/tests/.deps/alaw_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/alaw_test.Po
rename to jni/libsndfile/tests/.deps/alaw_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/benchmark.Po b/jni/libsndfile/tests/.deps/benchmark.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/benchmark.Po
rename to jni/libsndfile/tests/.deps/benchmark.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/checksum_test.Po b/jni/libsndfile/tests/.deps/checksum_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/checksum_test.Po
rename to jni/libsndfile/tests/.deps/checksum_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/command_test.Po b/jni/libsndfile/tests/.deps/command_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/command_test.Po
rename to jni/libsndfile/tests/.deps/command_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/cpp_test.Po b/jni/libsndfile/tests/.deps/cpp_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/cpp_test.Po
rename to jni/libsndfile/tests/.deps/cpp_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/dft_cmp.Po b/jni/libsndfile/tests/.deps/dft_cmp.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/dft_cmp.Po
rename to jni/libsndfile/tests/.deps/dft_cmp.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/dither_test.Po b/jni/libsndfile/tests/.deps/dither_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/dither_test.Po
rename to jni/libsndfile/tests/.deps/dither_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/dwvw_test.Po b/jni/libsndfile/tests/.deps/dwvw_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/dwvw_test.Po
rename to jni/libsndfile/tests/.deps/dwvw_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/error_test.Po b/jni/libsndfile/tests/.deps/error_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/error_test.Po
rename to jni/libsndfile/tests/.deps/error_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/external_libs_test.Po b/jni/libsndfile/tests/.deps/external_libs_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/external_libs_test.Po
rename to jni/libsndfile/tests/.deps/external_libs_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/fix_this.Po b/jni/libsndfile/tests/.deps/fix_this.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/fix_this.Po
rename to jni/libsndfile/tests/.deps/fix_this.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/floating_point_test.Po b/jni/libsndfile/tests/.deps/floating_point_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/floating_point_test.Po
rename to jni/libsndfile/tests/.deps/floating_point_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/format_check_test.Po b/jni/libsndfile/tests/.deps/format_check_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/format_check_test.Po
rename to jni/libsndfile/tests/.deps/format_check_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/generate.Po b/jni/libsndfile/tests/.deps/generate.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/generate.Po
rename to jni/libsndfile/tests/.deps/generate.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/header_test.Po b/jni/libsndfile/tests/.deps/header_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/header_test.Po
rename to jni/libsndfile/tests/.deps/header_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/headerless_test.Po b/jni/libsndfile/tests/.deps/headerless_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/headerless_test.Po
rename to jni/libsndfile/tests/.deps/headerless_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/largefile_test.Po b/jni/libsndfile/tests/.deps/largefile_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/largefile_test.Po
rename to jni/libsndfile/tests/.deps/largefile_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/locale_test.Po b/jni/libsndfile/tests/.deps/locale_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/locale_test.Po
rename to jni/libsndfile/tests/.deps/locale_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/lossy_comp_test.Po b/jni/libsndfile/tests/.deps/lossy_comp_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/lossy_comp_test.Po
rename to jni/libsndfile/tests/.deps/lossy_comp_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/misc_test.Po b/jni/libsndfile/tests/.deps/misc_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/misc_test.Po
rename to jni/libsndfile/tests/.deps/misc_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/multi_file_test.Po b/jni/libsndfile/tests/.deps/multi_file_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/multi_file_test.Po
rename to jni/libsndfile/tests/.deps/multi_file_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/ogg_test.Po b/jni/libsndfile/tests/.deps/ogg_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/ogg_test.Po
rename to jni/libsndfile/tests/.deps/ogg_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/pcm_test.Po b/jni/libsndfile/tests/.deps/pcm_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/pcm_test.Po
rename to jni/libsndfile/tests/.deps/pcm_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/peak_chunk_test.Po b/jni/libsndfile/tests/.deps/peak_chunk_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/peak_chunk_test.Po
rename to jni/libsndfile/tests/.deps/peak_chunk_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/pipe_test.Po b/jni/libsndfile/tests/.deps/pipe_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/pipe_test.Po
rename to jni/libsndfile/tests/.deps/pipe_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/raw_test.Po b/jni/libsndfile/tests/.deps/raw_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/raw_test.Po
rename to jni/libsndfile/tests/.deps/raw_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/rdwr_test.Po b/jni/libsndfile/tests/.deps/rdwr_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/rdwr_test.Po
rename to jni/libsndfile/tests/.deps/rdwr_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/scale_clip_test.Po b/jni/libsndfile/tests/.deps/scale_clip_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/scale_clip_test.Po
rename to jni/libsndfile/tests/.deps/scale_clip_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/sfversion.Po b/jni/libsndfile/tests/.deps/sfversion.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/sfversion.Po
rename to jni/libsndfile/tests/.deps/sfversion.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/stdin_test.Po b/jni/libsndfile/tests/.deps/stdin_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/stdin_test.Po
rename to jni/libsndfile/tests/.deps/stdin_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/stdio_test.Po b/jni/libsndfile/tests/.deps/stdio_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/stdio_test.Po
rename to jni/libsndfile/tests/.deps/stdio_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/stdout_test.Po b/jni/libsndfile/tests/.deps/stdout_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/stdout_test.Po
rename to jni/libsndfile/tests/.deps/stdout_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/string_test.Po b/jni/libsndfile/tests/.deps/string_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/string_test.Po
rename to jni/libsndfile/tests/.deps/string_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/ulaw_test.Po b/jni/libsndfile/tests/.deps/ulaw_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/ulaw_test.Po
rename to jni/libsndfile/tests/.deps/ulaw_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/utils.Po b/jni/libsndfile/tests/.deps/utils.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/utils.Po
rename to jni/libsndfile/tests/.deps/utils.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/virtual_io_test.Po b/jni/libsndfile/tests/.deps/virtual_io_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/virtual_io_test.Po
rename to jni/libsndfile/tests/.deps/virtual_io_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/vorbis_test.Po b/jni/libsndfile/tests/.deps/vorbis_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/vorbis_test.Po
rename to jni/libsndfile/tests/.deps/vorbis_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/win32_ordinal_test.Po b/jni/libsndfile/tests/.deps/win32_ordinal_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/win32_ordinal_test.Po
rename to jni/libsndfile/tests/.deps/win32_ordinal_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/win32_test.Po b/jni/libsndfile/tests/.deps/win32_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/win32_test.Po
rename to jni/libsndfile/tests/.deps/win32_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/.deps/write_read_test.Po b/jni/libsndfile/tests/.deps/write_read_test.Po
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/.deps/write_read_test.Po
rename to jni/libsndfile/tests/.deps/write_read_test.Po
diff --git a/jni/libsndfile-1.0.25/tests/Makefile b/jni/libsndfile/tests/Makefile
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/Makefile
rename to jni/libsndfile/tests/Makefile
diff --git a/jni/libsndfile-1.0.25/tests/Makefile.am b/jni/libsndfile/tests/Makefile.am
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/Makefile.am
rename to jni/libsndfile/tests/Makefile.am
diff --git a/jni/libsndfile-1.0.25/tests/Makefile.in b/jni/libsndfile/tests/Makefile.in
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/Makefile.in
rename to jni/libsndfile/tests/Makefile.in
diff --git a/jni/libsndfile-1.0.25/tests/aiff_rw_test.c b/jni/libsndfile/tests/aiff_rw_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/aiff_rw_test.c
rename to jni/libsndfile/tests/aiff_rw_test.c
diff --git a/jni/libsndfile-1.0.25/tests/alaw_test.c b/jni/libsndfile/tests/alaw_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/alaw_test.c
rename to jni/libsndfile/tests/alaw_test.c
diff --git a/jni/libsndfile-1.0.25/tests/benchmark.c b/jni/libsndfile/tests/benchmark.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/benchmark.c
rename to jni/libsndfile/tests/benchmark.c
diff --git a/jni/libsndfile-1.0.25/tests/benchmark.def b/jni/libsndfile/tests/benchmark.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/benchmark.def
rename to jni/libsndfile/tests/benchmark.def
diff --git a/jni/libsndfile-1.0.25/tests/benchmark.tpl b/jni/libsndfile/tests/benchmark.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/benchmark.tpl
rename to jni/libsndfile/tests/benchmark.tpl
diff --git a/jni/libsndfile-1.0.25/tests/checksum_test.c b/jni/libsndfile/tests/checksum_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/checksum_test.c
rename to jni/libsndfile/tests/checksum_test.c
diff --git a/jni/libsndfile-1.0.25/tests/command_test.c b/jni/libsndfile/tests/command_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/command_test.c
rename to jni/libsndfile/tests/command_test.c
diff --git a/jni/libsndfile-1.0.25/tests/cpp_test.cc b/jni/libsndfile/tests/cpp_test.cc
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/cpp_test.cc
rename to jni/libsndfile/tests/cpp_test.cc
diff --git a/jni/libsndfile-1.0.25/tests/dft_cmp.c b/jni/libsndfile/tests/dft_cmp.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/dft_cmp.c
rename to jni/libsndfile/tests/dft_cmp.c
diff --git a/jni/libsndfile-1.0.25/tests/dft_cmp.h b/jni/libsndfile/tests/dft_cmp.h
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/dft_cmp.h
rename to jni/libsndfile/tests/dft_cmp.h
diff --git a/jni/libsndfile-1.0.25/tests/dither_test.c b/jni/libsndfile/tests/dither_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/dither_test.c
rename to jni/libsndfile/tests/dither_test.c
diff --git a/jni/libsndfile-1.0.25/tests/dwvw_test.c b/jni/libsndfile/tests/dwvw_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/dwvw_test.c
rename to jni/libsndfile/tests/dwvw_test.c
diff --git a/jni/libsndfile-1.0.25/tests/error_test.c b/jni/libsndfile/tests/error_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/error_test.c
rename to jni/libsndfile/tests/error_test.c
diff --git a/jni/libsndfile-1.0.25/tests/external_libs_test.c b/jni/libsndfile/tests/external_libs_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/external_libs_test.c
rename to jni/libsndfile/tests/external_libs_test.c
diff --git a/jni/libsndfile-1.0.25/tests/fix_this.c b/jni/libsndfile/tests/fix_this.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/fix_this.c
rename to jni/libsndfile/tests/fix_this.c
diff --git a/jni/libsndfile-1.0.25/tests/floating_point_test.c b/jni/libsndfile/tests/floating_point_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/floating_point_test.c
rename to jni/libsndfile/tests/floating_point_test.c
diff --git a/jni/libsndfile-1.0.25/tests/floating_point_test.def b/jni/libsndfile/tests/floating_point_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/floating_point_test.def
rename to jni/libsndfile/tests/floating_point_test.def
diff --git a/jni/libsndfile-1.0.25/tests/floating_point_test.tpl b/jni/libsndfile/tests/floating_point_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/floating_point_test.tpl
rename to jni/libsndfile/tests/floating_point_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/format_check_test.c b/jni/libsndfile/tests/format_check_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/format_check_test.c
rename to jni/libsndfile/tests/format_check_test.c
diff --git a/jni/libsndfile-1.0.25/tests/generate.c b/jni/libsndfile/tests/generate.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/generate.c
rename to jni/libsndfile/tests/generate.c
diff --git a/jni/libsndfile-1.0.25/tests/generate.h b/jni/libsndfile/tests/generate.h
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/generate.h
rename to jni/libsndfile/tests/generate.h
diff --git a/jni/libsndfile-1.0.25/tests/header_test.c b/jni/libsndfile/tests/header_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/header_test.c
rename to jni/libsndfile/tests/header_test.c
diff --git a/jni/libsndfile-1.0.25/tests/header_test.def b/jni/libsndfile/tests/header_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/header_test.def
rename to jni/libsndfile/tests/header_test.def
diff --git a/jni/libsndfile-1.0.25/tests/header_test.tpl b/jni/libsndfile/tests/header_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/header_test.tpl
rename to jni/libsndfile/tests/header_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/headerless_test.c b/jni/libsndfile/tests/headerless_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/headerless_test.c
rename to jni/libsndfile/tests/headerless_test.c
diff --git a/jni/libsndfile-1.0.25/tests/largefile_test.c b/jni/libsndfile/tests/largefile_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/largefile_test.c
rename to jni/libsndfile/tests/largefile_test.c
diff --git a/jni/libsndfile-1.0.25/tests/locale_test.c b/jni/libsndfile/tests/locale_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/locale_test.c
rename to jni/libsndfile/tests/locale_test.c
diff --git a/jni/libsndfile-1.0.25/tests/lossy_comp_test.c b/jni/libsndfile/tests/lossy_comp_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/lossy_comp_test.c
rename to jni/libsndfile/tests/lossy_comp_test.c
diff --git a/jni/libsndfile-1.0.25/tests/misc_test.c b/jni/libsndfile/tests/misc_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/misc_test.c
rename to jni/libsndfile/tests/misc_test.c
diff --git a/jni/libsndfile-1.0.25/tests/multi_file_test.c b/jni/libsndfile/tests/multi_file_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/multi_file_test.c
rename to jni/libsndfile/tests/multi_file_test.c
diff --git a/jni/libsndfile-1.0.25/tests/ogg_test.c b/jni/libsndfile/tests/ogg_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/ogg_test.c
rename to jni/libsndfile/tests/ogg_test.c
diff --git a/jni/libsndfile-1.0.25/tests/pcm_test.c b/jni/libsndfile/tests/pcm_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pcm_test.c
rename to jni/libsndfile/tests/pcm_test.c
diff --git a/jni/libsndfile-1.0.25/tests/pcm_test.def b/jni/libsndfile/tests/pcm_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pcm_test.def
rename to jni/libsndfile/tests/pcm_test.def
diff --git a/jni/libsndfile-1.0.25/tests/pcm_test.tpl b/jni/libsndfile/tests/pcm_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pcm_test.tpl
rename to jni/libsndfile/tests/pcm_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/peak_chunk_test.c b/jni/libsndfile/tests/peak_chunk_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/peak_chunk_test.c
rename to jni/libsndfile/tests/peak_chunk_test.c
diff --git a/jni/libsndfile-1.0.25/tests/pedantic-header-test.sh b/jni/libsndfile/tests/pedantic-header-test.sh
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pedantic-header-test.sh
rename to jni/libsndfile/tests/pedantic-header-test.sh
diff --git a/jni/libsndfile-1.0.25/tests/pedantic-header-test.sh.in b/jni/libsndfile/tests/pedantic-header-test.sh.in
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pedantic-header-test.sh.in
rename to jni/libsndfile/tests/pedantic-header-test.sh.in
diff --git a/jni/libsndfile-1.0.25/tests/pipe_test.c b/jni/libsndfile/tests/pipe_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pipe_test.c
rename to jni/libsndfile/tests/pipe_test.c
diff --git a/jni/libsndfile-1.0.25/tests/pipe_test.def b/jni/libsndfile/tests/pipe_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pipe_test.def
rename to jni/libsndfile/tests/pipe_test.def
diff --git a/jni/libsndfile-1.0.25/tests/pipe_test.tpl b/jni/libsndfile/tests/pipe_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/pipe_test.tpl
rename to jni/libsndfile/tests/pipe_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/raw_test.c b/jni/libsndfile/tests/raw_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/raw_test.c
rename to jni/libsndfile/tests/raw_test.c
diff --git a/jni/libsndfile-1.0.25/tests/rdwr_test.c b/jni/libsndfile/tests/rdwr_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/rdwr_test.c
rename to jni/libsndfile/tests/rdwr_test.c
diff --git a/jni/libsndfile-1.0.25/tests/rdwr_test.def b/jni/libsndfile/tests/rdwr_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/rdwr_test.def
rename to jni/libsndfile/tests/rdwr_test.def
diff --git a/jni/libsndfile-1.0.25/tests/rdwr_test.tpl b/jni/libsndfile/tests/rdwr_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/rdwr_test.tpl
rename to jni/libsndfile/tests/rdwr_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/scale_clip_test.c b/jni/libsndfile/tests/scale_clip_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/scale_clip_test.c
rename to jni/libsndfile/tests/scale_clip_test.c
diff --git a/jni/libsndfile-1.0.25/tests/scale_clip_test.def b/jni/libsndfile/tests/scale_clip_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/scale_clip_test.def
rename to jni/libsndfile/tests/scale_clip_test.def
diff --git a/jni/libsndfile-1.0.25/tests/scale_clip_test.tpl b/jni/libsndfile/tests/scale_clip_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/scale_clip_test.tpl
rename to jni/libsndfile/tests/scale_clip_test.tpl
diff --git a/jni/libsndfile-1.0.25/tests/sfversion.c b/jni/libsndfile/tests/sfversion.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/sfversion.c
rename to jni/libsndfile/tests/sfversion.c
diff --git a/jni/libsndfile-1.0.25/tests/stdin_test.c b/jni/libsndfile/tests/stdin_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/stdin_test.c
rename to jni/libsndfile/tests/stdin_test.c
diff --git a/jni/libsndfile-1.0.25/tests/stdio_test.c b/jni/libsndfile/tests/stdio_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/stdio_test.c
rename to jni/libsndfile/tests/stdio_test.c
diff --git a/jni/libsndfile-1.0.25/tests/stdout_test.c b/jni/libsndfile/tests/stdout_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/stdout_test.c
rename to jni/libsndfile/tests/stdout_test.c
diff --git a/jni/libsndfile-1.0.25/tests/string_test.c b/jni/libsndfile/tests/string_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/string_test.c
rename to jni/libsndfile/tests/string_test.c
diff --git a/jni/libsndfile-1.0.25/tests/test_wrapper.sh b/jni/libsndfile/tests/test_wrapper.sh
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/test_wrapper.sh
rename to jni/libsndfile/tests/test_wrapper.sh
diff --git a/jni/libsndfile-1.0.25/tests/test_wrapper.sh.in b/jni/libsndfile/tests/test_wrapper.sh.in
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/test_wrapper.sh.in
rename to jni/libsndfile/tests/test_wrapper.sh.in
diff --git a/jni/libsndfile-1.0.25/tests/ulaw_test.c b/jni/libsndfile/tests/ulaw_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/ulaw_test.c
rename to jni/libsndfile/tests/ulaw_test.c
diff --git a/jni/libsndfile-1.0.25/tests/utils.c b/jni/libsndfile/tests/utils.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/utils.c
rename to jni/libsndfile/tests/utils.c
diff --git a/jni/libsndfile-1.0.25/tests/utils.def b/jni/libsndfile/tests/utils.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/utils.def
rename to jni/libsndfile/tests/utils.def
diff --git a/jni/libsndfile-1.0.25/tests/utils.h b/jni/libsndfile/tests/utils.h
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/utils.h
rename to jni/libsndfile/tests/utils.h
diff --git a/jni/libsndfile-1.0.25/tests/utils.tpl b/jni/libsndfile/tests/utils.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/utils.tpl
rename to jni/libsndfile/tests/utils.tpl
diff --git a/jni/libsndfile-1.0.25/tests/virtual_io_test.c b/jni/libsndfile/tests/virtual_io_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/virtual_io_test.c
rename to jni/libsndfile/tests/virtual_io_test.c
diff --git a/jni/libsndfile-1.0.25/tests/vorbis_test.c b/jni/libsndfile/tests/vorbis_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/vorbis_test.c
rename to jni/libsndfile/tests/vorbis_test.c
diff --git a/jni/libsndfile-1.0.25/tests/win32_ordinal_test.c b/jni/libsndfile/tests/win32_ordinal_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/win32_ordinal_test.c
rename to jni/libsndfile/tests/win32_ordinal_test.c
diff --git a/jni/libsndfile-1.0.25/tests/win32_test.c b/jni/libsndfile/tests/win32_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/win32_test.c
rename to jni/libsndfile/tests/win32_test.c
diff --git a/jni/libsndfile-1.0.25/tests/write_read_test.c b/jni/libsndfile/tests/write_read_test.c
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/write_read_test.c
rename to jni/libsndfile/tests/write_read_test.c
diff --git a/jni/libsndfile-1.0.25/tests/write_read_test.def b/jni/libsndfile/tests/write_read_test.def
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/write_read_test.def
rename to jni/libsndfile/tests/write_read_test.def
diff --git a/jni/libsndfile-1.0.25/tests/write_read_test.tpl b/jni/libsndfile/tests/write_read_test.tpl
similarity index 100%
rename from jni/libsndfile-1.0.25/tests/write_read_test.tpl
rename to jni/libsndfile/tests/write_read_test.tpl
diff --git a/jni/sflphone b/jni/sflphone
index 05152cb..085d128 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit 05152cb310003c9b9cac6bfe7a249fe9da6affa2
+Subproject commit 085d128eeebbf0b056ba0b62005a9ad96bc57a1e
