rx-player 4.2.0-dev.2024092400 → 4.2.0-dev.2024101500

package/src/main_thread/text_displayer/native/native_text_displayer.ts

@@ -158,24 +158,7 @@ export default class NativeTextDisplayer implements ITextDisplayer {
   public reset(): void {
     log.debug("NTD: Aborting NativeTextDisplayer");
     this._removeData(0, Infinity);
-    const { _trackElement, _videoElement } = this;
-
-    if (_trackElement !== undefined && _videoElement.hasChildNodes()) {
-      try {
-        _videoElement.removeChild(_trackElement);
-      } catch (_e) {
-        log.warn("NTD: Can't remove track element from the video");
-      }
-    }
-
-    // Ugly trick to work-around browser bugs by refreshing its mode
-    const oldMode = this._track.mode;
-    this._track.mode = "disabled";
-    this._track.mode = oldMode;
-
-    if (this._trackElement !== undefined) {
-      this._trackElement.innerHTML = "";
-    }
+    this._clearTrackElement();
   }
 
   public stop(): void {
@@ -213,6 +196,27 @@ export default class NativeTextDisplayer implements ITextDisplayer {
     }
     this._buffered.remove(start, end);
   }
+
+  private _clearTrackElement(): void {
+    const { _trackElement, _videoElement } = this;
+
+    if (_trackElement !== undefined && _videoElement.hasChildNodes()) {
+      try {
+        _videoElement.removeChild(_trackElement);
+      } catch (_e) {
+        log.warn("NTD: Can't remove track element from the video");
+      }
+    }
+
+    // Ugly trick to work-around browser bugs by refreshing its mode
+    const oldMode = this._track.mode;
+    this._track.mode = "disabled";
+    this._track.mode = oldMode;
+
+    if (this._trackElement !== undefined) {
+      this._trackElement.innerHTML = "";
+    }
+  }
 }
 
 /** Data of chunks that should be pushed to the NativeTextDisplayer. */

package/src/mse/main_media_source_interface.ts

@@ -464,6 +464,20 @@ export class MainSourceBufferInterface implements ISourceBufferInterface {
           op.reject(error);
         });
         this._currentOperations = [];
+
+        // A synchronous error probably will not lead to updateend event, so we need to
+        // go to next queue element manually
+        //
+        // FIXME: This here is needed to ensure that we're not left with a
+        // dangling queue of operations.
+        // However it can potentially be counter-productive if e.g. the `appendBuffer`
+        // error was due to a full buffer and if there are pushing operations awaiting in
+        // the queue.
+        //
+        // A better solution might just be to reject all push operations right away here?
+        // Only for a `QuotaExceededError` (to check MSE)?
+        // However this is too disruptive for what is now a hotfix
+        this._performNextOperation();
       }
     } else {
       // TODO merge contiguous removes?
@@ -482,7 +496,13 @@ export class MainSourceBufferInterface implements ISourceBufferInterface {
                 false,
               );
         nextElem.reject(error);
+        this._currentOperations.forEach((op) => {
+          op.reject(error);
+        });
         this._currentOperations = [];
+        // A synchronous error probably will not lead to updateend event, so we need to
+        // go to next queue element manually
+        this._performNextOperation();
       }
     }
   }

package/src/transports/smooth/pipelines.ts

@@ -350,6 +350,7 @@ export default function (transportOptions: ITransportOptions): ITransportPipelin
         if (
           mimeType === "application/ttml+xml+mp4" ||
           lcCodec === "stpp" ||
+          lcCodec === "stpp.ttml" ||
           lcCodec === "stpp.ttml.im1t"
         ) {
           _sdType = "ttml";

package/src/transports/utils/parse_text_track.ts

@@ -42,6 +42,7 @@ export function getISOBMFFTextTrackFormat(codecs: string | undefined): "ttml" |
   }
   switch (codecs.toLowerCase()) {
     case "stpp": // stpp === TTML in MP4
+    case "stpp.ttml":
     case "stpp.ttml.im1t":
       return "ttml";
     case "wvtt": // wvtt === WebVTT in MP4

package/src/utils/sync_or_async.ts

@@ -78,12 +78,14 @@ const SyncOrAsync = {
    * @returns {Object}
    */
   createAsync<T>(val: Promise<T>): ISyncOrAsyncValue<T> {
-    let ret = null;
-    val.then((resolved) => {
+    let ret: T | null = null;
+    val.then((resolved: T) => {
       ret = resolved;
     }, noop);
     return {
-      syncValue: ret,
+      get syncValue(): T | null {
+        return ret;
+      },
       getValueAsAsync() {
         return val;
       },