mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Add pinned video in wide mode.

Browse Source
This commit is contained in:
John Preston
2021-04-23 19:05:52 +04:00
parent b15623d435
commit e12fe974b2
3 changed files with 113 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/calls/group/calls_group_call.cpp
View File

@@ -410,7 +410,9 @@ void GroupCall::switchToCamera() {
return;
}
_videoDeviceId = _videoInputId;
if (_videoOutgoing)
if (_videoOutgoing->state() != Webrtc::VideoState::Active) {
_videoOutgoing->setState(Webrtc::VideoState::Active);
}
_videoCapture->switchToDevice(_videoDeviceId.toStdString());
}
@@ -419,6 +421,9 @@ void GroupCall::switchToScreenSharing(const QString &uniqueId) {
return;
}
_videoDeviceId = uniqueId;
if (_videoOutgoing->state() != Webrtc::VideoState::Active) {
_videoOutgoing->setState(Webrtc::VideoState::Active);
}
_videoCapture->switchToDevice(_videoDeviceId.toStdString());
}
@@ -1432,15 +1437,15 @@ void GroupCall::setupOutgoingVideo() {
}
_videoOutgoing->stateValue(
) | rpl::start_with_next([=](Webrtc::VideoState state) {
if (state != Webrtc::VideoState::Inactive && !hasDevices()) {
//if (state != Webrtc::VideoState::Inactive && !hasDevices()) {
//_errors.fire({ ErrorType::NoCamera }); // #TODO videochats
_videoOutgoing->setState(Webrtc::VideoState::Inactive);
//_videoOutgoing->setState(Webrtc::VideoState::Inactive);
//} else if (state != Webrtc::VideoState::Inactive
// && _instance
// && !_instance->supportsVideo()) {
// _errors.fire({ ErrorType::NotVideoCall });
// _videoOutgoing->setState(Webrtc::VideoState::Inactive);
} else if (state != Webrtc::VideoState::Inactive) {
/*} else */if (state != Webrtc::VideoState::Inactive) {
// Paused not supported right now.
Assert(state == Webrtc::VideoState::Active);
if (!_videoCapture) {