j62
/
ctbrec
2
2
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Better spec compliance regarding playlist update timing

This commit is contained in:
reusedname 2025-03-01 15:28:55 +05:00
parent 96bfd4e027
commit eca4245836
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/ctbrec/recorder/download/hls/AbstractHlsDownload.java
View File

@ -122,7 +122,11 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
handleMissedSegments(segmentPlaylist, nextSegmentNumber); handleMissedSegments(segmentPlaylist, nextSegmentNumber);
enqueueNewSegments(segmentPlaylist, nextSegmentNumber); enqueueNewSegments(segmentPlaylist, nextSegmentNumber);
splitRecordingIfNecessary(); splitRecordingIfNecessary();
calculateRescheduleTime(); // by the spec we must wait `targetDuration` before next playlist request if there are changes
// if there are none - half that amount
calculateRescheduleTime(playlistChanged(segmentPlaylist, nextSegmentNumber)
? segmentPlaylist.targetDuration*1000
: segmentPlaylist.targetDuration*500);
processFinishedSegments(); processFinishedSegments();
// this if-check makes sure, that we don't decrease nextSegment. for some reason // this if-check makes sure, that we don't decrease nextSegment. for some reason
@ -175,6 +179,11 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
return this; return this;
} }
private boolean playlistChanged(SegmentPlaylist segmentPlaylist, int nextSegmentNumber) {
return segmentPlaylist.seq + segmentPlaylist.segments.size() > nextSegmentNumber;
}
protected void processFinishedSegments() { protected void processFinishedSegments() {
downloadExecutor.submit(() -> { downloadExecutor.submit(() -> {
@ -427,8 +436,8 @@ public abstract class AbstractHlsDownload extends AbstractDownload {
return new SegmentDownload(model, playlist, segment, client, targetStream); return new SegmentDownload(model, playlist, segment, client, targetStream);
} }
private void calculateRescheduleTime() { private void calculateRescheduleTime(float duration_ms) {
rescheduleTime = beforeLastPlaylistRequest.plusMillis(1000); rescheduleTime = beforeLastPlaylistRequest.plusMillis(Math.max((int)Math.ceil(duration_ms), 250));
if (Instant.now().isAfter(rescheduleTime)) if (Instant.now().isAfter(rescheduleTime))
rescheduleTime = Instant.now(); rescheduleTime = Instant.now();
recordingEvents.add(RecordingEvent.of("next playlist download scheduled for " + rescheduleTime.toString())); recordingEvents.add(RecordingEvent.of("next playlist download scheduled for " + rescheduleTime.toString()));