Skip to content

Commit 1d60d7b

Browse files
JonovonoJonovono
committed
Change file location
1 parent eee0ec2 commit 1d60d7b

File tree

6 files changed

+102
-50
lines changed

6 files changed

+102
-50
lines changed

‎Examples/CLIExample/index.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ import VideoViews
118118
@main
119119
enum CLIExample {
120120
static func main() async throws {
121-
print("huhu")
122121
let recorder = createStreamUIRecorder(
123122
fps: 30,
124123
width: 1080,

‎README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11

22
# 〜StreamUI [BETA!]
33

4-
[![Discord](https://img.shields.io/discord/1071029581009657896?style=flat&logo=discord&logoColor=fff&color=404eed)](https://discord.gg/NpHj7brca4)
4+
[![Team Chat](https://design.vapor.codes/images/discordchat.svg)](https://discord.gg/NpHj7brca4)
5+
[![MIT License](https://design.vapor.codes/images/mitlicense.svg)](LICENSE)
6+
[![Swift 5.10+](https://design.vapor.codes/images/swift510up.svg)](https://swift.org)
7+
8+
9+
<!--[![Discord](https://img.shields.io/discord/1071029581009657896?style=flat&logo=discord&logoColor=fff&color=404eed)](https://discord.gg/NpHj7brca4)-->
510
<!--[![CI](https://github.com/pointfreeco/swift-clocks/workflows/CI/badge.svg)](https://github.com/pointfreeco/swift-clocks/actions?query=workflow%3ACI)-->
611
<!--[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fpointfreeco%2Fswift-clocks%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/pointfreeco/swift-clocks)-->
712
<!--[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fpointfreeco%2Fswift-clocks%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/pointfreeco/swift-clocks)-->
@@ -140,7 +145,9 @@ recorder.resumeRecording()
140145
await recorder.waitForRecordingCompletion()
141146
```
142147

143-
* **Video will automatically stop recording after the specified time**
148+
* **swift run** or build xcode
149+
150+
* **Video will automatically stop recording after the specified time and if specified will start live streaming!**
144151

145152

146153
## Supported SwiftUI Views

‎Sources/StreamUI/Helpers/RenderSettings.swift‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public struct LivestreamSettings {
2323
}
2424

2525
public struct RenderSettings {
26+
public var name: String
2627
public var width: Int
2728
public var height: Int
2829
public var fps: Int32
@@ -31,13 +32,18 @@ public struct RenderSettings {
3132

3233
public var avCodecKey = AVVideoCodecType.h264
3334
public var saveVideoFile: Bool
35+
3436
public var videoFilenameExt = "mp4"
37+
public var videosDirectoryURL: URL
3538
public var tempDirectoryURL: URL
39+
public var videoDirectoryURL: URL
40+
3641
public var videoFilename: String
3742

3843
public var livestreamSettings: [LivestreamSettings]?
3944

4045
public init(
46+
name: String = "streamui_video",
4147
width: Int,
4248
height: Int,
4349
fps: Int32,
@@ -46,6 +52,7 @@ public struct RenderSettings {
4652
saveVideoFile: Bool = true,
4753
livestreamSettings: [LivestreamSettings]?
4854
) {
55+
self.name = name
4956
self.width = width
5057
self.height = height
5158
self.fps = fps
@@ -54,21 +61,41 @@ public struct RenderSettings {
5461
self.livestreamSettings = livestreamSettings
5562
self.saveVideoFile = saveVideoFile
5663

57-
self.videoFilename = "stream_ui_video_\(UUID().uuidString)"
64+
// Generate a short timestamp
65+
let dateFormatter = DateFormatter()
66+
dateFormatter.dateFormat = "yyyyMMdd_HHmmss"
67+
let timestamp = dateFormatter.string(from: Date())
5868

59-
self.tempDirectoryURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
69+
// Create the video file name using the name and timestamp
70+
self.videoFilename = "\(name)_\(timestamp)"
71+
72+
// Get the app's container directory
73+
guard let containerURL = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first else {
74+
fatalError("Failed to get app container directory")
75+
}
76+
77+
// Create a "StreamUI" folder in the app's container
78+
let streamUIDirectoryURL = containerURL.appendingPathComponent("StreamUI", isDirectory: true)
79+
self.videosDirectoryURL = streamUIDirectoryURL.appendingPathComponent("videos", isDirectory: true)
80+
self.tempDirectoryURL = videosDirectoryURL.appendingPathComponent(".tmp", isDirectory: true)
81+
self.videoDirectoryURL = videosDirectoryURL.appendingPathComponent(name)
6082

6183
do {
84+
try FileManager.default.createDirectory(at: videosDirectoryURL, withIntermediateDirectories: true, attributes: nil)
6285
try FileManager.default.createDirectory(at: tempDirectoryURL, withIntermediateDirectories: true, attributes: nil)
86+
try FileManager.default.createDirectory(at: videoDirectoryURL, withIntermediateDirectories: true, attributes: nil)
6387
} catch {
64-
fatalError("Failed to create temporary directory: \(error)")
88+
print("failed")
89+
fatalError("Failed to create directories: \(error)")
6590
}
6691
}
6792

68-
var outputURL: URL? {
69-
let fileManager = FileManager.default
70-
let documents = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
71-
return documents.appendingPathComponent(videoFilename).appendingPathExtension(videoFilenameExt)
93+
var outputURL: URL {
94+
return videoDirectoryURL.appendingPathComponent(videoFilename).appendingPathExtension(videoFilenameExt)
95+
}
96+
97+
var tempOutputURL: URL {
98+
tempDirectoryURL.appendingPathComponent(videoFilename).appendingPathExtension(videoFilenameExt)
7299
}
73100

74101
func getDefaultBitrate() -> Int {

‎Sources/StreamUI/Helpers/createStreamUIRecorder.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,19 @@ public func createStreamUIRecorder<Content: View>(
2020
livestreamSettings: [LivestreamSettings]? = nil,
2121
@ViewBuilder content: @escaping () -> Content
2222
) -> Recorder {
23+
// Function to get the type name of the view
24+
func getTypeName(of view: Content) -> String {
25+
let mirror = Mirror(reflecting: view)
26+
return String(describing: mirror.subjectType)
27+
}
28+
29+
let view = content()
30+
let viewTypeName = getTypeName(of: view)
31+
32+
print("Type name", viewTypeName)
33+
2334
let renderSettings = RenderSettings(
35+
name: viewTypeName,
2436
width: Int(width),
2537
height: Int(height),
2638
fps: fps,
@@ -32,7 +44,7 @@ public func createStreamUIRecorder<Content: View>(
3244

3345
let recorder = Recorder(renderSettings: renderSettings)
3446

35-
let contentView = AnyView(content())
47+
let contentView = AnyView(view)
3648

3749
recorder.setRenderer(view: contentView)
3850

‎Sources/StreamUI/Recorders/Recorder.swift‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ public class Recorder {
6565
}
6666

6767
public func setupRecording() {
68-
let tempDirectoryURL = FileManager.default.temporaryDirectory
69-
let outputURL = tempDirectoryURL.appendingPathComponent(UUID().uuidString).appendingPathExtension("mp4")
7068
do {
71-
assetWriter = try AVAssetWriter(outputURL: outputURL, fileType: .mp4)
69+
assetWriter = try AVAssetWriter(outputURL: renderSettings.tempOutputURL, fileType: .mp4)
7270

7371
videoRecorder.setupVideoInput()
7472
audioRecorder.setupAudioInput()
@@ -130,14 +128,13 @@ public class Recorder {
130128
}
131129
}
132130

133-
func finishRecording() {
131+
func finishRecording() async {
134132
print("FINISH recording")
135133
guard state != .idle else { return }
136134

137135
audioRecorder.stopRecording()
138136

139-
finishWriting()
140-
recordingCompletionContinuation.continuation.finish()
137+
await finishWriting()
141138
state = .idle
142139
}
143140

@@ -169,25 +166,34 @@ public class Recorder {
169166

170167
public func waitForRecordingCompletion() async {
171168
for await _ in recordingCompletionContinuation.stream {}
172-
try? await Task.sleep(for: .seconds(1.0))
173169
}
174170

175-
private func finishWriting() {
176-
print("finish writing")
177-
if renderSettings.saveVideoFile {
178-
assetWriter?.finishWriting {
179-
print("Recording finished and saved to \(String(describing: self.assetWriter?.outputURL))")
180-
// DispatchQueue.main.async {
181-
// NSApplication.shared.terminate(nil)
182-
// }
183-
184-
if let outputURL = self.assetWriter?.outputURL, let duration = self.renderSettings.captureDuration {
185-
self.trimVideo(at: outputURL, to: duration) { trimmedURL in
186-
print("Recording finished and saved to \(String(describing: trimmedURL))")
187-
}
188-
}
171+
private func finishWriting() async {
172+
print("Finish writing")
173+
guard renderSettings.saveVideoFile else {
174+
recordingCompletionContinuation.continuation.finish()
175+
return
176+
}
177+
178+
await assetWriter?.finishWriting()
179+
180+
guard let tempOutputURL = assetWriter?.outputURL else {
181+
print("No output URL available")
182+
recordingCompletionContinuation.continuation.finish()
183+
return
184+
}
185+
186+
if let outputURL = assetWriter?.outputURL, let duration = renderSettings.captureDuration {
187+
if let trimmedURL = await trimVideo(at: outputURL, to: duration) {
188+
print("Recording trimmed and saved to \(trimmedURL)")
189+
try? FileManager.default.removeItem(at: tempOutputURL)
189190
}
191+
} else {
192+
try? FileManager.default.moveItem(at: tempOutputURL, to: renderSettings.outputURL)
193+
print("Recording finished and saved to \(String(describing: assetWriter?.outputURL))")
190194
}
195+
196+
recordingCompletionContinuation.continuation.finish()
191197
}
192198

193199
// Audio
@@ -237,35 +243,36 @@ public class Recorder {
237243
}
238244
}
239245

240-
private func trimVideo(at url: URL, to duration: Duration, completion: @escaping (URL?) -> Void) {
246+
private func trimVideo(at url: URL, to duration: Duration) async -> URL? {
241247
let asset = AVAsset(url: url)
242248
let startTime = CMTime.zero
243249
let endTime = CMTime(seconds: Double(duration.components.seconds), preferredTimescale: 600)
244250

245251
guard let exportSession = AVAssetExportSession(asset: asset, presetName: AVAssetExportPresetHighestQuality) else {
246252
print("Failed to create export session")
247-
completion(nil)
248-
return
253+
return nil
249254
}
250255

251-
let trimmedOutputURL = url.deletingLastPathComponent().appendingPathComponent(UUID().uuidString).appendingPathExtension("mp4")
256+
let trimmedOutputURL = renderSettings.outputURL
252257
exportSession.outputURL = trimmedOutputURL
253258
exportSession.outputFileType = .mp4
254259
exportSession.timeRange = CMTimeRange(start: startTime, end: endTime)
255260

256-
exportSession.exportAsynchronously {
257-
switch exportSession.status {
258-
case .completed:
259-
print("Trimming completed successfully")
260-
completion(trimmedOutputURL)
261-
case .failed:
262-
print("Trimming failed: \(String(describing: exportSession.error))")
263-
completion(nil)
264-
case .cancelled:
265-
print("Trimming cancelled")
266-
completion(nil)
267-
default:
268-
break
261+
return await withCheckedContinuation { continuation in
262+
exportSession.exportAsynchronously {
263+
switch exportSession.status {
264+
case .completed:
265+
print("Trimming completed successfully")
266+
continuation.resume(returning: trimmedOutputURL)
267+
case .failed:
268+
print("Trimming failed: \(String(describing: exportSession.error))")
269+
continuation.resume(returning: nil)
270+
case .cancelled:
271+
print("Trimming cancelled")
272+
continuation.resume(returning: nil)
273+
default:
274+
continuation.resume(returning: nil)
275+
}
269276
}
270277
}
271278
}

‎Sources/StreamUI/Recorders/VideoRecorder/VideoRecorder.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class VideoRecorder {
3232

3333
let compressionProperties: [String: Any] = [
3434
AVVideoAverageBitRateKey: renderSettings.getDefaultBitrate(),
35-
AVVideoMaxKeyFrameIntervalKey: renderSettings.getDefaultKeyframeInterval(), // Keyframe every 1 second at 30 fps
35+
AVVideoMaxKeyFrameIntervalKey: renderSettings.getDefaultKeyframeInterval(),
3636
AVVideoProfileLevelKey: AVVideoProfileLevelH264High41,
3737
AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC,
3838
AVVideoQualityKey: 0.85 // High quality (0.0 - 1.0)

0 commit comments

Comments
 (0)