void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 23:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix joining broadcasted streams in voice chats.

Browse source
This commit is contained in:
John Preston 2021-05-27 00:37:05 +04:00
parent 513c8d1a65
commit 6ea66bc527
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Telegram/SourceFiles/calls/group/calls_group_call.cpp
View file

@ -87,21 +87,38 @@ constexpr auto kFixLargeVideoDuration = 5 * crl::time(1000);
return (i == end(list)) ? 1 : (i->raisedHandRating + 1); return (i == end(list)) ? 1 : (i->raisedHandRating + 1);
} }
[[nodiscard]] std::string ParseVideoEndpoint(const QByteArray &json) { struct JoinVideoEndpoint {
std::string id;
};
struct JoinBroadcastStream {
};
using JoinClientFields = std::variant<
v::null_t,
JoinVideoEndpoint,
JoinBroadcastStream>;
[[nodiscard]] JoinClientFields ParseJoinResponse(const QByteArray &json) {
auto error = QJsonParseError{ 0, QJsonParseError::NoError }; auto error = QJsonParseError{ 0, QJsonParseError::NoError };
const auto document = QJsonDocument::fromJson(json, &error); const auto document = QJsonDocument::fromJson(json, &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
LOG(("API Error: " LOG(("API Error: "
"Failed to parse presentation video params, error: %1." "Failed to parse join response params, error: %1."
).arg(error.errorString())); ).arg(error.errorString()));
return {}; return {};
} else if (!document.isObject()) { } else if (!document.isObject()) {
LOG(("API Error: " LOG(("API Error: "
"Not an object received in presentation video params.")); "Not an object received in join response params."));
return {}; return {};
} }
if (document.object().value("stream").toBool()) {
return JoinBroadcastStream{};
}
const auto video = document.object().value("video").toObject(); const auto video = document.object().value("video").toObject();
return video.value("endpoint").toString().toStdString(); return JoinVideoEndpoint{
video.value("endpoint").toString().toStdString(),
};
} }
[[nodiscard]] const std::string &EmptyString() { [[nodiscard]] const std::string &EmptyString() {
@ -1373,18 +1390,34 @@ void GroupCall::handlePossibleCreateOrJoinResponse(
setScreenInstanceMode(InstanceMode::Rtc); setScreenInstanceMode(InstanceMode::Rtc);
data.vparams().match([&](const MTPDdataJSON &data) { data.vparams().match([&](const MTPDdataJSON &data) {
const auto json = data.vdata().v; const auto json = data.vdata().v;
setScreenEndpoint(ParseVideoEndpoint(json)); const auto response = ParseJoinResponse(json);
const auto endpoint = std::get_if<JoinVideoEndpoint>(&response);
if (endpoint) {
setScreenEndpoint(endpoint->id);
} else {
LOG(("Call Error: Bad response for 'presentation' flag."));
}
_screenInstance->setJoinResponsePayload(json.toStdString()); _screenInstance->setJoinResponsePayload(json.toStdString());
}); });
} else { } else {
if (!_instance) { if (!_instance) {
return; return;
} }
setInstanceMode(InstanceMode::Rtc);
data.vparams().match([&](const MTPDdataJSON &data) { data.vparams().match([&](const MTPDdataJSON &data) {
const auto json = data.vdata().v; const auto json = data.vdata().v;
setCameraEndpoint(ParseVideoEndpoint(json)); const auto response = ParseJoinResponse(json);
_instance->setJoinResponsePayload(json.toStdString()); const auto endpoint = std::get_if<JoinVideoEndpoint>(&response);
if (v::is<JoinBroadcastStream>(response)) {
if (!_broadcastDcId) {
LOG(("Api Error: Empty stream_dc_id in groupCall."));
_broadcastDcId = _peer->session().mtp().mainDcId();
}
setInstanceMode(InstanceMode::Stream);
} else {
setInstanceMode(InstanceMode::Rtc);
setCameraEndpoint(endpoint ? endpoint->id : std::string());
_instance->setJoinResponsePayload(json.toStdString());
}
updateRequestedVideoChannels(); updateRequestedVideoChannels();
checkMediaChannelDescriptions(); checkMediaChannelDescriptions();
}); });