9 Commits
Author SHA1 Message Date
cat-shark 0bf0a1f1da docs: the VR button is draggable (0.4.0.0) 2026-10-18 01:21:19 +08:00
cat-shark 1176c2009c plugin: publish 0.4.0.0 (bundle ae28bd) 2026-10-18 01:21:01 +08:00
cat-shark 30f97808ae ui: make the VR button draggable
It was pinned to the bottom-right corner. On a short window that put it straight
on top of the bitrate choices the playback watchdog shows (that panel is
centred), and there was no way to move it out of the way.

The button now uses left/top (set from JS) instead of right/bottom, is draggable
with pointer events, and remembers where it was dropped. Details that matter:

  - touch-action:none, otherwise a drag on a touch screen scrolls the page
  - a drag still fires a click on most browsers, so the click that ends a drag is
    swallowed; dragging never opens the panel by accident
  - clamped to the viewport, and re-clamped on resize
  - double click resets to the default corner (escape hatch for a button dragged
    somewhere awkward)
  - the settings panel follows the button instead of the viewport corner, so the
    two cannot drift apart; it prefers to sit just above the button, falls back
    to below, and clamps on screen when it is taller than the space available

Verified against a local harness, 18 checks, all passing: default placement
matches the old corner, a drag moves it by exactly the pointer delta and
persists it, the click ending a drag does not open the panel, a plain click
still does, the panel tracks the button's right edge, clamping holds at all four
edges, and double click restores the default.
2026-10-18 01:20:22 +08:00
cat-shark 85fea48159 docs: document the decoder-driven canPlayType override (0.3.0.0)
README gains 1.3 and the 2.0 capability row is corrected: the old
"8K HEVC decodingInfo supported:true" was only ever true for 8-bit Main.
HANDOFF 18.7/18.8 record what the override does, the three verified modes, the
kill switch, and what is deliberately left out (AV1, and acting on smooth:false).
2026-10-18 01:09:00 +08:00
cat-shark 986d30dfb4 plugin: publish 0.3.0.0 (bundle 4e9a8f) 2026-10-18 01:08:12 +08:00
cat-shark ab36d2f25c caps: ask the real decoder, and stop the client from over-claiming HEVC
The capability probe only ever asked canPlayType about Main profile (8-bit)
codec strings, which is why the project notes said "8K HEVC: supported" right up
until a Main 10 file showed up and could not be decoded at all. It now also asks
about Main 10, and -- more importantly -- asks the decoder itself.

The override: Jellyfin Web derives its entire HEVC claim from canPlayType
(browserDeviceProfile.js):

    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 60fps". A desktop that merely ships an HEVC decoder
therefore claims 8K Main 10, the server picks DirectPlay, and playback dies on a
black screen with no player UI at all. MediaCapabilities.decodingInfo asks the
actual decoder, so its verdict is fed back through canPlayType and Jellyfin's own
logic lands on the right profile -- the desktop drops to what 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.

Deliberately conservative: only supported === false downgrades.
supported:true/smooth:false is recorded but changes nothing -- too close to the
edge to act on, and the watchdog already covers "claimed to work, did not".
Kill switch if a device reports nonsense: localStorage['jfvr-cpt'] = 'off'.

Each level is probed at the resolution it exists for (L120 -> 1080p30,
L153 -> 4K60, L183/L186 -> 8K60), because a level string carries no dimensions.

Verified against a local harness in three modes, all passing:
  pc    -> 8K Main10 blocked, Jellyfin caps at level 153, the 8K Main 10 file
           exceeds the claim and the server transcodes
  quest -> nothing blocked, claim stays >= 183, DirectPlay preserved
  off   -> hook not installed, canPlayType untouched, old behaviour restored
Also re-ran the playback watchdog on the new bundle: still fires on media error.

Also widens the harness gitignore to _harness*.html for the new codec harness.
2026-10-18 01:07:44 +08:00
cat-shark bfcd102ed0 docs: record the 8K Main 10 root cause, the OSD load order, and the watchdog
README gets a section on the watchdog; HANDOFF gets ADDENDUM 12 with the full
investigation: the failing file is HEVC Main 10 while every other 8K file is
Main, Jellyfin Web builds its device profile from canPlayType('hvc1.2.4.L183')
which over-claims, the server has no force-transcode switch, and the player UI
(including the quality menu) is only created after 'playbackstart' -- which is
why a stuck video has no quality menu to click.

Also records that src/00-core.js only ever probed Main-profile codec strings, so
the documented "8K HEVC supported" result was never true for 10-bit.
2026-10-18 00:29:38 +08:00
cat-shark 131e0349b8 plugin: publish 0.2.0.0 (bundle edca47) 2026-10-18 00:28:26 +08:00
cat-shark d0fe04bf25 watchdog: tell the user when a video never starts, and offer transcode
Some files never produce a picture on some machines. The Quest decodes the
8K HEVC Main 10 files fine; a Windows desktop browser claims HEVC Main 10 up to
level 6.1 via canPlayType() (Jellyfin Web builds its device profile from that,
browserDeviceProfile.js) so the server picks Direct Play, and the desktop GPU
cannot actually decode it. Result: black screen and a spinner.

The user-visible symptom is worse than it sounds: Jellyfin Web creates the whole
player UI only after 'playbackstart', which never fires, so the OSD -- including
the quality menu -- is never built. There is literally nothing to click to lower
the bitrate. Load order, from the source:

  HtmlVideoPlayer.play()            htmlVideoPlayer/plugin.js:502
    createMediaElement()            :1802  spinner + <div.videoPlayerContainer>
                                           + <video>, inserted with no src yet
    setCurrentSrc()                 :593   elem.src = url
      -> loadedmetadata -> canplay -> play -> 'playbackstart'
        -> OSD controller (apps/legacy/controllers/playback/video/index.js:591)

So 40-watchdog.js watches for exactly the pre-OSD state: a .videoPlayerContainer
whose <video> still has videoWidth === 0. It fires immediately on a media error,
or after 15s (45s when the src is already an HLS transcode, where the server has
to produce segments first). It stands down the moment there is a picture, and
never runs during a VR session.

The panel names the format (fetched from the Jellyfin API), explains the cause,
and offers 20/8/3 Mbps plus "keep waiting". A choice writes the same localStorage
keys Jellyfin's own menu writes and reloads: window.playbackManager is not
reachable from injected script (verified: undefined; window.Emby only has Page),
so the settings path is the only option. Note the upstream key really is
'enableautobitratebitrate-...' with "bitrate" twice; reproduced deliberately.
A 120s cooldown in sessionStorage stops it nagging a slow-but-working playback.

Verified against a local harness (3 cases, all passing): healthy playback ->
never arms; media error -> immediate; hung stream -> ~16.4s; dismiss -> hides and
persists the cooldown, and stayed hidden 20s past the threshold; bitrate choice
-> writes maxbitrate-Video-true/false=20000000 and
enableautobitratebitrate-Video-true/false=false, then reloads.
2026-10-18 00:27:53 +08:00
10 changed files with 1613 additions and 24 deletions
+1 -1
View File
@@ -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__/
+127 -1
View File
@@ -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"]` |
@@ -789,3 +789,129 @@ handPref=left(持久化后重开会话) pointer hand:left HIT 0.22,0
右手按住画面拖动条,左手松开 viewDrag 仍 "armed"(拖动存活) 右手按住画面拖动条,左手松开 viewDrag 仍 "armed"(拖动存活)
右手按住画面拖动条,右手松开 viewDrag "reset (tap)"(拖动结束) 右手按住画面拖动条,右手松开 viewDrag "reset (tap)"(拖动结束)
``` ```
---
## 18. ADDENDUM 12 — 「这台机器放不出来」:8K Main 10 与客户端自报能力(插件 0.2.0.0 / bundle `edca47`)
### 18.1 现象
同一个文件 `masex.tv@kiwvr00896_1_8k.mp4`:
- **Quest 3 上正常播放**
- **PC 浏览器上黑屏 / 一直转圈,进度条不走**,而且**播放器界面(含码率菜单)根本不出现**
### 18.2 根因
**文件是 10-bit,而库里其它文件都是 8-bit。** 实测:
```
FAILS : kiwvr00896_1_8k profile=Main 10 pix_fmt=yuv420p10le 8192x4096 level 183 (6.1) 30 Mbps
kiwvr00896_2_8k profile=Main 10 pix_fmt=yuv420p10le
WORKS : 13dsvr01786_1_8k profile=Main pix_fmt=yuv420p 8192x4096 level 183
13dsvr01794_1_8k profile=Main pix_fmt=yuv420p
13dsvr01797_1_8k profile=Main pix_fmt=yuv420p
```
**关键:Jellyfin 的直连/转码决策 100% 看客户端上报的 DeviceProfile。** Jellyfin Web 是这么生成它的(`src/scripts/browserDeviceProfile.js`):
```js
let maxHevcLevel = 120;
let hevcProfiles = 'main';
// hevc main10 level 6.1
if (videoTestElement.canPlayType('video/mp4; codecs="hvc1.2.4.L183"')...) {
maxHevcLevel = 183; // 8K
hevcProfiles = 'main|main 10'; // 10-bit
}
```
PC 浏览器对 `hvc1.2.4.L183` 返回 **"probably"**(系统里有*某个* HEVC 解码器,`canPlayType` 判断很粗),于是声明「支持 Main 10 到 level 6.1(8K)」→ 服务器选了 **Direct Play** → 实际硬件解不动 → 黑屏。Quest 声明同样的话但它真做得到。
**服务器侧没有「强制转码」开关。** `UserPolicy` 只有:`EnableVideoPlaybackTranscoding`(已开)、`EnablePlaybackRemuxing`(已开)、`RemoteClientBitrateLimit`(只对远程连接)、`ForceRemoteSourceTranscoding`(只对远程片源)。没有任何按条目/按设备的强制转码。
**顺带发现:本项目的能力探测有盲区。** `src/00-core.js:326` 只测了
```js
['video/mp4; codecs="hev1.1.6.L183.B0"', // profile_idc 1 = Main(8-bit)
'video/mp4; codecs="hvc1.1.6.L183.B0"',
'video/mp4; codecs="hev1"', 'video/mp4; codecs="hvc1"']
```
`hev1.**1.6**.L183.B0` 里的 `1.6` 是 **Main**;**Main 10 是 `hev1.2.4.L183.B0`,从来没测过**。所以 README §2.0 那句「8K HEVC decodingInfo supported:true」**只对 8-bit 成立** —— 之前碰巧全是 8-bit 文件才没暴露。
### 18.3 为什么卡住之后连码率都调不了(重要)
Jellyfin Web 的播放器 UI **只在 `playbackstart` 之后才被创建**:
```
HtmlVideoPlayer.play() htmlVideoPlayer/plugin.js:502
createMediaElement() :1802 loading.show() 转圈
<div.videoPlayerContainer><video>
document.body.insertBefore(...) ← 还没有 src
updateVideoUrl() / setCurrentSrc() :593 elem.src = url
→ loadedmetadata → canplay → play
→ 'playbackstart'
→ OSD 控制器(apps/legacy/controllers/playback/video/index.js:591)
```
媒体起不来 → 事件不触发 → **OSD(含码率菜单)从未被创建**。所以「卡住后调不了码率」不是菜单藏起来了,是**它还不存在**。
推论:看门狗不能用 `90-main.js` 的 `findVideo()`(它要求 `videoWidth`,卡死时返回 null),必须直接看 `.videoPlayerContainer video`。
### 18.4 对策:`src/40-watchdog.js`
检测「OSD 之前就卡住」这个状态并给出唯一的解 —— 让服务器转码。见 README §1.2。
阈值:媒体报错立即弹;直连 15 秒;转码(src 已是 hls)45 秒;有画面立即退出;VR 会话中不跑。
选码率后写入 Jellyfin 自己那套键再重载:
```
maxbitrate-Video-<true|false> = 20000000
enableautobitratebitrate-Video-<true|false> = false ← 上游拼写,bitrate 出现两次
```
> 不能用 `playbackManager.setMaxStreamingBitrate()`:那个模块**没有暴露到 window**
> (实测 `window.playbackManager === undefined`,`window.Emby` 只剩 `Page`)。
### 18.5 转码在这台 NAS 上的实测能力
2026-10-05 那次播放走的就是转码:
```
-codec:v h264_vaapi -b:v 2744000 -vf "scale_vaapi=w=1280:h=640"
→ 1280x640 @ 2.7 Mbps,ffmpeg 每次 exit 0,无失败
```
8K 10-bit 硬解 + h264 硬编在 UHD 上跑得动,但**输出只有 1280×640**(当时目标码率 2.7 Mbps;UHD 编码上限约 4K)。
### 18.6 附带查清的两件事
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`),是盗版站打包进来的。
### 18.7 已做(插件 0.3.0.0 / bundle `4e9a8f`)
- [x] `src/00-core.js` 的能力探测补上 Main 10 和 8K/4K 分档;新增 `NS.caps.codec`(`decodingInfo` 逐档结果)与 `NS.capsDiag()` 里的 `HEVC real` 段
- [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 -1
View File
@@ -34,6 +34,7 @@ JFVR 同时也是一个标准的 **Jellyfin 插件**,通过自建 Gitea 仓库
| 脚本端点 | `/JFVR/jfvr.js`(bundle 内嵌在 DLL 里,URL 带内容哈希做缓存键) | | 脚本端点 | `/JFVR/jfvr.js`(bundle 内嵌在 DLL 里,URL 带内容哈希做缓存键) |
| 状态查询 | `/JFVR/status` | | 状态查询 | `/JFVR/status` |
| 设置页 | Dashboard → 插件 → Jellyfin Web VR(开关注入 / 覆盖脚本 URL) | | 设置页 | Dashboard → 插件 → Jellyfin Web VR(开关注入 / 覆盖脚本 URL) |
| 页面按钮 | 「VR 播放」按钮**可拖动**(位置记住;双击回到默认右下角) |
**安装**:Dashboard → 插件 → 目录 → ⚙️ → ➕ → 粘贴上面的仓库地址 → 保存 → **安装**:Dashboard → 插件 → 目录 → ⚙️ → ➕ → 粘贴上面的仓库地址 → 保存 →
在 Catalog 里找到 **Jellyfin Web VR** → 安装 → **重启 Jellyfin**。 在 Catalog 里找到 **Jellyfin Web VR** → 安装 → **重启 Jellyfin**。
@@ -54,6 +55,93 @@ python3 pack.py --bump --publish # 构建 → 打包 → 建 Release → 推 m
> 老路子仍然可用,作为插件的兜底:`JF_PW=... python3 deploy.py`。 > 老路子仍然可用,作为插件的兜底:`JF_PW=... python3 deploy.py`。
> 但**两者不要同时开** —— 装了插件就别再跑 `deploy.py`(跑完插件也会把那个标签清掉)。 > 但**两者不要同时开** —— 装了插件就别再跑 `deploy.py`(跑完插件也会把那个标签清掉)。
### 1.2 播放看门狗(卡住检测)
`src/40-watchdog.js`。针对一种很坑的失败:**某些设备/浏览器放不出来时,Jellyfin 的播放器界面根本不会被创建**。
原因(已从 Jellyfin Web 源码确认):播放器 UI 只在 `playbackstart` 事件之后构建,而 `playbackstart` 要等媒体真的起来了才会触发。加载顺序是:
```
HtmlVideoPlayer.play() htmlVideoPlayer/plugin.js:502
createMediaElement() :1802 转圈 + <div.videoPlayerContainer> + <video>
(此时还没 src)
setCurrentSrc() :593 elem.src = url
→ loadedmetadata → canplay → play → 'playbackstart'
→ OSD 控制器(apps/legacy/controllers/playback/video/index.js:591)
```
媒体起不来 → `playbackstart` 不触发 → **码率菜单根本不存在**,页面上只剩一个转圈和一个 `videoWidth === 0` 的 `<video>`。所以「卡住之后调不了码率」不是菜单藏起来了,是菜单还没被创建。
看门狗就盯这个状态(`.videoPlayerContainer` 里的 `<video>` 仍然是 `videoWidth === 0`):
| | 阈值 |
|---|---|
| 媒体报错(`video.error`) | 立即弹 |
| 直连没画面 | 15 秒 |
| 转码(src 已经是 hls) | 45 秒(服务器要先出片) |
| 已经有画面 | 立即退出,不打扰 |
| VR 会话中 | 完全不跑 |
弹窗会写明**具体格式**(走 Jellyfin API 查 MediaStreams),并给 20/8/3 Mbps 三档 + 「继续等待」。选一档后写入 Jellyfin 自己那套 localStorage 键然后重载:
```
maxbitrate-Video-<true|false> = 20000000
enableautobitratebitrate-Video-<true|false> = false
```
> 注意 `enableautobitratebitrate` 里 `bitrate` 确实出现了两次 —— 这是 Jellyfin 上游的拼写,照抄的。
> 之所以不用 `playbackManager.setMaxStreamingBitrate()`:那个模块没暴露到 window(已实测 `window.playbackManager === undefined`,`window.Emby` 只剩 `Page`),所以只能写设置 + 重载。
选过之后 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 嗅探」。
### 1.4 「VR 播放」按钮可以拖了
原来钉死在右下角(`right:16px; bottom:120px`),窗口矮的时候正好压在播放看门狗弹窗的码率按钮上,没地方躲。
现在:
- 用 `left/top` 定位(不再用 `right/bottom`),用 pointer 事件拖动,位置记在 `localStorage['jfvr-btn-pos']`
- `touch-action:none` —— 不加这个,触屏上拖动会变成滚动页面
- **拖动结束仍然会触发一次 click**,代码会把那一次吃掉,所以拖完不会意外弹出面板
- 限制在视窗内,窗口缩放时会重新夹紧
- **双击回到默认右下角**(拖到尴尬位置时的逃生口)
- 设置面板跟着按钮走(不再是钉在视窗角落),优先放在按钮上方,上方放不下就放下方,再放不下就夹在屏幕内
--- ---
## 2. Quest 3 实测数据(已用 ADB + CDP 在真机验证) ## 2. Quest 3 实测数据(已用 ADB + CDP 在真机验证)
@@ -75,10 +163,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 上就是内网直连
``` ```
+1 -1
View File
@@ -21,7 +21,7 @@ SRC = os.path.join(HERE, "src")
DIST = os.path.join(HERE, "dist") DIST = os.path.join(HERE, "dist")
OUT = os.path.join(DIST, "jfvr.js") OUT = os.path.join(DIST, "jfvr.js")
ORDER = ["00-core.js", "10-subtitles.js", "20-controls.js", "30-hands.js", "90-main.js"] ORDER = ["00-core.js", "10-subtitles.js", "20-controls.js", "30-hands.js", "40-watchdog.js", "90-main.js"]
def sources(): def sources():
+686 -10
View File
@@ -1,7 +1,7 @@
/*! /*!
* JFVR (Jellyfin Web VR) — built bundle. DO NOT EDIT. * JFVR (Jellyfin Web VR) — built bundle. DO NOT EDIT.
* Edit src/*.js and run: python3 build.py * Edit src/*.js and run: python3 build.py
* Modules: 00-core.js, 10-subtitles.js, 20-controls.js, 30-hands.js, 90-main.js * Modules: 00-core.js, 10-subtitles.js, 20-controls.js, 30-hands.js, 40-watchdog.js, 90-main.js
*/ */
/* ===== 00-core.js ===== */ /* ===== 00-core.js ===== */
@@ -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');
}; };
})(); })();
@@ -4396,6 +4554,368 @@
/* ===== 40-watchdog.js ===== */
/*!
* JFVR watchdog — "this video never started" detection.
*
* WHY THIS EXISTS
* ---------------
* Jellyfin Web builds the whole player UI (including the quality menu) only
* after the 'playbackstart' event, which the media element fires once it has
* actually started. The load order is:
*
* HtmlVideoPlayer.play() htmlVideoPlayer/plugin.js:502
* createMediaElement() :1802 -> loading.show() spinner
* -> <div.videoPlayerContainer><video>
* -> inserted into document.body
* (no src yet!)
* setCurrentSrc() :593 -> elem.src = url, only now
* -> loadedmetadata -> canplay -> play
* -> 'playbackstart'
* -> OSD controller (apps/legacy/controllers/playback/video/index.js:591)
*
* So when the browser cannot use the stream, the OSD never appears at all: the
* page is a spinner over an empty container with a <video> whose videoWidth is
* still 0. There is no quality menu to click, because it was never created.
*
* That is the case this module covers. It watches for exactly that state and
* offers the only thing that can help: tell Jellyfin to transcode.
*
* WHY localStorage AND NOT THE PLAYBACK MANAGER
* --------------------------------------------
* The bitrate is normally set through playbackManager.setMaxStreamingBitrate(),
* which does a live changeStream(). That manager is an ES module export and is
* NOT on window (verified: window.playbackManager is undefined; window.Emby only
* has Page). So the watchdog writes the same keys appSettings would have written
* (src/scripts/settings/appSettings.js) and reloads, which makes Jellyfin request
* PlaybackInfo again with the new cap and pick Transcode.
*
* NOTE the key name really does say "bitrate" twice — that is upstream's typo,
* reproduced here deliberately.
*/
(function () {
'use strict';
var NS = window.__JFVR;
if (!NS) { console.error('[JFVR] core missing'); return; }
if (NS.__watchdog) return;
NS.__watchdog = true;
var S = NS.state;
var log = NS.log;
/* ------------------------------------------------------------------ *
* tunables
* ------------------------------------------------------------------ */
var POLL_MS = 500;
// Direct play on a LAN should have metadata almost immediately; the file is
// 11 GB but its moov atom is at the front, so there is nothing to wait for.
// A transcode is different: the server has to decode the first GOP and produce
// segments before the browser sees any metadata, and this NAS is doing 8K.
var DEAD_MS = 15000;
var DEAD_TRANSCODE_MS = 45000;
// After the user answers (either way) stay quiet, so a slow-but-working
// playback does not get nagged at.
var QUIET_MS = 120000;
var QUIET_KEY = 'jfvr-watchdog-quiet-until';
// Values from Jellyfin's own menu (src/components/qualityOptions.js).
var CHOICES = [
{ label: '20 Mbps', bitrate: 20000000, note: '≈4K,最接近原始画质' },
{ label: '8 Mbps', bitrate: 8000000, note: '1080p 档,稳' },
{ label: '3 Mbps', bitrate: 3000000, note: '720p 档,最省算力' }
];
var W = {
seenAt: 0, // when the current stalled <video> first showed up
shown: false,
quietUntil: 0,
lastReason: '',
applied: null,
codec: null, // filled in best-effort from the Jellyfin API
panel: null
};
NS.Watchdog = W;
/* ------------------------------------------------------------------ *
* helpers
* ------------------------------------------------------------------ */
function now() { return Date.now(); }
/**
* The element Jellyfin creates in createMediaElement(). It exists from the
* very start of playback — including the failure case, which is the whole
* point: findVideo() in 90-main.js requires videoWidth and would return null.
*/
function playerVideo() {
var c = document.querySelector('.videoPlayerContainer');
if (!c) return null;
return c.querySelector('video') || null;
}
function isTranscode(v) {
var src = v.currentSrc || v.src || '';
return src.indexOf('/hls') >= 0 || src.indexOf('.m3u8') >= 0;
}
/** Metadata parsed AND a frame available. False means "no picture". */
function hasPicture(v) {
return v.videoWidth > 0 && v.readyState >= 2;
}
function readQuiet() {
try {
var raw = window.sessionStorage && sessionStorage.getItem(QUIET_KEY);
return raw ? parseInt(raw, 10) || 0 : 0;
} catch (e) { return 0; }
}
function setQuiet(ms) {
W.quietUntil = now() + ms;
try { sessionStorage.setItem(QUIET_KEY, String(W.quietUntil)); } catch (e) {}
}
/**
* Write the same keys Jellyfin's own quality menu writes, for BOTH in-network
* and out-of-network, because the client is the only side that knows which one
* applies and we cannot ask it (appSettings is not on window).
*/
function applyBitrate(bitrate) {
var media = 'Video';
['true', 'false'].forEach(function (inNet) {
try {
localStorage.setItem('enableautobitratebitrate-' + media + '-' + inNet, 'false');
localStorage.setItem('maxbitrate-' + media + '-' + inNet, String(bitrate));
} catch (e) {
log('watchdog: could not persist bitrate', e && e.message);
}
});
W.applied = bitrate;
log('watchdog: capped bitrate at', bitrate, 'and reloading');
setQuiet(QUIET_MS);
window.location.reload();
}
/* ------------------------------------------------------------------ *
* best-effort: name the actual format so the message is actionable
* ------------------------------------------------------------------ */
function itemIdFrom(v) {
var s = (v && (v.currentSrc || v.src)) || '';
var m = s.match(/\/Videos\/([0-9a-f]{32})\//i);
if (m) return m[1];
m = (window.location.hash || '').match(/[?&]id=([0-9a-f]{32})/i);
return m ? m[1] : null;
}
function describeCodec(v) {
if (W.codec) return;
var id = itemIdFrom(v);
if (!id || !window.ApiClient) return;
var url;
try { url = window.ApiClient.getUrl('Items/' + id); } catch (e) { return; }
window.ApiClient.ajax({ type: 'GET', url: url, dataType: 'json' }).then(function (item) {
var ms = (item && item.MediaSources && item.MediaSources[0] && item.MediaSources[0].MediaStreams) || [];
for (var i = 0; i < ms.length; i++) {
var st = ms[i];
if (st.Type !== 'Video') continue;
W.codec = [
st.Width + '×' + st.Height,
(st.Codec || '').toUpperCase(),
st.Profile || '',
st.BitDepth ? st.BitDepth + '-bit' : ''
].filter(Boolean).join(' ');
break;
}
if (W.shown) render(); // update the message in place
}).catch(function () { /* the prompt works fine without this */ });
}
/* ------------------------------------------------------------------ *
* the prompt
* ------------------------------------------------------------------ */
var WD_CSS = [
'.jfvr-wd{position:fixed;left:50%;top:50%;transform:translate(-50%,-50%);z-index:2147483002;width:420px;max-width:calc(100vw - 32px);',
'background:rgba(18,18,22,.97);color:#eaeaea;border:1px solid rgba(255,255,255,.16);border-radius:14px;',
'box-shadow:0 18px 60px rgba(0,0,0,.7);font-family:inherit;font-size:14px;padding:18px 18px 14px;backdrop-filter:blur(10px)}',
'.jfvr-wd h3{margin:0 0 6px;font-size:16px;font-weight:600}',
'.jfvr-wd p{margin:0 0 10px;font-size:13px;line-height:1.6;color:#c3c9d4}',
'.jfvr-wd .jfvr-wd-fmt{color:#ffd479;font-weight:600}',
'.jfvr-wd .jfvr-wd-sub{font-size:12px;color:#8b93a1;line-height:1.55;margin-bottom:12px}',
'.jfvr-wd-btns{display:flex;flex-direction:column;gap:8px;margin-bottom:10px}',
'.jfvr-wd-btns button{display:flex;justify-content:space-between;align-items:baseline;gap:10px;width:100%;padding:10px 12px;',
'border:1px solid rgba(255,255,255,.16);border-radius:9px;background:rgba(255,255,255,.05);color:#eaeaea;',
'font-size:14px;font-weight:600;cursor:pointer;font-family:inherit;text-align:left}',
'.jfvr-wd-btns button:hover{background:rgba(78,161,255,.18);border-color:#4ea1ff}',
'.jfvr-wd-btns button span.note{font-size:11px;font-weight:400;color:#8b93a1}',
'.jfvr-wd-quiet{width:100%;padding:9px;border:0;border-radius:9px;background:transparent;color:#8b93a1;',
'font-size:13px;cursor:pointer;font-family:inherit}',
'.jfvr-wd-quiet:hover{color:#eaeaea}',
'.jfvr-wd-diag{margin-top:10px;font-size:11px;color:#8b93a1}',
'.jfvr-wd-diag summary{cursor:pointer;user-select:none}',
'.jfvr-wd-diag pre{white-space:pre-wrap;word-break:break-all;margin:8px 0 0;font-size:10px;line-height:1.5;',
'max-height:150px;overflow:auto;color:#9fb0c4;background:rgba(0,0,0,.35);padding:8px;border-radius:7px}'
].join('');
function injectWdCss() {
if (document.getElementById('jfvr-wd-css')) return;
var s = NS.makeEl('style');
s.id = 'jfvr-wd-css';
s.textContent = WD_CSS;
document.head.appendChild(s);
}
function diagText(v) {
var e = v.error;
return [
'readyState : ' + v.readyState + ' (0=HAVE_NOTHING, 1=HAVE_METADATA, 2=HAVE_CURRENT_DATA)',
'networkState: ' + v.networkState,
'videoWidth : ' + v.videoWidth + '×' + v.videoHeight,
'paused : ' + v.paused,
'currentTime : ' + v.currentTime,
'error : ' + (e ? e.code + ' ' + (e.message || '') : 'none'),
'src : ' + String(v.currentSrc || v.src || '').slice(0, 160),
'格式 : ' + (W.codec || '(未知)')
].join('\n');
}
function render() {
if (!W.panel) return;
var body = W.panel.querySelector('.jfvr-wd-body');
var v = playerVideo();
if (body && v) {
var fmt = body.querySelector('.jfvr-wd-fmt');
if (fmt) fmt.textContent = W.codec || '这个格式';
var pre = body.querySelector('pre');
if (pre) pre.textContent = diagText(v);
}
}
function show(v, reason) {
if (W.shown) { render(); return; }
W.shown = true;
W.lastReason = reason;
injectWdCss();
var p = NS.makeEl('div', 'jfvr-wd');
p.id = 'jfvr-wd';
p.appendChild(NS.makeEl('h3', null, '视频没能开始播放'));
var body = NS.makeEl('div', 'jfvr-wd-body');
var msg = NS.makeEl('p');
var waited = Math.round(timeoutMs(v) / 1000);
msg.innerHTML =
(reason === 'error'
? '播放器报错了,一个画面都没解出来。'
: '等了 ' + waited + ' 秒都没拿到任何画面(<code>videoWidth = 0</code>),' +
'所以播放器界面也没有被创建出来。') +
'最常见的原因是<strong>这台设备解不动这个格式</strong>:' +
'<span class="jfvr-wd-fmt">' + (W.codec || '该格式') + '</span>。<br>' +
'让服务器转码成 H.264 再播就能看到画面,代价是画质下降(这台 NAS 的转码上限约 4K)。';
body.appendChild(msg);
body.appendChild(NS.makeEl('div', 'jfvr-wd-sub',
'选一档码率后会写入播放设置并重新加载页面。'));
var btns = NS.makeEl('div', 'jfvr-wd-btns');
CHOICES.forEach(function (c) {
var b = NS.makeEl('button');
b.type = 'button';
b.appendChild(NS.makeEl('span', null, c.label));
b.appendChild(NS.makeEl('span', 'note', c.note));
b.addEventListener('click', function (ev) {
ev.stopPropagation();
applyBitrate(c.bitrate);
});
btns.appendChild(b);
});
body.appendChild(btns);
var quiet = NS.makeEl('button', 'jfvr-wd-quiet', '继续等待,先别管我');
quiet.type = 'button';
quiet.addEventListener('click', function (ev) {
ev.stopPropagation();
setQuiet(QUIET_MS);
hide();
});
body.appendChild(quiet);
var diag = NS.makeEl('details', 'jfvr-wd-diag');
diag.appendChild(NS.makeEl('summary', null, '诊断信息'));
diag.appendChild(NS.makeEl('pre', null, diagText(v)));
body.appendChild(diag);
p.appendChild(body);
document.body.appendChild(p);
W.panel = p;
NS.recordError('watchdog', new Error('playback never started: ' + reason));
log('watchdog: playback never started, reason =', reason, 'codec =', W.codec);
}
function hide() {
W.shown = false;
if (W.panel) { W.panel.remove(); W.panel = null; }
}
function reset() {
W.seenAt = 0;
W.codec = null;
if (W.shown) hide();
}
function timeoutMs(v) {
return isTranscode(v) ? DEAD_TRANSCODE_MS : DEAD_MS;
}
/* ------------------------------------------------------------------ *
* poll
* ------------------------------------------------------------------ */
function poll() {
// Never interfere with an active VR session: the session owns the flow and
// a modal in the middle of it would be a disaster.
if (S.session) { if (W.shown) hide(); return; }
var v = playerVideo();
if (!v) { reset(); return; }
// Playback is fine (or at least has a picture): stand down.
if (hasPicture(v)) { reset(); return; }
// A media error is unambiguous — no need to wait out the timer.
if (v.error) {
describeCodec(v);
if (W.quietUntil && now() < W.quietUntil) return;
show(v, 'error');
return;
}
if (!W.seenAt) W.seenAt = now();
if (now() - W.seenAt < timeoutMs(v)) return;
if (W.quietUntil && now() < W.quietUntil) return;
describeCodec(v);
show(v, 'timeout');
}
NS.Watchdog.init = function () {
W.quietUntil = readQuiet();
setInterval(poll, POLL_MS);
log('watchdog armed (dead=' + DEAD_MS + 'ms, transcode=' + DEAD_TRANSCODE_MS + 'ms)');
};
})();
/* ===== 90-main.js ===== */ /* ===== 90-main.js ===== */
/*! /*!
@@ -4699,16 +5219,23 @@
// Sits ABOVE Jellyfin's own OSD bar: at the viewport's bottom-right it // Sits ABOVE Jellyfin's own OSD bar: at the viewport's bottom-right it
// covered the player's fullscreen button (owner report). 120 px clears the // covered the player's fullscreen button (owner report). 120 px clears the
// OSD bottom bar; the settings panel stacks above it. // OSD bottom bar; the settings panel stacks above it.
'.jfvr-btn{position:fixed;right:16px;bottom:120px;z-index:2147483000;display:flex;align-items:center;gap:8px;', // left/top are set from JS (see placeButton) so the button can be dragged
// anywhere. touch-action:none is what makes a drag work on a touch screen
// instead of scrolling the page underneath.
'.jfvr-btn{position:fixed;z-index:2147483000;display:flex;align-items:center;gap:8px;',
'padding:10px 16px;border:0;border-radius:24px;background:linear-gradient(135deg,#4ea1ff,#7b5cff);color:#fff;', 'padding:10px 16px;border:0;border-radius:24px;background:linear-gradient(135deg,#4ea1ff,#7b5cff);color:#fff;',
'font-size:15px;font-weight:600;cursor:pointer;box-shadow:0 6px 22px rgba(0,0,0,.45);font-family:inherit}', 'font-size:15px;font-weight:600;cursor:grab;box-shadow:0 6px 22px rgba(0,0,0,.45);font-family:inherit;',
'touch-action:none;user-select:none;-webkit-user-select:none;-webkit-tap-highlight-color:transparent}',
'.jfvr-btn:active{transform:scale(.96)}', '.jfvr-btn:active{transform:scale(.96)}',
'.jfvr-btn.jfvr-drag{cursor:grabbing;transform:none;box-shadow:0 10px 32px rgba(0,0,0,.65)}',
// the panel must always fit the viewport AND keep the CTA reachable, so the // the panel must always fit the viewport AND keep the CTA reachable, so the
// body scrolls and the button lives in a sticky footer // body scrolls and the button lives in a sticky footer
'.jfvr-panel{position:fixed;right:16px;bottom:180px;z-index:2147483001;width:290px;background:rgba(20,20,24,.96);', // Positioned from JS (positionPanel) so it follows the button once the
// button has been dragged; it no longer lives in the viewport corner.
'.jfvr-panel{position:fixed;z-index:2147483001;width:290px;background:rgba(20,20,24,.96);',
'color:#eaeaea;border:1px solid rgba(255,255,255,.14);border-radius:14px;box-shadow:0 12px 40px rgba(0,0,0,.6);', 'color:#eaeaea;border:1px solid rgba(255,255,255,.14);border-radius:14px;box-shadow:0 12px 40px rgba(0,0,0,.6);',
'font-family:inherit;font-size:14px;backdrop-filter:blur(10px);display:flex;flex-direction:column;', 'font-family:inherit;font-size:14px;backdrop-filter:blur(10px);display:flex;flex-direction:column;',
'max-height:calc(100vh - 200px);overflow:hidden}', 'max-height:calc(100vh - 32px);overflow:hidden}',
'.jfvr-head{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:rgba(255,255,255,.06);font-weight:600;flex:0 0 auto}', '.jfvr-head{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:rgba(255,255,255,.06);font-weight:600;flex:0 0 auto}',
'.jfvr-x{background:none;border:0;color:#aaa;font-size:20px;line-height:1;cursor:pointer;padding:0 4px}', '.jfvr-x{background:none;border:0;color:#aaa;font-size:20px;line-height:1;cursor:pointer;padding:0 4px}',
'.jfvr-body{padding:12px;overflow-y:auto;flex:1 1 auto;min-height:0}', '.jfvr-body{padding:12px;overflow-y:auto;flex:1 1 auto;min-height:0}',
@@ -4756,9 +5283,151 @@
var b = NS.makeEl('button', 'jfvr-btn'); var b = NS.makeEl('button', 'jfvr-btn');
b.type = 'button'; b.type = 'button';
b.innerHTML = '<span>&#127909;</span><span>VR 播放</span>'; b.innerHTML = '<span>&#127909;</span><span>VR 播放</span>';
b.addEventListener('click', function (ev) { ev.stopPropagation(); togglePanel(); }); b.title = '点击打开设置;按住拖动可以换位置;双击回到默认位置';
b.addEventListener('click', function (ev) {
ev.stopPropagation();
// A drag still produces a click on most browsers. Swallow that one so
// dragging the button never opens the panel by accident.
if (dragMoved) { dragMoved = false; return; }
togglePanel();
});
// Escape hatch: a button dragged half off a small window is annoying to
// recover by hand.
b.addEventListener('dblclick', function (ev) {
ev.stopPropagation();
resetButtonPos();
});
installDrag(b);
document.body.appendChild(b); document.body.appendChild(b);
btn = b; btn = b;
btnPos = readBtnPos();
placeButton(b, btnPos);
}
/* ------------------------------------------------------------------ *
* button placement / dragging
* ------------------------------------------------------------------
* The button used to be pinned to the bottom-right corner. On a short window
* that put it right on top of the bitrate choices the playback watchdog
* shows (that panel is centred), and there was no way to move it. It is
* draggable now and the spot is remembered per browser.
*
* The settings panel follows the button rather than the viewport corner, so
* the two cannot drift apart.
* ------------------------------------------------------------------ */
var BTN_POS_KEY = 'jfvr-btn-pos';
var BTN_MARGIN = 8;
var DRAG_SLOP = 4; // px of travel before it counts as a drag, not a tap
var btnPos = null; // {left, top} once placed; persisted on drop
var dragging = false;
var dragMoved = false;
var dragStart = null;
function readBtnPos() {
try {
var o = JSON.parse(localStorage.getItem(BTN_POS_KEY) || 'null');
if (o && typeof o.left === 'number' && typeof o.top === 'number') return o;
} catch (e) {}
return null;
}
function writeBtnPos(pos) {
try { localStorage.setItem(BTN_POS_KEY, JSON.stringify(pos)); } catch (e) {}
}
function clampPos(left, top, w, h) {
var maxLeft = Math.max(BTN_MARGIN, window.innerWidth - w - BTN_MARGIN);
var maxTop = Math.max(BTN_MARGIN, window.innerHeight - h - BTN_MARGIN);
return {
left: Math.round(Math.min(Math.max(left, BTN_MARGIN), maxLeft)),
top: Math.round(Math.min(Math.max(top, BTN_MARGIN), maxTop))
};
}
/** The default spot: the old fixed corner, expressed in left/top. */
function defaultPos(b) {
return { left: window.innerWidth - b.offsetWidth - 16,
top: window.innerHeight - b.offsetHeight - 120 };
}
function placeButton(b, pos) {
var p = pos || defaultPos(b);
var c = clampPos(p.left, p.top, b.offsetWidth, b.offsetHeight);
b.style.left = c.left + 'px';
b.style.top = c.top + 'px';
b.style.right = 'auto';
b.style.bottom = 'auto';
return c;
}
function resetButtonPos() {
if (!btn) return;
try { localStorage.removeItem(BTN_POS_KEY); } catch (e) {}
btnPos = placeButton(btn, null);
positionPanel();
}
function installDrag(b) {
b.addEventListener('pointerdown', function (ev) {
if (ev.button != null && ev.button !== 0) return; // primary button / touch only
var r = b.getBoundingClientRect();
dragging = true;
dragMoved = false;
dragStart = { x: ev.clientX, y: ev.clientY, left: r.left, top: r.top };
b.classList.add('jfvr-drag');
try { b.setPointerCapture(ev.pointerId); } catch (e) {}
});
b.addEventListener('pointermove', function (ev) {
if (!dragging || !dragStart) return;
var dx = ev.clientX - dragStart.x;
var dy = ev.clientY - dragStart.y;
if (!dragMoved) {
if (Math.abs(dx) < DRAG_SLOP && Math.abs(dy) < DRAG_SLOP) return;
dragMoved = true;
if (panel) hidePanel(); // do not drag the panel around with it
}
btnPos = clampPos(dragStart.left + dx, dragStart.top + dy, b.offsetWidth, b.offsetHeight);
b.style.left = btnPos.left + 'px';
b.style.top = btnPos.top + 'px';
});
function endDrag(ev) {
if (!dragging) return;
dragging = false;
dragStart = null;
b.classList.remove('jfvr-drag');
try { b.releasePointerCapture(ev.pointerId); } catch (e) {}
if (dragMoved) writeBtnPos(btnPos);
}
b.addEventListener('pointerup', endDrag);
b.addEventListener('pointercancel', endDrag);
}
/** Put the panel next to the button: above it, or below when there is no room. */
function positionPanel() {
if (!panel || !btn) return;
var b = btn.getBoundingClientRect();
var w = panel.offsetWidth;
var h = panel.offsetHeight;
var gap = 8;
var left = b.right - w; // right edges aligned
var top = b.top - h - gap;
if (top < BTN_MARGIN) top = b.bottom + gap; // no room above -> below
var maxLeft = Math.max(BTN_MARGIN, window.innerWidth - w - BTN_MARGIN);
var maxTop = Math.max(BTN_MARGIN, window.innerHeight - h - BTN_MARGIN);
panel.style.left = Math.round(Math.min(Math.max(left, BTN_MARGIN), maxLeft)) + 'px';
panel.style.top = Math.round(Math.min(Math.max(top, BTN_MARGIN), maxTop)) + 'px';
panel.style.right = 'auto';
panel.style.bottom = 'auto';
}
function onViewportResize() {
if (btn && document.body.contains(btn)) btnPos = placeButton(btn, btnPos);
positionPanel();
} }
function removeButton() { function removeButton() {
@@ -4942,6 +5611,7 @@
panel.appendChild(foot); panel.appendChild(foot);
document.body.appendChild(panel); document.body.appendChild(panel);
positionPanel();
panelSync = function () { panelSync = function () {
for (var i = 0; i < panelSyncs.length; i++) { for (var i = 0; i < panelSyncs.length; i++) {
@@ -6343,6 +7013,9 @@
try { if (NS.Subtitles && NS.Subtitles.init) NS.Subtitles.init(); } catch (e) { NS.recordError('Subtitles.init', e); } try { if (NS.Subtitles && NS.Subtitles.init) NS.Subtitles.init(); } catch (e) { NS.recordError('Subtitles.init', e); }
try { if (NS.Controls && NS.Controls.init) NS.Controls.init(); } catch (e) { NS.recordError('Controls.init', e); } try { if (NS.Controls && NS.Controls.init) NS.Controls.init(); } catch (e) { NS.recordError('Controls.init', e); }
try { if (NS.Hands && NS.Hands.init) NS.Hands.init(); } catch (e) { NS.recordError('Hands.init', e); } try { if (NS.Hands && NS.Hands.init) NS.Hands.init(); } catch (e) { NS.recordError('Hands.init', e); }
// Watches for "the player never produced a picture" and offers the only fix
// that helps (let the server transcode). See 40-watchdog.js.
try { if (NS.Watchdog && NS.Watchdog.init) NS.Watchdog.init(); } catch (e) { NS.recordError('Watchdog.init', e); }
scan(); scan();
new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true }); new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true });
@@ -6350,6 +7023,9 @@
window.addEventListener('beforeunload', function () { window.addEventListener('beforeunload', function () {
if (S.session) { try { S.session.end(); } catch (e) {} } if (S.session) { try { S.session.end(); } catch (e) {} }
}); });
// Keep the draggable button (and the panel that follows it) on screen when
// the window changes size.
window.addEventListener('resize', onViewportResize);
installFrameTracker(); installFrameTracker();
window.__JFVR_STATE__ = S; window.__JFVR_STATE__ = S;
+24
View File
@@ -7,6 +7,30 @@
"owner": "cat-shark", "owner": "cat-shark",
"category": "General", "category": "General",
"versions": [ "versions": [
{
"version": "0.4.0.0",
"targetAbi": "12.0.0.0",
"changelog": "Bundle version: `ae28bd`\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.4.0.0/Jellyfin.Plugin.JFVR_12.0.0.0.zip",
"checksum": "30A0E388FFD6A3D88C73DAB5928C6388",
"timestamp": "2026-10-17T17:20:34"
},
{
"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",
"targetAbi": "12.0.0.0",
"changelog": "Bundle version: `edca47`\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.2.0.0/Jellyfin.Plugin.JFVR_12.0.0.0.zip",
"checksum": "355DD18DC228A6586334431518C4B60D",
"timestamp": "2026-10-17T16:28:23"
},
{ {
"version": "0.1.0.1", "version": "0.1.0.1",
"targetAbi": "12.0.0.0", "targetAbi": "12.0.0.0",
+1 -1
View File
@@ -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.1.0.1" version: "0.4.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
View File
@@ -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');
}; };
})(); })();
+357
View File
@@ -0,0 +1,357 @@
/*!
* JFVR watchdog — "this video never started" detection.
*
* WHY THIS EXISTS
* ---------------
* Jellyfin Web builds the whole player UI (including the quality menu) only
* after the 'playbackstart' event, which the media element fires once it has
* actually started. The load order is:
*
* HtmlVideoPlayer.play() htmlVideoPlayer/plugin.js:502
* createMediaElement() :1802 -> loading.show() spinner
* -> <div.videoPlayerContainer><video>
* -> inserted into document.body
* (no src yet!)
* setCurrentSrc() :593 -> elem.src = url, only now
* -> loadedmetadata -> canplay -> play
* -> 'playbackstart'
* -> OSD controller (apps/legacy/controllers/playback/video/index.js:591)
*
* So when the browser cannot use the stream, the OSD never appears at all: the
* page is a spinner over an empty container with a <video> whose videoWidth is
* still 0. There is no quality menu to click, because it was never created.
*
* That is the case this module covers. It watches for exactly that state and
* offers the only thing that can help: tell Jellyfin to transcode.
*
* WHY localStorage AND NOT THE PLAYBACK MANAGER
* --------------------------------------------
* The bitrate is normally set through playbackManager.setMaxStreamingBitrate(),
* which does a live changeStream(). That manager is an ES module export and is
* NOT on window (verified: window.playbackManager is undefined; window.Emby only
* has Page). So the watchdog writes the same keys appSettings would have written
* (src/scripts/settings/appSettings.js) and reloads, which makes Jellyfin request
* PlaybackInfo again with the new cap and pick Transcode.
*
* NOTE the key name really does say "bitrate" twice — that is upstream's typo,
* reproduced here deliberately.
*/
(function () {
'use strict';
var NS = window.__JFVR;
if (!NS) { console.error('[JFVR] core missing'); return; }
if (NS.__watchdog) return;
NS.__watchdog = true;
var S = NS.state;
var log = NS.log;
/* ------------------------------------------------------------------ *
* tunables
* ------------------------------------------------------------------ */
var POLL_MS = 500;
// Direct play on a LAN should have metadata almost immediately; the file is
// 11 GB but its moov atom is at the front, so there is nothing to wait for.
// A transcode is different: the server has to decode the first GOP and produce
// segments before the browser sees any metadata, and this NAS is doing 8K.
var DEAD_MS = 15000;
var DEAD_TRANSCODE_MS = 45000;
// After the user answers (either way) stay quiet, so a slow-but-working
// playback does not get nagged at.
var QUIET_MS = 120000;
var QUIET_KEY = 'jfvr-watchdog-quiet-until';
// Values from Jellyfin's own menu (src/components/qualityOptions.js).
var CHOICES = [
{ label: '20 Mbps', bitrate: 20000000, note: '≈4K,最接近原始画质' },
{ label: '8 Mbps', bitrate: 8000000, note: '1080p 档,稳' },
{ label: '3 Mbps', bitrate: 3000000, note: '720p 档,最省算力' }
];
var W = {
seenAt: 0, // when the current stalled <video> first showed up
shown: false,
quietUntil: 0,
lastReason: '',
applied: null,
codec: null, // filled in best-effort from the Jellyfin API
panel: null
};
NS.Watchdog = W;
/* ------------------------------------------------------------------ *
* helpers
* ------------------------------------------------------------------ */
function now() { return Date.now(); }
/**
* The element Jellyfin creates in createMediaElement(). It exists from the
* very start of playback — including the failure case, which is the whole
* point: findVideo() in 90-main.js requires videoWidth and would return null.
*/
function playerVideo() {
var c = document.querySelector('.videoPlayerContainer');
if (!c) return null;
return c.querySelector('video') || null;
}
function isTranscode(v) {
var src = v.currentSrc || v.src || '';
return src.indexOf('/hls') >= 0 || src.indexOf('.m3u8') >= 0;
}
/** Metadata parsed AND a frame available. False means "no picture". */
function hasPicture(v) {
return v.videoWidth > 0 && v.readyState >= 2;
}
function readQuiet() {
try {
var raw = window.sessionStorage && sessionStorage.getItem(QUIET_KEY);
return raw ? parseInt(raw, 10) || 0 : 0;
} catch (e) { return 0; }
}
function setQuiet(ms) {
W.quietUntil = now() + ms;
try { sessionStorage.setItem(QUIET_KEY, String(W.quietUntil)); } catch (e) {}
}
/**
* Write the same keys Jellyfin's own quality menu writes, for BOTH in-network
* and out-of-network, because the client is the only side that knows which one
* applies and we cannot ask it (appSettings is not on window).
*/
function applyBitrate(bitrate) {
var media = 'Video';
['true', 'false'].forEach(function (inNet) {
try {
localStorage.setItem('enableautobitratebitrate-' + media + '-' + inNet, 'false');
localStorage.setItem('maxbitrate-' + media + '-' + inNet, String(bitrate));
} catch (e) {
log('watchdog: could not persist bitrate', e && e.message);
}
});
W.applied = bitrate;
log('watchdog: capped bitrate at', bitrate, 'and reloading');
setQuiet(QUIET_MS);
window.location.reload();
}
/* ------------------------------------------------------------------ *
* best-effort: name the actual format so the message is actionable
* ------------------------------------------------------------------ */
function itemIdFrom(v) {
var s = (v && (v.currentSrc || v.src)) || '';
var m = s.match(/\/Videos\/([0-9a-f]{32})\//i);
if (m) return m[1];
m = (window.location.hash || '').match(/[?&]id=([0-9a-f]{32})/i);
return m ? m[1] : null;
}
function describeCodec(v) {
if (W.codec) return;
var id = itemIdFrom(v);
if (!id || !window.ApiClient) return;
var url;
try { url = window.ApiClient.getUrl('Items/' + id); } catch (e) { return; }
window.ApiClient.ajax({ type: 'GET', url: url, dataType: 'json' }).then(function (item) {
var ms = (item && item.MediaSources && item.MediaSources[0] && item.MediaSources[0].MediaStreams) || [];
for (var i = 0; i < ms.length; i++) {
var st = ms[i];
if (st.Type !== 'Video') continue;
W.codec = [
st.Width + '×' + st.Height,
(st.Codec || '').toUpperCase(),
st.Profile || '',
st.BitDepth ? st.BitDepth + '-bit' : ''
].filter(Boolean).join(' ');
break;
}
if (W.shown) render(); // update the message in place
}).catch(function () { /* the prompt works fine without this */ });
}
/* ------------------------------------------------------------------ *
* the prompt
* ------------------------------------------------------------------ */
var WD_CSS = [
'.jfvr-wd{position:fixed;left:50%;top:50%;transform:translate(-50%,-50%);z-index:2147483002;width:420px;max-width:calc(100vw - 32px);',
'background:rgba(18,18,22,.97);color:#eaeaea;border:1px solid rgba(255,255,255,.16);border-radius:14px;',
'box-shadow:0 18px 60px rgba(0,0,0,.7);font-family:inherit;font-size:14px;padding:18px 18px 14px;backdrop-filter:blur(10px)}',
'.jfvr-wd h3{margin:0 0 6px;font-size:16px;font-weight:600}',
'.jfvr-wd p{margin:0 0 10px;font-size:13px;line-height:1.6;color:#c3c9d4}',
'.jfvr-wd .jfvr-wd-fmt{color:#ffd479;font-weight:600}',
'.jfvr-wd .jfvr-wd-sub{font-size:12px;color:#8b93a1;line-height:1.55;margin-bottom:12px}',
'.jfvr-wd-btns{display:flex;flex-direction:column;gap:8px;margin-bottom:10px}',
'.jfvr-wd-btns button{display:flex;justify-content:space-between;align-items:baseline;gap:10px;width:100%;padding:10px 12px;',
'border:1px solid rgba(255,255,255,.16);border-radius:9px;background:rgba(255,255,255,.05);color:#eaeaea;',
'font-size:14px;font-weight:600;cursor:pointer;font-family:inherit;text-align:left}',
'.jfvr-wd-btns button:hover{background:rgba(78,161,255,.18);border-color:#4ea1ff}',
'.jfvr-wd-btns button span.note{font-size:11px;font-weight:400;color:#8b93a1}',
'.jfvr-wd-quiet{width:100%;padding:9px;border:0;border-radius:9px;background:transparent;color:#8b93a1;',
'font-size:13px;cursor:pointer;font-family:inherit}',
'.jfvr-wd-quiet:hover{color:#eaeaea}',
'.jfvr-wd-diag{margin-top:10px;font-size:11px;color:#8b93a1}',
'.jfvr-wd-diag summary{cursor:pointer;user-select:none}',
'.jfvr-wd-diag pre{white-space:pre-wrap;word-break:break-all;margin:8px 0 0;font-size:10px;line-height:1.5;',
'max-height:150px;overflow:auto;color:#9fb0c4;background:rgba(0,0,0,.35);padding:8px;border-radius:7px}'
].join('');
function injectWdCss() {
if (document.getElementById('jfvr-wd-css')) return;
var s = NS.makeEl('style');
s.id = 'jfvr-wd-css';
s.textContent = WD_CSS;
document.head.appendChild(s);
}
function diagText(v) {
var e = v.error;
return [
'readyState : ' + v.readyState + ' (0=HAVE_NOTHING, 1=HAVE_METADATA, 2=HAVE_CURRENT_DATA)',
'networkState: ' + v.networkState,
'videoWidth : ' + v.videoWidth + '×' + v.videoHeight,
'paused : ' + v.paused,
'currentTime : ' + v.currentTime,
'error : ' + (e ? e.code + ' ' + (e.message || '') : 'none'),
'src : ' + String(v.currentSrc || v.src || '').slice(0, 160),
'格式 : ' + (W.codec || '(未知)')
].join('\n');
}
function render() {
if (!W.panel) return;
var body = W.panel.querySelector('.jfvr-wd-body');
var v = playerVideo();
if (body && v) {
var fmt = body.querySelector('.jfvr-wd-fmt');
if (fmt) fmt.textContent = W.codec || '这个格式';
var pre = body.querySelector('pre');
if (pre) pre.textContent = diagText(v);
}
}
function show(v, reason) {
if (W.shown) { render(); return; }
W.shown = true;
W.lastReason = reason;
injectWdCss();
var p = NS.makeEl('div', 'jfvr-wd');
p.id = 'jfvr-wd';
p.appendChild(NS.makeEl('h3', null, '视频没能开始播放'));
var body = NS.makeEl('div', 'jfvr-wd-body');
var msg = NS.makeEl('p');
var waited = Math.round(timeoutMs(v) / 1000);
msg.innerHTML =
(reason === 'error'
? '播放器报错了,一个画面都没解出来。'
: '等了 ' + waited + ' 秒都没拿到任何画面(<code>videoWidth = 0</code>),' +
'所以播放器界面也没有被创建出来。') +
'最常见的原因是<strong>这台设备解不动这个格式</strong>:' +
'<span class="jfvr-wd-fmt">' + (W.codec || '该格式') + '</span>。<br>' +
'让服务器转码成 H.264 再播就能看到画面,代价是画质下降(这台 NAS 的转码上限约 4K)。';
body.appendChild(msg);
body.appendChild(NS.makeEl('div', 'jfvr-wd-sub',
'选一档码率后会写入播放设置并重新加载页面。'));
var btns = NS.makeEl('div', 'jfvr-wd-btns');
CHOICES.forEach(function (c) {
var b = NS.makeEl('button');
b.type = 'button';
b.appendChild(NS.makeEl('span', null, c.label));
b.appendChild(NS.makeEl('span', 'note', c.note));
b.addEventListener('click', function (ev) {
ev.stopPropagation();
applyBitrate(c.bitrate);
});
btns.appendChild(b);
});
body.appendChild(btns);
var quiet = NS.makeEl('button', 'jfvr-wd-quiet', '继续等待,先别管我');
quiet.type = 'button';
quiet.addEventListener('click', function (ev) {
ev.stopPropagation();
setQuiet(QUIET_MS);
hide();
});
body.appendChild(quiet);
var diag = NS.makeEl('details', 'jfvr-wd-diag');
diag.appendChild(NS.makeEl('summary', null, '诊断信息'));
diag.appendChild(NS.makeEl('pre', null, diagText(v)));
body.appendChild(diag);
p.appendChild(body);
document.body.appendChild(p);
W.panel = p;
NS.recordError('watchdog', new Error('playback never started: ' + reason));
log('watchdog: playback never started, reason =', reason, 'codec =', W.codec);
}
function hide() {
W.shown = false;
if (W.panel) { W.panel.remove(); W.panel = null; }
}
function reset() {
W.seenAt = 0;
W.codec = null;
if (W.shown) hide();
}
function timeoutMs(v) {
return isTranscode(v) ? DEAD_TRANSCODE_MS : DEAD_MS;
}
/* ------------------------------------------------------------------ *
* poll
* ------------------------------------------------------------------ */
function poll() {
// Never interfere with an active VR session: the session owns the flow and
// a modal in the middle of it would be a disaster.
if (S.session) { if (W.shown) hide(); return; }
var v = playerVideo();
if (!v) { reset(); return; }
// Playback is fine (or at least has a picture): stand down.
if (hasPicture(v)) { reset(); return; }
// A media error is unambiguous — no need to wait out the timer.
if (v.error) {
describeCodec(v);
if (W.quietUntil && now() < W.quietUntil) return;
show(v, 'error');
return;
}
if (!W.seenAt) W.seenAt = now();
if (now() - W.seenAt < timeoutMs(v)) return;
if (W.quietUntil && now() < W.quietUntil) return;
describeCodec(v);
show(v, 'timeout');
}
NS.Watchdog.init = function () {
W.quietUntil = readQuiet();
setInterval(poll, POLL_MS);
log('watchdog armed (dead=' + DEAD_MS + 'ms, transcode=' + DEAD_TRANSCODE_MS + 'ms)');
};
})();
+161 -5
View File
@@ -299,16 +299,23 @@
// Sits ABOVE Jellyfin's own OSD bar: at the viewport's bottom-right it // Sits ABOVE Jellyfin's own OSD bar: at the viewport's bottom-right it
// covered the player's fullscreen button (owner report). 120 px clears the // covered the player's fullscreen button (owner report). 120 px clears the
// OSD bottom bar; the settings panel stacks above it. // OSD bottom bar; the settings panel stacks above it.
'.jfvr-btn{position:fixed;right:16px;bottom:120px;z-index:2147483000;display:flex;align-items:center;gap:8px;', // left/top are set from JS (see placeButton) so the button can be dragged
// anywhere. touch-action:none is what makes a drag work on a touch screen
// instead of scrolling the page underneath.
'.jfvr-btn{position:fixed;z-index:2147483000;display:flex;align-items:center;gap:8px;',
'padding:10px 16px;border:0;border-radius:24px;background:linear-gradient(135deg,#4ea1ff,#7b5cff);color:#fff;', 'padding:10px 16px;border:0;border-radius:24px;background:linear-gradient(135deg,#4ea1ff,#7b5cff);color:#fff;',
'font-size:15px;font-weight:600;cursor:pointer;box-shadow:0 6px 22px rgba(0,0,0,.45);font-family:inherit}', 'font-size:15px;font-weight:600;cursor:grab;box-shadow:0 6px 22px rgba(0,0,0,.45);font-family:inherit;',
'touch-action:none;user-select:none;-webkit-user-select:none;-webkit-tap-highlight-color:transparent}',
'.jfvr-btn:active{transform:scale(.96)}', '.jfvr-btn:active{transform:scale(.96)}',
'.jfvr-btn.jfvr-drag{cursor:grabbing;transform:none;box-shadow:0 10px 32px rgba(0,0,0,.65)}',
// the panel must always fit the viewport AND keep the CTA reachable, so the // the panel must always fit the viewport AND keep the CTA reachable, so the
// body scrolls and the button lives in a sticky footer // body scrolls and the button lives in a sticky footer
'.jfvr-panel{position:fixed;right:16px;bottom:180px;z-index:2147483001;width:290px;background:rgba(20,20,24,.96);', // Positioned from JS (positionPanel) so it follows the button once the
// button has been dragged; it no longer lives in the viewport corner.
'.jfvr-panel{position:fixed;z-index:2147483001;width:290px;background:rgba(20,20,24,.96);',
'color:#eaeaea;border:1px solid rgba(255,255,255,.14);border-radius:14px;box-shadow:0 12px 40px rgba(0,0,0,.6);', 'color:#eaeaea;border:1px solid rgba(255,255,255,.14);border-radius:14px;box-shadow:0 12px 40px rgba(0,0,0,.6);',
'font-family:inherit;font-size:14px;backdrop-filter:blur(10px);display:flex;flex-direction:column;', 'font-family:inherit;font-size:14px;backdrop-filter:blur(10px);display:flex;flex-direction:column;',
'max-height:calc(100vh - 200px);overflow:hidden}', 'max-height:calc(100vh - 32px);overflow:hidden}',
'.jfvr-head{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:rgba(255,255,255,.06);font-weight:600;flex:0 0 auto}', '.jfvr-head{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:rgba(255,255,255,.06);font-weight:600;flex:0 0 auto}',
'.jfvr-x{background:none;border:0;color:#aaa;font-size:20px;line-height:1;cursor:pointer;padding:0 4px}', '.jfvr-x{background:none;border:0;color:#aaa;font-size:20px;line-height:1;cursor:pointer;padding:0 4px}',
'.jfvr-body{padding:12px;overflow-y:auto;flex:1 1 auto;min-height:0}', '.jfvr-body{padding:12px;overflow-y:auto;flex:1 1 auto;min-height:0}',
@@ -356,9 +363,151 @@
var b = NS.makeEl('button', 'jfvr-btn'); var b = NS.makeEl('button', 'jfvr-btn');
b.type = 'button'; b.type = 'button';
b.innerHTML = '<span>&#127909;</span><span>VR 播放</span>'; b.innerHTML = '<span>&#127909;</span><span>VR 播放</span>';
b.addEventListener('click', function (ev) { ev.stopPropagation(); togglePanel(); }); b.title = '点击打开设置;按住拖动可以换位置;双击回到默认位置';
b.addEventListener('click', function (ev) {
ev.stopPropagation();
// A drag still produces a click on most browsers. Swallow that one so
// dragging the button never opens the panel by accident.
if (dragMoved) { dragMoved = false; return; }
togglePanel();
});
// Escape hatch: a button dragged half off a small window is annoying to
// recover by hand.
b.addEventListener('dblclick', function (ev) {
ev.stopPropagation();
resetButtonPos();
});
installDrag(b);
document.body.appendChild(b); document.body.appendChild(b);
btn = b; btn = b;
btnPos = readBtnPos();
placeButton(b, btnPos);
}
/* ------------------------------------------------------------------ *
* button placement / dragging
* ------------------------------------------------------------------
* The button used to be pinned to the bottom-right corner. On a short window
* that put it right on top of the bitrate choices the playback watchdog
* shows (that panel is centred), and there was no way to move it. It is
* draggable now and the spot is remembered per browser.
*
* The settings panel follows the button rather than the viewport corner, so
* the two cannot drift apart.
* ------------------------------------------------------------------ */
var BTN_POS_KEY = 'jfvr-btn-pos';
var BTN_MARGIN = 8;
var DRAG_SLOP = 4; // px of travel before it counts as a drag, not a tap
var btnPos = null; // {left, top} once placed; persisted on drop
var dragging = false;
var dragMoved = false;
var dragStart = null;
function readBtnPos() {
try {
var o = JSON.parse(localStorage.getItem(BTN_POS_KEY) || 'null');
if (o && typeof o.left === 'number' && typeof o.top === 'number') return o;
} catch (e) {}
return null;
}
function writeBtnPos(pos) {
try { localStorage.setItem(BTN_POS_KEY, JSON.stringify(pos)); } catch (e) {}
}
function clampPos(left, top, w, h) {
var maxLeft = Math.max(BTN_MARGIN, window.innerWidth - w - BTN_MARGIN);
var maxTop = Math.max(BTN_MARGIN, window.innerHeight - h - BTN_MARGIN);
return {
left: Math.round(Math.min(Math.max(left, BTN_MARGIN), maxLeft)),
top: Math.round(Math.min(Math.max(top, BTN_MARGIN), maxTop))
};
}
/** The default spot: the old fixed corner, expressed in left/top. */
function defaultPos(b) {
return { left: window.innerWidth - b.offsetWidth - 16,
top: window.innerHeight - b.offsetHeight - 120 };
}
function placeButton(b, pos) {
var p = pos || defaultPos(b);
var c = clampPos(p.left, p.top, b.offsetWidth, b.offsetHeight);
b.style.left = c.left + 'px';
b.style.top = c.top + 'px';
b.style.right = 'auto';
b.style.bottom = 'auto';
return c;
}
function resetButtonPos() {
if (!btn) return;
try { localStorage.removeItem(BTN_POS_KEY); } catch (e) {}
btnPos = placeButton(btn, null);
positionPanel();
}
function installDrag(b) {
b.addEventListener('pointerdown', function (ev) {
if (ev.button != null && ev.button !== 0) return; // primary button / touch only
var r = b.getBoundingClientRect();
dragging = true;
dragMoved = false;
dragStart = { x: ev.clientX, y: ev.clientY, left: r.left, top: r.top };
b.classList.add('jfvr-drag');
try { b.setPointerCapture(ev.pointerId); } catch (e) {}
});
b.addEventListener('pointermove', function (ev) {
if (!dragging || !dragStart) return;
var dx = ev.clientX - dragStart.x;
var dy = ev.clientY - dragStart.y;
if (!dragMoved) {
if (Math.abs(dx) < DRAG_SLOP && Math.abs(dy) < DRAG_SLOP) return;
dragMoved = true;
if (panel) hidePanel(); // do not drag the panel around with it
}
btnPos = clampPos(dragStart.left + dx, dragStart.top + dy, b.offsetWidth, b.offsetHeight);
b.style.left = btnPos.left + 'px';
b.style.top = btnPos.top + 'px';
});
function endDrag(ev) {
if (!dragging) return;
dragging = false;
dragStart = null;
b.classList.remove('jfvr-drag');
try { b.releasePointerCapture(ev.pointerId); } catch (e) {}
if (dragMoved) writeBtnPos(btnPos);
}
b.addEventListener('pointerup', endDrag);
b.addEventListener('pointercancel', endDrag);
}
/** Put the panel next to the button: above it, or below when there is no room. */
function positionPanel() {
if (!panel || !btn) return;
var b = btn.getBoundingClientRect();
var w = panel.offsetWidth;
var h = panel.offsetHeight;
var gap = 8;
var left = b.right - w; // right edges aligned
var top = b.top - h - gap;
if (top < BTN_MARGIN) top = b.bottom + gap; // no room above -> below
var maxLeft = Math.max(BTN_MARGIN, window.innerWidth - w - BTN_MARGIN);
var maxTop = Math.max(BTN_MARGIN, window.innerHeight - h - BTN_MARGIN);
panel.style.left = Math.round(Math.min(Math.max(left, BTN_MARGIN), maxLeft)) + 'px';
panel.style.top = Math.round(Math.min(Math.max(top, BTN_MARGIN), maxTop)) + 'px';
panel.style.right = 'auto';
panel.style.bottom = 'auto';
}
function onViewportResize() {
if (btn && document.body.contains(btn)) btnPos = placeButton(btn, btnPos);
positionPanel();
} }
function removeButton() { function removeButton() {
@@ -542,6 +691,7 @@
panel.appendChild(foot); panel.appendChild(foot);
document.body.appendChild(panel); document.body.appendChild(panel);
positionPanel();
panelSync = function () { panelSync = function () {
for (var i = 0; i < panelSyncs.length; i++) { for (var i = 0; i < panelSyncs.length; i++) {
@@ -1943,6 +2093,9 @@
try { if (NS.Subtitles && NS.Subtitles.init) NS.Subtitles.init(); } catch (e) { NS.recordError('Subtitles.init', e); } try { if (NS.Subtitles && NS.Subtitles.init) NS.Subtitles.init(); } catch (e) { NS.recordError('Subtitles.init', e); }
try { if (NS.Controls && NS.Controls.init) NS.Controls.init(); } catch (e) { NS.recordError('Controls.init', e); } try { if (NS.Controls && NS.Controls.init) NS.Controls.init(); } catch (e) { NS.recordError('Controls.init', e); }
try { if (NS.Hands && NS.Hands.init) NS.Hands.init(); } catch (e) { NS.recordError('Hands.init', e); } try { if (NS.Hands && NS.Hands.init) NS.Hands.init(); } catch (e) { NS.recordError('Hands.init', e); }
// Watches for "the player never produced a picture" and offers the only fix
// that helps (let the server transcode). See 40-watchdog.js.
try { if (NS.Watchdog && NS.Watchdog.init) NS.Watchdog.init(); } catch (e) { NS.recordError('Watchdog.init', e); }
scan(); scan();
new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true }); new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true });
@@ -1950,6 +2103,9 @@
window.addEventListener('beforeunload', function () { window.addEventListener('beforeunload', function () {
if (S.session) { try { S.session.end(); } catch (e) {} } if (S.session) { try { S.session.end(); } catch (e) {} }
}); });
// Keep the draggable button (and the panel that follows it) on screen when
// the window changes size.
window.addEventListener('resize', onViewportResize);
installFrameTracker(); installFrameTracker();
window.__JFVR_STATE__ = S; window.__JFVR_STATE__ = S;