rx-player 4.1.0 → 4.2.0-dev.2024080600

package/src/manifest/classes/__tests__/representation.test.ts

@@ -1,6 +1,6 @@
-import { describe, beforeEach, afterEach, it, expect, vi } from "vitest";
-import features from "../../../features";
+import { describe, it, expect, vi } from "vitest";
 import type { IParsedRepresentation } from "../../../parsers/manifest";
+import CodecSupportCache from "../codec_support_cache";
 import Representation from "../representation";
 import type { IRepresentationIndex } from "../representation_index";
 
@@ -55,28 +55,16 @@ const minimalIndex: IRepresentationIndex = {
   },
 };
 
-const defaultIsCodecSupported = vi.fn(
-  (_mimetype: string, _codec: string): boolean | undefined => true,
-);
-
 describe("Manifest - Representation", () => {
-  beforeEach(() => {
-    features.codecSupportProber = {
-      isSupported: defaultIsCodecSupported,
-    };
-  });
-  afterEach(() => {
-    features.codecSupportProber = null;
-    defaultIsCodecSupported.mockClear();
-  });
-
+  const cache = new CodecSupportCache([]);
   it("should be able to create Representation with the minimum arguments given", () => {
     const args = {
       bitrate: 12,
       id: "test",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -87,10 +75,10 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe(undefined);
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe(';codecs=""');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
-    expect(defaultIsCodecSupported).toHaveBeenCalledWith("", "");
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledWith("", "", false);
   });
 
   it("should be able to add a height attribute", () => {
@@ -100,7 +88,8 @@ describe("Manifest - Representation", () => {
       height: 57,
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "video");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "video", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -111,9 +100,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe(undefined);
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe(';codecs=""');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a width attribute", () => {
@@ -123,7 +112,8 @@ describe("Manifest - Representation", () => {
       width: 2,
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "video");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "video", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -134,9 +124,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe(undefined);
     expect(representation.width).toBe(2);
     expect(representation.getMimeTypeString()).toBe(';codecs=""');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a codecs attribute", () => {
@@ -146,7 +136,8 @@ describe("Manifest - Representation", () => {
       codecs: "vp9",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -157,9 +148,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe(undefined);
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe(';codecs="vp9"');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a supplementalCodecs attribute", () => {
@@ -170,20 +161,21 @@ describe("Manifest - Representation", () => {
       supplementalCodecs: "test",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
-    expect(representation.codecs).toEqual(["test"]);
+    expect(representation.codecs).toEqual(["test", "vp9"]);
     expect(representation.contentProtections).toBe(undefined);
     expect(representation.frameRate).toBe(undefined);
     expect(representation.height).toBe(undefined);
     expect(representation.mimeType).toBe(undefined);
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe(';codecs="test"');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a mimeType attribute", () => {
@@ -193,7 +185,8 @@ describe("Manifest - Representation", () => {
       mimeType: "audio/mp4",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -204,9 +197,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe("audio/mp4");
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe('audio/mp4;codecs=""');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a contentProtections attribute", () => {
@@ -228,7 +221,8 @@ describe("Manifest - Representation", () => {
         },
       },
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "video");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "video", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -239,9 +233,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe("video/mp4");
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe('video/mp4;codecs="vp12"');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to add a frameRate attribute", () => {
@@ -253,7 +247,8 @@ describe("Manifest - Representation", () => {
       codecs: "mp4a.40.2",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -264,9 +259,9 @@ describe("Manifest - Representation", () => {
     expect(representation.mimeType).toBe("audio/mp4");
     expect(representation.width).toBe(undefined);
     expect(representation.getMimeTypeString()).toBe('audio/mp4;codecs="mp4a.40.2"');
-    expect(representation.isSupported).toBe(true);
+    expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
   it("should be able to return an exploitable codecs + mimeType string", () => {
@@ -275,7 +270,9 @@ describe("Manifest - Representation", () => {
       id: "test",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    expect(new Representation(args1, "audio").getMimeTypeString()).toBe(';codecs=""');
+    expect(new Representation(args1, "audio", cache).getMimeTypeString()).toBe(
+      ';codecs=""',
+    );
 
     const args2 = {
       bitrate: 12,
@@ -283,7 +280,9 @@ describe("Manifest - Representation", () => {
       mimeType: "foo",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    expect(new Representation(args2, "audio").getMimeTypeString()).toBe('foo;codecs=""');
+    expect(new Representation(args2, "audio", cache).getMimeTypeString()).toBe(
+      'foo;codecs=""',
+    );
 
     const args3 = {
       bitrate: 12,
@@ -291,7 +290,9 @@ describe("Manifest - Representation", () => {
       codecs: "bar",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    expect(new Representation(args3, "audio").getMimeTypeString()).toBe(';codecs="bar"');
+    expect(new Representation(args3, "audio", cache).getMimeTypeString()).toBe(
+      ';codecs="bar"',
+    );
 
     const args4 = {
       bitrate: 12,
@@ -300,13 +301,12 @@ describe("Manifest - Representation", () => {
       codecs: "bar",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    expect(new Representation(args4, "audio").getMimeTypeString()).toBe(
+    expect(new Representation(args4, "audio", cache).getMimeTypeString()).toBe(
       'foo;codecs="bar"',
     );
   });
 
   it("should set `isSupported` of non-supported codecs or mime-type to `false`", () => {
-    defaultIsCodecSupported.mockImplementation(() => false);
     const args = {
       bitrate: 12,
       id: "test",
@@ -315,7 +315,16 @@ describe("Manifest - Representation", () => {
       codecs: "mp4a.40.2",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const customCache = new CodecSupportCache([
+      {
+        mimeType: "audio/mp4",
+        codec: "mp4a.40.2",
+        supported: false,
+        supportedIfEncrypted: false,
+      },
+    ]);
+    const spyCodecCache = vi.spyOn(customCache, "isSupported");
+    const representation = new Representation(args, "audio", customCache);
     expect(representation.id).toBe("test");
     expect(representation.bitrate).toBe(12);
     expect(representation.index).toBe(minimalIndex);
@@ -328,8 +337,8 @@ describe("Manifest - Representation", () => {
     expect(representation.getMimeTypeString()).toBe('audio/mp4;codecs="mp4a.40.2"');
     expect(representation.isSupported).toBe(false);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
-    expect(defaultIsCodecSupported).toHaveBeenCalledWith("audio/mp4", "mp4a.40.2");
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledWith("audio/mp4", "mp4a.40.2", false);
   });
 
   it("should not check support for a text media buffer", () => {
@@ -341,17 +350,17 @@ describe("Manifest - Representation", () => {
       codecs: "boop",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "text");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "text", cache);
     expect(representation.codecs).toEqual(["boop"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="boop"');
     expect(representation.isSupported).toBe(true);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(0);
+    expect(spyCodecCache).toHaveBeenCalledTimes(0);
   });
 
-  it("should not check support if no feature to check support exists", () => {
-    features.codecSupportProber = null;
+  it("should not set isSupported if codec cache returns undefined", () => {
     const args = {
       bitrate: 12,
       id: "test",
@@ -360,36 +369,17 @@ describe("Manifest - Representation", () => {
       codecs: "boop",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.codecs).toEqual(["boop"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="boop"');
     expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(0);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
-  it("should not set isSupported if support prober returns undefined", () => {
-    defaultIsCodecSupported.mockImplementation(() => undefined);
-    const args = {
-      bitrate: 12,
-      id: "test",
-      frameRate: "1/60",
-      mimeType: "bip",
-      codecs: "boop",
-      index: minimalIndex,
-    } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
-    expect(representation.codecs).toEqual(["boop"]);
-    expect(representation.mimeType).toBe("bip");
-    expect(representation.getMimeTypeString()).toBe('bip;codecs="boop"');
-    expect(representation.isSupported).toBe(undefined);
-    expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
-  });
-
-  it("should have both supplementalCodecs and codecs if support prober returns undefined", () => {
-    defaultIsCodecSupported.mockImplementation(() => undefined);
+  it("should have both supplementalCodecs and codecs if codec cache returns undefined", () => {
     const args = {
       bitrate: 12,
       id: "test",
@@ -399,21 +389,23 @@ describe("Manifest - Representation", () => {
       supplementalCodecs: "bap",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi.spyOn(cache, "isSupported");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.codecs).toEqual(["bap", "boop"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="bap"');
     expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 
-  it("should only have codecs if support prober returns false for the supplementalCodecs and true for the codecs", () => {
-    defaultIsCodecSupported.mockImplementation(
-      (_arg1: string, arg2: string): boolean | undefined => {
-        return arg2 === "boop";
-      },
-    );
+  it("should only have codecs if codec cache returns false for the supplementalCodecs and true for the codecs", () => {
+    const spyCodecCache = vi
+      .spyOn(cache, "isSupported")
+      .mockImplementation((_mimeType: string, codec: string, _encrypted: boolean) => {
+        return codec === "boop";
+      });
+
     const args = {
       bitrate: 12,
       id: "test",
@@ -423,21 +415,22 @@ describe("Manifest - Representation", () => {
       supplementalCodecs: "bap",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.codecs).toEqual(["boop"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="boop"');
     expect(representation.isSupported).toBe(true);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalled();
+    expect(spyCodecCache).toHaveBeenCalled();
   });
 
-  it("should have both supplementalCodecs and codecs if support prober returns undefined for the former and true for the latter", () => {
-    defaultIsCodecSupported.mockImplementation(
-      (_arg1: string, arg2: string): boolean | undefined => {
-        return arg2 === "boop" ? true : undefined;
-      },
-    );
+  it("should have both supplementalCodecs and codecs if codec cache returns undefined for the former and true for the latter", () => {
+    const spyCodecCache = vi
+      .spyOn(cache, "isSupported")
+      .mockImplementation((_mimeType: string, codec: string, _encrypted: boolean) => {
+        return codec === "boop" ? true : undefined;
+      });
+
     const args = {
       bitrate: 12,
       id: "test",
@@ -447,21 +440,16 @@ describe("Manifest - Representation", () => {
       supplementalCodecs: "bap",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const representation = new Representation(args, "audio", cache);
     expect(representation.codecs).toEqual(["bap", "boop"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="bap"');
     expect(representation.isSupported).toBe(undefined);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalled();
+    expect(spyCodecCache).toHaveBeenCalled();
   });
 
-  it("should only have supplementalCodecs if support prober returns true for the former", () => {
-    defaultIsCodecSupported.mockImplementation(
-      (_arg1: string, arg2: string): boolean | undefined => {
-        return arg2 === "bap" ? true : undefined;
-      },
-    );
+  it("should only have supplementalCodecs if codec cache returns true for the former", () => {
     const args = {
       bitrate: 12,
       id: "test",
@@ -471,12 +459,17 @@ describe("Manifest - Representation", () => {
       supplementalCodecs: "bap",
       index: minimalIndex,
     } as unknown as IParsedRepresentation;
-    const representation = new Representation(args, "audio");
+    const spyCodecCache = vi
+      .spyOn(cache, "isSupported")
+      .mockImplementation((_mimeType: string, codec: string, _encrypted: boolean) => {
+        return codec === "bap" ? true : undefined;
+      });
+    const representation = new Representation(args, "audio", cache);
     expect(representation.codecs).toEqual(["bap"]);
     expect(representation.mimeType).toBe("bip");
     expect(representation.getMimeTypeString()).toBe('bip;codecs="bap"');
     expect(representation.isSupported).toBe(true);
     expect(representation.decipherable).toBe(undefined);
-    expect(defaultIsCodecSupported).toHaveBeenCalledTimes(1);
+    expect(spyCodecCache).toHaveBeenCalledTimes(1);
   });
 });

package/src/manifest/classes/__tests__/update_period_in_place.test.ts

@@ -169,26 +169,26 @@ function generateFakeAdaptation({
 }
 
 describe("Manifest - updatePeriodInPlace", () => {
-  let mockOldVideoRepresentation1Replace: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation2Replace: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation3Replace: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation4Replace: MockInstance<[], void> | undefined;
-  let mockOldAudioRepresentationReplace: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation1Update: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation2Update: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation3Update: MockInstance<[], void> | undefined;
-  let mockOldVideoRepresentation4Update: MockInstance<[], void> | undefined;
-  let mockOldAudioRepresentationUpdate: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation1Replace: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation2Replace: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation3Replace: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation4Replace: MockInstance<[], void> | undefined;
-  let mockNewAudioRepresentationReplace: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation1Update: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation2Update: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation3Update: MockInstance<[], void> | undefined;
-  let mockNewVideoRepresentation4Update: MockInstance<[], void> | undefined;
-  let mockNewAudioRepresentationUpdate: MockInstance<[], void> | undefined;
+  let mockOldVideoRepresentation1Replace: MockInstance | undefined;
+  let mockOldVideoRepresentation2Replace: MockInstance | undefined;
+  let mockOldVideoRepresentation3Replace: MockInstance | undefined;
+  let mockOldVideoRepresentation4Replace: MockInstance | undefined;
+  let mockOldAudioRepresentationReplace: MockInstance | undefined;
+  let mockOldVideoRepresentation1Update: MockInstance | undefined;
+  let mockOldVideoRepresentation2Update: MockInstance | undefined;
+  let mockOldVideoRepresentation3Update: MockInstance | undefined;
+  let mockOldVideoRepresentation4Update: MockInstance | undefined;
+  let mockOldAudioRepresentationUpdate: MockInstance | undefined;
+  let mockNewVideoRepresentation1Replace: MockInstance | undefined;
+  let mockNewVideoRepresentation2Replace: MockInstance | undefined;
+  let mockNewVideoRepresentation3Replace: MockInstance | undefined;
+  let mockNewVideoRepresentation4Replace: MockInstance | undefined;
+  let mockNewAudioRepresentationReplace: MockInstance | undefined;
+  let mockNewVideoRepresentation1Update: MockInstance | undefined;
+  let mockNewVideoRepresentation2Update: MockInstance | undefined;
+  let mockNewVideoRepresentation3Update: MockInstance | undefined;
+  let mockNewVideoRepresentation4Update: MockInstance | undefined;
+  let mockNewAudioRepresentationUpdate: MockInstance | undefined;
 
   beforeEach(() => {
     mockOldVideoRepresentation1Replace = vi.spyOn(