Merge branch 'master' of git.linphone.org:linphone-iphone

2011-10-25 21:08:23 +02:00 · 2011-10-25 21:08:23 +02:00 · 29a7991d5e
commit 29a7991d5e
parent 43f7b8e728 fc530ed057
24 changed files with 1371 additions and 603 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,9 +1,9 @@
 [submodule "submodules/linphone"]
 	path = submodules/linphone
-	url = git://git.sv.gnu.org/linphone.git
+	url = git://git.linphone.org/linphone.git
 [submodule "submodules/externals/osip"]
 	path = submodules/externals/osip
-	url = git://git.savannah.gnu.org/osip.git
+	url = git://git.linphone.org/osip.git
 [submodule "submodules/externals/exosip"]
 	path = submodules/externals/exosip
 	url = git://git.linphone.org/exosip.git
--- a/Classes/AdvancedPhoneViewController.m
+++ b/Classes/AdvancedPhoneViewController.m
@ -51,6 +51,8 @@
 	
 }
 -(void) displayIncallFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+    [self presentModalViewController:mIncallViewController animated:true];
+
 	[super displayIncallFromUI:viewCtrl
 					   forUser:username
 			   withDisplayName:displayName];
@ -65,6 +67,12 @@
 	[mIncallViewController displayStatus:message];
 }

+-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl {
+    [super updateUIFromLinphoneState:viewCtrl];
+    
+	[mIncallViewController updateUIFromLinphoneState:viewCtrl];
+}
+
 - (void)dealloc {
    [mIncallViewController release];
 	[super dealloc];
--- a/Classes/IncallViewController.h
+++ b/Classes/IncallViewController.h
@ -35,6 +35,7 @@
 	UIHangUpButton* endCtrl;
 	UIButton* dialer;
 	UIMuteButton* mute;
+    UIPauseResumeButton* pause;
 	UISpeakerButton* speaker;
 	UIButton* contacts;

@ -74,6 +75,7 @@
@property (nonatomic, retain) IBOutlet UIButton* endCtrl;
@property (nonatomic, retain) IBOutlet UIButton* dialer;
@property (nonatomic, retain) IBOutlet UIButton* mute;
+@property (nonatomic, retain) IBOutlet UIButton* pause;
@property (nonatomic, retain) IBOutlet UIButton* speaker;
@property (nonatomic, retain) IBOutlet UIButton* contacts;

--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@ -35,6 +35,7 @@
@synthesize endCtrl;
@synthesize close;
@synthesize mute;
+@synthesize pause;
@synthesize dialer;
@synthesize speaker;
@synthesize contacts;
@ -70,6 +71,7 @@
    [super viewDidLoad];
 	//Controls
 	[mute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"]  offImage:[UIImage imageNamed:@"mic_active.png"] ];
+    [pause initWithOnImage:[UIImage imageNamed:@"resumecall.png"]  offImage:[UIImage imageNamed:@"pausecall.png"] ];
 	[speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"]  offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ];
 	

@ -127,6 +129,11 @@
 	[callDuration stop];
 	[self dismissModalViewControllerAnimated:true];
 }
+-(void) updateUIFromLinphoneState:(UIViewController *)viewCtrl {
+    [mute reset];
+    [pause reset];
+}
+
 - (IBAction)doAction:(id)sender {
 	
 	if (sender == dialer) {
--- a/Classes/IncallViewController.xib
+++ b/Classes/IncallViewController.xib
--- a/Classes/LinphoneUI/LinphoneManager.h
+++ b/Classes/LinphoneUI/LinphoneManager.h
@ -18,6 +18,7 @@
 */              

 #import <Foundation/Foundation.h>
+#import <AVFoundation/AVAudioSession.h>
 #import <SystemConfiguration/SCNetworkReachability.h>
 #include "linphonecore.h"
 #import "LogView.h"
@ -28,7 +29,7 @@ typedef enum _Connectivity {
 	,none
 } Connectivity;
@class FastAddressBook;
-@interface LinphoneManager : NSObject {
+@interface LinphoneManager : NSObject <AVAudioSessionDelegate> {
@private
 	SCNetworkReachabilityContext proxyReachabilityContext;
 	SCNetworkReachabilityRef proxyReachability;
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@ -35,6 +35,9 @@ extern void libmsilbc_init();
 #ifdef HAVE_AMR
 extern void libmsamr_init();
 #endif
+#if defined (HAVE_SILK)
+extern void libmssilk_init(); 
+#endif
@implementation LinphoneManager
@synthesize callDelegate;
@synthesize registrationDelegate;
@ -507,6 +510,8 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
    {
        ms_message("SPEEX codecs deactivated");
    }
+    [self configurePayloadType:"SILK" fromPrefKey:@"silk_24k_preference" withRate:24000];
+	[self configurePayloadType:"SILK" fromPrefKey:@"silk_16k_preference" withRate:16000];
    [self configurePayloadType:"AMR" fromPrefKey:@"amr_8k_preference" withRate:8000];
 	[self configurePayloadType:"GSM" fromPrefKey:@"gsm_8k_preference" withRate:8000];
 	[self configurePayloadType:"iLBC" fromPrefKey:@"ilbc_preference" withRate:8000];
@ -679,7 +684,9 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 	}
 	
 	libmsilbc_init();
-	
+#if defined (HAVE_SILK)
+    libmssilk_init(); 
+#endif	
 #ifdef HAVE_AMR
    libmsamr_init(); //load amr plugin if present from the liblinphone sdk
 #endif	/*
@ -719,6 +726,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 	//init audio session
 	AVAudioSession *audioSession = [AVAudioSession sharedInstance];
 	BOOL bAudioInputAvailable= [audioSession inputIsAvailable];
+    [audioSession setDelegate:self];
 	
 	if(!bAudioInputAvailable){
 		UIAlertView* error = [[UIAlertView alloc]	initWithTitle:NSLocalizedString(@"No microphone",nil)
@ -773,4 +781,24 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 	mLogView = view;
 }

+-(void) beginInterruption {
+    LinphoneCall* c = linphone_core_get_current_call(theLinphoneCore);
+    ms_message("Sound interruption detected!");
+    if (c) {
+        linphone_core_pause_call(theLinphoneCore, c);
+    }
+}
+
+-(void) endInterruption {
+    ms_message("Sound interruption ended!");
+    const MSList* c = linphone_core_get_calls(theLinphoneCore);
+    
+    if (c) {
+        ms_message("Auto resuming call");
+        linphone_core_resume_call(theLinphoneCore, (LinphoneCall*) c->data);
+    }
+    
+    [callDelegate updateUIFromLinphoneState:mCurrentViewController];
+}
+
@end
--- a/Classes/LinphoneUI/LinphoneUIDelegates.h
+++ b/Classes/LinphoneUI/LinphoneUIDelegates.h
@ -25,6 +25,7 @@
 -(void) displayCallInProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
 -(void) displayIncomingCallNotigicationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
 -(void) displayIncallFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
+-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl;
 //status reporting
 -(void) displayStatus:(NSString*) message; 
@end
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@ -26,3 +26,4 @@
 #import "UIDuration.h"
 #import "UIEraseButton.h"
 #import "LinphoneUIDelegates.h"
+#import "UIPauseResumeButton.h"
--- a/Classes/LinphoneUI/UIPauseResumeButton.h
+++ b/Classes/LinphoneUI/UIPauseResumeButton.h
@ -0,0 +1,28 @@
+/* UIMuteButton.h
+ *
+ * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
+ *
+ *  This 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 2 of the License, or   
+ *  (at your option) any later version.                                 
+ *                                                                      
+ *  This program 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 program; if not, write to the Free Software         
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+
+#import <UIKit/UIKit.h>
+#import "UIToggleButton.h"
+
+
+@interface UIPauseResumeButton : UIToggleButton<UIToggleButtonDelegate> {
+
+}
+
+@end
--- a/Classes/LinphoneUI/UIPauseResumeButton.m
+++ b/Classes/LinphoneUI/UIPauseResumeButton.m
@ -0,0 +1,69 @@
+/* UIMuteButton.m
+ *
+ * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
+ *
+ *  This 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 2 of the License, or   
+ *  (at your option) any later version.                                 
+ *                                                                      
+ *  This program 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 program; if not, write to the Free Software         
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */       
+#import "UIPauseResumeButton.h"
+#include "LinphoneManager.h"
+
+
+@implementation UIPauseResumeButton
+
+
+
+-(void) onOn {
+    LinphoneCall* c = linphone_core_get_current_call([LinphoneManager getLc]);
+    if (c) {
+        linphone_core_pause_call([LinphoneManager getLc], c);
+    }
+}
+-(void) onOff {
+	const MSList* c = linphone_core_get_calls([LinphoneManager getLc]);
+    if (c) {
+        linphone_core_resume_call([LinphoneManager getLc], (LinphoneCall*) c->data);
+    }
+}
+-(bool) isInitialStateOn {
+	@try {
+        const MSList* c = linphone_core_get_calls([LinphoneManager getLc]);
+        
+        if (c) {
+            return linphone_call_get_state((LinphoneCall*)c->data) == LinphoneCallPaused;
+        } else {
+            
+            return false;
+        }
+	} @catch(NSException* e) {
+		//not ready yet
+		return false;
+	}
+	
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code.
+}
+*/
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+
+@end
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@ -234,6 +234,10 @@
 	[status setText:message];
 }

+-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl {
+	[mute reset];
+}
+

 -(void) displayIncomingCallNotigicationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
 	
--- a/Settings.bundle/Root.plist
+++ b/Settings.bundle/Root.plist
@ -98,6 +98,26 @@
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>silk_24k_preference</string>
+			<key>Title</key>
+			<string>Silk 24Khz</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>silk_16k_preference</string>
+			<key>Title</key>
+			<string>Silk  16Khz</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>DefaultValue</key>
 			<true/>
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@ -47,6 +47,7 @@
 		2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; };
 		2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; };
 		2248E99F12F801C200220D9C /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E99E12F801C200220D9C /* LinphoneManager.m */; };
+		225AA31E14520E5400BA809B /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */; };
 		225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; };
 		225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; };
 		225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; };
@ -89,6 +90,13 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		223136D814433FF50035C1F4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 22DD19BE13A8D7FA0018ECD4;
+			remoteInfo = mediastream;
+		};
 		22A10DA211F88C1F00373793 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */;
@ -274,6 +282,7 @@
 		2248E99D12F801C200220D9C /* LinphoneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneManager.h; sourceTree = "<group>"; };
 		2248E99E12F801C200220D9C /* LinphoneManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneManager.m; sourceTree = "<group>"; };
 		2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+		225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = "<group>"; };
 		225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = "<group>"; };
 		225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = "<group>"; };
 		225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = "<group>"; };
@ -399,7 +408,6 @@
 		70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		F0A486D71404FE53009EC0BE /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = "<group>"; };
-		F0A486DB14050008009EC0BE /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/gcc/arm-apple-darwin10/4.0.1/libstdc++.dylib"; sourceTree = SDKROOT; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -407,6 +415,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				225AA31E14520E5400BA809B /* libSKP_SILK_SDK.a in Frameworks */,
 				22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */,
 				22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
@ -703,6 +712,7 @@
 			isa = PBXGroup;
 			children = (
 				22A10DA311F88C1F00373793 /* liblinphone.a */,
+				223136D914433FF50035C1F4 /* mediastream.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@ -788,7 +798,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				F0A486DB14050008009EC0BE /* libstdc++.dylib */,
+				225AA31D14520E5400BA809B /* libSKP_SILK_SDK.a */,
 				F0A486D71404FE53009EC0BE /* libsrtp.a */,
 				2214783B1386A2030020F8B8 /* Localizable.strings */,
 				22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */,
@ -936,6 +946,13 @@
 /* End PBXProject section */

 /* Begin PBXReferenceProxy section */
+		223136D914433FF50035C1F4 /* mediastream.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = mediastream.app;
+			remoteRef = 223136D814433FF50035C1F4 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		22A10DA311F88C1F00373793 /* liblinphone.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@ -1034,6 +1051,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv7,
+					armv6,
+				);
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "";
@ -1041,7 +1062,11 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					IN_LINPHONE,
+					HAVE_SILK,
+				);
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@ -1100,6 +1125,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv7,
+					armv6,
+				);
 				CODE_SIGN_ENTITLEMENTS = untitled.plist;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
@ -1108,7 +1137,11 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					IN_LINPHONE,
+					HAVE_SILK,
+				);
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@ -1167,6 +1200,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv7,
+					armv6,
+				);
 				CODE_SIGN_ENTITLEMENTS = untitled.plist;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
@ -1175,7 +1212,11 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					IN_LINPHONE,
+					HAVE_SILK,
+				);
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
--- a/4
+++ b/4
@ -25,10 +25,10 @@ nortp_timeout=30

 [sound]
 playback_dev_id=AU: Audio Unit Receiver
-ringer_dev_id=AU: Audio Unit Speaker
+ringer_dev_id=AQ: Audio Queue Device
 capture_dev_id=AU: Audio Unit Receiver
 echocancellation=0

 [misc]
 history_max_size=30
-
+max_calls=1
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@ -21,7 +21,7 @@
 ############################################################################
 all:
 	make -f  builder-iphone-os.mk  all \
-	&& make -f  builder-iphone-simulator.mk tc_proc=.i386 all \
+	&& make -f  builder-iphone-simulator.mk all \
 	&& make -f  builder-iphone-os.mk   host=armv7-apple-darwin all \
 	&& make -f builder-iphone-os.mk delivery-sdk
 clean:
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@ -32,10 +32,8 @@ linphone_configure_controls=  --disable-video \
                              --enable-console_ui=no \
                              --enable-ssl-hmac=no \
                              --enable-ssl=yes \
-                              --enable-macaqsnd=no \
-			      --enable-macsnd=no \
-                              --enable-iounit=yes \
                              --with-gsm=$(prefix) \
+			      --disable-tests \
                              LIBZRTPCPP_CFLAGS="-I$(prefix)/include" \
 			      LIBZRTPCPP_LIBS="-L$(prefix)/lib -lzrtpcpp -lcrypto" \
 			      SRTP_CFLAGS="-I$(prefix)/include" \
@ -46,6 +44,7 @@ linphone_configure_controls=  --disable-video \
                              SPEEX_LIBS="-L$(prefix)/lib -lspeexdsp -lspeex " \
                              OPENSSL_CFLAGS="-I$(prefix)/include" \
                              OPENSSL_LIBS="-L$(prefix)/lib -lssl -lcrypto" 
+				MSSILK_CFLAGS="-I$(prefix)/include/silk"
 ifeq ($(enable_zrtp),yes)
 	linphone_configure_controls+= --with-srtp=$(prefix) --enable-zrtp=yes --disable-tests
 endif
@ -95,13 +94,13 @@ init:
 veryclean: veryclean-linphone
 	rm -rf $(BUILDER_BUILD_DIR)

-.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2  build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
+.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2  build-speex build-libgsm  build-silk $(LINPHONE_BUILD_DIR)/Makefile
 	cd $(LINPHONE_BUILD_DIR)  && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate &&  make  && make install

-clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm  clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr
+clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm  clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-silk
 	cd  $(LINPHONE_BUILD_DIR) && make clean

-veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr
+veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-silk
 #-cd $(LINPHONE_BUILD_DIR) && make distclean
 	-cd $(LINPHONE_SRC_DIR) && rm -f configure

--- a/submodules/build/builders.d/silk.mk
+++ b/submodules/build/builders.d/silk.mk
@ -0,0 +1,58 @@
+############################################################################
+# silk.mk 
+# Copyright (C) 2011  Belledonne Communications,Grenoble France
+#
+############################################################################
+#
+# This 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 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+############################################################################
+
+SILK_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/silk
+
+ifneq (,$(findstring i386,$(host)))
+        src := SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_FIX_v1.0.8
+else
+	src := SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8
+endif
+ifneq (,$(findstring armv7,$(host)))
+        make_options := USE_NEON=yes  
+endif
+
+$(SILK_BUILD_DIR)/Makefile:
+	mkdir -p $(BUILDER_BUILD_DIR)/externals \
+	&& cd $(BUILDER_BUILD_DIR)/externals \
+	&& rm -rf silk \
+	&& wget http://developer.skype.com/silk/SILK_SDK_SRC_v1.0.8.zip \
+	&& unzip  SILK_SDK_SRC_v1.0.8.zip \
+	&& rm -f SILK_SDK_SRC_v1.0.8.zip \
+	&& mv ${src} silk  \
+	&& rm -rf SILK_SDK_SRC_v1.0.8
+
+build-silk: $(SILK_BUILD_DIR)/Makefile
+	cd $(SILK_BUILD_DIR) &&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
+	&& make -j1 all TOOLCHAIN_PREFIX=$$SDK_BIN_PATH/ CXX="$$CXX" CC="$$CC -mno-thumb -g" LD="$$LD" $(make_options)   ADDED_DEFINES+=IPHONE \
+	&& mkdir -p $(prefix)/include/silk \
+	&& cp -f $(SILK_BUILD_DIR)/interface/*  $(prefix)/include/silk \
+	&& cp -f lib*.a  $(prefix)/lib 
+
+clean-silk:
+	cd  $(SILK_BUILD_DIR)  && make clean
+
+clean-makefile-silk:
+	
+veryclean-silk:
+	rm -rf $(SILK_BUILD_DIR)
+
--- a/submodules/build/builders.d/zrtp.mk
+++ b/submodules/build/builders.d/zrtp.mk
@ -4,12 +4,14 @@ $(BUILDER_SRC_DIR)/$(zrtpcpp_dir)/CMakeLists.txt.tracker: $(BUILDER_SRC_DIR)/bui

 #I coudn't manage to crosscompile using only -D arguments to cmake
 #Thus the use of a toolchain file.
-TC = -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake$(tc_proc)
 $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(zrtpcpp_dir)/CMakeLists.txt.tracker
 	mkdir -p $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)
 	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\
        && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
-        && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false $(TC) -LH -Wdev -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix)"
+        && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake  \
+	-LH -Wdev -DCMAKE_C_COMPILER=$$SDK_BIN_PATH/gcc -DCMAKE_CXX_COMPILER=$$SDK_BIN_PATH/g++ \
+	-DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \
+	-DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix)"
 # Used toolchain: $(TC)

 ifeq ($(enable_zrtp),yes)
@ -31,6 +33,6 @@ clean-makefile-zrtpcpp: clean-zrtpcpp
 	-rm -f $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/CMakeCache.txt

 veryclean-zrtpcpp:
-	-rm $(BUILDER_SRC_DIR)/$(zrtpcpp_dir)
+	-rm -rf $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)


--- a/submodules/build/iphone-config.site
+++ b/submodules/build/iphone-config.site
@ -1,6 +1,5 @@
 # -*- shell-script -*-

-GCC_VERSION=4.2
 SDK_VERSION_MAJOR=4
 SDK_VERSION=4.0
 MCPU=""
@ -25,32 +24,16 @@ else
 fi
 echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}"

-SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}4*`
+SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
 SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin     
 for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ;
 echo "Selecting SDK path = ${SYSROOT_PATH}"
-COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE"
-CC="${SDK_BIN_PATH}/gcc-${GCC_VERSION} -std=c99 $COMMON_FLAGS"
-CXX="${SDK_BIN_PATH}/g++-${GCC_VERSION} $COMMON_FLAGS"
-LD="${SDK_BIN_PATH}/ld-${GCC_VERSION} -arch ${ARCH}"
+COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE -D__IOS"
+CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS"
+CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS"
+LD="${SDK_BIN_PATH}/ld -arch ${ARCH}"
 AR=${SDK_BIN_PATH}/ar
 RANLIB=${SDK_BIN_PATH}/ranlib

 CPPFLAGS="-Dasm=__asm"
 LDFLAGS="-Wl,-syslibroot,${SYSROOT_PATH} -framework CFNetwork" 
-
-export CC CXX LD CFLAGS="${COMMON_FLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_FLAG} ${CPPFLAGS}"  CPPFLAGS="${COMMON_FLAG} ${CPPFLAGS}" LDFLAGS="${LDFLAGS} ${COMMON_FLAGS}"
-
-# CMAKE options (not working right now so information duplicated in .cmake toolchains).
-DEVROOT=/Developer/Platforms/iPhoneOS.platform/Developer
-SDKVER=4.3
-export CMAKE_OPTS="${CMAKE_OPTS} \
-                -DCMAKE_SYSTEM_NAME=Generic \
-                -DSDKVER=${SDKVER} \
-                -DDEVROOT=${DEVROOT} \
-                -DSDKROOT=${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk \
-                -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
-                -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-                -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-	"
-
--- a/submodules/build/iphone-toolchain.cmake
+++ b/submodules/build/iphone-toolchain.cmake
@ -1,11 +1,4 @@
 SET (CMAKE_SYSTEM_NAME      "Generic")
-SET (CMAKE_SYSTEM_PROCESSOR "arm")
-
-SET (SDKVER     "4.3")
-SET (DEVROOT    "/Developer/Platforms/iPhoneOS.platform/Developer")
-SET (SDKROOT    "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
-
-SET (CMAKE_FIND_ROOT_PATH "${CMAKE_INSTALL_PREFIX}" "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
 SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
--- a/submodules/externals/osip
+++ b/submodules/externals/osip
@ -1 +1 @@
-Subproject commit 7dbd4b443eed178480b76498173e7bffc7e73d00
+Subproject commit 9e8c64cff496d2794fe352a6a3907e0e36988931
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@ -7,6 +7,18 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; };
+		220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; };
+		220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; };
+		220ED19D13A9033F00AC21E0 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC07E0554694100DB518D /* liblinphone.a */; };
+		220ED19F13A9038F00AC21E0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19E13A9038F00AC21E0 /* CoreVideo.framework */; };
+		220ED1A113A9039600AC21E0 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A013A9039600AC21E0 /* CoreAudio.framework */; };
+		220ED1A313A903BF00AC21E0 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A213A903BF00AC21E0 /* libgsm.a */; };
+		220ED1A713A9040700AC21E0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A613A9040700AC21E0 /* AudioToolbox.framework */; };
+		220ED1A913A9041800AC21E0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A813A9041800AC21E0 /* AVFoundation.framework */; };
+		221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221F589F13AB50F800D603C9 /* CoreMedia.framework */; };
+		221F58A413AB708C00D603C9 /* alldescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58A313AB708C00D603C9 /* alldescs.h */; };
+		221F58A813AB716400D603C9 /* tonedetector.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A513AB716300D603C9 /* tonedetector.c */; };
 		222CA63211F6CF7600621220 /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; };
 		222CA63311F6CF7600621220 /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; };
 		222CA63411F6CF7600621220 /* dtmfgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C011F6CF7600621220 /* dtmfgen.h */; };
@ -42,12 +54,8 @@
 		222CA65511F6CF7600621220 /* chanadapt.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E511F6CF7600621220 /* chanadapt.c */; };
 		222CA65711F6CF7600621220 /* dsptools.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E711F6CF7600621220 /* dsptools.c */; };
 		222CA65811F6CF7600621220 /* dtmfgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E811F6CF7600621220 /* dtmfgen.c */; };
-		222CA65911F6CF7600621220 /* dxfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E911F6CF7600621220 /* dxfilter.cpp */; };
-		222CA65A11F6CF7600621220 /* dxfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EA11F6CF7600621220 /* dxfilter.h */; };
 		222CA65B11F6CF7600621220 /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EB11F6CF7600621220 /* equalizer.c */; };
 		222CA65C11F6CF7600621220 /* eventqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EC11F6CF7600621220 /* eventqueue.c */; };
-		222CA65D11F6CF7600621220 /* extdisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5ED11F6CF7600621220 /* extdisplay.c */; };
-		222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; };
 		222CA65F11F6CF7600621220 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; };
 		222CA66011F6CF7600621220 /* gsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F011F6CF7600621220 /* gsm.c */; };
 		222CA66211F6CF7600621220 /* ice.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F211F6CF7600621220 /* ice.c */; };
@ -89,7 +97,6 @@
 		222CA6FB11F6CF9F00621220 /* rtpsession.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AE11F6CF9F00621220 /* rtpsession.h */; };
 		222CA6FC11F6CF9F00621220 /* rtpsignaltable.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AF11F6CF9F00621220 /* rtpsignaltable.h */; };
 		222CA6FD11F6CF9F00621220 /* sessionset.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B011F6CF9F00621220 /* sessionset.h */; };
-		222CA6FE11F6CF9F00621220 /* srtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B111F6CF9F00621220 /* srtp.h */; };
 		222CA6FF11F6CF9F00621220 /* str_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B211F6CF9F00621220 /* str_utils.h */; };
 		222CA70011F6CF9F00621220 /* stun.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B311F6CF9F00621220 /* stun.h */; };
 		222CA70111F6CF9F00621220 /* stun_udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B411F6CF9F00621220 /* stun_udp.h */; };
@ -116,7 +123,6 @@
 		222CA71711F6CF9F00621220 /* scheduler.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CF11F6CF9F00621220 /* scheduler.c */; };
 		222CA71811F6CF9F00621220 /* scheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6D011F6CF9F00621220 /* scheduler.h */; };
 		222CA71911F6CF9F00621220 /* sessionset.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D111F6CF9F00621220 /* sessionset.c */; };
-		222CA71A11F6CF9F00621220 /* srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D211F6CF9F00621220 /* srtp.c */; };
 		222CA71B11F6CF9F00621220 /* str_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D311F6CF9F00621220 /* str_utils.c */; };
 		222CA71C11F6CF9F00621220 /* stun.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D411F6CF9F00621220 /* stun.c */; };
 		222CA71D11F6CF9F00621220 /* stun_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D511F6CF9F00621220 /* stun_udp.c */; };
@ -150,7 +156,18 @@
 		222CA78511F6CFB100621220 /* sipsetup.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76311F6CFB100621220 /* sipsetup.c */; };
 		222CA78611F6CFB100621220 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; };
 		2252935B12F6CA4700DD9BFB /* ec-calibrator.c in Sources */ = {isa = PBXBuildFile; fileRef = 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */; };
+		225AA2DC144F077700BA809B /* silk_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2DA144F077600BA809B /* silk_dec.c */; };
+		225AA2DD144F077700BA809B /* silk_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2DB144F077700BA809B /* silk_enc.c */; };
+		225AA2DF144F0AA800BA809B /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */; };
+		225AA2E1144F1C6600BA809B /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2E0144F1C6600BA809B /* bitratedriver.c */; };
+		225AA2E3144F1E3400BA809B /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2E2144F1E3400BA809B /* qosanalyzer.c */; };
+		225AA2E5144F2E0200BA809B /* msprivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 225AA2E4144F2E0200BA809B /* msprivate.h */; };
+		225AA2FD1451A95400BA809B /* conference.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2FC1451A95400BA809B /* conference.c */; };
 		225D355A124B1FF60008581C /* linphonecall.c in Sources */ = {isa = PBXBuildFile; fileRef = 225D3559124B1FF60008581C /* linphonecall.c */; };
+		229A614D13DDFE3500090183 /* g722_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614913DDFE3500090183 /* g722_decode.c */; };
+		229A614E13DDFE3500090183 /* g722_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614A13DDFE3500090183 /* g722_encode.c */; };
+		229A614F13DDFE3500090183 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; };
+		229A615013DDFE3500090183 /* msg722.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614C13DDFE3500090183 /* msg722.c */; };
 		229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; };
 		22A10B5611F84E2D00373793 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B4F11F84E2D00373793 /* config.h */; };
 		22A10B5711F84E2D00373793 /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5011F84E2D00373793 /* gsm.h */; };
@ -159,11 +176,52 @@
 		22A10B5A11F84E2D00373793 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; };
 		22A10B5B11F84E2D00373793 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; };
 		22A10EE811F8920F00373793 /* mswebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 22A10EE711F8920F00373793 /* mswebcam.c */; };
+		22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */; };
+		22DD19C113A8D7FA0018ECD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */; };
+		22DD19C213A8D7FA0018ECD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
+		22DD19C413A8D7FA0018ECD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */; };
+		22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 22DD19E713A8D82C0018ECD4 /* mediastream.c */; };
+		22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */; };
+		22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A313A8E3310018ECD4 /* MainWindow.xib */; };
+		22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */; };
+		22DD21B213A8E3310018ECD4 /* mediastream-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */; };
+		22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */; };
+		22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */; };
+		22FC56A813CB69FB002FD0F1 /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */; };
+		22FC56AA13CB6A4F002FD0F1 /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */; };
+		7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; };
+		7014533E13FA841E00A01D86 /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 7014533D13FA841E00A01D86 /* zrtp.c */; };
+		70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; };
+		70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F013E147CE002BA2C0 /* QuartzCore.framework */; };
 		AA747D9F0F9514B9006C5449 /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
 /* End PBXBuildFile section */

+/* Begin PBXContainerItemProxy section */
+		220ED19513A8F82A00AC21E0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D2AAC07D0554694100DB518D;
+			remoteInfo = liblinphone;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
+		220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = "<group>"; };
+		220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = "<group>"; };
+		220ED19913A8F87700AC21E0 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = "<group>"; };
+		220ED19E13A9038F00AC21E0 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
+		220ED1A013A9039600AC21E0 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+		220ED1A213A903BF00AC21E0 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
+		220ED1A413A903E100AC21E0 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
+		220ED1A613A9040700AC21E0 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		220ED1A813A9041800AC21E0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		221F589913AB4EEE00D603C9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		221F589D13AB503F00D603C9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
+		221F589F13AB50F800D603C9 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		221F58A313AB708C00D603C9 /* alldescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alldescs.h; path = build/iphone/alldescs.h; sourceTree = "<group>"; };
+		221F58A513AB716300D603C9 /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = "<group>"; };
 		222CA5B911F6CF7600621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
 		222CA5BA11F6CF7600621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
 		222CA5BB11F6CF7600621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
@ -206,12 +264,8 @@
 		222CA5E511F6CF7600621220 /* chanadapt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chanadapt.c; sourceTree = "<group>"; };
 		222CA5E711F6CF7600621220 /* dsptools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsptools.c; sourceTree = "<group>"; };
 		222CA5E811F6CF7600621220 /* dtmfgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtmfgen.c; sourceTree = "<group>"; };
-		222CA5E911F6CF7600621220 /* dxfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dxfilter.cpp; sourceTree = "<group>"; };
-		222CA5EA11F6CF7600621220 /* dxfilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dxfilter.h; sourceTree = "<group>"; };
 		222CA5EB11F6CF7600621220 /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = "<group>"; };
 		222CA5EC11F6CF7600621220 /* eventqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventqueue.c; sourceTree = "<group>"; };
-		222CA5ED11F6CF7600621220 /* extdisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extdisplay.c; sourceTree = "<group>"; };
-		222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ffmpeg-priv.h"; sourceTree = "<group>"; };
 		222CA5EF11F6CF7600621220 /* g711common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g711common.h; sourceTree = "<group>"; };
 		222CA5F011F6CF7600621220 /* gsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gsm.c; sourceTree = "<group>"; };
 		222CA5F211F6CF7600621220 /* ice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ice.c; sourceTree = "<group>"; };
@ -261,7 +315,6 @@
 		222CA6AE11F6CF9F00621220 /* rtpsession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtpsession.h; sourceTree = "<group>"; };
 		222CA6AF11F6CF9F00621220 /* rtpsignaltable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtpsignaltable.h; sourceTree = "<group>"; };
 		222CA6B011F6CF9F00621220 /* sessionset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sessionset.h; sourceTree = "<group>"; };
-		222CA6B111F6CF9F00621220 /* srtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = srtp.h; sourceTree = "<group>"; };
 		222CA6B211F6CF9F00621220 /* str_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str_utils.h; sourceTree = "<group>"; };
 		222CA6B311F6CF9F00621220 /* stun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stun.h; sourceTree = "<group>"; };
 		222CA6B411F6CF9F00621220 /* stun_udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stun_udp.h; sourceTree = "<group>"; };
@ -292,7 +345,6 @@
 		222CA6CF11F6CF9F00621220 /* scheduler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scheduler.c; sourceTree = "<group>"; };
 		222CA6D011F6CF9F00621220 /* scheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheduler.h; sourceTree = "<group>"; };
 		222CA6D111F6CF9F00621220 /* sessionset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sessionset.c; sourceTree = "<group>"; };
-		222CA6D211F6CF9F00621220 /* srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = srtp.c; sourceTree = "<group>"; };
 		222CA6D311F6CF9F00621220 /* str_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = str_utils.c; sourceTree = "<group>"; };
 		222CA6D411F6CF9F00621220 /* stun.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun.c; sourceTree = "<group>"; };
 		222CA6D511F6CF9F00621220 /* stun_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun_udp.c; sourceTree = "<group>"; };
@ -333,7 +385,18 @@
 		222CA76311F6CFB100621220 /* sipsetup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sipsetup.c; sourceTree = "<group>"; };
 		222CA76411F6CFB100621220 /* sipsetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sipsetup.h; sourceTree = "<group>"; };
 		2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; };
+		225AA2DA144F077600BA809B /* silk_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = silk_dec.c; sourceTree = "<group>"; };
+		225AA2DB144F077700BA809B /* silk_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = silk_enc.c; sourceTree = "<group>"; };
+		225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "../liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = "<group>"; };
+		225AA2E0144F1C6600BA809B /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = "<group>"; };
+		225AA2E2144F1E3400BA809B /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = "<group>"; };
+		225AA2E4144F2E0200BA809B /* msprivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msprivate.h; sourceTree = "<group>"; };
+		225AA2FC1451A95400BA809B /* conference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = conference.c; sourceTree = "<group>"; };
 		225D3559124B1FF60008581C /* linphonecall.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linphonecall.c; sourceTree = "<group>"; };
+		229A614913DDFE3500090183 /* g722_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_decode.c; sourceTree = "<group>"; };
+		229A614A13DDFE3500090183 /* g722_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_encode.c; sourceTree = "<group>"; };
+		229A614B13DDFE3500090183 /* g722.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g722.h; sourceTree = "<group>"; };
+		229A614C13DDFE3500090183 /* msg722.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msg722.c; sourceTree = "<group>"; };
 		229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphonecore_utils.h; sourceTree = "<group>"; };
 		22A10B4F11F84E2D00373793 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 		22A10B5011F84E2D00373793 /* gsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsm.h; sourceTree = "<group>"; };
@ -343,12 +406,55 @@
 		22A10B5411F84E2D00373793 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toast.h; sourceTree = "<group>"; };
 		22A10B5511F84E2D00373793 /* unproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unproto.h; sourceTree = "<group>"; };
 		22A10EE711F8920F00373793 /* mswebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mswebcam.c; path = linphone/mediastreamer2/src/mswebcam.c; sourceTree = SOURCE_ROOT; };
+		22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = src/nowebcamCIF.jpg; sourceTree = "<group>"; };
+		22DD19BE13A8D7FA0018ECD4 /* mediastream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mediastream.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		22DD19C013A8D7FA0018ECD4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		22DD19E713A8D82C0018ECD4 /* mediastream.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = mediastream.c; sourceTree = "<group>"; };
+		22DD21A213A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		22DD21A413A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
+		22DD21A613A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/mediastreamViewController.xib; sourceTree = "<group>"; };
+		22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-Info.plist"; sourceTree = "<group>"; };
+		22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mediastream-Prefix.pch"; sourceTree = "<group>"; };
+		22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamAppDelegate.h; sourceTree = "<group>"; };
+		22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = "<group>"; };
+		22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = "<group>"; };
+		22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = "<group>"; };
+		22FC56A713CB69FA002FD0F1 /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = "<group>"; };
+		22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = "<group>"; };
+		7014533B13FA7ECA00A01D86 /* zrtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrtp.h; sourceTree = "<group>"; };
+		7014533D13FA841E00A01D86 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = "<group>"; };
+		70E542ED13E147C7002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
+		70E542F013E147CE002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = liblinphone_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		D2AAC07E0554694100DB518D /* liblinphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblinphone.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
+		22DD19BB13A8D7FA0018ECD4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				225AA2DF144F0AA800BA809B /* libSKP_SILK_SDK.a in Frameworks */,
+				70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */,
+				70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */,
+				221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */,
+				220ED1A913A9041800AC21E0 /* AVFoundation.framework in Frameworks */,
+				220ED1A713A9040700AC21E0 /* AudioToolbox.framework in Frameworks */,
+				220ED1A313A903BF00AC21E0 /* libgsm.a in Frameworks */,
+				220ED19F13A9038F00AC21E0 /* CoreVideo.framework in Frameworks */,
+				220ED1A113A9039600AC21E0 /* CoreAudio.framework in Frameworks */,
+				220ED19D13A9033F00AC21E0 /* liblinphone.a in Frameworks */,
+				220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */,
+				220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */,
+				220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */,
+				22DD19C113A8D7FA0018ECD4 /* UIKit.framework in Frameworks */,
+				22DD19C213A8D7FA0018ECD4 /* Foundation.framework in Frameworks */,
+				22DD19C413A8D7FA0018ECD4 /* CoreGraphics.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		D2AAC07C0554694100DB518D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@ -363,7 +469,7 @@
 		034768DFFF38A50411DB9C8B /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D2AAC07E0554694100DB518D /* liblinphone.a */,
+				22DD19BE13A8D7FA0018ECD4 /* mediastream.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@ -371,6 +477,22 @@
 		0867D691FE84028FC02AAC07 /* liblinphone */ = {
 			isa = PBXGroup;
 			children = (
+				225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */,
+				70E542F013E147CE002BA2C0 /* QuartzCore.framework */,
+				70E542ED13E147C7002BA2C0 /* OpenGLES.framework */,
+				221F589F13AB50F800D603C9 /* CoreMedia.framework */,
+				221F589D13AB503F00D603C9 /* CoreVideo.framework */,
+				221F589913AB4EEE00D603C9 /* CoreFoundation.framework */,
+				220ED1A813A9041800AC21E0 /* AVFoundation.framework */,
+				220ED1A613A9040700AC21E0 /* AudioToolbox.framework */,
+				220ED1A413A903E100AC21E0 /* AudioUnit.framework */,
+				220ED1A213A903BF00AC21E0 /* libgsm.a */,
+				220ED1A013A9039600AC21E0 /* CoreAudio.framework */,
+				220ED19E13A9038F00AC21E0 /* CoreVideo.framework */,
+				D2AAC07E0554694100DB518D /* liblinphone.a */,
+				220ED19713A8F87700AC21E0 /* libspeexdsp.a */,
+				220ED19813A8F87700AC21E0 /* libspeex.a */,
+				220ED19913A8F87700AC21E0 /* libortp.a */,
 				22A10B4C11F84DE300373793 /* externals */,
 				222CA4D011F6CF2D00621220 /* linphone */,
 				222CA4CF11F6CF2000621220 /* mediastreamer2 */,
@ -387,6 +509,8 @@
 			isa = PBXGroup;
 			children = (
 				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
+				22DD19C013A8D7FA0018ECD4 /* UIKit.framework */,
+				22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@ -411,6 +535,9 @@
 		222CA4CF11F6CF2000621220 /* mediastreamer2 */ = {
 			isa = PBXGroup;
 			children = (
+				22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */,
+				221F58A313AB708C00D603C9 /* alldescs.h */,
+				22DD19E013A8D82C0018ECD4 /* tests */,
 				222CA5B811F6CF7600621220 /* include */,
 				222CA5DC11F6CF7600621220 /* src */,
 			);
@ -478,6 +605,18 @@
 		222CA5DC11F6CF7600621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				225AA2E4144F2E0200BA809B /* msprivate.h */,
+				225AA2E2144F1E3400BA809B /* qosanalyzer.c */,
+				225AA2E0144F1C6600BA809B /* bitratedriver.c */,
+				225AA2DA144F077600BA809B /* silk_dec.c */,
+				225AA2DB144F077700BA809B /* silk_enc.c */,
+				229A614913DDFE3500090183 /* g722_decode.c */,
+				229A614A13DDFE3500090183 /* g722_encode.c */,
+				229A614B13DDFE3500090183 /* g722.h */,
+				229A614C13DDFE3500090183 /* msg722.c */,
+				22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */,
+				22FC56A713CB69FA002FD0F1 /* qualityindicator.c */,
+				221F58A513AB716300D603C9 /* tonedetector.c */,
 				2252935A12F6CA4700DD9BFB /* ec-calibrator.c */,
 				222CA5DD11F6CF7600621220 /* .gitignore */,
 				222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */,
@ -487,12 +626,8 @@
 				222CA5E511F6CF7600621220 /* chanadapt.c */,
 				222CA5E711F6CF7600621220 /* dsptools.c */,
 				222CA5E811F6CF7600621220 /* dtmfgen.c */,
-				222CA5E911F6CF7600621220 /* dxfilter.cpp */,
-				222CA5EA11F6CF7600621220 /* dxfilter.h */,
 				222CA5EB11F6CF7600621220 /* equalizer.c */,
 				222CA5EC11F6CF7600621220 /* eventqueue.c */,
-				222CA5ED11F6CF7600621220 /* extdisplay.c */,
-				222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */,
 				222CA5EF11F6CF7600621220 /* g711common.h */,
 				222CA5F011F6CF7600621220 /* gsm.c */,
 				222CA5F211F6CF7600621220 /* ice.c */,
@ -544,6 +679,7 @@
 		222CA6A311F6CF9F00621220 /* ortp */ = {
 			isa = PBXGroup;
 			children = (
+				7014533B13FA7ECA00A01D86 /* zrtp.h */,
 				222CA6A411F6CF9F00621220 /* .gitignore */,
 				222CA6A511F6CF9F00621220 /* b64.h */,
 				222CA6A611F6CF9F00621220 /* event.h */,
@ -557,7 +693,6 @@
 				222CA6AE11F6CF9F00621220 /* rtpsession.h */,
 				222CA6AF11F6CF9F00621220 /* rtpsignaltable.h */,
 				222CA6B011F6CF9F00621220 /* sessionset.h */,
-				222CA6B111F6CF9F00621220 /* srtp.h */,
 				222CA6B211F6CF9F00621220 /* str_utils.h */,
 				222CA6B311F6CF9F00621220 /* stun.h */,
 				222CA6B411F6CF9F00621220 /* stun_udp.h */,
@ -569,6 +704,7 @@
 		222CA6B611F6CF9F00621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				7014533D13FA841E00A01D86 /* zrtp.c */,
 				222CA6B711F6CF9F00621220 /* .gitignore */,
 				222CA6B811F6CF9F00621220 /* avprofile.c */,
 				222CA6B911F6CF9F00621220 /* b64.c */,
@ -595,7 +731,6 @@
 				222CA6CF11F6CF9F00621220 /* scheduler.c */,
 				222CA6D011F6CF9F00621220 /* scheduler.h */,
 				222CA6D111F6CF9F00621220 /* sessionset.c */,
-				222CA6D211F6CF9F00621220 /* srtp.c */,
 				222CA6D311F6CF9F00621220 /* str_utils.c */,
 				222CA6D411F6CF9F00621220 /* stun.c */,
 				222CA6D511F6CF9F00621220 /* stun_udp.c */,
@ -610,6 +745,7 @@
 		222CA72D11F6CFB100621220 /* coreapi */ = {
 			isa = PBXGroup;
 			children = (
+				225AA2FC1451A95400BA809B /* conference.c */,
 				229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */,
 				225D3559124B1FF60008581C /* linphonecall.c */,
 				22A10EE711F8920F00373793 /* mswebcam.c */,
@ -688,6 +824,31 @@
 			path = externals/gsm/inc;
 			sourceTree = "<group>";
 		};
+		22DD19E013A8D82C0018ECD4 /* tests */ = {
+			isa = PBXGroup;
+			children = (
+				22DD21A013A8E3310018ECD4 /* ios */,
+				22DD19E713A8D82C0018ECD4 /* mediastream.c */,
+			);
+			path = tests;
+			sourceTree = "<group>";
+		};
+		22DD21A013A8E3310018ECD4 /* ios */ = {
+			isa = PBXGroup;
+			children = (
+				22DD21A113A8E3310018ECD4 /* InfoPlist.strings */,
+				22DD21A313A8E3310018ECD4 /* MainWindow.xib */,
+				22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */,
+				22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */,
+				22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */,
+				22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */,
+				22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */,
+				22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */,
+				22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */,
+			);
+			path = ios;
+			sourceTree = "<group>";
+		};
 		32C88DFF0371C24200C91783 /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
@ -733,8 +894,6 @@
 				222CA64C11F6CF7600621220 /* rfc3984.h in Headers */,
 				222CA64D11F6CF7600621220 /* waveheader.h in Headers */,
 				222CA64E11F6CF7600621220 /* _kiss_fft_guts.h in Headers */,
-				222CA65A11F6CF7600621220 /* dxfilter.h in Headers */,
-				222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */,
 				222CA65F11F6CF7600621220 /* g711common.h in Headers */,
 				222CA66511F6CF7600621220 /* kiss_fft.h in Headers */,
 				222CA66711F6CF7600621220 /* kiss_fftr.h in Headers */,
@ -750,7 +909,6 @@
 				222CA6FB11F6CF9F00621220 /* rtpsession.h in Headers */,
 				222CA6FC11F6CF9F00621220 /* rtpsignaltable.h in Headers */,
 				222CA6FD11F6CF9F00621220 /* sessionset.h in Headers */,
-				222CA6FE11F6CF9F00621220 /* srtp.h in Headers */,
 				222CA6FF11F6CF9F00621220 /* str_utils.h in Headers */,
 				222CA70011F6CF9F00621220 /* stun.h in Headers */,
 				222CA70111F6CF9F00621220 /* stun_udp.h in Headers */,
@ -776,12 +934,34 @@
 				22A10B5A11F84E2D00373793 /* toast.h in Headers */,
 				22A10B5B11F84E2D00373793 /* unproto.h in Headers */,
 				229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */,
+				221F58A413AB708C00D603C9 /* alldescs.h in Headers */,
+				229A614F13DDFE3500090183 /* g722.h in Headers */,
+				7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */,
+				225AA2E5144F2E0200BA809B /* msprivate.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
+		22DD19BD13A8D7FA0018ECD4 /* mediastream */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 22DD19DA13A8D7FA0018ECD4 /* Build configuration list for PBXNativeTarget "mediastream" */;
+			buildPhases = (
+				22DD19BA13A8D7FA0018ECD4 /* Sources */,
+				22DD19BB13A8D7FA0018ECD4 /* Frameworks */,
+				22DD19BC13A8D7FA0018ECD4 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				220ED19613A8F82A00AC21E0 /* PBXTargetDependency */,
+			);
+			name = mediastream;
+			productName = mediastream;
+			productReference = 22DD19BE13A8D7FA0018ECD4 /* mediastream.app */;
+			productType = "com.apple.product-type.application";
+		};
 		D2AAC07D0554694100DB518D /* liblinphone */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "liblinphone" */;
@ -813,6 +993,7 @@
 				Japanese,
 				French,
 				German,
+				en,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* liblinphone */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@ -820,11 +1001,37 @@
 			projectRoot = "";
 			targets = (
 				D2AAC07D0554694100DB518D /* liblinphone */,
+				22DD19BD13A8D7FA0018ECD4 /* mediastream */,
 			);
 		};
 /* End PBXProject section */

+/* Begin PBXResourcesBuildPhase section */
+		22DD19BC13A8D7FA0018ECD4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */,
+				22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */,
+				22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */,
+				22DD21B213A8E3310018ECD4 /* mediastream-Info.plist in Resources */,
+				22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
+		22DD19BA13A8D7FA0018ECD4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */,
+				22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */,
+				22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		D2AAC07B0554694100DB518D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@ -835,10 +1042,8 @@
 				222CA65511F6CF7600621220 /* chanadapt.c in Sources */,
 				222CA65711F6CF7600621220 /* dsptools.c in Sources */,
 				222CA65811F6CF7600621220 /* dtmfgen.c in Sources */,
-				222CA65911F6CF7600621220 /* dxfilter.cpp in Sources */,
 				222CA65B11F6CF7600621220 /* equalizer.c in Sources */,
 				222CA65C11F6CF7600621220 /* eventqueue.c in Sources */,
-				222CA65D11F6CF7600621220 /* extdisplay.c in Sources */,
 				222CA66011F6CF7600621220 /* gsm.c in Sources */,
 				222CA66211F6CF7600621220 /* ice.c in Sources */,
 				222CA66311F6CF7600621220 /* itc.c in Sources */,
@ -882,7 +1087,6 @@
 				222CA71511F6CF9F00621220 /* rtptimer.c in Sources */,
 				222CA71711F6CF9F00621220 /* scheduler.c in Sources */,
 				222CA71911F6CF9F00621220 /* sessionset.c in Sources */,
-				222CA71A11F6CF9F00621220 /* srtp.c in Sources */,
 				222CA71B11F6CF9F00621220 /* str_utils.c in Sources */,
 				222CA71C11F6CF9F00621220 /* stun.c in Sources */,
 				222CA71D11F6CF9F00621220 /* stun_udp.c in Sources */,
@ -909,17 +1113,67 @@
 				22A10EE811F8920F00373793 /* mswebcam.c in Sources */,
 				225D355A124B1FF60008581C /* linphonecall.c in Sources */,
 				2252935B12F6CA4700DD9BFB /* ec-calibrator.c in Sources */,
+				221F58A813AB716400D603C9 /* tonedetector.c in Sources */,
+				22FC56A813CB69FB002FD0F1 /* qualityindicator.c in Sources */,
+				22FC56AA13CB6A4F002FD0F1 /* bitratecontrol.c in Sources */,
+				229A614D13DDFE3500090183 /* g722_decode.c in Sources */,
+				229A614E13DDFE3500090183 /* g722_encode.c in Sources */,
+				229A615013DDFE3500090183 /* msg722.c in Sources */,
+				7014533E13FA841E00A01D86 /* zrtp.c in Sources */,
+				225AA2DC144F077700BA809B /* silk_dec.c in Sources */,
+				225AA2DD144F077700BA809B /* silk_enc.c in Sources */,
+				225AA2E1144F1C6600BA809B /* bitratedriver.c in Sources */,
+				225AA2E3144F1E3400BA809B /* qosanalyzer.c in Sources */,
+				225AA2FD1451A95400BA809B /* conference.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */

+/* Begin PBXTargetDependency section */
+		220ED19613A8F82A00AC21E0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D2AAC07D0554694100DB518D /* liblinphone */;
+			targetProxy = 220ED19513A8F82A00AC21E0 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		22DD21A113A8E3310018ECD4 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				22DD21A213A8E3310018ECD4 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		22DD21A313A8E3310018ECD4 /* MainWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				22DD21A413A8E3310018ECD4 /* en */,
+			);
+			name = MainWindow.xib;
+			sourceTree = "<group>";
+		};
+		22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				22DD21A613A8E3310018ECD4 /* en */,
+			);
+			name = mediastreamViewController.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		1DEB921F08733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@ -928,8 +1182,42 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = liblinphone_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					"PACKAGE_DATA_DIR=\\\"\\\"",
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					TARGET_OS_IPHONE,
+				);
+				GCC_UNROLL_LOOPS = NO;
+				HEADER_SEARCH_PATHS = (
+					linphone/mediastreamer2/build/iphone,
+					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/silk",
+				);
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
 				PRODUCT_NAME = linphone;
+				USER_HEADER_SEARCH_PATHS = "linphone/mediastreamer2/build/iphone 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/";
 			};
 			name = Debug;
 		};
@ -937,13 +1225,50 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = liblinphone_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					"PACKAGE_DATA_DIR=\\\"\\\"",
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					TARGET_OS_IPHONE,
+				);
+				GCC_UNROLL_LOOPS = NO;
+				HEADER_SEARCH_PATHS = (
+					linphone/mediastreamer2/build/iphone,
+					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/silk",
+				);
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
 				PRODUCT_NAME = linphone;
+				USER_HEADER_SEARCH_PATHS = "linphone/mediastreamer2/build/iphone 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/";
 			};
 			name = Release;
 		};
@ -1012,6 +1337,7 @@
 					HAVE_EXOSIP_GET_SOCKET,
 					MS2_INTERNAL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@ -1030,6 +1356,245 @@
 			};
 			name = Release;
 		};
+		229A615513DF03B200090183 /* DistributionAdhoc */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					__MACIOUNIT_ENABLED__,
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					linphone/mediastreamer2/build/iphone,
+					linphone/mediastreamer2/include,
+					linphone/oRTP/include,
+					externals/gsm/,
+					externals/osip/include,
+					externals/exosip/include,
+					externals/speex/include,
+				);
+				OTHER_LDFLAGS = "-ObjC";
+				PREBINDING = NO;
+				SDKROOT = iphoneos;
+				VALID_ARCHS = "armv6 armv7 i386";
+			};
+			name = DistributionAdhoc;
+		};
+		229A615613DF03B200090183 /* DistributionAdhoc */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
+				DSTROOT = /tmp/liblinphone.dst;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = liblinphone_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					"PACKAGE_DATA_DIR=\\\"\\\"",
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					TARGET_OS_IPHONE,
+				);
+				GCC_UNROLL_LOOPS = NO;
+				HEADER_SEARCH_PATHS = (
+					linphone/mediastreamer2/build/iphone,
+					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/silk",
+				);
+				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
+				PRODUCT_NAME = linphone;
+				USER_HEADER_SEARCH_PATHS = "linphone/mediastreamer2/build/iphone 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/";
+			};
+			name = DistributionAdhoc;
+		};
+		229A615713DF03B200090183 /* DistributionAdhoc */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_SILK,
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					__IOSIOUNIT_ENABLED__,
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					"TARGET_OS_IPHONE=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"",
+				);
+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALIDATE_PRODUCT = YES;
+				WRAPPER_EXTENSION = app;
+			};
+			name = DistributionAdhoc;
+		};
+		22DD19DB13A8D7FA0018ECD4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_SILK,
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					__IOSIOUNIT_ENABLED__,
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					"TARGET_OS_IPHONE=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		22DD19DC13A8D7FA0018ECD4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					"$(ARCHS_STANDARD_32_BIT)",
+					armv6,
+				);
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					HAVE_SILK,
+					"_BYTE_ORDER=_LITTLE_ENDIAN",
+					ORTP_INET6,
+					ENABLE_TRACE,
+					"LINPHONE_VERSION=\\\"debug\\\"",
+					"LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"",
+					"LOG_DOMAIN=\\\"Linphone\\\"",
+					"ORTP_MAJOR_VERSION=0",
+					"ORTP_MICRO_VERSION=0",
+					"ORTP_MINOR_VERSION=15",
+					"ORTP_VERSION=\\\"0.15.0\\\"",
+					"PACKAGE=\\\"ortp\\\"",
+					"POSIXTIMER_INTERVAL=10000",
+					IN_LINPHONE,
+					__IOSIOUNIT_ENABLED__,
+					HAVE_EXOSIP_GET_SOCKET,
+					MS2_INTERNAL,
+					"TARGET_OS_IPHONE=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"",
+					"\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"",
+				);
+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALIDATE_PRODUCT = YES;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
@ -1038,6 +1603,7 @@
 			buildConfigurations = (
 				1DEB921F08733DC00010E9CD /* Debug */,
 				1DEB922008733DC00010E9CD /* Release */,
+				229A615613DF03B200090183 /* DistributionAdhoc */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@ -1047,6 +1613,17 @@
 			buildConfigurations = (
 				1DEB922308733DC00010E9CD /* Debug */,
 				1DEB922408733DC00010E9CD /* Release */,
+				229A615513DF03B200090183 /* DistributionAdhoc */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		22DD19DA13A8D7FA0018ECD4 /* Build configuration list for PBXNativeTarget "mediastream" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				22DD19DB13A8D7FA0018ECD4 /* Debug */,
+				22DD19DC13A8D7FA0018ECD4 /* Release */,
+				229A615713DF03B200090183 /* DistributionAdhoc */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
--- a/submodules/linphone
+++ b/submodules/linphone
@ -1 +1 @@
-Subproject commit 20709fc5f1b06c04f2311e1f6ec4ff45f76f4de8
+Subproject commit 388ef155ae078d2423cb7d8fddb7529be000bc52