From d9d6c066ee61a9e20121ad31e62dd104c2044ca2 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 29 Oct 2024 11:44:46 +0000
Subject: [PATCH] Switch to optimised video uploads to 720p (#3462)

---
 .../Media/MediaUploadingPreprocessor.swift         |  2 +-
 .../Sources/MediaUploadingPreprocessorTests.swift  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift b/ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
index 9a9b0bcef..2c77e549f 100644
--- a/ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
+++ b/ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
@@ -389,7 +389,7 @@ struct MediaUploadingPreprocessor {
     /// - Returns: the URL for the resulting video and its media info as a `VideoProcessingResult`
     private func convertVideoToMP4(_ url: URL, targetFileSize: UInt = 0) async throws(MediaUploadingPreprocessorError) -> VideoProcessingInfo {
         let asset = AVURLAsset(url: url)
-        let presetName = appSettings.optimizeMediaUploads ? AVAssetExportPreset640x480 : AVAssetExportPreset1920x1080
+        let presetName = appSettings.optimizeMediaUploads ? AVAssetExportPreset1280x720 : AVAssetExportPreset1920x1080
 
         guard let exportSession = AVAssetExportSession(asset: asset, presetName: presetName) else {
             throw .failedConvertingVideo
diff --git a/UnitTests/Sources/MediaUploadingPreprocessorTests.swift b/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
index a9aa74bd5..f8742fca4 100644
--- a/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
+++ b/UnitTests/Sources/MediaUploadingPreprocessorTests.swift
@@ -101,10 +101,10 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
         
         // Check optimised video info
         XCTAssertEqual(optimizedVideoInfo.mimetype, "video/mp4")
-        XCTAssertEqual(optimizedVideoInfo.blurhash, "K32PJbx^I7jYaebHMvV?o$")
-        XCTAssertEqual(optimizedVideoInfo.size ?? 0, 4_090_898, accuracy: 100) // Note: This is slightly stupid because it is larger now 🤦‍♂️
-        XCTAssertEqual(optimizedVideoInfo.width, 640)
-        XCTAssertEqual(optimizedVideoInfo.height, 360)
+        XCTAssertEqual(optimizedVideoInfo.blurhash, "K22PJZx^DgadWAbbMuRio$")
+        XCTAssertEqual(optimizedVideoInfo.size ?? 0, 1_431_959, accuracy: 100) // Note: This is slightly stupid because it is larger now 🤦‍♂️
+        XCTAssertEqual(optimizedVideoInfo.width, 1280)
+        XCTAssertEqual(optimizedVideoInfo.height, 720)
         XCTAssertEqual(optimizedVideoInfo.duration ?? 0, 30, accuracy: 100)
     }
 
@@ -165,9 +165,9 @@ final class MediaUploadingPreprocessorTests: XCTestCase {
         // Check optimised video info
         XCTAssertEqual(optimizedVideoInfo.mimetype, "video/mp4")
         XCTAssertEqual(optimizedVideoInfo.blurhash, "K7BDNJD*0L%#sl_2~C9ZE1")
-        XCTAssertEqual(optimizedVideoInfo.size ?? 0, 6_520_897, accuracy: 100)
-        XCTAssertEqual(optimizedVideoInfo.width, 360)
-        XCTAssertEqual(optimizedVideoInfo.height, 640)
+        XCTAssertEqual(optimizedVideoInfo.size ?? 0, 21_936_767, accuracy: 100)
+        XCTAssertEqual(optimizedVideoInfo.width, 720)
+        XCTAssertEqual(optimizedVideoInfo.height, 1280)
         XCTAssertEqual(optimizedVideoInfo.duration ?? 0, 30, accuracy: 100)
     }