Compare commits

...

12 Commits

Author SHA1 Message Date
CodeDevMLH
cc861f4263 Update manifest.json for release v1.7.0.4 [skip ci] 2026-03-05 23:35:23 +00:00
CodeDevMLH
10e6cdc4a2 Bump version to 1.7.0.4
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 51s
2026-03-06 00:34:32 +01:00
CodeDevMLH
a8c7faab6b Add Safari support for YouTube video playback using plain iframe embed 2026-03-06 00:34:19 +01:00
CodeDevMLH
6df390fa18 Update manifest.json for release v1.7.0.3 [skip ci] 2026-03-05 23:23:07 +00:00
CodeDevMLH
d0c3d7ee4d Bump version to 1.7.0.3 (test 3)
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 52s
2026-03-06 00:22:14 +01:00
CodeDevMLH
bc621aacdf test 2026-03-06 00:21:54 +01:00
CodeDevMLH
73eb30d671 Update manifest.json for release v1.7.0.2 [skip ci] 2026-03-05 22:44:56 +00:00
CodeDevMLH
2cfbec95c9 Bump version to 1.7.0.2
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 50s
2026-03-05 23:44:05 +01:00
CodeDevMLH
08fc29cba3 Improve video backdrop handling: optimize autoplay logic for fresh loads and enhance Safari compatibility with loadedmetadata event 2026-03-05 23:43:52 +01:00
CodeDevMLH
0d6b835486 Update manifest.json for release v1.7.0.1 [skip ci] 2026-03-05 21:43:51 +00:00
CodeDevMLH
bf620e447f Bump version to 1.7.0.1
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 53s
2026-03-05 22:42:58 +01:00
CodeDevMLH
3117d627dd Enhance video playback handling: enable autoplay, adjust mute settings for Safari compatibility, and improve navigation checks during autoplay. 2026-03-05 22:42:40 +01:00
3 changed files with 211 additions and 149 deletions

View File

@@ -12,7 +12,7 @@
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> --> <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
<Title>Jellyfin Media Bar Enhanced Plugin</Title> <Title>Jellyfin Media Bar Enhanced Plugin</Title>
<Authors>CodeDevMLH</Authors> <Authors>CodeDevMLH</Authors>
<Version>1.7.0.0</Version> <Version>1.7.0.4</Version>
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl> <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
</PropertyGroup> </PropertyGroup>

View File

@@ -1403,7 +1403,9 @@ const ApiUtils = {
return { return {
id: trailer.Id, id: trailer.Id,
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}` // static=true forces Jellyfin to direct-stream (no transcoding) which enables
// HTTP Range Requests (Accept-Ranges: bytes) — required by Safari for video playback
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true`
}; };
} }
return null; return null;
@@ -1734,153 +1736,193 @@ const SlideCreator = {
// Create a wrapper for opacity transition // Create a wrapper for opacity transition
videoBackdrop = SlideUtils.createElement("div", { videoBackdrop = SlideUtils.createElement("div", {
className: `backdrop video-backdrop ${videoClass}`, className: `backdrop video-backdrop ${videoClass}`,
style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent style: "opacity: 0; transition: opacity 1.2s ease-in-out;"
}); });
const ytPlayerDiv = SlideUtils.createElement("div", { // Detect Safari/WebKit — the YouTube IFrame API causes Error 153 on WebKit
id: `youtube-player-${itemId}`, // due to cross-origin postMessage restrictions. Use a plain iframe embed instead.
style: "width: 100%; height: 100%;" const isSafariWebKit = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent);
});
videoBackdrop.appendChild(ytPlayerDiv);
// Initialize YouTube Player if (isSafariWebKit) {
SlideUtils.loadYouTubeIframeAPI().then(() => { // ── Safari: plain iframe embed ───────────────────────────────────────────
// Fetch SponsorBlock data const embedUrl = `https://www.youtube-nocookie.com/embed/${videoId}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=0&origin=${encodeURIComponent(window.location.origin)}`;
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
const playerVars = {
autoplay: 0,
mute: STATE.slideshow.isMuted ? 1 : 0,
controls: 0,
disablekb: 1,
fs: 0,
iv_load_policy: 3,
rel: 0,
loop: 0,
playsinline: 1,
origin: window.location.origin,
enablejsapi: 1
};
// Determine video quality const ytIframe = document.createElement('iframe');
let quality = 'hd1080'; ytIframe.style.cssText = 'width:100%;height:100%;border:0;pointer-events:none;';
if (CONFIG.preferredVideoQuality === 'Maximum') { ytIframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
quality = 'highres'; ytIframe.setAttribute('allowfullscreen', '');
} else if (CONFIG.preferredVideoQuality === '720p') { ytIframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
quality = 'hd720'; ytIframe.src = embedUrl;
} else if (CONFIG.preferredVideoQuality === '1080p') { videoBackdrop.appendChild(ytIframe);
quality = 'hd1080';
} else { // Auto or fallback
// If screen is wider than 1920, prefer highres, otherwise 1080p
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
}
playerVars.suggestedQuality = quality; // Show immediately — no onStateChange available for plain iframes
videoBackdrop.style.opacity = '1';
// Apply SponsorBlock start/end times // Create a stub player compatible with all slide management code
if (segments.intro) { STATE.slideshow.videoPlayers[itemId] = {
playerVars.start = Math.ceil(segments.intro[1]); _isSafariIframe: true,
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`); _iframe: ytIframe,
} _videoId: videoId,
if (segments.outro) { _embedUrl: embedUrl,
playerVars.end = Math.floor(segments.outro[0]); pauseVideo() { ytIframe.src = ''; },
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`); stopVideo() { ytIframe.src = ''; },
} playVideo() { if (!ytIframe.src) ytIframe.src = this._embedUrl; },
mute() { /* cannot mute plain iframe mid-play */ },
unMute() { /* cannot unmute plain iframe mid-play */ },
setVolume() { /* not available */ },
getIframe() { return ytIframe; },
getPlayerState() { return 1; }, // always report PLAYING so fallback timeouts don't fire
loadVideoById({ videoId: vid }) {
const url = `https://www.youtube-nocookie.com/embed/${vid}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=0`;
ytIframe.src = url;
this._videoId = vid;
this._embedUrl = url;
},
destroy() { ytIframe.remove(); }
};
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, { console.log(`🍎 Safari detected — using plain iframe embed for YouTube video ${videoId}`);
height: '100%',
width: '100%',
videoId: videoId,
host: 'https://www.youtube-nocookie.com',
playerVars: playerVars,
events: {
'onReady': (event) => {
const iframe = event.target.getIframe();
if (iframe) {
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
}
// Store start/end time and videoId for later use } else {
event.target._startTime = playerVars.start || 0; // ── Non-Safari: YouTube IFrame API ──────────────────────────────────────
event.target._endTime = playerVars.end || undefined; const ytPlayerDiv = SlideUtils.createElement("div", {
event.target._videoId = videoId; id: `youtube-player-${itemId}`,
style: "width: 100%; height: 100%;"
// Store reference to wrapper for fading });
event.target._wrapperDiv = videoBackdrop;
if (STATE.slideshow.isMuted) { videoBackdrop.appendChild(ytPlayerDiv);
event.target.mute();
} else {
event.target.unMute();
event.target.setVolume(40);
}
if (typeof event.target.setPlaybackQuality === 'function') { SlideUtils.loadYouTubeIframeAPI().then(() => {
event.target.setPlaybackQuality(quality); ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
} const playerVars = {
autoplay: 1,
mute: 1, // need to be muted for Safari, because apple makes life difficult...
controls: 0,
disablekb: 1,
fs: 0,
iv_load_policy: 3,
rel: 0,
loop: 0,
playsinline: 1,
origin: window.location.origin,
enablejsapi: 1
};
// Only play if this is the active slide // Determine video quality
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`); let quality = 'hd1080';
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer'); if (CONFIG.preferredVideoQuality === 'Maximum') {
quality = 'highres';
} else if (CONFIG.preferredVideoQuality === '720p') {
quality = 'hd720';
} else if (CONFIG.preferredVideoQuality === '1080p') {
quality = 'hd1080';
} else {
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
}
if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) { playerVars.suggestedQuality = quality;
event.target.playVideo();
// Apply SponsorBlock start/end times
// Check if it actually started playing after a short delay (handling autoplay blocks) if (segments.intro) {
const timeoutId = setTimeout(() => { playerVars.start = Math.ceil(segments.intro[1]);
// Re-check conditions before processing fallback console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer'); }
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) { if (segments.outro) {
playerVars.end = Math.floor(segments.outro[0]);
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
}
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
height: '100%',
width: '100%',
videoId: videoId,
host: 'https://www.youtube-nocookie.com',
playerVars: playerVars,
events: {
'onReady': (event) => {
const iframe = event.target.getIframe();
if (iframe) {
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
// Full allow attribute matching what YouTube sets on their own embed pages
iframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
}
// Store start/end time and videoId for later use
event.target._startTime = playerVars.start || 0;
event.target._endTime = playerVars.end || undefined;
event.target._videoId = videoId;
// Store reference to wrapper for fading
event.target._wrapperDiv = videoBackdrop;
// Unmute now if user wants sound.
if (!STATE.slideshow.isMuted) {
event.target.unMute();
event.target.setVolume(40);
}
if (typeof event.target.setPlaybackQuality === 'function') {
event.target.setPlaybackQuality(quality);
}
// Stop playback if slide was navigated away from
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
if (!slide || !slide.classList.contains('active') || document.hidden || (isVideoPlayerOpen && !isVideoPlayerOpen.classList.contains('hide'))) {
event.target.stopVideo();
} else {
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
STATE.slideshow.slideInterval.stop();
}
const timeoutId = setTimeout(() => {
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`); console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
try { try {
event.target.stopVideo(); event.target.stopVideo();
} catch (e) { console.warn("Error stopping video in timeout:", e); } } catch (e) { console.warn("Error stopping video:", e); }
return; return;
} }
if (event.target.getPlayerState() !== YT.PlayerState.PLAYING && const state = event.target.getPlayerState();
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) { if (state !== YT.PlayerState.PLAYING && state !== YT.PlayerState.BUFFERING) {
console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`); console.warn(`Autoplay stalled for ${itemId}, attempting muted fallback`);
event.target.mute(); event.target.mute();
event.target.playVideo(); event.target.playVideo();
} }
}, 1000); }, 1000);
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = []; if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
STATE.slideshow.autoplayTimeouts.push(timeoutId); STATE.slideshow.autoplayTimeouts.push(timeoutId);
// Pause slideshow timer when video starts if configured
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
STATE.slideshow.slideInterval.stop();
} }
} },
}, 'onStateChange': (event) => {
'onStateChange': (event) => { if (event.data === YT.PlayerState.PLAYING) {
// Fade in when playing if (event.target._wrapperDiv) {
if (event.data === YT.PlayerState.PLAYING) { event.target._wrapperDiv.style.opacity = "1";
if (event.target._wrapperDiv) { }
event.target._wrapperDiv.style.opacity = "1"; }
if (event.data === YT.PlayerState.ENDED) {
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
if (slide && slide.classList.contains('active')) {
SlideshowManager.nextSlide();
} }
} }
},
if (event.data === YT.PlayerState.ENDED) { 'onError': (event) => {
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`); console.warn(`YouTube player error ${event.data} for video ${videoId}`);
if (slide && slide.classList.contains('active')) { if (CONFIG.waitForTrailerToEnd) {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
} }
} }
},
'onError': (event) => {
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
// Fallback to next slide on error
if (CONFIG.waitForTrailerToEnd) {
SlideshowManager.nextSlide();
}
} }
} });
}); });
}); });
}); } // end non-Safari
// 2. Check for local video trailers in MediaSources if yt is not available // 2. Check for local video trailers in MediaSources if yt is not available
} else if (!isYoutube) { } else if (!isYoutube) {
@@ -1896,6 +1938,7 @@ const SlideCreator = {
}; };
videoAttributes.muted = ""; videoAttributes.muted = "";
videoAttributes.playsinline = ""; // again Safari needs extra treatment...
videoBackdrop = SlideUtils.createElement("video", videoAttributes); videoBackdrop = SlideUtils.createElement("video", videoAttributes);
videoBackdrop.volume = 0.4; videoBackdrop.volume = 0.4;
@@ -1927,7 +1970,10 @@ const SlideCreator = {
}); });
videoBackdrop.addEventListener('error', (event) => { videoBackdrop.addEventListener('error', (event) => {
console.warn(`Local video error for item ${itemId}`); const src = event.target.src || event.target.getAttribute('data-src') || 'unknown';
const errCode = event.target.error ? event.target.error.code : 'n/a';
const errMsg = event.target.error ? event.target.error.message : 'n/a';
console.warn(`Local video error for item ${itemId} | code=${errCode} | msg=${errMsg} | url=${src}`);
const slide = event.target.closest('.slide'); const slide = event.target.closest('.slide');
if (slide && slide.classList.contains('active')) { if (slide && slide.classList.contains('active')) {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
@@ -2466,42 +2512,58 @@ const SlideshowManager = {
if (videoBackdrop.tagName === 'VIDEO') { if (videoBackdrop.tagName === 'VIDEO') {
// Restore src from data-src if it was deactivated to release connections // Restore src from data-src if it was deactivated to release connections
const lazySrc = videoBackdrop.getAttribute('data-src'); const lazySrc = videoBackdrop.getAttribute('data-src');
if (lazySrc && !videoBackdrop.src) { const isFreshLoad = lazySrc && !videoBackdrop.src;
videoBackdrop.src = lazySrc;
}
videoBackdrop.currentTime = 0;
videoBackdrop.muted = STATE.slideshow.isMuted; videoBackdrop.muted = STATE.slideshow.isMuted;
if (!STATE.slideshow.isMuted) { if (!STATE.slideshow.isMuted) {
videoBackdrop.volume = 0.4; videoBackdrop.volume = 0.4;
} }
videoBackdrop.play().catch(e => { const doPlay = () => {
// Check if it actually started playing after a short delay (handling autoplay blocks) if (!currentSlide.classList.contains('active')) return;
setTimeout(() => { videoBackdrop.play().catch(e => {
if (videoBackdrop.paused && currentSlide.classList.contains('active')) { setTimeout(() => {
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`); if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
videoBackdrop.muted = true; console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
videoBackdrop.play().catch(err => console.error("Muted fallback failed", err)); videoBackdrop.muted = true;
} videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
}, 1000); }
}); }, 1000);
});
};
if (isFreshLoad) {
// Safari: set src, then wait for loadedmetadata before seeking/playing
videoBackdrop.src = lazySrc;
videoBackdrop.load();
videoBackdrop.addEventListener('loadedmetadata', () => {
videoBackdrop.currentTime = 0;
doPlay();
}, { once: true });
} else {
// src already set (e.g. paused slide resuming)
videoBackdrop.currentTime = 0;
doPlay();
}
} else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) { } else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
const player = STATE.slideshow.videoPlayers[currentItemId]; const player = STATE.slideshow.videoPlayers[currentItemId];
if (player && typeof player.loadVideoById === 'function' && player._videoId) { if (player && typeof player.loadVideoById === 'function' && player._videoId) {
// Use loadVideoById to enforce start and end times // Use loadVideoById to enforce start and end times
// load always starts muted first, then unmute if needed
player.loadVideoById({ player.loadVideoById({
videoId: player._videoId, videoId: player._videoId,
startSeconds: player._startTime || 0, startSeconds: player._startTime || 0,
endSeconds: player._endTime endSeconds: player._endTime
}); });
player.mute();
if (STATE.slideshow.isMuted) { if (!STATE.slideshow.isMuted) {
player.mute(); setTimeout(() => {
} else { // Only unmute if still on the same slide
player.unMute(); if (currentSlide.classList.contains('active')) {
player.setVolume(40); player.unMute();
player.setVolume(40);
}
}, 600);
} }
// Check if playback successfully started, otherwise fallback to muted // Check if playback successfully started, otherwise fallback to muted

View File

@@ -9,12 +9,12 @@
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png", "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
"versions": [ "versions": [
{ {
"version": "1.7.0.0", "version": "1.7.0.4",
"changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS", "changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS",
"targetAbi": "10.11.0.0", "targetAbi": "10.11.0.0",
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.0/Jellyfin.Plugin.MediaBarEnhanced.zip", "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.4/Jellyfin.Plugin.MediaBarEnhanced.zip",
"checksum": "d126fd4b76c49bdcca257919fd3db8a5", "checksum": "a8f3cbea12cdce5902212d4ca753eb83",
"timestamp": "2026-03-05T01:05:37Z" "timestamp": "2026-03-05T23:35:22Z"
}, },
{ {
"version": "1.6.6.4", "version": "1.6.6.4",