diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index f51341c3b..acb065a57 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -87,6 +87,11 @@ } } + +-(void) configureOrientation { + [self configureOrientation:self.interfaceOrientation]; +} + - (void)viewDidUnload { [super viewDidUnload]; @@ -95,8 +100,9 @@ // e.g. self.myOutlet = nil; } -(void) viewWillDisappear:(BOOL)animated { - + [[UIApplication sharedApplication] setIdleTimerDisabled:NO]; } + -(void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [[UIApplication sharedApplication] setIdleTimerDisabled:true]; @@ -106,6 +112,14 @@ AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); + + + [self performSelectorOnMainThread:@selector(configureOrientation) + withObject:nil + waitUntilDone:YES]; + [mMute reset]; + [mMuteLand reset]; + [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { diff --git a/README b/README index 127db86aa..1c31943aa 100644 --- a/README +++ b/README @@ -12,7 +12,9 @@ Linphone for iPhone depends on liblinphone sdk. To build this sdk, you must inst -yasm -gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin +gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : +$ wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl +$ sudo mv gas-preprocessor.pl /opt/local/bin/. Link macport libtoolize to glibtoolize (sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize) Link host's strings to simulator SDK (ln -s /usr/bin/strings /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 05f725a78..d1140b64d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -104,23 +104,23 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 22A10DA211F88C1F00373793 /* PBXContainerItemProxy */ = { + F4D9F24C145748E80035B0D0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */; + containerPortal = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC07E0554694100DB518D; remoteInfo = liblinphone; }; - 22DD19DE13A8D7FB0018ECD4 /* PBXContainerItemProxy */ = { + F4D9F24E145748E80035B0D0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */; + containerPortal = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; proxyType = 2; remoteGlobalIDString = 22DD19BE13A8D7FA0018ECD4; remoteInfo = mediastream; }; - 22F3D57B13CCC60500A0DA02 /* PBXContainerItemProxy */ = { + F4D9F25C145829200035B0D0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */; + containerPortal = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC07D0554694100DB518D; remoteInfo = liblinphone; @@ -331,7 +331,6 @@ 22968A5E12F875C600588287 /* UISpeakerButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UISpeakerButton.m; sourceTree = ""; }; 22968A8612F87C2000588287 /* UIDuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDuration.h; sourceTree = ""; }; 22968A8712F87C2000588287 /* UIDuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDuration.m; sourceTree = ""; }; - 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = liblinphone.xcodeproj; path = submodules/liblinphone.xcodeproj; sourceTree = ""; }; 22AA8AFB13D7125500B30535 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = "liblinphone-sdk/apple-darwin/lib/libx264.a"; sourceTree = ""; }; 22AA8AFC13D7125500B30535 /* libmsx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsx264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsx264.a"; sourceTree = ""; }; 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICamSwitch.h; sourceTree = ""; }; @@ -445,6 +444,7 @@ 70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 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 = ""; }; + F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = liblinphone.xcodeproj; path = submodules/liblinphone.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -759,15 +759,6 @@ path = LinphoneUI; sourceTree = ""; }; - 22A10D9F11F88C1F00373793 /* Products */ = { - isa = PBXGroup; - children = ( - 22A10DA311F88C1F00373793 /* liblinphone.a */, - 22DD19DF13A8D7FB0018ECD4 /* mediastream.app */, - ); - name = Products; - sourceTree = ""; - }; 22C7560413265C6A007BC101 /* openssl */ = { isa = PBXGroup; children = ( @@ -849,6 +840,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */, 7066FC0B13E830E400EFC6DC /* libvpx.a */, 70E542F413E147EB002BA2C0 /* QuartzCore.framework */, 70E542F213E147E3002BA2C0 /* OpenGLES.framework */, @@ -863,7 +855,6 @@ 22276E8113C73D3100210156 /* libavutil.a */, 22276E8213C73D3100210156 /* libswscale.a */, 2214783B1386A2030020F8B8 /* Localizable.strings */, - 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */, 223148E51178A09900637D6A /* libmsilbc.a */, 223148E31178A08200637D6A /* libilbc.a */, 220FAD2810765B400068D98F /* libeXosip2.a */, @@ -952,6 +943,15 @@ name = Frameworks; sourceTree = ""; }; + F4D9F244145748E80035B0D0 /* Products */ = { + isa = PBXGroup; + children = ( + F4D9F24D145748E80035B0D0 /* liblinphone.a */, + F4D9F24F145748E80035B0D0 /* mediastream.app */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -967,7 +967,7 @@ buildRules = ( ); dependencies = ( - 22F3D57C13CCC60500A0DA02 /* PBXTargetDependency */, + F4D9F25D145829200035B0D0 /* PBXTargetDependency */, ); name = linphone; productName = linphone; @@ -994,8 +994,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 22A10D9F11F88C1F00373793 /* Products */; - ProjectRef = 22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */; + ProductGroup = F4D9F244145748E80035B0D0 /* Products */; + ProjectRef = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; }, ); projectRoot = ""; @@ -1006,18 +1006,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 22A10DA311F88C1F00373793 /* liblinphone.a */ = { + F4D9F24D145748E80035B0D0 /* liblinphone.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = liblinphone.a; - remoteRef = 22A10DA211F88C1F00373793 /* PBXContainerItemProxy */; + remoteRef = F4D9F24C145748E80035B0D0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 22DD19DF13A8D7FB0018ECD4 /* mediastream.app */ = { + F4D9F24F145748E80035B0D0 /* mediastream.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = mediastream.app; - remoteRef = 22DD19DE13A8D7FB0018ECD4 /* PBXContainerItemProxy */; + remoteRef = F4D9F24E145748E80035B0D0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -1101,10 +1101,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 22F3D57C13CCC60500A0DA02 /* PBXTargetDependency */ = { + F4D9F25D145829200035B0D0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = liblinphone; - targetProxy = 22F3D57B13CCC60500A0DA02 /* PBXContainerItemProxy */; + targetProxy = F4D9F25C145829200035B0D0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index eebe3f22e..fbe943686 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -19,8 +19,12 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################ + +#--enable-static is mandatory otherwise the lib is not installed + x264-configure-option= \ --host=$(host)\ + --enable-static \ --cross-prefix=$$SDK_BIN_PATH/ \ --extra-ldflags="-arch $$ARCH -isysroot $$SYSROOT_PATH" @@ -55,7 +59,7 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/co && ./configure --prefix=$(prefix) ${x264-configure-option} build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak - cd $(BUILDER_BUILD_DIR)/$(x264_dir) make && make install-lib-static + cd $(BUILDER_BUILD_DIR)/$(x264_dir) make && make install clean-x264: cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 5beb14a67..125aa3eb7 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -139,7 +139,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 */; }; @@ -225,6 +224,10 @@ 70E542FD13E14816002BA2C0 /* yuv2rgb.vs.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F913E14816002BA2C0 /* yuv2rgb.vs.h */; }; AA747D9F0F9514B9006C5449 /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; + F4D9F23F145710540035B0D0 /* netsim.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23D145710540035B0D0 /* netsim.c */; }; + F4D9F240145710540035B0D0 /* ortp_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23E145710540035B0D0 /* ortp_srtp.c */; }; + F4D9F26014583B580035B0D0 /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25E14583B580035B0D0 /* bitratedriver.c */; }; + F4D9F26114583B580035B0D0 /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25F14583B580035B0D0 /* qosanalyzer.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -390,7 +393,6 @@ 222CA6CF11F6CF9F00621220 /* scheduler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scheduler.c; sourceTree = ""; }; 222CA6D011F6CF9F00621220 /* scheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheduler.h; sourceTree = ""; }; 222CA6D111F6CF9F00621220 /* sessionset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sessionset.c; sourceTree = ""; }; - 222CA6D211F6CF9F00621220 /* srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = srtp.c; sourceTree = ""; }; 222CA6D311F6CF9F00621220 /* str_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = str_utils.c; sourceTree = ""; }; 222CA6D411F6CF9F00621220 /* stun.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun.c; sourceTree = ""; }; 222CA6D511F6CF9F00621220 /* stun_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun_udp.c; sourceTree = ""; }; @@ -493,6 +495,10 @@ 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; }; + F4D9F23D145710540035B0D0 /* netsim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = netsim.c; sourceTree = ""; }; + F4D9F23E145710540035B0D0 /* ortp_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ortp_srtp.c; sourceTree = ""; }; + F4D9F25E14583B580035B0D0 /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = ""; }; + F4D9F25F14583B580035B0D0 /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -679,6 +685,8 @@ 222CA5DC11F6CF7600621220 /* src */ = { isa = PBXGroup; children = ( + F4D9F25E14583B580035B0D0 /* bitratedriver.c */, + F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, 22313679143DED490035C1F4 /* msandroidvideo.cpp */, 229ECDEE143AEC2400D611B8 /* audioconference.c */, 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */, @@ -806,6 +814,8 @@ 222CA6B611F6CF9F00621220 /* src */ = { isa = PBXGroup; children = ( + F4D9F23D145710540035B0D0 /* netsim.c */, + F4D9F23E145710540035B0D0 /* ortp_srtp.c */, 7014533D13FA841E00A01D86 /* zrtp.c */, 222CA6B711F6CF9F00621220 /* .gitignore */, 222CA6B811F6CF9F00621220 /* avprofile.c */, @@ -833,7 +843,6 @@ 222CA6CF11F6CF9F00621220 /* scheduler.c */, 222CA6D011F6CF9F00621220 /* scheduler.h */, 222CA6D111F6CF9F00621220 /* sessionset.c */, - 222CA6D211F6CF9F00621220 /* srtp.c */, 222CA6D311F6CF9F00621220 /* str_utils.c */, 222CA6D411F6CF9F00621220 /* stun.c */, 222CA6D511F6CF9F00621220 /* stun_udp.c */, @@ -1200,7 +1209,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 */, @@ -1253,6 +1261,10 @@ 229ECDEB143AEA6300D611B8 /* msvideo_neon.c in Sources */, 229ECDED143AEBDA00D611B8 /* conference.c in Sources */, 229ECDEF143AEC2400D611B8 /* audioconference.c in Sources */, + F4D9F23F145710540035B0D0 /* netsim.c in Sources */, + F4D9F240145710540035B0D0 /* ortp_srtp.c in Sources */, + F4D9F26014583B580035B0D0 /* bitratedriver.c in Sources */, + F4D9F26114583B580035B0D0 /* qosanalyzer.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/linphone b/submodules/linphone index 6566c1179..b9394b5b8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6566c1179c6c30a4f436e71a6a2d4080f1609098 +Subproject commit b9394b5b868ab9b8d10207c39b8a317076ca2a77