fix minor compilation issue and update submodules

Classes/LinphoneCoreSettingsStore.m

@@ -183,6 +183,18 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 	{
 		[self transformCodecsToKeys: linphone_core_get_audio_codecs(lc)];
 		[self transformCodecsToKeys: linphone_core_get_video_codecs(lc)];
+        [self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"];
+        LpConfig *config = linphone_core_get_config(lc);
+        [self setInteger:lp_config_get_int(config, "audio", "codec_bitrate_limit", 32) forKey:@"audio_codec_bitrate_limit_preference"];
+
+        PayloadType *pt;
+        const MSList *elem;
+        for (elem=linphone_core_get_audio_codecs(lc);elem!=NULL;elem=elem->next){
+            pt=(PayloadType*)elem->data;
+            if ((strcmp(pt->mime_type, "opus") == 0) || (strcmp(pt->mime_type, "mpeg4-generic") == 0)) {
+                pt->normal_bitrate = [self integerForKey:@"audio_codec_bitrate_limit_preference"] * 1000;
+            }
+        }
 	}
 	
 	{	
@@ -486,6 +498,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		pt=(PayloadType*)elem->data;
 		NSString *pref=[LinphoneManager getPreferenceForCodec:pt->mime_type withRate:pt->clock_rate];
 		linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]);
+        if ((strcmp(pt->mime_type, "opus") == 0) || (strcmp(pt->mime_type, "mpeg4-generic") == 0)) {
+            pt->normal_bitrate = [self integerForKey:@"audio_codec_bitrate_limit_preference"] * 1000;
+        }
 	}
 	for (elem=linphone_core_get_video_codecs(lc);elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
@@ -493,6 +508,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]);
 	}
 
+    LpConfig *config = linphone_core_get_config(lc);
+    lp_config_set_int(config, "audio", "codec_bitrate_limit", [self integerForKey:@"audio_codec_bitrate_limit_preference"]);
+    linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]);
+	
     linphone_core_set_use_info_for_dtmf(lc, [self boolForKey:@"sipinfo_dtmf_preference"]);
     linphone_core_set_use_rfc2833_for_dtmf(lc, [self boolForKey:@"rfc_dtmf_preference"]);
     linphone_core_set_inc_timeout(lc, [self integerForKey:@"incoming_call_timeout_preference"]);

Classes/LinphoneManager.m

@@ -963,6 +963,10 @@ static LinphoneCoreVTable linphonec_vtable = {
 }
 
 static int comp_call_id(const LinphoneCall* call , const char *callid) {
+	if (linphone_call_log_get_call_id(linphone_call_get_call_log(call)) == nil) {
+		ms_error ("no callid for call [%p]", call);
+		return 1;
+	}
 	return strcmp(linphone_call_log_get_call_id(linphone_call_get_call_log(call)), callid);
 }
 

Classes/SettingsViewController.m

@@ -586,7 +586,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [hiddenKeys addObject:@"battery_alert_button"];
 #endif
     
-    [hiddenKeys addObject:@"audio_advanced_group"];
     [hiddenKeys addObject:@"playback_gain_preference"];
     [hiddenKeys addObject:@"microphone_gain_preference"];
     

Settings/InAppSettings.bundle/Audio.plist

@@ -188,6 +188,44 @@
 			<key>IASKTextAlignment</key>
 			<string>IASKUITextAlignmentRight</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>adaptive_rate_control_preference</string>
+			<key>Title</key>
+			<string>Adaptive rate control</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<integer>32</integer>
+			<key>Key</key>
+			<string>audio_codec_bitrate_limit_preference</string>
+			<key>Title</key>
+			<string>Codec bitrate limit</string>
+			<key>Titles</key>
+			<array>
+				<string>10 kbits/s</string>
+				<string>15 kbits/s</string>
+				<string>20 kbits/s</string>
+				<string>32 kbits/s</string>
+				<string>64 kbits/s</string>
+				<string>128 kbits/s</string>
+			</array>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Values</key>
+			<array>
+				<integer>10</integer>
+				<integer>15</integer>
+				<integer>20</integer>
+				<integer>32</integer>
+				<integer>64</integer>
+				<integer>128</integer>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>

Settings/InAppSettings.bundle/en.lproj/Audio.strings

@@ -42,3 +42,9 @@
 
 /* Microphone gain */
 "Microphone gain" = "Microphone gain";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
+
+/* Codec bitrate limit */
+"Codec bitrate limit" = "Codec bitrate limit";

Settings/InAppSettings.bundle/fr.lproj/Audio.strings

@@ -42,3 +42,9 @@
 
 /* Microphone gain */
 "Microphone gain" = "Gain microphone";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Contrôle de débit";
+
+/* Codec bitrate limit */
+"Codec bitrate limit" = "Limite de débit du codec";

Settings/InAppSettings.bundle/ru.lproj/Audio.strings

@@ -42,3 +42,9 @@
 
 /* Microphone gain */
 "Microphone gain" = "Усиление микрофона";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
+
+/* Codec bitrate limit */
+"Codec bitrate limit" = "Codec bitrate limit";

linphone.ldb/Contents.plist

@@ -17902,7 +17902,7 @@ Raison: %2$s</string>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-11-06T09:45:46Z</date>
+					<date>2013-06-28T12:59:59Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -17912,7 +17912,7 @@ Raison: %2$s</string>
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>d8b4f45bf8fca397a7f791bd55a61e1c
+					<string>a03adeb7710ae8986354684bdcd69764
 </string>
 					<key>name</key>
 					<string>Audio.strings</string>
@@ -18279,6 +18279,56 @@ Raison: %2$s</string>
 							<key>snapshots</key>
 							<dict/>
 						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Adaptive rate control</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Adaptive rate control</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Adaptive rate control</string>
+								<key>fr</key>
+								<string>Contrôle de débit</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Codec bitrate limit</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Codec bitrate limit</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Codec bitrate limit</string>
+								<key>fr</key>
+								<string>Limite de débit du codec</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 					</array>
 					<key>old objects</key>
 					<array/>

linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings

@@ -42,3 +42,9 @@
 
 /* Microphone gain */
 "Microphone gain" = "Microphone gain";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
+
+/* Codec bitrate limit */
+"Codec bitrate limit" = "Codec bitrate limit";

submodules/bcg729

@@ -1 +1 @@
-Subproject commit 1ad5aa5abdf23bb260595b07f0705c9ede1a37d2
+Subproject commit 136c165a611a2552a3f52b0669b47a1bce0ab989

submodules/liblinphone.xcodeproj/project.pbxproj

@@ -3209,12 +3209,11 @@
 					linphone/mediastreamer2/include,
 					linphone/oRTP/include,
 					externals/gsm/,
-					externals/osip/include,
-					externals/exosip/include,
 					externals/speex/include,
 					externals/ffmpeg,
 					external/ffmpeg/swscale,
 					"../liblinphone-sdk/apple-darwin/include",
+					"../liblinphone-sdk/apple-darwin/include/opus",
 				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = (
@@ -3265,12 +3264,11 @@
 					linphone/mediastreamer2/include,
 					linphone/oRTP/include,
 					externals/gsm/,
-					externals/osip/include,
-					externals/exosip/include,
 					externals/speex/include,
 					externals/ffmpeg,
 					external/ffmpeg/swscale,
 					"../liblinphone-sdk/apple-darwin/include",
+					"../liblinphone-sdk/apple-darwin/include/opus",
 				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = (
@@ -3321,12 +3319,11 @@
 					linphone/mediastreamer2/include,
 					linphone/oRTP/include,
 					externals/gsm/,
-					externals/osip/include,
-					externals/exosip/include,
 					externals/speex/include,
 					externals/ffmpeg,
 					external/ffmpeg/swscale,
 					"../liblinphone-sdk/apple-darwin/include",
+					"../liblinphone-sdk/apple-darwin/include/opus",
 				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = (

submodules/linphone

@@ -1 +1 @@
-Subproject commit 6a033f8a646a9d1621e5e6c0a8886ad687ed77a6
+Subproject commit 8b674d05e33a80261dde28930591ff37dc8938b4

submodules/msilbc

@@ -1 +1 @@
-Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf
+Subproject commit d5a47655f3c7ac64864f9d3a61bb0166eb748b57

submodules/mssilk

@@ -1 +1 @@
-Subproject commit 1d81e34d6e3234797a726f9e66fc02ac5f28a637
+Subproject commit 49f89d0cb2aaf676249c1b7cb0e545df78d2bf85