mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-11 13:56:15 -08:00
* feat: support batch video upscaling with folder upload and directory save - Add multi-file selection and entire folder upload (webkitdirectory) - Support drag & drop of both files and folders via FileSystemEntry API - Add save directory picker using File System Access API (showDirectoryPicker) - Process videos sequentially with per-file progress and status tracking - Add right-side result list with click-to-compare functionality - Add per-video duration and total batch duration display - Add retry button for failed items with error detail display - Remove auto-play on comparison viewer load - Fix worker error handling: handle "error" command to reject stale promises - Fix event listener accumulation in video comparison (AbortController) - Fix XSS risk by escaping HTML in all innerHTML injections - Fix URL revocation timing in download to prevent large file truncation - Extract writeToSaveDirectory and truncateName helpers to reduce duplication - Add Usage Guide panel explaining single/multiple/folder upload options Files changed: docs/upscaler/index.html (+1110/-181) docs/upscaler/upscaler.js (+110) * fix: prevent auto-play and resource consumption during upscaling - Set preload="metadata" on preview and comparison video elements - Explicitly pause preview video after setting src in showVideoPreview - Remove preview video seek sync from batch processing progress callbacks (was causing continuous decode during upscaling, wasting GPU resources) - Remove preview video seek sync from retry progress callback - All videos now require manual play; no background resource usage * fix: improve upscaled video quality with higher bitrate and codec support - Raise base bitrate from 2.5 Mbps (25e5) to 8 Mbps (8e6) for standard and firefox processors, preventing quality loss when source videos have high bitrates (e.g. 720p @ 16.7 Mbps was producing 1440p @ 10 Mbps, smaller than the original file) - Double the bitrate for mediabunny processor (X.n1 * 2) to account for the 4x pixel increase from 2x upscaling - Add H.264 Level 5.1 (avc1.640033) and Level 5.2 (avc1.640034) codecs to the fallback lists, since Level 4.0 (avc1.640028, ~24.6 Mbps) cannot support the higher bitrates for 1440p+ outputs - Add latencyMode: "quality" to VideoEncoder configs for both standard and firefox processors, prioritizing encoding quality over latency (suitable for offline processing) * feat: add video data comparison panel for original vs upscaled metrics - Add a comparison data table below the file info bar showing 6 metrics: Resolution, File Size, Duration, Est. Bitrate, Pixels, Process Time - Display per-metric change percentage with color-coded indicators: green (↑) for improvements, red (↓) for regressions, gray for neutral - Estimated bitrate calculated from file size × 8 / video duration - Table renders after both original and upscaled video metadata loads - Auto-hide panel on reset * fix: make video data comparison panel full-width and responsive - Move comparison data table from inside the left column to the full-width area below the left/right layout, so it is no longer constrained by the comparison viewer column width - Remove table-fixed colgroup and overflow-x-auto that caused horizontal scrolling on smaller screens - Table now uses w-full auto-layout, displaying all 4 columns (Metric, Original, Upscaled, Change) without requiring horizontal scrolling --------- Co-authored-by: rionzhao <rionzhao@tencent.com>
252 lines
9.1 KiB
JavaScript
252 lines
9.1 KiB
JavaScript
/*!
|
|
* artplayer-plugin-ads.js v2.1.0
|
|
* Github: https://github.com/zhw2590582/ArtPlayer
|
|
* (c) 2017-2026 Harvey Zhao
|
|
* Released under the MIT License.
|
|
*/
|
|
const style = ".artplayer-plugin-ads {\n position: absolute;\n z-index: 150;\n left: 0;\n top: 0;\n right: 0;\n bottom: 0;\n width: 100%;\n height: 100%;\n overflow: hidden;\n font-size: 13px;\n line-height: 1;\n color: #fff;\n background-color: #000;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-html {\n display: flex;\n align-items: center;\n justify-content: center;\n width: 100%;\n height: 100%;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-video {\n width: 100%;\n height: 100%;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-timer {\n display: none;\n position: absolute;\n top: 10px;\n right: 10px;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-timer > div {\n display: flex;\n align-items: center;\n background-color: rgba(0, 0, 0, 0.5);\n border-radius: 15px;\n margin-left: 5px;\n padding: 5px 10px;\n cursor: pointer;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-control {\n display: none;\n position: absolute;\n bottom: 10px;\n right: 10px;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-control > div {\n display: flex;\n align-items: center;\n background-color: rgba(0, 0, 0, 0.5);\n border-radius: 15px;\n margin-left: 5px;\n padding: 5px 10px;\n cursor: pointer;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-control .art-icon svg {\n width: 20px;\n height: 20px;\n}\n.artplayer-plugin-ads .artplayer-plugin-ads-loading {\n display: flex;\n align-items: center;\n justify-content: center;\n position: absolute;\n left: 0;\n top: 0;\n right: 0;\n bottom: 0;\n width: 100%;\n height: 100%;\n}\n";
|
|
function checkVersion(art) {
|
|
const {
|
|
version,
|
|
utils: { errorHandle }
|
|
} = art.constructor;
|
|
const arr = version.split(".").map(Number);
|
|
const major = arr[0];
|
|
const minor = arr[1] / 100;
|
|
errorHandle(
|
|
major + minor >= 5,
|
|
`Artplayer.js@${version} is not compatible the artplayerPluginAds@${artplayerPluginAds.version}. Please update it to version Artplayer.js@5.x.x`
|
|
);
|
|
}
|
|
function artplayerPluginAds(option) {
|
|
return (art) => {
|
|
checkVersion(art);
|
|
const {
|
|
template: { $player },
|
|
icons: { volume, volumeClose, fullscreenOn, fullscreenOff, loading },
|
|
constructor: {
|
|
validator,
|
|
utils: { query, append, setStyle }
|
|
}
|
|
} = art;
|
|
option = validator(
|
|
{
|
|
html: "",
|
|
video: "",
|
|
url: "",
|
|
playDuration: 5,
|
|
totalDuration: 10,
|
|
muted: false,
|
|
i18n: {
|
|
close: "关闭广告",
|
|
countdown: "%s秒",
|
|
detail: "查看详情",
|
|
canBeClosed: "%s秒后可关闭广告"
|
|
},
|
|
...option
|
|
},
|
|
{
|
|
html: "?string",
|
|
video: "?string",
|
|
url: "?string",
|
|
playDuration: "number",
|
|
totalDuration: "number",
|
|
muted: "?boolean",
|
|
i18n: {
|
|
close: "string",
|
|
countdown: "string",
|
|
detail: "string",
|
|
canBeClosed: "string"
|
|
}
|
|
}
|
|
);
|
|
let $ads = null;
|
|
let $timer = null;
|
|
let $close = null;
|
|
let $countdown = null;
|
|
let $control = null;
|
|
let $loading = null;
|
|
let time = 0;
|
|
let timer = null;
|
|
let isEnd = false;
|
|
let isInit = false;
|
|
let isCanClose = false;
|
|
function getI18n(val, str) {
|
|
return str.replace("%s", val);
|
|
}
|
|
function skip() {
|
|
isEnd = true;
|
|
art.play();
|
|
if (option.video)
|
|
$ads.pause();
|
|
setStyle(art.template.$ads, "display", "none");
|
|
art.emit("artplayerPluginAds:skip", option);
|
|
}
|
|
function play() {
|
|
if (isEnd)
|
|
return;
|
|
timer = setTimeout(() => {
|
|
time += 1;
|
|
const playDuration = option.playDuration - time;
|
|
if (playDuration >= 1) {
|
|
$close.innerHTML = getI18n(playDuration, option.i18n.canBeClosed);
|
|
} else {
|
|
$close.innerHTML = option.i18n.close;
|
|
if (!isCanClose) {
|
|
isCanClose = true;
|
|
}
|
|
}
|
|
$countdown.innerHTML = getI18n(option.totalDuration - time, option.i18n.countdown);
|
|
if (time >= option.totalDuration) {
|
|
skip();
|
|
} else {
|
|
play();
|
|
}
|
|
}, 1e3);
|
|
}
|
|
function pause() {
|
|
if (isEnd)
|
|
return;
|
|
clearTimeout(timer);
|
|
}
|
|
function show() {
|
|
art.template.$ads = append($player, '<div class="artplayer-plugin-ads"></div>');
|
|
$ads = append(
|
|
art.template.$ads,
|
|
option.video ? `<video class="artplayer-plugin-ads-video" src="${option.video}" loop playsInline></video>` : `<div class="artplayer-plugin-ads-html">${option.html}</div>`
|
|
);
|
|
$loading = append(art.template.$ads, '<div class="artplayer-plugin-ads-loading"></div>');
|
|
append($loading, loading);
|
|
$timer = append(
|
|
art.template.$ads,
|
|
`<div class="artplayer-plugin-ads-timer">
|
|
<div class="artplayer-plugin-ads-close">${option.playDuration <= 0 ? option.i18n.close : getI18n(option.playDuration, option.i18n.canBeClosed)}</div>
|
|
<div class="artplayer-plugin-ads-countdown">${getI18n(
|
|
option.totalDuration,
|
|
option.i18n.countdown
|
|
)}</div>
|
|
</div>`
|
|
);
|
|
$close = query(".artplayer-plugin-ads-close", $timer);
|
|
$countdown = query(".artplayer-plugin-ads-countdown", $timer);
|
|
if (option.playDuration >= option.totalDuration) {
|
|
setStyle($close, "display", "none");
|
|
}
|
|
art.proxy($close, "click", () => {
|
|
if (isCanClose) {
|
|
skip();
|
|
}
|
|
});
|
|
$control = append(
|
|
art.template.$ads,
|
|
`<div class="artplayer-plugin-ads-control">
|
|
<div class="artplayer-plugin-ads-detail">${option.i18n.detail}</div>
|
|
<div class="artplayer-plugin-ads-muted"></div>
|
|
<div class="artplayer-plugin-ads-fullscreen"></div>
|
|
</div>`
|
|
);
|
|
const $detail = query(".artplayer-plugin-ads-detail", $control);
|
|
const $muted = query(".artplayer-plugin-ads-muted", $control);
|
|
const $fullscreen = query(".artplayer-plugin-ads-fullscreen", $control);
|
|
if (option.url) {
|
|
art.proxy($detail, "click", () => {
|
|
window.open(option.url);
|
|
art.emit("artplayerPluginAds:click", option);
|
|
});
|
|
} else {
|
|
setStyle($detail, "display", "none");
|
|
}
|
|
if (option.video) {
|
|
const $volume = append($muted, volume);
|
|
const $volumeClose = append($muted, volumeClose);
|
|
setStyle($volumeClose, "display", "none");
|
|
if (option.muted) {
|
|
$ads.muted = true;
|
|
setStyle($volume, "display", "none");
|
|
setStyle($volumeClose, "display", "inline-flex");
|
|
}
|
|
art.proxy($muted, "click", () => {
|
|
$ads.muted = !$ads.muted;
|
|
if ($ads.muted) {
|
|
setStyle($volume, "display", "none");
|
|
setStyle($volumeClose, "display", "inline-flex");
|
|
} else {
|
|
setStyle($volume, "display", "inline-flex");
|
|
setStyle($volumeClose, "display", "none");
|
|
}
|
|
});
|
|
} else {
|
|
setStyle($muted, "display", "none");
|
|
}
|
|
const $fullscreenOn = append($fullscreen, fullscreenOn);
|
|
const $fullscreenOff = append($fullscreen, fullscreenOff);
|
|
setStyle($fullscreenOff, "display", "none");
|
|
art.proxy($fullscreen, "click", () => {
|
|
art.fullscreen = !art.fullscreen;
|
|
if (art.fullscreen) {
|
|
setStyle($fullscreenOn, "display", "inline-flex");
|
|
setStyle($fullscreenOff, "display", "none");
|
|
} else {
|
|
setStyle($fullscreenOn, "display", "none");
|
|
setStyle($fullscreenOff, "display", "inline-flex");
|
|
}
|
|
});
|
|
art.proxy($ads, "click", () => {
|
|
if (option.url)
|
|
window.open(option.url);
|
|
art.emit("artplayerPluginAds:click", option);
|
|
});
|
|
}
|
|
function init() {
|
|
if (isInit)
|
|
return;
|
|
isInit = true;
|
|
show();
|
|
art.pause();
|
|
if (option.video) {
|
|
art.proxy($ads, "error", skip);
|
|
art.proxy($ads, "loadedmetadata", () => {
|
|
play();
|
|
$ads.play();
|
|
setStyle($timer, "display", "flex");
|
|
setStyle($control, "display", "flex");
|
|
setStyle($loading, "display", "none");
|
|
});
|
|
} else {
|
|
play();
|
|
setStyle($timer, "display", "flex");
|
|
setStyle($control, "display", "flex");
|
|
setStyle($loading, "display", "none");
|
|
}
|
|
art.on("document:visibilitychange", () => {
|
|
if (document.hidden) {
|
|
pause();
|
|
} else {
|
|
play();
|
|
}
|
|
});
|
|
}
|
|
art.on("ready", () => {
|
|
art.once("play", init);
|
|
art.once("video:playing", init);
|
|
});
|
|
return {
|
|
name: "artplayerPluginAds",
|
|
skip,
|
|
pause,
|
|
play
|
|
};
|
|
};
|
|
}
|
|
if (typeof document !== "undefined") {
|
|
if (!document.getElementById("artplayer-plugin-ads")) {
|
|
const $style = document.createElement("style");
|
|
$style.id = "artplayer-plugin-ads";
|
|
$style.textContent = style;
|
|
document.head.appendChild($style);
|
|
}
|
|
}
|
|
export {
|
|
artplayerPluginAds as default
|
|
};
|