From 719b53248010b9ab8bd0baba6a489ff004632dfa Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 2 Jul 2023 19:26:48 +0200 Subject: [PATCH] Various fixes --- .../MediaEditor/Sources/MediaEditorVideoExport.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift index 0b0ef2fc7d..257d658c83 100644 --- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift +++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift @@ -327,7 +327,11 @@ public final class MediaEditorVideoExport { self.durationValue = trimmedVideoDuration } else { asset.loadValuesAsynchronously(forKeys: ["tracks", "duration"]) { - self.durationValue = asset.duration + if asset.duration.seconds > 60.0 { + self.durationValue = CMTime(seconds: 60.0, preferredTimescale: CMTimeScale(NSEC_PER_SEC)) + } else { + self.durationValue = asset.duration + } } } } else { @@ -373,6 +377,10 @@ public final class MediaEditorVideoExport { if let timeRange = self.configuration.timeRange { reader.timeRange = timeRange self.additionalReader?.timeRange = timeRange + } else if asset.duration.seconds > 60.0 { + let trimmedRange = CMTimeRange(start: CMTime(seconds: 0.0, preferredTimescale: CMTimeScale(NSEC_PER_SEC)), end: CMTime(seconds: 60.0, preferredTimescale: CMTimeScale(NSEC_PER_SEC))) + reader.timeRange = trimmedRange + self.additionalReader?.timeRange = trimmedRange } self.writer = MediaEditorVideoAVAssetWriter()