rx-player 3.26.2 → 3.27.0-dev.20220317

package/src/transports/dash/segment_parser.ts

@@ -42,7 +42,9 @@ import getEventsOutOfEMSGs from "./get_events_out_of_emsgs";
  * @returns {Function}
  */
 export default function generateAudioVideoSegmentParser(
-  { __priv_patchLastSegmentInSidx } : { __priv_patchLastSegmentInSidx? : boolean }
+  { __priv_patchLastSegmentInSidx } : {
+    __priv_patchLastSegmentInSidx? : boolean | undefined;
+  }
 ) : ISegmentParser<
   ArrayBuffer | Uint8Array | null,
   ArrayBuffer | Uint8Array | null
@@ -62,11 +64,13 @@ export default function generateAudioVideoSegmentParser(
       if (segment.isInit) {
         return { segmentType: "init",
                  initializationData: null,
+                 initializationDataSize: 0,
                  protectionDataUpdate: false,
                  initTimescale: undefined };
       }
       return { segmentType: "media",
                chunkData: null,
+               chunkSize: 0,
                chunkInfos: null,
                chunkOffset: 0,
                protectionDataUpdate: false,
@@ -113,6 +117,7 @@ export default function generateAudioVideoSegmentParser(
             const { needsManifestRefresh, inbandEvents } = events;
             return { segmentType: "media",
                      chunkData,
+                     chunkSize: chunkData.length,
                      chunkInfos,
                      chunkOffset,
                      appendWindow,
@@ -125,6 +130,7 @@ export default function generateAudioVideoSegmentParser(
 
       return { segmentType: "media",
                chunkData,
+               chunkSize: chunkData.length,
                chunkInfos,
                chunkOffset,
                protectionDataUpdate,
@@ -175,6 +181,7 @@ export default function generateAudioVideoSegmentParser(
 
     return { segmentType: "init",
              initializationData: chunkData,
+             initializationDataSize: chunkData.length,
              protectionDataUpdate,
              initTimescale: parsedTimescale };
   };

package/src/transports/dash/text_loader.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
+import PPromise from "../../utils/promise";
 import request, {
   fetchIsSupported,
 } from "../../utils/request";
@@ -43,7 +43,7 @@ import lowLatencySegmentLoader from "./low_latency_segment_loader";
 export default function generateTextTrackLoader(
   { lowLatencyMode,
     checkMediaSegmentIntegrity } : { lowLatencyMode: boolean;
-                                     checkMediaSegmentIntegrity? : boolean; }
+                                     checkMediaSegmentIntegrity? : boolean | undefined; }
 ) : ISegmentLoader<Uint8Array | ArrayBuffer | string | null> {
   return checkMediaSegmentIntegrity !== true ? textTrackLoader :
                                                addSegmentIntegrityChecks(textTrackLoader);

package/src/transports/dash/text_parser.ts

@@ -102,6 +102,7 @@ function parseISOBMFFEmbeddedTextTrack(
     }
     return { segmentType: "init",
              initializationData: null,
+             initializationDataSize: 0,
              protectionDataUpdate: false,
              initTimescale: mdhdTimescale };
   }
@@ -116,6 +117,7 @@ function parseISOBMFFEmbeddedTextTrack(
   const chunkOffset = takeFirstSet<number>(segment.timestampOffset, 0);
   return { segmentType: "media",
            chunkData,
+           chunkSize: chunkBytes.length,
            chunkInfos,
            chunkOffset,
            protectionDataUpdate: false,
@@ -144,21 +146,25 @@ function parsePlainTextTrack(
   if (segment.isInit) {
     return { segmentType: "init",
              initializationData: null,
+             initializationDataSize: 0,
              protectionDataUpdate: false,
              initTimescale: undefined };
   }
 
   let textTrackData : string;
+  let chunkSize : number | undefined;
   if (typeof data !== "string") {
     const bytesData = data instanceof Uint8Array ? data :
                                                    new Uint8Array(data);
     textTrackData = utf8ToStr(bytesData);
+    chunkSize = bytesData.length;
   } else {
     textTrackData = data;
   }
   const chunkData = getPlainTextTrackData(content, textTrackData, isChunked);
   return { segmentType: "media",
            chunkData,
+           chunkSize,
            chunkInfos: null,
            chunkOffset: timestampOffset,
            protectionDataUpdate: false,
@@ -172,7 +178,9 @@ function parsePlainTextTrack(
  * @returns {Function}
  */
 export default function generateTextTrackParser(
-  { __priv_patchLastSegmentInSidx } : { __priv_patchLastSegmentInSidx? : boolean }
+  { __priv_patchLastSegmentInSidx } : {
+    __priv_patchLastSegmentInSidx? : boolean | undefined;
+  }
 ) : ISegmentParser< ArrayBuffer | Uint8Array | string | null,
                     ITextTrackSegmentData | null > {
   /**
@@ -194,11 +202,13 @@ export default function generateTextTrackParser(
       // No data, just return an empty placeholder object
       return segment.isInit ? { segmentType: "init",
                                 initializationData: null,
+                                initializationDataSize: 0,
                                 protectionDataUpdate: false,
                                 initTimescale: undefined } :
 
                               { segmentType: "media",
                                 chunkData: null,
+                                chunkSize: 0,
                                 chunkInfos: null,
                                 chunkOffset: segment.timestampOffset ?? 0,
                                 protectionDataUpdate: false,

package/src/transports/local/segment_loader.ts

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import { CustomLoaderError } from "../../errors";
 import {
   ILocalManifestInitSegmentLoader,
   ILocalManifestSegmentLoader,
 } from "../../parsers/manifest/local";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
+import PPromise from "../../utils/promise";
 import {
   CancellationError,
   CancellationSignal,
@@ -39,7 +39,7 @@ import {
 function loadInitSegment(
   customSegmentLoader : ILocalManifestInitSegmentLoader,
   cancelSignal : CancellationSignal
-) : PPromise<ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
+) : Promise<ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
   return new PPromise((res, rej) => {
     /** `true` when the custom segmentLoader should not be active anymore. */
     let hasFinished = false;
@@ -107,7 +107,7 @@ function loadSegment(
   segment : { time : number; duration : number; timestampOffset? : number },
   customSegmentLoader : ILocalManifestSegmentLoader,
   cancelSignal : CancellationSignal
-) : PPromise< ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
+) : Promise< ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
   return new PPromise((res, rej) => {
     /** `true` when the custom segmentLoader should not be active anymore. */
     let hasFinished = false;
@@ -191,7 +191,7 @@ export default function segmentLoader(
   content : ISegmentContext,
   cancelSignal : CancellationSignal,
   _callbacks : ISegmentLoaderCallbacks<ArrayBuffer | null>
-) : PPromise<ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
+) : Promise<ISegmentLoaderResultSegmentLoaded<ArrayBuffer | null>> {
   const { segment } = content;
   const privateInfos = segment.privateInfos;
   if (segment.isInit) {

package/src/transports/local/segment_parser.ts

@@ -44,11 +44,13 @@ export default function segmentParser(
     if (segment.isInit) {
       return { segmentType: "init",
                initializationData: null,
+               initializationDataSize: 0,
                protectionDataUpdate: false,
                initTimescale: undefined };
     }
     return { segmentType: "media",
              chunkData: null,
+             chunkSize: 0,
              chunkInfos: null,
              chunkOffset: 0,
              protectionDataUpdate: false,
@@ -74,6 +76,7 @@ export default function segmentParser(
                                                  getMDHDTimescale(chunkData);
     return { segmentType: "init",
              initializationData: chunkData,
+             initializationDataSize: 0,
              initTimescale: timescale ?? undefined,
              protectionDataUpdate };
   }
@@ -86,6 +89,7 @@ export default function segmentParser(
   const chunkOffset = takeFirstSet<number>(segment.timestampOffset, 0);
   return { segmentType: "media",
            chunkData,
+           chunkSize: chunkData.length,
            chunkInfos,
            chunkOffset,
            protectionDataUpdate: false,

package/src/transports/local/text_parser.ts

@@ -66,6 +66,7 @@ function parseISOBMFFEmbeddedTextTrack(
     const mdhdTimescale = getMDHDTimescale(chunkBytes);
     return { segmentType: "init",
              initializationData: null,
+             initializationDataSize: 0,
              initTimescale: mdhdTimescale,
              protectionDataUpdate: false };
   }
@@ -80,6 +81,7 @@ function parseISOBMFFEmbeddedTextTrack(
   const chunkOffset = takeFirstSet<number>(segment.timestampOffset, 0);
   return { segmentType: "media",
            chunkData,
+           chunkSize: chunkBytes.length,
            chunkInfos,
            chunkOffset,
            protectionDataUpdate: false,
@@ -107,15 +109,18 @@ function parsePlainTextTrack(
   if (segment.isInit) {
     return { segmentType: "init",
              initializationData: null,
+             initializationDataSize: 0,
              initTimescale: undefined,
              protectionDataUpdate: false };
   }
 
   let textTrackData : string;
+  let chunkSize : number | undefined;
   if (typeof data !== "string") {
     const bytesData = data instanceof Uint8Array ? data :
                                                    new Uint8Array(data);
     textTrackData = utf8ToStr(bytesData);
+    chunkSize = bytesData.length;
   } else {
     textTrackData = data;
   }
@@ -123,6 +128,7 @@ function parsePlainTextTrack(
   const chunkOffset = takeFirstSet<number>(segment.timestampOffset, 0);
   return { segmentType: "media",
            chunkData,
+           chunkSize,
            chunkInfos: null,
            chunkOffset,
            protectionDataUpdate: false,
@@ -152,12 +158,14 @@ export default function textTrackParser(
     if (segment.isInit) {
       return { segmentType: "init",
                initializationData: null,
+               initializationDataSize: 0,
                protectionDataUpdate: false,
                initTimescale: undefined };
     }
     const chunkOffset = segment.timestampOffset ?? 0;
     return { segmentType: "media",
              chunkData: null,
+             chunkSize: 0,
              chunkInfos: null,
              chunkOffset,
              protectionDataUpdate: false,

package/src/transports/metaplaylist/manifest_loader.ts

@@ -43,7 +43,7 @@ function regularManifestLoader(
  * @returns {Function}
  */
 export default function generateManifestLoader(
-  { customManifestLoader } : { customManifestLoader?: ICustomManifestLoader }
+  { customManifestLoader } : { customManifestLoader?: ICustomManifestLoader | undefined }
 ) : (
     url : string | undefined,
     cancelSignal : CancellationSignal

package/src/transports/metaplaylist/pipelines.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import features from "../../features";
 import Manifest, {
   Adaptation,
@@ -29,6 +28,7 @@ import parseMetaPlaylist, {
 import { IParsedManifest } from "../../parsers/manifest/types";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import objectAssign from "../../utils/object_assign";
+import PPromise from "../../utils/promise";
 import { CancellationSignal } from "../../utils/task_canceller";
 import {
   IChunkTimeInfo,

package/src/transports/smooth/pipelines.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import features from "../../features";
 import log from "../../log";
 import Manifest, {
@@ -25,6 +24,7 @@ import { getMDAT } from "../../parsers/containers/isobmff";
 import createSmoothManifestParser, {
   SmoothRepresentationIndex,
 } from "../../parsers/manifest/smooth";
+import PPromise from "../../utils/promise";
 import request from "../../utils/request";
 import {
   strToUtf8,
@@ -178,8 +178,8 @@ export default function(options : ITransportOptions) : ITransportPipelines {
       content : ISegmentContext,
       cancelSignal : CancellationSignal,
       callbacks : ISegmentLoaderCallbacks<ILoadedAudioVideoSegmentFormat>
-    ) : PPromise<ISegmentLoaderResultSegmentLoaded<ILoadedAudioVideoSegmentFormat> |
-                 ISegmentLoaderResultSegmentCreated<ILoadedAudioVideoSegmentFormat>>
+    ) : Promise<ISegmentLoaderResultSegmentLoaded<ILoadedAudioVideoSegmentFormat> |
+                ISegmentLoaderResultSegmentCreated<ILoadedAudioVideoSegmentFormat>>
     {
       return segmentLoader(url, content, cancelSignal, callbacks);
     },
@@ -198,6 +198,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
         if (segment.isInit) {
           return { segmentType: "init",
                    initializationData: null,
+                   initializationDataSize: 0,
                    protectionDataUpdate: false,
                    initTimescale: undefined };
         }
@@ -205,6 +206,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                  chunkData: null,
                  chunkInfos: null,
                  chunkOffset: 0,
+                 chunkSize: 0,
                  protectionDataUpdate: false,
                  appendWindow: [undefined, undefined] };
       }
@@ -216,6 +218,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
         const timescale = segment.privateInfos?.smoothInitSegment?.timescale;
         return { segmentType: "init",
                  initializationData: data,
+                 initializationDataSize: data.byteLength,
                  // smooth init segments are crafted by hand.
                  // Their timescale is the one from the manifest.
                  initTimescale: timescale,
@@ -244,6 +247,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                chunkData,
                chunkInfos,
                chunkOffset: 0,
+               chunkSize: chunkData.length,
                protectionDataUpdate: false,
                appendWindow: [undefined, undefined] };
     },
@@ -255,8 +259,8 @@ export default function(options : ITransportOptions) : ITransportPipelines {
       content : ISegmentContext,
       cancelSignal : CancellationSignal,
       callbacks : ISegmentLoaderCallbacks<ILoadedTextSegmentFormat>
-    ) : PPromise<ISegmentLoaderResultSegmentLoaded<ILoadedTextSegmentFormat> |
-                 ISegmentLoaderResultSegmentCreated<ILoadedTextSegmentFormat>> {
+    ) : Promise<ISegmentLoaderResultSegmentLoaded<ILoadedTextSegmentFormat> |
+                ISegmentLoaderResultSegmentCreated<ILoadedTextSegmentFormat>> {
       const { segment, representation } = content;
       if (segment.isInit || url === null) {
         return PPromise.resolve({ resultType: "segment-created",
@@ -302,9 +306,11 @@ export default function(options : ITransportOptions) : ITransportPipelines {
       const isMP4 = isMP4EmbeddedTrack(representation);
       const { mimeType = "", codec = "" } = representation;
       const { data, isChunked } = loadedSegment;
+      let chunkSize : number | undefined;
       if (segment.isInit) { // text init segment has no use in HSS
         return { segmentType: "init",
                  initializationData: null,
+                 initializationDataSize: 0,
                  protectionDataUpdate: false,
                  initTimescale: undefined };
       }
@@ -313,6 +319,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                  chunkData: null,
                  chunkInfos: null,
                  chunkOffset: 0,
+                 chunkSize: 0,
                  protectionDataUpdate: false,
                  appendWindow: [undefined, undefined] };
       }
@@ -333,6 +340,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
           chunkBytes = data instanceof Uint8Array ? data :
             new Uint8Array(data);
         }
+        chunkSize = chunkBytes.length;
         const timingInfos = initTimescale !== undefined ?
           extractTimingsInfos(chunkBytes,
                               isChunked,
@@ -380,6 +388,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
         if (typeof data !== "string") {
           const bytesData = data instanceof Uint8Array ? data :
                                                          new Uint8Array(data);
+          chunkSize = bytesData.length;
           chunkString = utf8ToStr(bytesData);
         } else {
           chunkString = data;
@@ -423,6 +432,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                             start: segmentStart,
                             end: segmentEnd,
                             language },
+               chunkSize,
                chunkInfos,
                chunkOffset,
                protectionDataUpdate: false,
@@ -431,25 +441,25 @@ export default function(options : ITransportOptions) : ITransportPipelines {
   };
 
   const imageTrackPipeline = {
-    loadSegment(
+    async loadSegment(
       url : string | null,
       content : ISegmentContext,
       cancelSignal : CancellationSignal,
       callbacks : ISegmentLoaderCallbacks<ILoadedImageSegmentFormat>
-    ) : PPromise<ISegmentLoaderResultSegmentLoaded<ILoadedImageSegmentFormat> |
-                 ISegmentLoaderResultSegmentCreated<ILoadedImageSegmentFormat>> {
+    ) : Promise<ISegmentLoaderResultSegmentLoaded<ILoadedImageSegmentFormat> |
+                ISegmentLoaderResultSegmentCreated<ILoadedImageSegmentFormat>> {
       if (content.segment.isInit || url === null) {
         // image do not need an init segment. Passthrough directly to the parser
-        return PPromise.resolve({ resultType: "segment-created" as const,
-                                  resultData: null });
+        return { resultType: "segment-created" as const,
+                 resultData: null };
       }
 
-      return request({ url,
-                       responseType: "arraybuffer",
-                       onProgress: callbacks.onProgress,
-                       cancelSignal })
-        .then((data) => ({ resultType: "segment-loaded" as const,
-                           resultData: data }));
+      const data = await request({ url,
+                                   responseType: "arraybuffer",
+                                   onProgress: callbacks.onProgress,
+                                   cancelSignal });
+      return { resultType: "segment-loaded" as const,
+               resultData: data };
     },
 
     parseSegment(
@@ -465,6 +475,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
       if (content.segment.isInit) { // image init segment has no use
         return { segmentType: "init",
                  initializationData: null,
+                 initializationDataSize: 0,
                  protectionDataUpdate: false,
                  initTimescale: undefined };
       }
@@ -479,6 +490,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                  chunkData: null,
                  chunkInfos: null,
                  chunkOffset: 0,
+                 chunkSize: 0,
                  protectionDataUpdate: false,
                  appendWindow: [undefined, undefined] };
       }
@@ -493,6 +505,7 @@ export default function(options : ITransportOptions) : ITransportPipelines {
                             type: "bif" },
                chunkInfos: { time: 0,
                              duration: Number.MAX_VALUE },
+               chunkSize: undefined,
                chunkOffset: 0,
                protectionDataUpdate: false,
                appendWindow: [undefined, undefined] };

package/src/transports/smooth/segment_loader.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import { CustomLoaderError } from "../../errors";
 import assert from "../../utils/assert";
+import PPromise from "../../utils/promise";
 import request from "../../utils/request";
 import {
   CancellationError,
@@ -51,7 +51,7 @@ function regularSegmentLoader(
   content : ISegmentContext,
   callbacks : ISegmentLoaderCallbacks<Uint8Array | ArrayBuffer | null>,
   cancelSignal : CancellationSignal,
-  checkMediaSegmentIntegrity? : boolean
+  checkMediaSegmentIntegrity? : boolean | undefined
 ) : Promise<ISegmentLoaderResultSegmentLoaded<Uint8Array | ArrayBuffer | null>> {
   let headers;
   const range = content.segment.range;
@@ -85,8 +85,8 @@ const generateSegmentLoader = ({
   checkMediaSegmentIntegrity,
   customSegmentLoader,
 } : {
-  checkMediaSegmentIntegrity? : boolean;
-  customSegmentLoader? : ICustomSegmentLoader;
+  checkMediaSegmentIntegrity? : boolean | undefined;
+  customSegmentLoader? : ICustomSegmentLoader | undefined;
 }) => (
   url : string | null,
   content : ISegmentContext,
@@ -165,7 +165,7 @@ const generateSegmentLoader = ({
                                   checkMediaSegmentIntegrity);
     }
 
-    return new Promise((res, rej) => {
+    return new PPromise((res, rej) => {
       /** `true` when the custom segmentLoader should not be active anymore. */
       let hasFinished = false;
 
@@ -176,8 +176,8 @@ const generateSegmentLoader = ({
        */
       const resolve = (_args : {
         data : ArrayBuffer|Uint8Array;
-        size? : number;
-        duration? : number;
+        size? : number | undefined;
+        duration? : number | undefined;
       }) => {
         if (hasFinished || cancelSignal.isCancelled) {
           return;
@@ -231,7 +231,7 @@ const generateSegmentLoader = ({
       const progress = (
         _args : { duration : number;
                   size : number;
-                  totalSize? : number; }
+                  totalSize? : number | undefined; }
       ) => {
         if (hasFinished || cancelSignal.isCancelled) {
           return;