Skip to content

Fix permanent stall loading fragment-hint parts of encrypted low-latency streams (v1.6.x) #7976

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
robwalch merged 1 commit into from
Aug 14, 2026
+31 −18
Merged

Fix permanent stall loading fragment-hint parts of encrypted low-latency streams (v1.6.x) #7976

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
49 changes: 31 additions & 18 deletions src/controller/base-stream-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,27 +820,16 @@ export default class BaseStreamController
frag: PartsLoadedData | FragLoadedData,
) {}

protected _doFragLoad(
private loadKeyFor(
frag: Fragment,
level: Level,
targetBufferTime: number | null = null,
progressCallback?: FragmentLoadProgressCallback,
): Promise<PartsLoadedData | FragLoadedData | null> {
this.fragCurrent = frag;
const details = level.details;
if (!this.levels || !details) {
throw new Error(
`frag load aborted, missing level${details ? '' : ' detail'}s`,
);
}

details: LevelDetails,
): Promise<KeyLoadedData | void> | null {
let keyLoadingPromise: Promise<KeyLoadedData | void> | null = null;
if (frag.encrypted && !frag.decryptdata?.key) {
this.log(
`Loading key for ${frag.sn} of [${details.startSN}-${details.endSN}], ${this.playlistLabel()} ${frag.level}`,
);
this.state = State.KEY_LOADING;
this.fragCurrent = frag;
keyLoadingPromise = this.keyLoader.load(frag).then((keyLoadedData) => {
if (!this.fragContextChanged(keyLoadedData.frag)) {
this.hls.trigger(Events.KEY_LOADED, keyLoadedData);
Expand All @@ -851,10 +840,6 @@ export default class BaseStreamController
}
});
this.hls.trigger(Events.KEY_LOADING, { frag });
if ((this.fragCurrent as Fragment | null) === null) {
this.log(`context changed in KEY_LOADING`);
return Promise.resolve(null);
}
} else if (!frag.encrypted) {
keyLoadingPromise = this.keyLoader.loadClear(
frag,
Expand All @@ -865,6 +850,22 @@ export default class BaseStreamController
this.log(`[eme] blocking frag load until media-keys acquired`);
}
}
return keyLoadingPromise;
}

protected _doFragLoad(
frag: Fragment,
level: Level,
targetBufferTime: number | null = null,
progressCallback?: FragmentLoadProgressCallback,
): Promise<PartsLoadedData | FragLoadedData | null> {
this.fragCurrent = frag;
const details = level.details;
if (!this.levels || !details) {
throw new Error(
`frag load aborted, missing level${details ? '' : ' detail'}s`,
);
}

const fragPrevious = this.fragPrevious;
if (
Expand Down Expand Up @@ -892,6 +893,10 @@ export default class BaseStreamController
if (partIndex > -1) {
const part = partList[partIndex];
frag = this.fragCurrent = part.fragment;
const keyLoadingPromise = this.loadKeyFor(frag, details);
if (this.fragContextChanged(frag)) {
return Promise.resolve(null);
}
this.log(
`Loading ${frag.type} sn: ${frag.sn} part: ${part.index} (${partIndex}/${partList.length - 1}) of ${this.fragInfo(frag, false, part)}) cc: ${
frag.cc
Expand Down Expand Up @@ -962,6 +967,14 @@ export default class BaseStreamController
return Promise.resolve(null);
}

const keyLoadingPromise = this.loadKeyFor(frag, details);
if (this.fragContextChanged(frag)) {
this.log(
`Context changed in KEY_LOADING sn: ${frag.sn} ${frag.relurl} > ${this.fragCurrent?.relurl}`,
);
keyLoadingPromise?.catch(() => null);
return Promise.resolve(null);
}
this.log(
`Loading ${frag.type} sn: ${frag.sn} of ${this.fragInfo(frag, false)}) cc: ${frag.cc} ${
'[' + details.startSN + '-' + details.endSN + ']'
Expand Down
Loading