Skip to content

Stream in background #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sxudan merged 2 commits into from
Mar 10, 2024
Merged

Stream in background #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9306c87
feat: Stream in background
sxudan Mar 10, 2024
9b31bff
Fix: Refactor
sxudan Mar 10, 2024
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
Binary file modified live-demo.xcworkspace/xcuserdata/xkal.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
30 changes: 22 additions & 8 deletions live-demo/Utils/StreamPublisher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class StreamPublisher: NSObject, AudioVideoDelegate {

var blankFrames: Data?


override init () {
super.init()
initFFmpeg()
Expand All @@ -71,10 +72,6 @@ class StreamPublisher: NSObject, AudioVideoDelegate {
if reasonValue == 1 {
blankFrames = Helper.createEmptyRGBAData(width: 1920, height: 1080)
isInBackground = true
if self.running {
self.videoTimer?.invalidate()
self.videoTimer = nil
}
}
}
}
Expand All @@ -84,9 +81,7 @@ class StreamPublisher: NSObject, AudioVideoDelegate {
print("AVCaptureSession interruption ended.")
isInBackground = false
blankFrames = nil
if self.running {
self.startTimer()
}
clearVideoBuffer()
}

// Remove observers when the view controller is deallocated
Expand Down Expand Up @@ -140,6 +135,12 @@ class StreamPublisher: NSObject, AudioVideoDelegate {
}
}

func clearVideoBuffer() {
self.videoBufferLock.lock()
self.videoDataBuffer.removeAll()
self.videoBufferLock.unlock()
}

func appendToAudioBuffer(data: Data) {
audioFeedThread.async {
// print("appending audio___")
Expand Down Expand Up @@ -189,7 +190,7 @@ class StreamPublisher: NSObject, AudioVideoDelegate {

private func startTimer() {
DispatchQueue.global().async {
self.videoTimer = Timer.scheduledTimer(timeInterval: 0.005, target: self, selector: #selector(self.feedToVideoPipe), userInfo: nil, repeats: true)
self.videoTimer = Timer.scheduledTimer(timeInterval: 0.005, target: self, selector: #selector(self.handleFeed), userInfo: nil, repeats: true)
RunLoop.current.add(self.videoTimer!, forMode: .default)
RunLoop.current.run()
}
Expand All @@ -202,6 +203,19 @@ class StreamPublisher: NSObject, AudioVideoDelegate {
audioTimer = nil
}


@objc func handleFeed() {
if isInBackground {
self.appendToVideoBuffer(data: self.blankFrames!)
if self.videoDataBuffer.count > 10*1000000 {
print("Flushing....")
self.feedToVideoPipe()
}
} else {
feedToVideoPipe()
}
}

/// Not using anymore
@objc func mux() {
feedToVideoPipe()
Expand Down