Skip to content

Change exoplayer payload type #7010

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 8 commits into from
Sep 30, 2020
Merged

Change exoplayer payload type #7010

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
106b37d
Reenable exoplayer in more-info-camera
uvjustin Sep 29, 2020
51c7a21
Keep allow-exoplayer attribute on ha-hls-player
uvjustin Sep 30, 2020
b433987
Use exoplayer only on H.265
uvjustin Sep 30, 2020
b296cf0
Changes per @bramkragten
uvjustin Sep 30, 2020
f7e2734
Fix if else
uvjustin Sep 30, 2020
92ae51a
Send playlist instead of master_playlist
uvjustin Sep 30, 2020
f5297fa
Rename url to playlist_url for clarity
uvjustin Sep 30, 2020
ddfa5c5
Fix tslint error
uvjustin Sep 30, 2020
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
47 changes: 27 additions & 20 deletions src/components/ha-hls-player.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from "lit-element";
import { fireEvent } from "../common/dom/fire_event";
import { nextRender } from "../common/util/render-status";
import { getExternalConfig } from "../external_app/external_config";
import type { HomeAssistant } from "../types";

type HLSModule = typeof import("hls.js");
Expand Down Expand Up @@ -93,34 +94,40 @@ class HaHLSPlayer extends LitElement {
}

private async _getUseExoPlayer(): Promise<boolean> {
return false;
if (!this.hass!.auth.external || !this.allowExoPlayer) {
return false;
}
const externalConfig = await getExternalConfig(this.hass!.auth.external);
return externalConfig && externalConfig.hasExoPlayer;
}

private async _startHls(): Promise<void> {
let hls: any;
const videoEl = this._videoEl;
this._useExoPlayer = await this._getUseExoPlayer();
if (!this._useExoPlayer) {
hls = ((await import(/* webpackChunkName: "hls.js" */ "hls.js")) as any)
.default as HLSModule;
let hlsSupported = hls.isSupported();

if (!hlsSupported) {
hlsSupported =
videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
}
const url = this.url;
const useExoPlayerPromise = this._getUseExoPlayer();
const masterPlaylistPromise = await fetch(url);

if (!hlsSupported) {
this._videoEl.innerHTML = this.hass.localize(
"ui.components.media-browser.video_not_supported"
);
return;
}
const hls = ((await import(
/* webpackChunkName: "hls.js" */ "hls.js"
)) as any).default as HLSModule;
let hlsSupported = hls.isSupported();
Comment thread
uvjustin marked this conversation as resolved.

if (!hlsSupported) {
hlsSupported =
videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
}

const url = this.url;
if (!hlsSupported) {
this._videoEl.innerHTML = this.hass.localize(
"ui.components.media-browser.video_not_supported"
);
return;
}

if (this._useExoPlayer) {
this._useExoPlayer = await useExoPlayerPromise;
const hevcRegexp = /CODECS=".*?((hev1)|(hvc1))\..*?"/;
const masterPlaylist = await masterPlaylistPromise.text();
Comment thread
uvjustin marked this conversation as resolved.
Outdated
if (hevcRegexp.test(masterPlaylist) && this._useExoPlayer) {
Comment thread
uvjustin marked this conversation as resolved.
Outdated
this._renderHLSExoPlayer(url);
} else if (hls.isSupported()) {
this._renderHLSPolyfill(videoEl, hls, url);
Expand Down