1.2 beta

Voice Compression over EDGE

git-svn-id: http://sipdroid.googlecode.com/svn/trunk@377 8b64e154-0f13-11de-9106-f38757f67524

AndroidManifest.xml

@@ -25,8 +25,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.sipdroid.sipua"
-    android:versionName="1.1.8 beta"
-    android:versionCode="37">
+    android:versionName="1.2 beta"
+    android:versionCode="38">
 	<uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon64" android:label="@string/app_name">
         <activity android:name=".ui.Sipdroid" android:label="@string/app_name" android:launchMode="singleInstance"
@@ -43,13 +43,27 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="sms" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tel" />
+            </intent-filter>
         </activity>
         <activity android:name=".ui.SIP" android:label="@string/sip_name">
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="sms" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tel" />
+            </intent-filter>
         </activity>
         <activity android:name=".ui.AutoAnswer" android:label="@string/app_name"/>
         <activity android:name=".ui.SIPUri" android:label="@string/app_name">

jni/pjlib_linker_jni.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2009 The Sipdroid Open Source Project
+ * 
+ * This file is part of Sipdroid (http://www.sipdroid.org)
+ * 
+ * Sipdroid is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This source code is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this source code; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <jni.h>
 #include <JNIHelp.h>
 #include <android_runtime/AndroidRuntime.h>

res/values-cs/strings.xml

@@ -42,6 +42,8 @@
 \nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 \nCopyright (C) 2006 The Android Open Source Project (http://android.com)
 \nCopyright (C) 2005 Luca Veltri - University of Parma - Italy (http://mjsip.org)
+\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 \n
 \nTento program je free software, můžete jej redistribuovat a/nebo modifikovat za podmínek stanovených v GNU General Public License zveřejněnou nadací Free Software Foundation, buďto ve verzi 3 nebo (podle vaší volby) jakékoliv její pozdější verze.
 \n
@@ -72,7 +74,8 @@
 
 <string name="settings_options">Možnosti volání</string>
 <string name="settings_wlan">Použít WLAN</string>
-<string name="settings_3g">Použít 3G/EDGE</string>
+<string name="settings_3g">Použít 3G</string>
+<string name="settings_edge">Použít EDGE</string>
 <string name="settings_check">Ověřte si u vašeho operátora, jestli má povolené VoIP.</string>
 <string name="settings_pref">Preferovaný typ volání</string>
     <string-array name="pref_display_values">
@@ -85,7 +88,6 @@
 <string name="settings_auto_ondemand2">Zobrazit přepínač ve stavovém řádku</string>
 
 <string name="settings_advanced_options">Pokročilé možnosti</string>
-<string name="settings_minedge">Síla signálu pro EDGE volání</string>
 <string name="settings_policy_never">Změnit politiku uspání na Wifi stále zapnuto.</string>
 <string name="settings_policy_default">Resetovat politiku uspání na výchozí.</string>
 <string name="settings_search">Najít a nahradit</string>

res/values-de/strings.xml

@@ -42,6 +42,8 @@
 \nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 \nCopyright (C) 2006 The Android Open Source Project (http://android.com)
 \nCopyright (C) 2005 Luca Veltri - University of Parma - Italy (http://mjsip.org)
+\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 \n
 \nDieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.
 \n
@@ -72,16 +74,21 @@
         <item>TCP (längerer Standby mit 3G)</item>
     </string-array>
 
-
 <string name="settings_options">Anrufeinstellungen</string>
 <string name="settings_wlan">WLAN verwenden</string>
-<string name="settings_3g">3G/EDGE verwenden</string>
+<string name="settings_3g">3G verwenden</string>
+<string name="settings_edge">EDGE verwenden</string>
 <string name="settings_check">Prüfen Sie, ob Ihr Mobilfunkanbieter VoIP-Nutzung erlaubt</string>
 <string name="settings_pref">Bevorzugte Anrufart</string>
     <string-array name="pref_display_values">
         <item>Sipdroid, wenn verfügbar</item>
         <item>Telefon</item>
     </string-array>
+<string name="settings_compression">Sprachkompression</string>
+    <string-array name="compression_display_values">
+        <item>Nur über EDGE</item>
+        <item>Immer aktiv</item>
+    </string-array>
 <string name="settings_auto_on">Rufannahme im Betrieb</string>
 <string name="settings_auto_on2">Bei eingeschaltetem Bildschirm mit kurzem Vibrationsalarm</string>
 <string name="settings_auto_ondemand">Rufannahme nach Bedarf</string>
@@ -90,7 +97,6 @@
 <string name="settings_MWI2">Eingang neuer Nachrichten anzeigen</string>
 
 <string name="settings_advanced_options">Erweiterte Einstellungen</string>
-<string name="settings_minedge">Signalstärke für EDGE-Anrufe</string>
 <string name="settings_policy_never">Systemeinstellung geändert: WLAN bleibt bei Standy in Betrieb</string>
 <string name="settings_policy_default">Systemeinstellung wiederhergestellt: WLAN geht bei Standby außer Betrieb</string>
 <string name="settings_search">Suchen &amp; Ersetzen</string>

res/values-fr/strings.xml

@@ -16,6 +16,8 @@
 		\nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 		\nCopyright (C) 2006 Le projet Open Source Android (http://android.com)
 		\nCopyright (C) 2005 Luca Veltri - University de Parme - Italie (http://mjsip.org)
+		\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+		\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 		\n
 		\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU (GPL) comme publiée par la Free Software Foundation; ou en version 3 de la	licence, ou (à votre guise) n\'importe quelle autre version.
 		\n
@@ -53,7 +55,8 @@
 
 	<string name="settings_options">Options d\'appel</string>
 	<string name="settings_wlan">Utiliser le WLAN</string>
-	<string name="settings_3g">Utiliser la 3G/EDGE</string>
+	<string name="settings_3g">Utiliser la 3G</string>
+	<string name="settings_edge">Utiliser la EDGE</string>
 	<string name="settings_check">Vérifier auprès de votre opérateur mobile si il permet la VoIP</string>
 	<string name="settings_pref">Type d\'appel préféré</string>
 	<string-array name="pref_display_values">
@@ -72,16 +75,8 @@
 	<string name="settings_MWI2">S\'abonner à l\'attente de messages SIP</string>
 
 	<string name="settings_advanced_options">Options Avancées</string>
-	<string name="settings_minedge">Barres de signal pour les appels EDGE</string>
 	<string name="settings_policy_never">Politique de mise en veille changée pour maintenir le Wifi allumé.</string>
 	<string name="settings_policy_default">Retour aux paramètres par défaut de la politique de mise en veille du Wifi.</string>
-	<string-array name="bars">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-		<item>3</item>
-		<item>4</item>
-	</string-array>
 	<string name="settings_search">Chercher &amp; Remplacer</string>
 	<string name="settings_excludepat">Exclure des motifs</string>
 	<string name="settings_sipringtone">Sonnerie SIP</string>

res/values-pt/strings.xml

@@ -29,8 +29,11 @@
 	<string name="about">Sipdroid é um cliente SIP open-source para o
  Android\n\nVeja http://sipdroid.org para mais informações
  \n\nVersão ${VERSION}\nSoftware disponível para testes.\n\nCopyright 2009 The Sipdroid Open Source Project (http://sipdroid.org)\nCopyright 2008 Hughes Systique Corporation, E.U.A. (http://hsc.com)\nCopyright 2006 The Android Open Source Project (http://android.com)
-\nCopyright 2005 Luca Veltri - Universidade de Parma - Itália
- (http://mjsip.org)\n\nEste programa é livre, você pode redistribuí-lo e/ou modificá-lo sob os
+ \nCopyright 2005 Luca Veltri - Universidade de Parma - Itália
+ (http://mjsip.org)
+ \nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+ \nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ \n\nEste programa é livre, você pode redistribuí-lo e/ou modificá-lo sob os
  termos da GNU General Public License conforme publicada pela Free
  Software Foundation, versão 3 da Licença, ou (na sua opção) qualquer versão posterior.\n\nEste programa é distribuído na esperança de que será útil, mas SEM
  QUALQUER GARANTIA, mesmo sem a garantia implícita de COMERCIABILIDADE
@@ -110,7 +113,8 @@
 
 	<string name="settings_options">Opções de Chamada</string>
 	<string name="settings_wlan">Usar WLAN</string>
-	<string name="settings_3g">Usar 3G/EDGE</string>
+	<string name="settings_3g">Usar 3G</string>
+	<string name="settings_edge">Usar EDGE</string>
 	<string name="settings_check">Consulte o seu operador móvel, se ele permite VoIP</string>
 	<string name="settings_pref">Tipo de chamada</string>
 	<string-array name="pref_display_values">
@@ -129,16 +133,8 @@
 	<string name="settings_MWI2">Subscrever mensagem em espera SIP </string>
 
 	<string name="settings_advanced_options">Opções Avançadas</string>
-	<string name="settings_minedge">Barras de sinal para chamadas EDGE</string>
 	<string name="settings_policy_never">Alterar política de suspensão para manter o Wifi ligado.</string>
 	<string name="settings_policy_default">Redefinir política de suspensão do Wifi para o valor padrão.</string>
-	<string-array name="bars">
-		<item>0</item>
-		<item>1</item>
-		<item>2</item>
-		<item>3</item>
-		<item>4</item>
-	</string-array>
 	<string name="settings_search">Procurar &amp; Substituir</string>
 	<string name="settings_excludepat">Padrão de Exclusão</string>
 	<string name="settings_sipringtone">Toque SIP</string>

res/values-ro/strings.xml

@@ -41,6 +41,8 @@
 \nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 \nCopyright (C) 2006 The Android Open Source Project (http://android.com)
 \nCopyright (C) 2005 Luca Veltri - University of Parma - Italy (http://mjsip.org)
+\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 \n
 \nAcest program este gratuit; se poate redistribui sau/şi modifica în termenii specificaţi de GNU General Public Licence, asa cum este publicată de Free Software Foundation; fie versiunea 3 a licenţei, fie (la optiunea ta) orice alta versiune ulterioară. 
 \n
@@ -77,7 +79,8 @@
 
 <string name="settings_options">Opţiuni Apelare</string>
 <string name="settings_wlan">Foloseste WLAN</string>
-<string name="settings_3g">Foloseste 3G/EDGE</string>
+<string name="settings_3g">Foloseste 3G</string>
+<string name="settings_edge">Foloseste EDGE</string>
 <string name="settings_check">Verifică dacă operatorul de telefonie mobilă permite VoIP</string>
 <string name="settings_pref">Tip apelare preferat</string>
     <string-array name="pref_display_values">
@@ -96,16 +99,8 @@
 <string name="settings_MWI2">Subscrie pentru aşteptare mesaje SIP</string>
 
 <string name="settings_advanced_options">Opţiuni avansate</string>
-<string name="settings_minedge">Bare de semnal pentru conexiunile EDGE</string>
 <string name="settings_policy_never">Politica de repaus schimbată pentru a ţine Wifi pornit.</string>
 <string name="settings_policy_default">Resetare politica de repaus Wifi la initial.</string>
-    <string-array name="bars">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
 <string name="settings_search">Caută &amp; Modifică</string>
 <string name="settings_excludepat">Şablon Excludere</string>
 <string name="settings_sipringtone">Ton de apel SIP</string>

res/values-ru/strings.xml

@@ -42,6 +42,8 @@
 \nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 \nCopyright (C) 2006 The Android Open Source Project (http://android.com)
 \nCopyright (C) 2005 Luca Veltri – University of Parma – Italy (http://mjsip.org)
+\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 \n
 \nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 \n
@@ -78,7 +80,8 @@
 
 <string name="settings_options">Вызов</string>
 <string name="settings_wlan">Использовать WLAN</string>
-<string name="settings_3g">Использовать 3G/EDGE</string>
+<string name="settings_3g">Использовать 3G</string>
+<string name="settings_edge">Использовать EDGE</string>
 <string name="settings_check">Убедитесь, что ваш мобильный оператор разрешает VoIP</string>
 <string name="settings_pref">Предпочитаемый тип вызова</string>
     <string-array name="pref_display_values">
@@ -97,16 +100,8 @@
 <string name="settings_MWI2">Подписка на оставленные сообщения в SIP</string>
 
 <string name="settings_advanced_options">Дополнительно</string>
-<string name="settings_minedge">Индикатор сигнала для EDGE-вызовов</string>
 <string name="settings_policy_never">Другая политика сна, чтобы держать Wi-Fi включённым.</string>
 <string name="settings_policy_default">Сбросить политику сна Wi-Fi к стандартной.</string>
-    <string-array name="bars">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
 <string name="settings_search">Поиск и замена</string>
 <string name="settings_excludepat">Шаблон исключения</string>
 <string name="settings_sipringtone">Мелодия SIP-звонка</string>

res/values/strings.xml

@@ -42,6 +42,8 @@
 \nCopyright (C) 2008 Hughes Systique Corporation, USA (http://hsc.com)
 \nCopyright (C) 2006 The Android Open Source Project (http://android.com)
 \nCopyright (C) 2005 Luca Veltri - University of Parma - Italy (http://mjsip.org)
+\nCopyright (C) 2003-2008 Benny Prijono ([email protected])
+\nCopyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
 \n
 \nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 \n
@@ -119,7 +121,8 @@
 
 <string name="settings_options">Call Options</string>
 <string name="settings_wlan">Use WLAN</string>
-<string name="settings_3g">Use 3G/EDGE</string>
+<string name="settings_3g">Use 3G</string>
+<string name="settings_edge">Use EDGE</string>
 <string name="settings_check">Check with your mobile operator if he allows VoIP</string>
 <string name="settings_pref">Preferred Call Type</string>
     <string-array name="pref_display_values">
@@ -130,6 +133,15 @@
         <item>SIP</item>
         <item>PSTN</item>
     </string-array>
+<string name="settings_compression">Voice Compression</string>
+    <string-array name="compression_display_values">
+        <item>Only over EDGE</item>
+        <item>Always active</item>
+    </string-array>
+    <string-array name="compression_values">
+        <item>edge</item>
+        <item>always</item>
+    </string-array>
 <string name="settings_auto_on">Auto-Answer in use</string>
 <string name="settings_auto_on2">Short vibrating alert when screen is on</string>
 <string name="settings_auto_ondemand">Auto-Answer on demand</string>
@@ -138,16 +150,8 @@
 <string name="settings_MWI2">Subscribe to SIP message waiting</string>
 
 <string name="settings_advanced_options">Advanced Options</string>
-<string name="settings_minedge">Signal Bars for EDGE Calls</string>
 <string name="settings_policy_never">Changed sleep policy to keep Wifi on.</string>
 <string name="settings_policy_default">Reset Wifi sleep policy to default.</string>
-    <string-array name="bars">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
 <string name="settings_search">Search &amp; Replace</string>
 <string name="settings_excludepat">Exclude Pattern</string>
 <string name="settings_sipringtone">SIP Ringtone</string>

res/xml/preferences.xml

@@ -42,12 +42,23 @@
 				android:key="3g"
 				android:title="@string/settings_3g"
 				android:summary="@string/settings_check" />
+			<CheckBoxPreference
+				android:key="edge"
+				android:title="@string/settings_edge"
+				android:summary="@string/settings_check" />
 			<ListPreference
 				android:key="pref"
 				android:title="@string/settings_pref"
 				android:entries="@array/pref_display_values"
 				android:entryValues="@array/pref_values"
 				android:dialogTitle="@string/settings_pref" />
+			<ListPreference
+				android:key="compression"
+				android:title="@string/settings_compression"
+				android:entries="@array/compression_display_values"
+				android:entryValues="@array/compression_values"
+				android:defaultValue="edge"
+				android:dialogTitle="@string/settings_compression" />
 			<CheckBoxPreference
 				android:key="auto_on"
 				android:title="@string/settings_auto_on"
@@ -62,13 +73,6 @@
 				android:summary="@string/settings_MWI2" />
 	</PreferenceScreen>
 	<PreferenceScreen android:title="@string/settings_advanced_options">
-			<ListPreference
-				android:key="minedge"
-				android:title="@string/settings_minedge"
-				android:entries="@array/bars"
-				android:entryValues="@array/bars"
-				android:defaultValue="4"
-				android:dialogTitle="@string/settings_minedge" />
 			<EditTextPreference
 				android:key="search"
 				android:title="@string/settings_search"

src/org/sipdroid/media/G711.java

@@ -311,11 +311,14 @@ public class G711 {
 	};
 
 	public static void init() {
- 		int i;
-		for (i = 0; i < 256; i++)
-			a2s[i] = (short)_a2s[i];
-		for (i = 0; i < 65536; i++)
-			s2a[i] = (byte)_s2a[i >> 4];
+	}
+
+	static {
+	 		int i;
+			for (i = 0; i < 256; i++)
+				a2s[i] = (short)_a2s[i];
+			for (i = 0; i < 65536; i++)
+				s2a[i] = (byte)_s2a[i >> 4];
 	}
 
 	public static void alaw2linear(byte alaw[],short lin[],int frames) {