1 files changed, 23 insertions, 37 deletions

diff --git a/client/src/assets/player/shared/p2p-media-loader/p2p-media-loader-plugin.ts b/client/src/assets/player/shared/p2p-media-loader/p2p-media-loader-plugin.ts
index e6f525fea..fe967a730 100644
--- a/client/src/assets/player/shared/p2p-media-loader/p2p-media-loader-plugin.ts
+++ b/client/src/assets/player/shared/p2p-media-loader/p2p-media-loader-plugin.ts
@@ -3,19 +3,12 @@ import videojs from 'video.js'
 import { Events, Segment } from '@peertube/p2p-media-loader-core'
 import { Engine, initHlsJsPlayer, initVideoJsContribHlsJsPlayer } from '@peertube/p2p-media-loader-hlsjs'
 import { logger } from '@root-helpers/logger'
-import { addQueryParams, timeToInt } from '@shared/core-utils'
+import { addQueryParams } from '@shared/core-utils'
 import { P2PMediaLoaderPluginOptions, PlayerNetworkInfo } from '../../types'
-import { registerConfigPlugin, registerSourceHandler } from './hls-plugin'
-
-registerConfigPlugin(videojs)
-registerSourceHandler(videojs)
+import { SettingsButton } from '../settings/settings-menu-button'
 
 const Plugin = videojs.getPlugin('plugin')
 class P2pMediaLoaderPlugin extends Plugin {
-
-  private readonly CONSTANTS = {
-    INFO_SCHEDULER: 1000 // Don't change this
-  }
   private readonly options: P2PMediaLoaderPluginOptions
 
   private hlsjs: Hlsjs
@@ -31,7 +24,6 @@ class P2pMediaLoaderPlugin extends Plugin {
     pendingDownload: [] as number[],
     totalDownload: 0
   }
-  private startTime: number
 
   private networkInfoInterval: any
 
@@ -39,7 +31,6 @@ class P2pMediaLoaderPlugin extends Plugin {
     super(player)
 
     this.options = options
-    this.startTime = timeToInt(options.startTime)
 
     // FIXME: typings https://github.com/Microsoft/TypeScript/issues/14080
     if (!(videojs as any).Html5Hlsjs) {
@@ -77,17 +68,22 @@ class P2pMediaLoaderPlugin extends Plugin {
     })
 
     player.ready(() => {
-      this.initializeCore()
-
       this.initializePlugin()
     })
   }
 
   dispose () {
-    if (this.hlsjs) this.hlsjs.destroy()
-    if (this.p2pEngine) this.p2pEngine.destroy()
+    this.p2pEngine?.removeAllListeners()
+    this.p2pEngine?.destroy()
+
+    this.hlsjs?.destroy()
+    this.options.segmentValidator?.destroy();
+
+    (videojs as any).Html5Hlsjs?.removeAllHooks()
 
     clearInterval(this.networkInfoInterval)
+
+    super.dispose()
   }
 
   getCurrentLevel () {
@@ -104,18 +100,6 @@ class P2pMediaLoaderPlugin extends Plugin {
     return this.hlsjs
   }
 
-  private initializeCore () {
-    this.player.one('play', () => {
-      this.player.addClass('vjs-has-big-play-button-clicked')
-    })
-
-    this.player.one('canplay', () => {
-      if (this.startTime) {
-        this.player.currentTime(this.startTime)
-      }
-    })
-  }
-
   private initializePlugin () {
     initHlsJsPlayer(this.hlsjs)
 
@@ -133,7 +117,7 @@ class P2pMediaLoaderPlugin extends Plugin {
 
     this.runStats()
 
-    this.hlsjs.on(Hlsjs.Events.LEVEL_SWITCHED, () => this.player.trigger('engineResolutionChange'))
+    this.hlsjs.on(Hlsjs.Events.LEVEL_SWITCHED, () => this.player.trigger('engine-resolution-change'))
   }
 
   private runStats () {
@@ -167,7 +151,7 @@ class P2pMediaLoaderPlugin extends Plugin {
       this.statsP2PBytes.pendingUpload = []
       this.statsHTTPBytes.pendingDownload = []
 
-      return this.player.trigger('p2pInfo', {
+      return this.player.trigger('p2p-info', {
         source: 'p2p-media-loader',
         http: {
           downloadSpeed: httpDownloadSpeed,
@@ -182,7 +166,7 @@ class P2pMediaLoaderPlugin extends Plugin {
         },
         bandwidthEstimate: (this.hlsjs as any).bandwidthEstimate / 8
       } as PlayerNetworkInfo)
-    }, this.CONSTANTS.INFO_SCHEDULER)
+    }, 1000)
   }
 
   private arraySum (data: number[]) {
@@ -190,10 +174,7 @@ class P2pMediaLoaderPlugin extends Plugin {
   }
 
   private fallbackToBuiltInIOS () {
-    logger.info('HLS.js does not seem to be supported. Fallback to built-in HLS.');
-
-    // Workaround to force video.js to not re create a video element
-    (this.player as any).playerElIngest_ = this.player.el().parentNode
+    logger.info('HLS.js does not seem to be supported. Fallback to built-in HLS.')
 
     this.player.src({
       type: this.options.type,
@@ -203,9 +184,14 @@ class P2pMediaLoaderPlugin extends Plugin {
       })
     })
 
-    this.player.ready(() => {
-      this.initializeCore()
-    })
+    // Resolution button is not supported in built-in HLS player
+    this.getResolutionButton().hide()
+  }
+
+  private getResolutionButton () {
+    const settingsButton = this.player.controlBar.getDescendant([ 'settingsButton' ]) as SettingsButton
+
+    return settingsButton.menu.getChild('resolutionMenuButton')
   }
 }