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

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e00f6bfef..d4adc9a5d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -88,8 +88,6 @@
 			<CheckBoxPreference android:key="@string/pref_codec_g722_key"
 				android:defaultValue="false"
 				android:title="@string/pref_codec_g722"/>
-			<CheckBoxPreference android:key="@string/pref_codec_silk24_key"
-				android:title="@string/pref_codec_silk24"/>
 			<CheckBoxPreference android:key="@string/pref_codec_silk16_key" 
 			android:title="@string/pref_codec_silk16"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcmu_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 2169aa036..eb9c6859b 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -593,9 +593,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);
 
 
diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index 077f92407..6f88bce9f 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -619,7 +619,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
 		//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