Compare commits
3
Commits
03919dab98
...
v0.5.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6734e505c | ||
|
|
d20482d5dd | ||
|
|
cf731c16c2 |
+98
@@ -935,3 +935,101 @@ window.__JFVR.capsDiag()
|
|||||||
- [ ] 探测目前只覆盖 HEVC。AV1 / VP9 走同一套机制,但库里没有这类片源,先不做。
|
- [ ] 探测目前只覆盖 HEVC。AV1 / VP9 走同一套机制,但库里没有这类片源,先不做。
|
||||||
- [ ] 网络带宽那一维不在设备档案范围内(档案是在播放开始时判一次的)。Jellyfin 自带的 Auto 码率探测管这个。
|
- [ ] 网络带宽那一维不在设备档案范围内(档案是在播放开始时判一次的)。Jellyfin 自带的 Auto 码率探测管这个。
|
||||||
- [ ] 看门狗(§1.2)现在退居为纯兜底:如果检测结果准了,它就不应该再触发。它仍然保留,作为「声称能播结果没播出来」的最后一道。
|
- [ ] 看门狗(§1.2)现在退居为纯兜底:如果检测结果准了,它就不应该再触发。它仍然保留,作为「声称能播结果没播出来」的最后一道。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 19. ADDENDUM 13 — 真机根因:`nvidia-vaapi-driver` 0.0.14 的自引用初始化器
|
||||||
|
|
||||||
|
### 19.1 结论(先看这个)
|
||||||
|
|
||||||
|
本机(Kubuntu / NVIDIA TU116M GTX 1660 Ti Mobile / Chrome 152)播不了 8K Main 10,
|
||||||
|
**根因不在 Jellyfin、不在插件、也不在显卡硬件**,而在 `nvidia-vaapi-driver` 的版本:
|
||||||
|
|
||||||
|
```
|
||||||
|
已安装: nvidia-vaapi-driver 0.0.14-1 (2025-06-08,Ubuntu 26.04 仓库里只有这个)
|
||||||
|
已修复: 0.0.18 (2026-08-31)
|
||||||
|
```
|
||||||
|
|
||||||
|
**升级到 0.0.18 即可,不需要转码、不需要插件做任何补偿。**
|
||||||
|
|
||||||
|
### 19.2 证据链
|
||||||
|
|
||||||
|
**1) 硬件能做,中间层不行** —— 同一文件、同一台机器:
|
||||||
|
|
||||||
|
| 路径 | 结果 |
|
||||||
|
|---|---|
|
||||||
|
| `ffmpeg -hwaccel vaapi`(走 nvidia-vaapi-driver) | ❌ `Failed to create decode context: 2 (resource allocation failed)` |
|
||||||
|
| `ffmpeg -hwaccel cuda`(直连 NVDEC) | ✅ 正常 |
|
||||||
|
| VAAPI 解 8K **Main(8-bit)** | ✅ 正常 |
|
||||||
|
| VAAPI 解 1080p **Main 10** | ✅ 正常 |
|
||||||
|
|
||||||
|
→ 只有 **8K + 10-bit** 这个组合失败;硬件本身没问题。
|
||||||
|
|
||||||
|
**2) Chrome 侧的配置是对的** —— `chrome://gpu` 实测:
|
||||||
|
|
||||||
|
```
|
||||||
|
Graphics Feature Status
|
||||||
|
* Video Decode: Hardware accelerated ← VAAPI 生效中
|
||||||
|
Video Acceleration Information
|
||||||
|
Decode hevc main : 144x144 to 8192x8192 pixels
|
||||||
|
Decode hevc main 10 : 144x144 to 8192x8192 pixels ← 驱动"声称"支持
|
||||||
|
```
|
||||||
|
|
||||||
|
**驱动声称支持 8K Main 10,实际建不出解码器。** 于是:
|
||||||
|
|
||||||
|
```
|
||||||
|
canPlayType('hvc1.2.4.L183') → truthy
|
||||||
|
→ Jellyfin Web 声明 maxHevcLevel=183 / main|main 10
|
||||||
|
→ 服务器选 DirectPlay(日志里没有任何 ffmpeg)
|
||||||
|
→ Chrome 真正解码时 cuvidCreateDecoder 失败
|
||||||
|
→ 黑屏 / 一直转圈(而 OSD 只在 playbackstart 之后创建,所以连码率菜单都没有)
|
||||||
|
```
|
||||||
|
|
||||||
|
**3) 上游 bug** —— 0.0.14 的 `src/vabackend.c`:
|
||||||
|
|
||||||
|
```c
|
||||||
|
CUVIDDECODECREATEINFO vdci = {
|
||||||
|
.ulWidth = vdci.ulMaxWidth = vdci.ulTargetWidth = picture_width, // ← 在自身初始化器里引用自己
|
||||||
|
.ulHeight = vdci.ulMaxHeight = vdci.ulTargetHeight = picture_height, // C 里这是未定义行为
|
||||||
|
```
|
||||||
|
|
||||||
|
修复提交 `a565237`(2026-07-09)标题即 **"fix: drop self-referential CUVIDDECODECREATEINFO initializer"**,
|
||||||
|
把赋值移出初始化器;`#449`(2026-07-17 合入)把同样的修复镜像到另一个函数。**0.0.17 仍有问题,0.0.18 已修复。**
|
||||||
|
|
||||||
|
### 19.3 Kubuntu 上正确让 Chrome 用显卡
|
||||||
|
|
||||||
|
用户现有的启动参数**是对的**(`chrome://gpu` 已确认 `Video Decode: Hardware accelerated`):
|
||||||
|
|
||||||
|
```
|
||||||
|
--enable-features=VaapiOnNvidiaGPUs,VaapiVideoDecodeLinuxGL,VaapiVideoDecoder
|
||||||
|
--disable-features=UseChromeOSDirectVideoDecoder
|
||||||
|
```
|
||||||
|
|
||||||
|
配套条件:
|
||||||
|
|
||||||
|
- `nvidia-vaapi-driver` **≥ 0.0.18**(当前 0.0.14 → 这是要补的一环)
|
||||||
|
- 驱动 README 要求内核参数 `nvidia-drm.modeset=1`(**本机当前未设置**,`/proc/cmdline` 里没有)
|
||||||
|
- `LIBVA_DRIVER_NAME=nvidia`
|
||||||
|
- 注意:驱动 README 明说 *"specifically designed to be used by Firefox … may not operate correctly in other applications"*、*"Chrome is currently unsupported"*。Chrome 能用但不受官方支持。
|
||||||
|
|
||||||
|
升级(Ubuntu 仓库只有 0.0.14,需从源码构建):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo apt install meson ninja-build libva-dev libegl-dev gstreamer1.0-plugins-bad libffmpeg-nvenc-dev
|
||||||
|
git clone --branch v0.0.18 https://github.com/elFarto/nvidia-vaapi-driver
|
||||||
|
cd nvidia-vaapi-driver && meson setup build && sudo meson install -C build
|
||||||
|
```
|
||||||
|
|
||||||
|
### 19.4 这对插件意味着什么
|
||||||
|
|
||||||
|
升级驱动后:Chrome 能真正解 8K Main 10 → `decodingInfo` 报 `smooth:true` → 插件不拦任何档
|
||||||
|
→ 直连 8K → 看门狗也不会触发。**插件侧不需要做任何补偿。**
|
||||||
|
|
||||||
|
但 **0.5.0.0 的判定逻辑本身有个缺陷,已在 0.5.1.0 修掉**:它在 `smooth === false` 时就压低
|
||||||
|
level 上限,而 Jellyfin 的档案**无法表达「Main 支持到 8K,Main 10 只到 4K」**(level 上限和
|
||||||
|
profile 列表来自同一条 Main 10 判断链)。所以在那台「8-bit 8K 正常、10-bit 8K 失败」的机器上,
|
||||||
|
拦掉 `2:183` 会把**整库 61 个 8-bit 8K 文件**一起拖进转码 —— 而 NAS 转 8K 只能出 1280×640。
|
||||||
|
|
||||||
|
0.5.1.0 改成:**只有当同位深的 Main(8-bit)档也不可用时,才压低 level 上限**(为此补测了
|
||||||
|
Main L5.1 / L6.1 / L6.2 作为对照)。代价是「8-bit 能解、10-bit 不能」的设备仍会声称 10-bit 并在
|
||||||
|
那种文件上黑屏 —— 那正是 `40-watchdog.js` 存在的意义。
|
||||||
|
|||||||
Vendored
+32
-1
@@ -403,8 +403,23 @@
|
|||||||
// each level is probed at the resolution and bitrate it exists for. Main
|
// each level is probed at the resolution and bitrate it exists for. Main
|
||||||
// (8-bit) is probed at the same levels as Main 10 because it is the control
|
// (8-bit) is probed at the same levels as Main 10 because it is the control
|
||||||
// that decides whether a level is really out of reach.
|
// that decides whether a level is really out of reach.
|
||||||
|
//
|
||||||
|
// NOTE on the codec strings: they MUST carry a constraint byte. Chrome's
|
||||||
|
// MediaCapabilities.decodingInfo does not recognise the bare 'hvc1.1.L120'
|
||||||
|
// spelling and answers supported:false for it even on a machine that decodes
|
||||||
|
// HEVC perfectly, while 'hvc1.1.0.L120' is answered correctly. That one
|
||||||
|
// character used to matter far more than it looks: browserDeviceProfile.js
|
||||||
|
// gates the WHOLE hevc entry on supportsHevc(), which is exactly
|
||||||
|
//
|
||||||
|
// canPlayType('...codecs="hvc1.1.L120"') ||
|
||||||
|
// canPlayType('...codecs="hev1.1.L120"') ||
|
||||||
|
// canPlayType('...codecs="hvc1.1.0.L120"') || ...
|
||||||
|
//
|
||||||
|
// so a spurious block of tier 1:120 (all spellings map to it) removes hevc
|
||||||
|
// from every DirectPlayProfile and transcode every HEVC file in the library.
|
||||||
|
// 1:120 is NOT part of Jellyfin's level chain; it is only that gate.
|
||||||
var CODEC_PROBES = [
|
var CODEC_PROBES = [
|
||||||
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, mbps: 8, codec: 'hvc1.1.L120' },
|
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, mbps: 8, codec: 'hvc1.1.0.L120' },
|
||||||
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, mbps: 8, codec: 'hvc1.1.4.L123' },
|
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, mbps: 8, codec: 'hvc1.1.4.L123' },
|
||||||
{ key: '1:153', name: 'Main L5.1 (4K)', w: 3840, h: 2160, fps: 60, mbps: 20, codec: 'hvc1.1.5.L153.B0' },
|
{ key: '1:153', name: 'Main L5.1 (4K)', w: 3840, h: 2160, fps: 60, mbps: 20, codec: 'hvc1.1.5.L153.B0' },
|
||||||
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, mbps: 30, codec: 'hvc1.1.6.L183.B0' },
|
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, mbps: 30, codec: 'hvc1.1.6.L183.B0' },
|
||||||
@@ -501,6 +516,22 @@
|
|||||||
var own = blockReason(v, keep);
|
var own = blockReason(v, keep);
|
||||||
if (!own) return null;
|
if (!own) return null;
|
||||||
var parts = key.split(':');
|
var parts = key.split(':');
|
||||||
|
|
||||||
|
// Base tier. 1:120 is not in Jellyfin's level chain -- it is only the
|
||||||
|
// coarse "does this client have HEVC at all" gate (supportsHevc() in
|
||||||
|
// browserDeviceProfile.js, which probes exactly this level). Blocking it
|
||||||
|
// drops hevc from every DirectPlayProfile, i.e. transcodes the entire
|
||||||
|
// HEVC library. Never act on it unless the device is unusable at EVERY
|
||||||
|
// Main tier, so one flaky/early probe cannot do that.
|
||||||
|
if (key === '1:120') {
|
||||||
|
var anyMainUsable = CODEC_PROBES.some(function (p) {
|
||||||
|
if (p.key === '1:120' || p.key.charAt(0) !== '1') return false;
|
||||||
|
var m = NS.caps.codec[p.key];
|
||||||
|
return !!m && !m.error && m.supported !== false && m.smooth !== false;
|
||||||
|
});
|
||||||
|
if (anyMainUsable) return null;
|
||||||
|
}
|
||||||
|
|
||||||
if (parts[0] === '2') {
|
if (parts[0] === '2') {
|
||||||
// Control: the same level in Main (8-bit).
|
// Control: the same level in Main (8-bit).
|
||||||
if (!tierUnusable('1:' + parts[1])) return null;
|
if (!tierUnusable('1:' + parts[1])) return null;
|
||||||
|
|||||||
@@ -7,6 +7,14 @@
|
|||||||
"owner": "cat-shark",
|
"owner": "cat-shark",
|
||||||
"category": "General",
|
"category": "General",
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"version": "0.5.2.0",
|
||||||
|
"targetAbi": "12.0.0.0",
|
||||||
|
"changelog": "Bundle version: `16ae94`\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.5.2.0/Jellyfin.Plugin.JFVR_12.0.0.0.zip",
|
||||||
|
"checksum": "C5BD8E8C384642D4502BE1A0F80B8E68",
|
||||||
|
"timestamp": "2026-10-19T15:01:57"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.5.1.0",
|
"version": "0.5.1.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.5.1.0"
|
version: "0.5.2.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."
|
||||||
|
|||||||
+32
-1
@@ -395,8 +395,23 @@
|
|||||||
// each level is probed at the resolution and bitrate it exists for. Main
|
// each level is probed at the resolution and bitrate it exists for. Main
|
||||||
// (8-bit) is probed at the same levels as Main 10 because it is the control
|
// (8-bit) is probed at the same levels as Main 10 because it is the control
|
||||||
// that decides whether a level is really out of reach.
|
// that decides whether a level is really out of reach.
|
||||||
|
//
|
||||||
|
// NOTE on the codec strings: they MUST carry a constraint byte. Chrome's
|
||||||
|
// MediaCapabilities.decodingInfo does not recognise the bare 'hvc1.1.L120'
|
||||||
|
// spelling and answers supported:false for it even on a machine that decodes
|
||||||
|
// HEVC perfectly, while 'hvc1.1.0.L120' is answered correctly. That one
|
||||||
|
// character used to matter far more than it looks: browserDeviceProfile.js
|
||||||
|
// gates the WHOLE hevc entry on supportsHevc(), which is exactly
|
||||||
|
//
|
||||||
|
// canPlayType('...codecs="hvc1.1.L120"') ||
|
||||||
|
// canPlayType('...codecs="hev1.1.L120"') ||
|
||||||
|
// canPlayType('...codecs="hvc1.1.0.L120"') || ...
|
||||||
|
//
|
||||||
|
// so a spurious block of tier 1:120 (all spellings map to it) removes hevc
|
||||||
|
// from every DirectPlayProfile and transcode every HEVC file in the library.
|
||||||
|
// 1:120 is NOT part of Jellyfin's level chain; it is only that gate.
|
||||||
var CODEC_PROBES = [
|
var CODEC_PROBES = [
|
||||||
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, mbps: 8, codec: 'hvc1.1.L120' },
|
{ key: '1:120', name: 'Main L4.0', w: 1920, h: 1080, fps: 30, mbps: 8, codec: 'hvc1.1.0.L120' },
|
||||||
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, mbps: 8, codec: 'hvc1.1.4.L123' },
|
{ key: '1:123', name: 'Main L4.1', w: 1920, h: 1080, fps: 60, mbps: 8, codec: 'hvc1.1.4.L123' },
|
||||||
{ key: '1:153', name: 'Main L5.1 (4K)', w: 3840, h: 2160, fps: 60, mbps: 20, codec: 'hvc1.1.5.L153.B0' },
|
{ key: '1:153', name: 'Main L5.1 (4K)', w: 3840, h: 2160, fps: 60, mbps: 20, codec: 'hvc1.1.5.L153.B0' },
|
||||||
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, mbps: 30, codec: 'hvc1.1.6.L183.B0' },
|
{ key: '1:183', name: 'Main L6.1 (8K)', w: 8192, h: 4096, fps: 60, mbps: 30, codec: 'hvc1.1.6.L183.B0' },
|
||||||
@@ -493,6 +508,22 @@
|
|||||||
var own = blockReason(v, keep);
|
var own = blockReason(v, keep);
|
||||||
if (!own) return null;
|
if (!own) return null;
|
||||||
var parts = key.split(':');
|
var parts = key.split(':');
|
||||||
|
|
||||||
|
// Base tier. 1:120 is not in Jellyfin's level chain -- it is only the
|
||||||
|
// coarse "does this client have HEVC at all" gate (supportsHevc() in
|
||||||
|
// browserDeviceProfile.js, which probes exactly this level). Blocking it
|
||||||
|
// drops hevc from every DirectPlayProfile, i.e. transcodes the entire
|
||||||
|
// HEVC library. Never act on it unless the device is unusable at EVERY
|
||||||
|
// Main tier, so one flaky/early probe cannot do that.
|
||||||
|
if (key === '1:120') {
|
||||||
|
var anyMainUsable = CODEC_PROBES.some(function (p) {
|
||||||
|
if (p.key === '1:120' || p.key.charAt(0) !== '1') return false;
|
||||||
|
var m = NS.caps.codec[p.key];
|
||||||
|
return !!m && !m.error && m.supported !== false && m.smooth !== false;
|
||||||
|
});
|
||||||
|
if (anyMainUsable) return null;
|
||||||
|
}
|
||||||
|
|
||||||
if (parts[0] === '2') {
|
if (parts[0] === '2') {
|
||||||
// Control: the same level in Main (8-bit).
|
// Control: the same level in Main (8-bit).
|
||||||
if (!tierUnusable('1:' + parts[1])) return null;
|
if (!tierUnusable('1:' + parts[1])) return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user