diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index 72f621ed0e..b654657c88 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace tgcalls { class InstanceImpl; class InstanceV2Impl; +class InstanceV2ReferenceImpl; class InstanceV2_4_0_0Impl; class InstanceImplLegacy; void SetLegacyGlobalServerConfig(const std::string &serverConfig); @@ -53,6 +54,7 @@ const auto kDefaultVersion = "2.4.4"_q; const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); +const auto RegV2Ref = tgcalls::Register(); const auto RegisterV240 = tgcalls::Register(); const auto RegisterLegacy = tgcalls::Register(); diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index a090c6a8f7..78a8e22bed 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit a090c6a8f7bfb365b301d85bb8c9664d71321c5c +Subproject commit 78a8e22bedb0d06004da8bafeba88b7474cb89a4 diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index 9a6e515fbb..26253546aa 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit 9a6e515fbb1e9c53266456447b8f301fe200ad44 +Subproject commit 26253546aa108eca268d2acd1598ad7cf1ccdb6d diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index eadc938698..5461449609 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1243,9 +1243,9 @@ mac: stage('tg_owt', """ git clone https://github.com/desktop-app/tg_owt.git cd tg_owt - git checkout 1fe5e68d99 + git checkout bab760d7bd git submodule init - git submodule update src/third_party/libyuv + git submodule update src/third_party/libyuv src/third_party/crc32c/src win: SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg SET OPUS_PATH=$USED_PREFIX/include/opus diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake index 256a6280f5..34a5ba418b 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake @@ -30,6 +30,8 @@ PRIVATE EncryptedConnection.h FakeAudioDeviceModule.cpp FakeAudioDeviceModule.h + FieldTrialsConfig.cpp + FieldTrialsConfig.h InstanceImpl.cpp InstanceImpl.h LogSinkImpl.cpp @@ -55,18 +57,31 @@ PRIVATE VideoCaptureInterfaceImpl.h VideoCapturerInterface.h + utils/gzip.cpp + utils/gzip.h + v2/ContentNegotiation.cpp v2/ContentNegotiation.h - # v2/InstanceV2ReferenceImpl.cpp - # v2/InstanceV2ReferenceImpl.h + v2/ExternalSignalingConnection.cpp + v2/ExternalSignalingConnection.h + v2/InstanceV2ReferenceImpl.cpp + v2/InstanceV2ReferenceImpl.h v2/InstanceV2Impl.cpp v2/InstanceV2Impl.h v2/NativeNetworkingImpl.cpp v2/NativeNetworkingImpl.h + v2/ReflectorPort.cpp + v2/ReflectorPort.h + v2/ReflectorRelayPortFactory.cpp + v2/ReflectorRelayPortFactory.h v2/Signaling.cpp v2/Signaling.h + v2/SignalingConnection.cpp + v2/SignalingConnection.h v2/SignalingEncryption.cpp v2/SignalingEncryption.h + v2/SignalingSctpConnection.cpp + v2/SignalingSctpConnection.h v2_4_0_0/InstanceV2_4_0_0Impl.cpp v2_4_0_0/InstanceV2_4_0_0Impl.h v2_4_0_0/Signaling_4_0_0.cpp @@ -185,6 +200,7 @@ PRIVATE desktop-app::external_ffmpeg desktop-app::external_openssl desktop-app::external_rnnoise + desktop-app::external_zlib ) target_compile_definitions(lib_tgcalls diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index b2e6841058..836fdb0506 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit b2e684105884f781c2de6e77bf47a10919406325 +Subproject commit 836fdb0506ca362f08ccacc1501aa84fe68333ae diff --git a/cmake b/cmake index 26d31dbdef..b4fff01757 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 26d31dbdef488f9a29b58a8823de3b457829cba2 +Subproject commit b4fff0175709d20041ddf60db4bf57335bc99af1