Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions OpenParsec/NetworkHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class NetworkWatcher {
private var offline = false
private(set) var noNetwork = false
private var known = false
private var interface: NWInterface.InterfaceType?
private(set) var interfaceChanges = 0
private var waiting: [() -> Void] = []

var onReturn: (() -> Void)?
Expand All @@ -24,9 +26,16 @@ class NetworkWatcher {

monitor.pathUpdateHandler = { [weak self] path in
let status = path.status
let type = [NWInterface.InterfaceType.wifi, .cellular, .wiredEthernet].first { path.usesInterfaceType($0) }
DispatchQueue.main.async {
guard let self = self else { return }
self.noNetwork = status == .unsatisfied
if status == .satisfied, let type = type {
if let old = self.interface, old != type {
self.interfaceChanges += 1
}
self.interface = type
}
if !self.known {
self.known = true
let runs = self.waiting
Expand Down
56 changes: 56 additions & 0 deletions OpenParsec/ParsecBackgroundManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ class ParsecBackgroundManager {
var reconnectStartTime = Date()
var resumedAt: Date?
var isPaused = false
private var holdTask: UIBackgroundTaskIdentifier = .invalid
private var backgroundAt: Date?
private var endedInBackground = false
var onResumeEndedSession: (() -> Void)?
var onEndedInBackground: (() -> Void)?
var onNextFrame: (() -> Void)?
weak var glkViewController: RenderLoop?

var onShouldReconnect: ((String) -> Void)?
Expand Down Expand Up @@ -106,6 +112,55 @@ class ParsecBackgroundManager {
}
}

func holdSessionInBackground() {
guard holdTask == .invalid else { return }
backgroundAt = Date()
holdTask = UIApplication.shared.beginBackgroundTask(withName: "stream") { [weak self] in
self?.endSessionInBackground("background time ran out")
}
guard holdTask != .invalid else {
endSessionInBackground("no background time")
return
}
appNote("[background] holding stream")
}

private func endSessionInBackground(_ reason: String) {
if hasActiveConnection && !endedInBackground {
appNote("[background] \(reason), ending stream")
CParsec.disconnect()
isPaused = true
endedInBackground = true
onEndedInBackground?()
RunLoop.main.run(until: Date(timeIntervalSinceNow: 0.2))
for scene in UIApplication.shared.connectedScenes {
UIApplication.shared.requestSceneSessionRefresh(scene.session)
}
}
endHoldTask()
}

private func endHoldTask() {
guard holdTask != .invalid else { return }
UIApplication.shared.endBackgroundTask(holdTask)
holdTask = .invalid
}

func sceneWillEnterForeground() {
guard backgroundAt != nil else { return }
backgroundAt = nil
endHoldTask()
if endedInBackground {
endedInBackground = false
isPaused = false
appNote("[foreground] stream ended in the background")
glkViewController?.isPaused = false
onResumeEndedSession?()
} else if hasActiveConnection {
appNote("[foreground] stream held, resuming")
}
}

func markForReconnect() {
guard lastPeerId != nil else { return }
didDisconnectDueToBackground = true
Expand All @@ -114,6 +169,7 @@ class ParsecBackgroundManager {
func endSession() {
didDisconnectDueToBackground = false
endedByUser = true
endedInBackground = false
isReconnecting = false
reconnectAttempts = 0
resumeOnLaunch = false
Expand Down
4 changes: 4 additions & 0 deletions OpenParsec/ParsecMetalRenderer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ class ParsecMetalRenderer: NSObject, MTKViewDelegate {
}

fileprivate func upload(_ f: ParsecFrame, _ image: UnsafeRawPointer) {
if let next = ParsecBackgroundManager.shared.onNextFrame {
ParsecBackgroundManager.shared.onNextFrame = nil
next()
}
let w = Int(f.width), h = Int(f.height), stride = Int(f.fullWidth), rows = Int(f.fullHeight)
guard f.isWholeNV12 else { return }
let slot = (current + 1) % planes.count
Expand Down
1 change: 1 addition & 0 deletions OpenParsec/ParsecSDKBridge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class ParsecSDKBridge: ParsecService {
didSetResolution = false
ParsecClientDisconnect(_parsec)
audio_clear(&_audio)
audio_hold(false, _audioPtr)
ParsecBackgroundManager.shared.connectionDidEnd()
let status = connect(peerID)
if status != PARSEC_OK && status != PARSEC_CONNECTING {
Expand Down
Loading
Loading