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
69 changes: 36 additions & 33 deletions js&css/web-accessible/www.youtube.com/appearance.js
Original file line number Diff line number Diff line change
Expand Up @@ -1056,24 +1056,8 @@ ImprovedTube.disableLikesAnimation = function () {
VIDEO FILTERS (BRIGHTNESS, CONTRAST, SATURATION, HUE, SHARPNESS, GAMMA)
------------------------------------------------------------------------------*/
ImprovedTube.videoFilters = function () {
const isEnabled = this.storage.video_filters_activate !== false && (
this.storage.video_filters_activate === true ||
(this.storage.video_filters_preset && this.storage.video_filters_preset !== 'normal') ||
(this.isset(this.storage.video_filter_brightness) && Number(this.storage.video_filter_brightness) !== 100) ||
(this.isset(this.storage.video_filter_contrast) && Number(this.storage.video_filter_contrast) !== 100) ||
(this.isset(this.storage.video_filter_saturation) && Number(this.storage.video_filter_saturation) !== 100) ||
(this.isset(this.storage.video_filter_hue) && Number(this.storage.video_filter_hue) !== 0) ||
(this.isset(this.storage.video_filter_sharpness) && Number(this.storage.video_filter_sharpness) > 0) ||
(this.isset(this.storage.video_filter_gamma) && Number(this.storage.video_filter_gamma) !== 1)
);

if (!isEnabled // move to /js&css/web-accessible/core.js && !document.getElementById('it-video-filters-style')
) {
return;
}

const activate = this.storage.video_filters_activate !== false;
const preset = this.storage.video_filters_preset || 'custom';
const activate = this.storage.video_filters_activate === true;
const preset = this.storage.video_filters_preset || 'normal';

let b = Number(this.storage.video_filter_brightness); if (!isFinite(b)) b = 100;
let c = Number(this.storage.video_filter_contrast); if (!isFinite(c)) c = 100;
Expand Down Expand Up @@ -1122,22 +1106,41 @@ ImprovedTube.videoFilters = function () {
const center = (1 + 4 * sh).toFixed(2);
const neg = (-sh).toFixed(2);
const kernel = `0 ${neg} 0 ${neg} ${center} ${neg} 0 ${neg} 0`;
const exp = g > 0 ? (1 / g).toFixed(3) : 1;

svgEl.innerHTML = `
<filter id="it-video-filter">
${sh > 0 ? `<feConvolveMatrix order="3" preserveAlpha="true" kernelMatrix="${kernel}" result="sharp"/>` : ''}
${g !== 1 ? `
<feComponentTransfer ${sh > 0 ? 'in="sharp"' : ''}>
<feFuncR type="gamma" exponent="${exp}"/>
<feFuncG type="gamma" exponent="${exp}"/>
<feFuncB type="gamma" exponent="${exp}"/>
</feComponentTransfer>
` : ''}
</filter>
`;
const exp = g > 0 ? (1 / g).toFixed(3) : '1';

svgEl.textContent = '';

const ns = 'http://www.w3.org/2000/svg';
const filter = document.createElementNS(ns, 'filter');
filter.setAttribute('id', 'it-video-filter');

if (sh > 0) {
const feConvolveMatrix = document.createElementNS(ns, 'feConvolveMatrix');
feConvolveMatrix.setAttribute('order', '3');
feConvolveMatrix.setAttribute('preserveAlpha', 'true');
feConvolveMatrix.setAttribute('kernelMatrix', kernel);
feConvolveMatrix.setAttribute('result', 'sharp');
filter.appendChild(feConvolveMatrix);
}

if (g !== 1) {
const feComponentTransfer = document.createElementNS(ns, 'feComponentTransfer');
if (sh > 0) {
feComponentTransfer.setAttribute('in', 'sharp');
}

['feFuncR', 'feFuncG', 'feFuncB'].forEach(funcType => {
const feFunc = document.createElementNS(ns, funcType);
feFunc.setAttribute('type', 'gamma');
feFunc.setAttribute('exponent', exp);
feComponentTransfer.appendChild(feFunc);
});
filter.appendChild(feComponentTransfer);
}

svgEl.appendChild(filter);
} else {
svgEl.innerHTML = '';
svgEl.textContent = '';
}

if (!styleEl) {
Expand Down
60 changes: 47 additions & 13 deletions js&css/web-accessible/www.youtube.com/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -996,14 +996,28 @@ ImprovedTube.playerVideoFiltersButton = function () {

svg.appendChild(path);

const isActive = this.storage.video_filters_activate !== false &&
(this.storage.video_filters_preset !== 'normal' ||
(Number(this.storage.video_filter_brightness) !== 100 && this.isset(this.storage.video_filter_brightness)) ||
(Number(this.storage.video_filter_contrast) !== 100 && this.isset(this.storage.video_filter_contrast)) ||
(Number(this.storage.video_filter_saturation) !== 100 && this.isset(this.storage.video_filter_saturation)) ||
(Number(this.storage.video_filter_hue) !== 0 && this.isset(this.storage.video_filter_hue)) ||
(Number(this.storage.video_filter_sharpness) > 0 && this.isset(this.storage.video_filter_sharpness)) ||
(Number(this.storage.video_filter_gamma) !== 1 && this.isset(this.storage.video_filter_gamma)));
const preset = this.storage.video_filters_preset || 'normal';
let b = 100, c = 100, s = 100, h = 0, sh = 0, g = 1;

if (preset === 'vivid') {
b = 105; c = 115; s = 140; h = 0; sh = 1; g = 1;
} else if (preset === 'cinema') {
b = 95; c = 120; s = 85; h = 0; sh = 0.5; g = 1.1;
} else if (preset === 'warm') {
b = 100; c = 105; s = 115; h = -10; sh = 0; g = 1;
} else if (preset === 'cool') {
b = 102; c = 105; s = 105; h = 10; sh = 0; g = 1;
} else if (preset === 'custom') {
b = Number(this.storage.video_filter_brightness); if (!isFinite(b)) b = 100;
c = Number(this.storage.video_filter_contrast); if (!isFinite(c)) c = 100;
s = Number(this.storage.video_filter_saturation); if (!isFinite(s)) s = 100;
h = Number(this.storage.video_filter_hue); if (!isFinite(h)) h = 0;
sh = Number(this.storage.video_filter_sharpness); if (!isFinite(sh)) sh = 0;
g = Number(this.storage.video_filter_gamma); if (!isFinite(g)) g = 1;
}

const isActive = this.storage.video_filters_activate === true &&
!(b === 100 && c === 100 && s === 100 && h === 0 && sh === 0 && g === 1);

this.createPlayerButton({
id: 'it-video-filters-button',
Expand All @@ -1016,20 +1030,40 @@ ImprovedTube.playerVideoFiltersButton = function () {
let nextIdx = (presets.indexOf(current) + 1) % presets.length;
let nextPreset = presets[nextIdx];
ImprovedTube.storage.video_filters_preset = nextPreset;
ImprovedTube.storage.video_filters_activate = true;
ImprovedTube.storage.video_filters_activate = nextPreset !== 'normal';
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_preset', value: nextPreset });
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_activate', value: true });
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_activate', value: ImprovedTube.storage.video_filters_activate });
ImprovedTube.videoFilters();
ImprovedTube.showStatus('Filter: ' + nextPreset.toUpperCase());
} else {
ImprovedTube.storage.video_filters_activate = ImprovedTube.storage.video_filters_activate === false ? true : false;
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_activate', value: ImprovedTube.storage.video_filters_activate });
const newState = ImprovedTube.storage.video_filters_activate !== true;
ImprovedTube.storage.video_filters_activate = newState;
if (newState && (!ImprovedTube.storage.video_filters_preset || ImprovedTube.storage.video_filters_preset === 'normal') &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_brightness) &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_contrast) &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_saturation) &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_hue) &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_sharpness) &&
!ImprovedTube.isset(ImprovedTube.storage.video_filter_gamma)) {
ImprovedTube.storage.video_filters_preset = 'vivid';
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_preset', value: 'vivid' });
}
ImprovedTube.messages.send({ action: 'set', key: 'video_filters_activate', value: newState });
ImprovedTube.videoFilters();
ImprovedTube.showStatus('Filters: ' + (ImprovedTube.storage.video_filters_activate ? 'ON' : 'OFF'));
ImprovedTube.showStatus('Filters: ' + (newState ? 'ON' : 'OFF'));
}
},
title: 'Video Filters (Click: Toggle, Shift+Click: Cycle Presets)'
});

const btn = document.querySelector('#it-video-filters-button');
if (btn) {
if (isActive) {
btn.classList.add('it-video-filters-active');
} else {
btn.classList.remove('it-video-filters-active');
}
}
}
};
/*------------------------------------------------------------------------------
Expand Down