Updating library to build all supported archs, also initialize uninitialized variables.

Author: lukeweber

README.md

@@ -3,13 +3,12 @@ iLBC Android
 
 [Internet low bitrate codec](http://en.wikipedia.org/wiki/Internet_Low_Bit_Rate_Codec). This is a swc that wraps the base functionality of the iLBC codec now maintained by google as part of the [WebRTC](http://www.webrtc.org/) project.
 
-Based loosely on an android version of iLBC at http://code.google.com/p/android-ilbc.
-
 Changes
-* Built based on webrtc code instead of rfc
-* Adds option to use noise supression from webrtc in the encode method.
-* Uses 30ms mode only.
+* Built based on webrtc trunk
+* Adds option to use noise supression from webrtc in the encode method
+* Uses 30ms mode only
 
 Building
-* Download webrtc into jni directory. svn co http://webrtc.googlecode.com/svn/trunk jni/webrtc
-* Download the android NDK and run ndk-build in the root directory.
+* svn co http://webrtc.googlecode.com/svn/trunk jni/webrtc
+* Download the android NDK
+* ndk-build NDK_APPLICATION_MK=jni/Applicaiton.mk

jni/Android.mk

@@ -1,5 +1,5 @@
 #ARCH_ARM_HAVE_ARMV7A := true
-TARGET_ARCH := arm
+#TARGET_ARCH := arm
 
 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
 #
@@ -19,7 +19,7 @@ LOCAL_PATH := $(ILBC_WRAPPER_MAIN_PATH)
 include $(CLEAR_VARS)
 
 
-LOCAL_ARM_MODE := arm
+#LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES :=\

jni/Applicaiton.mk

@@ -1,6 +1,4 @@
-# ARMv7 is significanly faster due to the use of the hardware FPU
 APP_STL := gnustl_static
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := all
 APP_OPTIM := release
-APP_BUILD_SCRIPT := /Users/lukeweber/iLBC-android-wrapper/jni/Android.mk
-# APP_CPPFLAGS += -fexceptions -frtti
+APP_CFLAGS := -Werror

jni/iLBC_codec.c

@@ -10,10 +10,10 @@
 #define LOG_TAG "iLBC_codec"
 
 #include <android/log.h>
-#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) 
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG  , LOG_TAG, __VA_ARGS__) 
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO   , LOG_TAG, __VA_ARGS__) 
-#define LOGW(...) __android_log_print(ANDROID_LOG_WARN   , LOG_TAG, __VA_ARGS__) 
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG  , LOG_TAG, __VA_ARGS__)
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO   , LOG_TAG, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN   , LOG_TAG, __VA_ARGS__)
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR  , LOG_TAG, __VA_ARGS__)
 
 #define JNI_COPY  0
@@ -65,7 +65,9 @@ jint Java_com_tuenti_androidilbc_Codec_encode(JNIEnv *env, jobject this,
     jsize src_size, dest_size;
     jbyte *src_bytes, *dest_bytes;
 
-    int bytes_remaining, bytes_encoded, bytes;
+    int bytes_remaining = 0;
+    int bytes_encoded = 0;
+    int bytes = 0;
 
     encoding = 1;
     if(Enc_Inst == NULL){
@@ -133,14 +135,16 @@ jint Java_com_tuenti_androidilbc_Codec_resetDecoder(JNIEnv *env, jobject this){
     return 1;
 }
 
-jint Java_com_tuenti_androidilbc_Codec_decode(JNIEnv *env, jobject this, 
+jint Java_com_tuenti_androidilbc_Codec_decode(JNIEnv *env, jobject this,
             jbyteArray src, jint src_offset, jint src_len, jbyteArray dest)
 {
     jsize src_size, dest_size;
     jbyte *src_bytes, *dest_bytes;
 
-    int bytes_remaining, bytes_decoded, num_samples;
-    short speechType;
+    int bytes_remaining = 0;
+    int bytes_decoded = 0;
+    int num_samples = 0;
+    short speechType = 0;
 
     src_size = (*env)->GetArrayLength(env, src);
     src_bytes = (*env)->GetByteArrayElements(env, src, JNI_COPY);