From 9caecd7727027ff90a00d473bb730d755599d249 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 7 May 2015 11:54:56 +0200 Subject: [PATCH] Sample app for videostream reuse --- submodules/MS2/MS2.xcodeproj/project.pbxproj | 614 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + submodules/MS2/MS2/AppDelegate.h | 17 + submodules/MS2/MS2/AppDelegate.m | 45 ++ .../MS2/MS2/Base.lproj/LaunchScreen.xib | 41 ++ submodules/MS2/MS2/Base.lproj/Main.storyboard | 116 ++++ .../AppIcon.appiconset/Contents.json | 68 ++ submodules/MS2/MS2/Info.plist | 45 ++ submodules/MS2/MS2/UITextField+DoneButton.h | 13 + submodules/MS2/MS2/UITextField+DoneButton.m | 35 + submodules/MS2/MS2/ViewController.h | 23 + submodules/MS2/MS2/ViewController.m | 165 +++++ submodules/MS2/MS2/main.m | 16 + submodules/MS2/MS2Tests/Info.plist | 24 + submodules/MS2/MS2Tests/MS2Tests.m | 40 ++ submodules/linphone | 2 +- 16 files changed, 1270 insertions(+), 1 deletion(-) create mode 100644 submodules/MS2/MS2.xcodeproj/project.pbxproj create mode 100644 submodules/MS2/MS2.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 submodules/MS2/MS2/AppDelegate.h create mode 100644 submodules/MS2/MS2/AppDelegate.m create mode 100644 submodules/MS2/MS2/Base.lproj/LaunchScreen.xib create mode 100644 submodules/MS2/MS2/Base.lproj/Main.storyboard create mode 100644 submodules/MS2/MS2/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 submodules/MS2/MS2/Info.plist create mode 100644 submodules/MS2/MS2/UITextField+DoneButton.h create mode 100644 submodules/MS2/MS2/UITextField+DoneButton.m create mode 100644 submodules/MS2/MS2/ViewController.h create mode 100644 submodules/MS2/MS2/ViewController.m create mode 100644 submodules/MS2/MS2/main.m create mode 100644 submodules/MS2/MS2Tests/Info.plist create mode 100644 submodules/MS2/MS2Tests/MS2Tests.m diff --git a/submodules/MS2/MS2.xcodeproj/project.pbxproj b/submodules/MS2/MS2.xcodeproj/project.pbxproj new file mode 100644 index 000000000..58a9b37cc --- /dev/null +++ b/submodules/MS2/MS2.xcodeproj/project.pbxproj @@ -0,0 +1,614 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + F03A97691AFA48E800651655 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F03A97681AFA48E800651655 /* main.m */; }; + F03A976C1AFA48E800651655 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F03A976B1AFA48E800651655 /* AppDelegate.m */; }; + F03A976F1AFA48E800651655 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F03A976E1AFA48E800651655 /* ViewController.m */; }; + F03A97721AFA48E800651655 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F03A97701AFA48E800651655 /* Main.storyboard */; }; + F03A97741AFA48E800651655 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F03A97731AFA48E800651655 /* Images.xcassets */; }; + F03A97771AFA48E800651655 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = F03A97751AFA48E800651655 /* LaunchScreen.xib */; }; + F03A97831AFA48E900651655 /* MS2Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = F03A97821AFA48E900651655 /* MS2Tests.m */; }; + F03A97931AFA561900651655 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A978D1AFA561900651655 /* libmsamr.a */; }; + F03A97941AFA561A00651655 /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A978E1AFA561900651655 /* libmsbcg729.a */; }; + F03A97951AFA561A00651655 /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A978F1AFA561900651655 /* libmsilbc.a */; }; + F03A97961AFA561A00651655 /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97901AFA561900651655 /* libmsopenh264.a */; }; + F03A97971AFA561A00651655 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97911AFA561900651655 /* libmssilk.a */; }; + F03A97981AFA561A00651655 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97921AFA561900651655 /* libmsx264.a */; }; + F03A97AE1AFA563200651655 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97991AFA563200651655 /* libavcodec.a */; }; + F03A97AF1AFA563200651655 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979A1AFA563200651655 /* libavutil.a */; }; + F03A97B01AFA563200651655 /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979B1AFA563200651655 /* libbzrtp.a */; }; + F03A97B11AFA563200651655 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979C1AFA563200651655 /* libgsm.a */; }; + F03A97B21AFA563200651655 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979D1AFA563200651655 /* libilbc.a */; }; + F03A97B31AFA563200651655 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979E1AFA563200651655 /* libmediastreamer_base.a */; }; + F03A97B41AFA563200651655 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A979F1AFA563200651655 /* libmediastreamer_voip.a */; }; + F03A97B51AFA563200651655 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A01AFA563200651655 /* libopencore-amrnb.a */; }; + F03A97B61AFA563200651655 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A11AFA563200651655 /* libopencore-amrwb.a */; }; + F03A97B71AFA563200651655 /* libopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A21AFA563200651655 /* libopenh264.a */; }; + F03A97B81AFA563200651655 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A31AFA563200651655 /* libopus.a */; }; + F03A97B91AFA563200651655 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A41AFA563200651655 /* libortp.a */; }; + F03A97BA1AFA563200651655 /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A51AFA563200651655 /* libpolarssl.a */; }; + F03A97BB1AFA563200651655 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A61AFA563200651655 /* libSKP_SILK_SDK.a */; }; + F03A97BC1AFA563200651655 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A71AFA563200651655 /* libspeex.a */; }; + F03A97BD1AFA563200651655 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A81AFA563200651655 /* libspeexdsp.a */; }; + F03A97BE1AFA563200651655 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97A91AFA563200651655 /* libsrtp.a */; }; + F03A97BF1AFA563200651655 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97AA1AFA563200651655 /* libswresample.a */; }; + F03A97C01AFA563200651655 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97AB1AFA563200651655 /* libswscale.a */; }; + F03A97C11AFA563200651655 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97AC1AFA563200651655 /* libvpx.a */; }; + F03A97C21AFA563200651655 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97AD1AFA563200651655 /* libx264.a */; }; + F03A97C61AFA565000651655 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97C31AFA565000651655 /* AudioToolbox.framework */; }; + F03A97C71AFA565000651655 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97C41AFA565000651655 /* AVFoundation.framework */; }; + F03A97C81AFA565000651655 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97C51AFA565000651655 /* CoreAudio.framework */; }; + F03A97CA1AFA565C00651655 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97C91AFA565C00651655 /* libxml2.a */; }; + F03A97CC1AFA572600651655 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97CB1AFA572600651655 /* libstdc++.dylib */; }; + F03A97D81AFA580100651655 /* UITextField+DoneButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F03A97D71AFA580100651655 /* UITextField+DoneButton.m */; }; + F03A97DA1AFA589E00651655 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97D91AFA589E00651655 /* Foundation.framework */; }; + F03A97DC1AFA58B600651655 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97DB1AFA58B600651655 /* UIKit.framework */; }; + F03A97E11AFA5B4A00651655 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A97E01AFA5B4A00651655 /* CoreMedia.framework */; }; + F03A97E31AFA64D200651655 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F03A97E21AFA64D200651655 /* nowebcamCIF.jpg */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + F03A977D1AFA48E900651655 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F03A975B1AFA48E800651655 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F03A97621AFA48E800651655; + remoteInfo = MS2; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + F03A97631AFA48E800651655 /* MS2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MS2.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F03A97671AFA48E800651655 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + F03A97681AFA48E800651655 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + F03A976A1AFA48E800651655 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + F03A976B1AFA48E800651655 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + F03A976D1AFA48E800651655 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + F03A976E1AFA48E800651655 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + F03A97711AFA48E800651655 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + F03A97731AFA48E800651655 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + F03A97761AFA48E800651655 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + F03A977C1AFA48E900651655 /* MS2Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MS2Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + F03A97811AFA48E900651655 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + F03A97821AFA48E900651655 /* MS2Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MS2Tests.m; sourceTree = ""; }; + F03A978D1AFA561900651655 /* libmsamr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsamr.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsamr.a"; sourceTree = ""; }; + F03A978E1AFA561900651655 /* libmsbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsbcg729.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsbcg729.a"; sourceTree = ""; }; + F03A978F1AFA561900651655 /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsilbc.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsilbc.a"; sourceTree = ""; }; + F03A97901AFA561900651655 /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsopenh264.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsopenh264.a"; sourceTree = ""; }; + F03A97911AFA561900651655 /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; + F03A97921AFA561900651655 /* libmsx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsx264.a; path = "../../../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsx264.a"; sourceTree = ""; }; + F03A97991AFA563200651655 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; + F03A979A1AFA563200651655 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; + F03A979B1AFA563200651655 /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = ""; }; + F03A979C1AFA563200651655 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; + F03A979D1AFA563200651655 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; + F03A979E1AFA563200651655 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; + F03A979F1AFA563200651655 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; + F03A97A01AFA563200651655 /* libopencore-amrnb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrnb.a"; path = "../../../liblinphone-sdk/apple-darwin/lib/libopencore-amrnb.a"; sourceTree = ""; }; + F03A97A11AFA563200651655 /* libopencore-amrwb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrwb.a"; path = "../../../liblinphone-sdk/apple-darwin/lib/libopencore-amrwb.a"; sourceTree = ""; }; + F03A97A21AFA563200651655 /* libopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenh264.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libopenh264.a"; sourceTree = ""; }; + F03A97A31AFA563200651655 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libopus.a"; sourceTree = ""; }; + F03A97A41AFA563200651655 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; + F03A97A51AFA563200651655 /* libpolarssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpolarssl.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libpolarssl.a"; sourceTree = ""; }; + F03A97A61AFA563200651655 /* 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 = ""; }; + F03A97A71AFA563200651655 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; + F03A97A81AFA563200651655 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; + F03A97A91AFA563200651655 /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; + F03A97AA1AFA563200651655 /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libswresample.a"; sourceTree = ""; }; + F03A97AB1AFA563200651655 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; + F03A97AC1AFA563200651655 /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; + F03A97AD1AFA563200651655 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libx264.a"; sourceTree = ""; }; + F03A97C31AFA565000651655 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + F03A97C41AFA565000651655 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + F03A97C51AFA565000651655 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + F03A97C91AFA565C00651655 /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = "../../../liblinphone-sdk/apple-darwin/lib/libxml2.a"; sourceTree = ""; }; + F03A97CB1AFA572600651655 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; + F03A97D61AFA580100651655 /* UITextField+DoneButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+DoneButton.h"; sourceTree = ""; }; + F03A97D71AFA580100651655 /* UITextField+DoneButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+DoneButton.m"; sourceTree = ""; }; + F03A97D91AFA589E00651655 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + F03A97DB1AFA58B600651655 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + F03A97E01AFA5B4A00651655 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + F03A97E21AFA64D200651655 /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = "../../../liblinphone-sdk/apple-darwin/share/images/nowebcamCIF.jpg"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F03A97601AFA48E800651655 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + F03A97E11AFA5B4A00651655 /* CoreMedia.framework in Frameworks */, + F03A97DC1AFA58B600651655 /* UIKit.framework in Frameworks */, + F03A97DA1AFA589E00651655 /* Foundation.framework in Frameworks */, + F03A97CC1AFA572600651655 /* libstdc++.dylib in Frameworks */, + F03A97C61AFA565000651655 /* AudioToolbox.framework in Frameworks */, + F03A97C71AFA565000651655 /* AVFoundation.framework in Frameworks */, + F03A97C81AFA565000651655 /* CoreAudio.framework in Frameworks */, + F03A97971AFA561A00651655 /* libmssilk.a in Frameworks */, + F03A97B61AFA563200651655 /* libopencore-amrwb.a in Frameworks */, + F03A97B91AFA563200651655 /* libortp.a in Frameworks */, + F03A97CA1AFA565C00651655 /* libxml2.a in Frameworks */, + F03A97981AFA561A00651655 /* libmsx264.a in Frameworks */, + F03A97BB1AFA563200651655 /* libSKP_SILK_SDK.a in Frameworks */, + F03A97B81AFA563200651655 /* libopus.a in Frameworks */, + F03A97B31AFA563200651655 /* libmediastreamer_base.a in Frameworks */, + F03A97B41AFA563200651655 /* libmediastreamer_voip.a in Frameworks */, + F03A97B21AFA563200651655 /* libilbc.a in Frameworks */, + F03A97931AFA561900651655 /* libmsamr.a in Frameworks */, + F03A97B11AFA563200651655 /* libgsm.a in Frameworks */, + F03A97C21AFA563200651655 /* libx264.a in Frameworks */, + F03A97951AFA561A00651655 /* libmsilbc.a in Frameworks */, + F03A97B71AFA563200651655 /* libopenh264.a in Frameworks */, + F03A97941AFA561A00651655 /* libmsbcg729.a in Frameworks */, + F03A97AE1AFA563200651655 /* libavcodec.a in Frameworks */, + F03A97B01AFA563200651655 /* libbzrtp.a in Frameworks */, + F03A97C01AFA563200651655 /* libswscale.a in Frameworks */, + F03A97BF1AFA563200651655 /* libswresample.a in Frameworks */, + F03A97C11AFA563200651655 /* libvpx.a in Frameworks */, + F03A97BC1AFA563200651655 /* libspeex.a in Frameworks */, + F03A97BE1AFA563200651655 /* libsrtp.a in Frameworks */, + F03A97B51AFA563200651655 /* libopencore-amrnb.a in Frameworks */, + F03A97AF1AFA563200651655 /* libavutil.a in Frameworks */, + F03A97961AFA561A00651655 /* libmsopenh264.a in Frameworks */, + F03A97BA1AFA563200651655 /* libpolarssl.a in Frameworks */, + F03A97BD1AFA563200651655 /* libspeexdsp.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F03A97791AFA48E900651655 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + F03A975A1AFA48E800651655 = { + isa = PBXGroup; + children = ( + F03A978C1AFA560800651655 /* Frameworks */, + F03A97651AFA48E800651655 /* MS2 */, + F03A977F1AFA48E900651655 /* MS2Tests */, + F03A97641AFA48E800651655 /* Products */, + ); + sourceTree = ""; + }; + F03A97641AFA48E800651655 /* Products */ = { + isa = PBXGroup; + children = ( + F03A97631AFA48E800651655 /* MS2.app */, + F03A977C1AFA48E900651655 /* MS2Tests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + F03A97651AFA48E800651655 /* MS2 */ = { + isa = PBXGroup; + children = ( + F03A976A1AFA48E800651655 /* AppDelegate.h */, + F03A976B1AFA48E800651655 /* AppDelegate.m */, + F03A976D1AFA48E800651655 /* ViewController.h */, + F03A976E1AFA48E800651655 /* ViewController.m */, + F03A97E21AFA64D200651655 /* nowebcamCIF.jpg */, + F03A97D61AFA580100651655 /* UITextField+DoneButton.h */, + F03A97D71AFA580100651655 /* UITextField+DoneButton.m */, + F03A97701AFA48E800651655 /* Main.storyboard */, + F03A97731AFA48E800651655 /* Images.xcassets */, + F03A97751AFA48E800651655 /* LaunchScreen.xib */, + F03A97661AFA48E800651655 /* Supporting Files */, + ); + path = MS2; + sourceTree = ""; + }; + F03A97661AFA48E800651655 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + F03A97671AFA48E800651655 /* Info.plist */, + F03A97681AFA48E800651655 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + F03A977F1AFA48E900651655 /* MS2Tests */ = { + isa = PBXGroup; + children = ( + F03A97821AFA48E900651655 /* MS2Tests.m */, + F03A97801AFA48E900651655 /* Supporting Files */, + ); + path = MS2Tests; + sourceTree = ""; + }; + F03A97801AFA48E900651655 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + F03A97811AFA48E900651655 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + F03A978C1AFA560800651655 /* Frameworks */ = { + isa = PBXGroup; + children = ( + F03A97E01AFA5B4A00651655 /* CoreMedia.framework */, + F03A97DB1AFA58B600651655 /* UIKit.framework */, + F03A97D91AFA589E00651655 /* Foundation.framework */, + F03A97CB1AFA572600651655 /* libstdc++.dylib */, + F03A97C31AFA565000651655 /* AudioToolbox.framework */, + F03A97C41AFA565000651655 /* AVFoundation.framework */, + F03A97C51AFA565000651655 /* CoreAudio.framework */, + F03A978D1AFA561900651655 /* libmsamr.a */, + F03A978E1AFA561900651655 /* libmsbcg729.a */, + F03A97991AFA563200651655 /* libavcodec.a */, + F03A979A1AFA563200651655 /* libavutil.a */, + F03A979B1AFA563200651655 /* libbzrtp.a */, + F03A979C1AFA563200651655 /* libgsm.a */, + F03A979D1AFA563200651655 /* libilbc.a */, + F03A979E1AFA563200651655 /* libmediastreamer_base.a */, + F03A979F1AFA563200651655 /* libmediastreamer_voip.a */, + F03A97A01AFA563200651655 /* libopencore-amrnb.a */, + F03A97A11AFA563200651655 /* libopencore-amrwb.a */, + F03A97C91AFA565C00651655 /* libxml2.a */, + F03A97A21AFA563200651655 /* libopenh264.a */, + F03A97A31AFA563200651655 /* libopus.a */, + F03A97A41AFA563200651655 /* libortp.a */, + F03A97A51AFA563200651655 /* libpolarssl.a */, + F03A97A61AFA563200651655 /* libSKP_SILK_SDK.a */, + F03A97A71AFA563200651655 /* libspeex.a */, + F03A97A81AFA563200651655 /* libspeexdsp.a */, + F03A97A91AFA563200651655 /* libsrtp.a */, + F03A97AA1AFA563200651655 /* libswresample.a */, + F03A97AB1AFA563200651655 /* libswscale.a */, + F03A97AC1AFA563200651655 /* libvpx.a */, + F03A97AD1AFA563200651655 /* libx264.a */, + F03A978F1AFA561900651655 /* libmsilbc.a */, + F03A97901AFA561900651655 /* libmsopenh264.a */, + F03A97911AFA561900651655 /* libmssilk.a */, + F03A97921AFA561900651655 /* libmsx264.a */, + ); + name = Frameworks; + path = MS2; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + F03A97621AFA48E800651655 /* MS2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = F03A97861AFA48E900651655 /* Build configuration list for PBXNativeTarget "MS2" */; + buildPhases = ( + F03A975F1AFA48E800651655 /* Sources */, + F03A97601AFA48E800651655 /* Frameworks */, + F03A97611AFA48E800651655 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MS2; + productName = MS2; + productReference = F03A97631AFA48E800651655 /* MS2.app */; + productType = "com.apple.product-type.application"; + }; + F03A977B1AFA48E900651655 /* MS2Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = F03A97891AFA48E900651655 /* Build configuration list for PBXNativeTarget "MS2Tests" */; + buildPhases = ( + F03A97781AFA48E900651655 /* Sources */, + F03A97791AFA48E900651655 /* Frameworks */, + F03A977A1AFA48E900651655 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + F03A977E1AFA48E900651655 /* PBXTargetDependency */, + ); + name = MS2Tests; + productName = MS2Tests; + productReference = F03A977C1AFA48E900651655 /* MS2Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F03A975B1AFA48E800651655 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0630; + ORGANIZATIONNAME = "Belldonne Communications"; + TargetAttributes = { + F03A97621AFA48E800651655 = { + CreatedOnToolsVersion = 6.3; + }; + F03A977B1AFA48E900651655 = { + CreatedOnToolsVersion = 6.3; + TestTargetID = F03A97621AFA48E800651655; + }; + }; + }; + buildConfigurationList = F03A975E1AFA48E800651655 /* Build configuration list for PBXProject "MS2" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = F03A975A1AFA48E800651655; + productRefGroup = F03A97641AFA48E800651655 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + F03A97621AFA48E800651655 /* MS2 */, + F03A977B1AFA48E900651655 /* MS2Tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + F03A97611AFA48E800651655 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F03A97E31AFA64D200651655 /* nowebcamCIF.jpg in Resources */, + F03A97721AFA48E800651655 /* Main.storyboard in Resources */, + F03A97771AFA48E800651655 /* LaunchScreen.xib in Resources */, + F03A97741AFA48E800651655 /* Images.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F03A977A1AFA48E900651655 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + F03A975F1AFA48E800651655 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F03A976F1AFA48E800651655 /* ViewController.m in Sources */, + F03A976C1AFA48E800651655 /* AppDelegate.m in Sources */, + F03A97691AFA48E800651655 /* main.m in Sources */, + F03A97D81AFA580100651655 /* UITextField+DoneButton.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F03A97781AFA48E900651655 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F03A97831AFA48E900651655 /* MS2Tests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + F03A977E1AFA48E900651655 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = F03A97621AFA48E800651655 /* MS2 */; + targetProxy = F03A977D1AFA48E900651655 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + F03A97701AFA48E800651655 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + F03A97711AFA48E800651655 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + F03A97751AFA48E800651655 /* LaunchScreen.xib */ = { + isa = PBXVariantGroup; + children = ( + F03A97761AFA48E800651655 /* Base */, + ); + name = LaunchScreen.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + F03A97841AFA48E900651655 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + F03A97851AFA48E900651655 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + F03A97871AFA48E900651655 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../liblinphone-sdk/apple-darwin/include", + ); + INFOPLIST_FILE = MS2/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/guillaume/Dev/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", + "/Users/guillaume/Dev/linphone-iphone/liblinphone-sdk/apple-darwin/lib", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + F03A97881AFA48E900651655 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../liblinphone-sdk/apple-darwin/include", + ); + INFOPLIST_FILE = MS2/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/guillaume/Dev/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", + "/Users/guillaume/Dev/linphone-iphone/liblinphone-sdk/apple-darwin/lib", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + F03A978A1AFA48E900651655 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = MS2Tests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MS2.app/MS2"; + }; + name = Debug; + }; + F03A978B1AFA48E900651655 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + INFOPLIST_FILE = MS2Tests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MS2.app/MS2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + F03A975E1AFA48E800651655 /* Build configuration list for PBXProject "MS2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F03A97841AFA48E900651655 /* Debug */, + F03A97851AFA48E900651655 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F03A97861AFA48E900651655 /* Build configuration list for PBXNativeTarget "MS2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F03A97871AFA48E900651655 /* Debug */, + F03A97881AFA48E900651655 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F03A97891AFA48E900651655 /* Build configuration list for PBXNativeTarget "MS2Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F03A978A1AFA48E900651655 /* Debug */, + F03A978B1AFA48E900651655 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F03A975B1AFA48E800651655 /* Project object */; +} diff --git a/submodules/MS2/MS2.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/submodules/MS2/MS2.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..2f155d3fc --- /dev/null +++ b/submodules/MS2/MS2.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/submodules/MS2/MS2/AppDelegate.h b/submodules/MS2/MS2/AppDelegate.h new file mode 100644 index 000000000..9b120bee2 --- /dev/null +++ b/submodules/MS2/MS2/AppDelegate.h @@ -0,0 +1,17 @@ +// +// AppDelegate.h +// MS2 +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + + +@end + diff --git a/submodules/MS2/MS2/AppDelegate.m b/submodules/MS2/MS2/AppDelegate.m new file mode 100644 index 000000000..1d69a3256 --- /dev/null +++ b/submodules/MS2/MS2/AppDelegate.m @@ -0,0 +1,45 @@ +// +// AppDelegate.m +// MS2 +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import "AppDelegate.h" + +@interface AppDelegate () + +@end + +@implementation AppDelegate + + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + +@end diff --git a/submodules/MS2/MS2/Base.lproj/LaunchScreen.xib b/submodules/MS2/MS2/Base.lproj/LaunchScreen.xib new file mode 100644 index 000000000..a3cbf860c --- /dev/null +++ b/submodules/MS2/MS2/Base.lproj/LaunchScreen.xib @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/submodules/MS2/MS2/Base.lproj/Main.storyboard b/submodules/MS2/MS2/Base.lproj/Main.storyboard new file mode 100644 index 000000000..c0c388e46 --- /dev/null +++ b/submodules/MS2/MS2/Base.lproj/Main.storyboard @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/submodules/MS2/MS2/Images.xcassets/AppIcon.appiconset/Contents.json b/submodules/MS2/MS2/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..36d2c80d8 --- /dev/null +++ b/submodules/MS2/MS2/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/MS2/MS2/Info.plist b/submodules/MS2/MS2/Info.plist new file mode 100644 index 000000000..a088afae2 --- /dev/null +++ b/submodules/MS2/MS2/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.belledonne-communications.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/submodules/MS2/MS2/UITextField+DoneButton.h b/submodules/MS2/MS2/UITextField+DoneButton.h new file mode 100644 index 000000000..f1199f33c --- /dev/null +++ b/submodules/MS2/MS2/UITextField+DoneButton.h @@ -0,0 +1,13 @@ +// +// UITextField+DoneButton.h +// linphone +// +// Created by Gautier Pelloux-Prayer on 14/10/14. +// +// + +#import + +@interface UITextField (DoneButton) +- (void)addDoneButton; +@end diff --git a/submodules/MS2/MS2/UITextField+DoneButton.m b/submodules/MS2/MS2/UITextField+DoneButton.m new file mode 100644 index 000000000..055a126af --- /dev/null +++ b/submodules/MS2/MS2/UITextField+DoneButton.m @@ -0,0 +1,35 @@ +// +// UITextField+DoneButton.m +// linphone +// +// Created by Gautier Pelloux-Prayer on 14/10/14. +// +// + +#import "UITextField+DoneButton.h" + + +@implementation UITextField (DoneButton) + +- (void) addDoneButton { + // actually on iPad there is a done button + UIToolbar* numberToolbar = [[UIToolbar alloc]initWithFrame:CGRectMake(0, 0, 320, 50)]; + numberToolbar.items = [NSArray arrayWithObjects: + [[UIBarButtonItem alloc]initWithTitle:NSLocalizedString(@"Cancel", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(cancelNumberPad)], + [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], + [[UIBarButtonItem alloc]initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStyleDone target:self action:@selector(doneWithNumberPad)], + nil]; + [numberToolbar sizeToFit]; + + self.inputAccessoryView = numberToolbar; +} + +-(void)cancelNumberPad{ + [self resignFirstResponder]; + self.text = @""; +} + +-(void)doneWithNumberPad{ + [self resignFirstResponder]; +} +@end diff --git a/submodules/MS2/MS2/ViewController.h b/submodules/MS2/MS2/ViewController.h new file mode 100644 index 000000000..80492282e --- /dev/null +++ b/submodules/MS2/MS2/ViewController.h @@ -0,0 +1,23 @@ +// +// ViewController.h +// MS2 +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + +- (IBAction)onStartStreamsClick:(id)sender; +- (IBAction)changeCamUp:(id)sender; +- (IBAction)changeCamDown:(id)sender; + +@property (weak, nonatomic) IBOutlet UIView *remoteView; +@property (weak, nonatomic) IBOutlet UIView *localView; + +@property (weak, nonatomic) IBOutlet UILabel *infoLabel; + +@end + diff --git a/submodules/MS2/MS2/ViewController.m b/submodules/MS2/MS2/ViewController.m new file mode 100644 index 000000000..7aad4aaa8 --- /dev/null +++ b/submodules/MS2/MS2/ViewController.m @@ -0,0 +1,165 @@ +// +// ViewController.m +// MS2 +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import "ViewController.h" +#include +#include + +#import "mediastreamer2/mediastream.h" +#import "UITextField+DoneButton.h" +extern void libmsopenh264_init(); + +@interface ViewController () { + + MSWebCam* videoCam; + MSWebCam* noCam; + MSFilter* noWebCamFilter; + MSFilter* videoCamFilter; + + RtpProfile* profile; + VideoStream* currentStream; + IceSession* iceSession; + PayloadType* vp8_pt; +} +@end + +@implementation ViewController +#define CAM_NAME "AV Capture: com.apple.avfoundation.avcapturedevice.built-in_video:0" /*"AV Capture: Back Camera"*/ + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. + + ortp_init(); + ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + ms_init(); + libmsopenh264_init(); /*no plugin on IOS/Android */ + + NSString* nowebFile = @"nowebcamCIF.jpg"; + NSString* path = [[NSBundle mainBundle] pathForResource:[nowebFile stringByDeletingPathExtension] + ofType:[nowebFile pathExtension]]; + ms_static_image_set_default_image([path UTF8String]); + + + noCam = ms_web_cam_manager_get_cam(ms_web_cam_manager_get(), "StaticImage: Static picture"); + videoCam = ms_web_cam_manager_get_cam(ms_web_cam_manager_get(), CAM_NAME); + + noWebCamFilter = ms_web_cam_create_reader(noCam); + + // open the cam immediately + videoCamFilter = ms_web_cam_create_reader(videoCam); + + currentStream = NULL; + profile = rtp_profile_clone_full(&av_profile); + rtp_profile_set_payload(profile,103,&payload_type_vp8); + + vp8_pt = payload_type_clone(rtp_profile_get_payload(profile, 103)); + + // Enable AVPF + PayloadTypeAvpfParams avpf_params; + payload_type_set_flag(vp8_pt, PAYLOAD_TYPE_RTCP_FEEDBACK_ENABLED); + avpf_params.features = PAYLOAD_TYPE_AVPF_FIR | PAYLOAD_TYPE_AVPF_PLI | PAYLOAD_TYPE_AVPF_SLI | PAYLOAD_TYPE_AVPF_RPSI; + avpf_params.trr_interval = 3000; + payload_type_set_avpf_params(vp8_pt, avpf_params); + + vp8_pt->normal_bitrate = 500000; + + [NSTimer scheduledTimerWithTimeInterval:0.02 target:self selector:@selector(timer:) userInfo:nil repeats:TRUE]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +- (void)timer:(NSTimer*)timer { + if( currentStream) media_stream_iterate((MediaStream*)currentStream); +} + + +- (NSString *)getIPAddress { + + NSString *address = @"error"; + struct ifaddrs *interfaces = NULL; + struct ifaddrs *temp_addr = NULL; + int success = 0; + // retrieve the current interfaces - returns 0 on success + success = getifaddrs(&interfaces); + if (success == 0) { + // Loop through linked list of interfaces + temp_addr = interfaces; + while(temp_addr != NULL) { + if(temp_addr->ifa_addr->sa_family == AF_INET) { + // Check if interface is en0 which is the wifi connection on the iPhone + NSString* ifa = [NSString stringWithUTF8String:temp_addr->ifa_name]; + if([ifa isEqualToString:@"en0"] || [ifa isEqualToString:@"en1"]) { + // Get NSString from C String + address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)]; + break; + + } + + } + + temp_addr = temp_addr->ifa_next; + } + } + // Free memory + freeifaddrs(interfaces); + return address; + +} + +- (void)updateInfo { + if( currentStream == NULL )return; + const MSWebCam* currentCam = video_stream_get_camera(currentStream); + if( currentCam ) + self.infoLabel.text = [NSString stringWithFormat:@"Stream running, current cam: %s", currentCam->name]; + else + self.infoLabel.text = @"No Webcam ?!"; + +} + +- (IBAction)onStartStreamsClick:(id)sender { + if( currentStream ){ + VideoStream* stream = currentStream; + currentStream = NULL; + video_stream_stop(stream); + + } else { + VideoStream * stream = video_stream_new(3456, 3457, FALSE); + video_stream_set_native_window_id(stream, (unsigned long)self.remoteView); + video_stream_set_native_preview_window_id(stream, (unsigned long)self.localView); + video_stream_start_with_source(stream, profile, "127.0.0.1", 3456, "127.0.0.1", 3457, 103, 30, noCam, noWebCamFilter); + currentStream = stream; + [self updateInfo]; + } + +} + +- (IBAction)changeCamUp:(id)sender { + if(currentStream == NULL )return; + + NSLog(@"Restore static cam (%p)", noWebCamFilter); + video_stream_change_source_filter(currentStream, noCam, noWebCamFilter, TRUE); + + [self updateInfo]; + +} + +- (IBAction)changeCamDown:(id)sender { + if (currentStream == NULL) { + return; + } + NSLog(@"Use real camera (%p)", videoCamFilter); + video_stream_change_source_filter(currentStream, videoCam, videoCamFilter, TRUE); + [self updateInfo]; +} + + +@end diff --git a/submodules/MS2/MS2/main.m b/submodules/MS2/MS2/main.m new file mode 100644 index 000000000..4d0530109 --- /dev/null +++ b/submodules/MS2/MS2/main.m @@ -0,0 +1,16 @@ +// +// main.m +// MS2 +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/submodules/MS2/MS2Tests/Info.plist b/submodules/MS2/MS2Tests/Info.plist new file mode 100644 index 000000000..157a12536 --- /dev/null +++ b/submodules/MS2/MS2Tests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + com.belledonne-communications.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/submodules/MS2/MS2Tests/MS2Tests.m b/submodules/MS2/MS2Tests/MS2Tests.m new file mode 100644 index 000000000..f870c11a6 --- /dev/null +++ b/submodules/MS2/MS2Tests/MS2Tests.m @@ -0,0 +1,40 @@ +// +// MS2Tests.m +// MS2Tests +// +// Created by guillaume on 06/05/2015. +// Copyright (c) 2015 Belldonne Communications. All rights reserved. +// + +#import +#import + +@interface MS2Tests : XCTestCase + +@end + +@implementation MS2Tests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + XCTAssert(YES, @"Pass"); +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; +} + +@end diff --git a/submodules/linphone b/submodules/linphone index 730a7dc3c..05229ca07 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 730a7dc3cdc4215b1ad718d81e03ae4585ccbc20 +Subproject commit 05229ca079866640b2aa1ab312bf86eb4a7e571e