fix: Check bandwidth when filtering streams (#8125)

Fixes #8124.
shaka-project · Feb 22, 2025 · f7185c0 · f7185c0
1 parent 810582c
commit f7185c0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 5 deletions.
diff --git a/lib/util/stream_utils.js b/lib/util/stream_utils.js
@@ -196,11 +196,7 @@ shaka.util.StreamUtils = class {
             continue;
           }
         }
-        if (stream.width > previousStream.width ||
-          stream.height > previousStream.height) {
-          validVideoStreams.push(stream);
-          validVideoIds.push(stream.id);
-        } else if (stream.width == previousStream.width &&
+        if (stream.width == previousStream.width &&
           stream.height == previousStream.height) {
           const previousCodec =
             MimeUtils.getNormalizedCodec(previousStream.codecs);
@@ -213,6 +209,11 @@ shaka.util.StreamUtils = class {
               validVideoIds.push(stream.id);
             }
           }
+        } else if (stream.width > previousStream.width ||
+          stream.height > previousStream.height ||
+          stream.bandwidth > previousStream.bandwidth) {
+          validVideoStreams.push(stream);
+          validVideoIds.push(stream.id);
         }
       }
       validVideoStreamsMap.set(groupId, validVideoStreams);

diff --git a/test/util/stream_utils_unit.js b/test/util/stream_utils_unit.js
@@ -851,6 +851,38 @@ describe('StreamUtils', () => {
           v.video.bandwidth))).toBeTruthy();
     });
 
+    it('should keep variants where the lower resolution bandwidth' +
+      ' is greater than the higher resolution bandwidth', () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.bandwidth = 4000000;
+            stream.size(1920, 1080);
+          });
+        });
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(2, (stream) => {
+            stream.bandwidth = 5000000;
+            stream.size(1280, 720);
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(3, (stream) => {
+            stream.bandwidth = 3000000;
+            stream.size(640, 360);
+          });
+        });
+      });
+
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredDecodingAttributes= */[],
+          /* preferredTextFormats= */ []);
+
+      expect(manifest.variants.length).toBe(3);
+    });
+
     it('should filter variants by the best available bandwidth' +
     ' for audio language', () => {
       // This test is flaky in some Tizen devices, due to codec restrictions.