moving VIM-3844 changes into this PR since a lot has changed and ther…

…e will be merge conflicts
vimeo · Mar 31, 2016 · c68a0a6 · c68a0a6
1 parent 3cf3924
commit c68a0a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/VimeoUpload/Upload/Operations/Async/ExportOperation.swift b/VimeoUpload/Upload/Operations/Async/ExportOperation.swift
@@ -52,7 +52,7 @@ class ExportOperation: ConcurrentOperation
 
     convenience init(asset: AVAsset)
     {
-        let exportSession = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetHighestQuality)!
+        let exportSession = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetPassthrough)!
 
         self.init(exportSession: exportSession)
     }
@@ -115,7 +115,8 @@ class ExportOperation: ConcurrentOperation
         }
 
         // AVAssetExportSession does not do an internal check to see if there's ample disk space available to perform the export [AH] 12/06/2015
-
+        // However this check will not work with presetName "passthrough" since that preset reports estimatedOutputFileLength of zero always.
+
         let availableDiskSpace = try? NSFileManager.defaultManager().availableDiskSpace() // Double optional
         if let diskSpace = availableDiskSpace, let space = diskSpace where space.longLongValue < self.exportSession.estimatedOutputFileLength
         {

diff --git a/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift b/VimeoUpload/Upload/Operations/Async/iOS8/PHAssetExportSessionOperation.swift
@@ -46,7 +46,7 @@ class PHAssetExportSessionOperation: ConcurrentOperation
         self.cleanup()
     }
 
-    init(phAsset: PHAsset, exportPreset: String = AVAssetExportPresetHighestQuality)
+    init(phAsset: PHAsset, exportPreset: String = AVAssetExportPresetPassthrough)
     {
         self.phAsset = phAsset
         self.exportPreset = exportPreset