Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85fea48159 | ||
|
|
986d30dfb4 | ||
|
|
ab36d2f25c |
+1
-1
@@ -9,7 +9,7 @@ secrets*.md
|
|||||||
# deploy.py --legacy actually uses), so only the legacy one is tracked.
|
# deploy.py --legacy actually uses), so only the legacy one is tracked.
|
||||||
/jfvr-mvp.js
|
/jfvr-mvp.js
|
||||||
# Temporary offline test page (fake <video> + libass canvas + XR stubs).
|
# Temporary offline test page (fake <video> + libass canvas + XR stubs).
|
||||||
_harness.html
|
_harness*.html
|
||||||
|
|
||||||
# --- build / tooling noise --------------------------------------------
|
# --- build / tooling noise --------------------------------------------
|
||||||
__pycache__/
|
__pycache__/
|
||||||
|
|||||||
+25
-4
@@ -122,7 +122,7 @@ Style: RightEye, Alignment=8, MarginL=1920, MarginR=50 , MarginV=700
|
|||||||
| `XRWebGLBinding.createQuadLayer` | **true** |
|
| `XRWebGLBinding.createQuadLayer` | **true** |
|
||||||
| `XRWebGLBinding.getSubImage` | **需要 2 个参数** `(layer, frame)` |
|
| `XRWebGLBinding.getSubImage` | **需要 2 个参数** `(layer, frame)` |
|
||||||
| `MAX_TEXTURE_SIZE` / `MAX_RENDERBUFFER_SIZE` | **8192 / 16384** |
|
| `MAX_TEXTURE_SIZE` / `MAX_RENDERBUFFER_SIZE` | **8192 / 16384** |
|
||||||
| 8K HEVC `decodingInfo` | `supported:true, powerEfficient:true` |
|
| 8K HEVC `decodingInfo` | `supported:true, powerEfficient:true`(仅 8-bit Main,见 ADDENDUM 12) |
|
||||||
| `supportedFrameRates` | **[72, 80, 90, 120]** |
|
| `supportedFrameRates` | **[72, 80, 90, 120]** |
|
||||||
| `enabledFeatures` | `[local, viewer, bounded-floor, layers, hand-tracking, webxr, local-floor]` |
|
| `enabledFeatures` | `[local, viewer, bounded-floor, layers, hand-tracking, webxr, local-floor]` |
|
||||||
| 手部追踪 | ✅ 25 关节齐全,profiles `["oculus-hand","generic-hand","generic-hand-select","generic-trigger"]` |
|
| 手部追踪 | ✅ 25 关节齐全,profiles `["oculus-hand","generic-hand","generic-hand-select","generic-trigger"]` |
|
||||||
@@ -890,7 +890,28 @@ enableautobitratebitrate-Video-<true|false> = false ← 上游拼写,bitra
|
|||||||
1. **续播点 33:22.759 的来历**:就是 2026-10-05 那次转码会话留下的(`stopped ... at 2002759ms`)。所以 10-17 两次播放都从 33:22 续播,画面出不来进度自然不动,于是「停在 33:22」重复了两次。
|
1. **续播点 33:22.759 的来历**:就是 2026-10-05 那次转码会话留下的(`stopped ... at 2002759ms`)。所以 10-17 两次播放都从 33:22 续播,画面出不来进度自然不动,于是「停在 33:22」重复了两次。
|
||||||
2. **文件本身没问题**:完全分配无空洞(`du` 实际用量 == 表观大小)、`moov` 在文件头(faststart 正常)、33:22 处 ffmpeg 解码无报错、Jellyfin 数据库里时长正确(50:58)。同目录还有 3 个垃圾广告文件(`.url` × 3 + 一个 20 MB 的 `三 上 悠 亚…mp4`),是盗版站打包进来的。
|
2. **文件本身没问题**:完全分配无空洞(`du` 实际用量 == 表观大小)、`moov` 在文件头(faststart 正常)、33:22 处 ffmpeg 解码无报错、Jellyfin 数据库里时长正确(50:58)。同目录还有 3 个垃圾广告文件(`.url` × 3 + 一个 20 MB 的 `三 上 悠 亚…mp4`),是盗版站打包进来的。
|
||||||
|
|
||||||
### 18.7 待办
|
### 18.7 已做(插件 0.3.0.0 / bundle `4e9a8f`)
|
||||||
|
|
||||||
- [ ] `src/00-core.js` 的能力探测补上 Main 10(`hev1.2.4.L183.B0` / `hvc1.2.4.L183.B0`)和 8K/4K 的分档,让诊断面板不再只说「8K HEVC 支持」
|
- [x] `src/00-core.js` 的能力探测补上 Main 10 和 8K/4K 分档;新增 `NS.caps.codec`(`decodingInfo` 逐档结果)与 `NS.capsDiag()` 里的 `HEVC real` 段
|
||||||
- [ ] 若想彻底自动化(PC 自动转码、Quest 继续直连 8K):用 `MediaCapabilities.decodingInfo` 真机探测后覆盖 `HTMLVideoElement.prototype.canPlayType`,让 Jellyfin Web 自己那套 `maxHevcLevel` 逻辑算出准确 profile(Meta 官方文档也是这么建议的)。看门狗是「先给用户一个出路」的版本,不是这个。
|
- [x] **彻底自动化**:用 `MediaCapabilities.decodingInfo` 真机探测后覆盖 `HTMLVideoElement.prototype.canPlayType`,让 Jellyfin Web 自己那套 `maxHevcLevel` 逻辑算出准确 profile
|
||||||
|
|
||||||
|
覆盖逻辑的关键点:
|
||||||
|
|
||||||
|
- 每档在**它对应的分辨率**上探测(level 字符串不带尺寸):`L120→1920x1080@30`、`L123→1080p60`、`L153→3840x2160@60`、`L183/L186→8192x4096@60`
|
||||||
|
- codec string → `'<profile_idc>:<level>'`(`hvc1.2.4.L183` → `2:183`);`hvc1`/`hev1` 同键,因为差的只是 sample entry
|
||||||
|
- **只有 `supported === false` 才降级**;`supported:true, smooth:false` 只记录不行动(太贴边,而且看门狗已经兜底)
|
||||||
|
- 钩子在 bundle 执行时**同步**装上(此时还没有 verdict,一律交给原生),探测结果落地后才生效
|
||||||
|
- 逃生开关:`localStorage['jfvr-cpt'] = 'off'` → 完全不装钩子
|
||||||
|
|
||||||
|
三种模式本地实测(`_harness-codec.html`,全过):
|
||||||
|
|
||||||
|
| 模式 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| `pc` | 8K Main10 被拦 → Jellyfin 封顶 level 153 → 8K 文件超出声明 → **转码** |
|
||||||
|
| `quest` | 无一被拦 → 声明保持 ≥183 → **Direct Play 不变** |
|
||||||
|
| `off` | 钩子未安装,`canPlayType` 完全未动 → 恢复旧行为 |
|
||||||
|
|
||||||
|
### 18.8 待办
|
||||||
|
|
||||||
|
- [ ] 探测目前只覆盖 HEVC。AV1 / VP9 走同一套机制,但库里没有这类片源,先不做。
|
||||||
|
- [ ] `decodingInfo` 的 `smooth` 现在是只记录不行动。如果哪天出现「supported:true 但实际掉帧」的案例,可以考虑把 `smooth === false` 也纳入降级条件(风险:可能误伤 Quest)。
|
||||||
|
|||||||
@@ -93,6 +93,41 @@ enableautobitratebitrate-Video-<true|false> = false
|
|||||||
|
|
||||||
选过之后 120 秒内不再打扰(记在 sessionStorage)。
|
选过之后 120 秒内不再打扰(记在 sessionStorage)。
|
||||||
|
|
||||||
|
### 1.3 让客户端如实上报解码能力(`canPlayType` 覆盖)
|
||||||
|
|
||||||
|
`src/00-core.js`。解决的问题:**Jellyfin 的直连/转码决策 100% 看客户端上报的设备档案**,而 Jellyfin Web 是从 `canPlayType` 推出整个 HEVC 声明的(`browserDeviceProfile.js`):
|
||||||
|
|
||||||
|
```js
|
||||||
|
if (canPlayType('video/mp4; codecs="hvc1.2.4.L183"')) {
|
||||||
|
maxHevcLevel = 183; // level 6.1 = 8K
|
||||||
|
hevcProfiles = 'main|main 10';
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`canPlayType` 回答的是「这台机器*有没有* HEVC 解码器」,不是「能不能解 8192×4096 的 Main 10 @60fps」。所以一个只是「系统里有 HEVC 解码器」的桌面浏览器会声称支持 8K Main 10 → 服务器选 DirectPlay → 黑屏(而 OSD 压根不会创建,见 §1.2)。
|
||||||
|
|
||||||
|
插件的做法:
|
||||||
|
|
||||||
|
1. 页面加载时用 **`MediaCapabilities.decodingInfo`** 对 HEVC 各档做真机探测(每档在它对应的分辨率上测:L120→1080p30、L153→4K60、L183/L186→8K60,因为 level 字符串本身不带尺寸);
|
||||||
|
2. 把结果回灌给 `HTMLVideoElement.prototype.canPlayType`:只有 `supported === false` 才返回 `''`,其余全部交给原生实现。
|
||||||
|
|
||||||
|
这样 Jellyfin Web 自己那套 `maxHevcLevel` 逻辑就会得出**准确**档案:
|
||||||
|
|
||||||
|
| 设备 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| 桌面(声称支持但实际解不动 8K Main 10) | 降到 level 153 → 8K 文件超出声明 → **服务器转码** |
|
||||||
|
| Quest 3(真能解 8K Main 10) | 保持 ≥183 → **继续 Direct Play** |
|
||||||
|
|
||||||
|
**故意保守**:只有 `supported === false` 才降级。`supported:true, smooth:false` 会记录但不影响行为 —— 太贴边了,而且「声称能播结果没播出来」已经有 §1.2 的看门狗兜底。
|
||||||
|
|
||||||
|
出问题的逃生开关(某台设备报得离谱时用):
|
||||||
|
|
||||||
|
```js
|
||||||
|
localStorage['jfvr-cpt'] = 'off'; // 然后刷新,覆盖完全不安装
|
||||||
|
```
|
||||||
|
|
||||||
|
当前状态可以在诊断面板里看到(`canPlayType hook` 和 `HEVC real (decodingInfo)` 两段)。这也是 Meta 官方文档推荐的做法 —— 他们明确说「用 Media Capabilities API 探测,不要靠 UA 嗅探」。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 2. Quest 3 实测数据(已用 ADB + CDP 在真机验证)
|
## 2. Quest 3 实测数据(已用 ADB + CDP 在真机验证)
|
||||||
@@ -114,10 +149,14 @@ UA Mozilla/5.0 (X11; Linux x86_64; Quest 3) ... Chrome/152 ... VR Safari/537.36
|
|||||||
| `XRWebGLBinding` | — | true ← 回退路径可用 |
|
| `XRWebGLBinding` | — | true ← 回退路径可用 |
|
||||||
| `MAX_TEXTURE_SIZE` | 8192 | 8192 |
|
| `MAX_TEXTURE_SIZE` | 8192 | 8192 |
|
||||||
| `MAX_RENDERBUFFER_SIZE` | 16384 | 16384 |
|
| `MAX_RENDERBUFFER_SIZE` | 16384 | 16384 |
|
||||||
| 8K HEVC `decodingInfo` | supported / powerEfficient | **supported:true, powerEfficient:true** |
|
| 8K HEVC `decodingInfo` | supported / powerEfficient | **supported:true, powerEfficient:true**(仅 8-bit Main) |
|
||||||
|
|
||||||
结论:**HTTPS 下 Quest 浏览器提供全部所需 WebXR 能力,8K HEVC 走硬件解码。**
|
结论:**HTTPS 下 Quest 浏览器提供全部所需 WebXR 能力,8K HEVC 走硬件解码。**
|
||||||
|
|
||||||
|
> ⚠️ 上面那行 `decodingInfo` 当年只测了 **8-bit Main** 的 codec string(`hev1.1.6.L183.B0`),
|
||||||
|
> **10-bit Main 10(`hev1.2.4.L183.B0`)从来没测过**。插件现在会分档探测(见 §1.3),
|
||||||
|
> 诊断面板里会列出 Main/Main10 × 4K/8K 的真实结果。
|
||||||
|
|
||||||
### 2.1 网络实测:HTTPS 域名在 Quest 上就是内网直连
|
### 2.1 网络实测:HTTPS 域名在 Quest 上就是内网直连
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
Vendored
+162
-4
@@ -315,9 +315,81 @@
|
|||||||
hasGetJointPose: typeof window.XRFrame !== 'undefined' && typeof XRFrame.prototype.getJointPose === 'function',
|
hasGetJointPose: typeof window.XRFrame !== 'undefined' && typeof XRFrame.prototype.getJointPose === 'function',
|
||||||
maxTextureSize: null,
|
maxTextureSize: null,
|
||||||
hevc: {},
|
hevc: {},
|
||||||
decoding8k: null
|
decoding8k: null,
|
||||||
|
|
||||||
|
/* MediaCapabilities verdicts, keyed '<profile_idc>:<level>'. See below. */
|
||||||
|
codec: {},
|
||||||
|
codecBlocked: [],
|
||||||
|
cptPatched: false,
|
||||||
|
cptMode: null
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------ *
|
||||||
|
* codec capability: what this browser will ACTUALLY decode
|
||||||
|
* ------------------------------------------------------------------
|
||||||
|
* Two layers.
|
||||||
|
*
|
||||||
|
* 1. NS.caps.hevc -- raw canPlayType() answers, for the diagnostics panel.
|
||||||
|
* This used to only ask about Main profile (8-bit), which is why the
|
||||||
|
* project's notes said "8K HEVC: supported" right up until a Main 10
|
||||||
|
* (10-bit) file showed up and could not be decoded at all. The Main 10
|
||||||
|
* strings are the ones that actually matter for 8K VR here.
|
||||||
|
*
|
||||||
|
* 2. NS.caps.codec + the canPlayType override -- makes Jellyfin Web build
|
||||||
|
* an ACCURATE device profile.
|
||||||
|
*
|
||||||
|
* Why the override: Jellyfin Web derives its entire HEVC claim from
|
||||||
|
* canPlayType (src/scripts/browserDeviceProfile.js):
|
||||||
|
*
|
||||||
|
* let maxHevcLevel = 120, hevcProfiles = 'main';
|
||||||
|
* ...
|
||||||
|
* if (canPlayType('video/mp4; codecs="hvc1.2.4.L183"')) {
|
||||||
|
* maxHevcLevel = 183; // level 6.1 = 8K
|
||||||
|
* hevcProfiles = 'main|main 10';
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* canPlayType answers "does this system have an HEVC decoder", not "can it
|
||||||
|
* do 8192x4096 Main 10 at 60 fps". So a desktop browser that merely ships an
|
||||||
|
* HEVC decoder claims 8K Main 10, the server picks DirectPlay, and playback
|
||||||
|
* dies on a black screen with no player UI (the OSD is only built after
|
||||||
|
* 'playbackstart'). decodingInfo asks the actual decoder, so feeding its
|
||||||
|
* verdict back through canPlayType lets Jellyfin's own logic land on the
|
||||||
|
* right profile: the desktop drops to whatever it can really do and the
|
||||||
|
* server transcodes, while a Quest that genuinely decodes 8K Main 10 keeps
|
||||||
|
* DirectPlay. Meta's browser-video docs recommend exactly this API over UA
|
||||||
|
* sniffing.
|
||||||
|
*
|
||||||
|
* Only `supported === false` downgrades. `supported:true, smooth:false` is
|
||||||
|
* recorded but does not change behaviour: it is too close to the edge to act
|
||||||
|
* on, and 40-watchdog.js already covers "it claimed to work and did not".
|
||||||
|
*
|
||||||
|
* Kill switch if a device reports nonsense:
|
||||||
|
* localStorage['jfvr-cpt'] = 'off' then reload
|
||||||
|
*/
|
||||||
|
|
||||||
|
// decodingInfo needs real dimensions; a level string does not carry them, so
|
||||||
|
// each level is probed at the resolution it exists for.
|
||||||
|
var CODEC_PROBES = [
|
||||||
|
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, codec: 'hvc1.1.L120' },
|
||||||
|
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, codec: 'hvc1.1.4.L123' },
|
||||||
|
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.1.6.L183.B0' },
|
||||||
|
{ key: '2:123', name: 'Main10 L4.1', w: 1920, h: 1080, fps: 60, codec: 'hvc1.2.4.L123' },
|
||||||
|
{ key: '2:153', name: 'Main10 L5.1 (4K)', w: 3840, h: 2160, fps: 60, codec: 'hvc1.2.4.L153' },
|
||||||
|
{ key: '2:183', name: 'Main10 L6.1 (8K)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.2.4.L183' },
|
||||||
|
{ key: '2:186', name: 'Main10 L6.2 (8K60)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.2.4.L186' }
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 'video/mp4; codecs="hvc1.2.4.L183.B0"' -> '2:183' (profile_idc : level).
|
||||||
|
* Both the hvc1 and hev1 spellings map to the same key: they differ in the
|
||||||
|
* sample entry, not in what has to be decoded.
|
||||||
|
*/
|
||||||
|
function hevcKey(type) {
|
||||||
|
var m = /(?:hvc1|hev1)\.([0-9]+)(?:\.[0-9]+)?\.l([0-9]+)/i.exec(String(type || ''));
|
||||||
|
return m ? m[1] + ':' + m[2] : null;
|
||||||
|
}
|
||||||
|
NS.caps.hevcKey = hevcKey;
|
||||||
|
|
||||||
(function probe() {
|
(function probe() {
|
||||||
try {
|
try {
|
||||||
var mb = window.XRMediaBinding;
|
var mb = window.XRMediaBinding;
|
||||||
@@ -331,12 +403,17 @@
|
|||||||
if (gl) NS.caps.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
|
if (gl) NS.caps.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
try {
|
try {
|
||||||
['video/mp4; codecs="hev1.1.6.L183.B0"',
|
var ve = document.createElement('video');
|
||||||
|
['video/mp4; codecs="hev1.1.6.L183.B0"', // Main 8-bit 8K (the files that work)
|
||||||
'video/mp4; codecs="hvc1.1.6.L183.B0"',
|
'video/mp4; codecs="hvc1.1.6.L183.B0"',
|
||||||
|
'video/mp4; codecs="hev1.2.4.L183.B0"', // Main 10 8K (the files that do not)
|
||||||
|
'video/mp4; codecs="hvc1.2.4.L183.B0"',
|
||||||
|
'video/mp4; codecs="hev1.2.4.L153.B0"', // Main 10 4K
|
||||||
|
'video/mp4; codecs="hvc1.2.4.L153.B0"',
|
||||||
'video/mp4; codecs="hev1"',
|
'video/mp4; codecs="hev1"',
|
||||||
'video/mp4; codecs="hvc1"'].forEach(function (cs) {
|
'video/mp4; codecs="hvc1"'].forEach(function (cs) {
|
||||||
NS.caps.hevc[cs] = (typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported(cs)) ||
|
NS.caps.hevc[cs] = (typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported(cs)) ||
|
||||||
document.createElement('video').canPlayType(cs) || 'no';
|
ve.canPlayType(cs) || 'no';
|
||||||
});
|
});
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
if (navigator.xr && navigator.xr.isSessionSupported) {
|
if (navigator.xr && navigator.xr.isSessionSupported) {
|
||||||
@@ -346,8 +423,85 @@
|
|||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------ *
|
||||||
|
* MediaCapabilities probe + canPlayType override
|
||||||
|
* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
function applyVerdicts() {
|
||||||
|
NS.caps.codecBlocked = CODEC_PROBES.filter(function (p) {
|
||||||
|
var v = NS.caps.codec[p.key];
|
||||||
|
return v && v.supported === false;
|
||||||
|
}).map(function (p) { return p.name; });
|
||||||
|
}
|
||||||
|
|
||||||
|
function installCanPlayTypeOverride() {
|
||||||
|
if (NS.caps.cptMode === 'off') return;
|
||||||
|
var proto = window.HTMLVideoElement && window.HTMLVideoElement.prototype;
|
||||||
|
if (!proto || typeof proto.canPlayType !== 'function') return;
|
||||||
|
|
||||||
|
var orig = proto.canPlayType;
|
||||||
|
proto.canPlayType = function (type) {
|
||||||
|
try {
|
||||||
|
var key = hevcKey(type);
|
||||||
|
var v = key && NS.caps.codec[key];
|
||||||
|
// Only a definite "no" is acted on. Anything else is the browser's call.
|
||||||
|
if (v && v.supported === false) return '';
|
||||||
|
} catch (e) { /* never break the native answer */ }
|
||||||
|
return orig.apply(this, arguments);
|
||||||
|
};
|
||||||
|
NS.caps.cptPatched = true;
|
||||||
|
NS.caps.cptMode = 'on';
|
||||||
|
}
|
||||||
|
|
||||||
|
(function probeCodecs() {
|
||||||
|
// Kill switch, and the escape hatch if this ever misbehaves on a device.
|
||||||
|
try {
|
||||||
|
if (localStorage.getItem('jfvr-cpt') === 'off') { NS.caps.cptMode = 'off'; return; }
|
||||||
|
} catch (e) {}
|
||||||
|
var mc = navigator.mediaCapabilities;
|
||||||
|
if (!mc || typeof mc.decodingInfo !== 'function') { NS.caps.cptMode = 'no-api'; return; }
|
||||||
|
|
||||||
|
// Install FIRST, synchronously, so the hook is in place before anything can
|
||||||
|
// read canPlayType. Until a verdict lands the hook just defers to native,
|
||||||
|
// which is the safe default.
|
||||||
|
installCanPlayTypeOverride();
|
||||||
|
|
||||||
|
var pending = CODEC_PROBES.length;
|
||||||
|
CODEC_PROBES.forEach(function (p) {
|
||||||
|
var cfg = {
|
||||||
|
type: 'file',
|
||||||
|
video: {
|
||||||
|
contentType: 'video/mp4; codecs="' + p.codec + '"',
|
||||||
|
width: p.w, height: p.h, bitrate: 20000000, framerate: p.fps
|
||||||
|
}
|
||||||
|
};
|
||||||
|
mc.decodingInfo(cfg).then(function (info) {
|
||||||
|
NS.caps.codec[p.key] = {
|
||||||
|
name: p.name, workload: p.w + 'x' + p.h + '@' + p.fps,
|
||||||
|
supported: info.supported, smooth: info.smooth, powerEfficient: info.powerEfficient
|
||||||
|
};
|
||||||
|
}).catch(function (e) {
|
||||||
|
NS.caps.codec[p.key] = { name: p.name, error: String(e && e.message || e) };
|
||||||
|
}).then(function () {
|
||||||
|
if (--pending === 0) {
|
||||||
|
applyVerdicts();
|
||||||
|
NS.log('codec probe done; blocked = ' + (NS.caps.codecBlocked.join(', ') || 'none'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
NS.capsDiag = function () {
|
NS.capsDiag = function () {
|
||||||
var c = NS.caps;
|
var c = NS.caps;
|
||||||
|
var real = CODEC_PROBES.map(function (p) {
|
||||||
|
var v = c.codec[p.key];
|
||||||
|
if (!v) return ' ' + p.name.padEnd(20) + ' (pending)';
|
||||||
|
if (v.error) return ' ' + p.name.padEnd(20) + ' error: ' + v.error;
|
||||||
|
return ' ' + p.name.padEnd(20) + ' supported=' + v.supported +
|
||||||
|
' smooth=' + v.smooth + ' powerEfficient=' + v.powerEfficient +
|
||||||
|
' [' + v.workload + ']' + (v.supported === false ? ' <-- BLOCKED' : '');
|
||||||
|
}).join('\n');
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'origin : ' + location.origin,
|
'origin : ' + location.origin,
|
||||||
'secureContext : ' + c.secureContext,
|
'secureContext : ' + c.secureContext,
|
||||||
@@ -357,7 +511,11 @@
|
|||||||
'createQuadLayer : ' + c.hasQuadLayer,
|
'createQuadLayer : ' + c.hasQuadLayer,
|
||||||
'hand tracking API : ' + c.hasHandTracking + ' / jointSpace=' + c.hasXRJointSpace + ' / getJointPose=' + c.hasGetJointPose,
|
'hand tracking API : ' + c.hasHandTracking + ' / jointSpace=' + c.hasXRJointSpace + ' / getJointPose=' + c.hasGetJointPose,
|
||||||
'MAX_TEXTURE_SIZE : ' + c.maxTextureSize,
|
'MAX_TEXTURE_SIZE : ' + c.maxTextureSize,
|
||||||
'HEVC : ' + JSON.stringify(c.hevc)
|
'HEVC canPlayType : ' + JSON.stringify(c.hevc),
|
||||||
|
'canPlayType hook : ' + (c.cptMode || 'pending') +
|
||||||
|
(c.cptMode === 'on' ? ' (downgraded: ' + (c.codecBlocked.join(', ') || 'nothing yet') + ')' : ''),
|
||||||
|
'HEVC real (decodingInfo):',
|
||||||
|
real
|
||||||
].join('\n');
|
].join('\n');
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
|||||||
@@ -7,6 +7,14 @@
|
|||||||
"owner": "cat-shark",
|
"owner": "cat-shark",
|
||||||
"category": "General",
|
"category": "General",
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "0.3.0.0",
|
||||||
|
"targetAbi": "12.0.0.0",
|
||||||
|
"changelog": "Bundle version: `4e9a8f`\n\nFirst plugin build. The web bundle is embedded in the DLL and served from /JFVR/jfvr.js; index.html is rewritten at request time, so nothing is written to the jellyfin-web folder on disk.",
|
||||||
|
"sourceUrl": "https://git.cat-shark.xyz/cat-shark/jellyfin_vr_web_plugin/releases/download/v0.3.0.0/Jellyfin.Plugin.JFVR_12.0.0.0.zip",
|
||||||
|
"checksum": "1BFAF246451C090E351F9DDD516BD4DC",
|
||||||
|
"timestamp": "2026-10-17T17:08:08"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.2.0.0",
|
"version": "0.2.0.0",
|
||||||
"targetAbi": "12.0.0.0",
|
"targetAbi": "12.0.0.0",
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
# (InstallationManager.GetAvailablePackages), so one package covers all of 12.x.
|
# (InstallationManager.GetAvailablePackages), so one package covers all of 12.x.
|
||||||
name: "Jellyfin Web VR"
|
name: "Jellyfin Web VR"
|
||||||
guid: "7d33ef59-f9b0-412b-93bd-5cd5353018de"
|
guid: "7d33ef59-f9b0-412b-93bd-5cd5353018de"
|
||||||
version: "0.2.0.0"
|
version: "0.3.0.0"
|
||||||
targetAbi: "12.0.0.0"
|
targetAbi: "12.0.0.0"
|
||||||
framework: "net10.0"
|
framework: "net10.0"
|
||||||
overview: "VR180/VR360 playback inside Jellyfin Web for Meta Quest 3."
|
overview: "VR180/VR360 playback inside Jellyfin Web for Meta Quest 3."
|
||||||
|
|||||||
+162
-4
@@ -307,9 +307,81 @@
|
|||||||
hasGetJointPose: typeof window.XRFrame !== 'undefined' && typeof XRFrame.prototype.getJointPose === 'function',
|
hasGetJointPose: typeof window.XRFrame !== 'undefined' && typeof XRFrame.prototype.getJointPose === 'function',
|
||||||
maxTextureSize: null,
|
maxTextureSize: null,
|
||||||
hevc: {},
|
hevc: {},
|
||||||
decoding8k: null
|
decoding8k: null,
|
||||||
|
|
||||||
|
/* MediaCapabilities verdicts, keyed '<profile_idc>:<level>'. See below. */
|
||||||
|
codec: {},
|
||||||
|
codecBlocked: [],
|
||||||
|
cptPatched: false,
|
||||||
|
cptMode: null
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------ *
|
||||||
|
* codec capability: what this browser will ACTUALLY decode
|
||||||
|
* ------------------------------------------------------------------
|
||||||
|
* Two layers.
|
||||||
|
*
|
||||||
|
* 1. NS.caps.hevc -- raw canPlayType() answers, for the diagnostics panel.
|
||||||
|
* This used to only ask about Main profile (8-bit), which is why the
|
||||||
|
* project's notes said "8K HEVC: supported" right up until a Main 10
|
||||||
|
* (10-bit) file showed up and could not be decoded at all. The Main 10
|
||||||
|
* strings are the ones that actually matter for 8K VR here.
|
||||||
|
*
|
||||||
|
* 2. NS.caps.codec + the canPlayType override -- makes Jellyfin Web build
|
||||||
|
* an ACCURATE device profile.
|
||||||
|
*
|
||||||
|
* Why the override: Jellyfin Web derives its entire HEVC claim from
|
||||||
|
* canPlayType (src/scripts/browserDeviceProfile.js):
|
||||||
|
*
|
||||||
|
* let maxHevcLevel = 120, hevcProfiles = 'main';
|
||||||
|
* ...
|
||||||
|
* if (canPlayType('video/mp4; codecs="hvc1.2.4.L183"')) {
|
||||||
|
* maxHevcLevel = 183; // level 6.1 = 8K
|
||||||
|
* hevcProfiles = 'main|main 10';
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* canPlayType answers "does this system have an HEVC decoder", not "can it
|
||||||
|
* do 8192x4096 Main 10 at 60 fps". So a desktop browser that merely ships an
|
||||||
|
* HEVC decoder claims 8K Main 10, the server picks DirectPlay, and playback
|
||||||
|
* dies on a black screen with no player UI (the OSD is only built after
|
||||||
|
* 'playbackstart'). decodingInfo asks the actual decoder, so feeding its
|
||||||
|
* verdict back through canPlayType lets Jellyfin's own logic land on the
|
||||||
|
* right profile: the desktop drops to whatever it can really do and the
|
||||||
|
* server transcodes, while a Quest that genuinely decodes 8K Main 10 keeps
|
||||||
|
* DirectPlay. Meta's browser-video docs recommend exactly this API over UA
|
||||||
|
* sniffing.
|
||||||
|
*
|
||||||
|
* Only `supported === false` downgrades. `supported:true, smooth:false` is
|
||||||
|
* recorded but does not change behaviour: it is too close to the edge to act
|
||||||
|
* on, and 40-watchdog.js already covers "it claimed to work and did not".
|
||||||
|
*
|
||||||
|
* Kill switch if a device reports nonsense:
|
||||||
|
* localStorage['jfvr-cpt'] = 'off' then reload
|
||||||
|
*/
|
||||||
|
|
||||||
|
// decodingInfo needs real dimensions; a level string does not carry them, so
|
||||||
|
// each level is probed at the resolution it exists for.
|
||||||
|
var CODEC_PROBES = [
|
||||||
|
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, codec: 'hvc1.1.L120' },
|
||||||
|
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, codec: 'hvc1.1.4.L123' },
|
||||||
|
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.1.6.L183.B0' },
|
||||||
|
{ key: '2:123', name: 'Main10 L4.1', w: 1920, h: 1080, fps: 60, codec: 'hvc1.2.4.L123' },
|
||||||
|
{ key: '2:153', name: 'Main10 L5.1 (4K)', w: 3840, h: 2160, fps: 60, codec: 'hvc1.2.4.L153' },
|
||||||
|
{ key: '2:183', name: 'Main10 L6.1 (8K)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.2.4.L183' },
|
||||||
|
{ key: '2:186', name: 'Main10 L6.2 (8K60)', w: 8192, h: 4096, fps: 60, codec: 'hvc1.2.4.L186' }
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 'video/mp4; codecs="hvc1.2.4.L183.B0"' -> '2:183' (profile_idc : level).
|
||||||
|
* Both the hvc1 and hev1 spellings map to the same key: they differ in the
|
||||||
|
* sample entry, not in what has to be decoded.
|
||||||
|
*/
|
||||||
|
function hevcKey(type) {
|
||||||
|
var m = /(?:hvc1|hev1)\.([0-9]+)(?:\.[0-9]+)?\.l([0-9]+)/i.exec(String(type || ''));
|
||||||
|
return m ? m[1] + ':' + m[2] : null;
|
||||||
|
}
|
||||||
|
NS.caps.hevcKey = hevcKey;
|
||||||
|
|
||||||
(function probe() {
|
(function probe() {
|
||||||
try {
|
try {
|
||||||
var mb = window.XRMediaBinding;
|
var mb = window.XRMediaBinding;
|
||||||
@@ -323,12 +395,17 @@
|
|||||||
if (gl) NS.caps.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
|
if (gl) NS.caps.maxTextureSize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
try {
|
try {
|
||||||
['video/mp4; codecs="hev1.1.6.L183.B0"',
|
var ve = document.createElement('video');
|
||||||
|
['video/mp4; codecs="hev1.1.6.L183.B0"', // Main 8-bit 8K (the files that work)
|
||||||
'video/mp4; codecs="hvc1.1.6.L183.B0"',
|
'video/mp4; codecs="hvc1.1.6.L183.B0"',
|
||||||
|
'video/mp4; codecs="hev1.2.4.L183.B0"', // Main 10 8K (the files that do not)
|
||||||
|
'video/mp4; codecs="hvc1.2.4.L183.B0"',
|
||||||
|
'video/mp4; codecs="hev1.2.4.L153.B0"', // Main 10 4K
|
||||||
|
'video/mp4; codecs="hvc1.2.4.L153.B0"',
|
||||||
'video/mp4; codecs="hev1"',
|
'video/mp4; codecs="hev1"',
|
||||||
'video/mp4; codecs="hvc1"'].forEach(function (cs) {
|
'video/mp4; codecs="hvc1"'].forEach(function (cs) {
|
||||||
NS.caps.hevc[cs] = (typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported(cs)) ||
|
NS.caps.hevc[cs] = (typeof MediaSource !== 'undefined' && MediaSource.isTypeSupported(cs)) ||
|
||||||
document.createElement('video').canPlayType(cs) || 'no';
|
ve.canPlayType(cs) || 'no';
|
||||||
});
|
});
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
if (navigator.xr && navigator.xr.isSessionSupported) {
|
if (navigator.xr && navigator.xr.isSessionSupported) {
|
||||||
@@ -338,8 +415,85 @@
|
|||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------ *
|
||||||
|
* MediaCapabilities probe + canPlayType override
|
||||||
|
* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
function applyVerdicts() {
|
||||||
|
NS.caps.codecBlocked = CODEC_PROBES.filter(function (p) {
|
||||||
|
var v = NS.caps.codec[p.key];
|
||||||
|
return v && v.supported === false;
|
||||||
|
}).map(function (p) { return p.name; });
|
||||||
|
}
|
||||||
|
|
||||||
|
function installCanPlayTypeOverride() {
|
||||||
|
if (NS.caps.cptMode === 'off') return;
|
||||||
|
var proto = window.HTMLVideoElement && window.HTMLVideoElement.prototype;
|
||||||
|
if (!proto || typeof proto.canPlayType !== 'function') return;
|
||||||
|
|
||||||
|
var orig = proto.canPlayType;
|
||||||
|
proto.canPlayType = function (type) {
|
||||||
|
try {
|
||||||
|
var key = hevcKey(type);
|
||||||
|
var v = key && NS.caps.codec[key];
|
||||||
|
// Only a definite "no" is acted on. Anything else is the browser's call.
|
||||||
|
if (v && v.supported === false) return '';
|
||||||
|
} catch (e) { /* never break the native answer */ }
|
||||||
|
return orig.apply(this, arguments);
|
||||||
|
};
|
||||||
|
NS.caps.cptPatched = true;
|
||||||
|
NS.caps.cptMode = 'on';
|
||||||
|
}
|
||||||
|
|
||||||
|
(function probeCodecs() {
|
||||||
|
// Kill switch, and the escape hatch if this ever misbehaves on a device.
|
||||||
|
try {
|
||||||
|
if (localStorage.getItem('jfvr-cpt') === 'off') { NS.caps.cptMode = 'off'; return; }
|
||||||
|
} catch (e) {}
|
||||||
|
var mc = navigator.mediaCapabilities;
|
||||||
|
if (!mc || typeof mc.decodingInfo !== 'function') { NS.caps.cptMode = 'no-api'; return; }
|
||||||
|
|
||||||
|
// Install FIRST, synchronously, so the hook is in place before anything can
|
||||||
|
// read canPlayType. Until a verdict lands the hook just defers to native,
|
||||||
|
// which is the safe default.
|
||||||
|
installCanPlayTypeOverride();
|
||||||
|
|
||||||
|
var pending = CODEC_PROBES.length;
|
||||||
|
CODEC_PROBES.forEach(function (p) {
|
||||||
|
var cfg = {
|
||||||
|
type: 'file',
|
||||||
|
video: {
|
||||||
|
contentType: 'video/mp4; codecs="' + p.codec + '"',
|
||||||
|
width: p.w, height: p.h, bitrate: 20000000, framerate: p.fps
|
||||||
|
}
|
||||||
|
};
|
||||||
|
mc.decodingInfo(cfg).then(function (info) {
|
||||||
|
NS.caps.codec[p.key] = {
|
||||||
|
name: p.name, workload: p.w + 'x' + p.h + '@' + p.fps,
|
||||||
|
supported: info.supported, smooth: info.smooth, powerEfficient: info.powerEfficient
|
||||||
|
};
|
||||||
|
}).catch(function (e) {
|
||||||
|
NS.caps.codec[p.key] = { name: p.name, error: String(e && e.message || e) };
|
||||||
|
}).then(function () {
|
||||||
|
if (--pending === 0) {
|
||||||
|
applyVerdicts();
|
||||||
|
NS.log('codec probe done; blocked = ' + (NS.caps.codecBlocked.join(', ') || 'none'));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
NS.capsDiag = function () {
|
NS.capsDiag = function () {
|
||||||
var c = NS.caps;
|
var c = NS.caps;
|
||||||
|
var real = CODEC_PROBES.map(function (p) {
|
||||||
|
var v = c.codec[p.key];
|
||||||
|
if (!v) return ' ' + p.name.padEnd(20) + ' (pending)';
|
||||||
|
if (v.error) return ' ' + p.name.padEnd(20) + ' error: ' + v.error;
|
||||||
|
return ' ' + p.name.padEnd(20) + ' supported=' + v.supported +
|
||||||
|
' smooth=' + v.smooth + ' powerEfficient=' + v.powerEfficient +
|
||||||
|
' [' + v.workload + ']' + (v.supported === false ? ' <-- BLOCKED' : '');
|
||||||
|
}).join('\n');
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'origin : ' + location.origin,
|
'origin : ' + location.origin,
|
||||||
'secureContext : ' + c.secureContext,
|
'secureContext : ' + c.secureContext,
|
||||||
@@ -349,7 +503,11 @@
|
|||||||
'createQuadLayer : ' + c.hasQuadLayer,
|
'createQuadLayer : ' + c.hasQuadLayer,
|
||||||
'hand tracking API : ' + c.hasHandTracking + ' / jointSpace=' + c.hasXRJointSpace + ' / getJointPose=' + c.hasGetJointPose,
|
'hand tracking API : ' + c.hasHandTracking + ' / jointSpace=' + c.hasXRJointSpace + ' / getJointPose=' + c.hasGetJointPose,
|
||||||
'MAX_TEXTURE_SIZE : ' + c.maxTextureSize,
|
'MAX_TEXTURE_SIZE : ' + c.maxTextureSize,
|
||||||
'HEVC : ' + JSON.stringify(c.hevc)
|
'HEVC canPlayType : ' + JSON.stringify(c.hevc),
|
||||||
|
'canPlayType hook : ' + (c.cptMode || 'pending') +
|
||||||
|
(c.cptMode === 'on' ? ' (downgraded: ' + (c.codecBlocked.join(', ') || 'nothing yet') + ')' : ''),
|
||||||
|
'HEVC real (decodingInfo):',
|
||||||
|
real
|
||||||
].join('\n');
|
].join('\n');
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
|||||||
Reference in New Issue
Block a user