Skip to content

Fix mjpeg player #6896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 1 commit into from
Sep 9, 2020
Merged

Fix mjpeg player #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/ha-camera-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class HaCameraStream extends LitElement {
@internalProperty() private _url?: string;

protected render(): TemplateResult {
if (!this.stateObj || (!this._forceMJPEG && !this._url)) {
if (!this.stateObj) {
return html``;
}

Expand All @@ -52,16 +52,18 @@ class HaCameraStream extends LitElement {
)} camera.`}
/>
`
: html`
: this._url
? html`
<ha-hls-player
autoplay
muted
playsinline
?controls=${this.showControls}
.hass=${this.hass}
.url=${this._url!}
.url=${this._url}
></ha-hls-player>
`}
`
: ""}
`;
}

Expand Down
4 changes: 2 additions & 2 deletions src/dialogs/more-info/controls/more-info-camera.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {
css,
CSSResult,
html,
internalProperty,
LitElement,
property,
internalProperty,
PropertyValues,
TemplateResult,
} from "lit-element";
Expand Down Expand Up @@ -47,7 +47,7 @@ class MoreInfoCamera extends LitElement {
return html`
<ha-camera-stream
.hass=${this.hass}
.stateObj="${this.stateObj}"
.stateObj=${this.stateObj}
showcontrols
></ha-camera-stream>
${this._cameraPrefs
Expand Down