implemented export modified video issue #337 #339
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ import AVKit | |
|
|
||
| protocol CropSettings { | ||
| var dimensions: (width: Int, height: Int)? { get } | ||
| var trackPreferredTransform: CGAffineTransform? { get } | ||
| var crop: CropRect? { get } | ||
| } | ||
|
|
||
|
|
@@ -15,27 +16,35 @@ extension CropSettings { | |
| If the rect parameter defines an area that is not in the image, it returns nil: https://developer.apple.com/documentation/coregraphics/cgimage/1454683-cropping | ||
| */ | ||
| func croppedImage(image: CGImage) -> CGImage? { | ||
| guard crop != nil else { | ||
| return image | ||
| } | ||
| let transformedCrop = unormalziedCropFor(sizeInPreferredTransformationSpace: .init(width: image.width, height: image.height)) | ||
| return image.cropping(to: transformedCrop) | ||
| } | ||
|
|
||
| func unormalziedCropFor(sizeInPreferredTransformationSpace prefferedSize: CGSize) -> CGRect { | ||
| let cropRect = crop ?? .initialCropRect | ||
| guard let trackPreferredTransform else { | ||
| return cropRect.unnormalize(forDimensions: prefferedSize) | ||
| } | ||
| let origninalSize = CGRect(origin: .zero, size: prefferedSize) | ||
| .applying(trackPreferredTransform.inverted()).size | ||
| let originalCropSize = cropRect.unnormalize(forDimensions: origninalSize) | ||
| return originalCropSize.applying(trackPreferredTransform) | ||
| } | ||
|
|
||
| var croppedOutputDimensions: (width: Int, height: Int)? { | ||
| guard crop != nil else { | ||
| return dimensions | ||
| } | ||
|
|
||
| guard let dimensions else { | ||
| return nil | ||
| } | ||
|
|
||
| let outputDimensions = unormalziedCropFor(sizeInPreferredTransformationSpace: .init(width: dimensions.width, height: dimensions.height)) | ||
| return (outputDimensions.width.toIntAndClampingIfNeeded, | ||
| outputDimensions.height.toIntAndClampingIfNeeded) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,7 @@ private struct _EditScreen: View { | |
| @State private var url: URL | ||
| @State private var asset: AVAsset | ||
| @State private var modifiedAsset: AVAsset | ||
| @State private var modifiedAssetTimeRange: CMTimeRange? | ||
| @State private var metadata: AVAsset.VideoMetadata | ||
| @State private var estimatedFileSizeModel = EstimatedFileSizeModel() | ||
| @State private var timeRange: ClosedRange<Double>? | ||
|
|
@@ -54,6 +55,8 @@ private struct _EditScreen: View { | |
| @State private var fullPreviewDebouncer = Debouncer(delay: .milliseconds(200)) | ||
|
|
||
| @Binding private var outputCropRect: CropRect | ||
| @State private var exportModifiedVideoState = ExportModifiedVideoState.idle | ||
| @State private var isExportModifiedVideoAudioWarningPresented = false | ||
| private var overlay: NSView | ||
| private let fullPreviewStream: FullPreviewStream | ||
|
|
||
|
|
@@ -79,6 +82,11 @@ private struct _EditScreen: View { | |
| trimmingAVPlayer | ||
| controls | ||
| bottomBar | ||
| ExportModifiedVideoView( | ||
| state: $exportModifiedVideoState, | ||
| sourceURL: url, | ||
| isAudioWarningPresented: $isExportModifiedVideoAudioWarningPresented | ||
| ) | ||
| } | ||
| .background(.ultraThickMaterial) | ||
| .navigationTitle(url.lastPathComponent) | ||
|
|
@@ -160,6 +168,19 @@ private struct _EditScreen: View { | |
| .opacity(shouldShow ? 1 : 0) | ||
| .onAppear { | ||
| setUp() | ||
| appState.onExportAsVideo = onExportAsVideo | ||
| } | ||
| .onDisappear { | ||
| appState.onExportAsVideo = nil | ||
|
|
||
| switch exportModifiedVideoState { | ||
| case .idle: | ||
| break | ||
| case .exporting(let task, _): | ||
| task.cancel() | ||
| case .finished(let url): | ||
| try? FileManager.default.removeItem(at: url) | ||
| } | ||
| } | ||
| .task { | ||
| try? await Task.sleep(for: .seconds(0.3)) | ||
|
|
@@ -175,6 +196,44 @@ private struct _EditScreen: View { | |
| } | ||
| } | ||
|
|
||
| private func onExportAsVideo() { | ||
| switch exportModifiedVideoState { | ||
| case .idle: | ||
| break | ||
| case .exporting, .finished: | ||
| // If another alert (like bounce warning) occurs when you activate this callback, the `fileExporter` modifier won't show and the state will be stuck on `.finished`. By reassigning the state this will force a swiftUI draw and bring up the file exporter. | ||
| exportModifiedVideoState = exportModifiedVideoState | ||
| return | ||
| } | ||
|
|
||
| if metadata.hasAudio { | ||
| SSApp.runOnce(identifier: "audioTrackExportWarning") { | ||
| isExportModifiedVideoAudioWarningPresented = true | ||
| } | ||
| } | ||
|
|
||
| exportModifiedVideoState = .exporting( | ||
| Task { | ||
| do { | ||
| let outputURL = try await exportModifiedVideo(conversion: conversionSettings) | ||
| try await MainActor.run { | ||
| try Task.checkCancellation() | ||
| exportModifiedVideoState = .finished(outputURL) | ||
| } | ||
| } catch { | ||
| if Task.isCancelled || error.isCancelled { | ||
| return | ||
| } | ||
| await MainActor.run { | ||
| exportModifiedVideoState = .idle | ||
| appState.error = error | ||
| } | ||
| } | ||
| }, | ||
| videoIsOverTwentySeconds: conversionSettings.gifDuration(assetTimeRange: modifiedAssetTimeRange) > .seconds(20) | ||
| ) | ||
| } | ||
|
|
||
| private func updatePreviewOnSettingsChange() { | ||
| guard appState.mode != .editCrop else { | ||
| return | ||
|
|
@@ -203,6 +262,7 @@ private struct _EditScreen: View { | |
|
|
||
| let changedSpeedAsset = try await asset.firstVideoTrack?.extractToNewAssetAndChangeSpeed(to: Defaults[.outputSpeed]) ?? modifiedAsset | ||
| modifiedAsset = try await PreviewableComposition(extractPreviewableCompositionFrom: changedSpeedAsset) | ||
| modifiedAssetTimeRange = try await changedSpeedAsset.firstVideoTrack?.load(.timeRange) | ||
|
|
||
| estimatedFileSizeModel.updateEstimate() | ||
| updatePreviewOnSettingsChange() | ||
|
|
@@ -317,7 +377,8 @@ private struct _EditScreen: View { | |
| return .forever | ||
| }(), | ||
| bounce: bounceGIF, | ||
| crop: outputCropRect, | ||
| trackPreferredTransform: metadata.trackPreferredTransform | ||
| ) | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.