Fix a bug that lead to the BOLA rule requesting a wrong Representatio…

…n after a track switch
Dash-Industry-Forum · Feb 14, 2025 · de7e55e · de7e55e
1 parent 92bb1ee
commit de7e55e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/streaming/StreamProcessor.js b/src/streaming/StreamProcessor.js
@@ -713,6 +713,7 @@ function StreamProcessor(config) {
             });
         }
         currentMediaInfo = value;
+        abrController.handleNewMediaInfo(currentMediaInfo);
         eventBus.trigger(Events.MEDIAINFO_UPDATED, {
             mediaType: type,
             streamId: streamInfo.id,

diff --git a/src/streaming/controllers/AbrController.js b/src/streaming/controllers/AbrController.js
@@ -851,6 +851,10 @@ function AbrController() {
         abrRulesCollection.clearDataForStream(streamId);
     }
 
+    function handleNewMediaInfo(newMediaInfo) {
+        abrRulesCollection.handleNewMediaInfo(newMediaInfo);
+    }
+
 
     instance = {
         checkPlaybackQuality,
@@ -861,6 +865,7 @@ function AbrController() {
         getPossibleVoRepresentations,
         getPossibleVoRepresentationsFilteredBySettings,
         getRepresentationByAbsoluteIndex,
+        handleNewMediaInfo,
         initialize,
         isPlayingAtLowestQuality,
         isPlayingAtTopQuality,

diff --git a/src/streaming/rules/abr/ABRRulesCollection.js b/src/streaming/rules/abr/ABRRulesCollection.js
@@ -307,13 +307,19 @@ function ABRRulesCollection(config) {
         _updateRules()
     }
 
+    function handleNewMediaInfo(newMediaInfo) {
+        qualitySwitchRules.forEach(rule => rule.handleNewMediaInfo && rule.handleNewMediaInfo(newMediaInfo));
+        abandonFragmentRules.forEach(rule => rule.handleNewMediaInfo && rule.handleNewMediaInfo(newMediaInfo));
+    }
+
     instance = {
         clearDataForStream,
         getAbandonFragmentRules,
         getBestPossibleSwitchRequest,
         getBolaState,
         getMinSwitchRequest,
         getQualitySwitchRules,
+        handleNewMediaInfo,
         initialize,
         reset,
         setBolaState,

diff --git a/src/streaming/rules/abr/BolaRule.js b/src/streaming/rules/abr/BolaRule.js
@@ -79,7 +79,6 @@ function BolaRule(config) {
         eventBus.on(MediaPlayerEvents.METRIC_ADDED, _onMetricAdded, instance);
         eventBus.on(MediaPlayerEvents.QUALITY_CHANGE_REQUESTED, _onQualityChangeRequested, instance);
         eventBus.on(MediaPlayerEvents.FRAGMENT_LOADING_ABANDONED, _onFragmentLoadingAbandoned, instance);
-        eventBus.on(MediaPlayerEvents.NEW_TRACK_SELECTED, _onNewTrackSelected, instance);
         eventBus.on(Events.MEDIA_FRAGMENT_LOADED, _onMediaFragmentLoaded, instance);
         eventBus.on(Events.SETTING_UPDATED_MAX_BITRATE, _onMinMaxBitrateUpdated, instance);
         eventBus.on(Events.SETTING_UPDATED_MIN_BITRATE, _onMinMaxBitrateUpdated, instance);
@@ -446,13 +445,12 @@ function BolaRule(config) {
         }
     }
 
-    function _onNewTrackSelected(e) {
-        if (!e || !e.currentMediaInfo) {
-            return;
+    function handleNewMediaInfo(newMediaInfo) {
+        if (!newMediaInfo || !newMediaInfo.streamInfo || !newMediaInfo.type) {
+            return
         }
-        const currentMediaInfo = e.currentMediaInfo;
-        if (bolaStateDict[currentMediaInfo.streamInfo.id] && bolaStateDict[currentMediaInfo.streamInfo.id][currentMediaInfo.type]) {
-            delete bolaStateDict[currentMediaInfo.streamInfo.id][currentMediaInfo.type];
+        if (bolaStateDict[newMediaInfo.streamInfo.id] && bolaStateDict[newMediaInfo.streamInfo.id][newMediaInfo.type]) {
+            delete bolaStateDict[newMediaInfo.streamInfo.id][newMediaInfo.type];
         }
     }
 
@@ -626,14 +624,14 @@ function BolaRule(config) {
         eventBus.off(MediaPlayerEvents.METRIC_ADDED, _onMetricAdded, instance);
         eventBus.off(MediaPlayerEvents.QUALITY_CHANGE_REQUESTED, _onQualityChangeRequested, instance);
         eventBus.off(MediaPlayerEvents.FRAGMENT_LOADING_ABANDONED, _onFragmentLoadingAbandoned, instance);
-        eventBus.off(MediaPlayerEvents.NEW_TRACK_SELECTED, _onNewTrackSelected, instance);
         eventBus.off(Events.MEDIA_FRAGMENT_LOADED, _onMediaFragmentLoaded, instance);
         eventBus.off(Events.SETTING_UPDATED_MAX_BITRATE, _onMinMaxBitrateUpdated, instance);
         eventBus.off(Events.SETTING_UPDATED_MIN_BITRATE, _onMinMaxBitrateUpdated, instance);
     }
 
     instance = {
         getSwitchRequest,
+        handleNewMediaInfo,
         reset
     };