ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1262 - Compute correct sizes for portrait videos (#1367)

Browse Source 
* Fixes #1262 - Compute correct sizes for portrait videos

* Add unit test

* Tweaks following code review
This commit is contained in:
Stefan Ceriu
2023-07-20 13:30:43 +03:00
committed by GitHub
parent 66eea98b33
commit 5f8efefe19
6 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
+25 -3
View File
@@ -416,13 +416,13 @@ struct MediaUploadingPreprocessor {
let newAsset = AVURLAsset(url: newOutputURL)
guard let track = try? await newAsset.loadTracks(withMediaType: .video).first,
let durationInSeconds = try? await newAsset.load(.duration).seconds,
let naturalSize = try? await track.load(.naturalSize) else {
let adjustedNaturalSize = try? await track.size else {
return .failure(.failedConvertingVideo)
}
return .success(.init(url: newOutputURL,
height: naturalSize.height,
width: naturalSize.width,
height: adjustedNaturalSize.height,
width: adjustedNaturalSize.width,
duration: durationInSeconds * 1000,
mimeType: "video/mp4"))
} catch {
@@ -433,3 +433,25 @@ struct MediaUploadingPreprocessor {
}
}
}
private extension AVAssetTrack {
var size: CGSize {
get async throws {
let naturalSize = try await load(.naturalSize)
guard mediaType == .video else {
return naturalSize
}
// The naturalSize does not take the preferredTransform into consideration resulting
// in portrait videos reporting inverted values.
let transform = try await load(.preferredTransform)
switch (transform.a, transform.b, transform.c, transform.d) {
case (0, 1, -1, 0), (0, -1, 1, 0):
return CGSize(width: naturalSize.height, height: naturalSize.width)
default:
return CGSize(width: naturalSize.width, height: naturalSize.height)
}
}
}
}