add isEmptyStream on buffer status event to handle empty stream speci…

…ficities
canalplus · Dec 6, 2022 · b339974 · b339974
1 parent ed0ba4b
commit b339974
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 35 deletions.
diff --git a/src/core/init/media_source_content_initializer.ts b/src/core/init/media_source_content_initializer.ts
@@ -569,8 +569,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
             return this.trigger("periodStreamCleared", evt.value);
           case "representationChange":
             return this.trigger("representationChange", evt.value);
-          case "complete-stream":
-            return this.trigger("completeStream", evt.value);
           case "bitrateEstimationChange":
             return this.trigger("bitrateEstimationChange", evt.value);
           case "added-segment":

diff --git a/src/core/init/types.ts b/src/core/init/types.ts
@@ -177,11 +177,6 @@ export interface IContentInitializerEvents {
      */
     period : Period;
   };
-  /**
-   * The last (chronologically) `Period` for a given type has pushed all
-   * the segments it needs until the end.
-   */
-   completeStream: { type: IBufferType };
   /** Emitted when a new `Adaptation` is being considered. */
   adaptationChange: {
     /** The type of buffer for which the Representation is changing. */

diff --git a/src/core/stream/events_generators.ts b/src/core/stream/events_generators.ts
@@ -29,7 +29,6 @@ import {
   IActivePeriodChangedEvent,
   IAdaptationChangeEvent,
   IBitrateEstimationChangeEvent,
-  ICompletedStreamEvent,
   IEncryptionDataEncounteredEvent,
   IEndOfStreamEvent,
   ILockedStreamEvent,
@@ -88,11 +87,6 @@ const EVENTS = {
              value: { type, bitrate } };
   },
 
-  streamComplete(bufferType: IBufferType) : ICompletedStreamEvent {
-    return { type: "complete-stream",
-             value: { type: bufferType } };
-  },
-
   endOfStream() : IEndOfStreamEvent {
     return { type: "end-of-stream",
              value: undefined };

diff --git a/src/core/stream/orchestrator/are_streams_complete.ts b/src/core/stream/orchestrator/are_streams_complete.ts
@@ -22,7 +22,7 @@ import {
   Observable,
   startWith,
 } from "rxjs";
-import { IStreamOrchestratorEvent } from "../types";
+import { IStreamOrchestratorEvent, IStreamStatusEvent } from "../types";
 
 /**
  * Returns an Observable which emits ``true`` when all PeriodStreams given are
@@ -53,11 +53,8 @@ export default function areStreamsComplete(
   const isCompleteArray : Array<Observable<boolean>> = streams
     .map((stream) => {
       return stream.pipe(
-        filter((evt) => {
-          return evt.type === "complete-stream" ||
-                 (evt.type === "stream-status" && !evt.value.hasFinishedLoading);
-        }),
-        map((evt) => evt.type === "complete-stream"),
+        filter((evt) : evt is IStreamStatusEvent => evt.type === "stream-status"),
+        map((evt) => evt.value.hasFinishedLoading || evt.value.isEmptyStream),
         startWith(false),
         distinctUntilChanged()
       );

diff --git a/src/core/stream/orchestrator/stream_orchestrator.ts b/src/core/stream/orchestrator/stream_orchestrator.ts
@@ -498,8 +498,7 @@ export default function StreamOrchestrator(
           if (evt.value.hasFinishedLoading) {
             const nextPeriod = manifest.getPeriodAfter(basePeriod);
             if (nextPeriod === null) {
-              return observableConcat(observableOf(evt),
-                                      observableOf(EVENTS.streamComplete(bufferType)));
+              return observableOf(evt);
             }
 
             // current Stream is full, create the next one if not

diff --git a/src/core/stream/period/create_empty_adaptation_stream.ts b/src/core/stream/period/create_empty_adaptation_stream.ts
@@ -62,6 +62,7 @@ export default function createEmptyAdaptationStream(
                                      bufferType,
                                      position,
                                      imminentDiscontinuity: null,
+                                     isEmptyStream: true,
                                      hasFinishedLoading,
                                      neededSegments: [],
                                      shouldRefreshManifest: false } });

diff --git a/src/core/stream/representation/representation_stream.ts b/src/core/stream/representation/representation_stream.ts
@@ -260,6 +260,7 @@ export default function RepresentationStream<TSegmentDataType>({
                                 position: observation.position.last,
                                 bufferType,
                                 imminentDiscontinuity: status.imminentDiscontinuity,
+                                isEmptyStream: false,
                                 hasFinishedLoading: status.hasFinishedLoading,
                                 neededSegments: status.neededSegments } });
       let bufferRemoval = EMPTY;

diff --git a/src/core/stream/types.ts b/src/core/stream/types.ts
@@ -97,6 +97,11 @@ export interface IStreamStatusEvent {
      * end of the Period.
      */
     hasFinishedLoading : boolean;
+    /**
+     * If `true`, this stream is a placeholder stream which will never load any
+     * segment.
+     */
+    isEmptyStream : boolean;
     /**
      * Segments that will be scheduled for download to fill the buffer until
      * the buffer goal (first element of that list might already be ).
@@ -317,13 +322,6 @@ export interface IEndOfStreamEvent { type: "end-of-stream";
 export interface IResumeStreamEvent { type: "resume-stream";
                                       value: undefined; }
 
-/**
- * The last (chronologically) `PeriodStream` for a given type has pushed all
- * the segments it needs until the end.
- */
-export interface ICompletedStreamEvent { type: "complete-stream";
-                                         value : { type: IBufferType }; }
-
 /**
  * A situation needs the MediaSource to be reloaded.
  *
@@ -499,7 +497,6 @@ export type IPeriodStreamEvent = IPeriodStreamReadyEvent |
 
 /** Event coming from function(s) managing multiple PeriodStreams. */
 export type IMultiplePeriodStreamsEvent = IPeriodStreamClearedEvent |
-                                          ICompletedStreamEvent |
 
                                           // From a PeriodStream
 
@@ -531,7 +528,6 @@ export type IStreamOrchestratorEvent = IActivePeriodChangedEvent |
                                        IResumeStreamEvent |
 
                                        IPeriodStreamClearedEvent |
-                                       ICompletedStreamEvent |
 
                                        // From a PeriodStream
 

diff --git a/tests/integration/scenarios/end_number.js b/tests/integration/scenarios/end_number.js
@@ -11,7 +11,7 @@ import {
 } from "../../contents/DASH_static_SegmentTimeline";
 import RxPlayer from "../../../src";
 import sleep from "../../utils/sleep.js";
-import { waitForLoadedStateAfterLoadVideo } from "../../utils/waitForPlayerState";
+import waitForState, { waitForLoadedStateAfterLoadVideo } from "../../utils/waitForPlayerState";
 
 let player;
 
@@ -71,13 +71,11 @@ describe("end number", function () {
     await sleep(500);
     expect(xhrMock.getLockedXHR().length).to.equal(2);
     xhrMock.flush();
-    player.seekTo(19.7);
+    player.seekTo(19);
     await sleep(50);
     expect(xhrMock.getLockedXHR().length).to.equal(2);
     xhrMock.flush();
-    await sleep(5000);
-    expect(xhrMock.getLockedXHR().length).to.equal(0);
-    expect(player.getPlayerState()).to.eql("ENDED");
+    await waitForState(player, "ENDED", ["BUFFERING", "RELOADING", "PLAYING"]);
     expect(player.getPosition()).to.be.closeTo(20, 1);
   });