Skip to content

fix(macos): replay an HLS clip from its end without a spurious end #265

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

Open
comprido96 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(macos): replay an HLS clip from its end without a spurious end #265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions mediaplayer/src/jvmMain/native/macos/NativeVideoPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class MacVideoPlayer {

// End-of-playback flag (set by AVPlayerItemDidPlayToEndTime, consumed once by the Kotlin side)
private var didPlayToEnd: Bool = false
// Set when the item reaches its end, cleared when seekTo rebuilds it (not consumed by the Kotlin side)
private var reachedEnd: Bool = false
private var playbackEndObserver: NSObjectProtocol?

// HLS Error tracking
Expand Down Expand Up @@ -907,6 +909,7 @@ class MacVideoPlayer {
queue: nil
) { [weak self] _ in
self?.didPlayToEnd = true
self?.reachedEnd = true
}

// Configure player for HLS
Expand Down Expand Up @@ -1308,6 +1311,7 @@ class MacVideoPlayer {

/// Seeks to the specified time (in seconds).
func seekTo(time: Double) {
if isHLSStream && reachedEnd { reloadEndedItem() }
guard let player = player else { return }
let newTime = CMTime(seconds: time, preferredTimescale: 600)

Expand All @@ -1330,6 +1334,24 @@ class MacVideoPlayer {
}
}

/// Rebuilds the player on the same, already loaded asset once the HLS item has played to its end.
///
/// Seeked back from its end, an AVPlayerItem of an HLS VOD whose first segment carries no audio sample
/// (an fMP4 playlist with EXT-X-DISCONTINUITY between segments, where the camera records audio only
/// sparsely) plays that segment and then jumps to the end at the first discontinuity, every time. On first
/// play the same boundary goes through, and a fresh item from the same asset plays it through too.
private func reloadEndedItem() {
guard let asset = player?.currentItem?.asset else { return }
let composition = player?.currentItem?.videoComposition
reachedEnd = false
let wasPlaying = isPlaying
stopDisplayLink()
player?.pause()
cleanupObservers()
setupVideoOutputAndPlayer(with: asset, videoComposition: composition)
if wasPlaying { play() }
}

/// Consumes the end-of-playback flag. Returns true once per playback completion.
func consumeDidPlayToEnd() -> Bool {
if didPlayToEnd {
Expand Down