fix: Fix NaN and empty objects in getNonDefaultConfiguration (#6956)

shaka-project · Jul 2, 2024 · 52e3864 · 52e3864
1 parent fa9feb3
commit 52e3864
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/util/config_utils.js b/lib/util/config_utils.js
@@ -196,6 +196,8 @@ shaka.util.ConfigUtils = class {
           }
         } else if (isArrayEmpty(value) && isArrayEmpty(base[key])) {
           // Do nothing if both are empty arrays
+        } else if (Number.isNaN(value) && Number.isNaN(base[key])) {
+          // Do nothing if both are NaN
         } else if (value !== base[key]) {
           acc[key] = value;
         }
@@ -215,6 +217,9 @@ shaka.util.ConfigUtils = class {
           delete obj[key];
         } else if (isObject(obj[key])) {
           removeEmpty(obj[key]);
+          if (Object.keys(obj[key]).length === 0) {
+            delete obj[key];
+          }
         }
       }
     };

diff --git a/test/player_unit.js b/test/player_unit.js
@@ -772,13 +772,19 @@ describe('Player', () => {
 
   it('getNonDefaultConfiguration', () => {
     player.configure({
+      manifest: {
+        disableThumbnails: true,
+      },
       drm: {
         retryParameters: {backoffFactor: 5},
       },
     });
     const nonDefaultConfiguration = player.getNonDefaultConfiguration();
     const config = player.getConfiguration();
     expect(nonDefaultConfiguration).not.toBe(config);
+    expect(nonDefaultConfiguration['mediaSource']).toBeUndefined();
+    expect(nonDefaultConfiguration['manifest']['availabilityWindowOverride'])
+        .toBeUndefined();
   });
 
   describe('configure', () => {