From 1cdc784349e103ed45869a00320cf3fc82e506e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 12 Sep 2018 13:41:33 +0200 Subject: [PATCH 1/5] Update mediastreamer2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 1d6722bbb..1e4c0341f 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 1d6722bbb6b7d5609c148ab782869bb49b21f26b +Subproject commit 1e4c0341fb1df396c77a8c4d39771e168cded237 From 9bcce4943ad69cb045817c263468d3d303400bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 12 Sep 2018 13:41:49 +0200 Subject: [PATCH 2/5] Add a new entry for H265 in video codecs view. --- Classes/LinphoneManager.m | 1 + Settings/InAppSettings.bundle/Video.plist | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index c5cdfcdc7..bbb50468d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -136,6 +136,7 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre {"g729", 8000, "g729_preference"}, {"mp4v-es", 90000, "mp4v-es_preference"}, {"h264", 90000, "h264_preference"}, + {"h265", 90000, "h265_preference"}, {"vp8", 90000, "vp8_preference"}, {"mpeg4-generic", 16000, "aaceld_16k_preference"}, {"mpeg4-generic", 22050, "aaceld_22k_preference"}, diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist index 439ee4ad8..8e6dca3eb 100644 --- a/Settings/InAppSettings.bundle/Video.plist +++ b/Settings/InAppSettings.bundle/Video.plist @@ -158,6 +158,16 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + h265_preference + Title + H.265 + Type + PSToggleSwitchSpecifier + DefaultValue From 19f75b53bcce7eabe122888bad1ad5cd321b68bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 12 Sep 2018 14:18:12 +0200 Subject: [PATCH 3/5] Set the OS target version to 9.0 (cherry picked from commit 6ff6b63bb5660573d1d262821cea33eecf925a0d) --- Classes/ChatsListTableView.m | 2 +- linphone.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m index 4264087b9..abeeeee96 100644 --- a/Classes/ChatsListTableView.m +++ b/Classes/ChatsListTableView.m @@ -161,7 +161,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo } [dict setObject:display forKey:@"display"]; - [dict setObject:[NSNumber numberWithBool:linphone_chat_room_get_conference_address(cr)] + [dict setObject:[NSNumber numberWithBool:!!linphone_chat_room_get_conference_address(cr)] forKey:@"nbParticipants"]; [addresses addObject:dict]; if (addresses.count >= 4) //send no more data than needed diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c604f543a..c0aee81fc 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5034,7 +5034,7 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; @@ -5138,7 +5138,7 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; @@ -5242,7 +5242,7 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; @@ -5346,7 +5346,7 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; From 7a1de272b79293d091dd784c28b6e2d049562833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 13 Sep 2018 16:55:54 +0200 Subject: [PATCH 4/5] Update mediastreamer --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 1e4c0341f..69002ab1f 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 1e4c0341fb1df396c77a8c4d39771e168cded237 +Subproject commit 69002ab1f1a29b73aae45762c0ede50925c00612 From c7802c6aa7039e65759ccbdd1e75d5a015839b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 14 Sep 2018 17:19:25 +0200 Subject: [PATCH 5/5] Update mediastreamer2, msopenh264, msx264 --- submodules/mediastreamer2 | 2 +- submodules/msopenh264 | 2 +- submodules/msx264 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 69002ab1f..70cf3765c 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 69002ab1f1a29b73aae45762c0ede50925c00612 +Subproject commit 70cf3765c463a40d3616c817398c52af4ebce758 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index 18b41c256..fd330d26e 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 18b41c2569ea76b8eb1df9f85a32f16b3d001cc0 +Subproject commit fd330d26ecd368f6ee71e81c4f72ca6b935b8b33 diff --git a/submodules/msx264 b/submodules/msx264 index 662bc4bae..f4fe74056 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 662bc4baef6bdda578d7b28fef7572cae9f255d6 +Subproject commit f4fe74056d0474b42025d95449ec859e984d78ea