Various improvements

Isaac · Isaac · commit 894e0e4705fb · 2025-02-27T12:23:14.000+01:00
diff --git a/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift b/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift
@@ -298,7 +298,6 @@ private final class ItemNode: ASDisplayNode {
         self.shortTitleActiveNode.visibility = title.enableAnimations
         
         if themeUpdated || titleUpdated {
-            //TODO:release
             self.titleNode.attributedText = title.attributedString(font: Font.medium(14.0), textColor: presentationData.theme.list.itemSecondaryTextColor)
             self.titleActiveNode.attributedText = title.attributedString(font: Font.medium(14.0), textColor: presentationData.theme.list.itemAccentColor)
             
diff --git a/submodules/TelegramCallsUI/Sources/VideoChatParticipantsComponent.swift b/submodules/TelegramCallsUI/Sources/VideoChatParticipantsComponent.swift
@@ -637,7 +637,6 @@ final class VideoChatParticipantsComponent: Component {
         
         private var ignoreScrolling: Bool = false
         
-        //TODO:release
         private var gridParticipants: [VideoParticipant] = []
         private var listParticipants: [GroupCallParticipantsContext.Participant] = []
         
diff --git a/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift b/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift
@@ -2420,7 +2420,6 @@ final class VideoChatScreenComponent: Component {
                 }
                 videoButtonContent = .audio(audio: buttonAudio, isEnabled: buttonIsEnabled)
             } else {
-                //TODO:release
                 videoButtonContent = .video(isActive: false)
             }
             let _ = self.videoButton.update(
diff --git a/submodules/TelegramCallsUI/Sources/VideoChatScreenMoreMenu.swift b/submodules/TelegramCallsUI/Sources/VideoChatScreenMoreMenu.swift
@@ -285,7 +285,6 @@ extension VideoChatScreenComponent.View {
         }
         
         //let isScheduled = strongSelf.isScheduled
-        //TODO:release
         let isScheduled: Bool = !"".isEmpty
 
         let canSpeak: Bool
diff --git a/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift b/submodules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift
@@ -90,7 +90,7 @@ public final class BatchVideoRenderingContext {
     
     private final class TargetContext {
         weak var target: Target?
-        let file: TelegramMediaFile
+        let file: FileMediaReference
         let userLocation: MediaResourceUserLocation
         
         var readingContext: QueueLocalObject<ReadingContext>?
@@ -100,7 +100,7 @@ public final class BatchVideoRenderingContext {
         
         init(
             target: Target,
-            file: TelegramMediaFile,
+            file: FileMediaReference,
             userLocation: MediaResourceUserLocation
         ) {
             self.target = target
@@ -128,7 +128,7 @@ public final class BatchVideoRenderingContext {
         self.context = context
     }
     
-    public func add(target: Target, file: TelegramMediaFile, userLocation: MediaResourceUserLocation) -> TargetHandle {
+    public func add(target: Target, file: FileMediaReference, userLocation: MediaResourceUserLocation) -> TargetHandle {
         let id = self.nextId
         self.nextId += 1
         
@@ -158,11 +158,11 @@ public final class BatchVideoRenderingContext {
                         mediaBox: self.context.account.postbox.mediaBox,
                         userLocation: targetContext.userLocation,
                         userContentType: .sticker,
-                        reference: .media(media: .standalone(media: targetContext.file), resource: targetContext.file.resource)
+                        reference: targetContext.file.resourceReference(targetContext.file.media.resource)
                     ).startStrict()
                 }
                 if targetContext.dataDisposable == nil {
-                    targetContext.dataDisposable = (self.context.account.postbox.mediaBox.resourceData(targetContext.file.resource)
+                    targetContext.dataDisposable = (self.context.account.postbox.mediaBox.resourceData(targetContext.file.media.resource)
                     |> deliverOnMainQueue).startStrict(next: { [weak self, weak targetContext] data in
                         guard let self, let targetContext else {
                             return
diff --git a/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/BUILD b/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/BUILD
@@ -40,6 +40,7 @@ swift_library(
         "//submodules/TelegramUI/Components/EntityKeyboardGifContent:EntityKeyboardGifContent",
         "//submodules/TelegramUI/Components/LegacyMessageInputPanelInputView:LegacyMessageInputPanelInputView",
         "//submodules/AttachmentTextInputPanelNode",
+        "//submodules/TelegramUI/Components/BatchVideoRendering",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/ChatEntityKeyboardInputNode.swift b/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/ChatEntityKeyboardInputNode.swift
@@ -1912,6 +1912,7 @@ public final class ChatEntityKeyboardInputNode: ChatInputNode {
                         interaction: interaction,
                         inputNodeInteraction: inputNodeInteraction,
                         mode: mappedMode,
+                        batchVideoRenderingContext: nil,
                         trendingGifsPromise: trendingGifsPromise,
                         cancel: {
                         },
diff --git a/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/GifPaneSearchContentNode.swift b/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/GifPaneSearchContentNode.swift
@@ -12,12 +12,15 @@ import ChatControllerInteraction
 import MultiplexedVideoNode
 import ChatPresentationInterfaceState
 import EntityKeyboardGifContent
+import BatchVideoRendering
 
 final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
     private let context: AccountContext
     private let interaction: ChatEntityKeyboardInputNode.Interaction
     private let inputNodeInteraction: ChatMediaInputNodeInteraction
     
+    private let batchVideoRenderingContext: BatchVideoRenderingContext
+    
     private var theme: PresentationTheme
     private var strings: PresentationStrings
     
@@ -45,10 +48,11 @@ final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
     
     private var hasInitialText = false
     
-    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, interaction: ChatEntityKeyboardInputNode.Interaction, inputNodeInteraction: ChatMediaInputNodeInteraction, trendingPromise: Promise<ChatMediaInputGifPaneTrendingState?>) {
+    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, interaction: ChatEntityKeyboardInputNode.Interaction, inputNodeInteraction: ChatMediaInputNodeInteraction, batchVideoRenderingContext: BatchVideoRenderingContext, trendingPromise: Promise<ChatMediaInputGifPaneTrendingState?>) {
         self.context = context
         self.interaction = interaction
         self.inputNodeInteraction = inputNodeInteraction
+        self.batchVideoRenderingContext = batchVideoRenderingContext
         self.trendingPromise = trendingPromise
         
         self.theme = theme
@@ -217,7 +221,7 @@ final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
         super.willEnterHierarchy()
         
         if self.multiplexedNode == nil {
-            let multiplexedNode = MultiplexedVideoNode(account: self.context.account, theme: self.theme, strings: self.strings)
+            let multiplexedNode = MultiplexedVideoNode(context: self.context, theme: self.theme, strings: self.strings, batchVideoRenderingContext: self.batchVideoRenderingContext)
             self.multiplexedNode = multiplexedNode
             if let layout = self.validLayout {
                 multiplexedNode.frame = CGRect(origin: CGPoint(), size: layout)
diff --git a/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/PaneSearchContainerNode.swift b/submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/PaneSearchContainerNode.swift
@@ -14,6 +14,7 @@ import MultiplexedVideoNode
 import FeaturedStickersScreen
 import StickerPeekUI
 import EntityKeyboardGifContent
+import BatchVideoRendering
 
 private let searchBarHeight: CGFloat = 52.0
 
@@ -54,15 +55,15 @@ public final class PaneSearchContainerNode: ASDisplayNode, EntitySearchContainer
         return self.contentNode.ready
     }
     
-    public init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, interaction: ChatEntityKeyboardInputNode.Interaction, inputNodeInteraction: ChatMediaInputNodeInteraction, mode: ChatMediaInputSearchMode, stickerActionTitle: String? = nil, trendingGifsPromise: Promise<ChatMediaInputGifPaneTrendingState?>, cancel: @escaping () -> Void, peekBehavior: EmojiContentPeekBehavior?) {
+    public init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, interaction: ChatEntityKeyboardInputNode.Interaction, inputNodeInteraction: ChatMediaInputNodeInteraction, mode: ChatMediaInputSearchMode, batchVideoRenderingContext: BatchVideoRenderingContext?, stickerActionTitle: String? = nil, trendingGifsPromise: Promise<ChatMediaInputGifPaneTrendingState?>, cancel: @escaping () -> Void, peekBehavior: EmojiContentPeekBehavior?) {
         self.context = context
         self.mode = mode
         self.interaction = interaction
         self.inputNodeInteraction = inputNodeInteraction
         self.peekBehavior = peekBehavior
         switch mode {
         case .gif:
-            self.contentNode = GifPaneSearchContentNode(context: context, theme: theme, strings: strings, interaction: interaction, inputNodeInteraction: inputNodeInteraction, trendingPromise: trendingGifsPromise)
+            self.contentNode = GifPaneSearchContentNode(context: context, theme: theme, strings: strings, interaction: interaction, inputNodeInteraction: inputNodeInteraction, batchVideoRenderingContext: batchVideoRenderingContext ?? BatchVideoRenderingContext(context: context), trendingPromise: trendingGifsPromise)
         case .sticker, .trending:
             self.contentNode = StickerPaneSearchContentNode(context: context, theme: theme, strings: strings, interaction: interaction, inputNodeInteraction: inputNodeInteraction, stickerActionTitle: stickerActionTitle)
         }
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/BUILD b/submodules/TelegramUI/Components/EntityKeyboard/BUILD
@@ -51,6 +51,7 @@ swift_library(
         "//submodules/TelegramCore/FlatBuffers",
         "//submodules/TelegramCore/FlatSerialization",
         "//submodules/TelegramUI/Components/BatchVideoRendering",
+        "//submodules/TelegramUI/Components/GifVideoLayer",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift b/submodules/TelegramUI/Components/EntityKeyboard/Sources/GifPagerContentComponent.swift
@@ -20,115 +20,7 @@ import AVFoundation
 import PhotoResources
 import ShimmerEffect
 import BatchVideoRendering
-
-private class GifVideoLayer: AVSampleBufferDisplayLayer, BatchVideoRenderingContext.Target {
-    private let context: AccountContext
-    private let batchVideoContext: BatchVideoRenderingContext
-    private let userLocation: MediaResourceUserLocation
-    private let file: TelegramMediaFile?
-    
-    private var batchVideoTargetHandle: BatchVideoRenderingContext.TargetHandle?
-    var batchVideoRenderingTargetState: BatchVideoRenderingContext.TargetState?
-    
-    private var thumbnailDisposable: Disposable?
-    
-    private var isReadyToRender: Bool = false
-    
-    var started: (() -> Void)?
-    
-    var shouldBeAnimating: Bool = false {
-        didSet {
-            if self.shouldBeAnimating == oldValue {
-                return
-            }
-            self.updateShouldBeRendering()
-        }
-    }
-    
-    init(context: AccountContext, batchVideoContext: BatchVideoRenderingContext, userLocation: MediaResourceUserLocation, file: TelegramMediaFile?, synchronousLoad: Bool) {
-        self.context = context
-        self.batchVideoContext = batchVideoContext
-        self.userLocation = userLocation
-        self.file = file
-        
-        super.init()
-        
-        self.videoGravity = .resizeAspectFill
-        
-        if let file = self.file {
-            if let dimensions = file.dimensions {
-                self.thumbnailDisposable = (mediaGridMessageVideo(postbox: context.account.postbox, userLocation: userLocation, videoReference: .savedGif(media: file), synchronousLoad: synchronousLoad, nilForEmptyResult: true)
-                |> deliverOnMainQueue).start(next: { [weak self] transform in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    let boundingSize = CGSize(width: 93.0, height: 93.0)
-                    let imageSize = dimensions.cgSize.aspectFilled(boundingSize)
-                    
-                    if let image = transform(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets(), resizeMode: .fill(.clear)))?.generateImage() {
-                        Queue.mainQueue().async {
-                            if let strongSelf = self {
-                                strongSelf.contents = image.cgImage
-                                strongSelf.setupVideo()
-                                strongSelf.started?()
-                            }
-                        }
-                    } else {
-                        strongSelf.setupVideo()
-                    }
-                })
-            } else {
-                self.setupVideo()
-            }
-        }
-    }
-    
-    override init(layer: Any) {
-        guard let layer = layer as? GifVideoLayer else {
-            preconditionFailure()
-        }
-        
-        self.context = layer.context
-        self.batchVideoContext = layer.batchVideoContext
-        self.userLocation = layer.userLocation
-        self.file = layer.file
-        
-        super.init(layer: layer)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    deinit {
-        self.thumbnailDisposable?.dispose()
-    }
-    
-    private func setupVideo() {
-        self.isReadyToRender = true
-        self.updateShouldBeRendering()
-    }
-    
-    private func updateShouldBeRendering() {
-        let shouldBeRendering = self.shouldBeAnimating && self.isReadyToRender
-        
-        if shouldBeRendering, let file = self.file {
-            if self.batchVideoTargetHandle == nil {
-                self.batchVideoTargetHandle = self.batchVideoContext.add(target: self, file: file, userLocation: self.userLocation)
-            }
-        } else {
-            self.batchVideoTargetHandle = nil
-        }
-    }
-    
-    func setSampleBuffer(sampleBuffer: CMSampleBuffer) {
-        if #available(iOS 17.0, *) {
-            self.sampleBufferRenderer.enqueue(sampleBuffer)
-        } else {
-            self.enqueue(sampleBuffer)
-        }
-    }
-}
+import GifVideoLayer
 
 public final class GifPagerContentComponent: Component {
     public typealias EnvironmentType = (EntityKeyboardChildEnvironment, PagerComponentChildEnvironment)
@@ -388,7 +280,7 @@ public final class GifPagerContentComponent: Component {
                 self.item = item
                 self.onUpdateDisplayPlaceholder = onUpdateDisplayPlaceholder
                 
-                super.init(context: context, batchVideoContext: batchVideoContext, userLocation: .other, file: item?.file.media, synchronousLoad: attemptSynchronousLoad)
+                super.init(context: context, batchVideoContext: batchVideoContext, userLocation: .other, file: item?.file, synchronousLoad: attemptSynchronousLoad)
                 
                 if item == nil {
                     self.updateDisplayPlaceholder(displayPlaceholder: true, duration: 0.0)
diff --git a/submodules/TelegramUI/Components/GifVideoLayer/BUILD b/submodules/TelegramUI/Components/GifVideoLayer/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GifVideoLayer",
+    module_name = "GifVideoLayer",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/Display",
+        "//submodules/TelegramUI/Components/BatchVideoRendering",
+        "//submodules/AccountContext",
+        "//submodules/TelegramCore",
+        "//submodules/SSignalKit/SwiftSignalKit",
+        "//submodules/PhotoResources",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUI/Components/GifVideoLayer/Sources/GifVideoLayer.swift b/submodules/TelegramUI/Components/GifVideoLayer/Sources/GifVideoLayer.swift
diff --git a/submodules/TelegramUI/Components/MultiplexedVideoNode/BUILD b/submodules/TelegramUI/Components/MultiplexedVideoNode/BUILD
diff --git a/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift b/submodules/TelegramUI/Components/MultiplexedVideoNode/Sources/MultiplexedVideoNode.swift
diff --git a/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift b/submodules/TelegramUI/Components/StickerPickerScreen/Sources/StickerPickerScreen.swift
diff --git a/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageContextMenu.swift b/submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageContextMenu.swift
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift

Original file line number	Diff line number	Diff line change
`@@ -2420,7 +2420,6 @@ final class VideoChatScreenComponent: Component {`
`2420`	`2420`	`}`
`2421`	`2421`	`videoButtonContent = .audio(audio: buttonAudio, isEnabled: buttonIsEnabled)`
`2422`	`2422`	`} else {`
`2423`		`- //TODO:release`
`2424`	`2423`	`videoButtonContent = .video(isActive: false)`
`2425`	`2424`	`}`
`2426`	`2425`	`let _ = self.videoButton.update(`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,6 @@ extension VideoChatScreenComponent.View {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`//let isScheduled = strongSelf.isScheduled`
`288`		`- //TODO:release`
`289`	`288`	`let isScheduled: Bool = !"".isEmpty`
`290`	`289`
`291`	`290`	`let canSpeak: Bool`