RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2024-12-12 01:14:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix video in calls working on tgcalls v2 implementation.

Browse Source
This commit is contained in:
John Preston 2021-11-15 12:08:56 +04:00
parent c7678f17ac
commit bf18907fe6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/calls/calls_call.cpp
View File

@ -38,7 +38,6 @@ namespace tgcalls {
class InstanceImpl;
class InstanceV2Impl;
class InstanceImplLegacy;
class InstanceImplReference;
void SetLegacyGlobalServerConfig(const std::string &serverConfig);
} // namespace tgcalls
@ -388,12 +387,15 @@ void Call::setupOutgoingVideo() {
_videoCaptureIsScreencast);
_videoCapture->setOutput(_videoOutgoing->sink());
}
_videoCapture->setState(tgcalls::VideoState::Active);
if (_instance) {
_instance->setVideoCapture(_videoCapture);
}
_videoCapture->setState(tgcalls::VideoState::Active);
} else if (_videoCapture) {
_videoCapture->setState(tgcalls::VideoState::Inactive);
if (_instance) {
_instance->setVideoCapture(nullptr);
}
}
}, _lifetime);
}

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit 823ec7f0f59310ade8344ed74efd36d18ebfb018
Subproject commit 0e3f3705ecce37dc83ede0b04180a8cb0830aec3

4
Telegram/cmake/lib_tgcalls.cmake
View File

@ -160,10 +160,6 @@ PRIVATE
platform/tdesktop/VideoCameraCapturer.cpp
platform/tdesktop/VideoCameraCapturer.h
# All
reference/InstanceImplReference.cpp
reference/InstanceImplReference.h
# third-party
third-party/json11.cpp
third-party/json11.hpp