Skip to content

Fix endless while loop in gap controller with bad streams #7661

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

Fix endless while loop in gap controller with bad streams #7661

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions src/controller/gap-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,9 @@ export default class GapController extends TaskLoop {
let pos = appended.end;
while (pos < startTime) {
const provisioned = appendedFragAtPosition(pos, fragmentTracker);
if (provisioned) {
pos += provisioned.duration;
const duration = provisioned ? provisioned.duration : 0;
if (duration > 0) {
pos += duration;
} else {
moreToLoad = true;
break;
Expand Down
4 changes: 2 additions & 2 deletions src/remux/passthrough-remuxer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,10 @@ function isInvalidInitPts(
if (initPTS === null) {
return true;
}
// InitPTS is invalid when distance from program would be more than segment duration or a minimum of one second
// InitPTS is invalid when distance from program would be more than or equal to segment duration or a minimum of one second
const minDuration = Math.max(duration, 1);
const startTime = startDTS - initPTS.baseTime / initPTS.timescale;
return Math.abs(startTime - timeOffset) > minDuration;
return Math.abs(startTime - timeOffset) >= minDuration;
}

function getParsedTrackCodec(
Expand Down
Loading