ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 13:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7ff263736cc72c47966a430391455501f8dde111'

Browse Source
This commit is contained in:
Peter 2019-07-10 14:50:54 +04:00
commit 424230bc71
3 changed files with 80 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-beta.txt
View File

@ -1 +1 @@
Fixed crashes
General fixes and stability improvements

2
submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift
View File

@ -214,7 +214,7 @@ private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource
self.width = width
self.height = height
self.currentFrame = 0
guard let rawData = TGGUnzipData(data, 2 * 1024 * 1024) else {
guard let rawData = TGGUnzipData(data, 1024 * 1024) else {
return nil
}
guard let animation = LottieInstance(data: rawData, cacheKey: "") else {

80
submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift
View File

@ -11,6 +11,82 @@ import GZip
import RLottie
import MobileCoreServices
private func validateAnimationItems(_ items: [Any]?, shapes: Bool = true) -> Bool {
if let items = items {
for case let item as [AnyHashable: Any] in items {
if let type = item["ty"] as? String {
if type == "rp" || type == "sr" || type == "gs" {
return false
}
}
if shapes, let subitems = item["it"] as? [Any] {
if !validateAnimationItems(subitems, shapes: false) {
return false
}
}
}
}
return true;
}
private func validateAnimationLayers(_ layers: [Any]?) -> Bool {
if let layers = layers {
for case let layer as [AnyHashable: Any] in layers {
if let ddd = layer["ddd"] as? Int, ddd != 0 {
return false
}
if let sr = layer["sr"] as? Int, sr != 1 {
return false
}
if let _ = layer["tm"] {
return false
}
if let ty = layer["ty"] as? Int {
if ty == 1 || ty == 2 || ty == 5 || ty == 9 {
return false
}
}
if let hasMask = layer["hasMask"] as? Bool, hasMask {
return false
}
if let _ = layer["masksProperties"] {
return false
}
if let _ = layer["tt"] {
return false
}
if let ao = layer["ao"] as? Int, ao == 1 {
return false
}
if let shapes = layer["shapes"] as? [Any], !validateAnimationItems(shapes, shapes: true) {
return false
}
}
}
return true
}
func validateAnimationComposition(json: [AnyHashable: Any]) -> Bool {
let validDimensions: [Int] = [100, 512]
let validFramerates: [Int] = [30, 60]
guard let tgs = json["tgs"] as? Int, tgs == 1 else {
return false
}
guard let width = json["w"] as? Int, validDimensions.contains(width) else {
return false
}
guard let height = json["h"] as? Int, validDimensions.contains(height) else {
return false
}
guard let fps = json["fr"] as? Int, validFramerates.contains(fps) else {
return false
}
return true
}
func fetchCompressedLottieFirstFrameAJpeg(data: Data, size: CGSize, cacheKey: String) -> Signal<TempBoxFile, NoError> {
return Signal({ subscriber in
let queue = Queue()
@ -22,7 +98,7 @@ func fetchCompressedLottieFirstFrameAJpeg(data: Data, size: CGSize, cacheKey: St
return
}
let decompressedData = TGGUnzipData(data, 2 * 1024 * 1024)
let decompressedData = TGGUnzipData(data, 1024 * 1024)
if let decompressedData = decompressedData, let player = LottieInstance(data: decompressedData, cacheKey: cacheKey) {
if cancelled.with({ $0 }) {
return
@ -117,7 +193,7 @@ func experimentalConvertCompressedLottieToCombinedMp4(data: Data, size: CGSize,
var deltaTime: Double = 0
var compressionTime: Double = 0
let decompressedData = TGGUnzipData(data, 2 * 1024 * 1024)
let decompressedData = TGGUnzipData(data, 1024 * 1024)
if let decompressedData = decompressedData, let player = LottieInstance(data: decompressedData, cacheKey: cacheKey) {
let endFrame = Int(player.frameCount)