Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions js&css/web-accessible/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,9 @@ ImprovedTube.playerOnPlay = function () {

this.removeEventListener('ended', ImprovedTube.playerOnEnded, true);
this.addEventListener('ended', ImprovedTube.playerOnEnded, true);

this.removeEventListener('waiting', ImprovedTube.playerLiveHeadSpeedReset);
this.addEventListener('waiting', ImprovedTube.playerLiveHeadSpeedReset);
/*------------------------------------------------------------------------------
AUTOPLAY DISABLE player || playlist || channel trailer
------------------------------------------------------------------------------*/
Expand Down
16 changes: 16 additions & 0 deletions js&css/web-accessible/www.youtube.com/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,22 @@ ImprovedTube.playbackSpeed = function (newSpeed) {
return newSpeed;
};
/*------------------------------------------------------------------------------
LIVE HEAD PLAYBACK SPEED RESET
------------------------------------------------------------------------------*/
// Speeds are applied to the <video> element directly, so YouTube's player still reports 1x
// and never drops back to 1x at the live head like it does for its own speed menu (#4346).
// Without this, playback > 1x at the live head stalls, buffers, catches up again, forever.
ImprovedTube.playerLiveHeadSpeedReset = function (event) {
const video = event?.target;
if (!video || !(video.playbackRate > 1)) return;
const player = video.closest?.('.html5-video-player') || ImprovedTube.elements.player;
if (!player?.getVideoData?.()?.isLive) return;
if (player.getProgressState?.()?.isAtLiveHead !== true) return;

video.playbackRate = 1;
ImprovedTube.showStatus(1);
};
/*------------------------------------------------------------------------------
PERMANENT PLAYBACK SPEED
------------------------------------------------------------------------------*/
ImprovedTube.playerPlaybackSpeed = function () { if (this.storage.player_forced_playback_speed === true) {
Expand Down
116 changes: 116 additions & 0 deletions tests/unit/live-head-speed-reset.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
const fs = require('fs');
const path = require('path');
const vm = require('vm');

function extractFunction(file, signature) {
const source = fs.readFileSync(path.join(__dirname, '../..', file), 'utf8');
const start = source.indexOf(signature);
const openingBrace = source.indexOf('{', start);
let depth = 0;

if (start < 0 || openingBrace < 0) {
throw new Error(signature + ' was not found');
}

for (let index = openingBrace; index < source.length; index++) {
if (source[index] === '{') depth++;
if (source[index] === '}' && --depth === 0) {
return source.slice(start, index + 2);
}
}

throw new Error(signature + ' is not balanced');
}

const liveHeadSpeedReset = extractFunction(
'js&css/web-accessible/www.youtube.com/player.js',
'ImprovedTube.playerLiveHeadSpeedReset = function (event) {'
);

function setup({ rate = 5, isLive = true, isAtLiveHead = true, closestFindsPlayer = true, elementsPlayer } = {}) {
const player = {
getVideoData: () => ({ isLive }),
getProgressState: () => ({ isAtLiveHead })
};
const video = {
playbackRate: rate,
closest: selector => (closestFindsPlayer && selector === '.html5-video-player' ? player : null)
};
const statuses = [];
const ImprovedTube = {
elements: { player: elementsPlayer },
showStatus: value => statuses.push(value)
};

vm.runInNewContext(liveHeadSpeedReset, { ImprovedTube });

return { ImprovedTube, video, statuses, player };
}

describe('playerLiveHeadSpeedReset (#4346)', () => {
test('resets a sped-up livestream to 1x when it stalls at the live head', () => {
const { ImprovedTube, video, statuses } = setup();

ImprovedTube.playerLiveHeadSpeedReset({ target: video });

expect(video.playbackRate).toBe(1);
expect(statuses).toEqual([1]);
});

test('keeps the speed while catching up behind the live head (DVR)', () => {
const { ImprovedTube, video, statuses } = setup({ isAtLiveHead: false });

ImprovedTube.playerLiveHeadSpeedReset({ target: video });

expect(video.playbackRate).toBe(5);
expect(statuses).toEqual([]);
});

test('ignores regular (non-live) videos', () => {
const { ImprovedTube, video, statuses } = setup({ isLive: false });

ImprovedTube.playerLiveHeadSpeedReset({ target: video });

expect(video.playbackRate).toBe(5);
expect(statuses).toEqual([]);
});

test.each([1, 0.75])('leaves %sx untouched at the live head', rate => {
const { ImprovedTube, video, statuses } = setup({ rate });

ImprovedTube.playerLiveHeadSpeedReset({ target: video });

expect(video.playbackRate).toBe(rate);
expect(statuses).toEqual([]);
});

test('does nothing when the player API is unavailable', () => {
const { ImprovedTube, statuses } = setup();
const video = { playbackRate: 5, closest: () => ({}) };

expect(() => ImprovedTube.playerLiveHeadSpeedReset({ target: video })).not.toThrow();
expect(video.playbackRate).toBe(5);
expect(statuses).toEqual([]);
});

test('does nothing when closest() finds no player and there is no elements.player fallback', () => {
const { ImprovedTube, video, statuses } = setup({ closestFindsPlayer: false });

expect(() => ImprovedTube.playerLiveHeadSpeedReset({ target: video })).not.toThrow();
expect(video.playbackRate).toBe(5);
expect(statuses).toEqual([]);
});

test('falls back to ImprovedTube.elements.player when closest() finds no player', () => {
const elementsPlayer = {
getVideoData: () => ({ isLive: true }),
getProgressState: () => ({ isAtLiveHead: true })
};
const { ImprovedTube, video, statuses } = setup({ closestFindsPlayer: false, elementsPlayer });

ImprovedTube.playerLiveHeadSpeedReset({ target: video });

expect(video.playbackRate).toBe(1);
expect(statuses).toEqual([1]);
});
});