simplify accessibility matcher

Dash-Industry-Forum · Sep 20, 2022 · 5c03e89 · 5c03e89
1 parent c85c506
commit 5c03e89
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js
@@ -82,7 +82,6 @@ function MediaController() {
                 tracks = filterTracksBySettings(tracks, matchSettingsRole, settings);
             }
             tracks = filterTracksBySettings(tracks, matchSettingsAccessibility, settings);
-            tracks = filterTracksBySettings(tracks, matchSettingsNoAccessibility, settings);
             tracks = filterTracksBySettings(tracks, matchSettingsAudioChannelConfig, settings);
         }
 
@@ -351,16 +350,19 @@ function MediaController() {
     }
 
     function matchSettingsAccessibility(settings, track) {
-        let matchAccessibility = !settings.accessibility || !!track.accessibility.filter(function (item) {
-            return item === settings.accessibility;
-        })[0];
+        let matchAccessibility;
 
-        return matchAccessibility;
-    }
+        if (!settings.accessibility) {
+            // if no accessibility is requested (or request is empty string),
+            // match only those tracks having no accessibility element present
+            matchAccessibility = !track.accessibility.length;
+        } else {
+            matchAccessibility =  !!track.accessibility.filter(function (item) {
+                return item === settings.accessibility;
+            })[0];
+        }
 
-    function matchSettingsNoAccessibility(settings, track) {
-        let trackMatches = !!settings.accessibility || !track.accessibility.length;
-        return trackMatches;
+        return matchAccessibility;
     }
 
     function matchSettingsAudioChannelConfig(settings, track) {
@@ -596,7 +598,6 @@ function MediaController() {
         matchSettingsViewPoint,
         matchSettingsRole,
         matchSettingsAccessibility,
-        matchSettingsNoAccessibility,
         matchSettingsAudioChannelConfig,
         saveTextSettingsDisabled,
         setConfig,