From 04ab8dea75f7b3aa6ad6a452ea1b939cdf08fa2e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 13 Nov 2012 14:57:15 +0100
Subject: [PATCH] Deactivate audio codecs that use a clock rate other than 8000
 and 16000 Hz.

---
 res/xml/preferences.xml                   | 5 -----
 src/org/linphone/LinphoneManager.java     | 6 ++++--
 src/org/linphone/PreferencesFragment.java | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 72b1931a7..93d8f4927 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -106,11 +106,6 @@
 					android:defaultValue="@bool/pref_codec_g722_default"
 					android:title="@string/pref_codec_g722"/>
 				
-				<CheckBoxPreference 
-				    android:key="@string/pref_codec_silk24_key"
-	                android:defaultValue="@bool/pref_codec_silk24_default"
-					android:title="@string/pref_codec_silk24"/>
-				
 				<CheckBoxPreference 
 				    android:key="@string/pref_codec_silk16_key" 
 	                android:defaultValue="@bool/pref_codec_silk16_default"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 86c2559d3..457bc6797 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -717,9 +717,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			enableDisableAudioCodec("PCMA", 8000, 1, R.string.pref_codec_pcma_key);
 			enableDisableAudioCodec("AMR", 8000, 1, R.string.pref_codec_amr_key);
 			enableDisableAudioCodec("AMR-WB", 16000, 1, R.string.pref_codec_amrwb_key);
-			enableDisableAudioCodec("SILK", 24000, 1, R.string.pref_codec_silk24_key);
+			//enableDisableAudioCodec("SILK", 24000, 1, R.string.pref_codec_silk24_key);
+			enableDisableAudioCodec("SILK", 24000, 1, false);
 			enableDisableAudioCodec("SILK", 16000, 1, R.string.pref_codec_silk16_key);
-			enableDisableAudioCodec("SILK", 12000, 1, R.string.pref_codec_silk12_key);
+			//enableDisableAudioCodec("SILK", 12000, 1, R.string.pref_codec_silk12_key);
+			enableDisableAudioCodec("SILK", 12000, 1, false);
 			enableDisableAudioCodec("SILK", 8000, 1, R.string.pref_codec_silk8_key);
 
 			// Configure video codecs
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index eb140057e..6f88ffaf2 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -138,7 +138,7 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 		//detectAudioCodec(R.string.pref_codec_silk8_key,"SILK",8000, 1, true);
 		//detectAudioCodec(R.string.pref_codec_silk12_key,"SILK",12000, 1, true);
 		detectAudioCodec(R.string.pref_codec_silk16_key,"SILK",16000, 1, true);
-		detectAudioCodec(R.string.pref_codec_silk24_key,"SILK",24000, 1, true);
+		//detectAudioCodec(R.string.pref_codec_silk24_key,"SILK",24000, 1, true);
 		detectAudioCodec(R.string.pref_codec_g729_key,"G729",8000, 1, true);
 		
 		// No video