From c60d27accd9a7450696c79dcf7965859c9cb6dcb Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 9 Sep 2015 11:54:29 +0200 Subject: [PATCH 1/3] Settings: remove adaptive rate control algorithm choice - stateful is not working with srtp/zrtp calls (duplicating packets) --- Classes/LinphoneCoreSettingsStore.m | 3 --- Settings/InAppSettings.bundle/Network.plist | 20 -------------------- 2 files changed, 23 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index d983e88d3..04c4d7456 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -295,7 +295,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setInteger:linphone_core_get_upload_bandwidth(lc) forKey:@"upload_bandwidth_preference"]; [self setInteger:linphone_core_get_download_bandwidth(lc) forKey:@"download_bandwidth_preference"]; [self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"]; - [self setCString:linphone_core_get_adaptive_rate_algorithm(lc) forKey:@"adaptive_rate_algorithm_preference"]; } // tunnel section @@ -705,8 +704,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionNone); linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]); - linphone_core_set_adaptive_rate_algorithm(lc, [[self stringForKey:@"adaptive_rate_algorithm_preference"] - cStringUsingEncoding:[NSString defaultCStringEncoding]]); } // tunnel section diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist index e97766b92..4a87839d1 100644 --- a/Settings/InAppSettings.bundle/Network.plist +++ b/Settings/InAppSettings.bundle/Network.plist @@ -172,26 +172,6 @@ Type PSToggleSwitchSpecifier - - DefaultValue - Simple - Key - adaptive_rate_algorithm_preference - Title - Adaptive rate algorithm - Titles - - Simple - Stateful - - Type - PSMultiValueSpecifier - Values - - Simple - Stateful - - From e89c325f70b3094df144fcaf6d4570a682f15b29 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 9 Sep 2015 12:49:46 +0200 Subject: [PATCH 2/3] xcode: reorder project --- TestsUI/LinphoneTestCase.m | 1 - linphone.xcodeproj/project.pbxproj | 62 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/TestsUI/LinphoneTestCase.m b/TestsUI/LinphoneTestCase.m index aa3f2b2a1..06ae52616 100644 --- a/TestsUI/LinphoneTestCase.m +++ b/TestsUI/LinphoneTestCase.m @@ -23,7 +23,6 @@ if (!([language isEqualToString:@"en"] || [language containsString:@"en-"])) { LOGF(@"Language must be 'en' (English) instead of %@", language); } - linphone_core_set_log_level(ORTP_MESSAGE); } - (void)beforeAll { diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 43aef7f4c..0afaf917f 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1891,23 +1891,43 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */, + 22276E8313C73D3100210156 /* libavcodec.a in Frameworks */, + 22276E8413C73D3100210156 /* libavutil.a in Frameworks */, + 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */, + 045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */, + 220FAD3210765B400068D98F /* libgsm.a in Frameworks */, + 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */, + F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */, + D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */, + D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */, + 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, + 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */, + 226183B0147259670037138E /* libmssilk.a in Frameworks */, + 1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */, + 63D7216D1B73975900D70E65 /* libmsx264.a in Frameworks */, 63C510A01B8F48DB008A415A /* libmswebrtc.a in Frameworks */, + 226CDAE014E2D0B800513B67 /* libmsbcg729.a in Frameworks */, 63C5109E1B8F2603008A415A /* libopencore-amrnb.a in Frameworks */, 63C5109F1B8F2603008A415A /* libopencore-amrwb.a in Frameworks */, - 63D7216D1B73975900D70E65 /* libmsx264.a in Frameworks */, - 63D7215D1B7394D200D70E65 /* libtunnel.a in Frameworks */, - 63D7216C1B73973D00D70E65 /* libx264.a in Frameworks */, - 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */, - 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */, - F0B026F31AA710AF00FF49F7 /* libiconv.dylib in Frameworks */, - F05BAA621A5D594E00411815 /* libz.dylib in Frameworks */, - 1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */, + 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, 22509042196BD902007863F6 /* libopenh264.a in Frameworks */, 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */, 57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */, - 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */, - 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */, - 045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */, + 220FAD3810765B400068D98F /* libspeex.a in Frameworks */, + 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */, + 226183AE1472527D0037138E /* libsrtp.a in Frameworks */, + 22276E8513C73D3100210156 /* libswscale.a in Frameworks */, + 63D7215D1B7394D200D70E65 /* libtunnel.a in Frameworks */, + 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, + 63D7216C1B73973D00D70E65 /* libx264.a in Frameworks */, + 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */, + 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */, + D32B6E2F15A5C0AC0033019F /* libsqlite3.dylib in Frameworks */, + 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */, + 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, + F0B026F31AA710AF00FF49F7 /* libiconv.dylib in Frameworks */, + F05BAA621A5D594E00411815 /* libz.dylib in Frameworks */, D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, @@ -1929,26 +1949,6 @@ 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */, 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, - 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */, - D32B6E2F15A5C0AC0033019F /* libsqlite3.dylib in Frameworks */, - 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */, - 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, - 22276E8313C73D3100210156 /* libavcodec.a in Frameworks */, - 22276E8413C73D3100210156 /* libavutil.a in Frameworks */, - 220FAD3210765B400068D98F /* libgsm.a in Frameworks */, - F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */, - D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */, - D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */, - 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, - 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */, - 226183B0147259670037138E /* libmssilk.a in Frameworks */, - 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, - 226CDAE014E2D0B800513B67 /* libmsbcg729.a in Frameworks */, - 220FAD3810765B400068D98F /* libspeex.a in Frameworks */, - 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */, - 226183AE1472527D0037138E /* libsrtp.a in Frameworks */, - 22276E8513C73D3100210156 /* libswscale.a in Frameworks */, - 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; From 89920ad233c9d7dd2ceded8950d286915883e1a4 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 9 Sep 2015 14:02:38 +0200 Subject: [PATCH 3/3] LinphoneUITester: do not send a message for test big chat list, it is not required --- TestsUI/ChatTester.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m index 4c9bf5c1a..a49d9268c 100644 --- a/TestsUI/ChatTester.m +++ b/TestsUI/ChatTester.m @@ -160,17 +160,14 @@ // create lots of chat rooms... LinphoneCore *lc = [LinphoneManager getLc]; for (int i = 0; i < 100; i++) { - LinphoneChatRoom *room = - linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]); - linphone_chat_room_send_message(room, "Hello"); + linphone_core_get_chat_room_from_uri(lc, [[NSString stringWithFormat:@"%@ - %d", [self me], i] UTF8String]); } - [tester waitForTimeInterval:5]; // wait for all messages to be delivered - NSTimeInterval before = [[NSDate date] timeIntervalSince1970]; [tester tapViewWithAccessibilityLabel:@"Chat"]; NSTimeInterval after = [[NSDate date] timeIntervalSince1970]; + XCTAssertEqual([[self findTableView:@"ChatRoom list"] numberOfRowsInSection:0], 100); // conversation loading MUST be less than 1 sec XCTAssertLessThan(after - before, 1.); }