rx-player 3.26.3-dev.2022021400 → 3.27.0-dev.20220317

package/src/experimental/index.ts

@@ -0,0 +1,5 @@
+import configHandler from "../config";
+
+export {
+  configHandler as config,
+};

package/src/experimental/tools/VideoThumbnailLoader/push_data.ts

@@ -24,6 +24,7 @@ export default function pushData(
                     adaptation: Adaptation;
                     representation: Representation;
                     segment: ISegment;
+                    chunkSize: number | undefined;
                     start: number;
                     end: number; },
   parsed: ISegmentParserParsedMediaChunk<Uint8Array | ArrayBuffer>,

package/src/experimental/tools/VideoThumbnailLoader/thumbnail_loader.ts

@@ -249,7 +249,8 @@ export default class VideoThumbnailLoader {
                   if (end === undefined) {
                     end = start + (segment.duration / segment.timescale);
                   }
-                  const inventoryInfos = objectAssign({ segment,
+                  const inventoryInfos = objectAssign({ chunkSize: data.chunkSize,
+                                                        segment,
                                                         start,
                                                         end }, contentInfos);
                   return pushData(inventoryInfos,

package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/DRMInfos.test.ts

@@ -20,11 +20,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable no-restricted-properties */
 
-import {
-  map,
-  of as observableOf,
-} from "rxjs";
 import { ProberStatus } from "../../types";
 
 
@@ -81,7 +78,7 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
       },
     };
     const mockRequestMediaKeySystemAccess = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         getConfiguration: () => ({}),
       });
     });
@@ -114,11 +111,7 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
     };
     const mockRequestMediaKeySystemAccess = jest.fn(
       () => {
-        return observableOf(null).pipe(
-          map(() => {
-            throw new Error();
-          })
-        );
+        return Promise.reject(new Error());
       }
     );
     jest.mock("../../../../../compat", () => ({

package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/HDCPPolicy.test.ts

@@ -20,8 +20,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable no-restricted-properties */
 
-import { of as observableOf } from "rxjs";
 import PPromise from "../../../../../utils/promise";
 import { ProberStatus } from "../../types";
 
@@ -60,7 +60,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       return PPromise.resolve({});
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });
@@ -90,7 +90,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       });
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });
@@ -120,7 +120,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       });
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });

package/src/experimental/tools/mediaCapabilitiesProber/probers/DRMInfos.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import log from "../log";
@@ -55,7 +54,7 @@ export default function probeDRMInfos(
     return PPromise.resolve([ProberStatus.NotSupported, result]);
   }
 
-  return lastValueFrom(requestMediaKeySystemAccess(type, [configuration]))
+  return requestMediaKeySystemAccess(type, [configuration])
     .then((keySystemAccess) => {
       result.compatibleConfiguration = keySystemAccess.getConfiguration();
       const status : [ProberStatus, ICompatibleKeySystem?] =

package/src/experimental/tools/mediaCapabilitiesProber/probers/HDCPPolicy.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import {
@@ -61,7 +60,7 @@ export default function probeHDCPPolicy(
     }],
   };
 
-  return lastValueFrom(requestMediaKeySystemAccess(keySystem, [drmConfig]))
+  return requestMediaKeySystemAccess(keySystem, [drmConfig])
     .then((mediaKeysSystemAccess) => {
       return mediaKeysSystemAccess.createMediaKeys().then((mediaKeys) => {
         if (!("getStatusForPolicy" in mediaKeys)) {

package/src/features/__tests__/initialize_features.test.ts

@@ -93,7 +93,7 @@ describe("Features - initializeFeaturesObject", () => {
       nativeTextTracksParsers: {},
       htmlTextTracksBuffer: null,
       htmlTextTracksParsers: {},
-      emeManager: null,
+      ContentDecryptor: null,
       directfile: null,
     };
     jest.mock("../features_object", () => ({
@@ -113,7 +113,7 @@ describe("Features - initializeFeaturesObject", () => {
         js: require("../../parsers/manifest/dash/js-parser").default,
         wasm: null,
       },
-      emeManager: require("../../core/eme/index").default,
+      ContentDecryptor: require("../../core/decrypt/index").default,
       directfile: {
         initDirectFile: require("../../core/init/initialize_directfile").default,
         mediaElementTrackChoiceManager:

package/src/features/features_object.ts

@@ -23,7 +23,7 @@ import { IFeaturesObject } from "./types";
 const features : IFeaturesObject = { dashParsers: { wasm: null,
                                                     js: null },
                                      directfile: null,
-                                     emeManager: null,
+                                     ContentDecryptor: null,
                                      htmlTextTracksBuffer: null,
                                      htmlTextTracksParsers: {},
                                      imageBuffer: null,

package/src/features/initialize_features.ts

@@ -27,7 +27,7 @@ import features from "./features_object";
  */
 export default function initializeFeaturesObject() : void {
   if (__FEATURES__.EME === __FEATURES__.IS_ENABLED as number) {
-    features.emeManager = require("../core/eme/index.ts").default;
+    features.ContentDecryptor = require("../core/decrypt/index.ts").default;
   }
 
   if (__FEATURES__.BIF_PARSER === __FEATURES__.IS_ENABLED as number) {

package/src/features/list/__tests__/eme.test.ts

@@ -17,20 +17,20 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import emeManager from "../../../core/eme";
+import ContentDecryptor from "../../../core/decrypt";
 import addEMEFeature from "../eme";
 
-jest.mock("../../../core/eme", () => ({
+jest.mock("../../../core/decrypt", () => ({
   __esModule: true as const,
   default: jest.fn(),
 }));
 
 describe("Features list - EME", () => {
-  it("should add EME in the current features", () => {
+  it("should add the ContentDecryptor in the current features", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const featureObject : any = {};
     addEMEFeature(featureObject);
-    expect(featureObject).toEqual({ emeManager });
-    expect(featureObject.emeManager).toBe(emeManager);
+    expect(featureObject).toEqual({ ContentDecryptor });
+    expect(featureObject.ContentDecryptor).toBe(ContentDecryptor);
   });
 });

package/src/features/list/eme.ts

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-import EMEManager from "../../core/eme";
+import ContentDecryptor from "../../core/decrypt";
 import { IFeaturesObject } from "../types";
 
 /**
  * Add ability to play encrypted contents
  * @param {Object} features
  */
-function addEMEManagerFeature(features : IFeaturesObject) : void {
-  features.emeManager = EMEManager;
+function addEMEFeature(features : IFeaturesObject) : void {
+  features.ContentDecryptor = ContentDecryptor;
 }
 
-export { addEMEManagerFeature as EME };
-export default addEMEManagerFeature;
+export { addEMEFeature as EME };
+export default addEMEFeature;

package/src/features/types.ts

@@ -17,11 +17,7 @@
 import { Observable } from "rxjs";
 // eslint-disable-next-line max-len
 import MediaElementTrackChoiceManager from "../core/api/media_element_track_choice_manager";
-import {
-  IContentProtection,
-  IEMEManagerEvent,
-  IKeySystemOption,
-} from "../core/eme";
+import type ContentDecryptor from "../core/decrypt";
 import {
   IDirectfileEvent,
   IDirectFileOptions,
@@ -41,10 +37,7 @@ import { ITransportFunction } from "../transports";
 export type IDirectFileInit = (args : IDirectFileOptions) =>
                                 Observable<IDirectfileEvent>;
 
-export type IEMEManager = (mediaElement : HTMLMediaElement,
-                           keySystems: IKeySystemOption[],
-                           contentProtections$ : Observable<IContentProtection>) =>
-                             Observable<IEMEManagerEvent>;
+export type IContentDecryptorClass = typeof ContentDecryptor;
 
 export type IHTMLTextTracksBuffer =
   new(mediaElement : HTMLMediaElement,
@@ -89,7 +82,7 @@ export interface IFeaturesObject {
   directfile : { initDirectFile: IDirectFileInit;
                  mediaElementTrackChoiceManager : IMediaElementTrackChoiceManager; } |
                null;
-  emeManager : IEMEManager|null;
+  ContentDecryptor : IContentDecryptorClass|null;
   htmlTextTracksBuffer : IHTMLTextTracksBuffer|null;
   htmlTextTracksParsers : Partial<Record<string, IHTMLTextTracksParserFn>>;
   imageBuffer : IImageBuffer|null;

package/src/manifest/manifest.ts

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import { IInitializationDataInfo } from "../core/eme";
 import {
   ICustomError,
   MediaError,
 } from "../errors";
 import { IParsedManifest } from "../parsers/manifest";
-import areArraysOfNumbersEqual from "../utils/are_arrays_of_numbers_equal";
 import arrayFind from "../utils/array_find";
 import EventEmitter from "../utils/event_emitter";
 import idGenerator from "../utils/id_generator";
@@ -502,73 +500,10 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
    * changes performed.
    * @param {Object} keyUpdates
    */
-  public updateDeciperabilitiesBasedOnKeyIds(
-    { whitelistedKeyIds,
-      blacklistedKeyIDs } : { whitelistedKeyIds : Uint8Array[];
-                              blacklistedKeyIDs : Uint8Array[]; }
+  public updateRepresentationsDeciperability(
+    isDecipherableCb : (rep : Representation) => boolean | undefined
   ) : void {
-    const updates = updateDeciperability(this, (representation) => {
-      if (representation.decipherable === false ||
-          representation.contentProtections === undefined)
-      {
-        return representation.decipherable;
-      }
-      const contentKIDs = representation.contentProtections.keyIds;
-      for (let i = 0; i < contentKIDs.length; i++) {
-        const elt = contentKIDs[i];
-        for (let j = 0; j < blacklistedKeyIDs.length; j++) {
-          if (areArraysOfNumbersEqual(blacklistedKeyIDs[j], elt.keyId)) {
-            return false;
-          }
-        }
-        for (let j = 0; j < whitelistedKeyIds.length; j++) {
-          if (areArraysOfNumbersEqual(whitelistedKeyIds[j], elt.keyId)) {
-            return true;
-          }
-        }
-      }
-      return representation.decipherable;
-    });
-
-    if (updates.length > 0) {
-      this.trigger("decipherabilityUpdate", updates);
-    }
-  }
-
-  /**
-   * Look in the Manifest for Representations linked to the given content
-   * protection initialization data and mark them as being impossible to
-   * decrypt.
-   * Then trigger a "decipherabilityUpdate" event to notify everyone of the
-   * changes performed.
-   * @param {Object} initData
-   */
-  public addUndecipherableProtectionData(initData : IInitializationDataInfo) : void {
-    const updates = updateDeciperability(this, (representation) => {
-      if (representation.decipherable === false) {
-        return false;
-      }
-      const segmentProtections = representation.contentProtections?.initData ?? [];
-      for (let i = 0; i < segmentProtections.length; i++) {
-        if (initData.type === undefined ||
-            segmentProtections[i].type === initData.type)
-        {
-          const containedInitData = initData.values.every(undecipherableVal => {
-            return segmentProtections[i].values.some(currVal => {
-              return (undecipherableVal.systemId === undefined ||
-                      currVal.systemId === undecipherableVal.systemId) &&
-                     areArraysOfNumbersEqual(currVal.data,
-                                             undecipherableVal.data);
-            });
-          });
-          if (containedInitData) {
-            return false;
-          }
-        }
-      }
-      return representation.decipherable;
-    });
-
+    const updates = updateDeciperability(this, isDecipherableCb);
     if (updates.length > 0) {
       this.trigger("decipherabilityUpdate", updates);
     }
@@ -795,14 +730,9 @@ function updateDeciperability(
   isDecipherable : (rep : Representation) => boolean | undefined
 ) : IDecipherabilityUpdateElement[] {
   const updates : IDecipherabilityUpdateElement[] = [];
-  for (let i = 0; i < manifest.periods.length; i++) {
-    const period = manifest.periods[i];
-    const adaptations = period.getAdaptations();
-    for (let j = 0; j < adaptations.length; j++) {
-      const adaptation = adaptations[j];
-      const representations = adaptation.representations;
-      for (let k = 0; k < representations.length; k++) {
-        const representation = representations[k];
+  for (const period of manifest.periods) {
+    for (const adaptation of period.getAdaptations()) {
+      for (const representation of adaptation.representations) {
         const result = isDecipherable(representation);
         if (result !== representation.decipherable) {
           updates.push({ manifest, period, adaptation, representation });

package/src/manifest/representation.ts

@@ -15,7 +15,6 @@
  */
 
 import { isCodecSupported } from "../compat";
-import { IContentProtection } from "../core/eme";
 import log from "../log";
 import {
   IContentProtections,
@@ -166,7 +165,7 @@ class Representation {
    * @param {string} drmSystemId - The hexa-encoded DRM system ID
    * @returns {Array.<Object>}
    */
-  public getEncryptionData(drmSystemId : string) : IContentProtection[] {
+  public getEncryptionData(drmSystemId : string) : IRepresentationProtectionData[] {
     const allInitData = this.getAllEncryptionData();
     const filtered = [];
     for (let i = 0; i < allInitData.length; i++) {
@@ -216,7 +215,7 @@ class Representation {
    * after parsing this Representation's initialization segment, if one exists.
    * @returns {Array.<Object>}
    */
-  public getAllEncryptionData() : IContentProtection[] {
+  public getAllEncryptionData() : IRepresentationProtectionData[] {
     if (this.contentProtections === undefined ||
         this.contentProtections.initData.length === 0)
     {
@@ -297,4 +296,38 @@ class Representation {
   }
 }
 
+/** Protection data as returned by a Representation. */
+export interface IRepresentationProtectionData {
+  /**
+   * Initialization data type.
+   * String describing the format of the initialization data sent through this
+   * event.
+   * https://www.w3.org/TR/eme-initdata-registry/
+   */
+  type: string;
+  /**
+   * The key ids linked to those initialization data.
+   * This should be the key ids for the key concerned by the media which have
+   * the present initialization data.
+   *
+   * `undefined` when not known (different from an empty array - which would
+   * just mean that there's no key id involved).
+   */
+  keyIds : Uint8Array[] | undefined;
+  /** Every initialization data for that type. */
+  values: Array<{
+    /**
+     * Hex encoded system id, which identifies the key system.
+     * https://dashif.org/identifiers/content_protection/
+     */
+    systemId: string;
+    /**
+     * The initialization data itself for that type and systemId.
+     * For example, with "cenc" initialization data found in an ISOBMFF file,
+     * this will be the whole PSSH box.
+     */
+     data: Uint8Array;
+  }>;
+}
+
 export default Representation;

package/src/parsers/manifest/dash/common/indexes/is_period_fulfilled.ts

@@ -16,7 +16,6 @@
 
 import config from "../../../../../config";
 
-const { DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR } = config;
 
 /**
  * In Javascript, numbers are encoded in a way that a floating number may be
@@ -36,7 +35,7 @@ export default function isPeriodFulfilled(
   periodEnd: number
 ): boolean {
   const scaledRoundingError =
-    DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR * timescale;
+    config.getCurrent().DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR * timescale;
   return (lastSegmentEnd + scaledRoundingError) >= periodEnd;
 }
 

package/src/parsers/manifest/dash/common/indexes/template.ts

@@ -29,7 +29,6 @@ import {
   createIndexURLs,
 } from "./tokens";
 
-const { MINIMUM_SEGMENT_SIZE } = config;
 
 /**
  * Index property defined for a SegmentTemplate RepresentationIndex
@@ -533,7 +532,7 @@ export default class TemplateRepresentationIndex implements IRepresentationIndex
       // segment that there actually is due to a very little difference between
       // the period's duration and a multiple of a segment's duration.
       // Check that we're within a good margin
-      const minimumDuration = MINIMUM_SEGMENT_SIZE * timescale;
+      const minimumDuration = config.getCurrent().MINIMUM_SEGMENT_SIZE * timescale;
       if (maximumTime - regularLastSegmentStart > minimumDuration ||
           numberIndexedToZero === 0)
       {

package/src/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.ts

@@ -47,7 +47,6 @@ import constructTimelineFromElements from "./construct_timeline_from_elements";
 // eslint-disable-next-line max-len
 import constructTimelineFromPreviousTimeline from "./construct_timeline_from_previous_timeline";
 
-const { MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY } = config;
 
 /**
  * Index property defined for a SegmentTimeline RepresentationIndex
@@ -606,6 +605,7 @@ export default class TimelineRepresentationIndex implements IRepresentationIndex
     const newElements = this._parseTimeline();
     this._parseTimeline = null; // Free memory
 
+    const { MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY } = config.getCurrent();
     if (this._unsafelyBaseOnPreviousIndex === null ||
         newElements.length < MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY)
     {