enhancing new unit test #3, Preselection now gets removed if it refers to non-existing AdaptationSet

Author: stschr

src/streaming/utils/CapabilitiesFilter.js

@@ -78,6 +78,7 @@ function CapabilitiesFilter() {
                     }
 
                     _removeMultiRepresentationPreselections(manifest);
+                    _removePreselectionWithNoAdaptationSet(manifest);
 
                     return _applyCustomFilters(manifest);
                 })
@@ -534,6 +535,22 @@ function CapabilitiesFilter() {
         });
     }
 
+    function _removePreselectionWithNoAdaptationSet(manifest) {
+        if (!manifest || !manifest.Period || manifest.Period.length === 0) {
+            return;
+        }
+
+        manifest.Period.forEach((period) => {
+            if (period.Preselection) {
+                period.Preselection = period.Preselection.filter((prsl) => {
+                    const prslComponents = String(prsl.preselectionComponents).split(' ');
+                    const adaptationSetIds = period.AdaptationSet.map(as => {return as.id});
+                    return prslComponents.every(c => {return adaptationSetIds.includes(c)});
+                });
+            }
+        });
+    }
+
     function _applyCustomFilters(manifest) {
         if (!manifest || !manifest.Period || manifest.Period.length === 0) {
             return Promise.resolve();

test/unit/test/streaming/streaming.utils.CapabilitiesFilter.js

@@ -671,7 +671,7 @@ describe('CapabilitiesFilter', function () {
 
             });
 
-            it.only('should filter AdaptationSets, channels with preselection override - 1', function (done) {
+            it('should filter AdaptationSets, channels with preselection override', function (done) {
                 const manifest = {
                     Period: [{
                         Preselection: [
@@ -754,7 +754,7 @@ describe('CapabilitiesFilter', function () {
 
             });
 
-            it.only('should filter AdaptationSets, channels with preselection override - 2', function (done) {
+            it('should filter AdaptationSets and Preselections, channels with preselection override', function (done) {
                 const manifest = {
                     Period: [{
                         Preselection: [
@@ -828,9 +828,8 @@ describe('CapabilitiesFilter', function () {
 
                 capabilitiesFilter.filterUnsupportedFeatures(manifest)
                     .then(() => {
-                        expect(manifest.Period[0].Preselection).to.have.lengthOf(2);
-                        expect(manifest.Period[0].Preselection[0].id).to.be.equal('10');
-                        expect(manifest.Period[0].Preselection[1].id).to.be.equal('11');
+                        expect(manifest.Period[0].Preselection).to.have.lengthOf(1);
+                        expect(manifest.Period[0].Preselection[0].id).to.be.equal('11');
                         expect(manifest.Period[0].AdaptationSet).to.have.lengthOf(1);
                         expect(manifest.Period[0].AdaptationSet[0].id).to.be.equal('2');
                         done();