Feat: Option for Always Mapping Vod Bitrates By Nearest Value (#113)

* add alwaysMapBandwidthByNearest option * update unittests
Eyevinn · Aug 8, 2023 · b27e676 · b27e676
1 parent 60faf5a
commit b27e676
Show file tree

Hide file tree

Showing 10 changed files with 3,727 additions and 702 deletions.
diff --git a/index.js b/index.js
@@ -67,6 +67,9 @@ class HLSVod {
     if (opts && opts.expectedSubtitleTracks) {
       this.expectedSubtitleTracks = opts.expectedSubtitleTracks;
     }
+    if (opts && opts.alwaysMapBandwidthByNearest) {
+      this.alwaysMapBandwidthByNearest = opts.alwaysMapBandwidthByNearest;
+    }
     this.videoSequencesCount = 0;
     this.audioSequencesCount = 0;
     this.defaultAudioGroupAndLang = null;
@@ -116,6 +119,7 @@ class HLSVod {
       subtitleSequencesCount: this.subtitleSequencesCount,
       mediaStartExcessTime: this.mediaStartExcessTime,
       audioCodecsMap: this.audioCodecsMap,
+      alwaysMapBandwidthByNearest: this.alwaysMapBandwidthByNearest
     };
     return JSON.stringify(serialized);
   }
@@ -167,6 +171,7 @@ class HLSVod {
     this.subtitleSequencesCount = de.subtitleSequencesCount
     this.mediaStartExcessTime = de.mediaStartExcessTime;
     this.audioCodecsMap = de.audioCodecsMap;
+    this.alwaysMapBandwidthByNearest = de.alwaysMapBandwidthByNearest;
   }
 
   /**
@@ -186,7 +191,7 @@ class HLSVod {
           baseUrl = m[1] + "/";
         }
         const HAS_AUDIO_DEFAULTS = this.defaultAudioGroupAndLang === null ? false : true;
-        if (this.previousVod && this.previousVod.getBandwidths().length === m3u.items.StreamItem.length) {
+        if (!this.alwaysMapBandwidthByNearest && this.previousVod && this.previousVod.getBandwidths().length === m3u.items.StreamItem.length) {
           debug(`Previous VOD bandwidths matches amount of current. A mapping is possible`);
           const previousBandwidths = this.previousVod.getBandwidths().sort((a, b) => a - b);
           this.usageProfileMapping = {};

diff --git a/spec/hlsvod_spec.js b/spec/hlsvod_spec.js
@@ -889,6 +889,9 @@ describe("HLSVod with not equal usage profiles", () => {
     mockMasterManifest.push(function () {
       return fs.createReadStream("testvectors/hls_abr4/master.m3u8");
     });
+    mockMasterManifest.push(function () {
+      return fs.createReadStream("testvectors/hls_abr6/master.m3u8");
+    })
     mockMediaManifest.push(function (bandwidth) {
       return fs.createReadStream("testvectors/hls1/" + bandwidth + ".m3u8");
     });
@@ -910,6 +913,9 @@ describe("HLSVod with not equal usage profiles", () => {
     mockMediaManifest.push(function (bandwidth) {
       return fs.createReadStream("testvectors/hls_abr4/" + bandwidth + ".m3u8");
     });
+    mockMediaManifest.push(function (bandwidth) {
+      return fs.createReadStream("testvectors/hls_abr6/" + bandwidth + ".m3u8");
+    });
   });
 
   it("can find a correct match", (done) => {
@@ -1200,6 +1206,26 @@ describe("HLSVod with not equal usage profiles", () => {
         done();
       });
   });
+
+  it("can match by true nearest when options-> alwaysMapBandwidthByNearest is true", (done) => {
+    mockVod = new HLSVod("http://mock.com/mock.m3u8", null, 0,0, null, { alwaysMapBandwidthByNearest: 1 });
+    mockVod2 = new HLSVod("http://mock.com/mock2.m3u8", null, 0,0, null, { alwaysMapBandwidthByNearest: 1 });
+    mockVod
+      .load(mockMasterManifest[0], mockMediaManifest[0])
+      .then(() => {
+        return mockVod2.loadAfter(mockVod, mockMasterManifest[7], mockMediaManifest[7]);
+      })
+      .then(() => {
+        const seqSegments = mockVod2.getLiveMediaSequenceSegments(0);
+        const lastIdx = seqSegments["1497000"].length - 1;
+        expect(seqSegments["1497000"][lastIdx].uri).toEqual("https://mock.vod.media/segment1_0_av.ts");   
+        expect(seqSegments["3496000"][lastIdx].uri).toEqual("https://mock.vod.media/segment1_1_av.ts");
+        expect(seqSegments["4497000"][lastIdx].uri).toEqual("https://mock.vod.media/segment1_2_av.ts");
+        expect(seqSegments["5544000"][lastIdx].uri).toEqual("https://mock.vod.media/segment1_3_av.ts");
+        expect(seqSegments["6655000"][lastIdx].uri).toEqual("https://mock.vod.media/segment1_4_av.ts");
+        done();
+      });
+  });
 });
 /**
  *  Changes: