Skip to content
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

Jump to bottom

Minor VideoView optimization #492

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Minor VideoView optimization #492

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8979088
add/remove video renderer not on main
hiroshihorie Sep 22, 2024
6531440
Merge branch 'main' into hiroshi/change-add-remove-videorenderer
hiroshihorie Sep 23, 2024
85796b7
Merge branch 'main' into hiroshi/change-add-remove-videorenderer
hiroshihorie Sep 29, 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
46 changes: 25 additions & 21 deletions Sources/LiveKit/Views/VideoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,42 +270,39 @@ public class VideoView: NativeView, Loggable {

let shouldRenderDidUpdate = newState.shouldRender != oldState.shouldRender
let renderModeDidUpdate = newState.renderMode != oldState.renderMode

// track was swapped
let trackDidUpdate = !Self.track(oldState.track as? VideoTrack, isEqualWith: newState.track as? VideoTrack)

// Enter .main only if the following conditions are met...
if trackDidUpdate || shouldRenderDidUpdate {
// Handle track removal outside of main queue
if let track = oldState.track as? VideoTrack {
track.remove(videoRenderer: self)
}
}

// Enter .main only if UI updates are required
if trackDidUpdate || shouldRenderDidUpdate || renderModeDidUpdate {
// Execute on main thread
self.mainSyncOrAsync {
var didReCreateNativeRenderer = false

if trackDidUpdate || shouldRenderDidUpdate {
// clean up old track
if let track = oldState.track as? VideoTrack {
track.remove(videoRenderer: self)

if let r = self._primaryRenderer {
r.removeFromSuperview()
self._primaryRenderer = nil
}
// Clean up old renderers
if let r = self._primaryRenderer {
r.removeFromSuperview()
self._primaryRenderer = nil
}

if let r = self._secondaryRenderer {
r.removeFromSuperview()
self._secondaryRenderer = nil
}
if let r = self._secondaryRenderer {
r.removeFromSuperview()
self._secondaryRenderer = nil
}

// set new track
// Set up new renderer if needed
if let track = newState.track as? VideoTrack, newState.shouldRender {
// re-create renderer on main thread
let nr = self.recreatePrimaryRenderer(for: newState.renderMode)
didReCreateNativeRenderer = true

track.add(videoRenderer: self)

if let frame = track._state.videoFrame {
self.log("rendering cached frame tack: \(String(describing: track._state.sid))")
self.log("rendering cached frame track: \(String(describing: track._state.sid))")
nr.renderFrame(frame.toRTCType())
self.setNeedsLayout()
}
Expand All @@ -318,6 +315,13 @@ public class VideoView: NativeView, Loggable {
}
}

// Handle track addition outside of main queue
if trackDidUpdate || shouldRenderDidUpdate {
if let track = newState.track as? VideoTrack, newState.shouldRender {
track.add(videoRenderer: self)
}
}

// isRendering updated
if newState.isRendering != oldState.isRendering {
self.log("isRendering \(oldState.isRendering) -> \(newState.isRendering)")
Expand Down