Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Log parsed segment timestamps ahead of append #6549

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Log parsed segment timestamps ahead of append #6549

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
39 changes: 23 additions & 16 deletions src/controller/base-stream-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,9 @@ export default class BaseStreamController
}

if ('payload' in data) {
this.log(`Loaded fragment ${frag.sn} of level ${frag.level}`);
this.log(
`Loaded ${frag.type} sn: ${frag.sn} of ${this.playlistLabel()} ${frag.level}`,
);
this.hls.trigger(Events.FRAG_LOADED, data);
}

Expand Down Expand Up @@ -629,11 +631,7 @@ export default class BaseStreamController
this.log(
`Buffered ${frag.type} sn: ${frag.sn}${
part ? ' part: ' + part.index : ''
} of ${
this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
} ${frag.level} (frag:[${(frag.startPTS ?? NaN).toFixed(3)}-${(
frag.endPTS ?? NaN
).toFixed(3)}] > buffer:${
} of ${this.fragInfo(frag)} > buffer:${
media
? TimeRanges.toString(BufferHelper.getBuffered(media))
: '(detached)'
Expand Down Expand Up @@ -718,9 +716,7 @@ export default class BaseStreamController
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.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
} ${frag.level}`,
`Loading key for ${frag.sn} of [${details.startSN}-${details.endSN}], ${this.playlistLabel()} ${frag.level}`,
);
this.state = State.KEY_LOADING;
this.fragCurrent = frag;
Expand Down Expand Up @@ -773,9 +769,7 @@ export default class BaseStreamController
frag.cc
} of playlist [${details.startSN}-${
details.endSN
}] parts [0-${partIndex}-${partList.length - 1}] ${
this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
}: ${frag.level}, target: ${parseFloat(
}] parts [0-${partIndex}-${partList.length - 1}] ${this.playlistLabel()}: ${frag.level}, target: ${parseFloat(
targetBufferTime.toFixed(3),
)}`,
);
Expand Down Expand Up @@ -843,10 +837,8 @@ export default class BaseStreamController
}

this.log(
`Loading fragment ${frag.sn} cc: ${frag.cc} ${
details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : ''
}${this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'}: ${
frag.level
`Loading ${frag.type} sn: ${frag.sn} of ${this.fragInfo(frag, false)}) cc: ${frag.cc} ${
details ? '[' + details.startSN + '-' + details.endSN + ']' : ''
}, target: ${parseFloat(targetBufferTime.toFixed(3))}`,
);
// Don't update nextLoadPosition for fragments which are not buffered
Expand Down Expand Up @@ -1920,9 +1912,24 @@ export default class BaseStreamController
// For this error fallthrough. Marking parsed will allow advancing to next fragment.
}
this.state = State.PARSED;
this.log(
`Parsed ${frag.type} sn: ${frag.sn}${
part ? ' part: ' + part.index : ''
} of ${this.fragInfo(frag)})`,
);
this.hls.trigger(Events.FRAG_PARSED, { frag, part });
}

private playlistLabel() {
return this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track';
}

private fragInfo(frag: Fragment, pts: boolean = true): string {
return `${this.playlistLabel()} ${frag.level} (frag:[${((pts ? frag.startPTS : frag.start) ?? NaN).toFixed(3)}-${(
(pts ? frag.endPTS : frag.end) ?? NaN
).toFixed(3)}]`;
}

protected resetTransmuxer() {
if (this.transmuxer) {
this.transmuxer.destroy();
Expand Down
Loading