ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 01:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rare bug in sent video dimensions calculation

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-03-01 19:03:46 +04:00
parent 612f5eeef1
commit 0ce318b205
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/Sources/AVURLAsset+TGMediaItem.m
View File

@ -17,7 +17,7 @@
- (CGSize)originalSize - (CGSize)originalSize
{ {
AVAssetTrack *track = self.tracks.firstObject; AVAssetTrack *track = [self tracksWithMediaType:AVMediaTypeVideo].firstObject;
return CGRectApplyAffineTransform((CGRect){ CGPointZero, track.naturalSize }, track.preferredTransform).size; return CGRectApplyAffineTransform((CGRect){ CGPointZero, track.naturalSize }, track.preferredTransform).size;
} }

12
submodules/ShareItems/Sources/ShareItems.swift
View File

@ -110,6 +110,17 @@ private func preparedShareItem(account: Account, to peerId: PeerId, value: [Stri
} }
var finalDuration: Double = CMTimeGetSeconds(asset.duration) var finalDuration: Double = CMTimeGetSeconds(asset.duration)
func loadValues(_ avAsset: AVURLAsset) -> Signal<AVURLAsset, Void> {
return Signal { subscriber in
avAsset.loadValuesAsynchronously(forKeys: ["tracks", "duration", "playable"]) {
subscriber.putNext(avAsset)
}
return EmptyDisposable
}
}
return loadValues(asset)
|> mapToSignal { asset -> Signal<PreparedShareItem, Void> in
let preset = adjustments?.preset ?? TGMediaVideoConversionPresetCompressedMedium let preset = adjustments?.preset ?? TGMediaVideoConversionPresetCompressedMedium
let finalDimensions = TGMediaVideoConverter.dimensions(for: asset.originalSize, adjustments: adjustments, preset: preset) let finalDimensions = TGMediaVideoConverter.dimensions(for: asset.originalSize, adjustments: adjustments, preset: preset)
@ -139,6 +150,7 @@ private func preparedShareItem(account: Account, to peerId: PeerId, value: [Stri
return .single(.done(.media(media))) return .single(.done(.media(media)))
} }
} }
}
} else if let data = value["data"] as? Data { } else if let data = value["data"] as? Data {
let fileName = value["fileName"] as? String let fileName = value["fileName"] as? String
let mimeType = (value["mimeType"] as? String) ?? "application/octet-stream" let mimeType = (value["mimeType"] as? String) ?? "application/octet-stream"