Add tones

submodules/TelegramCallsUI/Sources/PresentationCall.swift

@@ -14,7 +14,7 @@ import DeviceAccess
 import UniversalMediaPlayer
 import AccountContext
 
-private final class PresentationCallToneRenderer {
+final class PresentationCallToneRenderer {
     let queue: Queue
     
     let tone: PresentationCallTone
@@ -94,15 +94,26 @@ private final class PresentationCallToneRenderer {
                     while takenCount < frameSize {
                         let dataOffset = (takeOffset + takenCount) % toneData.count
                         let dataCount = min(frameSize, toneData.count - dataOffset)
-                        memcpy(bytes, dataBytes.advanced(by: dataOffset), dataCount)
+                        //print("take from \(dataOffset) count: \(dataCount)")
+                        memcpy(bytes.advanced(by: takenCount), dataBytes.advanced(by: dataOffset), dataCount)
                         takenCount += dataCount
+                        
+                        if let toneDataMaxOffset = toneDataMaxOffset, takeOffset + takenCount >= toneDataMaxOffset {
+                            break
+                        }
+                    }
+                    
+                    if takenCount < frameSize {
+                        //print("fill with zeros from \(takenCount) count: \(frameSize - takenCount)")
+                        memset(bytes.advanced(by: takenCount), 0, frameSize - takenCount)
                     }
                 }
                 
-                if let toneDataMaxOffset = toneDataMaxOffset, takeOffset + frameSize > toneDataMaxOffset {
+                /*if let toneDataMaxOffset = toneDataMaxOffset, takeOffset + frameSize > toneDataMaxOffset {
                     let validCount = max(0, toneDataMaxOffset - takeOffset)
                     memset(bytes.advanced(by: validCount), 0, frameSize - validCount)
-                }
+                    print("clear from \(validCount) count: \(frameSize - validCount)")
+                }*/
                 
                 let status = CMBlockBufferCreateWithMemoryBlock(allocator: nil, memoryBlock: bytes, blockLength: frameSize, blockAllocator: nil, customBlockSource: nil, offsetToData: 0, dataLength: frameSize, flags: 0, blockBufferOut: &blockBuffer)
                 if status != noErr {

submodules/TelegramCallsUI/Sources/PresentationCallToneData.swift

@@ -71,6 +71,8 @@ enum PresentationCallTone {
     case busy
     case failed
     case ended
+    case groupJoined
+    case groupLeft
     
     var loopCount: Int? {
         switch self {
@@ -80,6 +82,8 @@ enum PresentationCallTone {
                 return 1
             case .ended:
                 return 1
+            case .groupJoined, .groupLeft:
+                return 1
             default:
                 return nil
         }
@@ -98,5 +102,9 @@ func presentationCallToneData(_ tone: PresentationCallTone) -> Data? {
             return loadToneData(name: "voip_fail.caf")
         case .ended:
             return loadToneData(name: "voip_end.caf")
+        case .groupJoined:
+            return loadToneData(name: "voip_group_joined.wav")
+        case .groupLeft:
+            return loadToneData(name: "voip_group_left.wav")
     }
 }

submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift

@@ -389,6 +389,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         return self._canBeRemoved.get()
     }
     
+    private let wasRemoved = Promise<Bool>(false)
+    
     private var stateValue = PresentationGroupCallState.initialValue {
         didSet {
             if self.stateValue != oldValue {
@@ -442,6 +444,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     
     private var removedChannelMembersDisposable: Disposable?
     
+    private var didConnectOnce: Bool = false
+    private var toneRenderer: PresentationCallToneRenderer?
+    
     init(
         accountContext: AccountContext,
         audioSession: ManagedAudioSession,
@@ -528,10 +533,15 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                                 return EmptyDisposable
                             })
                         } else {
-                            audioSessionControl.activate({ _ in })
+                            audioSessionControl.activate({ [weak self] _ in
-                            audioSessionActive = .single(true)
+                                Queue.mainQueue().async {
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    strongSelf.audioSessionActive.set(.single(true))
+                                }
+                            })
                         }
-                        strongSelf.audioSessionActive.set(audioSessionActive)
                     } else {
                         strongSelf.audioSessionActive.set(.single(false))
                     }
@@ -835,6 +845,14 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                             strongSelf.checkCallDisposable = nil
                         }
                     }
+                    
+                    if case .connected = state, !strongSelf.didConnectOnce {
+                        strongSelf.didConnectOnce = true
+                        
+                        let toneRenderer = PresentationCallToneRenderer(tone: .groupJoined)
+                        strongSelf.toneRenderer = toneRenderer
+                        toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive)
+                    }
                 }))
                 
                 self.audioLevelsDisposable.set((callContext.audioLevels
@@ -1074,9 +1092,24 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     private func updateIsAudioSessionActive(_ value: Bool) {
         if self.isAudioSessionActive != value {
             self.isAudioSessionActive = value
+            self.toneRenderer?.setAudioSessionActive(value)
         }
     }
     
+    private func markAsCanBeRemoved() {
+        self.callContext?.stop()
+        self.callContext = nil
+        self._canBeRemoved.set(.single(true))
+        
+        let toneRenderer = PresentationCallToneRenderer(tone: .groupLeft)
+        self.toneRenderer = toneRenderer
+        toneRenderer.setAudioSessionActive(self.isAudioSessionActive)
+        
+        Queue.mainQueue().after(0.5, {
+            self.wasRemoved.set(.single(true))
+        })
+    }
+    
     public func leave(terminateIfPossible: Bool) -> Signal<Bool, NoError> {
         if case let .estabilished(callInfo, _, localSsrc, _) = self.internalState {
             if terminateIfPossible {
@@ -1085,9 +1118,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     guard let strongSelf = self else {
                         return
                     }
-                    strongSelf.callContext?.stop()
+                    strongSelf.markAsCanBeRemoved()
-                    strongSelf.callContext = nil
-                    strongSelf._canBeRemoved.set(.single(true))
                 }))
             } else {
                 self.leaveDisposable.set((leaveGroupCall(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, source: localSsrc)
@@ -1095,23 +1126,16 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     guard let strongSelf = self else {
                         return
                     }
-                    strongSelf.callContext?.stop()
+                    strongSelf.markAsCanBeRemoved()
-                    strongSelf.callContext = nil
-                    strongSelf._canBeRemoved.set(.single(true))
                 }, completed: { [weak self] in
                     guard let strongSelf = self else {
                         return
                     }
-                    strongSelf.callContext?.stop()
+                    strongSelf.markAsCanBeRemoved()
-                    strongSelf.callContext = nil
-                    strongSelf._canBeRemoved.set(.single(true))
                 }))
             }
         } else {
-            self.callContext?.stop()
+            self.markAsCanBeRemoved()
-            self.callContext = nil
-            self.requestDisposable.set(nil)
-            self._canBeRemoved.set(.single(true))
         }
         return self._canBeRemoved.get()
     }

submodules/TgVoipWebrtc/tgcalls

@@ -1 +1 @@
-Subproject commit 91102cef8ef03b7223b04e28c8794c87bc78614d
+Subproject commit 58f3f89352d164540067e197ad735c0717546172