Remove Map / Update BCP-47 Libraries (#87)

bbc · Oct 5, 2023 · 5537d30 · 5537d30
1 parent ba5903d
commit 5537d30
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 68 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,8 +58,8 @@
         "yargs": "16.0.3"
     },
     "dependencies": {
-        "bcp-47-match": "^1.0.3",
-        "bcp-47-normalize": "^1.1.1",
+        "bcp-47-match": "^2.0.3",
+        "bcp-47-normalize": "^2.3.0",
         "codem-isoboxer": "0.3.9",
         "es6-promise": "^4.2.8",
         "fast-deep-equal": "2.0.1",

diff --git a/src/dash/DashAdapter.js b/src/dash/DashAdapter.js
@@ -38,7 +38,7 @@ import Event from './vo/Event';
 import FactoryMaker from '../core/FactoryMaker';
 import DashManifestModel from './models/DashManifestModel';
 import PatchManifestModel from './models/PatchManifestModel';
-import bcp47Normalize from 'bcp-47-normalize';
+import {bcp47Normalize} from 'bcp-47-normalize';
 
 /**
  * @module DashAdapter
@@ -1045,7 +1045,7 @@ function DashAdapter() {
         viewpoint = dashManifestModel.getViewpointForAdaptation(realAdaptation);
         mediaInfo.viewpoint = viewpoint.length ? viewpoint[0].value : undefined;
         mediaInfo.viewpointsWithSchemeIdUri = viewpoint;
-        
+
         accessibility = dashManifestModel.getAccessibilityForAdaptation(realAdaptation);
         mediaInfo.accessibility = accessibility.map(function (accessibility) {
             let accessibilityValue = accessibility.value;
@@ -1075,13 +1075,13 @@ function DashAdapter() {
             });
             mediaInfo.audioChannelConfigurationsWithSchemeIdUri = acc_rep;
         }
-        
+
         roles = dashManifestModel.getRolesForAdaptation(realAdaptation);
         mediaInfo.roles = roles.map(function (role) {
             return role.value;
         });
         mediaInfo.rolesWithSchemeIdUri = roles;
-        
+
         mediaInfo.codec = dashManifestModel.getCodec(realAdaptation);
         mediaInfo.mimeType = dashManifestModel.getMimeType(realAdaptation);
         mediaInfo.contentProtection = dashManifestModel.getContentProtectionData(realAdaptation);
@@ -1120,7 +1120,7 @@ function DashAdapter() {
                 mediaInfo.supplementalPropertiesAsArray = arr[0];
             }
         }
-        
+
         mediaInfo.isFragmented = dashManifestModel.getIsFragmented(realAdaptation);
         mediaInfo.isEmbedded = false;
 

diff --git a/src/dash/parser/matchers/LangMatcher.js b/src/dash/parser/matchers/LangMatcher.js
@@ -33,7 +33,7 @@
  */
 import BaseMatcher from './BaseMatcher';
 import DashConstants from '../../constants/DashConstants';
-import bcp47Normalize from 'bcp-47-normalize';
+import {bcp47Normalize} from 'bcp-47-normalize';
 
 class LangMatcher extends BaseMatcher {
     constructor() {

diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js
@@ -33,7 +33,7 @@ import Events from '../../core/events/Events';
 import EventBus from '../../core/EventBus';
 import FactoryMaker from '../../core/FactoryMaker';
 import Debug from '../../core/Debug';
-import bcp47Normalize from 'bcp-47-normalize';
+import {bcp47Normalize} from 'bcp-47-normalize';
 import {extendedFilter} from 'bcp-47-match';
 
 function MediaController() {

diff --git a/src/streaming/models/VideoModel.js b/src/streaming/models/VideoModel.js
@@ -36,13 +36,16 @@ import Debug from '../../core/Debug';
 import Constants from '../constants/Constants';
 import Settings from '../../core/Settings';
 
+const READY_STATES_TO_EVENT_NAMES = function () {
+    const ret = {};
 
-const READY_STATES_TO_EVENT_NAMES = new Map([
-    [Constants.VIDEO_ELEMENT_READY_STATES.HAVE_METADATA, 'loadedmetadata'],
-    [Constants.VIDEO_ELEMENT_READY_STATES.HAVE_CURRENT_DATA, 'loadeddata'],
-    [Constants.VIDEO_ELEMENT_READY_STATES.HAVE_FUTURE_DATA, 'canplay'],
-    [Constants.VIDEO_ELEMENT_READY_STATES.HAVE_ENOUGH_DATA, 'canplaythrough']
-]);
+    ret[Constants.VIDEO_ELEMENT_READY_STATES.HAVE_METADATA] = 'loadedmetadata';
+    ret[Constants.VIDEO_ELEMENT_READY_STATES.HAVE_CURRENT_DATA] = 'loadeddata';
+    ret[Constants.VIDEO_ELEMENT_READY_STATES.HAVE_FUTURE_DATA] = 'canplay';
+    ret[Constants.VIDEO_ELEMENT_READY_STATES.HAVE_ENOUGH_DATA] = 'canplaythrough';
+
+    return ret;
+}();
 
 function VideoModel() {
 
@@ -447,7 +450,7 @@ function VideoModel() {
             callback();
         } else {
             // wait for the appropriate callback before checking again
-            const event = READY_STATES_TO_EVENT_NAMES.get(targetReadyState);
+            const event = READY_STATES_TO_EVENT_NAMES[targetReadyState];
             _listenOnce(event, callback);
         }
     }