Revert "refs #1753: version 2.1"

This reverts commit 98b4eec.
codevise · Feb 17, 2011 · 6688d79 · 6688d79
1 parent 98b4eec
commit 6688d79
Show file tree

Hide file tree

Showing 38 changed files with 2,704 additions and 2,509 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -23,16 +23,15 @@
 // see ADDITIONAL_TERMS.txt
 /////////////////////////////////////////////////////////////////////
  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.sipdroid.sipua"
-    android:versionName="2.1 beta"
-    android:versionCode="81"
-    android:installLocation="auto">
+<manifest package="org.sipdroid.sipua"
+    android:versionName="2.0.1 beta"
+    android:versionCode="79"
+    android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4"/>
 	<supports-screens
           android:normalScreens="true"
           android:smallScreens="true"
-          android:largeScreens="true"
+          android:largeScreens="false"
           android:anyDensity="false" />
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 	<uses-feature android:name="android.hardware.location" android:required="false"/>
@@ -103,9 +102,9 @@
 	        android:configChanges="orientation|keyboardHidden">
         </activity>
         <activity android:name=".ui.InCallScreen" android:label="@string/app_name"
-	        android:excludeFromRecents="true" android:taskAffinity=""
-	        android:launchMode="singleInstance">
+	        android:excludeFromRecents="true" android:taskAffinity="" android:launchMode="singleTask">
         </activity>
+
 	    <receiver android:name=".ui.OneShotAlarm"/>
 	    <receiver android:name=".ui.OneShotAlarm2"/>
 	    <receiver android:name=".ui.LoopAlarm"/>

diff --git a/jni/Android.mk b/jni/Android.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 SPEEX	:= speex-1.2rc1
-SILK     := silk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := OSNetworkSystem
@@ -85,131 +84,130 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(BV16)/bvcommon $(LOCAL_PATH)/$(BV16)/bv16 $(
 #LOCAL_CFLAGS = -O3 -DWMOPS=0 -DG192BITSTREAM=0
 include $(BUILD_SHARED_LIBRARY)
 
-
 SILK     := silk
 LOCAL_MODULE    := silkcommon
+LOCAL_MODULE_FILENAME := silkcommon
 LOCAL_SRC_FILES :=  $(SILK)/src/SKP_Silk_A2NLSF.c \
-	$(SILK)/src/SKP_Silk_CNG.c \
-	$(SILK)/src/SKP_Silk_HP_variable_cutoff_FIX.c \
-	$(SILK)/src/SKP_Silk_LBRR_reset.c \
-	$(SILK)/src/SKP_Silk_LPC_inv_pred_gain.c \
-	$(SILK)/src/SKP_Silk_LPC_stabilize.c \
-	$(SILK)/src/SKP_Silk_LPC_synthesis_filter.c \
-	$(SILK)/src/SKP_Silk_LPC_synthesis_order16.c \
-	$(SILK)/src/SKP_Silk_LP_variable_cutoff.c \
-	$(SILK)/src/SKP_Silk_LSF_cos_table.c \
-	$(SILK)/src/SKP_Silk_LTP_analysis_filter_FIX.c \
-	$(SILK)/src/SKP_Silk_LTP_scale_ctrl_FIX.c \
-	$(SILK)/src/SKP_Silk_MA.c \
-	$(SILK)/src/SKP_Silk_NLSF2A.c \
-	$(SILK)/src/SKP_Silk_NLSF2A_stable.c \
-	$(SILK)/src/SKP_Silk_NLSF_MSVQ_decode.c \
-	$(SILK)/src/SKP_Silk_NLSF_MSVQ_encode_FIX.c \
-	$(SILK)/src/SKP_Silk_NLSF_VQ_rate_distortion_FIX.c \
-	$(SILK)/src/SKP_Silk_NLSF_VQ_sum_error_FIX.c \
-	$(SILK)/src/SKP_Silk_NLSF_VQ_weights_laroia.c \
-	$(SILK)/src/SKP_Silk_NLSF_stabilize.c \
-	$(SILK)/src/SKP_Silk_NSQ.c \
-	$(SILK)/src/SKP_Silk_NSQ_del_dec.c \
-	$(SILK)/src/SKP_Silk_PLC.c \
-	$(SILK)/src/SKP_Silk_VAD.c \
-	$(SILK)/src/SKP_Silk_VQ_nearest_neighbor_FIX.c \
-	$(SILK)/src/SKP_Silk_allpass_int.c \
-	$(SILK)/src/SKP_Silk_ana_filt_bank_1.c \
-	$(SILK)/src/SKP_Silk_apply_sine_window.c \
-	$(SILK)/src/SKP_Silk_array_maxabs.c \
-	$(SILK)/src/SKP_Silk_autocorr.c \
-	$(SILK)/src/SKP_Silk_biquad.c \
-	$(SILK)/src/SKP_Silk_biquad_alt.c \
-	$(SILK)/src/SKP_Silk_burg_modified.c \
-	$(SILK)/src/SKP_Silk_bwexpander.c \
-	$(SILK)/src/SKP_Silk_bwexpander_32.c \
-	$(SILK)/src/SKP_Silk_code_signs.c \
-	$(SILK)/src/SKP_Silk_control_codec_FIX.c \
-	$(SILK)/src/SKP_Silk_corrMatrix_FIX.c \
-	$(SILK)/src/SKP_Silk_create_init_destroy.c \
-	$(SILK)/src/SKP_Silk_dec_API.c \
-	$(SILK)/src/SKP_Silk_decode_core.c \
-	$(SILK)/src/SKP_Silk_decode_frame.c \
-	$(SILK)/src/SKP_Silk_decode_indices_v4.c \
-	$(SILK)/src/SKP_Silk_decode_parameters.c \
-	$(SILK)/src/SKP_Silk_decode_parameters_v4.c \
-	$(SILK)/src/SKP_Silk_decode_pulses.c \
-	$(SILK)/src/SKP_Silk_decoder_set_fs.c \
-	$(SILK)/src/SKP_Silk_detect_SWB_input.c \
-	$(SILK)/src/SKP_Silk_enc_API.c \
-	$(SILK)/src/SKP_Silk_encode_frame_FIX.c \
-	$(SILK)/src/SKP_Silk_encode_parameters.c \
-	$(SILK)/src/SKP_Silk_encode_parameters_v4.c \
-	$(SILK)/src/SKP_Silk_encode_pulses.c \
-	$(SILK)/src/SKP_Silk_find_LPC_FIX.c \
-	$(SILK)/src/SKP_Silk_find_LTP_FIX.c \
-	$(SILK)/src/SKP_Silk_find_pitch_lags_FIX.c \
-	$(SILK)/src/SKP_Silk_find_pred_coefs_FIX.c \
-	$(SILK)/src/SKP_Silk_gain_quant.c \
-	$(SILK)/src/SKP_Silk_init_encoder_FIX.c \
-	$(SILK)/src/SKP_Silk_inner_prod_aligned.c \
-	$(SILK)/src/SKP_Silk_interpolate.c \
-	$(SILK)/src/SKP_Silk_k2a.c \
-	$(SILK)/src/SKP_Silk_k2a_Q16.c \
-	$(SILK)/src/SKP_Silk_lin2log.c \
-	$(SILK)/src/SKP_Silk_log2lin.c \
-	$(SILK)/src/SKP_Silk_lowpass_int.c \
-	$(SILK)/src/SKP_Silk_lowpass_short.c \
-	$(SILK)/src/SKP_Silk_noise_shape_analysis_FIX.c \
-	$(SILK)/src/SKP_Silk_pitch_analysis_core.c \
-	$(SILK)/src/SKP_Silk_pitch_est_tables.c \
-	$(SILK)/src/SKP_Silk_prefilter_FIX.c \
-	$(SILK)/src/SKP_Silk_process_NLSFs_FIX.c \
-	$(SILK)/src/SKP_Silk_process_gains_FIX.c \
-	$(SILK)/src/SKP_Silk_pulses_to_bytes.c \
-	$(SILK)/src/SKP_Silk_quant_LTP_gains_FIX.c \
-	$(SILK)/src/SKP_Silk_range_coder.c \
-	$(SILK)/src/SKP_Silk_regularize_correlations_FIX.c \
-	$(SILK)/src/SKP_Silk_resample_1_2.c \
-	$(SILK)/src/SKP_Silk_resample_1_2_coarse.c \
-	$(SILK)/src/SKP_Silk_resample_1_2_coarsest.c \
-	$(SILK)/src/SKP_Silk_resample_1_3.c \
-	$(SILK)/src/SKP_Silk_resample_2_1_coarse.c \
-	$(SILK)/src/SKP_Silk_resample_2_3.c \
-	$(SILK)/src/SKP_Silk_resample_2_3_coarse.c \
-	$(SILK)/src/SKP_Silk_resample_2_3_coarsest.c \
-	$(SILK)/src/SKP_Silk_resample_2_3_rom.c \
-	$(SILK)/src/SKP_Silk_resample_3_1.c \
-	$(SILK)/src/SKP_Silk_resample_3_2.c \
-	$(SILK)/src/SKP_Silk_resample_3_2_rom.c \
-	$(SILK)/src/SKP_Silk_resample_3_4.c \
-	$(SILK)/src/SKP_Silk_resample_4_3.c \
-	$(SILK)/src/SKP_Silk_residual_energy16_FIX.c \
-	$(SILK)/src/SKP_Silk_residual_energy_FIX.c \
-	$(SILK)/src/SKP_Silk_scale_copy_vector16.c \
-	$(SILK)/src/SKP_Silk_scale_vector.c \
-	$(SILK)/src/SKP_Silk_schur.c \
-	$(SILK)/src/SKP_Silk_schur64.c \
-	$(SILK)/src/SKP_Silk_shell_coder.c \
-	$(SILK)/src/SKP_Silk_sigm_Q15.c \
-	$(SILK)/src/SKP_Silk_solve_LS_FIX.c \
-	$(SILK)/src/SKP_Silk_sort.c \
-	$(SILK)/src/SKP_Silk_sum_sqr_shift.c \
-	$(SILK)/src/SKP_Silk_tables_LTP.c \
-	$(SILK)/src/SKP_Silk_tables_NLSF_CB0_10.c \
-	$(SILK)/src/SKP_Silk_tables_NLSF_CB0_16.c \
-	$(SILK)/src/SKP_Silk_tables_NLSF_CB1_10.c \
-	$(SILK)/src/SKP_Silk_tables_NLSF_CB1_16.c \
-	$(SILK)/src/SKP_Silk_tables_gain.c \
-	$(SILK)/src/SKP_Silk_tables_other.c \
-	$(SILK)/src/SKP_Silk_tables_pitch_lag.c \
-	$(SILK)/src/SKP_Silk_tables_pulses_per_block.c \
-	$(SILK)/src/SKP_Silk_tables_sign.c \
-	$(SILK)/src/SKP_Silk_tables_type_offset.c
-	
+    $(SILK)/src/SKP_Silk_CNG.c \
+    $(SILK)/src/SKP_Silk_HP_variable_cutoff_FIX.c \
+    $(SILK)/src/SKP_Silk_LBRR_reset.c \
+    $(SILK)/src/SKP_Silk_LPC_inv_pred_gain.c \
+    $(SILK)/src/SKP_Silk_LPC_stabilize.c \
+    $(SILK)/src/SKP_Silk_LPC_synthesis_filter.c \
+    $(SILK)/src/SKP_Silk_LPC_synthesis_order16.c \
+    $(SILK)/src/SKP_Silk_LP_variable_cutoff.c \
+    $(SILK)/src/SKP_Silk_LSF_cos_table.c \
+    $(SILK)/src/SKP_Silk_LTP_analysis_filter_FIX.c \
+    $(SILK)/src/SKP_Silk_LTP_scale_ctrl_FIX.c \
+    $(SILK)/src/SKP_Silk_MA.c \
+    $(SILK)/src/SKP_Silk_NLSF2A.c \
+    $(SILK)/src/SKP_Silk_NLSF2A_stable.c \
+    $(SILK)/src/SKP_Silk_NLSF_MSVQ_decode.c \
+    $(SILK)/src/SKP_Silk_NLSF_MSVQ_encode_FIX.c \
+    $(SILK)/src/SKP_Silk_NLSF_VQ_rate_distortion_FIX.c \
+    $(SILK)/src/SKP_Silk_NLSF_VQ_sum_error_FIX.c \
+    $(SILK)/src/SKP_Silk_NLSF_VQ_weights_laroia.c \
+    $(SILK)/src/SKP_Silk_NLSF_stabilize.c \
+    $(SILK)/src/SKP_Silk_NSQ.c \
+    $(SILK)/src/SKP_Silk_NSQ_del_dec.c \
+    $(SILK)/src/SKP_Silk_PLC.c \
+    $(SILK)/src/SKP_Silk_VAD.c \
+    $(SILK)/src/SKP_Silk_VQ_nearest_neighbor_FIX.c \
+    $(SILK)/src/SKP_Silk_allpass_int.c \
+    $(SILK)/src/SKP_Silk_ana_filt_bank_1.c \
+    $(SILK)/src/SKP_Silk_apply_sine_window.c \
+    $(SILK)/src/SKP_Silk_array_maxabs.c \
+    $(SILK)/src/SKP_Silk_autocorr.c \
+    $(SILK)/src/SKP_Silk_biquad.c \
+    $(SILK)/src/SKP_Silk_biquad_alt.c \
+    $(SILK)/src/SKP_Silk_burg_modified.c \
+    $(SILK)/src/SKP_Silk_bwexpander.c \
+    $(SILK)/src/SKP_Silk_bwexpander_32.c \
+    $(SILK)/src/SKP_Silk_code_signs.c \
+    $(SILK)/src/SKP_Silk_control_codec_FIX.c \
+    $(SILK)/src/SKP_Silk_corrMatrix_FIX.c \
+    $(SILK)/src/SKP_Silk_create_init_destroy.c \
+    $(SILK)/src/SKP_Silk_dec_API.c \
+    $(SILK)/src/SKP_Silk_decode_core.c \
+    $(SILK)/src/SKP_Silk_decode_frame.c \
+    $(SILK)/src/SKP_Silk_decode_indices_v4.c \
+    $(SILK)/src/SKP_Silk_decode_parameters.c \
+    $(SILK)/src/SKP_Silk_decode_parameters_v4.c \
+    $(SILK)/src/SKP_Silk_decode_pulses.c \
+    $(SILK)/src/SKP_Silk_decoder_set_fs.c \
+    $(SILK)/src/SKP_Silk_detect_SWB_input.c \
+    $(SILK)/src/SKP_Silk_enc_API.c \
+    $(SILK)/src/SKP_Silk_encode_frame_FIX.c \
+    $(SILK)/src/SKP_Silk_encode_parameters.c \
+    $(SILK)/src/SKP_Silk_encode_parameters_v4.c \
+    $(SILK)/src/SKP_Silk_encode_pulses.c \
+    $(SILK)/src/SKP_Silk_find_LPC_FIX.c \
+    $(SILK)/src/SKP_Silk_find_LTP_FIX.c \
+    $(SILK)/src/SKP_Silk_find_pitch_lags_FIX.c \
+    $(SILK)/src/SKP_Silk_find_pred_coefs_FIX.c \
+    $(SILK)/src/SKP_Silk_gain_quant.c \
+    $(SILK)/src/SKP_Silk_init_encoder_FIX.c \
+    $(SILK)/src/SKP_Silk_inner_prod_aligned.c \
+    $(SILK)/src/SKP_Silk_interpolate.c \
+    $(SILK)/src/SKP_Silk_k2a.c \
+    $(SILK)/src/SKP_Silk_k2a_Q16.c \
+    $(SILK)/src/SKP_Silk_lin2log.c \
+    $(SILK)/src/SKP_Silk_log2lin.c \
+    $(SILK)/src/SKP_Silk_lowpass_int.c \
+    $(SILK)/src/SKP_Silk_lowpass_short.c \
+    $(SILK)/src/SKP_Silk_noise_shape_analysis_FIX.c \
+    $(SILK)/src/SKP_Silk_pitch_analysis_core.c \
+    $(SILK)/src/SKP_Silk_pitch_est_tables.c \
+    $(SILK)/src/SKP_Silk_prefilter_FIX.c \
+    $(SILK)/src/SKP_Silk_process_NLSFs_FIX.c \
+    $(SILK)/src/SKP_Silk_process_gains_FIX.c \
+    $(SILK)/src/SKP_Silk_pulses_to_bytes.c \
+    $(SILK)/src/SKP_Silk_quant_LTP_gains_FIX.c \
+    $(SILK)/src/SKP_Silk_range_coder.c \
+    $(SILK)/src/SKP_Silk_regularize_correlations_FIX.c \
+    $(SILK)/src/SKP_Silk_resample_1_2.c \
+    $(SILK)/src/SKP_Silk_resample_1_2_coarse.c \
+    $(SILK)/src/SKP_Silk_resample_1_2_coarsest.c \
+    $(SILK)/src/SKP_Silk_resample_1_3.c \
+    $(SILK)/src/SKP_Silk_resample_2_1_coarse.c \
+    $(SILK)/src/SKP_Silk_resample_2_3.c \
+    $(SILK)/src/SKP_Silk_resample_2_3_coarse.c \
+    $(SILK)/src/SKP_Silk_resample_2_3_coarsest.c \
+    $(SILK)/src/SKP_Silk_resample_2_3_rom.c \
+    $(SILK)/src/SKP_Silk_resample_3_1.c \
+    $(SILK)/src/SKP_Silk_resample_3_2.c \
+    $(SILK)/src/SKP_Silk_resample_3_2_rom.c \
+    $(SILK)/src/SKP_Silk_resample_3_4.c \
+    $(SILK)/src/SKP_Silk_resample_4_3.c \
+    $(SILK)/src/SKP_Silk_residual_energy16_FIX.c \
+    $(SILK)/src/SKP_Silk_residual_energy_FIX.c \
+    $(SILK)/src/SKP_Silk_scale_copy_vector16.c \
+    $(SILK)/src/SKP_Silk_scale_vector.c \
+    $(SILK)/src/SKP_Silk_schur.c \
+    $(SILK)/src/SKP_Silk_schur64.c \
+    $(SILK)/src/SKP_Silk_shell_coder.c \
+    $(SILK)/src/SKP_Silk_sigm_Q15.c \
+    $(SILK)/src/SKP_Silk_solve_LS_FIX.c \
+    $(SILK)/src/SKP_Silk_sort.c \
+    $(SILK)/src/SKP_Silk_sum_sqr_shift.c \
+    $(SILK)/src/SKP_Silk_tables_LTP.c \
+    $(SILK)/src/SKP_Silk_tables_NLSF_CB0_10.c \
+    $(SILK)/src/SKP_Silk_tables_NLSF_CB0_16.c \
+    $(SILK)/src/SKP_Silk_tables_NLSF_CB1_10.c \
+    $(SILK)/src/SKP_Silk_tables_NLSF_CB1_16.c \
+    $(SILK)/src/SKP_Silk_tables_gain.c \
+    $(SILK)/src/SKP_Silk_tables_other.c \
+    $(SILK)/src/SKP_Silk_tables_pitch_lag.c \
+    $(SILK)/src/SKP_Silk_tables_pulses_per_block.c \
+    $(SILK)/src/SKP_Silk_tables_sign.c \
+    $(SILK)/src/SKP_Silk_tables_type_offset.c
+    
 LOCAL_ARM_MODE := arm
 LOCAL_CFLAGS = -O3 
 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SILK)/src $(LOCAL_PATH)/$(SILK)/interface
 include $(BUILD_STATIC_LIBRARY)
 
-
 include $(CLEAR_VARS)
 LOCAL_MODULE    := silk8_jni
 LOCAL_SRC_FILES := silk8_jni.cpp 
@@ -267,4 +265,35 @@ LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SPANDSP)/spandsp $(LOCAL_PATH)/$(SPANDSP)
 LOCAL_CFLAGS = -O3
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+MPG123 := mpg123
+LOCAL_ARM_MODE  := arm
+LOCAL_MODULE    := libmpg123
+LOCAL_SRC_FILES := $(MPG123)/equalizer.c \
+                   $(MPG123)/index.c \
+                   $(MPG123)/layer2.c \
+                   $(MPG123)/synth.c \
+                   $(MPG123)/dct64.c \
+                   $(MPG123)/format.c \
+                   $(MPG123)/layer3.c \
+                   $(MPG123)/ntom.c \
+                   $(MPG123)/parse.c \
+                   $(MPG123)/readers.c \
+                   $(MPG123)/frame.c \
+                   $(MPG123)/layer1.c \
+                   $(MPG123)/libmpg123.c \
+                   $(MPG123)/optimize.c \
+                   $(MPG123)/synth_arm.S \
+                   $(MPG123)/tabinit.c \
+                   $(MPG123)/id3.c
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_ARM_MODE  := arm
+LOCAL_SRC_FILES := mp3wrapper/mp3.c
+LOCAL_MODULE := mp3
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
+LOCAL_STATIC_LIBRARIES := libmpg123
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_PROJECT_PATH := $(call my-dir)
+#APP_PROJECT_PATH := $(call my-dir)
 APP_MODULES  := OSNetworkSystem
 APP_MODULES	 += speex_jni
 APP_MODULES	 += bv16_jni
@@ -8,6 +8,7 @@ APP_MODULES	 += silkcommon
 #APP_MODULES	 += silk24_jni
 APP_MODULES	 += g722_jni
 APP_MODULES	 += gsm_jni
+APP_MODULES += mp3
 
-APP_OPTIM        := release 
+APP_OPTIM        := release
 APP_CFLAGS       += -O3