milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Extract HLS stream test function

Browse source
This commit is contained in:
Dmitry Lyzo 2023-09-14 00:14:10 +03:00
parent b2c7d93498
commit 1684acd0ca
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -35,6 +35,7 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/ba
import { PluginType } from '../../types/plugin.ts'; import { PluginType } from '../../types/plugin.ts';
import Events from '../../utils/events.ts'; import Events from '../../utils/events.ts';
import { includesAny } from '../../utils/container.ts'; import { includesAny } from '../../utils/container.ts';
import { isHls } from '../../utils/mediaSource.ts';
import debounce from 'lodash-es/debounce'; import debounce from 'lodash-es/debounce';
/** /**
@ -74,7 +75,7 @@ function enableNativeTrackSupport(mediaSource, track) {
return true; return true;
} }
if (browser.firefox && (mediaSource?.TranscodingSubProtocol || mediaSource?.Container) === 'hls') { if (browser.firefox && isHls(mediaSource)) {
return false; return false;
} }
@ -344,12 +345,10 @@ export class HtmlVideoPlayer {
const mediaSource = streamInfo.mediaSource; const mediaSource = streamInfo.mediaSource;
const item = streamInfo.item; const item = streamInfo.item;
const isHls = (mediaSource?.TranscodingSubProtocol || mediaSource?.Container) === 'hls';
// Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts // Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts
// This will start the transcoding process before actually feeding the video url into the player // This will start the transcoding process before actually feeding the video url into the player
// Edit: Also seeing stalls from hls.js // Edit: Also seeing stalls from hls.js
if (mediaSource && item && !mediaSource.RunTimeTicks && isHls && streamInfo.playMethod === 'Transcode' && (browser.iOS || browser.osx)) { if (mediaSource && item && !mediaSource.RunTimeTicks && isHls(mediaSource) && streamInfo.playMethod === 'Transcode' && (browser.iOS || browser.osx)) {
const hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8'); const hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8');
loading.show(); loading.show();
@ -513,7 +512,7 @@ export class HtmlVideoPlayer {
elem.crossOrigin = crossOrigin; elem.crossOrigin = crossOrigin;
} }
if (enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && (options.mediaSource.TranscodingSubProtocol || options.mediaSource.Container) === 'hls') { if (enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && isHls(options.mediaSource)) {
return this.setSrcWithHlsJs(elem, options, val); return this.setSrcWithHlsJs(elem, options, val);
} else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') { } else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') {
return this.setSrcWithFlvJs(elem, options, val); return this.setSrcWithFlvJs(elem, options, val);

10
src/utils/mediaSource.ts Normal file
View file

@ -0,0 +1,10 @@
import type { MediaSourceInfo } from '@jellyfin/sdk/lib/generated-client';
/**
* Checks if the media source is an HLS stream.
* @param mediaSource The media source.
* @returns _true_ if the media source is an HLS stream, _false_ otherwise.
*/
export function isHls(mediaSource: MediaSourceInfo|null|undefined): boolean {
return (mediaSource?.TranscodingSubProtocol || mediaSource?.Container) === 'hls';
}