From 65b0ed987e4345cd5c79780cea0a94a399387c41 Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Mon, 7 Feb 2022 20:58:01 -0800
Subject: [PATCH] Fixes for native WebRTC support.

---
 src/components/viewer.ts        | 1 +
 src/patches/ha-camera-stream.ts | 3 +++
 src/patches/ha-hls-player.ts    | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/viewer.ts b/src/components/viewer.ts
index 151b634f..7feb2c50 100644
--- a/src/components/viewer.ts
+++ b/src/components/viewer.ts
@@ -701,6 +701,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
           ? html`<frigate-card-ha-hls-player
               allow-exoplayer
               aria-label="${mediaToRender.title}"
+              ?autoplay=${false}
               controls
               muted
               playsinline
diff --git a/src/patches/ha-camera-stream.ts b/src/patches/ha-camera-stream.ts
index c7f01af5..1963dcce 100644
--- a/src/patches/ha-camera-stream.ts
+++ b/src/patches/ha-camera-stream.ts
@@ -99,6 +99,7 @@ customElements.whenDefined('ha-camera-stream').then(() => {
         return this._url
           ? html` <frigate-card-ha-hls-player
               ${ref(this._playerRef)}
+              ?autoplay=${false}
               playsinline
               .allowExoPlayer=${this.allowExoPlayer}
               .muted=${this.muted}
@@ -110,6 +111,8 @@ customElements.whenDefined('ha-camera-stream').then(() => {
       }
       if (this.stateObj.attributes.frontend_stream_type === STREAM_TYPE_WEB_RTC) {
         return html`<frigate-card-ha-web-rtc-player
+          ${ref(this._playerRef)}
+          ?autoplay=${false}
           playsinline
           .muted=${this.muted}
           .controls=${this.controls}
diff --git a/src/patches/ha-hls-player.ts b/src/patches/ha-hls-player.ts
index 707073f4..f2294c98 100644
--- a/src/patches/ha-hls-player.ts
+++ b/src/patches/ha-hls-player.ts
@@ -12,7 +12,7 @@
 import { TemplateResult, css, html } from 'lit';
 import { Ref, createRef, ref } from 'lit/directives/ref';
 import { customElement } from 'lit/decorators.js';
-import { dispatchMediaShowEvent } from '../common.js';
+import { dispatchErrorMessageEvent, dispatchMediaShowEvent } from '../common.js';
 
 customElements.whenDefined('ha-hls-player').then(() => {
   @customElement('frigate-card-ha-hls-player')
@@ -53,9 +53,15 @@ customElements.whenDefined('ha-hls-player').then(() => {
     // - https://github.com/home-assistant/frontend/blob/dev/src/components/ha-hls-player.ts
     // =====================================================================================
     protected render(): TemplateResult {
+      if (this._error) {
+        // Use native Frigate card error handling, and attach the entityid to
+        // clarify which camera the error refers to.
+        return dispatchErrorMessageEvent(this, this._error);
+      }
       return html`
         <video
           ${ref(this._videoRef)}
+          ?autoplay=${this.autoPlay}
           .muted=${this.muted}
           ?playsinline=${this.playsInline}
           ?controls=${this.controls}