vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-04-30 21:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 8.6.0

Browse source
This commit is contained in:
xaxtix 2022-03-11 19:49:54 +03:00
parent 3708e9847a
commit d30f796d8c
2625 changed files with 166215 additions and 59265 deletions
Download patch file Download diff file Expand all files Collapse all files

65
TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java
View file

@ -13,6 +13,8 @@ import android.os.SystemClock;
import android.text.TextUtils;
import android.util.SparseArray;
import androidx.collection.LongSparseArray;
import com.google.android.exoplayer2.util.Log;
import org.telegram.messenger.voip.Instance;
@ -25,8 +27,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import androidx.collection.LongSparseArray;
import java.util.List;
public class ChatObject {
@ -80,6 +81,8 @@ public class ChatObject {
public boolean canStreamVideo;
public int activeVideos;
public VideoParticipant videoNotAvailableParticipant;
public VideoParticipant rtmpStreamParticipant;
public boolean loadedRtmpStreamParticipant;
public AccountInstance currentAccount;
public int speakingMembersCount;
private Runnable typingUpdateRunnable = () -> {
@ -156,6 +159,46 @@ public class ChatObject {
loadMembers(true);
createNoVideoParticipant();
if (call.rtmp_stream) {
createRtmpStreamParticipant(Collections.emptyList());
}
}
// public void loadRtmpStreamChannels() {
// if (call == null || loadedRtmpStreamParticipant) {
// return;
// }
// TLRPC.TL_phone_getGroupCallStreamChannels getGroupCallStreamChannels = new TLRPC.TL_phone_getGroupCallStreamChannels();
// getGroupCallStreamChannels.call = getInputGroupCall();
// currentAccount.getConnectionsManager().sendRequest(getGroupCallStreamChannels, (response, error, timestamp) -> {
// if (response instanceof TLRPC.TL_phone_groupCallStreamChannels) {
// TLRPC.TL_phone_groupCallStreamChannels streamChannels = (TLRPC.TL_phone_groupCallStreamChannels) response;
// createRtmpStreamParticipant(streamChannels.channels);
// loadedRtmpStreamParticipant = true;
// }
// }, ConnectionsManager.RequestFlagFailOnServerErrors, ConnectionsManager.ConnectionTypeDownload, call.stream_dc_id);
// }
public void createRtmpStreamParticipant(List<TLRPC.TL_groupCallStreamChannel> channels) {
if (loadedRtmpStreamParticipant && rtmpStreamParticipant != null) {
return;
}
TLRPC.TL_groupCallParticipant participant = rtmpStreamParticipant != null ? rtmpStreamParticipant.participant : new TLRPC.TL_groupCallParticipant();
participant.peer = new TLRPC.TL_peerChat();
participant.peer.channel_id = chatId;
participant.video = new TLRPC.TL_groupCallParticipantVideo();
TLRPC.TL_groupCallParticipantVideoSourceGroup sourceGroup = new TLRPC.TL_groupCallParticipantVideoSourceGroup();
sourceGroup.semantics = "SIM";
for (TLRPC.TL_groupCallStreamChannel channel : channels) {
sourceGroup.sources.add(channel.channel);
}
participant.video.source_groups.add(sourceGroup);
participant.video.endpoint = "unified";
participant.videoEndpoint = "unified";
rtmpStreamParticipant = new VideoParticipant(participant, false, false);
sortParticipants();
AndroidUtilities.runOnUIThread(()-> currentAccount.getNotificationCenter().postNotificationName(NotificationCenter.groupCallUpdated, chatId, call.id, false));
}
public void createNoVideoParticipant() {
@ -217,7 +260,7 @@ public class ChatObject {
}
public boolean shouldShowPanel() {
return call.participants_count > 0 || isScheduled();
return call.participants_count > 0 || call.rtmp_stream || isScheduled();
}
public boolean isScheduled() {
@ -1057,7 +1100,7 @@ public class ChatObject {
if (participant.self) {
return service.getVideoState(presentation) == Instance.VIDEO_STATE_ACTIVE;
} else {
if (call.videoNotAvailableParticipant != null && call.videoNotAvailableParticipant.participant == participant || call.participants.get(MessageObject.getPeerId(participant.peer)) != null) {
if (call.rtmpStreamParticipant != null && call.rtmpStreamParticipant.participant == participant || call.videoNotAvailableParticipant != null && call.videoNotAvailableParticipant.participant == participant || call.participants.get(MessageObject.getPeerId(participant.peer)) != null) {
if (presentation) {
return participant.presentation != null;// && participant.hasPresentationFrame == 2;
} else {
@ -1075,6 +1118,10 @@ public class ChatObject {
TLRPC.Chat chat = currentAccount.getMessagesController().getChat(chatId);
boolean isAdmin = ChatObject.canManageCalls(chat);
if (rtmpStreamParticipant != null) {
visibleVideoParticipants.add(rtmpStreamParticipant);
}
long selfId = getSelfId();
VoIPService service = VoIPService.getSharedInstance();
TLRPC.TL_groupCallParticipant selfParticipant = participants.get(selfId);
@ -1638,6 +1685,8 @@ public class ChatObject {
public boolean presentation;
public boolean hasSame;
public float aspectRatio;// w / h
public int aspectRatioFromWidth;
public int aspectRatioFromHeight;
public VideoParticipant(TLRPC.TL_groupCallParticipant participant, boolean presentation, boolean hasSame) {
this.participant = participant;
@ -1657,7 +1706,13 @@ public class ChatObject {
return presentation == that.presentation && MessageObject.getPeerId(participant.peer) == MessageObject.getPeerId(that.participant.peer);
}
public void setAspectRatio(float aspectRatio, Call call) {
public void setAspectRatio(int width, int height, Call call) {
aspectRatioFromWidth = width;
aspectRatioFromHeight = height;
setAspectRatio(width / (float) height, call);
}
private void setAspectRatio(float aspectRatio, Call call) {
if (this.aspectRatio != aspectRatio) {
this.aspectRatio = aspectRatio;
if (!GroupCallActivity.isLandscapeMode && call.visibleVideoParticipants.size() % 2 == 1) {