Feature/#4421 (#4551)

* Allow to use Representations from different AdaptationSets when calling setRepresentationForTypeById * Minor changes to functional tests
Dash-Industry-Forum · Aug 16, 2024 · dcf985f · dcf985f
1 parent 2a5be5f
commit dcf985f
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 19 deletions.
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
@@ -1532,7 +1532,7 @@ function MediaPlayer() {
     }
 
     /**
-     * Sets the current quality for media type instead of letting the ABR Heuristics automatically selecting it.
+     * Sets the current quality for media type instead of letting the ABR Heuristics automatically select it.
      * This value will be overwritten by the ABR rules unless autoSwitchBitrate is set to false.
      *
      * @param {MediaType} type - 'video', 'audio' or 'image'
@@ -1567,7 +1567,7 @@ function MediaPlayer() {
     }
 
     /**
-     * Sets the current quality for media type instead of letting the ABR Heuristics automatically selecting it.
+     * Sets the current quality for media type instead of letting the ABR Heuristics automatically select it.
      * This value will be overwritten by the ABR rules unless autoSwitchBitrate is set to false.
      * Note that you need to specify a relative index based on the position of the target entry in the return value of getRepresentationsByType().
      * Do NOT use representation.absoluteIndex here as this index was assigned prior to applying any filter function. If you want to select a specific representation then use setRepresentationForTypeById() instead.

diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -687,7 +687,7 @@ function Stream(config) {
             }
             return thumbnailController.getPossibleVoRepresentations();
         }
-        const mediaInfo = getMediaInfo(type);
+        const mediaInfo = _getMediaInfo(type);
         return abrController.getPossibleVoRepresentationsFilteredBySettings(mediaInfo, true);
     }
 
@@ -706,8 +706,11 @@ function Stream(config) {
             }
             possibleVoRepresentations = thumbnailController.getPossibleVoRepresentations();
         } else {
-            const mediaInfo = getMediaInfo(type);
-            possibleVoRepresentations = abrController.getPossibleVoRepresentationsFilteredBySettings(mediaInfo, true);
+            const mediaInfos = _getAllMediaInfos(type);
+
+            possibleVoRepresentations = mediaInfos.flatMap((mediaInfo) => {
+                return abrController.getPossibleVoRepresentationsFilteredBySettings(mediaInfo, true);
+            })
         }
 
         if (!possibleVoRepresentations || possibleVoRepresentations.length === 0) {
@@ -735,7 +738,7 @@ function Stream(config) {
             }
             possibleVoRepresentations = thumbnailController.getPossibleVoRepresentations();
         } else {
-            const mediaInfo = getMediaInfo(type);
+            const mediaInfo = _getMediaInfo(type);
             possibleVoRepresentations = abrController.getPossibleVoRepresentationsFilteredBySettings(mediaInfo, true);
         }
 
@@ -801,20 +804,36 @@ function Stream(config) {
         }
     }
 
-    function getMediaInfo(type) {
-        let streamProcessor = null;
-
-        for (let i = 0; i < streamProcessors.length; i++) {
-            streamProcessor = streamProcessors[i];
+    function _getMediaInfo(type) {
+        let streamProcessor = _getStreamProcessorForType(type);
 
-            if (streamProcessor.getType() === type) {
-                return streamProcessor.getMediaInfo();
-            }
+        if (streamProcessor) {
+            return streamProcessor.getMediaInfo();
         }
 
         return null;
     }
 
+    function _getAllMediaInfos(type) {
+        let streamProcessor = _getStreamProcessorForType(type);
+
+        if (streamProcessor) {
+            return streamProcessor.getAllMediaInfos();
+        }
+
+        return [];
+    }
+
+    function _getStreamProcessorForType(type) {
+        if (!type) {
+            return null
+        }
+
+        return streamProcessors.find((streamProcessor) => {
+            return streamProcessor.getType() === type;
+        })
+    }
+
     function onBufferingCompleted() {
         let processors = getStreamProcessors();
         const ln = processors.length;

diff --git a/src/streaming/utils/CapabilitiesFilter.js b/src/streaming/utils/CapabilitiesFilter.js
@@ -107,7 +107,7 @@ function CapabilitiesFilter() {
                             eventBus.trigger(Events.ADAPTATION_SET_REMOVED_NO_CAPABILITIES, {
                                 adaptationSet: as
                             });
-                            logger.warn(`AdaptationSet has been removed because of no supported Representation`);
+                            logger.warn(`AdaptationSet with ID ${as.id ? as.id : 'unknown'} and codec ${as.codecs ? as.codecs : 'unknown'} has been removed because of no supported Representation`);
                         }
 
                         return supported;

diff --git a/test/functional/adapter/DashJsAdapter.js b/test/functional/adapter/DashJsAdapter.js
@@ -75,6 +75,7 @@ class DashJsAdapter {
     destroy() {
         this.logEvents = {};
         if (this.player) {
+            this._unregisterInternalEvents();
             this.player.resetSettings();
             this.player.destroy();
         }

diff --git a/test/functional/adapter/GoogleAdManagerAdapter.js b/test/functional/adapter/GoogleAdManagerAdapter.js
@@ -54,8 +54,11 @@ class GoogleAdManagerAdapter {
             this._onVastEvent, false);
     }
 
+    unregisterVastEventListener() {
+        this.streamManager.removeEventListener(Object.keys(VAST_EVENTS_TO_VERIFY), this._onVastEvent, false);
+    }
+
     _onVastEvent(event) {
-        console.log(`Received ${event.type} event at playback time ${this.playerAdapter.getCurrentTime()}`);
         switch (event.type) {
             case google.ima.dai.api.StreamEvent.Type.STARTED:
             case google.ima.dai.api.StreamEvent.Type.FIRST_QUARTILE:

diff --git a/test/functional/config/test-configurations/streams/single.json b/test/functional/config/test-configurations/streams/single.json
@@ -4,8 +4,8 @@
       "all"
     ],
     "excluded": [
-      "vendor/google-ad-manager-emsg",
-      "buffer/buffer-to-keep-seek"
+      "buffer/buffer-to-keep-seek",
+      "vendor/google-ad-manager-emsg"
     ]
   },
   "testvectors": [

diff --git a/test/functional/config/test-configurations/streams/smoke.json b/test/functional/config/test-configurations/streams/smoke.json
@@ -4,6 +4,7 @@
       "all"
     ],
     "excluded": [
+      "vendor/google-ad-manager-emsg"
     ]
   },
   "testvectors": [

diff --git a/test/functional/test/vendor/google-ad-manager-emsg.js b/test/functional/test/vendor/google-ad-manager-emsg.js
@@ -16,8 +16,8 @@ before(() => {
 
 after(() => {
     mpd = null;
-    playerAdapter.destroy();
     googleAdManagerAdapter.reset();
+    playerAdapter.destroy();
 })
 
 it('Register DAI pod session', async () => {