From 5deca3fac7d741e0d5b83ad40baf55750de16cc4 Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Wed, 2 Apr 2025 20:39:51 +0400 Subject: [PATCH] Add peerId --- .../TelegramCallsUI/Sources/PresentationGroupCall.swift | 2 ++ submodules/TelegramVoip/Sources/GroupCallContext.swift | 6 +++++- .../TgVoipWebrtc/OngoingCallThreadLocalContext.h | 2 ++ .../TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm | 6 ++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift index e0047cd47b..766e55d009 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift @@ -2988,6 +2988,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { result.append(OngoingGroupCallContext.MediaChannelDescription( kind: .audio, + peerId: participant.peer.id.id._internalGetInt64Value(), audioSsrc: audioSsrc, videoDescription: nil )) @@ -2999,6 +3000,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { result.append(OngoingGroupCallContext.MediaChannelDescription( kind: .audio, + peerId: participant.peer.id.id._internalGetInt64Value(), audioSsrc: screencastSsrc, videoDescription: nil )) diff --git a/submodules/TelegramVoip/Sources/GroupCallContext.swift b/submodules/TelegramVoip/Sources/GroupCallContext.swift index f731d15fed..aed5d502c4 100644 --- a/submodules/TelegramVoip/Sources/GroupCallContext.swift +++ b/submodules/TelegramVoip/Sources/GroupCallContext.swift @@ -270,11 +270,13 @@ public final class OngoingGroupCallContext { } public var kind: Kind + public var peerId: Int64 public var audioSsrc: UInt32 public var videoDescription: String? - public init(kind: Kind, audioSsrc: UInt32, videoDescription: String?) { + public init(kind: Kind, peerId: Int64, audioSsrc: UInt32, videoDescription: String?) { self.kind = kind + self.peerId = peerId self.audioSsrc = audioSsrc self.videoDescription = videoDescription } @@ -575,6 +577,7 @@ public final class OngoingGroupCallContext { } return OngoingGroupCallMediaChannelDescription( type: mappedType, + peerId: channel.peerId, audioSsrc: channel.audioSsrc, videoDescription: channel.videoDescription ) @@ -688,6 +691,7 @@ public final class OngoingGroupCallContext { } return OngoingGroupCallMediaChannelDescription( type: mappedType, + peerId: channel.peerId, audioSsrc: channel.audioSsrc, videoDescription: channel.videoDescription ) diff --git a/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h b/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h index 25ec5e072c..bc2349f7b4 100644 --- a/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h +++ b/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h @@ -332,10 +332,12 @@ typedef NS_ENUM(int32_t, OngoingGroupCallMediaChannelType) { @interface OngoingGroupCallMediaChannelDescription : NSObject @property (nonatomic, readonly) OngoingGroupCallMediaChannelType type; +@property (nonatomic, readonly) uint64_t peerId; @property (nonatomic, readonly) uint32_t audioSsrc; @property (nonatomic, strong, readonly) NSString * _Nullable videoDescription; - (instancetype _Nonnull)initWithType:(OngoingGroupCallMediaChannelType)type + peerId:(int64_t)peerId audioSsrc:(uint32_t)audioSsrc videoDescription:(NSString * _Nullable)videoDescription; diff --git a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm index abcfdbd27c..aade0011a9 100644 --- a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm +++ b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm @@ -3029,11 +3029,13 @@ encryptDecrypt:(NSData * _Nullable (^ _Nullable)(NSData * _Nonnull, bool))encryp @implementation OngoingGroupCallMediaChannelDescription - (instancetype _Nonnull)initWithType:(OngoingGroupCallMediaChannelType)type - audioSsrc:(uint32_t)audioSsrc - videoDescription:(NSString * _Nullable)videoDescription { + peerId:(int64_t)peerId + audioSsrc:(uint32_t)audioSsrc + videoDescription:(NSString * _Nullable)videoDescription { self = [super init]; if (self != nil) { _type = type; + _peerId = peerId; _audioSsrc = audioSsrc; _videoDescription = videoDescription; }