Merge branch 'development' into fix/#4040

Dash-Industry-Forum · Sep 20, 2022 · 8d9eb01 · 8d9eb01
2 parents 63cece7 + 79aca58
commit 8d9eb01
Showing 1 changed file with 39 additions and 17 deletions.
diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js
@@ -311,23 +311,45 @@ function MediaController() {
     }
 
     function matchSettings(settings, track, isTrackActive = false) {
-        const matchLang = !settings.lang || (
-            (settings.lang instanceof RegExp)?(track.lang.match(settings.lang)):( extendedFilter(track.lang, bcp47Normalize(settings.lang) ).length>0 )
-        );
-        const matchIndex = (settings.index === undefined) || (settings.index === null) || (track.index === settings.index);
-        const matchViewPoint = !settings.viewpoint || (settings.viewpoint === track.viewpoint);
-        const matchRole = !settings.role || !!track.roles.filter(function (item) {
-            return item === settings.role;
-        })[0];
-        let matchAccessibility = !settings.accessibility || !!track.accessibility.filter(function (item) {
-            return item === settings.accessibility;
-        })[0];
-        let matchAudioChannelConfiguration = !settings.audioChannelConfiguration || !!track.audioChannelConfiguration.filter(function (item) {
-            return item === settings.audioChannelConfiguration;
-        })[0];
-
-
-        return (matchLang && matchIndex && matchViewPoint && (matchRole || (track.type === Constants.AUDIO && isTrackActive)) && matchAccessibility && matchAudioChannelConfiguration);
+        try {
+            let matchLang = false;
+
+            // If there is no language defined in the target settings we got a match
+            if (!settings.lang) {
+                matchLang = true;
+            }
+
+            // If the target language is provided as a RegExp apply match function
+            else if (settings.lang instanceof RegExp) {
+                matchLang = track.lang.match(settings.lang);
+            }
+
+            // If the track has a language and we can normalize the target language check if we got a match
+            else if (track.lang !== '') {
+                const normalizedSettingsLang = bcp47Normalize(settings.lang);
+                if (normalizedSettingsLang) {
+                    matchLang = extendedFilter(track.lang, normalizedSettingsLang).length > 0
+                }
+            }
+
+            const matchIndex = (settings.index === undefined) || (settings.index === null) || (track.index === settings.index);
+            const matchViewPoint = !settings.viewpoint || (settings.viewpoint === track.viewpoint);
+            const matchRole = !settings.role || !!track.roles.filter(function (item) {
+                return item === settings.role;
+            })[0];
+            let matchAccessibility = !settings.accessibility || !!track.accessibility.filter(function (item) {
+                return item === settings.accessibility;
+            })[0];
+            let matchAudioChannelConfiguration = !settings.audioChannelConfiguration || !!track.audioChannelConfiguration.filter(function (item) {
+                return item === settings.audioChannelConfiguration;
+            })[0];
+
+
+            return (matchLang && matchIndex && matchViewPoint && (matchRole || (track.type === Constants.AUDIO && isTrackActive)) && matchAccessibility && matchAudioChannelConfiguration);
+        } catch (e) {
+            return false;
+            logger.error(e);
+        }
     }
 
     function resetInitialSettings() {