Skip to content
Open
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
4 changes: 4 additions & 0 deletions src/controller/base-playlist-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ export default class BasePlaylistController
fragments.forEach((frag) => {
frag?.setStart(frag.playlistOffset + offset);
});
const { fragmentHint } = details;
if (fragmentHint) {
fragmentHint.setStart(fragmentHint.playlistOffset + offset);
}
}

// if current playlist is a live playlist, arm a timer to reload it
Expand Down
11 changes: 7 additions & 4 deletions src/utils/discontinuities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,13 @@ export function alignStream(
// discontinuity sequence.
alignMediaPlaylistByPDT(details, switchDetails, logger);
}
if (!details.alignedSliding && !details.skippedSegments) {
// Try to align on sn so that we pick a better start fragment.
// Do not perform this on playlists with delta updates as this is only to align levels on switch
// and adjustSliding only adjusts fragments after skippedSegments.
if (
!details.alignedSliding &&
!details.skippedSegments &&
details.fragmentStart === (details.appliedTimelineOffset ?? 0)
) {
// Use sequence numbers only before the playlist has acquired sliding.
// A configured timeline offset on a fresh playlist is not sliding.
adjustSliding(switchDetails, details, false, logger);
}
}
Expand Down
15 changes: 12 additions & 3 deletions src/utils/level-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -500,20 +500,29 @@ export function adjustSliding(
newDetails.startSN + newDetails.skippedSegments - oldDetails.startSN;
const oldFragments = oldDetails.fragments;
const advancedOrStable = delta >= 0;
// The configured offset is already applied when the playlist is loaded.
// Use it for same-rendition updates because a delta playlist may contain
// fragments copied from the old details ahead of the new ones.
const existingSliding = matchingStableVariantOrRendition
? (newDetails.appliedTimelineOffset ?? 0)
: newDetails.fragmentStart;
let sliding = 0;
if (advancedOrStable && delta < oldFragments.length) {
sliding = oldFragments[delta].start;
sliding = oldFragments[delta].start - existingSliding;
logger?.log(
`Aligning playlists based on SN ${newDetails.startSN} (diff: ${sliding})`,
);
} else if (advancedOrStable && newDetails.startSN === oldDetails.endSN + 1) {
sliding = oldDetails.fragmentEnd;
sliding = oldDetails.fragmentEnd - existingSliding;
logger?.log(
`Aligning playlists based on first/last SN ${newDetails.startSN} (diff: ${sliding})`,
);
} else if (advancedOrStable && matchingStableVariantOrRendition) {
// align with expected position (updated playlist start sequence is past end sequence of last update)
sliding = oldDetails.fragmentStart + delta * newDetails.levelTargetDuration;
sliding =
oldDetails.fragmentStart +
delta * newDetails.levelTargetDuration -
existingSliding;
} else if (!newDetails.skippedSegments && newDetails.fragmentStart === 0) {
// align new start with old (playlist switch has a sequence with no overlap and should not be used for alignment)
sliding = oldDetails.fragmentStart;
Expand Down
48 changes: 48 additions & 0 deletions tests/unit/controller/level-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,54 @@ segment-0.m4s
);
expect(payload.deliveryDirectives).to.include({ msn: 1, part: 1 });
});

it('applies timelineOffset to the trailing part hint', function () {
const url = 'https://example.com/video.m3u8';
const details = M3U8Parser.parseLevelPlaylist(
`#EXTM3U
#EXT-X-VERSION:9
#EXT-X-TARGETDURATION:6
#EXT-X-SERVER-CONTROL:PART-HOLD-BACK=3,CAN-BLOCK-RELOAD=YES
#EXT-X-PART-INF:PART-TARGET=1
#EXT-X-MEDIA-SEQUENCE:0
#EXT-X-PART:DURATION=1,URI="part-0.m4s",INDEPENDENT=YES
#EXTINF:6,
segment-0.m4s
#EXT-X-PART:DURATION=1,URI="part-1.m4s",INDEPENDENT=YES
#EXT-X-PRELOAD-HINT:TYPE=PART,URI="part-2.m4s"`,
url,
0,
PlaylistLevelType.MAIN,
0,
{},
);
const levelInfo = new Level(
parsedLevel({
bitrate: 1_000_000,
url,
}),
);

expect(details.playlistParsingError).to.be.null;
expect(details.endSN).to.equal(0);
expect(details.lastPartSn).to.equal(1);
expect(details.lastPartIndex).to.equal(0);

hls.config.timelineOffset = 10;
levelController.startLoad();
levelController.playlistLoaded(0, {
details,
id: 0,
level: 0,
levelInfo,
networkDetails: new Response('ok'),
stats: new LoadStats(),
deliveryDirectives: null,
});

expect(details.fragmentStart).to.equal(10);
expect(details.fragmentHint?.start).to.equal(16);
});
});

describe('Redundant Streams', function () {
Expand Down
78 changes: 78 additions & 0 deletions tests/unit/controller/level-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import M3U8Parser from '../../../src/loader/m3u8-parser';
import { Level } from '../../../src/types/level';
import { PlaylistLevelType } from '../../../src/types/loader';
import { AttrList } from '../../../src/utils/attr-list';
import { alignStream } from '../../../src/utils/discontinuities';
import {
addSliding,
adjustSliding,
Expand Down Expand Up @@ -204,6 +205,83 @@ describe('LevelHelper Tests', function () {
const actual = newPlaylist.fragments.map((f) => f.start);
expect(actual).to.deep.equal([15, 20, 25]);
});

it('keeps merged live playlists aligned with main across refreshes', function () {
const main = generatePlaylist([1, 2, 3, 4, 5], 10);
let subtitles = generatePlaylist([1, 2, 3]);
alignStream(main, subtitles, logger);
expect(subtitles.fragments.map((f) => f.start)).to.deep.equal([
10, 15, 20,
]);

[2, 3].forEach((startSN) => {
const updated = generatePlaylist([startSN, startSN + 1, startSN + 2]);
mergeDetails(subtitles, updated, logger);
alignStream(main, updated, logger);
expect(updated.fragments.map((f) => f.start)).to.deep.equal(
main.fragments.slice(startSN - 1, startSN + 2).map((f) => f.start),
);
subtitles = updated;
});
});

it('does not re-align a slid rendition by sequence number', function () {
const main = generatePlaylist([1, 2, 3], 10);
[12, 18].forEach((offset) => {
const subtitles = generatePlaylist([2, 3, 4], offset);
alignStream(main, subtitles, logger);
expect(subtitles.fragments.map((f) => f.start)).to.deep.equal([
offset,
offset + 5,
offset + 10,
]);
});
});

it('does not re-align a slid rendition when sequences are adjacent', function () {
const main = generatePlaylist([1, 2, 3], 10);
const subtitles = generatePlaylist([4, 5, 6], 12);
alignStream(main, subtitles, logger);
expect(subtitles.fragments.map((f) => f.start)).to.deep.equal([
12, 17, 22,
]);
});

it('aligns a fresh rendition with a configured timeline offset', function () {
const main = generatePlaylist([1, 2, 3], 10);
const subtitles = generatePlaylist([2, 3, 4], 10);
subtitles.appliedTimelineOffset = 10;
alignStream(main, subtitles, logger);
expect(subtitles.fragments.map((f) => f.start)).to.deep.equal([
15, 20, 25,
]);
});

it('keeps the configured timeline offset once across subtitle refreshes', function () {
const main = generatePlaylist([1, 2, 3, 4, 5], 10);
const previous = generatePlaylist([2, 3, 4], 10);
previous.appliedTimelineOffset = 10;
alignStream(main, previous, logger);
expect(previous.fragmentStart).to.equal(15);

const reloaded = generatePlaylist([3, 4, 5], 10);
reloaded.appliedTimelineOffset = 10;
mergeDetails(previous, reloaded, logger);
expect(reloaded.fragmentStart).to.equal(20);
alignStream(main, reloaded, logger);
expect(reloaded.fragments.map((f) => f.start)).to.deep.equal([
20, 25, 30,
]);
});

it('keeps an existing offset when rendition sequences have no overlap', function () {
const main = generatePlaylist([1, 2, 3], 10);
const subtitles = generatePlaylist([5, 6, 7], 30);
alignStream(main, subtitles, logger);
expect(subtitles.fragments.map((f) => f.start)).to.deep.equal([
30, 35, 40,
]);
});
});

describe('mergeDetails', function () {
Expand Down
Loading