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: Subtitle Track Playhead is dependant Of Video Track #302

Merged
merged 8 commits into from
Nov 21, 2023
Merged

Fix: Subtitle Track Playhead is dependant Of Video Track #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b022db8
chore: first version of seperate fn for audio increment + unit tests
Nfrederiksen Oct 27, 2023
c21f006
fix: HA demux audio incr not in sync
Nfrederiksen Nov 1, 2023
5089dde
test: for new increment function
Nfrederiksen Nov 1, 2023
22c9df2
test: add more cases
Nfrederiksen Nov 1, 2023
8f293b0
chore: cleaner Increment logs
Nfrederiksen Nov 21, 2023
14be00f
bump hls-vodtolive v4.1.1
Nfrederiksen Nov 21, 2023
a4f9f7b
Merge branch 'master' into fix/independent-subtitle-playhead
Nfrederiksen Nov 21, 2023
90ab9c6
Merge branch 'master' into fix/independent-subtitle-playhead
Nfrederiksen Nov 21, 2023
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
15 changes: 12 additions & 3 deletions engine/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,10 +923,19 @@ class Session {
const mediaSequenceValueAudio = currentVod.mediaSequenceValuesAudio[playheadState.vodMediaSeqAudio];
audioInfo = ` mseq[A]={${playheadState.mediaSeqAudio + mediaSequenceValueAudio}}`
}
debug(`[${this._sessionId}]: Session can now serve mseq[V]={${playheadState.mediaSeq + mediaSequenceValue}}` + audioInfo);
let subsInfo = "";
if (this.use_vtt_subtitles) {
const mediaSequenceValueSubtitle = currentVod.mediaSequenceValuesSubtitle[playheadState.vodMediaSeqSubtitle];
subsInfo = ` mseq[S]={${playheadState.mediaSeqSubtitle + mediaSequenceValueSubtitle}}`
}
debug(`[${this._sessionId}]: Session can now serve mseq[V]={${playheadState.mediaSeq + mediaSequenceValue}}` + audioInfo + subsInfo);
}

debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio} of ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")})`);
debug(`[${this._sessionId}]: INCREMENT (mseq=${playheadState.mediaSeq + playheadState.vodMediaSeqVideo}) vodMediaSeq=(${playheadState.vodMediaSeqVideo}_${playheadState.vodMediaSeqAudio}${
this.use_vtt_subtitles ? `_${playheadState.vodMediaSeqSubtitle}` : ""
} of ${currentVod.getLiveMediaSequencesCount()}_${currentVod.getLiveMediaSequencesCount("audio")}${
this.use_vtt_subtitles ? `_${currentVod.getLiveMediaSequencesCount("subtitle")})` : ")"
}`);

// As a FOLLOWER, we might need to read up from shared store...
if (playheadState.vodMediaSeqVideo < 2 || playheadState.mediaSeq !== this.prevMediaSeqOffset.video) {
Expand Down Expand Up @@ -2098,7 +2107,7 @@ class Session {
let positionV = _currentPosVideo ? _currentPosVideo / 1000 : 0;
let positionX;
let posDiff;
const threshold = 0.250;
const threshold = 0.500;
while (extraMediaIncrement < _extraSeqFinalIndex) {
const currentPosExtraMedia = (await _getExtraPlayheadPositionAsyncFn(_vodMediaSeqExtra + extraMediaIncrement)) * 1000;
positionX = currentPosExtraMedia ? currentPosExtraMedia / 1000 : 0;
Expand Down
Loading