This commit is contained in:
Ali 2020-12-29 18:19:12 +04:00
parent 0b20a7f959
commit 13617eb082
6 changed files with 14 additions and 9 deletions

View File

@ -1893,7 +1893,7 @@ public final class VoiceChatController: ViewController {
var currentVideoOrigin = CGPoint(x: 4.0, y: (layout.statusBarHeight ?? 0.0) + 4.0) var currentVideoOrigin = CGPoint(x: 4.0, y: (layout.statusBarHeight ?? 0.0) + 4.0)
for videoNode in self.videoNodes { for videoNode in self.videoNodes {
let videoSize = CGSize(width: 100.0, height: 100.0) let videoSize = CGSize(width: 300.0, height: 400.0)
if currentVideoOrigin.x + videoSize.width > layout.size.width { if currentVideoOrigin.x + videoSize.width > layout.size.width {
currentVideoOrigin.x = 0.0 currentVideoOrigin.x = 0.0
currentVideoOrigin.y += videoSize.height currentVideoOrigin.y += videoSize.height

View File

@ -88,7 +88,7 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int
loop: for participant in participants { loop: for participant in participants {
switch participant { switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, params): case let .groupCallParticipant(flags, userId, date, activeDate, source, volume, mutedCnt, params):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
let ssrc = UInt32(bitPattern: source) let ssrc = UInt32(bitPattern: source)
guard let peer = transaction.getPeer(peerId) else { guard let peer = transaction.getPeer(peerId) else {
@ -231,7 +231,7 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash
loop: for participant in participants { loop: for participant in participants {
switch participant { switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, params): case let .groupCallParticipant(flags, userId, date, activeDate, source, volume, mutedCnt, params):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
let ssrc = UInt32(bitPattern: source) let ssrc = UInt32(bitPattern: source)
guard let peer = transaction.getPeer(peerId) else { guard let peer = transaction.getPeer(peerId) else {
@ -1145,7 +1145,7 @@ public final class GroupCallParticipantsContext {
flags |= 1 << 0 flags |= 1 << 0
} }
return account.network.request(Api.functions.phone.editGroupCallMember(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), userId: inputUser)) return account.network.request(Api.functions.phone.editGroupCallMember(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), userId: inputUser, volume: nil))
|> map(Optional.init) |> map(Optional.init)
|> `catch` { _ -> Signal<Api.Updates?, NoError> in |> `catch` { _ -> Signal<Api.Updates?, NoError> in
return .single(nil) return .single(nil)
@ -1205,7 +1205,7 @@ public final class GroupCallParticipantsContext {
extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate { extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
init(_ apiParticipant: Api.GroupCallParticipant) { init(_ apiParticipant: Api.GroupCallParticipant) {
switch apiParticipant { switch apiParticipant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, params): case let .groupCallParticipant(flags, userId, date, activeDate, source, volume, mutedCnt, params):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
let ssrc = UInt32(bitPattern: source) let ssrc = UInt32(bitPattern: source)
var muteState: GroupCallParticipantsContext.Participant.MuteState? var muteState: GroupCallParticipantsContext.Participant.MuteState?
@ -1251,7 +1251,7 @@ extension GroupCallParticipantsContext.Update.StateUpdate {
var participantUpdates: [GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate] = [] var participantUpdates: [GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate] = []
for participant in participants { for participant in participants {
switch participant { switch participant {
case let .groupCallParticipant(flags, userId, date, activeDate, source, params): case let .groupCallParticipant(flags, userId, date, activeDate, source, volume, mutedCnt, params):
let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId) let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
let ssrc = UInt32(bitPattern: source) let ssrc = UInt32(bitPattern: source)
var muteState: GroupCallParticipantsContext.Participant.MuteState? var muteState: GroupCallParticipantsContext.Participant.MuteState?

@ -1 +1 @@
Subproject commit 59c7723489655096aa7513b97e54d7e9d8f84c60 Subproject commit c37f8a2ee8e4714e93c2ac3f625b8bc771b5199b

@ -1 +1 @@
Subproject commit 2d20a42ab60f8fed37612361f2ea776d0bc7ca1a Subproject commit 3a38edea2cd114d53914cab017cab2e43a600031

View File

@ -3178,6 +3178,7 @@ armv7_specific_sources = [webrtc_source_dir + "/" + path for path in [
arm64_specific_sources = [webrtc_source_dir + "/" + path for path in [ arm64_specific_sources = [webrtc_source_dir + "/" + path for path in [
"common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/complex_bit_reverse.c",
"common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/signal_processing/filter_ar_fast_q12.c",
"common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc",
]] ]]
x86_specific_sources = [webrtc_source_dir + "/" + path for path in [ x86_specific_sources = [webrtc_source_dir + "/" + path for path in [
@ -3209,6 +3210,7 @@ common_flags = [
"-DWEBRTC_POSIX", "-DWEBRTC_POSIX",
"-DHAVE_WEBRTC_VIDEO", "-DHAVE_WEBRTC_VIDEO",
"-DRTC_ENABLE_VP9", "-DRTC_ENABLE_VP9",
"-DHAVE_SCTP",
] ]
arm_specific_flags = [ arm_specific_flags = [
@ -3326,6 +3328,7 @@ cc_library(
"-D__Userspace__", "-D__Userspace__",
"-D__Userspace_os_Darwin", "-D__Userspace_os_Darwin",
"-DPACKAGE_VERSION=''", "-DPACKAGE_VERSION=''",
"-DHAVE_SCTP",
] + arch_specific_cflags, ] + arch_specific_cflags,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
@ -3403,6 +3406,7 @@ cc_library(
"-DHAVE_SYS_TYPES_H", "-DHAVE_SYS_TYPES_H",
"-DHAVE_UNISTD_H", "-DHAVE_UNISTD_H",
"-DPACKAGE_STRING='\"\"'", "-DPACKAGE_STRING='\"\"'",
"-DHAVE_SCTP",
] + arch_specific_cflags, ] + arch_specific_cflags,
deps = [ deps = [
"//third-party/boringssl:crypto", "//third-party/boringssl:crypto",
@ -3571,6 +3575,7 @@ objc_library(
"-D__Userspace__", "-D__Userspace__",
"-D__Userspace_os_Darwin", "-D__Userspace_os_Darwin",
"-DPACKAGE_VERSION='\"\"'", "-DPACKAGE_VERSION='\"\"'",
"-DHAVE_SCTP",
] + arch_specific_cflags, ] + arch_specific_cflags,
deps = [ deps = [
"//third-party/boringssl:crypto", "//third-party/boringssl:crypto",

@ -1 +1 @@
Subproject commit ee20896490bb64b7a4d97268cfd62fc48fee6e62 Subproject commit 8c10245619347c08707db1561b7cec2dbf467354