Skip to content

Commit

Permalink
fix: do not set timeOffset if null in loadPrevious
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nfrederiksen
Nfrederiksen committed Aug 15, 2023
1 parent d3102a3 commit 4672231
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 10 deletions.
2 changes: 1 addition & 1 deletion index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,7 @@ class HLSVod {
}
}
const lastSeg = this.segments[sourceBw][this.segments[sourceBw].length - 1];
if (lastSeg && lastSeg.timelinePosition) {
if (this.timeOffset !== null && lastSeg && lastSeg.timelinePosition) {
this.timeOffset = lastSeg.timelinePosition + lastSeg.duration * 1000;
}
this.segments[destBw].push({
Expand Down
66 changes: 57 additions & 9 deletions spec/hlsvod_spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ describe("HLSVod with timeline", () => {
it("can handle vod after another vod", (done) => {
const now = Date.now();
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest)
.then(() => {
Expand All @@ -702,6 +702,25 @@ describe("HLSVod with timeline", () => {
});
});

it("can handle vod after another vod, with later vod disabling timeOffset", (done) => {
const now = 1692110553608;
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], timeOffet=null);
mockVod
.load(mockMasterManifest, mockMediaManifest)
.then(() => {
return mockVod2.loadAfter(mockVod, mockMasterManifest, mockMediaManifest);
})
.then(() => {
const seqSegments = mockVod2.getLiveMediaSequenceSegments(0);
const size = seqSegments["2497000"].length;
expect(seqSegments["2497000"][size - 3].timelinePosition).toEqual(now + 2646 * 1000);
expect(seqSegments["2497000"][size - 2].discontinuity).toEqual(true);
expect(seqSegments["2497000"][size - 1].timelinePosition).toEqual(null);
done();
});
});

it("can handle vod after another vod with two ads back-to-back", (done) => {
const splices = [
{
Expand Down Expand Up @@ -737,7 +756,7 @@ describe("HLSVod with timeline", () => {
];
const now = Date.now();
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", splices);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", splices, now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest)
.then(() => {
Expand All @@ -754,7 +773,7 @@ describe("HLSVod with timeline", () => {
it("outputs EXT-X-PROGRAM-DATE-TIME after discontinuity", (done) => {
const now = Date.now();
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest)
.then(() => {
Expand Down Expand Up @@ -1362,7 +1381,7 @@ describe("HLSVod with separate audio variants", () => {
const now = Date.now();
// # Two demuxed vods with some different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand All @@ -1385,11 +1404,40 @@ describe("HLSVod with separate audio variants", () => {
});
});

it("can handle vod after another vod, loading same groupId & languages, but with later vod disabling timeOffset", (done) => {
const now = Date.now();
// # Two demuxed vods with some different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], timeOffest=null);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
return mockVod2.loadAfter(mockVod, mockMasterManifest2, mockMediaManifest2, mockAudioManifest2);
})
.then(() => {
const seqSegments1 = mockVod.getLiveMediaSequenceSegments(0);
const seqSegments2 = mockVod2.getLiveMediaSequenceSegments(0);
expect(seqSegments1["354000"][0].uri).toEqual("http://mock.com/1woxvooiidb(11186147_ISMUSP)-video=241929-1.ts");
expect(seqSegments2["354000"][seqSegments2["354000"].length - 1 - 1].discontinuity).toBe(true);
expect(seqSegments2["354000"][seqSegments2["354000"].length - 1].uri).toEqual(
"http://mock.com/1woxvooiidb(11186147_ISMUSP)-video=241929-1.ts"
);
const seqAudioSegments1 = mockVod.getLiveMediaSequenceAudioSegments("audio-aacl-96", "de", 0);
const seqAudioSegments2 = mockVod2.getLiveMediaSequenceAudioSegments("audio-aacl-96", "de", 0);
expect(seqAudioSegments1[0].uri).toEqual("http://mock.com/1woxvooiidb(11186147_ISMUSP)-audio=96000_de-1.aac");
expect(seqAudioSegments2[seqAudioSegments2.length - 3].timelinePosition).toEqual(now + 75030.19995117188);
expect(seqAudioSegments2[[seqAudioSegments2.length - 2]].discontinuity).toBe(true);
expect(seqAudioSegments2[seqAudioSegments2.length - 1].uri).toEqual("http://mock.com/media_mock/audioplaylist/i-audio_de-1.aac");
expect(seqAudioSegments2[seqAudioSegments2.length - 1].timelinePosition).toEqual(null);
done();
});
});

it("can handle vod after another vod, loading same groupId but missing a language, type 1", (done) => {
const now = Date.now();
// # Two demuxed vods with some different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand Down Expand Up @@ -1421,7 +1469,7 @@ describe("HLSVod with separate audio variants", () => {
const now = Date.now();
// # Two demuxed vods with some different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand Down Expand Up @@ -1454,7 +1502,7 @@ describe("HLSVod with separate audio variants", () => {
const now = Date.now();
// # Two demuxed vods with different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand Down Expand Up @@ -1483,7 +1531,7 @@ describe("HLSVod with separate audio variants", () => {
const now = Date.now();
// # Two demuxed vods with different languages.
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand Down Expand Up @@ -1511,7 +1559,7 @@ describe("HLSVod with separate audio variants", () => {
it("can return an audio variant manifest", (done) => {
const now = Date.now();
mockVod = new HLSVod("http://mock.com/mock.m3u8", [], now);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", []);
mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", [], now + 1);
mockVod
.load(mockMasterManifest, mockMediaManifest, mockAudioManifest)
.then(() => {
Expand Down

0 comments on commit 4672231

Please sign in to comment.