fix(DASH): Fix playback of some DASH with multiple periods

build/types/core

@@ -114,6 +114,7 @@
 +../../lib/util/public_promise.js
 +../../lib/util/state_history.js
 +../../lib/util/stats.js
++../../lib/util/segment_index.js
 +../../lib/util/stream_utils.js
 +../../lib/util/string_utils.js
 +../../lib/util/switch_history.js

externs/shaka/manifest_parser.js

@@ -120,6 +120,13 @@ shaka.extern.ManifestParser = class {
    * @exportDoc
    */
   setMediaElement(mediaElement) {}
+
+  /**
+   * provide CloseSegmentIndexRegister
+   * @param {shaka.util.CloseSegmentIndexRegister} register
+   * @exportDoc
+   */
+  setCloseSegmentIndexRegister(register) {}
 };
 
 

lib/dash/dash_parser.js

@@ -230,6 +230,18 @@ shaka.dash.DashParser = class {
     }
   }
 
+  /**
+   * @override
+   * @exportInterface
+  */
+  setCloseSegmentIndexRegister(register) {
+    const parser = this;
+    const closeSegmentIndexes = () => {
+      parser.handleDeferredCloseSegmentIndexes();
+    };
+    register.add(closeSegmentIndexes);
+  }
+
   /**
    * @override
    * @exportInterface
@@ -1491,6 +1503,17 @@ shaka.dash.DashParser = class {
     }
   }
 
+  /**
+   * Handles deferred releases of old SegmentIndexes
+   * content type from a previous update.
+   * @export
+   */
+  handleDeferredCloseSegmentIndexes() {
+    if (this.periodCombiner_) {
+      this.periodCombiner_.handleDeferredCloseSegmentIndexes();
+    }
+  }
+
   /**
    * Clean StreamMap Object to remove reference of deleted Stream Object
    * @private

lib/dash/segment_template.js

@@ -833,6 +833,17 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     }
   }
 
+  /**
+   * @override
+   */
+  evictAll() {
+    if (this.templateInfo_ && this.templateInfo_.timeline.length) {
+      this.numEvicted_ += this.templateInfo_.timeline.length;
+      this.templateInfo_.timeline = [];
+    }
+    this.references = [];
+  }
+
   /**
    * Merge new template info
    * @param {shaka.dash.SegmentTemplate.SegmentTemplateInfo} info

lib/hls/hls_parser.js

@@ -311,6 +311,11 @@ shaka.hls.HlsParser = class {
     }
   }
 
+  /** @override */
+  setCloseSegmentIndexRegister(register) {
+    // No-op
+  }
+
   /**
    * @override
    * @exportInterface

lib/media/segment_index.js

@@ -308,6 +308,17 @@ shaka.media.SegmentIndex = class {
     this.numEvicted_ += diff;
   }
 
+  /**
+   * Removes all SegmentReferences that end before the given time.
+   * @export
+   */
+  evictAll() {
+    if (this.references.length) {
+      this.numEvicted_ += this.references.length;
+      this.references = [];
+    }
+  }
+
 
   /**
    * Drops references that start after windowEnd, or end before windowStart,

lib/media/streaming_engine.js

@@ -34,7 +34,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4BoxParsers');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
-
+goog.require('shaka.util.CloseSegmentIndexRegister');
 
 /**
  * @summary Creates a Streaming Engine.
@@ -148,6 +148,12 @@ shaka.media.StreamingEngine = class {
 
     /** @private {?shaka.media.StreamingEngine.MediaState_} */
     this.lastTextMediaStateBeforeUnload_ = null;
+
+    /**
+     * @private {shaka.util.CloseSegmentIndexRegister}
+     */
+    this.closeSegmentIndexRegister_ =
+      new shaka.util.CloseSegmentIndexRegister();
   }
 
   /** @override */
@@ -182,6 +188,7 @@ shaka.media.StreamingEngine = class {
     this.playerInterface_ = null;
     this.manifest_ = null;
     this.config_ = null;
+    this.closeSegmentIndexRegister_ = null;
   }
 
   /**
@@ -269,7 +276,6 @@ shaka.media.StreamingEngine = class {
     }
   }
 
-
   /**
    * Applies a playback range. This will only affect non-live content.
    *
@@ -530,8 +536,15 @@ shaka.media.StreamingEngine = class {
         this.deferredCloseSegmentIndex_.delete(streamId);
       }
     }
+    this.closeSegmentIndexRegister_.closeSegmentIndexes();
   }
 
+  /**
+   * @return {shaka.util.CloseSegmentIndexRegister}
+   */
+  getCloseSegmentIndexRegister() {
+    return this.closeSegmentIndexRegister_;
+  }
 
   /**
    * Switches to the given Stream. |stream| may be from any Variant.

lib/mss/mss_parser.js

@@ -103,6 +103,12 @@ shaka.mss.MssParser = class {
     }
   }
 
+  /**
+   *  @override
+   *  @exportInterface
+   */
+  setCloseSegmentIndexRegister(register) {}
+
   /**
    * @override
    * @exportInterface

lib/offline/offline_manifest_parser.js

@@ -31,6 +31,11 @@ shaka.offline.OfflineManifestParser = class {
     // No-op
   }
 
+  /** @override */
+  setCloseSegmentIndexRegister(register) {
+    // No-op
+  }
+
   /** @override */
   async start(uriString, playerInterface) {
     /** @type {shaka.offline.OfflineUri} */

lib/player.js

@@ -2570,6 +2570,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     this.streamingEngine_ = this.createStreamingEngine();
     this.streamingEngine_.configure(this.config_.streaming);
+    this.parser_.setCloseSegmentIndexRegister(
+        this.streamingEngine_.getCloseSegmentIndexRegister());
 
     // Set the load mode to "loaded with media source" as late as possible so
     // that public methods won't try to access internal components until

lib/util/periods.js

@@ -56,6 +56,15 @@ shaka.util.PeriodCombiner = class {
      * @private {!Set.<string>}
      */
     this.usedPeriodIds_ = new Set();
+
+    /**
+     * Retains a reference to the function used to close SegmentIndex objects
+     * for streams which were switched away from during an ongoing update_()
+     * just after the period removal.
+     *
+     * @private {!Map.<number, !function()>}
+     */
+    this.deferredCloseSegmentIndex_ = new Map();
   }
 
   /** @override */
@@ -69,7 +78,7 @@ shaka.util.PeriodCombiner = class {
         stream.segmentIndex.release();
       }
     }
-
+    this.handleDeferredCloseSegmentIndexes();
     this.audioStreams_ = [];
     this.videoStreams_ = [];
     this.textStreams_ = [];
@@ -110,6 +119,21 @@ shaka.util.PeriodCombiner = class {
     return this.imageStreams_;
   }
 
+
+  /**
+   * Handles deferred releases of old SegmentIndexes
+   * content type from a previous update.
+   * @export
+   */
+  handleDeferredCloseSegmentIndexes() {
+    for (const [key, value] of this.deferredCloseSegmentIndex_.entries()) {
+      const streamId = /** @type {number} */ (key);
+      const closeSegmentIndex = /** @type {function()} */ (value);
+      closeSegmentIndex();
+      this.deferredCloseSegmentIndex_.delete(streamId);
+    }
+  }
+
   /**
    * Deletes a stream from matchedStreams because it is no longer needed
    *
@@ -154,9 +178,17 @@ shaka.util.PeriodCombiner = class {
         });
       }
     }
-    if (stream.segmentIndex) {
-      stream.closeSegmentIndex();
+    if (stream.segmentIndex &&
+      !this.deferredCloseSegmentIndex_.has(stream.id)) {
+      const deferedCloseSegmentIndex = () => {
+        if (stream.segmentIndex) {
+          stream.segmentIndex.evictAll();
+          stream.closeSegmentIndex();
+        }
+      };
+      this.deferredCloseSegmentIndex_.set(stream.id, deferedCloseSegmentIndex);
     }
+
     this.usedPeriodIds_.delete(periodId);
   }
 

lib/util/segment_index.js

@@ -0,0 +1,36 @@
+goog.provide('shaka.util.CloseSegmentIndexRegister');
+
+/**
+ * @summary a register which provides an interface
+ * to close shaka.media.SegmentIndex
+ * @export
+ */
+shaka.util.CloseSegmentIndexRegister = class {
+  /** */
+  constructor() {
+    /** @private {!Array.<Function>} */
+    this.register_ = [];
+  }
+
+  /**
+     * add function which closes shaka.media.SegmentIndex
+     * from the stream
+     * @param {Function} closeSegmentIndexFunction
+     */
+  add(closeSegmentIndexFunction) {
+    if (closeSegmentIndexFunction) {
+      this.register_.push(closeSegmentIndexFunction);
+    }
+  }
+
+  /**
+     * close shaka.media.SegmentIndex from register
+     */
+  closeSegmentIndexes() {
+    for (const closeSegmentIndexFunction of this.register_) {
+      if (closeSegmentIndexFunction) {
+        closeSegmentIndexFunction();
+      }
+    }
+  }
+};

test/offline/storage_integration.js

@@ -1734,6 +1734,11 @@ filterDescribe('Storage', storageSupport, () => {
     /** @override */
     configure(params) {}
 
+    /** @override */
+    setCloseSegmentIndexRegister(register) {
+      // No-op
+    }
+
     /** @override */
     start(uri, player) {
       return Promise.resolve(this.map_[uri]);

test/test/util/simple_fakes.js

@@ -120,6 +120,10 @@ shaka.test.FakeStreamingEngine = class {
         jasmine.createSpy('switchTextStream').and.callFake((textStream) => {
           activeText = textStream;
         });
+
+    /** @type {!jasmine.Spy} */
+    this.getCloseSegmentIndexRegister =
+      jasmine.createSpy('getCloseSegmentIndexRegister');
   }
 };
 
@@ -149,6 +153,10 @@ shaka.test.FakeManifestParser = class {
 
     /** @type {!jasmine.Spy} */
     this.onExpirationUpdated = jasmine.createSpy('onExpirationUpdated');
+
+    /** @type {!jasmine.Spy} */
+    this.setCloseSegmentIndexRegister =
+      jasmine.createSpy('setCloseSegmentIndexRegister');
   }
 };
 

test/test/util/test_scheme.js

@@ -754,6 +754,11 @@ shaka.test.TestScheme.ManifestParser = class {
     return new shaka.test.TestScheme.ManifestParser();
   }
 
+  /** @override */
+  setCloseSegmentIndexRegister(register) {
+    // No-op
+  }
+
   /** @override */
   start(uri, playerInterface) {
     const re = /^test:([^/]+)$/;