fix: handle edge case where input is standard but rescaling still nec…

…essary
muxinc · May 24, 2024 · a9cb4d6 · a9cb4d6
1 parent f421564
commit a9cb4d6
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 19 deletions.
diff --git a/Sources/MuxUploadSDK/InputInspection/UploadInputFormatInspectionResult.swift b/Sources/MuxUploadSDK/InputInspection/UploadInputFormatInspectionResult.swift
@@ -20,13 +20,42 @@ struct UploadInputFormatInspectionResult {
         case unsupportedPixelFormat
     }
 
-    var nonStandardInputReasons: [NonstandardInputReason]
+    var nonStandardInputReasons: [NonstandardInputReason] = []
 
     var isStandardInput: Bool {
         nonStandardInputReasons.isEmpty
     }
 
-    var maximumResolution: DirectUploadOptions.InputStandardization.MaximumResolution
+    struct RescalingDetails {
+        var maximumDesiredResolutionPreset: DirectUploadOptions.InputStandardization.MaximumResolution = .default
+
+        var recordedResolution: CMVideoDimensions = CMVideoDimensions(width: 0, height: 0)
+
+        var needsRescaling: Bool {
+            switch maximumDesiredResolutionPreset {
+            case .default, .preset1920x1080:
+                if max(recordedResolution.width, recordedResolution.height) > 1920 {
+                    return true
+                } else {
+                    return false
+                }
+            case .preset1280x720:
+                if max(recordedResolution.width, recordedResolution.height) > 1280 {
+                    return true
+                } else {
+                    return false
+                }
+            case .preset3840x2160:
+                if max(recordedResolution.width, recordedResolution.height) > 3840 {
+                    return true
+                } else {
+                    return false
+                }
+            }
+        }
+    }
+
+    var rescalingDetails: RescalingDetails = RescalingDetails()
 }
 
 extension UploadInputFormatInspectionResult.NonstandardInputReason: CustomStringConvertible {

diff --git a/Sources/MuxUploadSDK/InputInspection/UploadInputInspector.swift b/Sources/MuxUploadSDK/InputInspection/UploadInputInspector.swift
@@ -91,10 +91,7 @@ class AVFoundationUploadInputInspector: UploadInputInspector {
             // Nothing to inspect, therefore nothing to standardize
             // declare as already standard
             completionHandler(
-                UploadInputFormatInspectionResult(
-                    nonStandardInputReasons: [],
-                    maximumResolution: maximumResolution
-                ),
+                UploadInputFormatInspectionResult(),
                 CMTime.zero,
                 nil
             )
@@ -157,8 +154,11 @@ class AVFoundationUploadInputInspector: UploadInputInspector {
                         if nonStandardReasons.isEmpty {
                             completionHandler(
                                 UploadInputFormatInspectionResult(
-                                    nonStandardInputReasons: [],
-                                    maximumResolution: maximumResolution
+                                    nonStandardInputReasons: nonStandardReasons,
+                                    rescalingDetails: UploadInputFormatInspectionResult.RescalingDetails(
+                                        maximumDesiredResolutionPreset: maximumResolution,
+                                        recordedResolution: videoDimensions
+                                    )
                                 ),
                                 sourceInputDuration,
                                 nil
@@ -167,7 +167,10 @@ class AVFoundationUploadInputInspector: UploadInputInspector {
                             completionHandler(
                                 UploadInputFormatInspectionResult(
                                     nonStandardInputReasons: [],
-                                    maximumResolution: maximumResolution
+                                    rescalingDetails: UploadInputFormatInspectionResult.RescalingDetails(
+                                        maximumDesiredResolutionPreset: maximumResolution,
+                                        recordedResolution: videoDimensions
+                                    )
                                 ),
                                 sourceInputDuration,
                                 nil

diff --git a/Sources/MuxUploadSDK/InputStandardization/UploadInputStandardizationWorker.swift b/Sources/MuxUploadSDK/InputStandardization/UploadInputStandardizationWorker.swift
@@ -43,7 +43,7 @@ class UploadInputStandardizationWorker {
 
     func standardize(
         sourceAsset: AVAsset,
-        maximumResolution: DirectUploadOptions.InputStandardization.MaximumResolution,
+        rescalingDetails: UploadInputFormatInspectionResult.RescalingDetails,
         outputURL: URL,
         completion: @escaping (AVAsset, AVAsset?, Error?) -> ()
     ) {
@@ -52,7 +52,7 @@ class UploadInputStandardizationWorker {
 
         let exportPreset: String
 
-        switch maximumResolution {
+        switch rescalingDetails.maximumDesiredResolutionPreset {
         case .default:
             exportPreset = AVAssetExportPreset1920x1080
         case .preset1280x720:

diff --git a/Sources/MuxUploadSDK/InputStandardization/UploadInputStandardizer.swift b/Sources/MuxUploadSDK/InputStandardization/UploadInputStandardizer.swift
@@ -11,15 +11,15 @@ class UploadInputStandardizer {
     func standardize(
         id: String,
         sourceAsset: AVAsset,
-        maximumResolution: DirectUploadOptions.InputStandardization.MaximumResolution,
+        rescalingDetails: UploadInputFormatInspectionResult.RescalingDetails,
         outputURL: URL,
         completion: @escaping (AVAsset, AVAsset?, Error?) -> ()
     ) {
         let worker = UploadInputStandardizationWorker()
 
         worker.standardize(
             sourceAsset: sourceAsset,
-            maximumResolution: maximumResolution,
+            rescalingDetails: rescalingDetails,
             outputURL: outputURL,
             completion: completion
         )

diff --git a/Sources/MuxUploadSDK/PublicAPI/DirectUpload.swift b/Sources/MuxUploadSDK/PublicAPI/DirectUpload.swift
@@ -487,9 +487,59 @@ public final class DirectUpload {
                     )
                 case (.some(let result), .none):
                     if result.isStandardInput {
-                        self.startNetworkTransport(
-                            videoFile: videoFile
-                        )
+
+                        if result.rescalingDetails.needsRescaling {
+                            SDKLogger.logger?.debug(
+                                "Detected Input Needs Rescaling"
+                            )
+
+                            // TODO: inject Date() for testing purposes
+                            let outputFileName = "upload-\(Date().timeIntervalSince1970)"
+
+                            let outputDirectory = FileManager.default.temporaryDirectory
+                            let outputURL = URL(
+                                fileURLWithPath: outputFileName,
+                                relativeTo: outputDirectory
+                            )
+
+                            self.inputStandardizer.standardize(
+                                id: self.id,
+                                sourceAsset: AVAsset(url: videoFile),
+                                rescalingDetails: result.rescalingDetails,
+                                outputURL: outputURL
+                            ) { sourceAsset, standardizedAsset, error in
+
+                                if let error {
+                                    // Request upload confirmation
+                                    // before proceeding. If handler unset,
+                                    // by default do not cancel upload if
+                                    // input standardization fails
+                                    let shouldCancelUpload = self.nonStandardInputHandler?() ?? false
+
+                                    if !shouldCancelUpload {
+                                        self.startNetworkTransport(
+                                            videoFile: videoFile
+                                        )
+                                    } else {
+                                        self.fileWorker?.cancel()
+                                        self.uploadManager.acknowledgeUpload(id: self.id)
+                                        self.input.processUploadCancellation()
+                                    }
+                                } else {
+                                    self.startNetworkTransport(
+                                        videoFile: outputURL,
+                                        duration: inputDuration
+                                    )
+                                }
+
+                                self.inputStandardizer.acknowledgeCompletion(id: self.id)
+                            }
+
+                        } else {
+                            self.startNetworkTransport(
+                                videoFile: videoFile
+                            )
+                        }
                     } else {
                         SDKLogger.logger?.debug(
                             """
@@ -512,7 +562,7 @@ public final class DirectUpload {
                         self.inputStandardizer.standardize(
                             id: self.id,
                             sourceAsset: AVAsset(url: videoFile),
-                            maximumResolution: result.maximumResolution,
+                            rescalingDetails: result.rescalingDetails,
                             outputURL: outputURL
                         ) { sourceAsset, standardizedAsset, error in
 

diff --git a/Tests/MuxUploadSDKTests/Helpers/MockUploadInputInspector.swift b/Tests/MuxUploadSDKTests/Helpers/MockUploadInputInspector.swift
@@ -14,7 +14,7 @@ class MockUploadInputInspector: UploadInputInspector {
     static let alwaysFailing: MockUploadInputInspector = MockUploadInputInspector(
         mockInspectionResult: UploadInputFormatInspectionResult(
             nonStandardInputReasons: [],
-            maximumResolution: .default
+            rescalingDetails: .init()
         ),
         mockInspectionError: UploadInputInspectionError.inspectionFailure
     )
@@ -26,7 +26,7 @@ class MockUploadInputInspector: UploadInputInspector {
     init() {
         self.mockInspectionResult = UploadInputFormatInspectionResult(
             nonStandardInputReasons: [],
-            maximumResolution: .default
+            rescalingDetails: .init()
         )
         self.duration = .zero
     }