Skip to content
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

Jump to bottom

Fix: add subtitle media sequence data to insertSlate fn #307

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Fix: add subtitle media sequence data to insertSlate fn #307

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
fix: add subtitle media sequence data to insertSlate
  • Loading branch information
@Nfrederiksen
Nfrederiksen committed Dec 8, 2023
commit b9d658607ef0e1cd90274c63565b717321b2d7c2
10 changes: 9 additions & 1 deletion engine/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,32 +1071,40 @@ class Session {
console.error(`[${this._sessionId}]: Will insert slate`);
const slateVod = await this._loadSlate(currentVod);
debug(`[${this._sessionId}]: slate loaded`);
let sessionState = await this._sessionState.getValues(["slateCount", "mediaSeq", "discSeq", "mediaSeqAudio", "discSeqAudio"]);
let sessionState = await this._sessionState.getValues(["slateCount", "mediaSeq", "discSeq", "mediaSeqAudio", "discSeqAudio", "mediaSeqSubtitle", "discSeqSubtitle"]);
let endValue = 0;
let endValueAudio = 0;
let endValueSubtitle = 0;
let lastDiscontinuity = 0;
let lastDiscontinuityAudio = 0;
let lastDiscontinuitySubtitle = 0;
if (currentVod) {
if (currentVod.sequenceAlwaysContainNewSegments) {
endValue = currentVod.getLastSequenceMediaSequenceValue();
endValueAudio = currentVod.getLastSequenceMediaSequenceValueAudio();
endValueSubtitle = currentVod.getLastSequenceMediaSequenceValueSubtitle();
} else {
endValue = currentVod.getLiveMediaSequencesCount();
endValueAudio = currentVod.getLiveMediaSequencesCount("audio");
endValueSubtitle = currentVod.getLiveMediaSequencesCount("subtitle");
}
lastDiscontinuity = currentVod.getLastDiscontinuity();
lastDiscontinuityAudio = currentVod.getLastDiscontinuityAudio();
lastDiscontinuitySubtitle = currentVod.getLastDiscontinuitySubtitle();
}
const isLeader = await this._sessionStateStore.isLeader(this._instanceId);

const updatedSessionState = await this._sessionState.setValues({
"vodMediaSeqVideo": 0,
"vodMediaSeqAudio": 0,
"vodMediaSeqSubtitle": 0,
"state": SessionState.VOD_NEXT_INITIATING,
"mediaSeq": sessionState.mediaSeq + endValue,
"mediaSeqAudio": sessionState.mediaSeqAudio + endValueAudio,
"mediaSeqSubtitle": sessionState.mediaSeqSubtitle + endValueAudio,
"discSeq": sessionState.discSeq + lastDiscontinuity,
"discSeqAudio": sessionState.discSeqAudio + lastDiscontinuityAudio,
"discSeqSubtitle": sessionState.discSeqSubtitle + lastDiscontinuitySubtitle,
"slateCount": sessionState.slateCount + 1
});
sessionState = { ...sessionState, ...updatedSessionState };
Expand Down