From dd4584c8b3c67006dac3c358ffbfd091d83c1650 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 3 Jul 2019 01:58:43 +0300 Subject: [PATCH] Use LZFSE compression --- submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift | 4 ++-- submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift | 4 ++-- .../TelegramUI/TelegramUI/CachedResourceRepresentations.swift | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift b/submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift index 6e9be9bb31..bb5986a994 100644 --- a/submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift +++ b/submodules/TelegramUI/TelegramUI/AnimatedStickerNode.swift @@ -108,7 +108,7 @@ private final class AnimatedStickerCachedFrameSource: AnimatedStickerFrameSource init?(queue: Queue, data: Data) { self.queue = queue self.data = data - self.scratchBuffer = Data(count: compression_decode_scratch_buffer_size(COMPRESSION_LZ4)) + self.scratchBuffer = Data(count: compression_decode_scratch_buffer_size(COMPRESSION_LZFSE)) var offset = 0 var width = 0 @@ -170,7 +170,7 @@ private final class AnimatedStickerCachedFrameSource: AnimatedStickerFrameSource self.scratchBuffer.withUnsafeMutableBytes { (scratchBytes: UnsafeMutablePointer) -> Void in self.decodeBuffer.withUnsafeMutableBytes { (decodeBytes: UnsafeMutablePointer) -> Void in self.frameBuffer.withUnsafeMutableBytes { (frameBytes: UnsafeMutablePointer) -> Void in - compression_decode_buffer(decodeBytes, decodeBufferLength, bytes.advanced(by: self.offset), Int(frameLength), UnsafeMutableRawPointer(scratchBytes), COMPRESSION_LZ4) + compression_decode_buffer(decodeBytes, decodeBufferLength, bytes.advanced(by: self.offset), Int(frameLength), UnsafeMutableRawPointer(scratchBytes), COMPRESSION_LZFSE) var lhs = UnsafeMutableRawPointer(frameBytes).assumingMemoryBound(to: UInt64.self) var rhs = UnsafeRawPointer(decodeBytes).assumingMemoryBound(to: UInt64.self) diff --git a/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift b/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift index 02ed7fa9f8..8ef4d1e800 100644 --- a/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift +++ b/submodules/TelegramUI/TelegramUI/AnimatedStickerUtils.swift @@ -244,7 +244,7 @@ func experimentalConvertCompressedLottieToCombinedMp4(data: Data, size: CGSize, var compressedFrameData = Data(count: frameLength) let compressedFrameDataLength = compressedFrameData.count - let scratchData = malloc(compression_encode_scratch_buffer_size(COMPRESSION_LZ4))! + let scratchData = malloc(compression_encode_scratch_buffer_size(COMPRESSION_LZFSE))! defer { free(scratchData) } @@ -278,7 +278,7 @@ func experimentalConvertCompressedLottieToCombinedMp4(data: Data, size: CGSize, drawingTime += CACurrentMediaTime() - drawStartTime compressedFrameData.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer) -> Void in - let length = compression_encode_buffer(bytes, compressedFrameDataLength, previousYuvaFrameData.assumingMemoryBound(to: UInt8.self), yuvaLength, scratchData, COMPRESSION_LZ4) + let length = compression_encode_buffer(bytes, compressedFrameDataLength, previousYuvaFrameData.assumingMemoryBound(to: UInt8.self), yuvaLength, scratchData, COMPRESSION_LZFSE) var frameLengthValue: Int32 = Int32(length) let _ = fileContext.write(&frameLengthValue, count: 4) let _ = fileContext.write(bytes, count: length) diff --git a/submodules/TelegramUI/TelegramUI/CachedResourceRepresentations.swift b/submodules/TelegramUI/TelegramUI/CachedResourceRepresentations.swift index 211e2fc57a..bd03f1b2bd 100644 --- a/submodules/TelegramUI/TelegramUI/CachedResourceRepresentations.swift +++ b/submodules/TelegramUI/TelegramUI/CachedResourceRepresentations.swift @@ -271,7 +271,7 @@ final class CachedAnimatedStickerRepresentation: CachedMediaResourceRepresentati let height: Int32 var uniqueId: String { - return "animated-sticker-\(self.width)x\(self.height)-v4" + return "animated-sticker-\(self.width)x\(self.height)-v5" } init(width: Int32, height: Int32) {