Fixing 1080p default playback

This commit is contained in:
maximstewart 2021-02-28 15:49:58 -06:00
parent 2414a593c4
commit 7d15cf00b4
4 changed files with 165 additions and 19 deletions

View File

@ -12,8 +12,8 @@ Better YouTube + works to improve the YouTube experience by providing quick acce
* It shows volume level as you scroll. * It shows volume level as you scroll.
* It lets Unix, Linux, and MacOS systems have the ability to download the video using native app calls. * It lets Unix, Linux, and MacOS systems have the ability to download the video using native app calls.
# Version: 1.5.6 # Version: 1.5.7
* 1080p playback defaulting... fix ...? * Added injection script to default to 1080p playback
# Download # Download
https://addons.mozilla.org/en-US/firefox/addon/better-youtube-plus/ https://addons.mozilla.org/en-US/firefox/addon/better-youtube-plus/

149
src/inject.js Normal file
View File

@ -0,0 +1,149 @@
'use strict';
// ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'auto']
const prefs = {
hd: true,
once: false,
higher: true,
quality: "hd1080",
log: false,
highFramerate: true
};
const script = document.createElement('script');
Object.assign(script.dataset, prefs);
script.textContent = `
window.yttools = window.yttools || [];
{
const isTypeSupported = MediaSource.isTypeSupported;
MediaSource.isTypeSupported = function(videoType) {
const prefs = resolutionChangeListener.prefs;
// Block all queries regarding high-framerate support.
if (prefs.highFramerate === 'false') {
const matches = videoType.match(/framerate=(\\d+)/);
if (matches && (matches[1] > 30)) {
return false;
}
}
return isTypeSupported(videoType);
}
}
function resolutionChangeListener(e) {
const prefs = resolutionChangeListener.prefs;
const player = resolutionChangeListener.player;
const log = (...args) => prefs.log === 'true' && console.log('Better-Youtube-Plus: ', ...args);
try {
if (e === 1 && player) {
const levels = player.getAvailableQualityLevels();
if (levels.length === 0) {
return log("Returned empty quality levels...");
}
// ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'auto']
const qualities = player.getAvailableQualityLevels();
const q = player.getPlaybackQuality();
if ((q.startsWith('h') && prefs.quality.startsWith('h')) && prefs.hd === 'true') {
console.log("Quality matches requested resolution...");
return;
}
const compare = (q1, q2) => {
if (q2 === 'auto') {
return false;
}
const i1 = qualities.indexOf(q1);
const i2 = qualities.indexOf(q2);
if (i1 === -1 || i2 === -1) {
return false;
}
return i1 - i2 <= 0;
};
if (prefs.higher === 'true' && compare(q, prefs.quality)) {
return log('Quality is higher than ' + prefs.quality + '... skipping quality change.');
}
if (q === prefs.quality) {
return log('Selected quality is okay...');
}
const find = increase => {
if (prefs.quality === 'highest') {
return levels[0];
}
else {
if (increase) {
prefs.quality = qualities[qualities.indexOf(prefs.quality) - 1] || levels[0];
}
const index = levels.indexOf(prefs.quality);
if (index !== -1) {
return prefs.quality;
}
return find(true);
}
};
const nq = find();
if (q === nq) {
return log('Requested quality is unavailable... skipping change.');
}
player.setPlaybackQuality(nq);
try {
player.setPlaybackQualityRange(nq, nq);
}
catch (e) {}
if (prefs.once === 'true') {
player.removeEventListener('onStateChange', 'resolutionChangeListener');
window.resolutionChangeListener = () => {};
log("Removing Listener...");
}
log('Quality was ' + q + ' and now is set to ' + nq);
}
}
catch (e) {
log(e);
}
}
resolutionChangeListener.prefs = document.currentScript.dataset;
window.yttools.push(e => {
resolutionChangeListener.player = e;
resolutionChangeListener(1);
e.addEventListener('onStateChange', resolutionChangeListener);
});
function onYouTubePlayerReady(player) {
if (yttools.resolved !== true) {
yttools.resolved = true;
yttools.forEach(c => {
try {
c(player);
}
catch (e) {}
});
}
}
window.addEventListener('spfready', () => {
if (typeof window.ytplayer === 'object' && window.ytplayer.config && yttools.resolved !== true) {
window.ytplayer.config.args.jsapicallback = 'onYouTubePlayerReady';
}
});
window.addEventListener('yt-navigate-finish', () => {
const player = document.querySelector('.html5-video-player');
if (player && yttools.resolved !== true) {
yttools.resolved = true;
yttools.forEach(c => c(player));
}
});
`;
document.documentElement.appendChild(script);
script.remove();

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Better Youtube +", "name": "Better Youtube +",
"version": "1.5.6", "version": "1.5.7",
"description": "Enhancements for Youtube to have a better experience.", "description": "Enhancements for Youtube to have a better experience.",
"applications": { "applications": {
@ -13,9 +13,16 @@
"permissions": [ "permissions": [
"nativeMessaging", "nativeMessaging",
"tabs", "tabs",
"*://*.youtube.com/*" "*://www.youtube.com/*"
], ],
"content_scripts": [{
"matches": ["*://www.youtube.com/*"],
"js": ["inject.js"],
"run_at": "document_start",
"all_frames": true
}],
"icons": { "icons": {
"48": "icons/betterYoutube_48.png", "48": "icons/betterYoutube_48.png",
"96": "icons/betterYoutube_96.png" "96": "icons/betterYoutube_96.png"

View File

@ -41,7 +41,7 @@
let ytThumbImgMenu, ytEnhancerMenu, ytEnhancerMenu2; // Menu systems let ytThumbImgMenu, ytEnhancerMenu, ytEnhancerMenu2; // Menu systems
let ytThumbnailBttn, ytLoopBttn, ytFloatBttn, ytDownloadBttn; // Menu Buttons let ytThumbnailBttn, ytLoopBttn, ytFloatBttn, ytDownloadBttn; // Menu Buttons
let ytMaxDefaultImg, ytHqDefaultImg, ytAMaxDefaultImg, ytAHqDefaultImg; // Thumbnail images let ytMaxDefaultImg, ytHqDefaultImg, ytAMaxDefaultImg, ytAHqDefaultImg; // Thumbnail images
let mainContentArea, playerWindow, containerOfPlyrWndow, video, player; // Youtube Player container let mainContentArea, playerWindow, containerOfPlyrWndow, video; // Youtube Player container
let videoTimeLength, videoTimeCurent, ytRangeStart, ytRangeEnd, let videoTimeLength, videoTimeCurent, ytRangeStart, ytRangeEnd,
slugInputTag, endlessPlayTag, ytVideoIntervalLoop, loopingInterval; slugInputTag, endlessPlayTag, ytVideoIntervalLoop, loopingInterval;
@ -153,6 +153,10 @@
slugInputTag.value = video.baseURI.slice(32, 32+11); slugInputTag.value = video.baseURI.slice(32, 32+11);
ytRangeStart.value = "0:00"; ytRangeStart.value = "0:00";
setTimeout(function () {
videoTimeLength = document.getElementsByClassName("ytp-time-duration")[0].innerText;
ytRangeEnd.value = videoTimeLength;
}, 2000);
// Only setting these up if we need to load controls' info // Only setting these up if we need to load controls' info
if (!controlsAreLoaded) { if (!controlsAreLoaded) {
@ -170,20 +174,6 @@
video.addEventListener("wheel", manageVolume); video.addEventListener("wheel", manageVolume);
// Dragable window for floating video event setup // Dragable window for floating video event setup
dragVideo(poppedContainer); dragVideo(poppedContainer);
// I don't think this works... =[
let resolutionStateChange = setInterval(function () {
player = document.getElementById("movie_player");
if (video.readyState === 4 && player !== undefined) {
clearInterval(resolutionStateChange);
// ? Something like a meta information and signal object????
// If 1080p not present, api plays the next lowest available resolution.
player.setPlaybackQualityRange("hd1080","hd1080");
videoTimeLength = document.getElementsByClassName("ytp-time-duration")[0].innerText;
ytRangeEnd.value = videoTimeLength;
}
}, 1000);
} }
} }