Update video

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -5627,3 +5627,5 @@ Any member of this group will be able to see messages in the channel.";
 "PrivacySettings.AutoArchiveTitle" = "NEW CHATS FROM UNKNOWN USERS";
 "PrivacySettings.AutoArchive" = "Archive and Mute";
 "PrivacySettings.AutoArchiveInfo" = "Automatically archive and mute new chats, groups and channels from non-contacts.";
+
+"Call.RemoteVideoPaused" = "%@'s video paused";

submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift

@@ -189,7 +189,7 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder:
                         messageText = invoice.title
                     case let action as TelegramMediaAction:
                         switch action.action {
-                            case let .phoneCall(_, discardReason, _, _):
+                            case let .phoneCall(_, discardReason, _, isVideo):
                                 hideAuthor = !isPeerGroup
                                 let incoming = message.flags.contains(.Incoming)
                                 if let discardReason = discardReason {
@@ -205,11 +205,19 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder:
                                 
                                 if messageText.isEmpty {
                                     if incoming {
+                                        if isVideo {
+                                            messageText = strings.Notification_VideoCallIncoming
+                                        } else {
                                             messageText = strings.Notification_CallIncoming
+                                        }
+                                    } else {
+                                        if isVideo {
+                                            messageText = strings.Notification_VideoCallOutgoing
                                         } else {
                                             messageText = strings.Notification_CallOutgoing
                                         }
                                     }
+                                }
                             default:
                                 hideAuthor = true
                                 if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId) {

submodules/TelegramCallsUI/Sources/CallControllerButton.swift

@@ -11,7 +11,7 @@ enum CallControllerButtonType {
     case accept
     case speaker
     case bluetooth
-    case video
+    case switchCamera
 }
 
 private let buttonSize = CGSize(width: 75.0, height: 75.0)
@@ -124,8 +124,8 @@ final class CallControllerButtonNode: HighlightTrackingButtonNode {
                 regularImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: emptyStroke, fillColor: .clear)
                 highlightedImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: emptyStroke, fillColor: emptyHighlightedFill)
                 filledImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: nil, fillColor: invertedFill, knockout: true)
-            case .video:
-                let patternImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Text/IconVideo"), color: .white)
+            case .switchCamera:
+                let patternImage = generateTintedImage(image: UIImage(bundleImageName: "Call/CallSwitchCameraButton"), color: .white)
                 regularImage = generateEmptyButtonImage(icon: patternImage, strokeColor: emptyStroke, fillColor: .clear)
                 highlightedImage = generateEmptyButtonImage(icon: patternImage, strokeColor: emptyStroke, fillColor: emptyHighlightedFill)
                 filledImage = generateEmptyButtonImage(icon: patternImage, strokeColor: nil, fillColor: invertedFill, knockout: true)
@@ -215,8 +215,8 @@ final class CallControllerButtonNode: HighlightTrackingButtonNode {
                 regularImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: emptyStroke, fillColor: .clear)
                 highlightedImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: emptyStroke, fillColor: emptyHighlightedFill)
                 filledImage = generateEmptyButtonImage(icon: UIImage(bundleImageName: "Call/CallBluetoothButton"), strokeColor: nil, fillColor: invertedFill, knockout: true)
-            case .video:
-                let patternImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Text/IconVideo"), color: .white)
+            case .switchCamera:
+                let patternImage = generateTintedImage(image: UIImage(bundleImageName: "Call/CallSwitchCameraButton"), color: .white)
                 regularImage = generateEmptyButtonImage(icon: patternImage, strokeColor: emptyStroke, fillColor: .clear)
                 highlightedImage = generateEmptyButtonImage(icon: patternImage, strokeColor: emptyStroke, fillColor: emptyHighlightedFill)
                 filledImage = generateEmptyButtonImage(icon: patternImage, strokeColor: nil, fillColor: invertedFill, knockout: true)

submodules/TelegramCallsUI/Sources/CallControllerButtonsNode.swift

@@ -32,6 +32,7 @@ final class CallControllerButtonsNode: ASDisplayNode {
     private let muteButton: CallControllerButtonNode
     private let endButton: CallControllerButtonNode
     private let speakerButton: CallControllerButtonNode
+    private let swichCameraButton: CallControllerButtonNode
     
     private var mode: CallControllerButtonsMode?
     
@@ -48,6 +49,7 @@ final class CallControllerButtonsNode: ASDisplayNode {
     var end: (() -> Void)?
     var speaker: (() -> Void)?
     var toggleVideo: (() -> Void)?
+    var rotateCamera: (() -> Void)?
     
     init(strings: PresentationStrings) {
         self.acceptButton = CallControllerButtonNode(type: .accept, label: strings.Call_Accept)
@@ -61,6 +63,8 @@ final class CallControllerButtonsNode: ASDisplayNode {
         self.endButton.alpha = 0.0
         self.speakerButton = CallControllerButtonNode(type: .speaker, label: nil)
         self.speakerButton.alpha = 0.0
+        self.swichCameraButton = CallControllerButtonNode(type: .switchCamera, label: nil)
+        self.swichCameraButton.alpha = 0.0
         
         super.init()
         
@@ -69,12 +73,14 @@ final class CallControllerButtonsNode: ASDisplayNode {
         self.addSubnode(self.muteButton)
         self.addSubnode(self.endButton)
         self.addSubnode(self.speakerButton)
+        self.addSubnode(self.swichCameraButton)
         
         self.acceptButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
         self.declineButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
         self.muteButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
         self.endButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
         self.speakerButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
+        self.swichCameraButton.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
     }
     
     func updateLayout(constrainedWidth: CGFloat, transition: ContainedViewLayoutTransition) {
@@ -112,8 +118,12 @@ final class CallControllerButtonsNode: ASDisplayNode {
         let twoButtonsWidth = 2.0 * buttonSize.width + 1.0 * twoButtonSpacing
         
         var origin = CGPoint(x: floor((width - threeButtonsWidth) / 2.0), y: 0.0)
+        
         for button in [self.muteButton, self.endButton, self.speakerButton] {
             transition.updateFrame(node: button, frame: CGRect(origin: origin, size: buttonSize))
+            if button === self.speakerButton {
+                transition.updateFrame(node: self.swichCameraButton, frame: CGRect(origin: origin, size: buttonSize))
+            }
             
             origin.x += buttonSize.width + threeButtonSpacing
         }
@@ -129,16 +139,44 @@ final class CallControllerButtonsNode: ASDisplayNode {
                 for button in [self.declineButton, self.acceptButton] {
                     button.alpha = 1.0
                 }
-                for button in [self.muteButton, self.endButton, self.speakerButton] {
+                for button in [self.muteButton, self.endButton, self.speakerButton, self.swichCameraButton] {
                     button.alpha = 0.0
                 }
             case let .active(speakerMode, videoState):
-                for button in [self.muteButton, self.speakerButton] {
+                for button in [self.muteButton] {
                     if animated && button.alpha.isZero {
                         button.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
                     }
                     button.alpha = 1.0
                 }
+                switch videoState {
+                case .active, .available:
+                    for button in [self.speakerButton] {
+                        if animated && !button.alpha.isZero {
+                            button.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                        }
+                        button.alpha = 0.0
+                    }
+                    for button in [self.swichCameraButton] {
+                        if animated && button.alpha.isZero {
+                            button.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                        }
+                        button.alpha = 1.0
+                    }
+                case .notAvailable:
+                    for button in [self.swichCameraButton] {
+                        if animated && !button.alpha.isZero {
+                            button.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                        }
+                        button.alpha = 0.0
+                    }
+                    for button in [self.speakerButton] {
+                        if animated && button.alpha.isZero {
+                            button.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                        }
+                        button.alpha = 1.0
+                    }
+                }
                 var animatingAcceptButton = false
                 if self.endButton.alpha.isZero {
                     if animated {
@@ -160,22 +198,6 @@ final class CallControllerButtonsNode: ASDisplayNode {
                     self.endButton.alpha = 1.0
                 }
                 
-                /*switch videoState {
-                case .notAvailable:
-                    self.videoButton.alpha = 0.0
-                case let .available(isEnabled):
-                    self.videoButton.isUserInteractionEnabled = isEnabled
-                    if animated {
-                        self.videoButton.alpha = isEnabled ? 1.0 : 0.5
-                        self.videoButton.layer.animateAlpha(from: 0.0, to: self.videoButton.alpha, duration: 0.2)
-                    } else {
-                        self.videoButton.alpha = isEnabled ? 1.0 : 0.5
-                    }
-                case .active:
-                    self.videoButton.isUserInteractionEnabled = true
-                    self.videoButton.alpha = 0.0
-                }*/
-                
                 if !self.declineButton.alpha.isZero {
                     if animated {
                         self.declineButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
@@ -211,9 +233,9 @@ final class CallControllerButtonsNode: ASDisplayNode {
             self.speaker?()
         } else if button === self.acceptButton {
             self.accept?()
-        }/* else if button === self.videoButton {
-            self.toggleVideo?()
-        }*/
+        } else if button === self.swichCameraButton {
+            self.rotateCamera?()
+        }
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
@@ -223,9 +245,12 @@ final class CallControllerButtonsNode: ASDisplayNode {
             self.muteButton,
             self.endButton,
             self.speakerButton,
-            //self.videoButton
+            self.swichCameraButton
         ]
         for button in buttons {
+            if button.isHidden || button.alpha.isZero {
+                continue
+            }
             if let result = button.view.hitTest(self.view.convert(point, to: button.view), with: event) {
                 return result
             }

submodules/TelegramCallsUI/Sources/CallControllerNode.swift

@@ -107,6 +107,7 @@ final class CallControllerNode: ASDisplayNode {
     private let backButtonArrowNode: ASImageNode
     private let backButtonNode: HighlightableButtonNode
     private let statusNode: CallControllerStatusNode
+    private let videoPausedNode: ImmediateTextNode
     private let buttonsNode: CallControllerButtonsNode
     private var keyPreviewNode: CallControllerKeyPreviewNode?
     
@@ -167,6 +168,10 @@ final class CallControllerNode: ASDisplayNode {
         self.backButtonNode = HighlightableButtonNode()
         
         self.statusNode = CallControllerStatusNode()
+        
+        self.videoPausedNode = ImmediateTextNode()
+        self.videoPausedNode.alpha = 0.0
+        
         self.buttonsNode = CallControllerButtonsNode(strings: self.presentationData.strings)
         self.keyButtonNode = HighlightableButtonNode()
         
@@ -201,6 +206,7 @@ final class CallControllerNode: ASDisplayNode {
         self.containerNode.addSubnode(self.imageNode)
         self.containerNode.addSubnode(self.dimNode)
         self.containerNode.addSubnode(self.statusNode)
+        self.containerNode.addSubnode(self.videoPausedNode)
         self.containerNode.addSubnode(self.buttonsNode)
         self.containerNode.addSubnode(self.keyButtonNode)
         self.containerNode.addSubnode(self.backButtonArrowNode)
@@ -226,6 +232,10 @@ final class CallControllerNode: ASDisplayNode {
             self?.toggleVideo?()
         }
         
+        self.buttonsNode.rotateCamera = { [weak self] in
+            self?.call.switchVideoCamera()
+        }
+        
         self.keyButtonNode.addTarget(self, action: #selector(self.keyPressed), forControlEvents: .touchUpInside)
         
         self.backButtonNode.addTarget(self, action: #selector(self.backPressed), forControlEvents: .touchUpInside)
@@ -262,6 +272,8 @@ final class CallControllerNode: ASDisplayNode {
                 }
             }
             
+            self.videoPausedNode.attributedText = NSAttributedString(string: self.presentationData.strings.Call_RemoteVideoPaused(peer.compactDisplayTitle).0, font: Font.regular(17.0), textColor: .white)
+            
             if let (layout, navigationBarHeight) = self.validLayout {
                 self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
             }
@@ -372,6 +384,15 @@ final class CallControllerNode: ASDisplayNode {
                 isActive = true
             }
             incomingVideoNode.updateIsBlurred(isBlurred: !isActive)
+            if isActive != self.videoPausedNode.alpha.isZero {
+                if isActive {
+                    self.videoPausedNode.alpha = 0.0
+                    self.videoPausedNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                } else {
+                    self.videoPausedNode.alpha = 1.0
+                    self.videoPausedNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                }
+            }
         }
         
         switch callState.state {
@@ -605,6 +626,9 @@ final class CallControllerNode: ASDisplayNode {
         let statusHeight = self.statusNode.updateLayout(constrainedWidth: layout.size.width, transition: transition)
         transition.updateFrame(node: self.statusNode, frame: CGRect(origin: CGPoint(x: 0.0, y: statusOffset), size: CGSize(width: layout.size.width, height: statusHeight)))
         
+        let videoPausedSize = self.videoPausedNode.updateLayout(CGSize(width: layout.size.width - 16.0, height: 100.0))
+        transition.updateFrame(node: self.videoPausedNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - videoPausedSize.width) / 2.0), y: floor((layout.size.height - videoPausedSize.height) / 2.0)), size: videoPausedSize))
+        
         self.buttonsNode.updateLayout(constrainedWidth: layout.size.width, transition: transition)
         let buttonsOriginY: CGFloat = layout.size.height - (buttonsOffset - 40.0) - buttonsHeight - layout.intrinsicInsets.bottom
         transition.updateFrame(node: self.buttonsNode, frame: CGRect(origin: CGPoint(x: 0.0, y: buttonsOriginY), size: CGSize(width: layout.size.width, height: buttonsHeight)))

submodules/TelegramCallsUI/Sources/PresentationCall.swift

@@ -473,13 +473,13 @@ public final class PresentationCallImpl: PresentationCall {
                 }
             case .accepting:
                 self.callWasActive = true
-                presentationState = PresentationCallState(state: .connecting(nil), videoState: .notAvailable, remoteVideoState: mappedRemoteVideoState)
+                presentationState = PresentationCallState(state: .connecting(nil), videoState: mappedVideoState, remoteVideoState: mappedRemoteVideoState)
             case .dropping:
-                presentationState = PresentationCallState(state: .terminating, videoState: .notAvailable, remoteVideoState: mappedRemoteVideoState)
+                presentationState = PresentationCallState(state: .terminating, videoState: mappedVideoState, remoteVideoState: mappedRemoteVideoState)
             case let .terminated(id, reason, options):
-                presentationState = PresentationCallState(state: .terminated(id, reason, self.callWasActive && (options.contains(.reportRating) || self.shouldPresentCallRating)), videoState: .notAvailable, remoteVideoState: mappedRemoteVideoState)
+                presentationState = PresentationCallState(state: .terminated(id, reason, self.callWasActive && (options.contains(.reportRating) || self.shouldPresentCallRating)), videoState: mappedVideoState, remoteVideoState: mappedRemoteVideoState)
             case let .requesting(ringing):
-                presentationState = PresentationCallState(state: .requesting(ringing), videoState: .notAvailable, remoteVideoState: mappedRemoteVideoState)
+                presentationState = PresentationCallState(state: .requesting(ringing), videoState: mappedVideoState, remoteVideoState: mappedRemoteVideoState)
             case let .active(_, _, keyVisualHash, _, _, _, _):
                 self.callWasActive = true
                 if let callContextState = callContextState {

submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Video.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Images.xcassets/Peer Info/ButtonVideo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Video.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift

@@ -106,7 +106,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
                 case .call:
                     imageName = "Peer Info/ButtonCall"
                 case .videoCall:
-                    imageName = "Chat/Input/Text/IconVideo"
+                    imageName = "Peer Info/ButtonVideo"
                 case .mute:
                     imageName = "Peer Info/ButtonMute"
                 case .unmute:

submodules/TelegramVoip/Sources/OngoingCallContext.swift

@@ -538,7 +538,7 @@ public final class OngoingCallContext {
                                 port: Int32(clamping: server.port),
                                 username: username,
                                 password: password,
-                                isTurn: false
+                                isTurn: true
                             ))
                         }
                     }

submodules/TgVoipWebrtc/Impl/VideoCameraCapturer.mm

@@ -120,6 +120,7 @@ static webrtc::ObjCVideoTrackSource *getObjCVideoSource(const rtc::scoped_refptr
 }
 
 - (void)stopCapture {
+  _isActiveUpdated = nil;
   [self stopCaptureWithCompletionHandler:nil];
 }