From 4a6b9761902fb694677980874ad3dc4a985e4c90 Mon Sep 17 00:00:00 2001
From: 4gray <serega05@gmail.com>
Date: Sun, 29 Nov 2020 00:41:40 +0100
Subject: [PATCH] fix: default html5 player initialization fix

---
 .../video-player/video-player.component.html  | 18 ++++++-------
 .../video-player/video-player.component.ts    | 27 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/app/video-player/video-player.component.html b/src/app/video-player/video-player.component.html
index 14d37e509..623263b7c 100644
--- a/src/app/video-player/video-player.component.html
+++ b/src/app/video-player/video-player.component.html
@@ -60,15 +60,15 @@
                     }"
                 ></app-vjs-player>
             </ng-container>
-
-            <!-- player component -->
-            <video
-                *ngIf="player === 'html5'"
-                id="video-player"
-                autoplay="true"
-                controls="true"
-                muted="muted"
-            ></video>
         </ng-container>
+        <!-- default html player component -->
+        <video
+            #videoPlayer
+            *ngIf="player === 'html5'"
+            id="video-player"
+            autoplay="true"
+            controls="true"
+            muted="muted"
+        ></video>
     </mat-drawer-content>
 </mat-drawer-container>
diff --git a/src/app/video-player/video-player.component.ts b/src/app/video-player/video-player.component.ts
index b4b24597d..326cce8f4 100644
--- a/src/app/video-player/video-player.component.ts
+++ b/src/app/video-player/video-player.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import * as Hls from 'hls.js';
 import { ChannelQuery, Channel, ChannelStore } from '../state';
 import { Observable } from 'rxjs';
@@ -26,7 +26,8 @@ export class VideoPlayerComponent implements OnInit {
     );
 
     /** Video player DOM element */
-    videoPlayer: HTMLVideoElement;
+    @ViewChild('videoPlayer', { static: false })
+    videoPlayer: ElementRef<HTMLVideoElement>;
 
     /** HLS object */
     hls = new Hls();
@@ -74,11 +75,6 @@ export class VideoPlayerComponent implements OnInit {
         this.storage.get(SETTINGS_STORE_KEY).subscribe((settings: Settings) => {
             if (settings && Object.keys(settings).length > 0) {
                 this.player = settings.player;
-                if (this.player === 'html5') {
-                    this.videoPlayer = document.getElementById(
-                        'video-player'
-                    ) as HTMLVideoElement;
-                }
             }
         });
     }
@@ -98,15 +94,20 @@ export class VideoPlayerComponent implements OnInit {
         if (Hls.isSupported()) {
             console.log('... switching channel to ', channel.name, channel.url);
             this.hls.loadSource(channel.url);
-            this.hls.attachMedia(this.videoPlayer);
+            this.hls.attachMedia(this.videoPlayer.nativeElement);
             this.channelTitle = channel.name;
         } else if (
-            this.videoPlayer.canPlayType('application/vnd.apple.mpegurl')
+            this.videoPlayer.nativeElement.canPlayType(
+                'application/vnd.apple.mpegurl'
+            )
         ) {
-            this.videoPlayer.src = channel.url;
-            this.videoPlayer.addEventListener('loadedmetadata', () => {
-                this.videoPlayer.play();
-            });
+            this.videoPlayer.nativeElement.src = channel.url;
+            this.videoPlayer.nativeElement.addEventListener(
+                'loadedmetadata',
+                () => {
+                    this.videoPlayer.nativeElement.play();
+                }
+            );
         }
     }