fix(FEC-7913): Live - player doesn't seek to live edge on resume (#48)

* fix(FEC-7913): Live - player doesn't seek to live on resume
kaltura · Feb 15, 2018 · 193fea0 · 193fea0
1 parent 02e9637
commit 193fea0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/src/hls-adapter.js b/src/hls-adapter.js
@@ -360,6 +360,18 @@ export default class HlsAdapter extends BaseMediaSourceAdapter {
     return this._hls.autoLevelEnabled;
   }
 
+  /**
+   * Returns the details of hls level
+   * @function _getLevelDetails
+   * @returns {Object} - Level details
+   * @private
+   */
+  _getLevelDetails(): Object {
+    const level = this._hls.levels[this._hls.currentLevel] || this._hls.levels[this._hls.nextLevel] || this._hls.levels[this._hls.nextAutoLevel] || this._hls.levels[this._hls.nextLoadLevel];
+    return level ? level.details : {};
+  }
+
+
   /**
    * Returns the live edge
    * @returns {number} - live edge
@@ -368,14 +380,16 @@ export default class HlsAdapter extends BaseMediaSourceAdapter {
   _getLiveEdge(): number {
     try {
       let liveEdge;
-      if (this._hls.config.liveSyncDuration) {
+      if (this._hls.liveSyncPosition) {
+        liveEdge = this._hls.liveSyncPosition;
+      } else if (this._hls.config.liveSyncDuration) {
         liveEdge = this._videoElement.duration - this._hls.config.liveSyncDuration;
       } else {
-        liveEdge = this._videoElement.duration - this._hls.config.liveSyncDurationCount * this._hls.levels[0].details.targetduration;
+        liveEdge = this._videoElement.duration - this._hls.config.liveSyncDurationCount * this._getLevelDetails().targetduration;
       }
-      return liveEdge > 0 ? liveEdge : 0;
+      return liveEdge > 0 ? liveEdge : this._videoElement.duration;
     } catch (e) {
-      return NaN;
+      return this._videoElement.duration;
     }
   }
 
@@ -401,7 +415,7 @@ export default class HlsAdapter extends BaseMediaSourceAdapter {
    */
   isLive(): boolean {
     try {
-      return this._hls.levels[0].details.live;
+      return this._getLevelDetails().live;
     } catch (e) {
       return false;
     }

diff --git a/test/src/hls-adapter.spec.js b/test/src/hls-adapter.spec.js
@@ -551,32 +551,15 @@ describe('HlsAdapter Instance - _getLiveEdge', function () {
     });
   });
 
-  it('should return live edge for liveSyncDuration = 60', (done) => {
-    config.playback.options.html5.hls.liveSyncDuration = 60;
+  it('should return live edge', (done) => {
     hlsAdapterInstance = HlsAdapter.createAdapter(video, liveSource, config);
     hlsAdapterInstance.load().then(() => {
       hlsAdapterInstance._videoElement.addEventListener('durationchange', () => {
-        if (video.duration > 60) {
-          hlsAdapterInstance._getLiveEdge().should.be.equal(video.duration - 60);
+        if (hlsAdapterInstance._hls.liveSyncPosition) {
+          hlsAdapterInstance._getLiveEdge().should.be.equal(hlsAdapterInstance._hls.liveSyncPosition);
           done();
         } else {
-          hlsAdapterInstance._getLiveEdge().should.be.equal(0);
-        }
-      });
-    });
-  });
-
-  it('should return live edge for liveSyncDurationCount = 5', (done) => {
-    config.playback.options.html5.hls.liveSyncDurationCount = 5;
-    hlsAdapterInstance = HlsAdapter.createAdapter(video, liveSource, config);
-    hlsAdapterInstance.load().then(() => {
-      hlsAdapterInstance._videoElement.addEventListener('durationchange', () => {
-        let delay = 5 * hlsAdapterInstance._hls.levels[0].details.targetduration;
-        if (video.duration > delay) {
-          hlsAdapterInstance._getLiveEdge().should.be.equal(video.duration - delay);
-          done();
-        } else {
-          hlsAdapterInstance._getLiveEdge().should.be.equal(0);
+          hlsAdapterInstance._getLiveEdge().should.be.equal(video.duration);
         }
       });
     });