jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-29 04:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mjpeg player (#6896)

Browse Source
This commit is contained in:
Bram Kragten 2020-09-09 22:09:56 +02:00 committed by GitHub
parent d99d092784
commit 1130007d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/ha-camera-stream.ts
View File

@ -35,7 +35,7 @@ class HaCameraStream extends LitElement {
@internalProperty() private _url?: string; @internalProperty() private _url?: string;
protected render(): TemplateResult { protected render(): TemplateResult {
if (!this.stateObj || (!this._forceMJPEG && !this._url)) { if (!this.stateObj) {
return html``; return html``;
} }
@ -52,16 +52,18 @@ class HaCameraStream extends LitElement {
)} camera.`} )} camera.`}
/> />
` `
: html` : this._url
? html`
<ha-hls-player <ha-hls-player
autoplay autoplay
muted muted
playsinline playsinline
?controls=${this.showControls} ?controls=${this.showControls}
.hass=${this.hass} .hass=${this.hass}
.url=${this._url!} .url=${this._url}
></ha-hls-player> ></ha-hls-player>
`} `
: ""}
`; `;
} }

4
src/dialogs/more-info/controls/more-info-camera.ts
View File

@ -4,9 +4,9 @@ import {
css, css,
CSSResult, CSSResult,
html, html,
internalProperty,
LitElement, LitElement,
property, property,
internalProperty,
PropertyValues, PropertyValues,
TemplateResult, TemplateResult,
} from "lit-element"; } from "lit-element";
@ -47,7 +47,7 @@ class MoreInfoCamera extends LitElement {
return html` return html`
<ha-camera-stream <ha-camera-stream
.hass=${this.hass} .hass=${this.hass}
.stateObj="${this.stateObj}" .stateObj=${this.stateObj}
showcontrols showcontrols
></ha-camera-stream> ></ha-camera-stream>
${this._cameraPrefs ${this._cameraPrefs