ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hashtag search improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-05-22 14:04:37 +04:00
parent 7c7456de4b
commit 464eb8625f
53 changed files with 2049 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorComposerEntity.swift
View File

@@ -67,14 +67,19 @@ func composerEntitiesForDrawingEntity(postbox: Postbox, textScale: CGFloat, enti
return []
} else {
let content: MediaEditorComposerStickerEntity.Content
var scale = entity.scale
switch entity.content {
case let .file(file, _):
content = .file(file.media)
case let .image(image, _):
content = .image(image)
case let .animatedImage(data, _):
let _ = data
return []
if let animatedImage = UIImage.animatedImageFromData(data: data) {
content = .animatedImage(animatedImage.images, animatedImage.duration)
scale *= 1.0
} else {
return []
}
case let .video(file):
content = .video(file)
case .dualVideoReference:
@@ -93,7 +98,7 @@ func composerEntitiesForDrawingEntity(postbox: Postbox, textScale: CGFloat, enti
return []
}
}
return [MediaEditorComposerStickerEntity(postbox: postbox, content: content, position: entity.position, scale: entity.scale, rotation: entity.rotation, baseSize: entity.baseSize, mirrored: entity.mirrored, colorSpace: colorSpace, tintColor: tintColor, isStatic: entity.isExplicitlyStatic)]
return [MediaEditorComposerStickerEntity(postbox: postbox, content: content, position: entity.position, scale: scale, rotation: entity.rotation, baseSize: entity.baseSize, mirrored: entity.mirrored, colorSpace: colorSpace, tintColor: tintColor, isStatic: entity.isExplicitlyStatic)]
}
} else if let renderImage = entity.renderImage, let image = CIImage(image: renderImage, options: [.colorSpace: colorSpace]) {
if let entity = entity as? DrawingBubbleEntity {
@@ -296,8 +301,9 @@ final class MediaEditorComposerStickerEntity: MediaEditorComposerEntity {
self.imagePromise.set(.single(image))
case let .animatedImage(images, duration):
self.isAnimated = true
let _ = images
let _ = duration
self.videoFrameRate = Float(images.count) / Float(duration)
self.totalDuration = duration
self.durationPromise.set(.single(duration))
case .video:
self.isAnimated = true
}
@@ -338,7 +344,37 @@ final class MediaEditorComposerStickerEntity: MediaEditorComposerEntity {
func image(for time: CMTime, frameRate: Float, context: CIContext, completion: @escaping (CIImage?) -> Void) {
let currentTime = CMTimeGetSeconds(time)
if case .video = self.content {
if case let .animatedImage(images, _) = self.content {
var frameAdvancement: Int = 0
if let frameRate = self.videoFrameRate, frameRate > 0 {
let frameTime = 1.0 / Double(frameRate)
let frameIndex = Int(floor(currentTime / frameTime))
let currentFrameIndex = self.currentFrameIndex
if currentFrameIndex != frameIndex {
let previousFrameIndex = currentFrameIndex
self.currentFrameIndex = frameIndex
var delta = 1
if let previousFrameIndex = previousFrameIndex {
delta = max(1, frameIndex - previousFrameIndex)
}
frameAdvancement = delta
}
}
if frameAdvancement == 0, let image = self.image {
completion(image)
return
} else if let currentFrameIndex = self.currentFrameIndex {
let index = currentFrameIndex % images.count
var image = images[index]
image = generateScaledImage(image: images[index], size: image.size.aspectFitted(CGSize(width: 384, height: 384)), opaque: false, scale: 1.0)!
let ciImage = CIImage(image: image)
self.image = ciImage
completion(ciImage)
return
}
} else if case .video = self.content {
if self.videoOutput == nil {
self.setupVideoOutput()
}
@@ -475,7 +511,6 @@ final class MediaEditorComposerStickerEntity: MediaEditorComposerEntity {
let options = NSMutableDictionary()
options.setObject(ioSurfaceProperties, forKey: kCVPixelBufferIOSurfacePropertiesKey as NSString)
var pixelBuffer: CVPixelBuffer?
CVPixelBufferCreate(
kCFAllocatorDefault,