From 4392d78ff6098d26c68a3281511b9f4498d08361 Mon Sep 17 00:00:00 2001
From: uvjustin <46082645+uvjustin@users.noreply.github.com>
Date: Tue, 15 Sep 2020 06:26:26 +0800
Subject: [PATCH] Allow ExoPlayer only from more-info-camera (#6974)

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
---
 src/components/ha-camera-stream.ts                 | 4 ++++
 src/components/ha-hls-player.ts                    | 5 ++++-
 src/dialogs/more-info/controls/more-info-camera.ts | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts
index 7b091055e0..eb9ce99718 100644
--- a/src/components/ha-camera-stream.ts
+++ b/src/components/ha-camera-stream.ts
@@ -32,6 +32,9 @@ class HaCameraStream extends LitElement {
   @property({ type: Boolean, attribute: "muted" })
   public muted = false;
 
+  @property({ type: Boolean, attribute: "allow-exoplayer" })
+  public allowExoPlayer = false;
+
   // We keep track if we should force MJPEG with a string
   // that way it automatically resets if we change entity.
   @internalProperty() private _forceMJPEG?: string;
@@ -61,6 +64,7 @@ class HaCameraStream extends LitElement {
             <ha-hls-player
               autoplay
               playsinline
+              .allowExoPlayer=${this.allowExoPlayer}
               .muted=${this.muted}
               .controls=${this.controls}
               .hass=${this.hass}
diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts
index 912bcab7b6..b513413d23 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -35,6 +35,9 @@ class HaHLSPlayer extends LitElement {
   @property({ type: Boolean, attribute: "playsinline" })
   public playsInline = false;
 
+  @property({ type: Boolean, attribute: "allow-exoplayer" })
+  public allowExoPlayer = false;
+
   @query("video") private _videoEl!: HTMLVideoElement;
 
   @internalProperty() private _attached = false;
@@ -91,7 +94,7 @@ class HaHLSPlayer extends LitElement {
   }
 
   private async _getUseExoPlayer(): Promise<boolean> {
-    if (!this.hass!.auth.external) {
+    if (!this.hass!.auth.external || !this.allowExoPlayer) {
       return false;
     }
     const externalConfig = await getExternalConfig(this.hass!.auth.external);
diff --git a/src/dialogs/more-info/controls/more-info-camera.ts b/src/dialogs/more-info/controls/more-info-camera.ts
index ffd315d9dd..7fa55778b2 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -48,6 +48,7 @@ class MoreInfoCamera extends LitElement {
       <ha-camera-stream
         .hass=${this.hass}
         .stateObj=${this.stateObj}
+        allow-exoplayer
         controls
       ></ha-camera-stream>
       ${this._cameraPrefs