1 files changed, 22 insertions, 2 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 56068e340..b608ee3e2 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
@@ -44,13 +44,31 @@ class P2pMediaLoaderPlugin extends Plugin {
     if (!(videojs as any).Html5Hlsjs) {
       logger.warn('HLS.js does not seem to be supported. Try to fallback to built in HLS.')
 
+      let message: string
       if (!player.canPlayType('application/vnd.apple.mpegurl')) {
-        const message = 'Cannot fallback to built-in HLS'
+        message = 'Cannot fallback to built-in HLS'
+      } else if (options.requiresAuth) {
+        message = 'Video requires auth which is not compatible to build-in HLS player'
+      }
+
+      if (message) {
         logger.warn(message)
 
-        player.ready(() => player.trigger('error', new Error(message)))
+        const error: MediaError = {
+          code: MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
+          message,
+          MEDIA_ERR_ABORTED: MediaError.MEDIA_ERR_ABORTED,
+          MEDIA_ERR_DECODE: MediaError.MEDIA_ERR_DECODE,
+          MEDIA_ERR_NETWORK: MediaError.MEDIA_ERR_NETWORK,
+          MEDIA_ERR_SRC_NOT_SUPPORTED: MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED
+        }
+
+        player.ready(() => player.error(error))
         return
       }
+
+      // Workaround to force video.js to not re create a video element
+      (this.player as any).playerElIngest_ = this.player.el().parentNode
     } else {
       // FIXME: typings https://github.com/Microsoft/TypeScript/issues/14080
       (videojs as any).Html5Hlsjs.addHook('beforeinitialize', (videojsPlayer: any, hlsjs: any) => {
@@ -115,6 +133,8 @@ class P2pMediaLoaderPlugin extends Plugin {
     this.p2pEngine = this.options.loader.getEngine()
 
     this.p2pEngine.on(Events.SegmentError, (segment: Segment, err) => {
+      if (navigator.onLine === false) return
+
       logger.error(`Segment ${segment.id} error.`, err)
 
       this.options.redundancyUrlManager.removeBySegmentUrl(segment.requestUrl)