From 26895cf003b1275dfeafc0fe67e53ce6491ca1d3 Mon Sep 17 00:00:00 2001
From: Justin Wong <46082645+uvjustin@users.noreply.github.com>
Date: Sun, 13 Sep 2020 23:54:14 +0800
Subject: [PATCH 1/4] Allow ExoPlayer only from more-info-camera

---
 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 7b091055e053..197d35960d93 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: "allowExoPlayer" })
+  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 8f47b088707f..ec49e6cb6cdd 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: "allowExoPlayer" })
+  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 ffd315d9ddaa..7b678b70e5b2 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -46,6 +46,7 @@ class MoreInfoCamera extends LitElement {
 
     return html`
       <ha-camera-stream
+        allowExoPlayer
         .hass=${this.hass}
         .stateObj=${this.stateObj}
         controls

From e26964896f3c64e684b7b15d99ca1136bae10501 Mon Sep 17 00:00:00 2001
From: Justin Wong <46082645+uvjustin@users.noreply.github.com>
Date: Mon, 14 Sep 2020 17:52:23 +0800
Subject: [PATCH 2/4] Bind to boolean attribute and use lowercase

---
 src/components/ha-camera-stream.ts                 | 4 ++--
 src/components/ha-hls-player.ts                    | 2 +-
 src/dialogs/more-info/controls/more-info-camera.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts
index 197d35960d93..fe9aaf204a60 100644
--- a/src/components/ha-camera-stream.ts
+++ b/src/components/ha-camera-stream.ts
@@ -32,7 +32,7 @@ class HaCameraStream extends LitElement {
   @property({ type: Boolean, attribute: "muted" })
   public muted = false;
 
-  @property({ type: Boolean, attribute: "allowExoPlayer" })
+  @property({ type: Boolean, attribute: "allowexoplayer" })
   public allowExoPlayer = false;
 
   // We keep track if we should force MJPEG with a string
@@ -64,7 +64,7 @@ class HaCameraStream extends LitElement {
             <ha-hls-player
               autoplay
               playsinline
-              .allowExoPlayer=${this.allowExoPlayer}
+              ?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 ec49e6cb6cdd..0d680a7cb2cf 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -35,7 +35,7 @@ class HaHLSPlayer extends LitElement {
   @property({ type: Boolean, attribute: "playsinline" })
   public playsInline = false;
 
-  @property({ type: Boolean, attribute: "allowExoPlayer" })
+  @property({ type: Boolean, attribute: "allowexoplayer" })
   public allowExoPlayer = false;
 
   @query("video") private _videoEl!: HTMLVideoElement;
diff --git a/src/dialogs/more-info/controls/more-info-camera.ts b/src/dialogs/more-info/controls/more-info-camera.ts
index 7b678b70e5b2..722ecbd52957 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -46,9 +46,9 @@ class MoreInfoCamera extends LitElement {
 
     return html`
       <ha-camera-stream
-        allowExoPlayer
         .hass=${this.hass}
         .stateObj=${this.stateObj}
+        allowexoplayer
         controls
       ></ha-camera-stream>
       ${this._cameraPrefs

From 302614e9515ba87f1545c244dabc37a392a8c42c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 15 Sep 2020 00:09:18 +0200
Subject: [PATCH 3/4] Apply suggestions from code review

---
 src/components/ha-camera-stream.ts                 | 4 ++--
 src/components/ha-hls-player.ts                    | 2 +-
 src/dialogs/more-info/controls/more-info-camera.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts
index fe9aaf204a60..86fbee4ac74a 100644
--- a/src/components/ha-camera-stream.ts
+++ b/src/components/ha-camera-stream.ts
@@ -32,7 +32,7 @@ class HaCameraStream extends LitElement {
   @property({ type: Boolean, attribute: "muted" })
   public muted = false;
 
-  @property({ type: Boolean, attribute: "allowexoplayer" })
+  @property({ type: Boolean, attribute: "allow-exoplayer" })
   public allowExoPlayer = false;
 
   // We keep track if we should force MJPEG with a string
@@ -64,7 +64,7 @@ class HaCameraStream extends LitElement {
             <ha-hls-player
               autoplay
               playsinline
-              ?allowexoplayer=${this.allowExoPlayer}
+              .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 0d680a7cb2cf..e0c9b81b1e35 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -35,7 +35,7 @@ class HaHLSPlayer extends LitElement {
   @property({ type: Boolean, attribute: "playsinline" })
   public playsInline = false;
 
-  @property({ type: Boolean, attribute: "allowexoplayer" })
+  @property({ type: Boolean, attribute: "allow-exoplayer" })
   public allowExoPlayer = false;
 
   @query("video") private _videoEl!: HTMLVideoElement;
diff --git a/src/dialogs/more-info/controls/more-info-camera.ts b/src/dialogs/more-info/controls/more-info-camera.ts
index 722ecbd52957..7fa55778b254 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -48,7 +48,7 @@ class MoreInfoCamera extends LitElement {
       <ha-camera-stream
         .hass=${this.hass}
         .stateObj=${this.stateObj}
-        allowexoplayer
+        allow-exoplayer
         controls
       ></ha-camera-stream>
       ${this._cameraPrefs

From cb1820f35c044e81ac19d231acb3e25f6cfa1ed4 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 15 Sep 2020 00:13:45 +0200
Subject: [PATCH 4/4] Typo

---
 src/components/ha-camera-stream.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts
index 86fbee4ac74a..eb9ce9971891 100644
--- a/src/components/ha-camera-stream.ts
+++ b/src/components/ha-camera-stream.ts
@@ -64,7 +64,7 @@ class HaCameraStream extends LitElement {
             <ha-hls-player
               autoplay
               playsinline
-              .allowExoplayer=${this.allowExoPlayer}
+              .allowExoPlayer=${this.allowExoPlayer}
               .muted=${this.muted}
               .controls=${this.controls}
               .hass=${this.hass}