比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
3a5ead0ce0 | ||
|
|
90e512aabe | ||
|
|
c2c71f3dbc | ||
|
|
ccc34734e3 | ||
|
|
c9e4d3f330 | ||
|
|
ad9ee19bf8 | ||
|
|
bc9021271d | ||
|
|
046411ba8b | ||
|
|
b16a6326a4 | ||
|
|
01efcc8a29 | ||
|
|
b34ef54ad8 | ||
|
|
b82a386632 | ||
|
|
93c61899a4 | ||
|
|
27b3c24ac7 | ||
|
|
8615dc1c4f | ||
|
|
6add6f29e3 | ||
|
|
c03843dddb | ||
|
|
3642a1dba6 | ||
|
|
b3597bb4e4 | ||
|
|
5bf2a8428a |
没有与搜索条件相匹配的文件
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"title": "大鱼调色 1.19.1 公测版|修复默认预览卡顿,含 16 个独立模块",
|
||||
"content": "<!-- wp:paragraph -->\n<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。1.19.1(构建 110)公测版修复刚添加整合效果、尚未调节参数时预览严重卡顿的问题,保留 Apple Vision 跟踪和可关闭的后台自动诊断。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>本文主下载已更新为 1.19.1(构建 110)。同一个 PKG 已包含“大鱼调色”整合效果和全部 16 个独立模块效果,以及所需的完整主 App,无需另外下载安装独立模块。</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>官方原始安装包不加密,不限制安装数量。</strong> 安装和使用无需登录、激活码或机器码。原始 PKG 可以原样转发,请保持安装包完整。禁止二次加密或加上一机一码后分发。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.19.1 默认预览卡顿修复</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>修复整合效果在刚添加、未调整任何参数时明显拖慢预览的问题。默认状态不再执行无效的人脸检测和整帧人脸轮廓蒙版运算;已有参数、预设及模板继续兼容。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>在本机 Apple M4 的相同人像基准中,1080p 单帧平均渲染耗时由约 324 毫秒降至 5.2 毫秒,4K 由约 1249 毫秒降至 17 毫秒。这是插件渲染器耗时,不是 Final Cut Pro 的实际播放帧率;启用人脸肤色保护后的性能仍需继续优化。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>正式版本通过 994 项检查,并在 Final Cut Pro 12.4 中重新添加整合效果复测默认播放。安装包已签名、公证,包含整合效果、16 个独立模块和对应预览图。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">新增独立模块示意</h2>\n<!-- /wp:heading -->\n\n<!-- wp:image {\"id\":15879,\"sizeSlug\":\"full\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-full\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793978887-775df3c76d48009.png\" alt=\"Final Cut Pro 效果浏览器中的大鱼调色独立模块,包括基础调整、曲线、HSL、肤色保护与 CST 色彩空间转换\" class=\"wp-image-15879\" width=\"1364\" height=\"748\" /><figcaption class=\"wp-element-caption\">Final Cut Pro「效果 → 大鱼调色」中的独立模块示意</figcaption></figure>\n<!-- /wp:image -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.19.0 全 Apple Vision 跟踪</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>马赛克蒙版改用 Apple Vision 目标跟踪。</strong>先在“局部马赛克”菜单中勾选目标蒙版,再到控制面板逐个执行正向、反向或双向跟踪。转身时保留蒙版的宽高比例,减少框过度变窄。已有轨迹不会自动改变,需要重新跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>短时丢失后尝试重新找到目标。</strong>丢失时冻结最后确认的外观,根据之前运动做最多约 0.8 秒的暂时预测;连续两次确认目标后,再用丢失前后位置补齐中间轨迹。超过范围仍未确认则停止,末尾未确认预测不保存为正常关键帧,补齐的片段会提示复核。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>本版同时修复控制面板延后布局访问已释放视图时的插件服务闪退。正式安装后通过 979 项回归检查,Final Cut Pro 实片完成 285 帧跟踪,并核对转身前后实际马赛克遮挡。不同素材仍需自行播放检查。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>跟踪预览最多每秒刷新 15 次,只显示最新画面,减少面板刷新负担。普通调色蒙版和图章统一改用 Apple Vision 局部配准,保留位置、缩放和旋转;图章取样区和覆盖区分别跟踪。APP 已移除 OpenCV 跟踪依赖。新方案已用同一段转身素材与 CSRT、VitTrack 做本机比较,并覆盖人工短遮挡、长遮挡停止、突切停止和反向跟踪;单段测试不能保证所有素材都不偏移,长时间离开画面或相似人物交叉仍需分段修正。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.18.1 跟踪提速与界面刷新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>跟踪使用 Metal 生成紧凑灰度数据,减少 GPU 到 CPU 的回读;特征检测集中在目标范围,并复用相邻帧的光流计算数据。参数面板减少重复读取与图层列表刷新,让操作少做重复工作。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>同一段 4K 实拍素材的 285 帧测试中,纯追踪计算由约 8.78 秒降至 1.31 秒,轨迹与旧版逐帧一致。该测试不含宿主供图、解码、预览和渲染,不Line truncated
|
||||
"excerpt": "大鱼调色 1.19.1(110)修复刚添加整合效果时的默认预览卡顿。安装包完整包含整合效果、16 个独立模块和主 App,保留 Apple Vision 跟踪及可关闭的后台自动诊断。",
|
||||
"resource": {
|
||||
"cao_original_filename": "大鱼调色-1.19.1.pkg"
|
||||
},
|
||||
"seo": {
|
||||
"title": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.19.1 公测版|修复默认预览卡顿,含 16 个独立模块"
|
||||
},
|
||||
"description": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.19.1 修复添加整合效果后尚未调节参数就严重卡顿的问题,保留 Apple Vision 跟踪和后台自动诊断。官方 PKG 包含整合效果、16 个独立调色模块及完整主 App,已签名公证,无需激活。"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
# 大鱼调色 1.19.1(110)
|
||||
|
||||
修复整合版效果在刚添加、尚未调节参数时严重拖慢预览的问题。空 LUT 槽与零混合黑白设置不再触发人脸检测,未实际生效的肤色保护也不再执行整帧人脸轮廓蒙版。已有调色参数、默认开关、预设和模板保持兼容。
|
||||
|
||||
Apple M4 同一公开人像渲染基准:1080p 平均 324.37 → 5.23 ms,4K 平均 1248.90 → 16.99 ms;这是渲染器耗时,不是 FCP 显示帧率。默认状态的 14 次渲染中人脸检测从 14 次降为 0。实际启用人脸肤色保护时仍执行既有算法,其性能不在此次优化范围。
|
||||
|
||||
994 项正式安装原生检查通过。FCP 12.4 在独立验收项目中完成旧效果默认重播、新添加整合效果默认播放及正式加载核验。未量化宿主掉帧或完成全片导出/跟踪复测。
|
||||
|
||||
适用 Apple Silicon、macOS 14.6 或更高版本。安装前保存并退出 Final Cut Pro / Motion;安装后重新打开宿主。APP 与 PKG 均已 Developer ID 签名、公证 Accepted、票据及 Gatekeeper 验证通过,PKG 20 项展开检查通过。本机为正式 APP 独立安装验收,未重复运行本 PKG 的系统安装脚本。
|
||||
|
||||
实际编译源码:`3642a1dba6cbbc4423bd6928944e0e95d76d9cfa`。
|
||||
安装包:`大鱼调色-1.19.1.pkg`,44488264 字节。
|
||||
SHA-256:`7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647`。
|
||||
APP 公证:`c965f687-ab0b-442b-99e1-4b5013065f50`;PKG 公证:`5bf23d87-857d-48d9-856c-f6f05e97867b`。
|
||||
|
||||
附匹配正式二进制 UUID 的 dSYM 符号包,供诊断恢复。
|
||||
@@ -0,0 +1,16 @@
|
||||
# 大鱼调色 1.20.2(113)
|
||||
|
||||
- 蜘蛛盘内显示当前效果的矢量轨迹。色盘保留平滑的色相外圈,中心压暗,半透明轨迹、灰色节点和深色描边便于分辨。
|
||||
- 提亮蜘蛛网格线。蜘蛛盘与控制面板共用 Cb/Cr 色度坐标及肤色参考方向,两处指示线均朝左上。
|
||||
- 新添加的 Final Cut Pro 整合效果、独立模板和肤色工具默认关闭肤色保护。已有项目读取保存的开关状态。
|
||||
|
||||
Apple Silicon,macOS 14.6 或更高版本。安装前保存并退出 Final Cut Pro 和 Motion。APP 及安装包均完成 Developer ID 签名、公证和票据验证,正式安装版通过 1002 项原生检查,并在 Final Cut Pro 12.4 的同一帧实看片中核对网格和两条肤色线。
|
||||
|
||||
| 项目 | 内容 |
|
||||
| --- | --- |
|
||||
| 实际编译提交 | `046411ba8b2c2bf8549601b2e5a080fd9dccd31b` |
|
||||
| 安装包 | `大鱼调色-1.20.2.pkg` |
|
||||
| 字节数 | 44505420 |
|
||||
| SHA-256 | `8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4` |
|
||||
| APP 公证 | `e8c27c08-a78e-4be2-9adf-235e7bfad1f6` |
|
||||
| PKG 公证 | `1a6834df-840f-47da-9ee8-be6a0a808fee` |
|
||||
@@ -0,0 +1,16 @@
|
||||
# 大鱼调色 1.21.0(114)
|
||||
|
||||
- GPU 管线在工具首次使用时准备。未调整的独立效果可跳过通用调色和查找纹理,中性画面保留透明度、负值和超白。
|
||||
- 无蒙版的 CST 合并两次全帧处理。示波器取样与最终输出共用 GPU 提交,保留暂停帧缓存。
|
||||
- 检查器减少重复读参和布局更新,连续修改参数时减少宿主往返。
|
||||
|
||||
Apple Silicon,macOS 14.6 或更高版本。安装前保存并退出 Final Cut Pro 和 Motion。正式安装版通过 1050 项原生检查,包含 21 组独立 CST 对照。Final Cut Pro 12.4 实测播放、混合滑杆、复位和四种示波器。
|
||||
|
||||
| 项目 | 内容 |
|
||||
| --- | --- |
|
||||
| 实际编译提交 | `90e512aabe72fff30046b4bf18d6a35f91c0c113` |
|
||||
| 安装包 | `大鱼调色-1.21.0.pkg` |
|
||||
| 字节数 | 44508770 |
|
||||
| SHA-256 | `ec1a57f23bf369d7a7841848d71d8ab78a7c229cbb5abe1c502e9964f87dbbcb` |
|
||||
| APP 公证 | `505ed5a4-7b32-49a2-8eef-70c7757a98b4` |
|
||||
| PKG 公证 | `29d5f921-6cd4-48a4-856a-2632f9a85e2b` |
|
||||
二进制文件未显示。
|
之后 宽度: | 高度: | 大小: 376 KiB |
+31
-1
@@ -1,8 +1,38 @@
|
||||
# 2026-11-08 蜘蛛盘矢量示波器 1.20.2(113)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译提交 `046411ba8b2c2bf8549601b2e5a080fd9dccd31b`,发行标签 `v1.20.2-spider-scope-20261108` 指向 `bc9021271d5e4992a6a63011e4ff197812029ab3`。独立远端克隆分别核对 798 与 802 个跟踪文件,Git 完整性通过,无 LFS 指针或子模块,发行标签与编译节点的构建输入一致。[恢复记录](verification/Recovery1.20.2.json)
|
||||
|
||||
恢复 Git 登录后克隆仓库,用 `git switch --detach <完整编译提交>` 还原工程。Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+ 与锁定的 ColorManagement 依赖。使用 `tools/deliver.py` 构建、签名、公证及正式安装,完成 FCP 验收后输入 complete。主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队 B3W25FX5H5,唯一正式安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。证书、私钥与公证凭据独立恢复。
|
||||
|
||||
APP 公证 `e8c27c08-a78e-4be2-9adf-235e7bfad1f6` Accepted,1002 项正式安装检查通过,FCP 12.4 已在同一实片帧核对网格提亮及两处肤色线方向。安装包用 `Packaging/build_pkg.py` 从已验证的正式 APP 生成,公证 `1a6834df-840f-47da-9ee8-be6a0a808fee` Accepted,20 项展开验包、192 条载荷权限及票据通过。本机正式 APP 独立安装,验收未再次执行 PKG 安装脚本。[正式安装](verification/Delivery1.20.2.json) · [FCP 实看](verification/HostSpiderScope1.20.2.json) · [验包](verification/Package1.20.2.json)
|
||||
|
||||
Release **413** 保存安装包附件 **59**,大小 44505420 字节,SHA-256 `8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4`。草稿附件及发布后附件均完整下载验证。[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.20.2-spider-scope-20261108) · [安装包下载](https://dayu.media/git/dayu/dayu-color/releases/download/v1.20.2-spider-scope-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.20.2.pkg) · [发行记录](verification/Release1.20.2.json) · [开发交接](开发交接.md)
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-06 默认整合效果预览修复 1.19.1(110)
|
||||
|
||||
编译节点 `3642a1dba6cbbc4423bd6928944e0e95d76d9cfa` 已保存于 `https://dayu.media/git/dayu/dayu-color.git` 的 main。独立 HTTPS 克隆、分离检出与 778 个跟踪文件逐字节核对及 Git 完整性通过;无 LFS/子模块,未重复第三方冷构建。使用原 Xcode 27.1、FxPlug SDK 4.3.5、Release 和已有 ColorManagement 锁定依赖;`tools/deliver.py` 负责固定路径交付。签名、公证凭据不在仓库。
|
||||
|
||||
正式 APP 1.19.1(110)公证 `c965f687-ab0b-442b-99e1-4b5013065f50` Accepted,994 项正式原生检查与本轮 FCP 默认预览复测通过。主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队 B3W25FX5H5,唯一正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。新机器恢复 Git 登录后克隆并 `git switch --detach <完整提交>`,证书私钥与公证 profile 需单独恢复。
|
||||
|
||||
发行标签 `v1.19.1-idle-preview-20261106` 指向 `6add6f29e357d37e94a8430d6963ec7f91993537`,独立远端检出核对全部 786 个跟踪文件与 Git 完整性通过。`Packaging/build_pkg.py` 复用 PKG 工坊打包已验证的正式 APP,PKG 公证 `5bf23d87-857d-48d9-856c-f6f05e97867b` Accepted,20 项展开检查、192 条载荷权限检查、票据和 Gatekeeper 通过;未重复执行系统安装脚本。
|
||||
|
||||
Release **404** 保存 PKG **51** 与 dSYM **52**,草稿及发布后均完整下载核验。安装包 44,488,264 字节,SHA-256 `7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647`;符号 3,475,056 字节,SHA-256 `c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a`。符号化前核对正式二进制 UUID,见 [符号记录](verification/Symbols1.19.1.json)。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.1-idle-preview-20261106) · [附件地址与核验](verification/Release1.19.1.json)。
|
||||
|
||||
本轮下载副本、恢复 clone、基准可执行文件、构建 APP 和打包暂存已清理。原始宿主采样保留在本机缓存,未上传。后续按用户要求,文章 15792 已更新至 1.19.1/110,网站主下载与 Release 包完整哈希一致,16 个独立模块及整合效果已再次展开核对;公开正文更新保存在 [文章更新内容](Packaging/article-1.19.1.json),完整后台回读仅留本机缓存,不包含在远程恢复承诺中。主 APP beta 通道仍为上次核对的 1.19.0/109,本次未改。见 [文章核验](verification/Article1.19.1.json)、[包内模块](verification/PackageModules1.19.1.json)。性能修正和宿主覆盖范围见 [开发交接](开发交接.md)、[安装记录](verification/Delivery1.19.1.json)、[恢复记录](verification/Recovery1.19.1.json)、[清理记录](verification/Cleanup1.19.1.json)。
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-06 全 Apple 跟踪 1.19.0(109)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,main。实际编译 `867bcfbad3f566ced2170925e8eadd9414cc3b75`,独立远端检出 766 个文件逐字节一致,Git 完整性通过,无 LFS/子模块。Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release;正式构建使用系统 Vision,不再编译或链接 OpenCV,历史源码包仅用于研究复测。证书私钥、公证 profile 和 Git 凭据需独立恢复。
|
||||
|
||||
固定安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队 B3W25FX5H5。`tools/deliver.py` 负责正式构建/公证/安装,宿主验收后输入 complete;`Packaging/build_pkg.py` 负责正式 PKG。APP 公证 `b83655db-23a9-4312-91e4-bfd697143e44` Accepted,979 项正式安装回归和 FCP 实片检查通过。发行包与标签状态稍后补记。
|
||||
固定安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队 B3W25FX5H5。`tools/deliver.py` 负责正式构建/公证/安装,宿主验收后输入 complete;`Packaging/build_pkg.py` 负责正式 PKG。APP 公证 `b83655db-23a9-4312-91e4-bfd697143e44` Accepted,979 项正式安装回归和 FCP 实片检查通过。发行标签 `v1.19.0-vision-tracking-20261106` 指向 `a0178f994d71c19e95c70e23f9b056947b063b1c`,独立检出 771 个文件逐字节一致。PKG 公证 `99abefcb-c1cb-4aff-8b85-8109eab00df9` Accepted,20 项验包、192 条权限核对通过;未重复执行系统安装脚本。
|
||||
|
||||
Release 403 保存 PKG 49 与符号 50,草稿和正式完整下载均通过。安装包 44,486,766 字节,SHA-256 `0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745`;符号 3,472,206 字节,SHA-256 `401cb46a38838a5605b7a1cb6eb3cd5ee03a649a80c7cf6655741a57ec0deb31`。恢复 dSYM 后核对 UUID 再符号化;候选 108 的不同 UUID 已单独保留诊断记录,不能用 109 符号替代。
|
||||
|
||||
[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.0-vision-tracking-20261106) · [发行报告](verification/Release1.19.0.json)。文章 15792 与 beta 通道均为 109,完整包下载票据通过;NAS 清单备份 `beta-202611062006.jsonbak`。本轮恢复 clone、下载副本、算法比较环境与旧 APP 生成备份已清理,原素材与 QA 库保留。
|
||||
|
||||
[恢复核验](verification/Recovery1.19.0.json) · [符号 UUID](verification/Symbols1.19.0.json) · [宿主范围](verification/HostVisionTracking1.19.0.json) · [交接](开发交接.md)。以下保留历史。
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
# 默认整合效果预览卡顿:1.19.1
|
||||
|
||||
2026-11-06,Mac mini M4。用户反馈仅添加整合版效果、未调整参数,预览即严重卡顿。本机正式 1.19.0(109)复现并采样;独立 QA 副本“1.19.1 默认预览性能验收”保留,原验收项目未修改。
|
||||
|
||||
## 根因
|
||||
|
||||
`DYFaceRender.inc.h` 在决定是否运行 Vision 前没有消除空 LUT 槽的默认强度,也没有处理默认开着眼睛但混合为零的黑白模块。因此 `bypassIdleSkin` 错把未调色的画面当作需要肤色保护,逐帧检测人脸关键点。随后 `renderLegacy` 实际已判断肤色处理为空,但仍因 `skinFaceOnly` 默认值与检测得到的轮廓条目选用 `dyMaskedFragment`,逐像素执行人脸多边形与特征孔洞计算。画面中出现人脸时,GPU 开销尤其突出。
|
||||
|
||||
现场四秒采样中,渲染线程 1783 个样本停在 `renderLegacy → MTLCommandBuffer waitUntilCompleted`;另有 `prepareFaceSupport → Vision`。原始采样只留本机缓存,不上传用户素材路径。
|
||||
|
||||
## 修正
|
||||
|
||||
在渲染参数的临时副本上,按实际输入/风格 LUT、删除模块、黑白混合与中性调色状态判断人脸分析需求。默认空槽不再触发 Vision;强度为零的新增肤色层也不触发。真正启用的调色、肤色选区预览与有效独立肤色层继续使用人脸检测。
|
||||
|
||||
`renderLegacy` 的人脸蒙版标志同时要求肤色处理实际有效。保持全部宿主参数、默认值、模板、效果 UUID、色彩算法和用户预设不变。
|
||||
|
||||
## 可复现验证
|
||||
|
||||
`tools/benchmark_default_preview.py` 连接已有 Release 对象为无界面 CLI,只读正式安装资源,不注册或启动 GUI 插件。以已有公开 NASA 人像制作 1080p/4K 输入,每帧改变亮度避免静帧缓存掩盖开销;每组预热两帧并测十二帧。包括真实渲染及 GPU 完成等待,排除输入上传、宿主解码、UI、最终示波器捕获与播放调度,因此不能直接宣称 FCP 实际 FPS。
|
||||
|
||||
修复前默认人像平均:1080p 324.37 ms,4K 1248.90 ms。相同输入关闭人脸限定对照:5.73 ms/18.39 ms。无脸渐变的旧版默认仅 13.62 ms/32.72 ms,说明仅测无脸色块会漏掉严重退化。修复后同一人像默认平均为 5.23 ms/16.99 ms,分别约 62.0 倍/73.5 倍;每组 14 次默认渲染的人脸分析调用从 14 降至 0。994 项原生检查全通过。完整数值及修复后结果见 `verification/IdlePreview1.19.1.json`。
|
||||
|
||||
原生回归新增默认不检测人脸、不建多边形管线、画面与关闭人脸限定对照一致、有效调色/黑白/选区预览仍检测人脸、关闭 LUT 与空独立肤色层不触发检测。既有人脸范围、特征排除、上下原点、蒙版、独立层、马赛克及色彩检查继续执行。
|
||||
|
||||
## 覆盖边界
|
||||
|
||||
本次修复默认和无效参数状态的额外工作。真正需要人脸肤色保护的活跃调色仍执行原有逐帧检测及轮廓算法,其性能需要另行优化;本轮不以跳过有效保护换取速度。不改变逐帧人脸马赛克或已保存的跟踪轨迹。
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -1294,7 +1294,8 @@
|
||||
"title": "显示肤色保护区域"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"default": 0,
|
||||
"hostDefault": 1,
|
||||
"key": "skinEnabled",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
@@ -3718,10 +3719,10 @@
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "1f435e32ee8b6f74fbc6c588f3564cc794ce100d1aae821075c115b33bb24412",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "0d2527b18589f63d63d16fd64c47a70c5973994fb3841a3246631c7e836ea8e8",
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
|
||||
"大鱼调色/Plugin/DYModel.mm": "327eb427759eaac8d04de39c09c416c0c68e7cac636978c864bdd103d297aec7",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "96eff1bd54be127e527595da7cbf38e58f4dfd4a16c9491d8630f7b1d1045c84",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "a0bf1a613e280a56ade97303e87f376878e459debd68f72adc0895d6bf67ad61",
|
||||
"大鱼调色/Plugin/DYToolState.h": "da71b283a5a0cc05ad8b1e554a105d0196f3283c4e31f0c5521204d74100b882",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "c36d2e91353f2b179be5a9df8c248ce34dbfb7e73cba913754f9d1675f2a3375",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"nativeReference": {
|
||||
@@ -18,7 +18,7 @@
|
||||
},
|
||||
"staticContract": {
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
@@ -55,7 +55,7 @@
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -308,7 +308,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
// Headless renderer benchmark. Link against the reviewed Release objects; never
|
||||
// registers a plug-in, opens a host, or reads user media. Resources are read-only.
|
||||
#import "../大鱼调色/Plugin/DYRenderer.h"
|
||||
#import "../大鱼调色/Plugin/DYModel.h"
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
@interface DYDiagnosticTile : FxImageTile
|
||||
- (instancetype)initWithDevice:(id<MTLDevice>)device width:(NSUInteger)width height:(NSUInteger)height;
|
||||
@end
|
||||
@interface DYRenderer (PerformanceProbe)
|
||||
- (void)prepareFaceSupport:(FxImageTile*)source;
|
||||
@end
|
||||
static NSUInteger faceCalls=0;
|
||||
@interface DYPreviewBenchmarkRenderer : DYRenderer
|
||||
@end
|
||||
@implementation DYPreviewBenchmarkRenderer
|
||||
- (void)prepareFaceSupport:(FxImageTile*)source {faceCalls++;[super prepareFaceSupport:source];}
|
||||
@end
|
||||
int main(int argc,const char*argv[]){@autoreleasepool{
|
||||
id<MTLDevice> gpu=MTLCreateSystemDefaultDevice();NSMutableArray *rows=[NSMutableArray array];
|
||||
NSBitmapImageRep *portrait=(NSBitmapImageRep*)[NSBitmapImageRep imageRepWithContentsOfFile:@"tools/fixtures/astronaut.png"];
|
||||
if(portrait.pixelsWide!=512||portrait.pixelsHigh!=512){fputs("Missing 512x512 public portrait fixture\n",stderr);return 1;}
|
||||
std::vector<__fp16> face(512*512*3);for(int y=0;y<512;y++)for(int x=0;x<512;x++){NSColor*c=[[portrait colorAtX:x y:y]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];float rgb[]={(float)c.redComponent,(float)c.greenComponent,(float)c.blueComponent};for(int k=0;k<3;k++){float v=rgb[k];face[(y*512+x)*3+k]=(__fp16)(v<=.04045?v/12.92:pow((v+.055)/1.055,2.4));}}
|
||||
for(int width:{1920,3840}){@autoreleasepool{
|
||||
int height=width*9/16;DYDiagnosticTile *src=[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height],*dst=[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height];
|
||||
std::vector<__fp16> pixels(width*height*4);for(int y=0;y<height;y++)for(int x=0;x<width;x++){int p=(y*width+x)*4;pixels[p]=(__fp16)(.03+.8*x/width);pixels[p+1]=(__fp16)(.03+.6*y/height);pixels[p+2]=.2;pixels[p+3]=1;}
|
||||
for(int y=0;y<height;y++)for(int x=(width-height)/2;x<(width+height)/2;x++)for(int c=0;c<3;c++)pixels[(y*width+x)*4+c]=face[((y*512/height)*512+(x-(width-height)/2)*512/height)*3+c];
|
||||
const auto reference=pixels;
|
||||
id<MTLTexture> input=[src metalTextureForDevice:gpu];[input replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:width*8];
|
||||
for(int mode=0;mode<3;mode++){@autoreleasepool{
|
||||
DYRenderer *renderer=[DYPreviewBenchmarkRenderer new];DYUniforms u;DYDefaultUniforms(&u);if(mode==1)u.skinFaceOnly=0;if(mode==2){u.skinProtection.x=0;u.skinFaceOnly=0;}
|
||||
std::vector<double> milliseconds;NSUInteger before=faceCalls;NSError *error=nil;BOOL ok=YES;
|
||||
for(int i=0;i<14;i++){@autoreleasepool{
|
||||
// A different real input each frame prevents the face raster cache from
|
||||
// disguising unnecessary inference as a still-frame-only workload.
|
||||
for(size_t p=0;p<pixels.size();p++)pixels[p]=p%4==3?reference[p]:(__fp16)(reference[p]*(.92+i*.01));[input replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:width*8];
|
||||
double start=CACurrentMediaTime();ok=[renderer renderSource:src destination:dst uniforms:u paths:@{} spider:nil tools:nil colorManagement:nil hostPrimaries:-1 error:&error];
|
||||
if(!ok){fprintf(stderr,"%s\n",error.description.UTF8String);return 1;}if(i>=2)milliseconds.push_back((CACurrentMediaTime()-start)*1000);
|
||||
}}
|
||||
std::sort(milliseconds.begin(),milliseconds.end());double sum=0;for(double v:milliseconds)sum+=v;
|
||||
[rows addObject:@{@"width":@(width),@"height":@(height),@"mode":@[@"default",@"faceOnlyOff",@"skinOff"][mode],@"frames":@(milliseconds.size()),@"meanMs":@(sum/milliseconds.size()),@"medianMs":@(milliseconds[milliseconds.size()/2]),@"maxMs":@(milliseconds.back()),@"faceCalls":@(faceCalls-before)}];[renderer release];
|
||||
}}[src release];[dst release];
|
||||
}}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:@{@"gpu":gpu.name,@"cases":rows} options:NSJSONWritingPrettyPrinted error:nil];fwrite(json.bytes,1,json.length,stdout);puts("");[gpu release];return 0;
|
||||
}}
|
||||
@@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Link a headless benchmark against existing Release objects and run it."""
|
||||
from pathlib import Path
|
||||
import argparse, plistlib, subprocess
|
||||
p=argparse.ArgumentParser();p.add_argument('--output',type=Path,required=True);a=p.parse_args()
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
cache=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color')
|
||||
objects=cache/'DerivedData/Build/Intermediates.noindex/大鱼调色.build/Release/XPC Service.build/Objects-normal/arm64'
|
||||
work=cache/'performance-1.19.1/benchmark.bundle/Contents';(work/'MacOS').mkdir(parents=True,exist_ok=True)
|
||||
resources=Path('/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/Resources')
|
||||
if not (work/'Resources').exists():(work/'Resources').symlink_to(resources)
|
||||
(work/'Info.plist').write_bytes(plistlib.dumps({'CFBundleExecutable':'benchmark','CFBundleIdentifier':'com.dayu.color.headless-benchmark','CFBundlePackageType':'BNDL'}))
|
||||
cmd=['xcrun','clang++','-std=c++17','-O2','-mmacosx-version-min=14.6','-fno-objc-arc','-F/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks','-F/Library/Developer/Frameworks',str(root/'tools/benchmark_default_preview.mm')]
|
||||
cmd += [str(x) for x in objects.glob('*.o') if x.name!='main.o' and not x.name.endswith('_lto.o')]
|
||||
cmd += ['@'+str(cache/'cms-runtime/bridge-link.rsp')]
|
||||
for f in ['Metal','MetalPerformanceShaders','Vision','QuartzCore','Accelerate','PluginManager','Foundation','AppKit','FxPlug','Security','CoreVideo','IOSurface','CoreMedia','CoreImage','CoreGraphics','ImageIO','UniformTypeIdentifiers','AVFoundation']:cmd+=['-framework',f]
|
||||
cmd+=['-lcompression','-lz','-Wl,-rpath,/Library/Developer/Frameworks','-o',str(work/'MacOS/benchmark')]
|
||||
subprocess.run(cmd,check=True,cwd=root)
|
||||
with a.output.open('w') as out:subprocess.run([str(work/'MacOS/benchmark')],stdout=out,check=True,cwd=root)
|
||||
print(a.output)
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"version": "1.19.0",
|
||||
"build": 109,
|
||||
"articleID": 15792,
|
||||
"url": "https://dayu.media/15792/",
|
||||
"title": "大鱼调色 1.19.0 公测版|全 Apple Vision 跟踪与后台自动诊断",
|
||||
"fieldsMatch": true,
|
||||
"preservedFields": [
|
||||
"author",
|
||||
"categories",
|
||||
"tags",
|
||||
"featured_media",
|
||||
"status",
|
||||
"price",
|
||||
"membership",
|
||||
"covers",
|
||||
"video",
|
||||
"legacyImages",
|
||||
"fcpx.enabled"
|
||||
],
|
||||
"resourceChangedKeys": [
|
||||
"cao_downurl",
|
||||
"cao_original_filename"
|
||||
],
|
||||
"originalFilename": "大鱼调色-1.19.0.pkg",
|
||||
"fullPackageDownloadVerified": true,
|
||||
"bytes": 44486766,
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"downloadStaplerValid": true,
|
||||
"frontendTitleAndSingleDescription": true,
|
||||
"paidResourceURLNotInPublicHTML": true,
|
||||
"checkedAt": "2026-11-06T20:07:20.159595+08:00"
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"articleID": 15792,
|
||||
"url": "https://dayu.media/15792/",
|
||||
"title": "大鱼调色 1.19.1 公测版|修复默认预览卡顿,含 16 个独立模块",
|
||||
"fieldsMatch": true,
|
||||
"preservedFields": [
|
||||
"author",
|
||||
"categories",
|
||||
"tags",
|
||||
"featured_media",
|
||||
"status",
|
||||
"price",
|
||||
"membership",
|
||||
"covers",
|
||||
"video",
|
||||
"legacyImages",
|
||||
"fcpx.enabled",
|
||||
"seo.keywords"
|
||||
],
|
||||
"resourceChangedKeys": [
|
||||
"cao_downurl",
|
||||
"cao_original_filename"
|
||||
],
|
||||
"originalFilename": "大鱼调色-1.19.1.pkg",
|
||||
"fullPackageDownloadVerified": true,
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"downloadStaplerValid": true,
|
||||
"downloadSignatureAndGatekeeperPassed": true,
|
||||
"frontend": [
|
||||
{
|
||||
"request": "normal",
|
||||
"status": 200,
|
||||
"titleMatch": true,
|
||||
"descriptionSingleAndExact": true,
|
||||
"keywordsSingleAndExact": true,
|
||||
"all16ModulesPresent": true,
|
||||
"previousImagesPresent": true,
|
||||
"mainPackageURLNotExposed": true,
|
||||
"codeBlockPresent": true
|
||||
},
|
||||
{
|
||||
"request": "fresh",
|
||||
"status": 200,
|
||||
"titleMatch": true,
|
||||
"descriptionSingleAndExact": true,
|
||||
"keywordsSingleAndExact": true,
|
||||
"all16ModulesPresent": true,
|
||||
"previousImagesPresent": true,
|
||||
"mainPackageURLNotExposed": true,
|
||||
"codeBlockPresent": true
|
||||
}
|
||||
],
|
||||
"independentModuleCount": 16,
|
||||
"integratedEffectCount": 1,
|
||||
"moduleAudit": "verification/PackageModules1.19.1.json",
|
||||
"idempotencyKey": "dayu-color-1191-article-20261106",
|
||||
"appUpdateChannelChanged": false,
|
||||
"backendSourceModified": false,
|
||||
"checkedAt": "2026-11-06T23:16:27.598281+08:00"
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"articleID": 15792,
|
||||
"url": "https://dayu.media/15792/",
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"mediaID": 15879,
|
||||
"mediaURL": "https://dayu.media/wp-content/uploads/2026/11/1793978887-775df3c76d48009.png",
|
||||
"originalImage": "Publishing/1.19.1/independent-modules.png",
|
||||
"width": 1364,
|
||||
"height": 748,
|
||||
"bytes": 384718,
|
||||
"sha256": "f5b6f7f112273095358901ea47b538868c96793f94c5394d960e8102f7f85114",
|
||||
"position": "After 1.19.1 update section and before 1.19.0 history",
|
||||
"heading": "新增独立模块示意",
|
||||
"caption": "Final Cut Pro「效果 → 大鱼调色」中的独立模块示意",
|
||||
"originalUploadedUnchanged": true,
|
||||
"downloadHashVerified": true,
|
||||
"frontendImageCount": 1,
|
||||
"browserVisualVerified": true,
|
||||
"readbackMatches": true,
|
||||
"preservedFields": [
|
||||
"title",
|
||||
"excerpt",
|
||||
"status",
|
||||
"author",
|
||||
"categories",
|
||||
"tags",
|
||||
"featured_media",
|
||||
"resource",
|
||||
"seo",
|
||||
"url",
|
||||
"fcpx configuration",
|
||||
"existing body images"
|
||||
],
|
||||
"idempotencyKey": "dayu-color-1191-modules-image-20261106",
|
||||
"checkedAt": "2026-11-06T23:30:57.947485+08:00",
|
||||
"screenshot": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-independent-modules-published.jpg"
|
||||
}
|
||||
@@ -1,33 +1,22 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-1-106.pkg",
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-19-0-109.pkg",
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"backup": null,
|
||||
"size": 46654687,
|
||||
"size": 44486766,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "93c8d1d4752a5271910b691df3fee4417432ecbe9da11e45c71c09d2c811fa4c",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611061819.jsonbak",
|
||||
"size": 719
|
||||
"sha256": "4af4d18f6ecbe3c7444135e026a5e09b4520ae3728c798c667206ce871e9dc8e",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611062006.jsonbak",
|
||||
"size": 845
|
||||
},
|
||||
"version": "1.18.1",
|
||||
"build": 106,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-18-1-106.pkg",
|
||||
"timestamp": "202611061819",
|
||||
"liveChecks": [
|
||||
{
|
||||
"currentBuild": 105,
|
||||
"updateAvailable": true
|
||||
},
|
||||
{
|
||||
"currentBuild": 106,
|
||||
"updateAvailable": false
|
||||
}
|
||||
],
|
||||
"downloadVerification": {
|
||||
"http": 200,
|
||||
"bytes": 46654687,
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"downloadedTicketValidated": true,
|
||||
"byteIdenticalToOfficialPKG": true
|
||||
}
|
||||
"version": "1.19.0",
|
||||
"build": 109,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-19-0-109.pkg",
|
||||
"timestamp": "202611062006",
|
||||
"endpointVerified": {
|
||||
"from106": true,
|
||||
"from109": false
|
||||
},
|
||||
"fullDownloadVerified": true,
|
||||
"downloadStaplerValid": true
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-19-0-109.pkg",
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"backup": null,
|
||||
"size": 44486766,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "4af4d18f6ecbe3c7444135e026a5e09b4520ae3728c798c667206ce871e9dc8e",
|
||||
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611062006.jsonbak",
|
||||
"size": 845
|
||||
},
|
||||
"version": "1.19.0",
|
||||
"build": 109,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-19-0-109.pkg",
|
||||
"timestamp": "202611062006",
|
||||
"endpointVerified": {
|
||||
"from106": true,
|
||||
"from109": false
|
||||
},
|
||||
"fullDownloadVerified": true,
|
||||
"downloadStaplerValid": true
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
{
|
||||
"status": "draft-download-required",
|
||||
"resolvedStatus": "published-and-both-assets-download-verified",
|
||||
"finalRecord": "verification/Release1.18.1.json",
|
||||
"releaseID": 402,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.1-tracking-ui-20261106",
|
||||
"tag": "v1.18.1-tracking-ui-20261106",
|
||||
"commit": "5fe4b1933e015a906fab36b65dcbc45a0d6bee49",
|
||||
"assetID": 47,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.18.1-tracking-ui-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.18.1.pkg",
|
||||
"bytes": 46654687,
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2"
|
||||
"status": "draft-verified-and-published",
|
||||
"releaseID": 403,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.0-vision-tracking-20261106",
|
||||
"tag": "v1.19.0-vision-tracking-20261106",
|
||||
"commit": "a0178f994d71c19e95c70e23f9b056947b063b1c",
|
||||
"assetID": 49,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.0-vision-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.0.pkg",
|
||||
"bytes": 44486766,
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"publishedReport": "verification/Release1.19.0.json"
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
"version": "1.19.0",
|
||||
"build": 109,
|
||||
"checkedAt": "2026-11-06T20:08:00.786843+08:00",
|
||||
"removed": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-1430a23853ba4af19998a456211e8479.app",
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-3a5da074e12c4e069b2dfb7257319220.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/tracker-bench-env",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/probe-registration.mm",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-vit-occlusion.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-object-reverse.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/probe-registration",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/tracking-candidates-contact.png",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/tracker-bench-pip.log",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-vision-occlusion.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-object-cut.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-contact.png",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-cut.raw",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/vittrack.onnx",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/candidate108-symbols.zip",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-occlusion-bgra.raw",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-object-long.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-vit.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/vision-regions.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/benchmark-object",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/candidate107-symbols.zip",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-reverse.raw",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/download-109-beta.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-csrt-occlusion.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/update-vision-records.py",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-csrt.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/benchmark-vision",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.19.0",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-object.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-object-occlusion.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-640-bgra.raw",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-long-occlusion.raw",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/turn-vision-accurate.json",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/download-109-article.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verify-vision-regions",
|
||||
"/Users/mac/Downloads/大鱼调色-1.19.0.pkg",
|
||||
"/Users/mac/Downloads/大鱼调色-1.19.0-symbols.zip"
|
||||
],
|
||||
"remainingGeneratedAppsInProductCache": [],
|
||||
"remainingGeneratedAppsInRepository": [],
|
||||
"preserved": [
|
||||
"formal installation",
|
||||
"current PKG and matching symbols",
|
||||
"historical release packages",
|
||||
"QA library and user original media",
|
||||
"sanitized verification reports",
|
||||
"private article before/after snapshots"
|
||||
],
|
||||
"scope": "Current product/task generated artifacts only; not an entire-disk uniqueness claim"
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"checkedAt": "2026-11-06T20:59:57.930526+08:00",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.19.1",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/performance-1.19.1/benchmark.bundle",
|
||||
"/Volumes/备份/大鱼调色-1.19.1.pkg",
|
||||
"/Volumes/备份/大鱼调色-1.19.1-symbols.zip"
|
||||
],
|
||||
"remainingGeneratedAppsInProductCache": [],
|
||||
"remainingGeneratedAppsInRepository": [],
|
||||
"deliveryWorkflowCleanup": "Formal delivery completed: build APP, submission ZIP and previous replacement APP removed after host verification; packaging staging removed by PKG Forge.",
|
||||
"preserved": [
|
||||
"formal installation",
|
||||
"current PKG and matching symbols",
|
||||
"historical release packages",
|
||||
"QA library and original media",
|
||||
"local raw host samples and benchmark JSON/logs",
|
||||
"source and locked dependencies"
|
||||
],
|
||||
"scope": "Only verified artifacts created by this task; no entire-disk uniqueness claim",
|
||||
"articleUpdateCleanup": {
|
||||
"checkedAt": "2026-11-06T23:17:33.640601+08:00",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-1.19.1-package-audit",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-1.19.1-download.pkg"
|
||||
],
|
||||
"preserved": [
|
||||
"original signed PKG and symbols",
|
||||
"private article before/after snapshots in local cache",
|
||||
"published article payload and sanitized verification in Git"
|
||||
],
|
||||
"installationExecuted": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"version": "1.20.2",
|
||||
"build": 113,
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"formalPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.2.pkg",
|
||||
"registeredPaths": [
|
||||
" com.dayu.color.XPC(1.1)\t35786B49-0554-4495-8E95-47C2CE9ADB64\t2026-11-08 07:38:01 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"removedVerifiedTaskCopies": [
|
||||
"/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.0.pkg",
|
||||
"/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.1.pkg",
|
||||
"/Volumes/备份/大鱼调色-1.20.2.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/spider-scope-1.20.0/1.20.0 蜘蛛盘验收.fcpxml"
|
||||
],
|
||||
"buildAppRemoved": true,
|
||||
"notaryZipRemoved": true,
|
||||
"temporaryRecoveryClonesRemoved": true,
|
||||
"scope": "仅本轮生成的产物和本产品正式路径"
|
||||
}
|
||||
+23
-29
@@ -2,74 +2,68 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.19.0",
|
||||
"build": "109",
|
||||
"version": "1.20.2",
|
||||
"build": "113",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "b83655db-23a9-4312-91e4-bfd697143e44",
|
||||
"notaryID": "e8c27c08-a78e-4be2-9adf-235e7bfad1f6",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "867bcfbad3f566ced2170925e8eadd9414cc3b75",
|
||||
"sourceCommit": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": {
|
||||
"report": "verification/HostVisionTracking1.19.0.json",
|
||||
"pass": true,
|
||||
"hostPID": 97776,
|
||||
"pluginPID": 97806,
|
||||
"workerMainThread": false
|
||||
}
|
||||
"hostVerification": "verification/HostSpiderScope1.20.2.json"
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.19.1",
|
||||
"build": "110",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "c965f687-ab0b-442b-99e1-4b5013065f50",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostIdlePreview1.19.1.json"
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.20.0",
|
||||
"build": "111",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "942c85a5-1365-4c08-a932-7a6efd4cbe43",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "01efcc8a2998c78a193a9b8b2e5c4bf81b6a0345",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostSpiderScope1.20.0.json"
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.20.1",
|
||||
"build": "112",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "bf9de2fb-f997-4acf-8ad4-59ec06031a39",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "b16a6326a4f0da0faad9e1c57345e3805f558b6c",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostSpiderScope1.20.1.json"
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.20.2",
|
||||
"build": "113",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "e8c27c08-a78e-4be2-9adf-235e7bfad1f6",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostSpiderScope1.20.2.json"
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.21.0",
|
||||
"build": "114",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "505ed5a4-7b32-49a2-8eef-70c7757a98b4",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "90e512aabe72fff30046b4bf18d6a35f91c0c113",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "336e24998cd785ea976fbe4da11da3e8c76854373cdc9f57200f2dcb42a1f3ff",
|
||||
"hostVerification": "verification/HostFluidity1.21.0.json",
|
||||
"installedNativeChecks": 1050
|
||||
}
|
||||
@@ -0,0 +1,297 @@
|
||||
{
|
||||
"version": "1.21.0",
|
||||
"build": 114,
|
||||
"compiledSource": "90e512aabe72fff30046b4bf18d6a35f91c0c113",
|
||||
"baselineVersion": "1.20.2",
|
||||
"baselineBuild": 113,
|
||||
"baselineSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"gpu": "Apple M4",
|
||||
"method": "Headless Release renderer and IOSurface textures. Baseline renderer rebuilt from the unchanged 1.20.2 renderer source with its installed metallib. Candidate linked from the final build objects; metallib byte-matched to the installed build. 22 changing synthetic RGBA16Float frames per case, with partial and zero alpha, extended highlights and negative RGB. Source upload and host state preparation excluded. Measured renderer wall time includes final scope readback with the panel closed. Skipped 6 frames and recorded the middle of the remaining 16. Alternated test order. HSL source uses a bottom-left origin and other cases use top-left.",
|
||||
"modes": {
|
||||
"integrated": "Untouched integrated settings including default Sony CST",
|
||||
"neutralHSL": "Untouched standalone HSL",
|
||||
"activeBasic": "Integrated settings with +0.25 basic exposure"
|
||||
},
|
||||
"measurements": [
|
||||
{
|
||||
"build": 113,
|
||||
"pair": "a",
|
||||
"cases": [
|
||||
{
|
||||
"maxMs": 12.938208335981471,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 77.44212499892456,
|
||||
"width": 1920,
|
||||
"mode": "integrated",
|
||||
"medianMs": 7.354083332757
|
||||
},
|
||||
{
|
||||
"maxMs": 2.787833334878087,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 5.399999998189742,
|
||||
"width": 1920,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 2.0991666642657947
|
||||
},
|
||||
{
|
||||
"maxMs": 6.76562499938882,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 6.076875000871951,
|
||||
"width": 1920,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 4.969249999703607
|
||||
},
|
||||
{
|
||||
"maxMs": 29.241708332847338,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 33.40008333179867,
|
||||
"width": 3840,
|
||||
"mode": "integrated",
|
||||
"medianMs": 23.035124999296386
|
||||
},
|
||||
{
|
||||
"maxMs": 8.66854166451958,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 7.010708333837101,
|
||||
"width": 3840,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 7.675666667637415
|
||||
},
|
||||
{
|
||||
"maxMs": 25.247833335015457,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 24.129375000484288,
|
||||
"width": 3840,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 19.690958331921138
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"build": 114,
|
||||
"pair": "a",
|
||||
"cases": [
|
||||
{
|
||||
"maxMs": 6.538916666613659,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 9.243958334991476,
|
||||
"width": 1920,
|
||||
"mode": "integrated",
|
||||
"medianMs": 4.636333331291098
|
||||
},
|
||||
{
|
||||
"maxMs": 2.6706666649261024,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 5.093541665701196,
|
||||
"width": 1920,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 1.3894583316869102
|
||||
},
|
||||
{
|
||||
"maxMs": 5.872749999980442,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 66.25158333190484,
|
||||
"width": 1920,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 4.331708332756534
|
||||
},
|
||||
{
|
||||
"maxMs": 24.4553749980696,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 25.604499998735264,
|
||||
"width": 3840,
|
||||
"mode": "integrated",
|
||||
"medianMs": 15.133749999222346
|
||||
},
|
||||
{
|
||||
"maxMs": 8.956791665696073,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 6.821791666880017,
|
||||
"width": 3840,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 6.765833335521165
|
||||
},
|
||||
{
|
||||
"maxMs": 17.701708333333954,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 31.818916664633434,
|
||||
"width": 3840,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 15.026791668788064
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"build": 114,
|
||||
"pair": "b",
|
||||
"cases": [
|
||||
{
|
||||
"maxMs": 6.47824999759905,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 8.391749997826992,
|
||||
"width": 1920,
|
||||
"mode": "integrated",
|
||||
"medianMs": 3.9361249982903246
|
||||
},
|
||||
{
|
||||
"maxMs": 3.493458334560273,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 3.163458331982838,
|
||||
"width": 1920,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 1.6217500015045516
|
||||
},
|
||||
{
|
||||
"maxMs": 11.122041665657889,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 70.30949999898439,
|
||||
"width": 1920,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 8.894208334822906
|
||||
},
|
||||
{
|
||||
"maxMs": 22.29845833426225,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 29.890708334278315,
|
||||
"width": 3840,
|
||||
"mode": "integrated",
|
||||
"medianMs": 19.29470833420055
|
||||
},
|
||||
{
|
||||
"maxMs": 3.057958332647104,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 6.649041664786637,
|
||||
"width": 3840,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 2.682041664229473
|
||||
},
|
||||
{
|
||||
"maxMs": 16.54995833450812,
|
||||
"computePipelines": 3,
|
||||
"firstMs": 22.187250000570202,
|
||||
"width": 3840,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 14.910999998392072
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"build": 113,
|
||||
"pair": "b",
|
||||
"cases": [
|
||||
{
|
||||
"maxMs": 8.093041666143108,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 69.24862499727169,
|
||||
"width": 1920,
|
||||
"mode": "integrated",
|
||||
"medianMs": 5.378374997235369
|
||||
},
|
||||
{
|
||||
"maxMs": 3.8760833340347745,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 5.63374999910593,
|
||||
"width": 1920,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 2.3266249991138466
|
||||
},
|
||||
{
|
||||
"maxMs": 13.359000000491505,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 6.309416665317258,
|
||||
"width": 1920,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 8.464666665531695
|
||||
},
|
||||
{
|
||||
"maxMs": 19.337375000759494,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 23.844416664360324,
|
||||
"width": 3840,
|
||||
"mode": "integrated",
|
||||
"medianMs": 17.469708331191214
|
||||
},
|
||||
{
|
||||
"maxMs": 7.565374999103369,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 6.806416666222503,
|
||||
"width": 3840,
|
||||
"mode": "neutralHSL",
|
||||
"medianMs": 5.443375001050299
|
||||
},
|
||||
{
|
||||
"maxMs": 21.247958331514383,
|
||||
"computePipelines": 16,
|
||||
"firstMs": 31.353166665212484,
|
||||
"width": 3840,
|
||||
"mode": "activeBasic",
|
||||
"medianMs": 19.150083335262025
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"exactLastFrameAndScopeSHA256": {
|
||||
"a": {
|
||||
"neutralHSL-1920.scope": "d443c82467d99bd6a88b846cd17a8b200aadc04000c9c7e3d13d37807d69b4b6",
|
||||
"neutralHSL-3840.rgba16": "0ac067de6dbdafb632c22e19e46e9d96beb8c24d0138249949127460587a32c5",
|
||||
"neutralHSL-1920.rgba16": "7247fe37fcf4ec2b3077b0c44e602a0b4031b76dd52f012b6301dabd56e1d051",
|
||||
"integrated-1920.scope": "52f199d89d01220a3fca7472f61ccb3d828bb433ba411edd665a4c3169d834eb",
|
||||
"activeBasic-3840.scope": "0108d9d7c89d8c60b3b8bbfb8f31853227d378a4253f8e3c3a009d72ffadeb3f",
|
||||
"activeBasic-3840.rgba16": "8e094cc3639aaf3c0d1f3ff5725b0ecb85f80f7a3633c46c545fbd20fcc96bd9",
|
||||
"activeBasic-1920.scope": "cf6ec23848953f6fca09f3ff35e1bc5d6515549dc7d1d061bdd98c7cbfd3fe33",
|
||||
"integrated-1920.rgba16": "d6792912c85837afec62e56629ef749ff6a29594ba57e07eba4aa9cd64040546",
|
||||
"integrated-3840.scope": "ec7f0cfba144c6662422b1804a483953ad7615f0d03aa6a60bd847f99c187af0",
|
||||
"activeBasic-1920.rgba16": "b5dc08cfb483b8a657e4e7cbbac9ad456ac670a6ad7af842b2599b87d08d7358",
|
||||
"integrated-3840.rgba16": "3a68492e8ea37b3ed93daaa9bc20a8ce24bbd475adf76fa45db4867900216330",
|
||||
"neutralHSL-3840.scope": "5f576ba137f4f43b5106c132a4cfd7fb3297dc471b5224926f3f0040745d00dc"
|
||||
},
|
||||
"b": {
|
||||
"neutralHSL-1920.scope": "d443c82467d99bd6a88b846cd17a8b200aadc04000c9c7e3d13d37807d69b4b6",
|
||||
"neutralHSL-3840.rgba16": "0ac067de6dbdafb632c22e19e46e9d96beb8c24d0138249949127460587a32c5",
|
||||
"neutralHSL-1920.rgba16": "7247fe37fcf4ec2b3077b0c44e602a0b4031b76dd52f012b6301dabd56e1d051",
|
||||
"integrated-1920.scope": "52f199d89d01220a3fca7472f61ccb3d828bb433ba411edd665a4c3169d834eb",
|
||||
"activeBasic-3840.scope": "0108d9d7c89d8c60b3b8bbfb8f31853227d378a4253f8e3c3a009d72ffadeb3f",
|
||||
"activeBasic-3840.rgba16": "8e094cc3639aaf3c0d1f3ff5725b0ecb85f80f7a3633c46c545fbd20fcc96bd9",
|
||||
"activeBasic-1920.scope": "cf6ec23848953f6fca09f3ff35e1bc5d6515549dc7d1d061bdd98c7cbfd3fe33",
|
||||
"integrated-1920.rgba16": "d6792912c85837afec62e56629ef749ff6a29594ba57e07eba4aa9cd64040546",
|
||||
"integrated-3840.scope": "ec7f0cfba144c6662422b1804a483953ad7615f0d03aa6a60bd847f99c187af0",
|
||||
"activeBasic-1920.rgba16": "b5dc08cfb483b8a657e4e7cbbac9ad456ac670a6ad7af842b2599b87d08d7358",
|
||||
"integrated-3840.rgba16": "3a68492e8ea37b3ed93daaa9bc20a8ce24bbd475adf76fa45db4867900216330",
|
||||
"neutralHSL-3840.scope": "5f576ba137f4f43b5106c132a4cfd7fb3297dc471b5224926f3f0040745d00dc"
|
||||
}
|
||||
},
|
||||
"installedNativeChecks": 1050,
|
||||
"independentCSTReferenceCases": 21,
|
||||
"focusedNativeResults": [
|
||||
{
|
||||
"error": "",
|
||||
"name": "neutral-preview-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "neutral-direct-preserves-hdr-negative-and-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "neutral-render-defers-unused-gpu-pipelines",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "final-scope-captured-with-neutral-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "final-scope-inline-matches-separate-capture",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"limitations": [
|
||||
"First-render times are affected by Metal compilation caches and machine scheduling; they are informational.",
|
||||
"Warm wall time varied by run, especially the 4K CST path. No FCP presentation FPS or drop count was measured.",
|
||||
"Six last-frame comparisons in each pair, not an exhaustive comparison of all parameter combinations."
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"version": "1.21.0",
|
||||
"build": 114,
|
||||
"compiledSource": "90e512aabe72fff30046b4bf18d6a35f91c0c113",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"servicePID": 13297,
|
||||
"project": "Existing independent default-preview QA duplicate",
|
||||
"format": "1080p 25p",
|
||||
"checks": {
|
||||
"installedInspectorVersion": "1.21.0",
|
||||
"existingEffect": "Standalone spider effect",
|
||||
"playbackStart": "00:00:00:00",
|
||||
"playbackEnd": "00:00:11:09",
|
||||
"inspectorSlider": "Spider mix 1.00 → 0.50 → 1.00 via reset",
|
||||
"workspaceSlider": "Spider mix 1.00 → 0.50 → 1.00 via reset",
|
||||
"workspaceScopes": "Waveform, parade, histogram and vectorscope each reported 57,600 valid sRGB display-reference samples after rendering the edited/reset frame",
|
||||
"installedNativeChecks": 1050,
|
||||
"templates": 17
|
||||
},
|
||||
"firstScopeOpen": {
|
||||
"requestedSeconds": 11.383333333,
|
||||
"cachedSeconds": 11.36,
|
||||
"observation": "Waiting until the next actual render; no stale frame substituted."
|
||||
},
|
||||
"limits": [
|
||||
"FCP drop count, continuous drag latency, host Undo, same-time workspace reopen, Motion and full export not confirmed in this pass.",
|
||||
"The real host playback used the standalone spider effect. Integrated default CST and inactive HSL were covered by the renderer benchmark and installed integration checks."
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"hostPluginPID": 1885,
|
||||
"project": "1.19.1 默认预览性能验收",
|
||||
"projectFormat": "1080p 25p",
|
||||
"source": "Existing local real portrait video in QA library; not copied or uploaded",
|
||||
"checks": [
|
||||
{
|
||||
"name": "Formal installed service and inspector 1.19.1",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "Reset baseline duplicate replayed to 00:00:11:09",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "Removed effect and freshly added integrated effect, default settings replayed to 00:00:11:09",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "Four-second actual render samples no longer contain prepareFaceSupport",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "Installed 994 native checks",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "Unique PluginKit registration, codesign, staple and Gatekeeper execute",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"observations": "After fresh addition, all default eyes remained on and primary remained off. Exposure field was exercised at 0.25 and restored to 0.00; default three expanded groups restored. No render error or crash dialog observed.",
|
||||
"limitations": [
|
||||
"No measured FCP presentation FPS / dropped-frame counter; the benchmark ratios describe renderer wall time only.",
|
||||
"Host undo was not independently confirmed; no undo pass claimed.",
|
||||
"Active face-limited skin processing retains its existing cost.",
|
||||
"No full export or real motion tracking rerun in this scoped renderer fix."
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
"version": "1.20.0",
|
||||
"build": "111",
|
||||
"compiledSource": "01efcc8a2998c78a193a9b8b2e5c4bf81b6a0345",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"hostServicePIDs": [
|
||||
7429
|
||||
],
|
||||
"hostObservation": {
|
||||
"mode": "当前打开的真实素材,检查器中展开蜘蛛盘;只读观察",
|
||||
"scope": "可见明亮密度轨迹、压暗的色相底盘、网格控制点、带肤色标签的斜虚线",
|
||||
"skinToggle": "检查器报告肤色保护启用 off"
|
||||
},
|
||||
"installedNativeChecks": 999,
|
||||
"relevantNativeChecks": [
|
||||
"skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
"spider-drag-one-host-undo-group",
|
||||
"spider-escape-restores-coordinates-and-pins",
|
||||
"spider-osc-uses-exact-instance-output-time",
|
||||
"spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
"spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
"spider-raster-hue-orientation-neutral-center-and-invalid-filtering",
|
||||
"canvas-spider-drags-real-mesh-and-closes-one-undo",
|
||||
"canvas-spider-uuid-persists-mesh-without-touching-base",
|
||||
"canvas-spider-external-topology-change-wins"
|
||||
],
|
||||
"templatesVerified": 17,
|
||||
"rasterBenchmark": {
|
||||
"input": "320×180 synthetic RGB, Apple M4, 80 iterations",
|
||||
"meanMs": 0.984,
|
||||
"scope": "CPU density raster only"
|
||||
},
|
||||
"limitations": [
|
||||
"FCP 实看为用户当前片段,未在该片段内执行参数编辑或播放操作。",
|
||||
"工作区和画布的测量与交互使用原生集成检查,未在此次 FCP 实片中逐一操作。",
|
||||
"未量化宿主帧率,未单独运行 Motion。"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": "1.20.1",
|
||||
"build": "112",
|
||||
"compiledSource": "b16a6326a4f0da0faad9e1c57345e3805f558b6c",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"hostServicePIDs": [
|
||||
8471
|
||||
],
|
||||
"hostObservation": {
|
||||
"mode": "恢复当前测试项目,在同一实片暂停帧打开蜘蛛盘和控制面板",
|
||||
"scope": "两处肤色线均由中心向左上,色度轨迹同方向分布,工作区矢量示波器报告 sRGB 显示参考和 57600 个有效取样",
|
||||
"readability": "色盘轨迹集中于中性中心及蓝青方向,灰色节点的深边和双描边网格在轨迹上可辨认",
|
||||
"skinToggle": "检查器报告肤色保护启用 off"
|
||||
},
|
||||
"installedNativeChecks": 1002,
|
||||
"relevantNativeChecks": [
|
||||
"skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
"spider-drag-one-host-undo-group",
|
||||
"spider-escape-restores-coordinates-and-pins",
|
||||
"spider-and-workspace-measure-identical-color-managed-pixels",
|
||||
"spider-osc-uses-exact-instance-output-time",
|
||||
"spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
"spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
"spider-shares-cbcr-bins-and-keeps-trace-translucent",
|
||||
"spider-and-panel-skin-reference-share-direction",
|
||||
"spider-display-projection-round-trips-and-follows-pointer",
|
||||
"canvas-spider-drags-real-mesh-and-closes-one-undo",
|
||||
"canvas-spider-uuid-persists-mesh-without-touching-base",
|
||||
"canvas-spider-external-topology-change-wins"
|
||||
],
|
||||
"templatesVerified": 17,
|
||||
"limitations": [
|
||||
"实片验收未写入用户调色参数。实际拖点、撤销组和坐标映射由原生集成检查覆盖。",
|
||||
"未量化 FCP 帧率,未单独运行 Motion。"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"version": "1.20.2",
|
||||
"build": "113",
|
||||
"compiledSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"hostServicePIDs": [
|
||||
9209
|
||||
],
|
||||
"hostObservation": {
|
||||
"mode": "恢复当前测试项目,在同一实片暂停帧打开蜘蛛盘和控制面板",
|
||||
"scope": "两处肤色线均由中心向左上,色度轨迹同方向分布,工作区矢量示波器报告 sRGB 显示参考和 57600 个有效取样",
|
||||
"readability": "白色网格前景不透明度 55%→72%,深色底描边保留。正式版同帧实看,暗色区域的网格更亮,灰节点、肤色线和中心轨迹可分辨。",
|
||||
"skinToggle": "检查器报告肤色保护启用 off",
|
||||
"frame": "00:00:15:22(同前一候选)"
|
||||
},
|
||||
"installedNativeChecks": 1002,
|
||||
"relevantNativeChecks": [
|
||||
"skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
"spider-drag-one-host-undo-group",
|
||||
"spider-escape-restores-coordinates-and-pins",
|
||||
"spider-and-workspace-measure-identical-color-managed-pixels",
|
||||
"spider-osc-uses-exact-instance-output-time",
|
||||
"spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
"spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
"spider-shares-cbcr-bins-and-keeps-trace-translucent",
|
||||
"spider-and-panel-skin-reference-share-direction",
|
||||
"spider-display-projection-round-trips-and-follows-pointer",
|
||||
"canvas-spider-drags-real-mesh-and-closes-one-undo",
|
||||
"canvas-spider-uuid-persists-mesh-without-touching-base",
|
||||
"canvas-spider-external-topology-change-wins"
|
||||
],
|
||||
"templatesVerified": 17,
|
||||
"limitations": [
|
||||
"实片验收未写入用户调色参数。实际拖点、撤销组和坐标映射由原生集成检查覆盖。",
|
||||
"未量化 FCP 帧率,未单独运行 Motion。"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"baselineVersion": "1.19.0",
|
||||
"baselineBuild": 109,
|
||||
"baselineCompiledSource": "867bcfbad3f566ced2170925e8eadd9414cc3b75",
|
||||
"fixedCompiledSource": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"date": "2026-11-06",
|
||||
"method": "Headless real DYRenderer Release objects and IOSurface textures; NASA portrait fixture, input changes on every frame; 2 warmup + 12 measured frames per case. Includes render completion; excludes upload, FCP decode, UI, scope capture and playback scheduling.",
|
||||
"baseline": {
|
||||
"gpu": "Apple M4",
|
||||
"cases": [
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 324.3709479235501,
|
||||
"mode": "default",
|
||||
"width": 1920,
|
||||
"medianMs": 324.43966664141044,
|
||||
"maxMs": 342.59325003949925,
|
||||
"faceCalls": 14
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 5.731375005173807,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 1920,
|
||||
"medianMs": 5.292500020004809,
|
||||
"maxMs": 8.346875023562461,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 4.9824479162149755,
|
||||
"mode": "skinOff",
|
||||
"width": 1920,
|
||||
"medianMs": 4.696958349086344,
|
||||
"maxMs": 6.6408750135451555,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 1248.9016388911598,
|
||||
"mode": "default",
|
||||
"width": 3840,
|
||||
"medianMs": 1244.0447499975562,
|
||||
"maxMs": 1306.3457916723564,
|
||||
"faceCalls": 14
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 18.385972221343156,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 3840,
|
||||
"medianMs": 18.255416653119028,
|
||||
"maxMs": 21.025374997407198,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 18.504340274375863,
|
||||
"mode": "skinOff",
|
||||
"width": 3840,
|
||||
"medianMs": 19.312124990392476,
|
||||
"maxMs": 21.85391669627279,
|
||||
"faceCalls": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
"baselineWithoutFace": {
|
||||
"gpu": "Apple M4",
|
||||
"cases": [
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 13.62385764271797,
|
||||
"mode": "default",
|
||||
"width": 1920,
|
||||
"medianMs": 13.580000028014183,
|
||||
"maxMs": 19.66562500456348,
|
||||
"faceCalls": 14
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 5.1813645792814595,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 1920,
|
||||
"medianMs": 4.661791666876525,
|
||||
"maxMs": 7.6917500118725,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 5.026055553268331,
|
||||
"mode": "skinOff",
|
||||
"width": 1920,
|
||||
"medianMs": 4.50924999313429,
|
||||
"maxMs": 8.256000000983477,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 32.72458678596498,
|
||||
"mode": "default",
|
||||
"width": 3840,
|
||||
"medianMs": 33.722958294674754,
|
||||
"maxMs": 40.68808333249763,
|
||||
"faceCalls": 14
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 20.206972233912285,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 3840,
|
||||
"medianMs": 20.862416655290872,
|
||||
"maxMs": 21.603250002954155,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 19.99316319900875,
|
||||
"mode": "skinOff",
|
||||
"width": 3840,
|
||||
"medianMs": 20.055041648447514,
|
||||
"maxMs": 28.718291665427387,
|
||||
"faceCalls": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
"hostBaseline": {
|
||||
"version": "1.19.0 (109)",
|
||||
"project": "1.19.1 默认预览性能验收",
|
||||
"scope": "Independent duplicate in existing QA library; resetAll; playback sample",
|
||||
"sampleSeconds": 4,
|
||||
"evidence": "1783 render-worker samples in MTLCommandBuffer waitUntilCompleted from renderLegacy; prepareFaceSupport/Vision also present. Original raw sample stays in local cache."
|
||||
},
|
||||
"fixed": {
|
||||
"gpu": "Apple M4",
|
||||
"cases": [
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 5.232524306241733,
|
||||
"mode": "default",
|
||||
"width": 1920,
|
||||
"medianMs": 4.472625034395605,
|
||||
"maxMs": 9.54858330078423,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 4.97277431228819,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 1920,
|
||||
"medianMs": 4.468583327252418,
|
||||
"maxMs": 7.736208324786276,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 1080,
|
||||
"frames": 12,
|
||||
"meanMs": 4.766229176311754,
|
||||
"mode": "skinOff",
|
||||
"width": 1920,
|
||||
"medianMs": 4.410208319313824,
|
||||
"maxMs": 7.635333342477679,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 16.990586804846924,
|
||||
"mode": "default",
|
||||
"width": 3840,
|
||||
"medianMs": 17.110083310399204,
|
||||
"maxMs": 18.918749992735684,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 17.767736106179655,
|
||||
"mode": "faceOnlyOff",
|
||||
"width": 3840,
|
||||
"medianMs": 18.158666673116386,
|
||||
"maxMs": 19.148874969687313,
|
||||
"faceCalls": 0
|
||||
},
|
||||
{
|
||||
"height": 2160,
|
||||
"frames": 12,
|
||||
"meanMs": 18.471642353688367,
|
||||
"mode": "skinOff",
|
||||
"width": 3840,
|
||||
"medianMs": 18.95591663196683,
|
||||
"maxMs": 19.815666659269482,
|
||||
"faceCalls": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
"nativeChecks": 994,
|
||||
"nativePassed": true,
|
||||
"defaultSpeedup": [
|
||||
{
|
||||
"width": 1920,
|
||||
"beforeMeanMs": 324.3709479235501,
|
||||
"afterMeanMs": 5.232524306241733,
|
||||
"ratio": 61.9912931004672
|
||||
},
|
||||
{
|
||||
"width": 3840,
|
||||
"beforeMeanMs": 1248.9016388911598,
|
||||
"afterMeanMs": 16.990586804846924,
|
||||
"ratio": 73.5055035612357
|
||||
}
|
||||
]
|
||||
}
|
||||
+120
-16
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 979,
|
||||
"checks": 1002,
|
||||
"gpu": "Apple M4",
|
||||
"limitations": [
|
||||
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
|
||||
@@ -12,7 +12,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -30,7 +30,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "all-module-eyes-enabled-by-default",
|
||||
"name": "module-eyes-enabled-by-default-except-skin",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -42,6 +42,10 @@
|
||||
"name": "historical-host-mapping-default-and-explicit-on-off-preserved",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-get-set-model-roundtrip",
|
||||
"pass": true
|
||||
@@ -286,6 +290,72 @@
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-default-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-default-no-face-inference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-default-no-polygon-mask-pipeline",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-reference-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-matches-neutral-with-face-option-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-preserves-saved-default-controls",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-active-color-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-active-color-still-detects-faces",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-skin-selection-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-visualize-still-detects-faces",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-disabled-lut-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-disabled-lut-does-not-trigger-face-work",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "idle-preview-blackwhite-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-active-blackwhite-still-detects-faces",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "idle-preview-empty-extra-skin-does-not-trigger-face-work",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "blackwhite-full-render",
|
||||
@@ -546,7 +616,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7347,
|
||||
"changedComponents": 7354,
|
||||
"maxAbsoluteError": 0.13134765625,
|
||||
"name": "hsl-real-table-frame",
|
||||
"nonfiniteComponents": 0,
|
||||
@@ -572,8 +642,8 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7347,
|
||||
"maxAbsoluteError": 0.09033203125,
|
||||
"changedComponents": 7357,
|
||||
"maxAbsoluteError": 0.094482421875,
|
||||
"name": "grading-real-table-frame",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
@@ -898,7 +968,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +988,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 86.35029167635366,
|
||||
"maximumGapMS": 76.41433333628811,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1405,7 +1475,7 @@
|
||||
"closePixels": 128,
|
||||
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1476,7 +1546,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "532E3490-5625-47B9-B4EA-B2CF331F755F",
|
||||
"node": "605374AC-F96A-4155-B4BF-433929B3FC20",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1485,10 +1555,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -1538,6 +1608,34 @@
|
||||
"name": "workspace-scope-cache-never-crosses-plugin-instances",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-and-workspace-measure-identical-color-managed-pixels",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-osc-uses-exact-instance-output-time",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-shares-cbcr-bins-and-keeps-trace-translucent",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-and-panel-skin-reference-share-direction",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "spider-display-projection-round-trips-and-follows-pointer",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "workspace-toolbar-lists-every-inspector-tool-including-distortion",
|
||||
"pass": true
|
||||
@@ -1559,7 +1657,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"buttons": 5,
|
||||
"buttons": 6,
|
||||
"frames": [
|
||||
{
|
||||
"button": "{{145, 2}, {24, 24}}",
|
||||
@@ -1590,11 +1688,17 @@
|
||||
"cell": "{{0, 0}, {174, 28}}",
|
||||
"table": "{{145, 114}, {24, 24}}",
|
||||
"visible": "{{0, 0}, {174, 229}}"
|
||||
},
|
||||
{
|
||||
"button": "{{145, 2}, {24, 24}}",
|
||||
"cell": "{{0, 0}, {174, 28}}",
|
||||
"table": "{{145, 142}, {24, 24}}",
|
||||
"visible": "{{0, 0}, {174, 229}}"
|
||||
}
|
||||
],
|
||||
"name": "workspace-native-row-bypass-buttons-remain-visible-at-minimum-width",
|
||||
"pass": true,
|
||||
"rows": 5
|
||||
"rows": 6
|
||||
},
|
||||
{
|
||||
"name": "workspace-two-independent-lut-layer-fixtures-exist",
|
||||
@@ -4488,7 +4592,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4887,6 +4991,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E7F4DE8F-CB6B-4629-8C34-20B0ED00CD4B",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/DFD3CB29-145A-46CE-A78E-3232106A83D4",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
+33
-39
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.0.pkg",
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"bytes": 44486766,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.2.pkg",
|
||||
"sha256": "8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4",
|
||||
"bytes": 44505420,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,27 +31,27 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.19.0",
|
||||
"build": "109"
|
||||
"version": "1.20.2",
|
||||
"build": "113"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-n9y6tva7/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.eedd4f1f-face-4f7b-bcfc-f7f3eef8e5d1/6CFC97CA-0062-470D-9808-89A44226A7A5/大鱼调色"
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-m_xzx8yc/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.10a6bf46-1412-4819-83d4-ebb45c79275b/B090E51C-345E-4A74-80E5-70F4A10D475E/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.19.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-06 12:04:22 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.20.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-08 07:39:35 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.2.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-06T12:04:24.225Z",
|
||||
"name": "大鱼调色-1.19.0.pkg",
|
||||
"message": "Successfully received submission info",
|
||||
"createdDate": "2026-11-08T07:39:36.695Z",
|
||||
"name": "大鱼调色-1.20.2.pkg",
|
||||
"status": "Accepted",
|
||||
"id": "99abefcb-c1cb-4aff-8b85-8109eab00df9"
|
||||
"id": "1a6834df-840f-47da-9ee8-be6a0a808fee",
|
||||
"message": "Successfully received submission info"
|
||||
},
|
||||
"appCompiledSource": "867bcfbad3f566ced2170925e8eadd9414cc3b75",
|
||||
"appBuild": "109",
|
||||
"appCompiledSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"appBuild": "113",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
@@ -71,55 +71,55 @@
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
@@ -127,12 +127,6 @@
|
||||
"entries": 192,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": {
|
||||
"report": "verification/HostVisionTracking1.19.0.json",
|
||||
"pass": true,
|
||||
"hostPID": 97776,
|
||||
"pluginPID": 97806,
|
||||
"workerMainThread": false
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostSpiderScope1.20.2.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.1.pkg",
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"bytes": 44488264,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
"PKG Developer ID Installer signature",
|
||||
"PKG stapled ticket and Gatekeeper install assessment",
|
||||
"must-close attached to root-authorized payload",
|
||||
"all four FCP/Motion host identifiers",
|
||||
"bundle relocation disabled",
|
||||
"desktop and Bundle ID preinstall guards",
|
||||
"postinstall contains actual FxPlug verification invocations",
|
||||
"GUI worker, registration repair and Finder reveal present",
|
||||
"successful completion and consecutive registration checks",
|
||||
"exact payload contents: 大鱼调色.app",
|
||||
"fixed FxPlug outer APP install path",
|
||||
"outer APP has one real verification action",
|
||||
"service path/identifier/registration version: com.dayu.color.XPC",
|
||||
"nonempty FxPlug service manifest",
|
||||
"payload APP signature, independent ticket and Gatekeeper",
|
||||
"exact payload contents: 大鱼调色",
|
||||
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
|
||||
"complete outer APP payload present",
|
||||
"welcome warns to save work and close hosts",
|
||||
"conclusion gives manual APP and host restart instructions"
|
||||
],
|
||||
"resources": [
|
||||
{
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.19.1",
|
||||
"build": "110"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-1qexqyew/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.691e3653-3e5f-4889-bf13-2f93d3bd57df/255642D7-C373-45EE-980D-CA01DD3273A0/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.19.1.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-06 12:53:46 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.1.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"name": "大鱼调色-1.19.1.pkg",
|
||||
"id": "5bf23d87-857d-48d9-856c-f6f05e97867b",
|
||||
"createdDate": "2026-11-06T12:53:47.706Z",
|
||||
"status": "Accepted",
|
||||
"message": "Successfully received submission info"
|
||||
},
|
||||
"appCompiledSource": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"appBuild": "110",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
"com.apple.FinalCut",
|
||||
"com.apple.FinalCutApp",
|
||||
"com.apple.motionapp",
|
||||
"com.apple.motionappApp",
|
||||
"com.dayu.color"
|
||||
],
|
||||
"preinstallGuardCount": 1,
|
||||
"normalQuit": true
|
||||
},
|
||||
"packageEntryAdaptation": {
|
||||
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
|
||||
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
|
||||
"requiredApplication": "com.dayu.color"
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"payloadBundleAccess": {
|
||||
"entries": 192,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostIdlePreview1.19.1.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.2.pkg",
|
||||
"sha256": "8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4",
|
||||
"bytes": 44505420,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
"PKG Developer ID Installer signature",
|
||||
"PKG stapled ticket and Gatekeeper install assessment",
|
||||
"must-close attached to root-authorized payload",
|
||||
"all four FCP/Motion host identifiers",
|
||||
"bundle relocation disabled",
|
||||
"desktop and Bundle ID preinstall guards",
|
||||
"postinstall contains actual FxPlug verification invocations",
|
||||
"GUI worker, registration repair and Finder reveal present",
|
||||
"successful completion and consecutive registration checks",
|
||||
"exact payload contents: 大鱼调色.app",
|
||||
"fixed FxPlug outer APP install path",
|
||||
"outer APP has one real verification action",
|
||||
"service path/identifier/registration version: com.dayu.color.XPC",
|
||||
"nonempty FxPlug service manifest",
|
||||
"payload APP signature, independent ticket and Gatekeeper",
|
||||
"exact payload contents: 大鱼调色",
|
||||
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
|
||||
"complete outer APP payload present",
|
||||
"welcome warns to save work and close hosts",
|
||||
"conclusion gives manual APP and host restart instructions"
|
||||
],
|
||||
"resources": [
|
||||
{
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.20.2",
|
||||
"build": "113"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-m_xzx8yc/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.10a6bf46-1412-4819-83d4-ebb45c79275b/B090E51C-345E-4A74-80E5-70F4A10D475E/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.20.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-08 07:39:35 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.20.2.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-08T07:39:36.695Z",
|
||||
"name": "大鱼调色-1.20.2.pkg",
|
||||
"status": "Accepted",
|
||||
"id": "1a6834df-840f-47da-9ee8-be6a0a808fee",
|
||||
"message": "Successfully received submission info"
|
||||
},
|
||||
"appCompiledSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"appBuild": "113",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
"com.apple.FinalCut",
|
||||
"com.apple.FinalCutApp",
|
||||
"com.apple.motionapp",
|
||||
"com.apple.motionappApp",
|
||||
"com.dayu.color"
|
||||
],
|
||||
"preinstallGuardCount": 1,
|
||||
"normalQuit": true
|
||||
},
|
||||
"packageEntryAdaptation": {
|
||||
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
|
||||
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
|
||||
"requiredApplication": "com.dayu.color"
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"payloadBundleAccess": {
|
||||
"entries": 192,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostSpiderScope1.20.2.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.0.pkg",
|
||||
"sha256": "ec1a57f23bf369d7a7841848d71d8ab78a7c229cbb5abe1c502e9964f87dbbcb",
|
||||
"bytes": 44508770,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
"PKG Developer ID Installer signature",
|
||||
"PKG stapled ticket and Gatekeeper install assessment",
|
||||
"must-close attached to root-authorized payload",
|
||||
"all four FCP/Motion host identifiers",
|
||||
"bundle relocation disabled",
|
||||
"desktop and Bundle ID preinstall guards",
|
||||
"postinstall contains actual FxPlug verification invocations",
|
||||
"GUI worker, registration repair and Finder reveal present",
|
||||
"successful completion and consecutive registration checks",
|
||||
"exact payload contents: 大鱼调色.app",
|
||||
"fixed FxPlug outer APP install path",
|
||||
"outer APP has one real verification action",
|
||||
"service path/identifier/registration version: com.dayu.color.XPC",
|
||||
"nonempty FxPlug service manifest",
|
||||
"payload APP signature, independent ticket and Gatekeeper",
|
||||
"exact payload contents: 大鱼调色",
|
||||
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
|
||||
"complete outer APP payload present",
|
||||
"welcome warns to save work and close hosts",
|
||||
"conclusion gives manual APP and host restart instructions"
|
||||
],
|
||||
"resources": [
|
||||
{
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.21.0",
|
||||
"build": "114"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-81lueh25/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.41bb9e80-c269-4a80-b88c-4edb6aad9bc1/A487CF16-2495-4CDE-B156-411B7EFEF470/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.21.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-08 08:25:14 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-08T08:25:16.003Z",
|
||||
"id": "29d5f921-6cd4-48a4-856a-2632f9a85e2b",
|
||||
"status": "Accepted",
|
||||
"message": "Successfully received submission info",
|
||||
"name": "大鱼调色-1.21.0.pkg"
|
||||
},
|
||||
"appCompiledSource": "90e512aabe72fff30046b4bf18d6a35f91c0c113",
|
||||
"appBuild": "114",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
"com.apple.FinalCut",
|
||||
"com.apple.FinalCutApp",
|
||||
"com.apple.motionapp",
|
||||
"com.apple.motionappApp",
|
||||
"com.dayu.color"
|
||||
],
|
||||
"preinstallGuardCount": 1,
|
||||
"normalQuit": true
|
||||
},
|
||||
"packageEntryAdaptation": {
|
||||
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
|
||||
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
|
||||
"requiredApplication": "com.dayu.color"
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"payloadBundleAccess": {
|
||||
"entries": 192,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostFluidity1.21.0.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,298 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"checkedAt": "2026-11-06T23:14:34.412249+08:00",
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.1.pkg",
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"integratedEffect": "大鱼调色",
|
||||
"independentEffects": [
|
||||
"一级调色",
|
||||
"蜘蛛盘校色仪",
|
||||
"基础调整",
|
||||
"肤色保护",
|
||||
"风格 LUT",
|
||||
"HSL",
|
||||
"曲线",
|
||||
"颜色分级",
|
||||
"三原色",
|
||||
"色阶",
|
||||
"黑白混色",
|
||||
"色彩平衡",
|
||||
"通道混合器",
|
||||
"胶片模拟",
|
||||
"镜头畸变修复",
|
||||
"CST 色彩空间转换"
|
||||
],
|
||||
"independentEffectCount": 16,
|
||||
"installedEffectCount": 17,
|
||||
"templateAndPreviewFileCount": 51,
|
||||
"allSourceAndBundledHashesMatch": true,
|
||||
"installDestination": "~/Movies/Motion Templates.localized/Effects.localized/大鱼调色",
|
||||
"appDestination": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"files": [
|
||||
{
|
||||
"path": "大鱼调色/大鱼调色.moef",
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"bytes": 46021
|
||||
},
|
||||
{
|
||||
"path": "大鱼调色/large.png",
|
||||
"sha256": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"bytes": 261628
|
||||
},
|
||||
{
|
||||
"path": "大鱼调色/small.png",
|
||||
"sha256": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"bytes": 42791
|
||||
},
|
||||
{
|
||||
"path": "一级调色/一级调色.moef",
|
||||
"sha256": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"bytes": 46778
|
||||
},
|
||||
{
|
||||
"path": "一级调色/large.png",
|
||||
"sha256": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"bytes": 31953
|
||||
},
|
||||
{
|
||||
"path": "一级调色/small.png",
|
||||
"sha256": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"bytes": 8051
|
||||
},
|
||||
{
|
||||
"path": "蜘蛛盘校色仪/蜘蛛盘校色仪.moef",
|
||||
"sha256": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"bytes": 46776
|
||||
},
|
||||
{
|
||||
"path": "蜘蛛盘校色仪/large.png",
|
||||
"sha256": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"bytes": 29077
|
||||
},
|
||||
{
|
||||
"path": "蜘蛛盘校色仪/small.png",
|
||||
"sha256": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"bytes": 8606
|
||||
},
|
||||
{
|
||||
"path": "基础调整/基础调整.moef",
|
||||
"sha256": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"bytes": 46770
|
||||
},
|
||||
{
|
||||
"path": "基础调整/large.png",
|
||||
"sha256": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"bytes": 14561
|
||||
},
|
||||
{
|
||||
"path": "基础调整/small.png",
|
||||
"sha256": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"bytes": 4537
|
||||
},
|
||||
{
|
||||
"path": "肤色保护/肤色保护.moef",
|
||||
"sha256": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"bytes": 46850
|
||||
},
|
||||
{
|
||||
"path": "肤色保护/large.png",
|
||||
"sha256": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"bytes": 15279
|
||||
},
|
||||
{
|
||||
"path": "肤色保护/small.png",
|
||||
"sha256": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"bytes": 5144
|
||||
},
|
||||
{
|
||||
"path": "风格 LUT/风格 LUT.moef",
|
||||
"sha256": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"bytes": 46850
|
||||
},
|
||||
{
|
||||
"path": "风格 LUT/large.png",
|
||||
"sha256": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"bytes": 15637
|
||||
},
|
||||
{
|
||||
"path": "风格 LUT/small.png",
|
||||
"sha256": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"bytes": 5877
|
||||
},
|
||||
{
|
||||
"path": "HSL/HSL.moef",
|
||||
"sha256": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"bytes": 46768
|
||||
},
|
||||
{
|
||||
"path": "HSL/large.png",
|
||||
"sha256": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"bytes": 36559
|
||||
},
|
||||
{
|
||||
"path": "HSL/small.png",
|
||||
"sha256": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"bytes": 9811
|
||||
},
|
||||
{
|
||||
"path": "曲线/曲线.moef",
|
||||
"sha256": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"bytes": 46856
|
||||
},
|
||||
{
|
||||
"path": "曲线/large.png",
|
||||
"sha256": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"bytes": 14887
|
||||
},
|
||||
{
|
||||
"path": "曲线/small.png",
|
||||
"sha256": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"bytes": 4513
|
||||
},
|
||||
{
|
||||
"path": "颜色分级/颜色分级.moef",
|
||||
"sha256": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"bytes": 46872
|
||||
},
|
||||
{
|
||||
"path": "颜色分级/large.png",
|
||||
"sha256": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"bytes": 30645
|
||||
},
|
||||
{
|
||||
"path": "颜色分级/small.png",
|
||||
"sha256": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"bytes": 9702
|
||||
},
|
||||
{
|
||||
"path": "三原色/三原色.moef",
|
||||
"sha256": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"bytes": 46882
|
||||
},
|
||||
{
|
||||
"path": "三原色/large.png",
|
||||
"sha256": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"bytes": 19743
|
||||
},
|
||||
{
|
||||
"path": "三原色/small.png",
|
||||
"sha256": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"bytes": 6228
|
||||
},
|
||||
{
|
||||
"path": "色阶/色阶.moef",
|
||||
"sha256": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"bytes": 46860
|
||||
},
|
||||
{
|
||||
"path": "色阶/large.png",
|
||||
"sha256": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"bytes": 13205
|
||||
},
|
||||
{
|
||||
"path": "色阶/small.png",
|
||||
"sha256": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"bytes": 4767
|
||||
},
|
||||
{
|
||||
"path": "黑白混色/黑白混色.moef",
|
||||
"sha256": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"bytes": 46888
|
||||
},
|
||||
{
|
||||
"path": "黑白混色/large.png",
|
||||
"sha256": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"bytes": 12899
|
||||
},
|
||||
{
|
||||
"path": "黑白混色/small.png",
|
||||
"sha256": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"bytes": 3958
|
||||
},
|
||||
{
|
||||
"path": "色彩平衡/色彩平衡.moef",
|
||||
"sha256": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"bytes": 46872
|
||||
},
|
||||
{
|
||||
"path": "色彩平衡/large.png",
|
||||
"sha256": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"bytes": 14637
|
||||
},
|
||||
{
|
||||
"path": "色彩平衡/small.png",
|
||||
"sha256": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"bytes": 6069
|
||||
},
|
||||
{
|
||||
"path": "通道混合器/通道混合器.moef",
|
||||
"sha256": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"bytes": 46856
|
||||
},
|
||||
{
|
||||
"path": "通道混合器/large.png",
|
||||
"sha256": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"bytes": 27134
|
||||
},
|
||||
{
|
||||
"path": "通道混合器/small.png",
|
||||
"sha256": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"bytes": 7731
|
||||
},
|
||||
{
|
||||
"path": "胶片模拟/胶片模拟.moef",
|
||||
"sha256": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"bytes": 46850
|
||||
},
|
||||
{
|
||||
"path": "胶片模拟/large.png",
|
||||
"sha256": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"bytes": 13409
|
||||
},
|
||||
{
|
||||
"path": "胶片模拟/small.png",
|
||||
"sha256": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"bytes": 4357
|
||||
},
|
||||
{
|
||||
"path": "镜头畸变修复/镜头畸变修复.moef",
|
||||
"sha256": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"bytes": 46850
|
||||
},
|
||||
{
|
||||
"path": "镜头畸变修复/large.png",
|
||||
"sha256": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"bytes": 32470
|
||||
},
|
||||
{
|
||||
"path": "镜头畸变修复/small.png",
|
||||
"sha256": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"bytes": 10171
|
||||
},
|
||||
{
|
||||
"path": "CST 色彩空间转换/CST 色彩空间转换.moef",
|
||||
"sha256": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"bytes": 46768
|
||||
},
|
||||
{
|
||||
"path": "CST 色彩空间转换/large.png",
|
||||
"sha256": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"bytes": 27622
|
||||
},
|
||||
{
|
||||
"path": "CST 色彩空间转换/small.png",
|
||||
"sha256": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc",
|
||||
"bytes": 8498
|
||||
}
|
||||
],
|
||||
"checks": {
|
||||
"pkgSignature": true,
|
||||
"pkgStaple": true,
|
||||
"appSignature": true,
|
||||
"appStaple": true
|
||||
},
|
||||
"installationExecuted": false,
|
||||
"method": "Expanded exact published signed PKG; verified all 17 installable effects and 34 previews against repository and bundled templates, and inspected postinstall destination. Did not count the bundled recovery copies twice.",
|
||||
"bytes": 44488264
|
||||
}
|
||||
@@ -6,5 +6,9 @@
|
||||
"gitFsck": true,
|
||||
"lfsPointers": [],
|
||||
"submodules": [],
|
||||
"scope": "Independent remote clone and byte checks; did not repeat third-party cold build or store user media"
|
||||
"scope": "Independent remote clone and byte checks; did not repeat third-party cold build or store user media",
|
||||
"tag": "v1.19.0-vision-tracking-20261106",
|
||||
"releaseCommit": "a0178f994d71c19e95c70e23f9b056947b063b1c",
|
||||
"releaseFilesVerified": 771,
|
||||
"releaseByteExact": true
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"sourceCommit": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"sourceFilesVerified": 778,
|
||||
"sourceClone": "Independent HTTPS shallow clone and detached checkout",
|
||||
"gitFsckPassed": true,
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"coldThirdPartyBuildRepeated": false,
|
||||
"tag": "v1.19.1-idle-preview-20261106",
|
||||
"tagCommit": "6add6f29e357d37e94a8430d6963ec7f91993537",
|
||||
"tagFilesVerified": 786,
|
||||
"tagGitFsckPassed": true
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"compiledSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"trackedFiles": 798,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"remoteBranch": "main",
|
||||
"gitFsck": "pass",
|
||||
"lfsPointers": 0,
|
||||
"submodules": 0,
|
||||
"tag": "v1.20.2-spider-scope-20261108",
|
||||
"releaseCommit": "bc9021271d5e4992a6a63011e4ff197812029ab3",
|
||||
"tagTrackedFiles": 802,
|
||||
"tagGitFsck": "pass",
|
||||
"buildInputsMatchCompiledSource": true
|
||||
}
|
||||
+50
-15
@@ -3,23 +3,58 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.18.1-tracking-ui-20261106",
|
||||
"releaseCommit": "5fe4b1933e015a906fab36b65dcbc45a0d6bee49",
|
||||
"releaseID": 402,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.18.1-tracking-ui-20261106",
|
||||
"visibilityUnchanged": true,
|
||||
"tag": "v1.19.1-idle-preview-20261106",
|
||||
"releaseCommit": "6add6f29e357d37e94a8430d6963ec7f91993537",
|
||||
"appCompiledSource": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"releaseID": 404,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.1-idle-preview-20261106",
|
||||
"prerelease": true,
|
||||
"assetID": 47,
|
||||
"assetName": "大鱼调色-1.18.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.18.1-tracking-ui-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.18.1.pkg",
|
||||
"bytes": 46654687,
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
|
||||
"verification": "Both full draft browser downloads verified before publication; both published attachments downloaded and verified again; release, tag and assets read back.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"assets": [
|
||||
{
|
||||
"assetID": 51,
|
||||
"assetName": "大鱼调色-1.19.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
},
|
||||
{
|
||||
"assetID": 52,
|
||||
"assetName": "大鱼调色-1.19.1-symbols.zip",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
}
|
||||
],
|
||||
"assetID": 51,
|
||||
"assetName": "大鱼调色-1.19.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Users/mac/Downloads/大鱼调色-1.18.1.pkg",
|
||||
"sha256": "e149555c46cc6196eb12601196d70121d79b796be852f9a2e89688b20483a6b2",
|
||||
"bytes": 46654687,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.18.1-tracking-ui-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.18.1.pkg"
|
||||
}
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.19.0-vision-tracking-20261106",
|
||||
"releaseCommit": "a0178f994d71c19e95c70e23f9b056947b063b1c",
|
||||
"releaseID": 403,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.0-vision-tracking-20261106",
|
||||
"prerelease": true,
|
||||
"assetID": 49,
|
||||
"assetName": "大鱼调色-1.19.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.0-vision-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.0.pkg",
|
||||
"bytes": 44486766,
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Users/mac/Downloads/大鱼调色-1.19.0.pkg",
|
||||
"sha256": "0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745",
|
||||
"bytes": 44486766,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.0-vision-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.0.pkg"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"visibilityUnchanged": true,
|
||||
"tag": "v1.19.1-idle-preview-20261106",
|
||||
"releaseCommit": "6add6f29e357d37e94a8430d6963ec7f91993537",
|
||||
"appCompiledSource": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"releaseID": 404,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.1-idle-preview-20261106",
|
||||
"prerelease": true,
|
||||
"existingAssetReused": true,
|
||||
"verification": "Both full draft browser downloads verified before publication; both published attachments downloaded and verified again; release, tag and assets read back.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"assets": [
|
||||
{
|
||||
"assetID": 51,
|
||||
"assetName": "大鱼调色-1.19.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
},
|
||||
{
|
||||
"assetID": 52,
|
||||
"assetName": "大鱼调色-1.19.1-symbols.zip",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
}
|
||||
],
|
||||
"assetID": 51,
|
||||
"assetName": "大鱼调色-1.19.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1.pkg",
|
||||
"bytes": 44488264,
|
||||
"sha256": "7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1.pkg"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.20.2-spider-scope-20261108",
|
||||
"releaseCommit": "bc9021271d5e4992a6a63011e4ff197812029ab3",
|
||||
"appCompiledSource": "046411ba8b2c2bf8549601b2e5a080fd9dccd31b",
|
||||
"version": "1.20.2",
|
||||
"build": 113,
|
||||
"releaseID": 413,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.20.2-spider-scope-20261108",
|
||||
"prerelease": true,
|
||||
"assetID": 59,
|
||||
"assetName": "大鱼调色-1.20.2.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.20.2-spider-scope-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.20.2.pkg",
|
||||
"bytes": 44505420,
|
||||
"sha256": "8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"draftDownloadURL": "https://dayu.media/git/attachments/f818322d-609a-4bae-a323-c5308bb78c80",
|
||||
"passResult": true,
|
||||
"draftVerification": "Authenticated browser download matched SHA-256 and byte count",
|
||||
"verification": "Published release read-back and complete attachment download matched SHA-256 and byte count."
|
||||
}
|
||||
@@ -18,5 +18,10 @@
|
||||
"bytes": 3472206,
|
||||
"sha256": "401cb46a38838a5605b7a1cb6eb3cd5ee03a649a80c7cf6655741a57ec0deb31",
|
||||
"installedBinaryUUIDMatch": true,
|
||||
"releaseUploaded": false
|
||||
"releaseUploaded": true,
|
||||
"releaseID": 403,
|
||||
"assetID": 50,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.0-vision-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.0-symbols.zip",
|
||||
"draftDownloadVerified": true,
|
||||
"publishedDownloadVerified": true
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"version": "1.19.1",
|
||||
"build": 110,
|
||||
"compiledSource": "3642a1dba6cbbc4423bd6928944e0e95d76d9cfa",
|
||||
"images": [
|
||||
{
|
||||
"name": "大鱼调色",
|
||||
"uuid": "F952A83C-8229-3789-9945-3936C3C617B9",
|
||||
"dSYM": "大鱼调色.app.dSYM"
|
||||
},
|
||||
{
|
||||
"name": "大鱼调色 XPC Service",
|
||||
"uuid": "1BF2C6C3-5F37-35DA-A809-54CB322B3EBE",
|
||||
"dSYM": "大鱼调色 XPC Service.pluginkit.dSYM"
|
||||
}
|
||||
],
|
||||
"path": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"installedBinaryUUIDMatch": true,
|
||||
"releaseUploaded": true,
|
||||
"releaseID": 404,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.1-idle-preview-20261106",
|
||||
"assetID": 52,
|
||||
"assetName": "大鱼调色-1.19.1-symbols.zip",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.19.1-symbols.zip",
|
||||
"bytes": 3475056,
|
||||
"sha256": "c40af08b2bc0c704e1eee3851d66e957b1c35a9ec88052b65d9c2d402c2cd37a",
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.19.1-idle-preview-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.19.1-symbols.zip"
|
||||
},
|
||||
"publishedFullDownloadVerified": true
|
||||
}
|
||||
@@ -13,9 +13,9 @@
|
||||
DYUniforms edited;DYReadUniforms(host,kCMTimeZero,&edited);run.record(@"canvas-hsl-plot-captures-outside-and-commits-one-undo",edited.hslHueA[2]==100&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSString *layerID=DYInsertTool(doc,@"hsl",@"base:hsl")[@"id"];DYWriteTools(host,doc,kCMTimeZero);publish();[(id)panel setValue:layerID forKey:@"nodeID"];publish();plot=[area(@"hslPlot")[@"rect"]rectValue];a=NSMakePoint(NSMinX(plot)+plot.size.width*2.5/8,NSMidY(plot));b=NSMakePoint(a.x,NSMidY(plot)-plot.size.height*.25);drag(a,b);DYReadUniforms(host,kCMTimeZero,&edited);
|
||||
run.record(@"canvas-hsl-independent-uuid-does-not-edit-base",edited.hslHueA[2]==100&&fabs([DYToolWithID(DYReadTools(host,kCMTimeZero).document,layerID)[@"values"][@"hsl0_2"]doubleValue]-50)<1e-5);
|
||||
[(id)panel setValue:@"spider" forKey:@"toolType"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];auto mesh=dy::neutralMesh();int selected=dy::meshIndex(mesh,0,2);a=NSMakePoint(plot.origin.x+mesh.x[selected]*plot.size.width,plot.origin.y+mesh.y[selected]*plot.size.height);b=NSMakePoint(a.x+9,a.y-6);undo=base->_undoStarts;drag(a,b);
|
||||
[(id)panel setValue:@"spider" forKey:@"toolType"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];auto mesh=dy::neutralMesh();int selected=dy::meshIndex(mesh,0,2);a=DYSpiderPlotPoint(plot,mesh.x[selected],mesh.y[selected]);b=NSMakePoint(a.x+9,a.y-6);undo=base->_undoStarts;drag(a,b);
|
||||
NSData *saved=DYReadAssets(host,kCMTimeZero).spiderMesh;auto changed=DYSpiderMesh(saved);run.record(@"canvas-spider-drags-real-mesh-and-closes-one-undo",saved.length&&fabs(changed.x[selected]-mesh.x[selected])>.001&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSString *spiderID=DYInsertTool(doc,@"spider",@"base:spider")[@"id"];DYWriteTools(host,doc,kCMTimeZero);publish();[(id)panel setValue:spiderID forKey:@"nodeID"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];a=NSMakePoint(plot.origin.x+mesh.x[selected]*plot.size.width,plot.origin.y+mesh.y[selected]*plot.size.height);b=NSMakePoint(a.x-8,a.y+5);drag(a,b);
|
||||
doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSString *spiderID=DYInsertTool(doc,@"spider",@"base:spider")[@"id"];DYWriteTools(host,doc,kCMTimeZero);publish();[(id)panel setValue:spiderID forKey:@"nodeID"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];a=DYSpiderPlotPoint(plot,mesh.x[selected],mesh.y[selected]);b=NSMakePoint(a.x-8,a.y+5);drag(a,b);
|
||||
run.record(@"canvas-spider-uuid-persists-mesh-without-touching-base",[saved isEqual:DYReadAssets(host,kCMTimeZero).spiderMesh]&&[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]length]>0);
|
||||
NSData *current=DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"];[bridge beginSpider:current node:spiderID enabled:1 atTime:kCMTimeZero];drain();doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);auto external=dy::neutralMesh(12,12);NSData *externalData=[NSData dataWithBytes:&external length:sizeof(external)];((NSMutableDictionary*)DYToolWithID(doc,spiderID))[@"spider"]=externalData;DYWriteTools(host,doc,kCMTimeZero);[bridge changeSpider:current];[bridge endGesture];drain();
|
||||
run.record(@"canvas-spider-external-topology-change-wins",[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]isEqual:externalData]);
|
||||
@@ -54,7 +54,7 @@ if(faceFixture.length){
|
||||
// Both FxPlug row conventions must resolve the same visual face.
|
||||
Pixels flipped(portrait.size());for(NSUInteger y=0;y<h;y++)memcpy(flipped.data()+y*w*4,portrait.data()+(h-1-y)*w*4,w*8);upload(flipped);[src setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];u.skinVisualize=0;Pixels bottom=render(run,face,src,dst,gpu,u,@{},@"face-bottom-origin-production-render");double flipError=0;for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w*4;x++)flipError=MAX(flipError,fabs((float)bottom[(h-1-y)*w*4+x]-(float)protectedFrame[y*w*4+x]));run.record(@"face-top-and-bottom-origins-protect-identical-visual-region",flipError<.003,@{@"maximumError":@(flipError)});[src setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];upload(portrait);
|
||||
NSMutableDictionary *masked=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters zeroP=DYMaskAtTime(zero,kCMTimeZero);zeroP.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&zeroP length:sizeof(zeroP)];masked[@"baseMasks"][@"skin"]=[NSMutableArray arrayWithObject:zero];u.skinVisualize=1;NSError *maskError=nil;BOOL maskOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:masked error:&maskError];Pixels empty=read(dst,gpu);double emptyMax=0;for(NSUInteger i=0;i<w*h;i++)emptyMax=MAX(emptyMax,(float)empty[i*4]);run.record(@"face-preview-respects-authored-zero-strength-mask",maskOK&&emptyMax<.001);
|
||||
u.skinVisualize=0;u.skinProtection.x=0;NSMutableDictionary *layers=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *skin=(id)DYInsertTool(layers,@"skin",@"base:skin");skin[@"values"][@"skinStrength"]=@100;skin[@"values"][@"skinVisualize"]=@1;BOOL layerOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:layers error:&maskError];Pixels layerMask=read(dst,gpu);double layerFace=0,layerBackground=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)layerFace=MAX(layerFace,(float)layerMask[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)layerBackground=MAX(layerBackground,(float)layerMask[(y*w+x)*4]);run.record(@"face-independent-layer-uses-own-preview-and-face-mask",layerOK&&layerFace>.01&&layerBackground<.001);
|
||||
u.skinVisualize=0;u.skinProtection.x=0;NSMutableDictionary *layers=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *skin=(id)DYInsertTool(layers,@"skin",@"base:skin");skin[@"values"][@"skinEnabled"]=@1;skin[@"values"][@"skinStrength"]=@100;skin[@"values"][@"skinVisualize"]=@1;BOOL layerOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:layers error:&maskError];Pixels layerMask=read(dst,gpu);double layerFace=0,layerBackground=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)layerFace=MAX(layerFace,(float)layerMask[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)layerBackground=MAX(layerBackground,(float)layerMask[(y*w+x)*4]);run.record(@"face-independent-layer-uses-own-preview-and-face-mask",layerOK&&layerFace>.01&&layerBackground<.001);
|
||||
DYDiagnosticTile *twoSource=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease],*twoDest=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease];Pixels two(1024*512*4);for(NSUInteger y=0;y<512;y++)for(NSUInteger x=0;x<1024;x++)memcpy(two.data()+(y*1024+x)*4,portrait.data()+(y*512+x%512)*4,8);[[twoSource metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,1024,512)mipmapLevel:0 withBytes:two.data()bytesPerRow:1024*8];u.skinProtection.x=1;BOOL twoOK=[face renderSource:twoSource destination:twoDest uniforms:u paths:@{}error:&maskError];NSData *twoEntries=[face valueForKey:@"faceEntries"];const DYToolMaskEntry *twoMasks=(const DYToolMaskEntry*)twoEntries.bytes;NSInteger faceCount=0;for(NSUInteger i=0;i<twoEntries.length/sizeof(*twoMasks);i++)faceCount+=twoMasks[i].section==-100;run.record(@"face-multiple-people-build-independent-support-regions",twoOK&&faceCount==2,@{@"faces":@(faceCount)});
|
||||
NSMutableDictionary *privacy=DYMutablePlist(DYInitialToolDocument(nil));privacy[@"mosaic"]=@{@"enabled":@YES,@"source":@"face",@"size":@64};DYUniforms privacyU=defaults;privacyU.primarySectionEnabled=0;privacyU.skinProtection.x=0;
|
||||
BOOL privacyOK=[face renderSource:src destination:dst uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels privateFrame=read(dst,gpu);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#import "DYToolState.h"
|
||||
#import "DYInspector.h"
|
||||
#import "DYManagedColor.h"
|
||||
#include "DYScopeMath.hpp"
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#import <os/log.h>
|
||||
#include <cmath>
|
||||
@@ -83,9 +83,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
else if(_mode==2){NSData *hist=_metadata[@"histogram"];if(hist.length==4*dyscope::Bins*sizeof(uint32_t)){auto *bins=(const uint32_t*)hist.bytes;uint32_t maximum=1;for(unsigned i=0;i<4*dyscope::Bins;i++)maximum=std::max(maximum,bins[i]);NSArray *colors=@[[NSColor colorWithWhite:.8 alpha:.8],NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor];for(unsigned c=0;c<4;c++){[colors[c]setStroke];NSBezierPath *line=[NSBezierPath bezierPath];for(unsigned x=0;x<dyscope::Bins;x++){NSPoint q=NSMakePoint(plot.origin.x+x*plot.size.width/255,NSMaxY(plot)-std::log1p(double(bins[c*dyscope::Bins+x]))/std::log1p(double(maximum))*plot.size.height);if(x)[line lineToPoint:q];else[line moveToPoint:q];}[line stroke];}}}
|
||||
else{[[NSBezierPath bezierPathWithOvalInRect:plot]stroke];NSBezierPath *axes=[NSBezierPath bezierPath];[axes moveToPoint:NSMakePoint(NSMidX(plot),NSMinY(plot))];[axes lineToPoint:NSMakePoint(NSMidX(plot),NSMaxY(plot))];[axes moveToPoint:NSMakePoint(NSMinX(plot),NSMidY(plot))];[axes lineToPoint:NSMakePoint(NSMaxX(plot),NSMidY(plot))];[axes stroke];
|
||||
// A quiet dashed reference stays legible over the trace without obscuring it.
|
||||
NSPoint skin=NSMakePoint(NSMidX(plot)+dyscope::SkinToneCb*plot.size.width*.49,NSMidY(plot)-dyscope::SkinToneCr*plot.size.height*.49);
|
||||
NSPoint skin=DYSkinScopePoint(plot,.98);
|
||||
NSBezierPath *skinLine=[NSBezierPath bezierPath];CGFloat dash[]={3,3};[skinLine setLineDash:dash count:2 phase:0];skinLine.lineWidth=.8;[[NSColor colorWithRed:.92 green:.75 blue:.56 alpha:.85]setStroke];[skinLine moveToPoint:NSMakePoint(NSMidX(plot),NSMidY(plot))];[skinLine lineToPoint:skin];[skinLine stroke];
|
||||
[@"肤色" drawAtPoint:NSMakePoint(skin.x-19,skin.y-10)withAttributes:text];float rgb[6][3]={{1,0,0},{1,0,1},{0,0,1},{0,1,1},{0,1,0},{1,1,0}};NSArray *names=@[@"R",@"Mg",@"B",@"Cy",@"G",@"Y"];for(int i=0;i<6;i++){float y=.2126f*rgb[i][0]+.7152f*rgb[i][1]+.0722f*rgb[i][2],cb=(rgb[i][2]-y)/1.8556f,cr=(rgb[i][0]-y)/1.5748f;NSPoint q=NSMakePoint(NSMidX(plot)+cb/1.2f*plot.size.width,NSMidY(plot)-cr/1.2f*plot.size.height);[[NSColor colorWithRed:rgb[i][0]*.65+.3 green:rgb[i][1]*.65+.3 blue:rgb[i][2]*.65+.3 alpha:1]setStroke];[[NSBezierPath bezierPathWithRect:NSMakeRect(q.x-2,q.y-2,4,4)]stroke];[names[i]drawAtPoint:NSMakePoint(q.x+3,q.y-5)withAttributes:text];}}
|
||||
[@"肤色" drawAtPoint:NSMakePoint(skin.x-19,skin.y-10)withAttributes:text];float rgb[6][3]={{1,0,0},{1,0,1},{0,0,1},{0,1,1},{0,1,0},{1,1,0}};NSArray *names=@[@"R",@"Mg",@"B",@"Cy",@"G",@"Y"];for(int i=0;i<6;i++){dyscope::RGBA color={rgb[i][0],rgb[i][1],rgb[i][2],1};auto chroma=dyscope::chroma(color,dyscope::luminance(color));NSPoint q=DYScopePoint(plot,chroma.cb,chroma.cr);[[NSColor colorWithRed:rgb[i][0]*.65+.3 green:rgb[i][1]*.65+.3 blue:rgb[i][2]*.65+.3 alpha:1]setStroke];[[NSBezierPath bezierPathWithRect:NSMakeRect(q.x-2,q.y-2,4,4)]stroke];[names[i]drawAtPoint:NSMakePoint(q.x+3,q.y-5)withAttributes:text];}}
|
||||
if(!_metadata){NSString *message=@"等待画面";[message drawAtPoint:NSMakePoint(NSMidX(plot)-20,NSMidY(plot)-6)withAttributes:text];}
|
||||
}
|
||||
@end
|
||||
|
||||
+32
-3
@@ -1,4 +1,5 @@
|
||||
#import "DYScopeSample.h"
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#import "DYHistogram.h"
|
||||
#include "DYFilmMath.h"
|
||||
@@ -58,6 +59,7 @@
|
||||
- (void)changeHueCount:(int)hues saturationCount:(int)saturation;
|
||||
- (void)resetMesh;
|
||||
- (NSPoint)point:(NSInteger)index;
|
||||
- (NSRect)discRect;
|
||||
- (void)selectRing;
|
||||
- (void)selectSpoke;
|
||||
- (void)resetSelected;
|
||||
@@ -188,6 +190,15 @@ static Pixels referenceFrame(id<MTLDevice> gpu,id<MTLLibrary> library,const Pixe
|
||||
static float *field(DYUniforms *u,NSDictionary *row){return (float *)((uint8_t *)u+[row[@"offset"]unsignedIntegerValue]);}
|
||||
}
|
||||
|
||||
@interface DYRenderer (IdlePreviewProbe)
|
||||
- (void)prepareFaceSupport:(FxImageTile*)source;
|
||||
@end
|
||||
@interface DYIdlePreviewProbe : DYRenderer { @public NSUInteger faceCalls; }
|
||||
@end
|
||||
@implementation DYIdlePreviewProbe
|
||||
- (void)prepareFaceSupport:(FxImageTile*)source {faceCalls++;[super prepareFaceSupport:source];}
|
||||
@end
|
||||
|
||||
extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
Run run;NSString *runtime=nil;NSString *gpuName=@"unavailable";
|
||||
@try {
|
||||
@@ -205,8 +216,8 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
run.need(@"finite-real-model-defaults",finite&&matches);
|
||||
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22&&defaults.cm.toneMapping==1);
|
||||
bool initialGroups=true;
|
||||
for(NSDictionary *section in sections){BOOL base=YES;for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
|
||||
run.record(@"all-module-eyes-enabled-by-default",initialGroups);
|
||||
for(NSDictionary *section in sections){BOOL base=![section[@"key"]isEqual:@"skin"];for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
|
||||
run.record(@"module-eyes-enabled-by-default-except-skin",initialGroups);
|
||||
DYDiagnosticManager *manager=[[[DYDiagnosticManager alloc]init]autorelease];error=nil;
|
||||
run.need(@"native-parameter-creation",DYCreateParameters(manager,&error)&&!manager->_duplicate&&manager->_values.count==descriptors.count&&manager->_custom.count==4,@{@"error":reason(error)});
|
||||
id<FxParameterSettingAPI_v6> setter=[manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];id<FxParameterRetrievalAPI_v6> getter=[manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
@@ -215,6 +226,15 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
[setter setFloatValue:1 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==1;
|
||||
[setter setFloatValue:0 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==0;
|
||||
run.record(@"historical-host-mapping-default-and-explicit-on-off-preserved",mappingPID&&storedMapping);
|
||||
UInt32 skinPID=[DYToolSection(@"skin")[@"enabled"]unsignedIntValue];
|
||||
DYUniforms legacySkin;DYReadUniforms(manager,kCMTimeZero,&legacySkin);
|
||||
[setter setFloatValue:0 toParameter:skinPID atTime:kCMTimeZero];DYUniforms newSkin;DYReadUniforms(manager,kCMTimeZero,&newSkin);
|
||||
auto insertedSkin=DYToolUniforms(DYNewTool(@"skin"));
|
||||
auto existingSkin=DYToolUniforms(@{@"type":@"skin",@"values":@{@"skinStrength":@60}});
|
||||
run.record(@"skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
skinPID&&defaults.skinProtection.x==0&&legacySkin.skinProtection.x==1&&newSkin.skinProtection.x==0&&
|
||||
insertedSkin.skinProtection.x==0&&insertedSkin.skinProtection.y==60&&existingSkin.skinProtection.x==1);
|
||||
[setter setFloatValue:1 toParameter:skinPID atTime:kCMTimeZero];
|
||||
[setter setFloatValue:.75 toParameter:2000 atTime:kCMTimeZero];double value=0;[getter getFloatValue:&value fromParameter:2000 atTime:kCMTimeZero];DYUniforms restored;DYReadUniforms(manager,kCMTimeZero,&restored);
|
||||
run.record(@"native-get-set-model-roundtrip",value==.75&&restored.exposure==.75f);
|
||||
[setter setFloatValue:999 toParameter:2000 atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&restored);run.record(@"model-clamps-host-out-of-range",restored.exposure==5);
|
||||
@@ -307,7 +327,15 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
NSView *spiderPanel=[inspector valueForKey:@"spiderPanel"];NSView<DYSpiderProbe> *disc=(id)[spiderPanel valueForKey:@"disc"];[disc setFrameSize:NSMakeSize(310,300)];auto initialMesh=DYSpiderMesh(disc.meshData);
|
||||
run.record(@"spider-default-six-by-six-31-nodes",initialMesh.hues==6&&initialMesh.rings==5&&dy::meshCount(initialMesh)==31);
|
||||
auto selectNode=[&](int index,NSEventModifierFlags flags){NSPoint pt=[disc point:index];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,pt,flags)];[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,pt,flags)];};
|
||||
auto dragNode=[&](int index,float dx,float dy){NSPoint pt=[disc point:index];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,pt)];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(pt.x+dx*.5,pt.y+dy*.5))];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(pt.x+dx,pt.y+dy))];[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,NSMakePoint(pt.x+dx,pt.y+dy))];};
|
||||
auto dragNode=[&](int index,float dx,float dy){
|
||||
NSPoint start=[disc point:index];NSRect rect=disc.discRect;
|
||||
auto mesh=DYSpiderMesh(disc.meshData);
|
||||
NSPoint target=DYSpiderPlotPoint(rect,mesh.x[index]+dx/NSWidth(rect),mesh.y[index]+dy/NSHeight(rect));
|
||||
[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,start)];
|
||||
[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint((start.x+target.x)*.5,(start.y+target.y)*.5))];
|
||||
[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,target)];
|
||||
[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,target)];
|
||||
};
|
||||
starts=uiHost->_undoStarts;ends=uiHost->_undoEnds;dragNode(2,18,8);DYAssetState *spiderSaved=DYReadAssets(uiHost,kCMTimeZero);auto dragged=DYSpiderMesh(spiderSaved.spiderMesh);
|
||||
run.record(@"spider-single-drag-spoke-following-and-pin",dragged.x[0]>initialMesh.x[0]&&dragged.x[1]>initialMesh.x[1]&&dragged.x[3]>initialMesh.x[3]&&dragged.x[4]==initialMesh.x[4]&&dragged.x[5]==initialMesh.x[5]&&dragged.pins[2]);
|
||||
run.record(@"spider-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive);
|
||||
@@ -335,6 +363,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
defaults.cm.inputTransfer=1002;defaults.cm.inputGamut=22;defaults.cm.toneMapping=0;
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];Pixels neutral=render(run,renderer,source,destination,gpu,defaults,@{},@"renderer-default-pass");Difference neutralDifference=difference(input,neutral);
|
||||
run.record(@"transparent-premultiplied-neutral",neutralDifference.nonfinite==0&&neutralDifference.maximum<=.001,measure(neutralDifference));
|
||||
#include "DYIdlePreviewDiagnostics.inc.h"
|
||||
NSString *cstReference=NSProcessInfo.processInfo.environment[@"DY_DIAGNOSTIC_CST_REFERENCE"];
|
||||
if(cstReference.length){
|
||||
error=nil;id<MTLLibrary>oracle=[gpu newLibraryWithURL:[NSURL fileURLWithPath:cstReference] error:&error];run.need(@"independent-installed-cst-reference-loaded",oracle!=nil,@{@"path":cstReference,@"error":reason(error)});
|
||||
|
||||
@@ -35,7 +35,12 @@
|
||||
[handler release];[request release];_faceEntries=[[NSData alloc]initWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry)];[_faceCachedEntries release];_faceCachedEntries=[_faceEntries copy];
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
|
||||
DYUniforms effective=u;bypassNeutralTools(&effective);bypassIdleSkin(&effective);BOOL face=effective.skinProtection.x>.5&&(u.skinFaceOnly>.5||u.skinVisualize>.5);for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);face|=[node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinFaceOnly>.5;}
|
||||
DYUniforms effective=DYEffectiveFaceUniforms(u,paths,tools);BOOL face=effective.skinProtection.x>.5&&(effective.skinProtection.y>0||effective.skinVisualize>.5)&&(effective.skinFaceOnly>.5||effective.skinVisualize>.5);for(NSDictionary *node in tools[@"layers"]){
|
||||
if(face)break;
|
||||
if(![node[@"type"]isEqual:@"skin"]||DYToolIsNeutral(node))continue;
|
||||
DYUniforms layer=DYToolUniforms(node);
|
||||
face=layer.skinProtection.x>.5&&(layer.skinFaceOnly>.5||layer.skinVisualize>.5);
|
||||
}
|
||||
if(face&&!_exporting)[self prepareFaceSupport:src];else{[_faceEntries release];_faceEntries=nil;}
|
||||
BOOL ok=[self renderToolsSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
return ok;
|
||||
@@ -43,6 +48,7 @@
|
||||
- (BOOL)renderLens:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)u masks:(NSArray*)masks entry:(NSDictionary*)entry error:(NSError**)error {
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)u.lensCenterY=1-u.lensCenterY;
|
||||
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d],output=[destination metalTextureForDevice:d];
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:entry[@"dyLensRepair"]];[ce setTexture:before atIndex:0];[ce setTexture:output atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];float aspect=before.width*source.pixelAspect/MAX(1.,(double)before.height);[ce setBytes:&aspect length:sizeof(aspect) atIndex:1];[ce dispatchThreads:MTLSizeMake(output.width,output.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
|
||||
if(!masks.count)return YES;MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:output.pixelFormat width:output.width height:output.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>blend=[d newTextureWithDescriptor:desc];if(!blend)return fail(error,@"无法分配修复蒙版");DYToolMaskHeader h{};h.section=(int)[DYToolTypes()indexOfObject:@"lens"];id<MTLBuffer>buffer=[self maskBuffer:@{@"lens":masks}tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];[self encodeBlend:before after:output output:blend masks:buffer header:h entry:entry commands:cb];[cb commit];[cb waitUntilCompleted];DYExportTile *tile=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[tile setBounds:destination.tilePixelBounds origin:destination.imageOrigin];[tile setPixelAspect:destination.pixelAspect];BOOL ok=cb.status==MTLCommandBufferStatusCompleted&&[self copyTile:tile to:destination entry:entry error:error];[tile release];[blend release];return ok;
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:@"dyLensRepair" entry:entry error:error];if(!pipeline)return NO;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:output atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];float aspect=before.width*source.pixelAspect/MAX(1.,(double)before.height);[ce setBytes:&aspect length:sizeof(aspect) atIndex:1];[ce dispatchThreads:MTLSizeMake(output.width,output.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
|
||||
if(!masks.count)return YES;MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:output.pixelFormat width:output.width height:output.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>blend=[d newTextureWithDescriptor:desc];if(!blend)return fail(error,@"无法分配修复蒙版");DYToolMaskHeader h{};h.section=(int)[DYToolTypes()indexOfObject:@"lens"];id<MTLBuffer>buffer=[self maskBuffer:@{@"lens":masks}tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];if(![self encodeBlend:before after:output output:blend masks:buffer header:h entry:entry commands:cb error:error]){[blend release];return NO;}[cb commit];[cb waitUntilCompleted];DYExportTile *tile=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[tile setBounds:destination.tilePixelBounds origin:destination.imageOrigin];[tile setPixelAspect:destination.pixelAspect];BOOL ok=cb.status==MTLCommandBufferStatusCompleted&&[self copyTile:tile to:destination entry:entry error:error];[tile release];[blend release];return ok;
|
||||
}
|
||||
@@ -20,6 +20,14 @@
|
||||
ci=[[ci imageByApplyingFilter:@"CIGaussianBlur" withInputParameters:@{kCIInputRadiusKey:@(radius)}]imageByCroppingToRect:bounds];
|
||||
[context render:ci toMTLTexture:output commandBuffer:commands bounds:bounds colorSpace:nil];return YES;
|
||||
};
|
||||
NSMutableArray *needed=[NSMutableArray arrayWithObject:@"dyFilmPoint"];
|
||||
if(!mixer){
|
||||
if(DYFilmBloomActive(u.film))[needed addObjectsFromArray:@[@"dyFilmSparseBlur",@"dyFilmBloomEdges"]];
|
||||
if(DYFilmGrainActive(u.film))[needed addObject:@"dyFilmNoise"];
|
||||
if(DYFilmPrintActive(u))[needed addObject:@"dyFilmPrint"];
|
||||
if(u.film.mix<1)[needed addObject:@"dyFilmMix"];
|
||||
}
|
||||
for(NSString *name in needed)if(![self computePipeline:name entry:entry error:error])return NO;
|
||||
auto encode=[&](NSString *name,id<MTLTexture>a,id<MTLTexture>b,id<MTLTexture>out,const void *data,NSUInteger length){
|
||||
id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[name]];[ce setTexture:a atIndex:0];if(b)[ce setTexture:b atIndex:1];[ce setTexture:out atIndex:b?2:1];if(data)[ce setBytes:data length:length atIndex:0];[ce dispatchThreads:MTLSizeMake(out.width,out.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
};
|
||||
@@ -61,7 +69,7 @@
|
||||
}
|
||||
// Finish the effect before the module's existing mask blend. Source and
|
||||
// result retain identical alpha, and an empty mask group means full coverage.
|
||||
if(masks.count){id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return fail(error,@"无法分配胶片蒙版缓冲区");DYToolMaskHeader header{};header.section=(int)[DYToolTypes()indexOfObject:type];id<MTLBuffer>buffer=[self maskBuffer:@{type:masks} tile:source device:d header:&header];[self encodeBlend:before after:current output:out masks:buffer header:header entry:entry commands:commands];current=out;}
|
||||
if(masks.count){id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return fail(error,@"无法分配胶片蒙版缓冲区");DYToolMaskHeader header{};header.section=(int)[DYToolTypes()indexOfObject:type];id<MTLBuffer>buffer=[self maskBuffer:@{type:masks} tile:source device:d header:&header];if(![self encodeBlend:before after:current output:out masks:buffer header:header entry:entry commands:commands error:error])return NO;current=out;}
|
||||
[commands commit];[commands waitUntilCompleted];if(commands.status!=MTLCommandBufferStatusCompleted)return fail(error,commands.error.localizedDescription);
|
||||
DYExportTile *result=[[[DYExportTile alloc]initWithTexture:current registry:d.registryID]autorelease];[result setBounds:source.tilePixelBounds origin:source.imageOrigin];[result setPixelAspect:source.pixelAspect];return [self copyTile:result to:destination entry:entry error:error];
|
||||
}@catch(NSException *exception){return fail(error,[@"胶片处理失败:" stringByAppendingString:exception.reason?:@""]);}
|
||||
|
||||
+25
-8
@@ -232,16 +232,30 @@ fragment half4 dySegmentFragment(DYRaster in [[stage_in]],
|
||||
// Optional boundary conversion. Use this before both statistics and grading
|
||||
// when the host supplies premultiplied RGB; all neighborhood samples then see
|
||||
// the same straight RGB representation. Source and destination must differ.
|
||||
inline half4 dyStraightSample(float4 sample) {
|
||||
if (!(sample.a > 0.0f) || !all(isfinite(sample))) return half4(0.0h);
|
||||
return half4(half3(sample.rgb / sample.a), half(sample.a));
|
||||
}
|
||||
|
||||
kernel void dyUnpremultiply(texture2d<float, access::read> source [[texture(0)]],
|
||||
texture2d<half, access::write> destination [[texture(1)]],
|
||||
uint2 pixel [[thread_position_in_grid]]) {
|
||||
if (pixel.x >= destination.get_width() || pixel.y >= destination.get_height()) return;
|
||||
float4 sample = source.read(pixel);
|
||||
if (!(sample.a > 0.0f) || !all(isfinite(sample))) {
|
||||
destination.write(half4(0.0h), pixel);
|
||||
return;
|
||||
}
|
||||
destination.write(half4(half3(sample.rgb / sample.a), half(sample.a)), pixel);
|
||||
destination.write(dyStraightSample(source.read(pixel)), pixel);
|
||||
}
|
||||
|
||||
// Match the historical half-precision alpha round trip without an intermediate
|
||||
// texture when source and destination cover the same pixel grid.
|
||||
fragment half4 dyNeutralInputFragment(DYRaster in [[stage_in]],texture2d<float,access::read> source [[texture(0)]]) {
|
||||
uint2 size(source.get_width(),source.get_height());
|
||||
half4 c=dyStraightSample(source.read(min(uint2(in.uv*float2(size)),size-1)));
|
||||
return c.a>0.0h?half4(c.rgb*c.a,c.a):half4(0.0h);
|
||||
}
|
||||
|
||||
fragment half4 dyNeutralOutputFragment(DYRaster in [[stage_in]],texture2d<half> source [[texture(0)]]) {
|
||||
constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);
|
||||
half4 c=source.sample(f,in.uv);
|
||||
return c.a>0.0h?half4(c.rgb*c.a,c.a):half4(0.0h);
|
||||
}
|
||||
|
||||
// Per-instance CPU analysis thumbnail. Host dispatches exactly 64x64 threads;
|
||||
@@ -314,9 +328,12 @@ inline float3 dyDecode(float3 encoded) {
|
||||
}
|
||||
kernel void dyColorManagement(texture2d<float,access::read> source [[texture(0)]],
|
||||
texture2d<half,access::write> destination [[texture(1)]],
|
||||
constant DayuRenderParams& p [[buffer(0)]],constant float& amount [[buffer(1)]],uint2 pos [[thread_position_in_grid]]) {
|
||||
constant DayuRenderParams& p [[buffer(0)]],constant float& amount [[buffer(1)]],
|
||||
constant uint& premultiplied [[buffer(2)]],uint2 pos [[thread_position_in_grid]]) {
|
||||
if(pos.x>=source.get_width()||pos.y>=source.get_height())return;
|
||||
float4 sample=source.read(pos);if(!(sample.a>0)){destination.write(half4(0),pos);return;}
|
||||
float4 sample=source.read(pos);
|
||||
if(premultiplied)sample=float4(dyStraightSample(sample));
|
||||
if(!(sample.a>0)){destination.write(half4(0),pos);return;}
|
||||
float4 raw=float4(dyEncode(sample.rgb),sample.a),c=raw;
|
||||
if(p.stages&1)c=cst_air(half4(c),p.input);
|
||||
if(p.stages&2){if(p.reserved&8)c=cst_air(half4(c),p.basisInput);c=basis_air(half4(c),p.basis);if(p.reserved&8)c=cst_air(half4(c),p.basisOutput);}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
// A fresh renderer must not detect faces or choose the polygon-mask shader
|
||||
// merely because the untouched skin eye / face-only option is enabled.
|
||||
{
|
||||
DYIdlePreviewProbe *probe=[[[DYIdlePreviewProbe alloc]init]autorelease];
|
||||
DYUniforms fresh;DYDefaultUniforms(&fresh);DYUniforms saved=fresh;
|
||||
Pixels actual=render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-default-render");
|
||||
run.record(@"idle-preview-default-no-face-inference",probe->faceCalls==0);
|
||||
BOOL masked=NO;for(NSDictionary *device in [[probe valueForKey:@"devices"]allValues])for(NSString *key in device[@"pipelines"])masked|=[key hasSuffix:@"-1-0"];
|
||||
run.record(@"idle-preview-default-no-polygon-mask-pipeline",!masked);
|
||||
fresh.skinFaceOnly=0;Pixels reference=render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-reference-render");
|
||||
run.record(@"idle-preview-matches-neutral-with-face-option-off",difference(actual,reference).maximum<.002);
|
||||
run.record(@"idle-preview-preserves-saved-default-controls",saved.skinFaceOnly==1&&saved.skinProtection.x==0&&saved.preLUTStrength==1&&saved.cm.blackWhiteMix==0);
|
||||
saved.skinProtection.x=1; // Explicitly exercise the enabled path below.
|
||||
fresh=saved;fresh.saturation=25;render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-active-color-render");
|
||||
run.record(@"idle-preview-active-color-still-detects-faces",probe->faceCalls==1);
|
||||
fresh=saved;fresh.skinVisualize=1;render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-skin-selection-render");
|
||||
run.record(@"idle-preview-visualize-still-detects-faces",probe->faceCalls==2);
|
||||
fresh=saved;fresh.lookSectionEnabled=0;render(run,probe,source,destination,gpu,fresh,@{@"look0":@"/unavailable/disabled.cube"},@"idle-preview-disabled-lut-render");
|
||||
run.record(@"idle-preview-disabled-lut-does-not-trigger-face-work",probe->faceCalls==2);
|
||||
fresh=saved;fresh.cm.blackWhiteMix=.5;render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-blackwhite-render");
|
||||
run.record(@"idle-preview-active-blackwhite-still-detects-faces",probe->faceCalls==3);
|
||||
fresh=saved;NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));DYInsertTool(doc,@"skin",@"base:skin");
|
||||
NSError *idleError=nil;BOOL idleOK=[probe renderSource:source destination:destination uniforms:fresh paths:@{} spider:nil tools:doc error:&idleError];
|
||||
run.record(@"idle-preview-empty-extra-skin-does-not-trigger-face-work",idleOK&&probe->faceCalls==3);
|
||||
}
|
||||
{
|
||||
DYRenderer *fast=[[[DYRenderer alloc]init]autorelease];
|
||||
DYUniforms untouched=defaults;untouched.primarySectionEnabled=0;
|
||||
Pixels wide=input;
|
||||
for(NSUInteger i=0;i<wide.size();i+=4){wide[i]*=-2;wide[i+1]*=4;}
|
||||
id<MTLTexture> texture=[source metalTextureForDevice:gpu];
|
||||
MTLRegion region=MTLRegionMake2D(0,0,width,height);
|
||||
[texture replaceRegion:region mipmapLevel:0 withBytes:wide.data() bytesPerRow:width*8];
|
||||
Pixels previewFrame=render(run,fast,source,destination,gpu,untouched,@{},@"neutral-preview-frame");
|
||||
NSError *fastError=nil;CMTime time=CMTimeMake(5,24);
|
||||
BOOL rendered=[fast renderHostSource:source destination:destination uniforms:untouched paths:@{} spider:nil tools:nil colorManagement:nil hostPrimaries:-1 atTime:time error:&fastError];
|
||||
Difference delta=difference(previewFrame,read(destination,gpu));
|
||||
BOOL direct=NO,lazy=YES;
|
||||
for(NSDictionary *entry in [[fast valueForKey:@"devices"]allValues]){
|
||||
for(NSString *key in entry[@"pipelines"])direct|=[key hasPrefix:@"dyNeutralInputFragment-"];
|
||||
lazy&=!entry[@"dyFilmNoise"]&&!entry[@"dyCloneStamps"]&&!entry[@"dyLensRepair"];
|
||||
}
|
||||
run.record(@"neutral-direct-preserves-hdr-negative-and-alpha",rendered&&direct&&delta.maximum==0&&delta.nonfinite==0,measure(delta));
|
||||
run.record(@"neutral-render-defers-unused-gpu-pipelines",lazy);
|
||||
DYScopeSample *sample=[[[fast valueForKey:@"scopeLatest"]retain]autorelease];
|
||||
run.record(@"final-scope-captured-with-neutral-output",[sample.metadata[@"timeValue"]integerValue]==5&&[sample.metadata[@"timeScale"]integerValue]==24&&sample.pixels.length==320*180*16);
|
||||
[fast captureScopeTile:destination atTime:time];
|
||||
run.record(@"final-scope-inline-matches-separate-capture",[sample.pixels isEqual:[[fast valueForKey:@"scopeLatest"]pixels]]);
|
||||
[texture replaceRegion:region mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
|
||||
}
|
||||
+28
-20
@@ -565,7 +565,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(rememberWorkspaceSelection:) name:@"DYWorkspaceToolSelection" object:_manager];
|
||||
if(_renderer){
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYOutputHistogramDidChange" object:_renderer];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYFinalOutputDidChange" object:_renderer];
|
||||
}
|
||||
[self themeChanged:nil];
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
@@ -736,7 +736,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if([key isEqual:@"grading"]) {
|
||||
DYWheelPanel *wheels=[[[DYWheelPanel alloc]initWithFrame:NSZeroRect]autorelease];wheels.delegate=self;wheels.identifier=@"gradingWheels";[card addSubview:wheels];[body addObject:wheels];[_graphics addObject:wheels];
|
||||
}
|
||||
if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;_spiderPanel.horizontalLayout=_workspaceEditor;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];}
|
||||
if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;[_spiderPanel setScopeRenderer:_renderer];_spiderPanel.horizontalLayout=_workspaceEditor;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];}
|
||||
for(NSDictionary *d in section[@"rows"]) {
|
||||
DYFlippedView *row=[[[DYFlippedView alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
row.identifier=d[@"key"];
|
||||
@@ -975,7 +975,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI]; if(!action)return;
|
||||
_refreshing=YES;
|
||||
uint64_t beta=DYBetaSpanBegin(@"inspector_refresh",nil);
|
||||
BOOL groupingChanged=NO;NSString *recentPath=nil;
|
||||
BOOL groupingChanged=NO;NSString *recentPath=nil;NSDictionary *stackDocument=nil;
|
||||
[action startAction:self];
|
||||
@try {
|
||||
CMTime t=action.currentTime;
|
||||
@@ -985,23 +985,31 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
NSDictionary *cms=_embedded?DYReadAssets(maskHost,t).colorManagement:assets.colorManagement;
|
||||
NSDictionary *tools=DYReadTools(maskHost,t).document;
|
||||
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
|
||||
BOOL wasUnified=_unified;
|
||||
_unified=DYUnifiedColorState(cms);
|
||||
groupingChanged=wasUnified!=_unified;
|
||||
if(!_embedded&&!_workspaceEditor){
|
||||
[_renderOrder release];_renderOrder=[DYUnifiedRenderOrder(tools)copy];
|
||||
NSMutableDictionary *primary=nil,*output=nil;for(NSMutableDictionary *card in _cards){if([card[@"section"][@"key"]isEqual:@"primary"])primary=card;if([card[@"section"][@"key"]isEqual:@"output"])output=card;}
|
||||
if(!_renderOrder||groupingChanged){
|
||||
NSMutableDictionary *primary=nil,*output=nil;for(NSMutableDictionary *card in _cards){if([card[@"section"][@"key"]isEqual:@"primary"])primary=card;if([card[@"section"][@"key"]isEqual:@"output"])output=card;}
|
||||
NSMutableArray *body=[NSMutableArray arrayWithArray:primary[@"body"]];
|
||||
for(NSView *row in output[@"body"]){if([row.identifier isEqual:@"toolMasks"])continue;[body removeObjectIdenticalTo:row];[(_unified?output:primary)[@"view"]addSubview:row];if(!_unified)[body addObject:row];}
|
||||
primary[@"body"]=body;
|
||||
primary[@"body"]=body;
|
||||
}
|
||||
NSArray *order=DYUnifiedRenderOrder(tools);
|
||||
if(![_renderOrder isEqualToArray:order]){[_renderOrder release];_renderOrder=[order copy];}
|
||||
}
|
||||
NSDictionary *initialTools=tools;
|
||||
for(NSMutableDictionary *card in _cards){NSString *type=card[@"section"][@"key"];card[@"removed"]=@([type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(initialTools,type));}
|
||||
NSMutableDictionary *graphicValues=[NSMutableDictionary dictionary];
|
||||
NSMutableDictionary *graphicValues=[NSMutableDictionary dictionary],*readValues=[NSMutableDictionary dictionary];
|
||||
auto readValue=[&](NSNumber *pid,double fallback){
|
||||
if(!pid)return fallback;
|
||||
NSNumber *cached=readValues[pid];if(cached)return cached.doubleValue;
|
||||
double value=fallback;[get getFloatValue:&value fromParameter:pid.unsignedIntValue atTime:t];
|
||||
if(!std::isfinite(value))value=fallback;
|
||||
readValues[pid]=@(value);return value;
|
||||
};
|
||||
for(NSNumber *pid in _controls) {
|
||||
NSDictionary *r=_controls[pid],*d=r[@"descriptor"]; double v=[d[@"default"] doubleValue];
|
||||
[get getFloatValue:&v fromParameter:pid.unsignedIntValue atTime:t];
|
||||
if(!std::isfinite(v))v=[d[@"default"] doubleValue];
|
||||
NSDictionary *r=_controls[pid],*d=r[@"descriptor"];double v=readValue(pid,[d[@"default"]doubleValue]);
|
||||
graphicValues[d[@"key"]]=@(v);
|
||||
if(d[@"enabled"]) {double enabled=1;[get getFloatValue:&enabled fromParameter:[d[@"enabled"] unsignedIntValue] atTime:t];[r[@"itemEnabled"] setState:enabled>=.5?NSControlStateValueOn:NSControlStateValueOff];[r[@"itemEnabled"] setImage:[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"]];for(NSString *control in @[@"slider",@"field",@"popup"]) [r[control] setAlphaValue:enabled>=.5?1:.45];}
|
||||
if(d[@"enabled"]) {double enabled=readValue(d[@"enabled"],1);[r[@"itemEnabled"] setState:enabled>=.5?NSControlStateValueOn:NSControlStateValueOff];[r[@"itemEnabled"] setImage:[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"]];for(NSString *control in @[@"slider",@"field",@"popup"]) [r[control] setAlphaValue:enabled>=.5?1:.45];}
|
||||
[r[@"slider"] setDoubleValue:v]; [r[@"field"] setStringValue:DYNumber(v,d)];
|
||||
[r[@"toggle"] setState:v>=.5?NSControlStateValueOn:NSControlStateValueOff];
|
||||
NSPopUpButton *popup=r[@"popup"]; if(popup.numberOfItems>0){NSArray *values=d[@"values"];NSInteger index=values?[values indexOfObject:@((int)llround(v))]:(NSInteger)llround(v);[popup selectItemAtIndex:index==NSNotFound?0:MAX(0,MIN(index,popup.numberOfItems-1))];}
|
||||
@@ -1010,9 +1018,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
for(id graphic in _graphics)[graphic setValues:graphicValues];
|
||||
for(NSMutableDictionary *c in _cards) {
|
||||
NSNumber *pid=c[@"section"][@"enabled"];
|
||||
double v=[c[@"section"][@"defaultEnabled"]doubleValue];if(pid)[get getFloatValue:&v fromParameter:pid.unsignedIntValue atTime:t];
|
||||
NSNumber *extra=c[@"section"][@"extraEnabled"];double extraValue=0;
|
||||
if(extra)[get getFloatValue:&extraValue fromParameter:extra.unsignedIntValue atTime:t];
|
||||
double v=readValue(pid,[c[@"section"][@"defaultEnabled"]doubleValue]);
|
||||
double extraValue=readValue(c[@"section"][@"extraEnabled"],0);
|
||||
BOOL enabled=v>=.5||extraValue>=.5;
|
||||
NSNumber *saved=[oldToken isKindOfClass:DYInspectorToken.class]?oldToken.folds[c[@"section"][@"key"]]:nil;
|
||||
BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:![self initiallyExpandedSection:c[@"section"][@"key"]];
|
||||
@@ -1036,24 +1043,25 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
_tabs[@"managedColor"]=@(cms.count>0&&!DYPrimaryColorState(cms));_tabs[@"primaryCMS"]=@(DYPrimaryColorState(cms));[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];[_managedPanel setInputLUTPath:assets.paths[@"input"]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:([_tabs[@"managedColor"]boolValue]||[_tabs[@"primaryCMS"]boolValue])?@"调色混合":@"CST 混合"];
|
||||
for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:([_tabs[@"managedColor"]boolValue]||_unified)?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
|
||||
[_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked];
|
||||
double profile=0,configured=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];[get getFloatValue:&configured fromParameter:2236 atTime:t];
|
||||
double profile=readValue(@2013,0),configured=readValue(@2236,0);
|
||||
_tabs[@"legacyInput"]=@(configured<.5&&(configured<0||profile>.5||[assets.paths[@"input"]length]||oldToken.schema<2));
|
||||
for(NSString *key in _assetButtons) {
|
||||
NSString *path=assets.paths[key]; NSButton *button=_assetButtons[key][@"choose"];
|
||||
NSString *name=path.length?path.lastPathComponent.stringByDeletingPathExtension:@"无";
|
||||
if([key isEqual:@"input"]&&!path.length){double profile=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];for(NSDictionary *d in DYDescriptors())if([d[@"key"]isEqual:@"inputProfile"]){NSArray *options=d[@"options"];NSInteger index=MAX(0,MIN((NSInteger)llround(profile),(NSInteger)options.count-1));name=options[index];break;}}
|
||||
if([key isEqual:@"input"]&&!path.length){for(NSDictionary *d in DYDescriptors())if([d[@"key"]isEqual:@"inputProfile"]){NSArray *options=d[@"options"];NSInteger index=MAX(0,MIN((NSInteger)llround(profile),(NSInteger)options.count-1));name=options[index];break;}}
|
||||
button.title=_assetLoads[key]?@"正在载入…":name; button.toolTip=path.length?path:@"选择输入转换或 LUT;点击网格图标浏览缩略图";
|
||||
[_assetButtons[key][@"remove"] setEnabled:path.length>0];
|
||||
NSButton *eye=_assetButtons[key][@"eye"];if(eye){NSInteger slot=[[key substringFromIndex:4]integerValue];double enabled=1;[get getFloatValue:&enabled fromParameter:2040+(UInt32)slot-1 atTime:t];eye.state=enabled>=.5?NSControlStateValueOn:NSControlStateValueOff;eye.image=[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"];}
|
||||
NSButton *eye=_assetButtons[key][@"eye"];if(eye){NSInteger slot=[[key substringFromIndex:4]integerValue];double enabled=readValue(@(2040+(UInt32)slot-1),1);eye.state=enabled>=.5?NSControlStateValueOn:NSControlStateValueOff;eye.image=[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"];}
|
||||
}
|
||||
if(_recentBrowser)recentPath=[assets.paths[@"look0"]copy];
|
||||
for(NSInteger i=1;i<5;i++)if([assets.paths[[NSString stringWithFormat:@"look%ld",(long)i]]length])_visibleLooks=MAX(_visibleLooks,i+1);
|
||||
[self setNeedsLayout:YES];
|
||||
if(!_embedded&&!_workspaceEditor)stackDocument=[[tools copy]autorelease];
|
||||
} @finally { [action endAction:self]; _refreshing=NO; }
|
||||
[_recentBrowser refreshRecentSelection:recentPath];[recentPath release];
|
||||
// Remote layout/accessibility can re-enter the host. Let the parameter
|
||||
// action and current callback unwind before notifying the remote view.
|
||||
if(!_embedded&&!_workspaceEditor)[self synchronizeTools];
|
||||
if(stackDocument)[self synchronizeTools:stackDocument];
|
||||
DYBetaSpanEnd(beta,nil);
|
||||
if(groupingChanged)dispatch_async(dispatch_get_main_queue(),^{NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);});
|
||||
}
|
||||
|
||||
@@ -1,18 +1,14 @@
|
||||
- (void)managedPreview:(id<MTLTexture>)texture origin:(FxImageOrigin)origin entry:(NSMutableDictionary*)entry {
|
||||
@synchronized(_previewLock){if(_exporting||CACurrentMediaTime()-_lastPreview<=.5)return;}
|
||||
id<MTLComputePipelineState>p=[self managedKernel:@"dyManagedPreview" entry:entry error:nil];if(!p)return;
|
||||
id<MTLComputePipelineState>p=[self computePipeline:@"dyManagedPreview" entry:entry error:nil];if(!p)return;
|
||||
id<MTLBuffer>b=[entry[@"device"]newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];if(!b)return;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:texture atIndex:0];[ce setBuffer:b offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
|
||||
}
|
||||
// Included in DYRenderer. V1 callers and their ABI remain on renderSource:...tools:error:.
|
||||
- (NSDictionary*)colorContext {@synchronized(_previewLock){return [[_colorContext copy]autorelease];}}
|
||||
- (id<MTLComputePipelineState>)managedKernel:(NSString*)name entry:(NSMutableDictionary*)entry error:(NSError**)error {
|
||||
NSMutableDictionary *cache=entry[@"managedKernels"];if(!cache){cache=[NSMutableDictionary dictionary];entry[@"managedKernels"]=cache;}
|
||||
id<MTLComputePipelineState>pipeline=cache[name];if(!pipeline){id<MTLFunction>f=[entry[@"library"]newFunctionWithName:name];if(!f){fail(error,[@"色彩管理内核缺失:" stringByAppendingString:name]);return nil;}pipeline=[entry[@"device"]newComputePipelineStateWithFunction:f error:error];[f release];if(!pipeline)return nil;cache[name]=pipeline;[pipeline release];}return pipeline;
|
||||
}
|
||||
- (BOOL)managedDispatch:(NSString*)name textures:(NSArray*)textures data:(const void*)data length:(NSUInteger)length extra:(const void*)extra extraLength:(NSUInteger)extraLength entry:(NSMutableDictionary*)entry error:(NSError**)error {
|
||||
id<MTLComputePipelineState>pipeline=[self managedKernel:name entry:entry error:error];if(!pipeline)return NO;
|
||||
id<MTLComputePipelineState>pipeline=[self computePipeline:name entry:entry error:error];if(!pipeline)return NO;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];for(NSUInteger i=0;i<textures.count;i++)[ce setTexture:textures[i] atIndex:i];if(data)[ce setBytes:data length:length atIndex:0];if(extra)[ce setBytes:extra length:extraLength atIndex:1];id<MTLTexture>t=textures[0];[ce dispatchThreads:MTLSizeMake(t.width,t.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];return cb.status==MTLCommandBufferStatusCompleted?YES:fail(error,cb.error.localizedDescription);
|
||||
}
|
||||
- (BOOL)managedConvert:(dycm::Space)from to:(dycm::Space)to display:(NSInteger)display gamut:(BOOL)gamut input:(id<MTLTexture>)input output:(id<MTLTexture>)output entry:(NSMutableDictionary*)entry error:(NSError**)error {
|
||||
@@ -44,7 +40,8 @@
|
||||
if(image.left!=bounds.left||image.right!=bounds.right||image.top!=bounds.top||image.bottom!=bounds.bottom){
|
||||
fail(error,@"仿制图章需要宿主提供完整的源画面。");return nil;
|
||||
}
|
||||
NSDictionary *entry=[self device:registry error:error];if(!entry)return nil;
|
||||
NSMutableDictionary *entry=[self device:registry error:error];if(!entry)return nil;
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:@"dyCloneStamps" entry:entry error:error];if(!pipeline)return nil;
|
||||
id<MTLDevice>device=entry[@"device"];
|
||||
id<MTLTexture>input=[source metalTextureForDevice:device];
|
||||
if(!input||input.framebufferOnly){fail(error,@"仿制图章无法读取源画面。");return nil;}
|
||||
@@ -55,7 +52,7 @@
|
||||
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];
|
||||
if(!output||!encoder){fail(error,@"无法分配仿制图章缓冲区。");return nil;}
|
||||
uint32_t count=(uint32_t)stamps.size(),flip=source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;
|
||||
[encoder setComputePipelineState:entry[@"dyCloneStamps"]];
|
||||
[encoder setComputePipelineState:pipeline];
|
||||
[encoder setTexture:input atIndex:0];[encoder setTexture:output atIndex:1];
|
||||
[encoder setBytes:stamps.data() length:count*sizeof(DYCloneStamp) atIndex:0];
|
||||
[encoder setBytes:&count length:sizeof(count) atIndex:1];[encoder setBytes:&flip length:sizeof(flip) atIndex:2];
|
||||
@@ -120,7 +117,7 @@
|
||||
auto convert=[&](dycm::Space a,dycm::Space b,NSInteger display=0,BOOL gamut=NO){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配色彩管理缓冲区。");BOOL ok=[self managedConvert:a to:b display:display gamut:gamut input:current output:out entry:entry error:error];if(ok)current=out;return ok;};
|
||||
auto profile=[&](DYColorProfile*p){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配颜色配置缓冲区。");BOOL ok=[self managedProfile:p input:current output:out entry:entry error:error];if(ok)current=out;return ok;};
|
||||
auto tile=[&](id<MTLTexture>texture){DYExportTile*t=[[[DYExportTile alloc]initWithTexture:texture registry:d.registryID]autorelease];[t setBounds:src.tilePixelBounds origin:src.imageOrigin];[t setPixelAspect:src.pixelAspect];return t;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,NSString*type){if(!masks.count)return YES;id<MTLTexture>out=next(before);if(!out)return fail(error,@"无法分配工作空间蒙版缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];id<MTLComputePipelineState>p=[self managedKernel:@"dyManagedBlend" entry:entry error:error];if(!mb||!p)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,NSString*type){if(!masks.count)return YES;id<MTLTexture>out=next(before);if(!out)return fail(error,@"无法分配工作空间蒙版缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];id<MTLComputePipelineState>p=[self computePipeline:@"dyManagedBlend" entry:entry error:error];if(!mb||!p)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto basis=[&](DYUniforms values,NSArray*masks){values.cm.inputTransfer=values.cm.workingTransfer=values.cm.outputTransfer=1;values.cm.inputGamut=values.cm.workingGamut=values.cm.outputGamut=2;values.cm.toneMapping=0;values.inputSectionEnabled=values.cm.outputEnabled=0;if(values.primarySectionEnabled<.5||values.cm.basisEnabled<.5||identityCM(values)||values.cm.mix<=0)return YES;id<MTLTexture>before=current,out=next();BasisParams p=DYCMRender(values.cm).basis;float amount=values.cm.mix;if(!out||![self managedDispatch:@"dyManagedBasis" textures:@[current,out] data:&p length:sizeof(p) extra:&amount extraLength:4 entry:entry error:error])return NO;current=out;return blend(before,masks,@"primary");};
|
||||
auto print=[&](DYUniforms values,NSArray*masks){if(!DYFilmPrintActive(values))return YES;NSArray*names=@[@"",@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"];NSString*path=[[NSBundle bundleForClass:self.class]pathForResource:names[(int)values.filmPrint.x] ofType:@"dylut" inDirectory:@"PrintLooks"];id<MTLTexture>cube=path?[self lut:path entry:entry error:error]:nil;if(!cube)return fail(error,@"印片资源不可用。");id<MTLTexture>before=current,out=next();float amount=values.filmPrint.y*values.film.mix;if(!out||![self managedDispatch:@"dyManagedPrint" textures:@[current,cube,out] data:&amount length:4 extra:nullptr extraLength:0 entry:entry error:error])return NO;current=out;return blend(before,masks,@"film");};
|
||||
@try{try{
|
||||
|
||||
+6
-4
@@ -6,12 +6,13 @@
|
||||
NSString *const DYModelChanged=@"DYModelChanged";
|
||||
static NSMutableArray *sections,*descriptors;
|
||||
static UInt32 PID(NSUInteger offset){return 2000+(UInt32)offset/4;}
|
||||
static NSDictionary *row(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double d,NSString*kind){
|
||||
static NSMutableDictionary *row(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double d,NSString*kind){
|
||||
NSMutableDictionary*r=[@{@"key":k,@"title":t,@"pid":@(PID(o)),@"offset":@(o),@"min":@(lo),@"max":@(hi),@"default":@(d),@"step":@(hi-lo>10?1:.01),@"kind":kind?:@"float"}mutableCopy];
|
||||
[descriptors addObject:r];return [r autorelease];
|
||||
}
|
||||
static void section(NSString*k,NSString*t,NSUInteger offset,NSArray*rows,double def=1){
|
||||
NSDictionary*e=row([k stringByAppendingString:@"Enabled"],t,offset,0,1,def,@"bool");
|
||||
static void section(NSString*k,NSString*t,NSUInteger offset,NSArray*rows,double def=1,NSNumber *hostDefault=nil){
|
||||
NSMutableDictionary *e=row([k stringByAppendingString:@"Enabled"],t,offset,0,1,def,@"bool");
|
||||
if(hostDefault)e[@"hostDefault"]=hostDefault;
|
||||
[sections addObject:@{@"key":k,@"title":t,@"enabled":e[@"pid"],@"defaultEnabled":@(def),@"rows":rows}];
|
||||
}
|
||||
static NSDictionary *scalar(NSString*k,NSString*t,NSUInteger o,double lo=-100,double hi=100,double def=0){return row(k,t,o,lo,hi,def,@"float");}
|
||||
@@ -136,7 +137,8 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
section(@"spider",@"蜘蛛盘校色仪",offsetof(DYUniforms,spiderSectionEnabled),@[scalar(@"spiderMix",@"蜘蛛盘混合",offsetof(DYUniforms,spiderMix),0,1,1)]);
|
||||
section(@"base",@"基础调色",136,[[[base subarrayWithRange:NSMakeRange(0,6)]arrayByAddingObjectsFromArray:[base subarrayWithRange:NSMakeRange(10,3)]]arrayByAddingObject:copyAuto],1);
|
||||
section(@"color",@"白平衡与颜色",140,@[base[6],base[7],base[9],base[8]],1);
|
||||
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28),row(@"skinFaceOnly",@"仅保护人脸肤色",offsetof(DYUniforms,skinFaceOnly),0,1,1,@"bool"),row(@"skinVisualize",@"显示肤色保护区域",offsetof(DYUniforms,skinVisualize),0,1,0,@"bool")],1);
|
||||
// Existing FCP effects can omit the historical on value. New templates seed off.
|
||||
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28),row(@"skinFaceOnly",@"仅保护人脸肤色",offsetof(DYUniforms,skinFaceOnly),0,1,1,@"bool"),row(@"skinVisualize",@"显示肤色保护区域",offsetof(DYUniforms,skinVisualize),0,1,0,@"bool")],0,@1);
|
||||
NSMutableArray*look=[NSMutableArray arrayWithObject:scalar(@"postLUTStrength",@"风格 1 强度",60,0,1,1)];
|
||||
for(int i=0;i<4;i++){[look addObject:row([NSString stringWithFormat:@"look%dEnabled",i+2],[NSString stringWithFormat:@"风格 %d 启用",i+2],160+i*4,0,1,1,@"bool")];[look addObject:scalar([NSString stringWithFormat:@"look%dStrength",i+2],[NSString stringWithFormat:@"风格 %d 强度",i+2],64+i*4,0,1,1)];}
|
||||
section(@"look",@"风格 LUT",144,look);
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
id<MTLBuffer>buffer=[self maskBuffer:face?@{}:@{@"primary":masks} tile:src device:device header:&header];_faceEntries=skinEntries;
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
id<MTLTexture>output=[[device newTextureWithDescriptor:desc]autorelease];
|
||||
id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyLocalMosaic" entry:entry error:error];
|
||||
id<MTLComputePipelineState>pipeline=[self computePipeline:@"dyLocalMosaic" entry:entry error:error];
|
||||
if(!input||!buffer||!output||!pipeline){fail(error,@"局部马赛克缓冲区不可用。");return nil;}
|
||||
// Size is in 1080-line reference pixels, stable under proxy/viewer scaling.
|
||||
uint32_t block=(uint32_t)MAX(2,round([settings[@"size"]doubleValue]*input.height/1080.));
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
@property(nonatomic,assign) NSView *accessoryRow;
|
||||
@property(nonatomic,assign) id<DYGraphicDelegate> delegate;
|
||||
- (void)setMesh:(NSData *)mesh linked:(BOOL)linked;
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer;
|
||||
@end
|
||||
@implementation DYSpiderPanel {
|
||||
DYSpiderDisc *_disc; NSPopUpButton *_hues,*_saturation; NSButton *_link;
|
||||
@@ -31,6 +32,7 @@
|
||||
}return self;
|
||||
}
|
||||
- (void)dealloc{_disc.changed=nil;_disc.gesture=nil;_disc.selectionChanged=nil;[_disc release];[_hues release];[_saturation release];[_link release];[_status release];[super dealloc];}
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer{_disc.scopeRenderer=renderer;}
|
||||
- (void)setMesh:(NSData *)data linked:(BOOL)linked{auto m=DYSpiderMesh(data);_disc.meshData=[NSData dataWithBytes:&m length:sizeof(m)];_linked=linked;[_hues selectItemWithTag:m.hues];[_saturation selectItemWithTag:m.rings+1];_link.state=linked?NSControlStateValueOn:NSControlStateValueOff;}
|
||||
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;
|
||||
if(_horizontalLayout){CGFloat d=MIN(self.bounds.size.height,MAX(170,w*.48)),x=d+20,cw=MAX(200,w-x-10);_disc.frame=NSMakeRect(0,0,d,d);[[self viewWithTag:101]setFrame:NSMakeRect(x,7,48,18)];_hues.frame=NSMakeRect(x+58,2,cw-58,26);[[self viewWithTag:102]setFrame:NSMakeRect(x,37,48,18)];_saturation.frame=NSMakeRect(x+58,32,cw-58,26);_link.frame=NSMakeRect(x,64,cw,22);_accessoryRow.frame=NSMakeRect(x,89,cw,33);CGFloat bw=(cw-6)/2;for(int i=0;i<5;i++)[[self viewWithTag:201+i]setFrame:NSMakeRect(x+(i%2)*(bw+6),126+(i/2)*30,bw,26)];_status.frame=NSMakeRect(x,218,cw,MAX(18,self.bounds.size.height-218));_status.hidden=self.bounds.size.height<238;return;}
|
||||
|
||||
+36
-2
@@ -8,6 +8,7 @@
|
||||
#import "DYAutoGrade.h"
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
@@ -43,13 +44,46 @@
|
||||
if(!_modelRefreshPending.exchange(true)){id host=_apiManager;dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];});}return YES;}
|
||||
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
|
||||
uint64_t stateSpan=DYBetaSpanBegin(@"plugin_state",nil);@try{
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSDictionary *snapshot=DYToolRenderSnapshot(tools.document,t);for(NSMutableDictionary *node in snapshot[@"layers"])if([node[@"type"]isEqual:@"film"]){DYUniforms layer=DYToolUniforms(node);node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);
|
||||
DYAssetState *assets=DYReadAssets(_apiManager,t);
|
||||
DYToolDocument *tools=DYReadTools(_apiManager,t);
|
||||
[self adoptToolCanvasDocument:tools.document];
|
||||
[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];
|
||||
[_viewerParameterBridge publishAssets:assets atTime:t];
|
||||
double copyAuto=0;
|
||||
[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];
|
||||
NSDictionary *snapshot=DYToolRenderSnapshot(tools.document,t);
|
||||
// Host timing is needed only for an active time-varying grain pass.
|
||||
BOOL hasFilmFrame=NO;
|
||||
int64_t frame=0;
|
||||
auto filmFrame=[&]{
|
||||
if(!hasFilmFrame){
|
||||
CMTime duration=kCMTimeInvalid,origin=kCMTimeZero;
|
||||
id<FxTimingAPI_v4> timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];
|
||||
if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&duration];
|
||||
if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];
|
||||
frame=DYFilmFrameIndex(t,duration,origin);hasFilmFrame=YES;
|
||||
}
|
||||
return frame;
|
||||
};
|
||||
if(!DYBaseToolRemoved(snapshot,@"film")&&u.film.enabled>.5&&u.film.mix>0&&DYFilmGrainActive(u.film))
|
||||
u.filmFrameKey=DYFilmFrameKey(filmFrame(),u.film.grainHold,u.film.grainSeed);
|
||||
for(NSMutableDictionary *node in snapshot[@"layers"])if([node[@"type"]isEqual:@"film"]){
|
||||
DYFilmSettings film=DYToolUniforms(node).film;
|
||||
if(film.enabled>.5&&film.mix>0&&DYFilmGrainActive(film))node[@"filmFrameKey"]=@(DYFilmFrameKey(filmFrame(),film.grainHold,film.grainSeed));
|
||||
}
|
||||
NSInteger primaries=-1;
|
||||
id<FxColorGamutAPI_v2> gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];
|
||||
if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;
|
||||
NSDictionary *s=@{@"colorManagement":assets.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":assets.paths?:@{},@"spider":assets.spiderMesh?:[NSData data]};
|
||||
*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];
|
||||
return *state!=nil;
|
||||
}@finally{DYBetaSpanEnd(stateSpan,nil);}
|
||||
}
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t renderSpan=DYBetaSpanBegin(@"render",@{@"width":@(src[0].ioSurface.width),@"height":@(src[0].ioSurface.height),@"layer_count":@([p[@"tools"][@"layers"]count])});uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=NO;@try{ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];}@finally{DYBetaSpanEnd(renderSpan,@{@"status":ok?@"passed":@"failed"});}DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",DYBetaErrorFields((e&&*e)?*e:nil,@"render_source"));if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t renderSpan=DYBetaSpanBegin(@"render",@{@"width":@(src[0].ioSurface.width),@"height":@(src[0].ioSurface.height),@"layer_count":@([p[@"tools"][@"layers"]count])});uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=NO;@try{ok=[_renderer renderHostSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 atTime:t error:e];}@finally{DYBetaSpanEnd(renderSpan,@{@"status":ok?@"passed":@"failed"});}DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",DYBetaErrorFields((e&&*e)?*e:nil,@"render_source"));if(ok){@synchronized(self){
|
||||
FxRect image=src[0].imagePixelBounds;
|
||||
double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left;
|
||||
_toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
auto dispatch=[&](NSString*name,const void*params,NSUInteger length,const void*extra=nullptr,NSUInteger extraLength=0){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级 CST 缓冲区。");BOOL ok=[self managedDispatch:name textures:@[current,out] data:params length:length extra:extra extraLength:extraLength entry:entry error:error];if(ok)current=out;return ok;};
|
||||
auto transform=[&](CSTParams p){if(p.inputTransfer==p.outputTransfer&&p.inputGamut==p.outputGamut&&!p.toneMapping)return YES;return dispatch(@"dyPrimaryCST",&p,sizeof(p));};
|
||||
auto tile=[&](id<MTLTexture>t){DYExportTile*v=[[[DYExportTile alloc]initWithTexture:t registry:d.registryID]autorelease];[v setBounds:src.tilePixelBounds origin:src.imageOrigin];[v setPixelAspect:src.pixelAspect];return v;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];DYCSTMixParams p={{wg,wt,2,20,0},{2,20,wg,wt,0},amount};id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyPrimaryBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];DYCSTMixParams p={{wg,wt,2,20,0},{2,20,wg,wt,0},amount};id<MTLComputePipelineState>pipeline=[self computePipeline:@"dyPrimaryBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto grade=[&](DYUniforms values,NSArray*masks,BOOL local){if(values.primarySectionEnabled<.5||values.cm.mix<=0)return YES;DYUniforms neutral=values;neutral.inputSectionEnabled=neutral.cm.outputEnabled=0;BOOL gradeNeutral=identityCM(neutral);if(!local&&gradeNeutral)return YES;if(local&&identityCM(values))return YES;
|
||||
DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;if((int)lroundf(values.cm.workingTransfer)==20){p.reserved|=8;p.basis.colorspace=10;p.basisInput={(int)lroundf(values.cm.workingGamut),20,(int)lroundf(values.cm.workingGamut),10,0};p.basisOutput={(int)lroundf(values.cm.workingGamut),10,(int)lroundf(values.cm.workingGamut),20,0};}CSTParams back={wg,wt,wg,wt,0};
|
||||
if(local){p.stages=(values.inputSectionEnabled>.5?1:0)|(gradeNeutral?0:2)|(values.cm.outputEnabled>.5?4:0);back={values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputGamut):(int)lroundf(values.cm.workingGamut),values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputTransfer):(int)lroundf(values.cm.workingTransfer),wg,wt,0};}
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
- (NSData*)outputHistogram;
|
||||
/// Bins from this instance's most recent final output at the requested time.
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time;
|
||||
/// Latest completed spider density raster. Requests a coalesced background refresh.
|
||||
- (NSData*)outputSpiderScope;
|
||||
/// Exact-time final output for the OSC, cached per sample.
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time;
|
||||
/// Display-encoded float RGBA, 320×180, with the visually top row first.
|
||||
/// Analysis preview retains the host texture's original row order separately.
|
||||
- (NSData*)lookLUTPreview;
|
||||
@@ -39,5 +43,6 @@
|
||||
- (NSDictionary *)scopeMetadata;
|
||||
- (NSDictionary*)colorContext;
|
||||
- (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error;
|
||||
- (BOOL)renderHostSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries atTime:(CMTime)time error:(NSError**)error;
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state error:(NSError**)error;
|
||||
@end
|
||||
+155
-33
@@ -70,13 +70,31 @@ static void bypassNeutralTools(DYUniforms *u){
|
||||
if(neutral)for(NSDictionary *row in DYDescriptors())if([row[@"pid"]isEqual:section[@"enabled"]])*(float*)((uint8_t*)u+[row[@"offset"]unsignedIntegerValue])=0;
|
||||
}
|
||||
}
|
||||
static BOOL hasLegacyGrade(const DYUniforms &u){
|
||||
if(u.curveSectionEnabled>.5||u.hslSectionEnabled>.5||u.colorGradingSectionEnabled>.5||u.primariesSectionEnabled>.5||u.levelsSectionEnabled>.5||u.blackWhiteSectionEnabled>.5||u.colorBalanceSectionEnabled>.5)return YES;
|
||||
if(u.preLUTStrength!=0||u.postLUTStrength!=0||simd_any(u.extraPostLUTStrengths!=0))return YES;
|
||||
const float *values=&u.exposure,*enabled=&u.exposureEnabled;
|
||||
for(int i=0;i<13;i++){BOOL group=(i>=6&&i<=9)?u.colorSectionEnabled>.5:u.baseSectionEnabled>.5;if(group&&enabled[i]>.5&&values[i]!=0)return YES;}
|
||||
return NO;
|
||||
}
|
||||
static void bypassIdleSkin(DYUniforms *u){
|
||||
if(u->skinVisualize>.5)return;
|
||||
if(u->curveSectionEnabled>.5||u->hslSectionEnabled>.5||u->colorGradingSectionEnabled>.5||u->primariesSectionEnabled>.5||u->levelsSectionEnabled>.5||u->blackWhiteSectionEnabled>.5||u->colorBalanceSectionEnabled>.5)return;
|
||||
if(u->preLUTStrength!=0||u->postLUTStrength!=0||simd_any(u->extraPostLUTStrengths!=0))return;
|
||||
const float *values=&u->exposure,*enabled=&u->exposureEnabled;
|
||||
for(int i=0;i<13;i++){BOOL group=(i>=6&&i<=9)?u->colorSectionEnabled>.5:u->baseSectionEnabled>.5;if(group&&enabled[i]>.5&&values[i]!=0)return;}
|
||||
u->skinProtection.x=0;
|
||||
if(u->skinVisualize<=.5&&!hasLegacyGrade(*u))u->skinProtection.x=0;
|
||||
}
|
||||
// Decide face work from the same effective operations that textures: and the
|
||||
// legacy renderer actually execute. Saved strengths remain 1 for empty LUT
|
||||
// slots, and B&W's eye remains on at a zero mix; neither changes the image.
|
||||
static DYUniforms DYEffectiveFaceUniforms(DYUniforms u,NSDictionary *paths,NSDictionary *tools){
|
||||
DYApplyRemovedBaseTools(&u,tools);
|
||||
paths=DYVisibleBaseToolPaths(paths,tools);
|
||||
BOOL input=u.primarySectionEnabled>.5&&u.inputSectionEnabled>.5&&!managed(u,paths);
|
||||
if(!input||(![paths[@"input"]length]&&u.inputProfile<.5))u.preLUTStrength=0;
|
||||
for(int i=0;i<5;i++)if(u.lookSectionEnabled<.5||(i&&u.extraLookSectionEnableds[i-1]<.5)||![paths[[NSString stringWithFormat:@"look%d",i]]length]){
|
||||
if(i==0)u.postLUTStrength=0;else u.extraPostLUTStrengths[i-1]=0;
|
||||
}
|
||||
bypassNeutralTools(&u);
|
||||
if(u.cm.blackWhiteMix<=0)u.blackWhiteSectionEnabled=0;
|
||||
bypassIdleSkin(&u);
|
||||
return u;
|
||||
}
|
||||
// Admission and identity bypass for the explicitly bounded finishing domain.
|
||||
static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData *spider,NSDictionary *tools){
|
||||
@@ -108,6 +126,11 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
NSDictionary*rootPaths=visiblePaths(paths,u);u=normalize(u);NSMutableDictionary*doc=DYMutablePlist(tools);for(NSMutableDictionary*node in doc[@"layers"]){DYUniforms original=DYToolUniforms(node),v=normalize(original);NSMutableDictionary*values=[NSMutableDictionary dictionary];for(NSDictionary*d in DYBaseToolDescriptors(node[@"type"]))if([d[@"offset"]integerValue]>=0)values[d[@"key"]]=@(*(float*)((uint8_t*)&v+[d[@"offset"]unsignedIntegerValue]));node[@"values"]=values;node[@"paths"]=visiblePaths(node[@"paths"],original);}
|
||||
return DYManagedActiveFinishing(u,rootPaths,spider,doc);
|
||||
}
|
||||
struct DYScopeReadback {
|
||||
id<MTLBuffer> buffer;
|
||||
NSUInteger generation;
|
||||
uint64_t serial;
|
||||
};
|
||||
@interface DYRenderer(){
|
||||
NSMutableDictionary *_devices,*_luts,*_preparedLUTs;
|
||||
NSSet *_activeLUTPaths;
|
||||
@@ -120,16 +143,38 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;NSData *_mosaicRaster,*_mosaicEntries;NSDictionary *_mosaicFaceSnapshot;
|
||||
dispatch_queue_t _scopeQueue;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputObserved,_outputNotificationPending,_spiderScopeWorkerRunning;
|
||||
NSData *_spiderScopeRaster;
|
||||
uint64_t _spiderScopeSerial;
|
||||
NSUInteger _scopeGeneration;
|
||||
DYScopeSample *_scopePending,*_scopeLatest;
|
||||
uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime;
|
||||
FxImageTile *_scopeDestination; // borrowed for one locked host render
|
||||
CMTime _scopeRenderTime;
|
||||
BOOL _scopeCaptured;
|
||||
NSData *_scopePreview;
|
||||
NSDictionary *_scopeMetadata;
|
||||
DYColorProfile *_scopeProfile;
|
||||
NSObject *_scopeProfileLock;
|
||||
}
|
||||
@end
|
||||
@implementation DYRenderer
|
||||
// The caller holds the renderer lock. Unused tools never load a GPU function.
|
||||
- (id<MTLComputePipelineState>)computePipeline:(NSString *)name entry:(NSMutableDictionary *)entry error:(NSError **)error {
|
||||
id<MTLComputePipelineState> pipeline=entry[name];
|
||||
if(pipeline)return pipeline;
|
||||
id<MTLLibrary> library=entry[@"library"];
|
||||
id<MTLDevice> device=entry[@"device"];
|
||||
id<MTLFunction> function=[library newFunctionWithName:name];
|
||||
if(!function){fail(error,[name stringByAppendingString:@" 缺失"]);return nil;}
|
||||
uint64_t span=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":name,@"gpu":device.name?:@"unknown"});
|
||||
pipeline=[device newComputePipelineStateWithFunction:function error:error];
|
||||
DYBetaSpanEnd(span,@{@"status":pipeline?@"passed":@"failed"});
|
||||
[function release];
|
||||
if(!pipeline)return nil;
|
||||
entry[name]=pipeline;
|
||||
return [pipeline autorelease];
|
||||
}
|
||||
#include "DYScopeCapture.inc.h"
|
||||
#include "DYFilmRender.inc.h"
|
||||
#include "DYPrimaryRender.inc.h"
|
||||
@@ -138,8 +183,8 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
#include "DYManagedRender.inc.h"
|
||||
#include "DYFaceRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeProfileLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];[_scopeProfileLock release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)trimPreparedLUTsKeeping:(NSString *)path {
|
||||
if(_preparedLUTs.count<=12)return;
|
||||
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
|
||||
@@ -173,7 +218,6 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
NSURL*url=[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"];
|
||||
id<MTLLibrary>lib=[d newLibraryWithURL:url error:err];if(!lib){[d release];return nil;}
|
||||
id<MTLCommandQueue>q=[d newCommandQueue];entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"library":lib,@"queue":q,@"pipelines":[NSMutableDictionary dictionary]}];
|
||||
for(NSString*fn in @[@"dyLensRepair",@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyScopeSample",@"dyCloneStamps",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
|
||||
float identity[32];for(int z=0;z<2;z++)for(int y=0;y<2;y++)for(int x=0;x<2;x++){int i=((z*2+y)*2+x)*4;identity[i]=x;identity[i+1]=y;identity[i+2]=z;identity[i+3]=1;}id<MTLTexture>neutral=texture3D(d,identity,2);if(!neutral){fail(err,@"无法分配中性 LUT");return nil;}entry[@"identity"]=neutral;
|
||||
// Preparing before the first frame may use registry 0. Reuse those pipelines
|
||||
// when the host subsequently supplies that device's actual registry ID.
|
||||
@@ -191,7 +235,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
- (NSArray*)textures:(NSDictionary*)paths uniforms:(DYUniforms*)u entry:(NSDictionary*)e error:(NSError**)err{
|
||||
// Normalize only this render copy. Disabled groups retain their host parameters
|
||||
// and paths, while inactive LUTs neither load files nor affect any layer.
|
||||
BOOL inputEnabled=u->inputSectionEnabled>.5&&!managed(*u,paths);
|
||||
BOOL inputEnabled=u->inputSectionEnabled>.5&&!managed(*u,paths)&&u->preLUTStrength>0;
|
||||
NSString*input=inputEnabled?paths[@"input"]:nil;int profile=inputEnabled?(int)roundf(u->inputProfile):0;
|
||||
if(!inputEnabled){u->inputProfile=0;u->preLUTStrength=0;}
|
||||
if(!input.length&&profile>0&&profile<(int)inputFiles().count)input=[[NSBundle bundleForClass:self.class]pathForResource:inputFiles()[profile] ofType:@"dylut" inDirectory:@"InputLUTs"];
|
||||
@@ -199,10 +243,20 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
NSMutableArray*ts=[NSMutableArray array];id<MTLTexture>t=[self lut:input entry:e error:err];if(!t)return nil;[ts addObject:t];if(!input.length)u->preLUTStrength=0;
|
||||
BOOL looksEnabled=u->lookSectionEnabled>.5;
|
||||
if(!looksEnabled)u->extraLookSectionEnableds=(DYFloat4){0,0,0,0};
|
||||
for(int i=0;i<5;i++){BOOL active=looksEnabled&&(i==0||u->extraLookSectionEnableds[i-1]>.5);NSString*p=active?paths[[NSString stringWithFormat:@"look%d",i]]:nil;t=[self lut:p entry:e error:err];if(!t)return nil;[ts addObject:t];if(!p.length){if(i==0)u->postLUTStrength=0;else u->extraPostLUTStrengths[i-1]=0;}}
|
||||
for(int i=0;i<5;i++){BOOL active=looksEnabled&&(i==0?u->postLUTStrength>0:u->extraLookSectionEnableds[i-1]>.5&&u->extraPostLUTStrengths[i-1]>0);NSString*p=active?paths[[NSString stringWithFormat:@"look%d",i]]:nil;t=[self lut:p entry:e error:err];if(!t)return nil;[ts addObject:t];if(!p.length){if(i==0)u->postLUTStrength=0;else u->extraPostLUTStrengths[i-1]=0;}}
|
||||
[DYColorTables fillPrimaries:u];id<MTLDevice>d=e[@"device"];
|
||||
id<MTLTexture>h=[_tables hslForDevice:d uniforms:u],w=[_tables whiteBalanceForDevice:d uniforms:u],g=[_tables gradingForDevice:d uniforms:u];if(!h||!w||!g){fail(err,_tables.lastError?:@"颜色查表构建失败");return nil;}[ts addObjectsFromArray:@[h,w,g]];return ts;
|
||||
}
|
||||
- (BOOL)renderHostSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries atTime:(CMTime)time error:(NSError**)error {
|
||||
@synchronized(self){
|
||||
_scopeDestination=dst;_scopeRenderTime=time;_scopeCaptured=NO;
|
||||
@try{
|
||||
BOOL ok=[self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error];
|
||||
if(ok&&!_scopeCaptured)[self captureScopeTile:dst atTime:time];
|
||||
return ok;
|
||||
}@finally{_scopeDestination=nil;}
|
||||
}
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self renderSource:src destination:dst uniforms:u paths:paths spider:nil error:err];}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider error:(NSError**)err{return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:nil error:err];}
|
||||
- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:masks stageFirst:-1 stageLast:-1 skinReference:nil originalReference:nil captureOriginal:nullptr suppressBlackWhite:NO error:err];}
|
||||
@@ -213,8 +267,9 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
|
||||
[_activeLUTPaths release];_activeLUTPaths=[[NSSet alloc]initWithArray:paths.allValues?:@[]];
|
||||
NSMutableDictionary*e=[self device:dst.deviceRegistryID error:err];if(!e)return NO;id<MTLDevice>d=e[@"device"];id<MTLTexture>input=[src metalTextureForDevice:d],output=[dst metalTextureForDevice:d];if(!input||!output)return fail(err,@"宿主图像纹理不可用");
|
||||
BOOL useCM=managed(u,paths)&&(!segmented||stageFirst==0);bypassNeutralTools(&u);float bwMix=fmaxf(0,fminf(1,u.cm.blackWhiteMix));if(bwMix<=0)u.blackWhiteSectionEnabled=0;
|
||||
NSArray*ts=[self textures:paths uniforms:&u entry:e error:err];if(!ts)return NO;bypassIdleSkin(&u);
|
||||
BOOL useCM=managed(u,paths)&&(!segmented||stageFirst==0)&&!identityCM(u)&&u.cm.mix>0;
|
||||
u=DYEffectiveFaceUniforms(u,paths,nil);
|
||||
float bwMix=u.blackWhiteSectionEnabled>.5?fmaxf(0,fminf(1,u.cm.blackWhiteMix)):0;
|
||||
// Only a deformed active mesh allocates samples; device entries retain the
|
||||
// current buffer across frames. Neutral grids are exact identity at all densities.
|
||||
simd_int2 spiderSize={0,0};id<MTLBuffer>spiderBuffer=nil;
|
||||
@@ -224,31 +279,98 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
}
|
||||
if([e[@"spiderActive"]boolValue]){spiderBuffer=e[@"spiderBuffer"];spiderSize={ [e[@"spiderHues"]intValue],[e[@"spiderRings"]intValue]};}
|
||||
}
|
||||
DYToolMaskHeader maskHeader{};id<MTLBuffer>maskBuffer=(masks.count||segmented||u.skinFaceOnly>.5||_faceEntries.length)?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;maskHeader.faceOnly=u.skinFaceOnly>.5;BOOL hasMasks=maskHeader.count>0||maskHeader.faceOnly;if((hasMasks||segmented)&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区");
|
||||
NSMutableDictionary*ps=e[@"pipelines"];NSString*format=[NSString stringWithFormat:@"%lu-%d-%d",(unsigned long)output.pixelFormat,hasMasks,segmented];id<MTLRenderPipelineState>pipeline=ps[format];if(!pipeline){MTLRenderPipelineDescriptor*p=[MTLRenderPipelineDescriptor new];p.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];p.fragmentFunction=[e[@"library"]newFunctionWithName:segmented?@"dySegmentFragment":hasMasks?@"dyMaskedFragment":@"dyFragment"];p.colorAttachments[0].pixelFormat=output.pixelFormat;pipeline=[d newRenderPipelineStateWithDescriptor:p error:err];[p.vertexFunction release];[p.fragmentFunction release];[p release];if(!pipeline)return NO;ps[format]=pipeline;[pipeline release];}
|
||||
MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;id<MTLTexture>straight=[d newTextureWithDescriptor:td];if(!straight)return fail(err,@"无法分配调色缓冲区");
|
||||
id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyUnpremultiply"]];[ce setTexture:input atIndex:0];[ce setTexture:straight atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
if(useCM&&!identityCM(u)&&u.cm.mix>0){
|
||||
DayuRenderParams cm=DYCMRender(u.cm);cm.stages=(cm.stages&~1)|(u.inputSectionEnabled>.5?1:0);
|
||||
if(cm.stages){id<MTLTexture>converted=[d newTextureWithDescriptor:td];if(!converted){[straight release];return fail(err,@"无法分配 CST 缓冲区");}
|
||||
ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyColorManagement"]];[ce setTexture:straight atIndex:0];[ce setTexture:converted atIndex:1];[ce setBytes:&cm length:sizeof(cm) atIndex:0];[ce setBytes:&u.cm.mix length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];if(hasMasks){id<MTLTexture>blended=[d newTextureWithDescriptor:td];if(!blended){[converted release];[straight release];return fail(err,@"无法分配一级蒙版缓冲区");}maskHeader.section=0;maskHeader.premultiplied=0;[self encodeBlend:straight after:converted output:blended masks:maskBuffer header:maskHeader entry:e commands:cb];[converted release];converted=blended;}[straight release];straight=converted;
|
||||
BOOL faceOnly=u.skinProtection.x>.5&&(u.skinProtection.y>0||u.skinVisualize>.5)&&u.skinFaceOnly>.5;
|
||||
DYToolMaskHeader maskHeader{};id<MTLBuffer>maskBuffer=(masks.count||segmented||faceOnly||_faceEntries.length)?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;maskHeader.faceOnly=faceOnly;BOOL hasMasks=maskHeader.count>0||maskHeader.faceOnly;if((hasMasks||segmented)&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区");
|
||||
BOOL preview=NO;
|
||||
@synchronized(_previewLock){preview=(!segmented||stageFirst==0)&&!_exporting&&CACurrentMediaTime()-_lastPreview>.5;}
|
||||
BOOL neutral=!segmented&&!hasMasks&&!spiderBuffer&&u.skinVisualize<.5&&!hasLegacyGrade(u);
|
||||
FxRect s=src.tilePixelBounds,t=dst.tilePixelBounds;
|
||||
BOOL sameGrid=input.width==output.width&&input.height==output.height&&s.left==t.left&&s.right==t.right&&s.top==t.top&&s.bottom==t.bottom;
|
||||
BOOL direct=neutral&&!useCM&&!preview&&sameGrid&&input!=output;
|
||||
NSString *fragment=direct?@"dyNeutralInputFragment":neutral?@"dyNeutralOutputFragment":segmented?@"dySegmentFragment":hasMasks?@"dyMaskedFragment":@"dyFragment";
|
||||
NSMutableDictionary *ps=e[@"pipelines"];
|
||||
NSString *format=[NSString stringWithFormat:@"%lu-%d-%d",(unsigned long)output.pixelFormat,hasMasks,segmented];
|
||||
if(neutral)format=[NSString stringWithFormat:@"%@-%lu",fragment,(unsigned long)output.pixelFormat];
|
||||
id<MTLRenderPipelineState> pipeline=ps[format];
|
||||
if(!pipeline){
|
||||
MTLRenderPipelineDescriptor *desc=[[[MTLRenderPipelineDescriptor alloc]init]autorelease];
|
||||
id<MTLLibrary> library=e[@"library"];
|
||||
desc.vertexFunction=[[library newFunctionWithName:@"dyVertex"]autorelease];
|
||||
desc.fragmentFunction=[[library newFunctionWithName:fragment]autorelease];
|
||||
desc.colorAttachments[0].pixelFormat=output.pixelFormat;
|
||||
pipeline=[[d newRenderPipelineStateWithDescriptor:desc error:err]autorelease];
|
||||
if(!pipeline)return NO;
|
||||
ps[format]=pipeline;
|
||||
}
|
||||
NSArray *ts=neutral?nil:[self textures:paths uniforms:&u entry:e error:err];
|
||||
if(!neutral&&!ts)return NO;
|
||||
id<MTLCommandBuffer> cb=[e[@"queue"]commandBuffer];
|
||||
id<MTLTexture> straight=input;
|
||||
if(!direct){
|
||||
MTLTextureDescriptor *td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];
|
||||
td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
straight=[[d newTextureWithDescriptor:td]autorelease];
|
||||
if(!straight)return fail(err,@"无法分配调色缓冲区");
|
||||
MTLSize grid=MTLSizeMake(input.width,input.height,1),group=MTLSizeMake(16,16,1);
|
||||
BOOL fused=useCM&&!hasMasks;
|
||||
if(!fused){
|
||||
id<MTLComputePipelineState> unpremultiply=[self computePipeline:@"dyUnpremultiply" entry:e error:err];if(!unpremultiply)return NO;
|
||||
id<MTLComputeCommandEncoder> ce=[cb computeCommandEncoder];
|
||||
[ce setComputePipelineState:unpremultiply];[ce setTexture:input atIndex:0];[ce setTexture:straight atIndex:1];
|
||||
[ce dispatchThreads:grid threadsPerThreadgroup:group];[ce endEncoding];
|
||||
}
|
||||
if(useCM){
|
||||
DayuRenderParams cm=DYCMRender(u.cm);cm.stages=(cm.stages&~1)|(u.inputSectionEnabled>.5?1:0);
|
||||
id<MTLComputePipelineState> cst=[self computePipeline:@"dyColorManagement" entry:e error:err];if(!cst)return NO;
|
||||
id<MTLTexture> converted=fused?straight:[[d newTextureWithDescriptor:td]autorelease];
|
||||
if(!converted)return fail(err,@"无法分配 CST 缓冲区");
|
||||
uint32_t premultiplied=fused;
|
||||
id<MTLComputeCommandEncoder> ce=[cb computeCommandEncoder];
|
||||
[ce setComputePipelineState:cst];[ce setTexture:fused?input:straight atIndex:0];[ce setTexture:converted atIndex:1];
|
||||
[ce setBytes:&cm length:sizeof(cm) atIndex:0];[ce setBytes:&u.cm.mix length:4 atIndex:1];[ce setBytes:&premultiplied length:4 atIndex:2];
|
||||
[ce dispatchThreads:grid threadsPerThreadgroup:group];[ce endEncoding];
|
||||
if(hasMasks){
|
||||
id<MTLTexture> blended=[[d newTextureWithDescriptor:td]autorelease];if(!blended)return fail(err,@"无法分配一级蒙版缓冲区");
|
||||
maskHeader.section=0;maskHeader.premultiplied=0;
|
||||
if(![self encodeBlend:straight after:converted output:blended masks:maskBuffer header:maskHeader entry:e commands:cb error:err])return NO;
|
||||
converted=blended;
|
||||
}
|
||||
straight=converted;
|
||||
}
|
||||
}
|
||||
// Keep the actual post-CST straight source alive across all native segments.
|
||||
// Both native spatial helpers and whites statistics historically read this
|
||||
// source; the current segment's center color is a different input.
|
||||
id<MTLTexture>nativeSource=segmented&&originalReference?[originalReference metalTextureForDevice:d]:straight;
|
||||
if(!nativeSource){[straight release];return fail(err,@"原生工具参考纹理不可用");}
|
||||
// Segments retain the original straight source for spatial tools and statistics.
|
||||
id<MTLTexture> nativeSource=segmented&&originalReference?[originalReference metalTextureForDevice:d]:straight;
|
||||
if(!nativeSource)return fail(err,@"原生工具参考纹理不可用");
|
||||
if(segmented&&captureOriginal&&!*captureOriginal){DYExportTile *reference=[[DYExportTile alloc]initWithTexture:nativeSource registry:d.registryID];[reference setBounds:src.tilePixelBounds origin:src.imageOrigin];[reference setPixelAspect:src.pixelAspect];*captureOriginal=reference;}
|
||||
float level=.5;id<MTLBuffer>scene=[d newBufferWithBytes:&level length:4 options:MTLResourceStorageModeShared];
|
||||
if(!_exporting&&(!segmented||(stageFirst<=2&&stageLast>=2))&&u.whites>0&&u.whitesEnabled>.5&&u.baseSectionEnabled>.5){ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyWhitesSceneStatistics"]];[ce setTexture:nativeSource atIndex:0];[ce setTexture:ts[7] atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];[ce setBuffer:scene offset:0 atIndex:1];[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];}
|
||||
BOOL preview=NO;@synchronized(_previewLock){preview=(!segmented||stageFirst==0)&&!_exporting&&CACurrentMediaTime()-_lastPreview>.5;}id<MTLBuffer>pb=nil;if(preview){pb=[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyInputAnalysis"]];[ce setTexture:straight atIndex:0];[ce setTexture:ts[0] atIndex:1];float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];}
|
||||
id<MTLBuffer> scene=nil;
|
||||
if(!neutral){
|
||||
float level=.5;
|
||||
scene=[[d newBufferWithBytes:&level length:4 options:MTLResourceStorageModeShared]autorelease];
|
||||
if(!scene)return fail(err,@"无法分配调色统计缓冲区");
|
||||
if(!_exporting&&(!segmented||(stageFirst<=2&&stageLast>=2))&&u.whites>0&&u.whitesEnabled>.5&&u.baseSectionEnabled>.5){
|
||||
id<MTLComputePipelineState> stats=[self computePipeline:@"dyWhitesSceneStatistics" entry:e error:err];if(!stats)return NO;
|
||||
id<MTLComputeCommandEncoder> ce=[cb computeCommandEncoder];
|
||||
[ce setComputePipelineState:stats];[ce setTexture:nativeSource atIndex:0];[ce setTexture:ts[7] atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];[ce setBuffer:scene offset:0 atIndex:0];
|
||||
[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];
|
||||
}
|
||||
}
|
||||
id<MTLBuffer> pb=nil;
|
||||
if(preview){
|
||||
id<MTLComputePipelineState> analysis=[self computePipeline:@"dyInputAnalysis" entry:e error:err];if(!analysis)return NO;
|
||||
pb=[[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
if(!pb)return fail(err,@"无法分配输入预览缓冲区");
|
||||
id<MTLComputeCommandEncoder> ce=[cb computeCommandEncoder];
|
||||
[ce setComputePipelineState:analysis];[ce setTexture:straight atIndex:0];[ce setTexture:neutral?e[@"identity"]:ts[0] atIndex:1];
|
||||
float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;
|
||||
[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];
|
||||
[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];
|
||||
}
|
||||
MTLRenderPassDescriptor*rp=[MTLRenderPassDescriptor renderPassDescriptor];rp.colorAttachments[0].texture=output;rp.colorAttachments[0].loadAction=MTLLoadActionDontCare;rp.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>re=[cb renderCommandEncoderWithDescriptor:rp];[re setRenderPipelineState:pipeline];
|
||||
float w=output.width,h=output.height;FxRect s=src.tilePixelBounds,t=dst.tilePixelBounds;float sw=s.right-s.left,sh=s.top-s.bottom;float l=(t.left-s.left)/sw,r=(t.right-s.left)/sw,top=(s.top-t.top)/sh,bottom=(s.top-t.bottom)/sh;
|
||||
float w=output.width,h=output.height;float sw=s.right-s.left,sh=s.top-s.bottom;float l=(t.left-s.left)/sw,r=(t.right-s.left)/sw,top=(s.top-t.top)/sh,bottom=(s.top-t.bottom)/sh;
|
||||
if(src.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;}
|
||||
DYVertex2D vs[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};
|
||||
if(dst.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(int i=0;i<4;i++)vs[i].position.y=-vs[i].position.y;
|
||||
vector_uint2 vp={(unsigned)output.width,(unsigned)output.height};[re setVertexBytes:vs length:sizeof(vs) atIndex:0];[re setVertexBytes:&vp length:sizeof(vp) atIndex:1];[re setViewport:(MTLViewport){0,0,w,h,0,1}];[re setFragmentTexture:straight atIndex:0];for(NSUInteger i=0;i<ts.count;i++)[re setFragmentTexture:ts[i] atIndex:i+1];[re setFragmentBytes:&u length:sizeof(u) atIndex:0];[re setFragmentBuffer:scene offset:0 atIndex:1];DYRenderOptions options={1,bwMix,0,0};[re setFragmentBytes:&options length:sizeof(options) atIndex:2];DYUniforms color=u;color.blackWhiteSectionEnabled=0;[re setFragmentBytes:&color length:sizeof(color) atIndex:3];if(spiderBuffer)[re setFragmentBuffer:spiderBuffer offset:0 atIndex:4];else{float empty[2]={0,0};[re setFragmentBytes:empty length:sizeof(empty) atIndex:4];}[re setFragmentBytes:&spiderSize length:sizeof(spiderSize) atIndex:5];if(hasMasks||segmented){[re setFragmentBuffer:maskBuffer offset:0 atIndex:6];[re setFragmentBytes:&maskHeader length:sizeof(maskHeader) atIndex:7];}if(segmented){DYToolStageRange range={(int)stageFirst,(int)stageLast,(int)suppressBlackWhite};[re setFragmentBytes:&range length:sizeof(range) atIndex:8];[re setFragmentTexture:skinReference?[skinReference metalTextureForDevice:d]:input atIndex:10];[re setFragmentTexture:nativeSource atIndex:11];}[re drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[re endEncoding];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
|
||||
vector_uint2 vp={(unsigned)output.width,(unsigned)output.height};[re setVertexBytes:vs length:sizeof(vs) atIndex:0];[re setVertexBytes:&vp length:sizeof(vp) atIndex:1];[re setViewport:(MTLViewport){0,0,w,h,0,1}];[re setFragmentTexture:straight atIndex:0];if(!neutral){for(NSUInteger i=0;i<ts.count;i++)[re setFragmentTexture:ts[i] atIndex:i+1];[re setFragmentBytes:&u length:sizeof(u) atIndex:0];[re setFragmentBuffer:scene offset:0 atIndex:1];DYRenderOptions options={1,bwMix,0,0};[re setFragmentBytes:&options length:sizeof(options) atIndex:2];DYUniforms color=u;color.blackWhiteSectionEnabled=0;[re setFragmentBytes:&color length:sizeof(color) atIndex:3];if(spiderBuffer)[re setFragmentBuffer:spiderBuffer offset:0 atIndex:4];else{float empty[2]={0,0};[re setFragmentBytes:empty length:sizeof(empty) atIndex:4];}[re setFragmentBytes:&spiderSize length:sizeof(spiderSize) atIndex:5];if(hasMasks||segmented){[re setFragmentBuffer:maskBuffer offset:0 atIndex:6];[re setFragmentBytes:&maskHeader length:sizeof(maskHeader) atIndex:7];}if(segmented){DYToolStageRange range={(int)stageFirst,(int)stageLast,(int)suppressBlackWhite};[re setFragmentBytes:&range length:sizeof(range) atIndex:8];[re setFragmentTexture:skinReference?[skinReference metalTextureForDevice:d]:input atIndex:10];[re setFragmentTexture:nativeSource atIndex:11];}}[re drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[re endEncoding];BOOL ok=[self completeCommands:cb destination:dst texture:output entry:e];
|
||||
if(ok&&pb){@synchronized(_previewLock){
|
||||
[_preview release];_preview=[[NSData alloc]initWithBytes:pb.contents length:320*180*16];
|
||||
// The analysis kernel reads physical texture rows. Its result remains intact
|
||||
@@ -261,7 +383,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
}else _lookLUTPreview=[_preview retain];
|
||||
_lastPreview=CACurrentMediaTime();[self notifyPreviewChanged];
|
||||
}}
|
||||
if(!ok)fail(err,cb.error.localizedDescription);[pb release];[straight release];[scene release];return ok;
|
||||
if(!ok)fail(err,cb.error.localizedDescription);return ok;
|
||||
});}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self exportLUT:url uniforms:u paths:paths spider:nil error:err];}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)err{@synchronized(self){
|
||||
|
||||
+124
-52
@@ -18,80 +18,152 @@
|
||||
- (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}}
|
||||
- (NSData*)outputHistogram{
|
||||
DYScopeSample *sample=nil;
|
||||
@synchronized(_previewLock){_outputHistogramObserved=YES;sample=[[_scopeLatest retain]autorelease];}
|
||||
@synchronized(_previewLock){_outputObserved=YES;sample=[[_scopeLatest retain]autorelease];}
|
||||
return sample.canvasHistogram;
|
||||
}
|
||||
- (void)queueOutputHistogramNotification{
|
||||
- (void)queueOutputNotification{
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
|
||||
@synchronized(_previewLock){_outputHistogramNotificationPending=NO;}
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYOutputHistogramDidChange" object:self];
|
||||
@synchronized(_previewLock){_outputNotificationPending=NO;}
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYFinalOutputDidChange" object:self];
|
||||
});
|
||||
}
|
||||
- (NSData *)canvasHistogramAtTime:(CMTime)time{
|
||||
- (DYScopeSample *)finalSampleAtTime:(CMTime)time{
|
||||
if(!CMTIME_IS_NUMERIC(time))return nil;
|
||||
DYScopeSample *sample=nil;
|
||||
@synchronized(_previewLock){sample=[_scopeLatest retain];}
|
||||
NSDictionary *metadata=sample.metadata;
|
||||
CMTime captured=CMTimeMakeWithEpoch([metadata[@"timeValue"]longLongValue],[metadata[@"timeScale"]intValue],[metadata[@"timeEpoch"]longLongValue]);
|
||||
NSData *histogram=metadata&&CMTimeCompare(time,captured)==0?sample.canvasHistogram:nil;
|
||||
if(metadata&&CMTimeCompare(time,captured)==0)return [sample autorelease];
|
||||
[sample release];
|
||||
return histogram;
|
||||
return nil;
|
||||
}
|
||||
- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time{
|
||||
NSUInteger generation;uint64_t serial;@synchronized(_previewLock){if(_exporting||!tile)return;generation=_scopeGeneration;serial=++_scopeCaptureSerial;}
|
||||
@autoreleasepool{@try{
|
||||
NSDictionary *entry=nil,*context=nil;@synchronized(self){entry=[[self device:tile.deviceRegistryID error:nil]retain];context=[_colorContext copy];}
|
||||
id<MTLDevice>device=entry[@"device"];id<MTLTexture>texture=[tile metalTextureForDevice:device];
|
||||
if(!entry||!texture||!texture.width||!texture.height||texture.framebufferOnly){[entry release];[context release];return;}
|
||||
id<MTLBuffer>buffer=[device newBufferWithLength:dyscope::Width*dyscope::Height*sizeof(dyscope::RGBA) options:MTLResourceStorageModeShared];
|
||||
id<MTLCommandBuffer>command=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[command computeCommandEncoder];
|
||||
if(!buffer||!encoder){[buffer release];[entry release];[context release];return;}
|
||||
uint32_t flip=tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;[encoder setComputePipelineState:entry[@"dyScopeSample"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&flip length:sizeof(flip) atIndex:1];
|
||||
[encoder dispatchThreads:MTLSizeMake(dyscope::Width,dyscope::Height,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[encoder endEncoding];[command commit];
|
||||
// The host may recycle its destination as soon as render returns. Complete
|
||||
// only this 320x180 readback while that ownership is still guaranteed.
|
||||
// CPU profile conversion, plotting and UI notification do not block render.
|
||||
[command waitUntilCompleted];
|
||||
if(command.status!=MTLCommandBufferStatusCompleted){[buffer release];[entry release];[context release];return;}
|
||||
DYScopeSample *sample=[DYScopeSample new];sample.pixels=[NSData dataWithBytes:buffer.contents length:buffer.length];sample.generation=generation;
|
||||
CGColorSpaceRef sourceSpace=DYManagedTileSpace(tile,[context[@"primaries"]integerValue]);sample.space=sourceSpace;if(sourceSpace)CGColorSpaceRelease(sourceSpace);
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom;
|
||||
sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch),@"source":context[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)};
|
||||
[buffer release];[entry release];[context release];
|
||||
BOOL start=NO,notifyHistogram=NO;@synchronized(_previewLock){
|
||||
if(serial>=_scopeLatestSerial){
|
||||
[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;
|
||||
if(_outputHistogramObserved&&!_outputHistogramNotificationPending){_outputHistogramNotificationPending=YES;notifyHistogram=YES;}
|
||||
- (NSData *)canvasHistogramAtTime:(CMTime)time {
|
||||
return [self finalSampleAtTime:time].canvasHistogram;
|
||||
}
|
||||
- (DYColorProfile *)scopeProfileForSpace:(CGColorSpaceRef)space {
|
||||
if(!space)return nil;
|
||||
@synchronized(_scopeProfileLock){
|
||||
if(!_scopeProfile||!CFEqual(_scopeProfile.source,space)){
|
||||
CGColorSpaceRef target=CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
|
||||
if(!target)return nil;
|
||||
[_scopeProfile release];
|
||||
_scopeProfile=[[DYColorProfile alloc]initWithSource:space target:target error:nil];
|
||||
CGColorSpaceRelease(target);
|
||||
}
|
||||
return [[_scopeProfile retain]autorelease];
|
||||
}
|
||||
}
|
||||
- (NSData *)canvasSpiderScopeAtTime:(CMTime)time {
|
||||
DYScopeSample *sample=[self finalSampleAtTime:time];
|
||||
return sample?[sample spiderScopeWithProfile:[self scopeProfileForSpace:sample.space]]:nil;
|
||||
}
|
||||
- (NSData *)outputSpiderScope {
|
||||
NSData *raster=nil;
|
||||
@synchronized(_previewLock){
|
||||
_outputObserved=YES;
|
||||
raster=[[_spiderScopeRaster retain]autorelease];
|
||||
if(!_scopeLatest||_spiderScopeWorkerRunning||_spiderScopeSerial==_scopeLatestSerial)return raster;
|
||||
_spiderScopeWorkerRunning=YES;
|
||||
}
|
||||
dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0),^{@autoreleasepool{
|
||||
DYScopeSample *sample=nil;uint64_t serial;
|
||||
@synchronized(_previewLock){sample=[_scopeLatest retain];serial=_scopeLatestSerial;}
|
||||
NSData *measured=[sample spiderScopeWithProfile:[self scopeProfileForSpace:sample.space]];
|
||||
@synchronized(_previewLock){
|
||||
[_spiderScopeRaster release];_spiderScopeRaster=[measured retain];_spiderScopeSerial=serial;
|
||||
_spiderScopeWorkerRunning=NO;
|
||||
}
|
||||
[sample release];
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYSpiderScopeDidChange" object:self];
|
||||
});
|
||||
}});
|
||||
return raster;
|
||||
}
|
||||
// The caller owns the destination until command completion. Only the small
|
||||
// result buffer is copied out of that lifetime, even when the scope is closed.
|
||||
- (DYScopeReadback)encodeScopeTile:(FxImageTile *)tile texture:(id<MTLTexture>)texture entry:(NSMutableDictionary *)entry commands:(id<MTLCommandBuffer>)command {
|
||||
if(_exporting||!tile||!texture.width||!texture.height||texture.framebufferOnly)return {};
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:@"dyScopeSample" entry:entry error:nil];
|
||||
if(!pipeline)return {};
|
||||
id<MTLBuffer> buffer=entry[@"scopeBuffer"];
|
||||
if(!buffer){
|
||||
id<MTLDevice> device=entry[@"device"];
|
||||
buffer=[[device newBufferWithLength:dyscope::Width*dyscope::Height*sizeof(dyscope::RGBA) options:MTLResourceStorageModeShared]autorelease];
|
||||
if(!buffer)return {};
|
||||
entry[@"scopeBuffer"]=buffer;
|
||||
}
|
||||
id<MTLComputeCommandEncoder> encoder=[command computeCommandEncoder];
|
||||
if(!encoder)return {};
|
||||
uint32_t flip=tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;
|
||||
[encoder setComputePipelineState:pipeline];[encoder setTexture:texture atIndex:0];
|
||||
[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&flip length:sizeof(flip) atIndex:1];
|
||||
[encoder dispatchThreads:MTLSizeMake(dyscope::Width,dyscope::Height,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];
|
||||
[encoder endEncoding];
|
||||
@synchronized(_previewLock){return {buffer,_scopeGeneration,++_scopeCaptureSerial};}
|
||||
}
|
||||
- (void)publishScopeReadback:(DYScopeReadback)readback tile:(FxImageTile *)tile atTime:(CMTime)time {
|
||||
if(!readback.buffer)return;
|
||||
@try{
|
||||
DYScopeSample *sample=[[[DYScopeSample alloc]init]autorelease];
|
||||
sample.pixels=[NSData dataWithBytes:readback.buffer.contents length:readback.buffer.length];
|
||||
sample.generation=readback.generation;
|
||||
CGColorSpaceRef space=DYManagedTileSpace(tile,[_colorContext[@"primaries"]integerValue]);
|
||||
sample.space=space;if(space)CGColorSpaceRelease(space);
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;
|
||||
BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom;
|
||||
sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch),@"source":_colorContext[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)};
|
||||
BOOL start=NO,notifyOutput=NO;
|
||||
@synchronized(_previewLock){
|
||||
if(readback.serial>=_scopeLatestSerial){
|
||||
[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=readback.serial;
|
||||
if(_outputObserved&&!_outputNotificationPending){_outputNotificationPending=YES;notifyOutput=YES;}
|
||||
}
|
||||
if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}
|
||||
}[sample release];
|
||||
if(notifyHistogram)[self queueOutputHistogramNotification];
|
||||
if(_scopeEnabled&&readback.serial==_scopeLatestSerial&&(readback.generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){
|
||||
sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];
|
||||
if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}
|
||||
}
|
||||
}
|
||||
if(notifyOutput)[self queueOutputNotification];
|
||||
if(start)dispatch_async(_scopeQueue,^{[self processPendingScopeSamples];});
|
||||
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}}
|
||||
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}
|
||||
}
|
||||
- (BOOL)completeCommands:(id<MTLCommandBuffer>)command destination:(FxImageTile *)destination texture:(id<MTLTexture>)texture entry:(NSMutableDictionary *)entry {
|
||||
DYScopeReadback readback{};
|
||||
if(destination==_scopeDestination){
|
||||
@try{readback=[self encodeScopeTile:destination texture:texture entry:entry commands:command];}
|
||||
@catch(NSException *exception){/* Fall back to separate sampling. */}
|
||||
}
|
||||
[command commit];[command waitUntilCompleted];
|
||||
if(command.status!=MTLCommandBufferStatusCompleted)return NO;
|
||||
if(readback.buffer){[self publishScopeReadback:readback tile:destination atTime:_scopeRenderTime];_scopeCaptured=YES;}
|
||||
return YES;
|
||||
}
|
||||
- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time {
|
||||
@synchronized(self){@autoreleasepool{@try{
|
||||
if(!tile||_exporting)return;
|
||||
NSMutableDictionary *entry=[self device:tile.deviceRegistryID error:nil];
|
||||
id<MTLTexture> texture=[tile metalTextureForDevice:entry[@"device"]];
|
||||
id<MTLCommandBuffer> command=[entry[@"queue"]commandBuffer];
|
||||
DYScopeReadback readback=[self encodeScopeTile:tile texture:texture entry:entry commands:command];
|
||||
if(!readback.buffer)return;
|
||||
[command commit];[command waitUntilCompleted];
|
||||
if(command.status==MTLCommandBufferStatusCompleted)[self publishScopeReadback:readback tile:tile atTime:time];
|
||||
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}}}
|
||||
}
|
||||
- (void)processPendingScopeSamples{
|
||||
for(;;){@autoreleasepool{
|
||||
DYScopeSample *sample=nil;@synchronized(_previewLock){sample=_scopePending;_scopePending=nil;if(!sample){_scopeWorkerRunning=NO;return;}}
|
||||
@synchronized(_previewLock){if(!_scopeEnabled||sample.generation!=_scopeGeneration){[sample release];continue;}}
|
||||
const auto *raw=(const dyscope::RGBA*)sample.pixels.bytes;size_t count=sample.pixels.length/sizeof(dyscope::RGBA);std::vector<DYCompositeRGBA> pixels(count);uint64_t invalid=0;
|
||||
for(size_t i=0;i<count;i++){
|
||||
const auto&p=raw[i];BOOL finite=std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a);
|
||||
if(!finite){invalid++;pixels[i]={0,0,0,0};continue;}
|
||||
if(p.a<=1e-6f){pixels[i]={0,0,0,0};continue;}
|
||||
pixels[i]={p.r/p.a,p.g/p.a,p.b/p.a,p.a};
|
||||
if(!(std::isfinite(pixels[i].r)&&std::isfinite(pixels[i].g)&&std::isfinite(pixels[i].b))){invalid++;pixels[i]={0,0,0,0};}
|
||||
}
|
||||
NSError *error=nil;BOOL converted=NO;CGColorSpaceRef target=CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
|
||||
if(sample.space&&target){
|
||||
if(!_scopeProfile||!CFEqual(_scopeProfile.source,sample.space)){[_scopeProfile release];_scopeProfile=[[DYColorProfile alloc]initWithSource:sample.space target:target error:&error];}
|
||||
if(_scopeProfile){auto result=[_scopeProfile convertPixels:pixels alpha:dycm::Alpha::Straight budget:32ull*1024*1024 cancelled:nullptr error:&error];if(result){pixels=std::move(*result);converted=YES;}}
|
||||
}if(target)CGColorSpaceRelease(target);
|
||||
std::vector<dyscope::RGBA> reference;reference.reserve(pixels.size());for(const auto&p:pixels)reference.push_back({p.r,p.g,p.b,p.a});
|
||||
auto measurements=dyscope::measure(reference);measurements.nonfinite+=invalid;
|
||||
auto reference=[sample displayReferenceWithProfile:[self scopeProfileForSpace:sample.space]];
|
||||
const auto &pixels=reference->pixels;
|
||||
uint64_t invalid=reference->invalid;
|
||||
BOOL converted=reference->converted;
|
||||
auto measurements=dyscope::measure(pixels);measurements.nonfinite+=invalid;
|
||||
auto wave=dyscope::densityImage(measurements.wave,false),parade=dyscope::densityImage(measurements.parade,true),vectors=dyscope::vectorImage(measurements.vectors);
|
||||
NSMutableDictionary *metadata=[[sample.metadata mutableCopy]autorelease];
|
||||
metadata[@"domain"]=converted?@"sRGB 显示参考":@"宿主 RGB(未换算)";
|
||||
metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":(error?[NSString stringWithFormat:@"RGB 原值参考 · %@;波形按 709 权重参考,非 IRE",error.localizedDescription]:@"最终输出 · 空间未知;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量");
|
||||
metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":@"最终输出 · 未完成颜色空间换算;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量";
|
||||
metadata[@"converted"]=@(converted);metadata[@"minimum"]=@(measurements.minimum);metadata[@"maximum"]=@(measurements.maximum);metadata[@"valid"]=@(measurements.valid);metadata[@"transparent"]=@(measurements.transparent>=invalid?measurements.transparent-invalid:0);metadata[@"nonfinite"]=@(measurements.nonfinite);metadata[@"below"]=@(measurements.below);metadata[@"above"]=@(measurements.above);
|
||||
metadata[@"waveform"]=[NSData dataWithBytes:wave.data() length:wave.size()];metadata[@"parade"]=[NSData dataWithBytes:parade.data() length:parade.size()];metadata[@"histogram"]=[NSData dataWithBytes:measurements.histogram.data() length:sizeof(measurements.histogram)];metadata[@"vectorscope"]=[NSData dataWithBytes:vectors.data() length:vectors.size()];
|
||||
BOOL publish=NO;@synchronized(_previewLock){if(_scopeEnabled&&sample.generation==_scopeGeneration){[_scopePreview release];_scopePreview=[[NSData alloc]initWithBytes:pixels.data() length:pixels.size()*sizeof(DYCompositeRGBA)];[_scopeMetadata release];_scopeMetadata=[metadata copy];publish=YES;}}
|
||||
|
||||
+39
-5
@@ -5,6 +5,7 @@
|
||||
#include <cstdint>
|
||||
#include <span>
|
||||
#include <vector>
|
||||
#include "../../ColorManagement/Core/DYPremultiplied.h"
|
||||
|
||||
// Display-reference measurements only. Values remain unclipped; the plot
|
||||
// covers -10%...110% and explicitly counts samples beyond that range.
|
||||
@@ -12,9 +13,8 @@ namespace dyscope {
|
||||
inline constexpr unsigned Width=320,Height=180,Bins=256;
|
||||
inline constexpr float Low=-.1f,High=1.1f;
|
||||
// Conventional positive-I flesh-tone reference: 33 degrees left of +Cr.
|
||||
inline constexpr double SkinToneAngle=123.0*3.14159265358979323846/180.0;
|
||||
inline constexpr double SkinToneCb=-0.5446390350150271,SkinToneCr=0.8386705679454240;
|
||||
struct RGBA { float r,g,b,a; };
|
||||
using RGBA=DYCompositeRGBA;
|
||||
struct Result {
|
||||
std::vector<uint32_t> wave=std::vector<uint32_t>(Width*Bins),parade=std::vector<uint32_t>(3*Width*Bins),vectors=std::vector<uint32_t>(Bins*Bins);
|
||||
std::array<uint32_t,4*Bins> histogram{};
|
||||
@@ -24,15 +24,32 @@ struct Result {
|
||||
inline unsigned bin(float v){if(!(v>Low))return 0;if(v>=High)return Bins-1;return unsigned(std::clamp(std::lround((v-Low)/(High-Low)*(Bins-1)),0l,long(Bins-1)));}
|
||||
// BT.709 colour-difference coordinates on the same encoded display-reference
|
||||
// RGB used by the existing scopes (ITU-R BT.709-6 section 3.3). Not an IRE meter.
|
||||
inline unsigned chromaBin(float v){if(!(v>-.6f))return 0;if(v>=.6f)return Bins-1;return unsigned(std::clamp(std::lround((v+.6f)/1.2f*(Bins-1)),0l,long(Bins-1)));}
|
||||
inline constexpr float Kr=.2126f,Kg=.7152f,Kb=.0722f;
|
||||
inline constexpr float ChromaLimit=.6f;
|
||||
struct Chroma {float cb,cr;};
|
||||
inline float luminance(const RGBA &p){return Kr*p.r+Kg*p.g+Kb*p.b;}
|
||||
inline Chroma chroma(const RGBA &p,float y){return {(p.b-y)/(2*(1-Kb)),(p.r-y)/(2*(1-Kr))};}
|
||||
inline RGBA chromaRGB(Chroma c){
|
||||
float r=2*(1-Kr)*c.cr,b=2*(1-Kb)*c.cb;
|
||||
return {r,-(Kr*r+Kb*b)/Kg,b,1};
|
||||
}
|
||||
inline unsigned chromaBin(float v){
|
||||
if(!(v>-ChromaLimit))return 0;
|
||||
if(v>=ChromaLimit)return Bins-1;
|
||||
return unsigned(std::clamp(std::lround((v+ChromaLimit)/(2*ChromaLimit)*(Bins-1)),0l,long(Bins-1)));
|
||||
}
|
||||
inline size_t vectorIndex(Chroma c){return (Bins-1-chromaBin(c.cr))*Bins+chromaBin(c.cb);}
|
||||
inline bool visible(const RGBA &p){
|
||||
return std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a)&&p.a>1e-6f;
|
||||
}
|
||||
inline Result measure(std::span<const RGBA> pixels,unsigned width=Width,unsigned height=Height){
|
||||
Result r;if(!width||!height||pixels.size()!=size_t(width)*height)return r;bool first=true;
|
||||
for(unsigned y=0;y<height;y++)for(unsigned x=0;x<width;x++){
|
||||
const auto&p=pixels[size_t(y)*width+x];
|
||||
if(!(std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a))){r.nonfinite++;continue;}
|
||||
if(p.a<=1e-6f){r.transparent++;continue;}
|
||||
float values[4]={.2126f*p.r+.7152f*p.g+.0722f*p.b,p.r,p.g,p.b};unsigned column=std::min(Width-1,unsigned(uint64_t(x)*Width/width));
|
||||
float cb=(p.b-values[0])/1.8556f,cr=(p.r-values[0])/1.5748f;r.vectors[(Bins-1-chromaBin(cr))*Bins+chromaBin(cb)]++;
|
||||
float values[4]={luminance(p),p.r,p.g,p.b};unsigned column=std::min(Width-1,unsigned(uint64_t(x)*Width/width));
|
||||
r.vectors[vectorIndex(chroma(p,values[0]))]++;
|
||||
for(unsigned c=0;c<4;c++){
|
||||
float v=values[c];unsigned b=bin(v);r.histogram[c*Bins+b]++;
|
||||
if(!c)r.wave[(Bins-1-b)*Width+column]++;
|
||||
@@ -57,4 +74,21 @@ inline std::vector<uint8_t> vectorImage(std::span<const uint32_t> counts){
|
||||
if(counts.size()!=Bins*Bins)return {};std::vector<uint8_t> out(counts.size()*4);uint32_t maximum=0;for(uint32_t n:counts)maximum=std::max(maximum,n);float divisor=std::log1p(float(maximum));
|
||||
for(size_t i=0;i<counts.size();i++){float cb=float(i%Bins)/(Bins-1)*1.2f-.6f,cr=.6f-float(i/Bins)/(Bins-1)*1.2f;float intensity=counts[i]&&divisor>0?std::pow(std::log1p(float(counts[i]))/divisor,.65f):0;float colors[]={.5f+1.5748f*cr,.5f-.187324f*cb-.468124f*cr,.5f+1.8556f*cb};float peak=std::max({colors[0],colors[1],colors[2],.001f});for(int c=0;c<3;c++)out[i*4+c]=uint8_t(std::lround(std::clamp(colors[c]/peak,0.f,1.f)*intensity*255));out[i*4+3]=255;}return out;
|
||||
}
|
||||
// Transparent rendering of the same Cb/Cr bins used by the full scope.
|
||||
inline std::vector<uint8_t> spiderVectorImage(std::span<const RGBA> pixels) {
|
||||
std::vector<uint32_t> density(Bins*Bins);
|
||||
uint32_t peak=0;
|
||||
for(const auto &pixel:pixels)if(visible(pixel))
|
||||
peak=std::max(peak,++density[vectorIndex(chroma(pixel,luminance(pixel)))]);
|
||||
std::vector<uint8_t> raster(density.size()*4);
|
||||
if(!peak)return raster;
|
||||
float maximum=std::log1p(float(peak));
|
||||
for(size_t i=0;i<density.size();i++){
|
||||
if(!density[i])continue;
|
||||
float intensity=std::pow(std::log1p(float(density[i]))/maximum,1.15f);
|
||||
uint8_t alpha=std::lround(255.f*(.035f+.68f*intensity));
|
||||
std::fill_n(raster.data()+4*i,4,alpha); // premultiplied white
|
||||
}
|
||||
return raster;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,15 @@
|
||||
#pragma once
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreGraphics/CoreGraphics.h>
|
||||
#include "DYScopeMath.hpp"
|
||||
#include <memory>
|
||||
@class DYColorProfile;
|
||||
struct DYScopeReference {
|
||||
std::vector<dyscope::RGBA> pixels;
|
||||
uint64_t invalid=0;
|
||||
bool converted=false;
|
||||
};
|
||||
|
||||
@interface DYScopeSample : NSObject
|
||||
@property(nonatomic,copy) NSData *pixels;
|
||||
@property(nonatomic,copy) NSDictionary *metadata;
|
||||
@@ -8,4 +17,7 @@
|
||||
@property(nonatomic) CGColorSpaceRef space;
|
||||
/// Final-output bins in the host RGB domain, calculated only if requested.
|
||||
@property(nonatomic,readonly) NSData *canvasHistogram;
|
||||
/// Shared straight-alpha display samples for the workspace and spider scopes.
|
||||
- (std::shared_ptr<const DYScopeReference>)displayReferenceWithProfile:(DYColorProfile *)profile;
|
||||
- (NSData *)spiderScopeWithProfile:(DYColorProfile *)profile;
|
||||
@end
|
||||
+41
-2
@@ -1,7 +1,11 @@
|
||||
#import "DYScopeSample.h"
|
||||
#import "DYHistogram.h"
|
||||
#import "../../ColorManagement/Sources/DYColorProfile.h"
|
||||
#include <mutex>
|
||||
@implementation DYScopeSample {
|
||||
NSData *_canvasHistogram;
|
||||
NSData *_canvasHistogram,*_spiderScope;
|
||||
std::shared_ptr<const DYScopeReference> _reference;
|
||||
std::mutex _referenceMutex;
|
||||
}
|
||||
- (NSData *)canvasHistogram{
|
||||
@synchronized(self){
|
||||
@@ -9,6 +13,41 @@
|
||||
return [[_canvasHistogram retain]autorelease];
|
||||
}
|
||||
}
|
||||
- (std::shared_ptr<const DYScopeReference>)displayReferenceWithProfile:(DYColorProfile *)profile {
|
||||
std::lock_guard<std::mutex> lock(_referenceMutex);
|
||||
if(_reference)return _reference;
|
||||
const auto *raw=(const dyscope::RGBA *)_pixels.bytes;
|
||||
auto reference=std::make_shared<DYScopeReference>();
|
||||
reference->pixels.resize(_pixels.length/sizeof(*raw));
|
||||
for(size_t i=0;i<reference->pixels.size();i++){
|
||||
const auto &p=raw[i];
|
||||
if(!std::isfinite(p.r)||!std::isfinite(p.g)||!std::isfinite(p.b)||!std::isfinite(p.a)){
|
||||
reference->invalid++;
|
||||
continue;
|
||||
}
|
||||
if(p.a<=1e-6f)continue;
|
||||
dyscope::RGBA straight={p.r/p.a,p.g/p.a,p.b/p.a,p.a};
|
||||
if(dyscope::visible(straight))reference->pixels[i]=straight;
|
||||
else reference->invalid++;
|
||||
}
|
||||
if(profile){
|
||||
auto result=[profile convertPixels:reference->pixels alpha:dycm::Alpha::Straight
|
||||
budget:32ull*1024*1024 cancelled:nullptr error:nil];
|
||||
if(result){reference->pixels=std::move(*result);reference->converted=true;}
|
||||
}
|
||||
_reference=reference;
|
||||
return _reference;
|
||||
}
|
||||
- (NSData *)spiderScopeWithProfile:(DYColorProfile *)profile {
|
||||
@synchronized(self){if(_spiderScope)return [[_spiderScope retain]autorelease];}
|
||||
auto reference=[self displayReferenceWithProfile:profile];
|
||||
auto raster=dyscope::spiderVectorImage(reference->pixels);
|
||||
NSData *data=[NSData dataWithBytes:raster.data() length:raster.size()];
|
||||
@synchronized(self){
|
||||
if(!_spiderScope)_spiderScope=[data retain];
|
||||
return [[_spiderScope retain]autorelease];
|
||||
}
|
||||
}
|
||||
- (void)setSpace:(CGColorSpaceRef)space{if(_space==space)return;if(_space)CGColorSpaceRelease(_space);_space=space?CGColorSpaceRetain(space):nil;}
|
||||
- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
|
||||
- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];[_spiderScope release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
|
||||
@end
|
||||
+59
-11
@@ -1,6 +1,8 @@
|
||||
// Ported from dayu-colorplate; provenance in research/SpiderAndBalanceSources.json.
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
@interface DYSpiderDisc : NSView
|
||||
@property(nonatomic) DYGrade grade;
|
||||
@property(nonatomic,retain) DYRenderer *scopeRenderer;
|
||||
@property(nonatomic,copy) NSData *meshData;
|
||||
@property(nonatomic,readonly) NSInteger hueCount,saturationCount;
|
||||
- (void)changeHueCount:(int)hues saturationCount:(int)saturation;
|
||||
@@ -18,7 +20,30 @@
|
||||
- (void)toggleLock;
|
||||
@end
|
||||
@implementation DYSpiderDisc {BOOL _dragging,_marquee,_gestureActive;NSPoint _dragOrigin,_marqueeEnd;DYGrade _dragGrade;dy::SpiderMesh _mesh,_dragMesh;BOOL _variableMesh;NSMutableIndexSet*_selectionStart,*_pinsStart;}
|
||||
- (void)dealloc{[self finishGesture];[_pinned release];[_selection release];[_selectionStart release];[_pinsStart release];[_changed release];[_selectionChanged release];[_gesture release];[super dealloc];}
|
||||
- (void)dealloc{[self finishGesture];self.scopeRenderer=nil;[_pinned release];[_selection release];[_selectionStart release];[_pinsStart release];[_changed release];[_selectionChanged release];[_gesture release];[super dealloc];}
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer {
|
||||
if(renderer==_scopeRenderer)return;
|
||||
NSNotificationCenter *center=NSNotificationCenter.defaultCenter;
|
||||
if(_scopeRenderer){
|
||||
[center removeObserver:self name:@"DYFinalOutputDidChange" object:_scopeRenderer];
|
||||
[center removeObserver:self name:@"DYSpiderScopeDidChange" object:_scopeRenderer];
|
||||
}
|
||||
[_scopeRenderer release];_scopeRenderer=[renderer retain];
|
||||
if(renderer){
|
||||
[center addObserver:self selector:@selector(finalOutputChanged:) name:@"DYFinalOutputDidChange" object:renderer];
|
||||
[center addObserver:self selector:@selector(spiderScopeChanged:) name:@"DYSpiderScopeDidChange" object:renderer];
|
||||
}
|
||||
self.needsDisplay=YES;
|
||||
}
|
||||
- (BOOL)canDisplayScope {
|
||||
return self.window&&!self.hiddenOrHasHiddenAncestor&&!NSIsEmptyRect(self.visibleRect);
|
||||
}
|
||||
- (void)finalOutputChanged:(NSNotification *)note {
|
||||
if([self canDisplayScope])[_scopeRenderer outputSpiderScope];
|
||||
}
|
||||
- (void)spiderScopeChanged:(NSNotification *)note {
|
||||
if([self canDisplayScope])self.needsDisplay=YES;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (BOOL)acceptsFirstResponder{return YES;}
|
||||
- (BOOL)acceptsFirstMouse:(NSEvent*)event{return YES;}
|
||||
@@ -51,18 +76,40 @@
|
||||
if(c=='\t'){_selected=(_selected+(e.modifierFlags&NSEventModifierFlagShift?[self nodeCount]-1:1)+[self nodeCount])%[self nodeCount];[_selection removeAllIndexes];[_selection addIndex:_selected];[self describeSelection];self.needsDisplay=YES;return;}
|
||||
if(c==' '){[self toggleLock];return;}if(c==NSDeleteCharacter||c==NSBackspaceCharacter){[self resetSelected];return;}
|
||||
float step=e.modifierFlags&NSEventModifierFlagShift?.02f:.005f;
|
||||
if(c==NSLeftArrowFunctionKey)[self moveFrom:_grade x:-step y:0];else if(c==NSRightArrowFunctionKey)[self moveFrom:_grade x:step y:0];else if(c==NSUpArrowFunctionKey)[self moveFrom:_grade x:0 y:-step];else if(c==NSDownArrowFunctionKey)[self moveFrom:_grade x:0 y:step];else[super keyDown:e];
|
||||
NSPoint move=NSZeroPoint;
|
||||
if(c==NSLeftArrowFunctionKey)move.x=-step;
|
||||
else if(c==NSRightArrowFunctionKey)move.x=step;
|
||||
else if(c==NSUpArrowFunctionKey)move.y=-step;
|
||||
else if(c==NSDownArrowFunctionKey)move.y=step;
|
||||
else{[super keyDown:e];return;}
|
||||
if(_selection.count){
|
||||
NSInteger lead=_selected>=0&&[_selection containsIndex:_selected]?_selected:_selection.firstIndex;
|
||||
NSRect rect=self.discRect;
|
||||
NSPoint delta=DYSpiderMeshDelta(rect,_mesh.x[lead],_mesh.y[lead],NSMakePoint(move.x*NSWidth(rect),move.y*NSHeight(rect)));
|
||||
[self moveFrom:_grade x:delta.x y:delta.y];
|
||||
}
|
||||
}
|
||||
- (instancetype)initWithFrame:(NSRect)r{if((self=[super initWithFrame:r])){_grade=dyDefaultGrade();_mesh=dy::legacyMesh(_grade);_selected=-1;self.pinData=nil;self.selection=[NSMutableIndexSet indexSet];_interactionEnabled=YES;self.accessibilityLabel=@"蜘蛛盘,拖动一点联动同列自由点";}return self;}
|
||||
- (NSRect)discRect{CGFloat s=MIN(self.bounds.size.width,self.bounds.size.height)-32;return NSMakeRect((self.bounds.size.width-s)/2,(self.bounds.size.height-s)/2,s,s);}
|
||||
- (NSPoint)point:(NSInteger)i{NSRect r=self.discRect;return NSMakePoint(r.origin.x+_mesh.x[i]*r.size.width,r.origin.y+_mesh.y[i]*r.size.height);}
|
||||
- (instancetype)initWithFrame:(NSRect)r{if((self=[super initWithFrame:r])){_grade=dyDefaultGrade();_mesh=dy::legacyMesh(_grade);_selected=-1;self.pinData=nil;self.selection=[NSMutableIndexSet indexSet];_interactionEnabled=YES;self.accessibilityLabel=@"蜘蛛盘,含矢量示波器和肤色指示线";}return self;}
|
||||
- (NSRect)discRect{CGFloat s=MAX(0,MIN(self.bounds.size.width,self.bounds.size.height)-32);return NSMakeRect((self.bounds.size.width-s)/2,(self.bounds.size.height-s)/2,s,s);}
|
||||
- (NSPoint)point:(NSInteger)i{return DYSpiderPlotPoint(self.discRect,_mesh.x[i],_mesh.y[i]);}
|
||||
- (void)setGrade:(DYGrade)g{if(memcmp(g.spiderX,_grade.spiderX,sizeof(g.spiderX))||memcmp(g.spiderY,_grade.spiderY,sizeof(g.spiderY))){_grade=g;self.meshData=nil;}else _grade=g;self.needsDisplay=YES;}
|
||||
- (void)drawRect:(NSRect)dirty{
|
||||
NSRect r=self.discRect;NSPoint c=NSMakePoint(NSMidX(r),NSMidY(r));CGFloat rad=r.size.width/2;
|
||||
for(int s=0;s<64;s++)for(int ring=1;ring<=5;ring++){double a=s*M_PI/32,b=(s+1)*M_PI/32;NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(c.x+cos(a)*(ring-1)*rad/5,c.y+sin(a)*(ring-1)*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(a)*ring*rad/5,c.y+sin(a)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*ring*rad/5,c.y+sin(b)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*(ring-1)*rad/5,c.y+sin(b)*(ring-1)*rad/5)];[p closePath];[[NSColor colorWithCalibratedHue:s/64. saturation:ring/5. brightness:.47 alpha:1]setFill];[p fill];}
|
||||
[[NSColor colorWithWhite:1 alpha:.30]setStroke];for(int ring=1;ring<=_mesh.rings;ring++){NSBezierPath *p=[NSBezierPath bezierPath];for(int s=0;s<=_mesh.hues;s++){NSPoint q=[self point:dy::meshIndex(_mesh,s%_mesh.hues,ring)];if(s==0)[p moveToPoint:q];else[p lineToPoint:q];}[p stroke];}
|
||||
for(int s=0;s<_mesh.hues;s++){NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:[self point:[self nodeCount]-1]];for(int ring=1;ring<=_mesh.rings;ring++)[p lineToPoint:[self point:dy::meshIndex(_mesh,s,ring)]];[p stroke];}
|
||||
for(int i=0;i<[self nodeCount];i++){NSPoint p=[self point:i];CGFloat z=[_selection containsIndex:i]?4.5:2.6;NSBezierPath *d=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-z,p.y-z,z*2,z*2)];[([_selection containsIndex:i]?DYAccent():[NSColor colorWithWhite:1 alpha:.85])setFill];[d fill];if([_selection containsIndex:i]){[NSColor.whiteColor setStroke];[d stroke];}if([_pinned containsIndex:i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(p.x-1,p.y-1,2,2));}}
|
||||
NSRect r=self.discRect;if(NSIsEmptyRect(r))return;
|
||||
DYDrawSpiderScope(r,[self canDisplayScope]?[_scopeRenderer outputSpiderScope]:nil,1);
|
||||
NSBezierPath *net=[NSBezierPath bezierPath];
|
||||
for(int ring=1;ring<=_mesh.rings;ring++){
|
||||
for(int hue=0;hue<=_mesh.hues;hue++){
|
||||
NSPoint q=[self point:dy::meshIndex(_mesh,hue%_mesh.hues,ring)];
|
||||
if(hue==0)[net moveToPoint:q];else[net lineToPoint:q];
|
||||
}
|
||||
}
|
||||
for(int hue=0;hue<_mesh.hues;hue++){
|
||||
[net moveToPoint:[self point:[self nodeCount]-1]];
|
||||
for(int ring=1;ring<=_mesh.rings;ring++)[net lineToPoint:[self point:dy::meshIndex(_mesh,hue,ring)]];
|
||||
}
|
||||
DYDrawSpiderNet(net,1);
|
||||
for(int i=0;i<[self nodeCount];i++)
|
||||
DYDrawSpiderNode([self point:i],1,[_selection containsIndex:i]?DYAccent():nil,[_pinned containsIndex:i]);
|
||||
if(_marquee){
|
||||
NSRect box=NSMakeRect(MIN(_dragOrigin.x,_marqueeEnd.x),MIN(_dragOrigin.y,_marqueeEnd.y),fabs(_dragOrigin.x-_marqueeEnd.x),fabs(_dragOrigin.y-_marqueeEnd.y));
|
||||
NSBezierPath*outline=[NSBezierPath bezierPathWithRect:box];outline.lineWidth=1.25;
|
||||
@@ -89,7 +136,8 @@
|
||||
- (void)mouseDragged:(NSEvent*)e {
|
||||
if(!_interactionEnabled)return;NSPoint p=[self convertPoint:e.locationInWindow fromView:nil];
|
||||
if(_marquee){_marqueeEnd=p;NSRect box=NSMakeRect(MIN(_dragOrigin.x,p.x),MIN(_dragOrigin.y,p.y),fabs(p.x-_dragOrigin.x),fabs(p.y-_dragOrigin.y));self.selection=[[_selectionStart mutableCopy]autorelease];for(int i=0;i<[self nodeCount];i++)if(NSPointInRect([self point:i],box))[_selection addIndex:i];[self describeSelection];self.needsDisplay=YES;}
|
||||
else if(_dragging){if(!_gestureActive){_gestureActive=YES;if(_gesture)_gesture(YES);}NSRect r=self.discRect;[self moveFrom:_dragGrade x:(p.x-_dragOrigin.x)/r.size.width y:(p.y-_dragOrigin.y)/r.size.height];}
|
||||
else if(_dragging){if(!_gestureActive){_gestureActive=YES;if(_gesture)_gesture(YES);}NSPoint delta=DYSpiderMeshDelta(self.discRect,_dragMesh.x[_selected],_dragMesh.y[_selected],
|
||||
NSMakePoint(p.x-_dragOrigin.x,p.y-_dragOrigin.y));[self moveFrom:_dragGrade x:delta.x y:delta.y];}
|
||||
}
|
||||
- (void)mouseUp:(NSEvent*)e{_dragging=_marquee=NO;[self finishGesture];self.needsDisplay=YES;}
|
||||
@end
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
#pragma once
|
||||
#import <AppKit/AppKit.h>
|
||||
#include "DYScopeMath.hpp"
|
||||
#include "SpiderCore/DYColorMath.h"
|
||||
|
||||
// Shared Cb/Cr display coordinates. Positive Cr goes up in a flipped view.
|
||||
static inline NSPoint DYScopePoint(NSRect rect, double cb, double cr) {
|
||||
return NSMakePoint(NSMidX(rect)+cb*NSWidth(rect)/(2*dyscope::ChromaLimit),
|
||||
NSMidY(rect)-cr*NSHeight(rect)/(2*dyscope::ChromaLimit));
|
||||
}
|
||||
static inline NSPoint DYSkinScopePoint(NSRect rect, double radiusFraction) {
|
||||
return DYScopePoint(rect,dyscope::SkinToneCb*dyscope::ChromaLimit*radiusFraction,
|
||||
dyscope::SkinToneCr*dyscope::ChromaLimit*radiusFraction);
|
||||
}
|
||||
|
||||
// Stored spider points remain HSV. Only the displayed angle changes; the
|
||||
// distance from center still represents the mesh's editable saturation ring.
|
||||
static inline float DYSpiderHueAtChroma(float cb,float cr) {
|
||||
auto p=dyscope::chromaRGB({cb,cr});
|
||||
return dyRGBHSV(float3{p.r,p.g,p.b}).x;
|
||||
}
|
||||
static inline NSPoint DYSpiderPlotPoint(NSRect rect,double x,double y) {
|
||||
double distance=hypot(x-.5,y-.5);
|
||||
if(distance==0)return NSMakePoint(NSMidX(rect),NSMidY(rect));
|
||||
double hue=atan2(y-.5,x-.5)/(2*M_PI);
|
||||
auto rgb=dyHSVRGB(float3{(float)hue,1,1});
|
||||
dyscope::RGBA color={rgb.x,rgb.y,rgb.z,1};
|
||||
auto c=dyscope::chroma(color,dyscope::luminance(color));
|
||||
double scale=distance*2*dyscope::ChromaLimit/hypot(c.cb,c.cr);
|
||||
return DYScopePoint(rect,c.cb*scale,c.cr*scale);
|
||||
}
|
||||
static inline NSPoint DYSpiderMeshPoint(NSRect rect,NSPoint point) {
|
||||
if(NSIsEmptyRect(rect))return NSMakePoint(.5,.5);
|
||||
double cb=(point.x-NSMidX(rect))/NSWidth(rect),cr=(NSMidY(rect)-point.y)/NSHeight(rect);
|
||||
double radius=hypot(cb,cr),angle=2*M_PI*DYSpiderHueAtChroma(cb,cr);
|
||||
return NSMakePoint(.5+cos(angle)*radius,.5+sin(angle)*radius);
|
||||
}
|
||||
static inline NSPoint DYSpiderMeshDelta(NSRect rect,double x,double y,NSPoint movement) {
|
||||
if(NSIsEmptyRect(rect)||NSEqualPoints(movement,NSZeroPoint))return NSZeroPoint;
|
||||
NSPoint target=DYSpiderPlotPoint(rect,x,y);
|
||||
target.x+=movement.x;target.y+=movement.y;
|
||||
NSPoint mapped=DYSpiderMeshPoint(rect,target);
|
||||
return NSMakePoint(mapped.x-x,mapped.y-y);
|
||||
}
|
||||
|
||||
static inline void DYDrawSpiderWheel(NSRect rect) {
|
||||
// Cache the smooth color field. A neutral center separates the trace from
|
||||
// the hue around the perimeter, and the field is shared by every mesh size.
|
||||
static NSImage *wheel;
|
||||
static dispatch_once_t once;
|
||||
dispatch_once(&once,^{
|
||||
constexpr NSInteger side=256;
|
||||
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil
|
||||
pixelsWide:side pixelsHigh:side bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES
|
||||
isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:side*4 bitsPerPixel:32]autorelease];
|
||||
for(NSInteger y=0;y<side;y++)for(NSInteger x=0;x<side;x++){
|
||||
float cb=(x+.5f-side*.5f)/(side*.5f),cr=(side*.5f-y-.5f)/(side*.5f);
|
||||
float radius=std::min(1.f,std::hypot(cb,cr));
|
||||
auto color=dyHSVRGB(float3{DYSpiderHueAtChroma(cb,cr),radius*.93f,.225f+.17f*radius});
|
||||
uint8_t *out=bitmap.bitmapData+4*(y*side+x);
|
||||
out[0]=std::lround(color.x*255);out[1]=std::lround(color.y*255);
|
||||
out[2]=std::lround(color.z*255);out[3]=255;
|
||||
}
|
||||
wheel=[[NSImage alloc]initWithSize:NSMakeSize(side,side)];
|
||||
[wheel addRepresentation:bitmap];
|
||||
});
|
||||
[wheel drawInRect:rect fromRect:NSZeroRect operation:NSCompositingOperationSourceOver
|
||||
fraction:1 respectFlipped:YES hints:nil];
|
||||
}
|
||||
|
||||
static inline void DYDrawSpiderTrace(NSRect rect, NSData *raster) {
|
||||
constexpr size_t side=dyscope::Bins;
|
||||
if(raster.length!=side*side*4)return;
|
||||
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)raster);
|
||||
CGColorSpaceRef space=CGColorSpaceCreateDeviceRGB();
|
||||
CGImageRef image=CGImageCreate(side,side,8,32,side*4,space,kCGImageAlphaPremultipliedLast,
|
||||
provider,nullptr,false,kCGRenderingIntentDefault);
|
||||
if(image){
|
||||
NSImage *trace=[[[NSImage alloc]initWithCGImage:image size:NSZeroSize]autorelease];
|
||||
[trace drawInRect:rect fromRect:NSZeroRect operation:NSCompositingOperationSourceOver
|
||||
fraction:1 respectFlipped:YES hints:@{NSImageHintInterpolation:@(NSImageInterpolationLow)}];
|
||||
CGImageRelease(image);
|
||||
}
|
||||
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
|
||||
}
|
||||
|
||||
static inline void DYDrawSpiderScope(NSRect rect,NSData *raster,CGFloat scale) {
|
||||
if(NSIsEmptyRect(rect))return;
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
[[NSBezierPath bezierPathWithOvalInRect:rect]addClip];
|
||||
DYDrawSpiderWheel(rect);
|
||||
DYDrawSpiderTrace(rect,raster);
|
||||
|
||||
NSBezierPath *line=[NSBezierPath bezierPath];
|
||||
[line moveToPoint:DYSkinScopePoint(rect,.08)];
|
||||
[line lineToPoint:DYSkinScopePoint(rect,.93)];
|
||||
CGFloat dashes[]={4*scale,3*scale};
|
||||
[line setLineDash:dashes count:2 phase:0];
|
||||
line.lineWidth=2.7*scale;
|
||||
[[NSColor colorWithWhite:0 alpha:.9]setStroke];[line stroke];
|
||||
line.lineWidth=1.15*scale;
|
||||
[[NSColor colorWithSRGBRed:1 green:.79 blue:.57 alpha:1]setStroke];[line stroke];
|
||||
if(NSWidth(rect)>=72*scale){
|
||||
NSDictionary *attrs=@{NSFontAttributeName:[NSFont systemFontOfSize:9*scale weight:NSFontWeightMedium],
|
||||
NSForegroundColorAttributeName:[NSColor colorWithSRGBRed:1 green:.88 blue:.74 alpha:1]};
|
||||
NSString *label=@"肤色";NSSize size=[label sizeWithAttributes:attrs];
|
||||
NSPoint anchor=DYSkinScopePoint(rect,.83);
|
||||
anchor.x+=4*scale;anchor.y-=size.height*.65;
|
||||
NSRect tag=NSInsetRect(NSMakeRect(anchor.x,anchor.y,size.width,size.height),-3*scale,-1*scale);
|
||||
[[NSColor colorWithWhite:.09 alpha:.93]setFill];
|
||||
[[NSBezierPath bezierPathWithRoundedRect:tag xRadius:3*scale yRadius:3*scale]fill];
|
||||
[label drawAtPoint:anchor withAttributes:attrs];
|
||||
}
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
|
||||
static inline void DYDrawSpiderNet(NSBezierPath *net,CGFloat scale) {
|
||||
net.lineWidth=1.65*scale;
|
||||
[[NSColor colorWithWhite:0 alpha:.63]setStroke];[net stroke];
|
||||
net.lineWidth=.7*scale;
|
||||
[[NSColor colorWithWhite:1 alpha:.72]setStroke];[net stroke];
|
||||
}
|
||||
static inline void DYDrawSpiderNode(NSPoint p,CGFloat scale,NSColor *selection,BOOL pinned) {
|
||||
CGFloat radius=(selection?4.2:2.9)*scale;
|
||||
NSBezierPath *dot=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-radius,p.y-radius,2*radius,2*radius)];
|
||||
[(selection?:[NSColor colorWithWhite:.62 alpha:1])setFill];[dot fill];
|
||||
dot.lineWidth=(selection?1.9:1.55)*scale;
|
||||
[[NSColor colorWithWhite:.065 alpha:1]setStroke];[dot stroke];
|
||||
if(pinned){
|
||||
[NSColor.blackColor setFill];
|
||||
NSRectFill(NSMakeRect(p.x-scale,p.y-scale,2*scale,2*scale));
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
- (void)synchronizeTools {
|
||||
id<FxCustomParameterActionAPI_v4>a=[self actionAPI];if(!a)return;[a startAction:self];NSDictionary *document=nil;@try{document=[DYReadTools(_manager,a.currentTime).document copy];}@finally{[a endAction:self];}
|
||||
- (void)synchronizeTools:(NSDictionary *)document {
|
||||
NSMutableArray *order=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*roots=[NSMutableDictionary dictionary];
|
||||
for(NSString *orderedID in DYToolDisplayOrder(document)){NSDictionary *node=DYToolWithID(document,orderedID);if(!node)continue;NSString *ID=node[@"id"],*type=node[@"type"];[order addObject:ID];roots[ID]=DYToolRootAnchor(document,ID)?:@"tail";NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);
|
||||
DYInspector *view=_stackViews[ID];if(!view){DYToolManager *manager=[[[DYToolManager alloc]initWithHost:_manager node:node]autorelease];view=[[[DYInspector alloc]initWithAPIManager:manager renderer:_renderer]autorelease];_stackViews[ID]=view;[_document addSubview:view];}
|
||||
DYInspector *view=_stackViews[ID];BOOL existed=view!=nil;if(!view){DYToolManager *manager=[[[DYToolManager alloc]initWithHost:_manager node:node]autorelease];view=[[[DYInspector alloc]initWithAPIManager:manager renderer:_renderer]autorelease];_stackViews[ID]=view;[_document addSubview:view];}
|
||||
if(view->_cards.count){NSDictionary *section=view->_cards[0][@"section"];NSString *title=[NSString stringWithFormat:@"%@ %ld",section[@"title"],(long)number];[view->_cards[0][@"header"]setTitle:title];[view->_cards[0][@"removeButton"]setAccessibilityLabel:[title stringByAppendingString:@"删除此层"]];}
|
||||
[view refresh];[view setNeedsLayout:YES];
|
||||
if(existed)[view refresh];
|
||||
}
|
||||
for(NSString *ID in [[_stackViews.allKeys copy]autorelease])if(![order containsObject:ID]){[_stackViews[ID]removeFromSuperview];[_stackViews removeObjectForKey:ID];}
|
||||
[_stackOrder release];_stackOrder=[order copy];[_stackRoots release];_stackRoots=[roots copy];[document release];[self setNeedsLayout:YES];
|
||||
[_stackOrder release];_stackOrder=[order copy];[_stackRoots release];_stackRoots=[roots copy];[self setNeedsLayout:YES];
|
||||
}
|
||||
- (void)toolMask:(NSButton*)sender{if(sender.tag<0||sender.tag>=_cards.count)return;id host=_embedded?[(DYToolManager*)_manager host]:_manager;NSString *node=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:_cards[sender.tag][@"section"][@"key"]];[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":node,@"source":@"inspector"}];[(DYToolMaskPanel*)_cards[sender.tag][@"maskPanel"]addMenu:sender];}
|
||||
- (void)repeatTool:(NSButton*)sender{
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
for(NSDictionary *m in groups[type]){if(![m[@"enabled"]boolValue])continue;DYToolMaskEntry entry{};entry.section=(int)section;entry.combine=[m[@"combine"]intValue];[m[@"parameters"]getBytes:&entry.mask.parameters length:sizeof(DYMaskParameters)];entry.mask.parameters.imageAspect=w/ht;NSData *nodes=m[@"nodes"];entry.mask.path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));entries.push_back(entry);}
|
||||
}if(_faceEntries.length){const DYToolMaskEntry *faces=(const DYToolMaskEntry*)_faceEntries.bytes;entries.insert(entries.end(),faces,faces+_faceEntries.length/sizeof(DYToolMaskEntry));}h->count=(unsigned)entries.size();if(entries.empty())entries.push_back({});return [[device newBufferWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry) options:MTLResourceStorageModeShared]autorelease];
|
||||
}
|
||||
- (void)encodeBlend:(id<MTLTexture>)before after:(id<MTLTexture>)after output:(id<MTLTexture>)output masks:(id<MTLBuffer>)masks header:(DYToolMaskHeader)h entry:(NSDictionary*)entry commands:(id<MTLCommandBuffer>)commands {
|
||||
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"dyToolBlend"]];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
- (BOOL)encodeBlend:(id<MTLTexture>)before after:(id<MTLTexture>)after output:(id<MTLTexture>)output masks:(id<MTLBuffer>)masks header:(DYToolMaskHeader)h entry:(NSMutableDictionary*)entry commands:(id<MTLCommandBuffer>)commands error:(NSError**)error {
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:@"dyToolBlend" entry:entry error:error];if(!pipeline)return NO;
|
||||
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:pipeline];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];return YES;
|
||||
}
|
||||
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest entry:(NSMutableDictionary*)e error:(NSError**)error {
|
||||
return [self copyTile:source to:dest rotation:0 entry:e error:error];
|
||||
@@ -34,7 +35,7 @@
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.textureCoordinate.y=1-vertex.textureCoordinate.y;
|
||||
if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.position.y=-vertex.position.y;
|
||||
}
|
||||
vector_uint2 size={(unsigned)b.width,(unsigned)b.height};id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=b;pass.colorAttachments[0].loadAction=MTLLoadActionDontCare;pass.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>encoder=[cb renderCommandEncoderWithDescriptor:pass];[encoder setRenderPipelineState:pipeline];[encoder setVertexBytes:v length:sizeof(v) atIndex:0];[encoder setVertexBytes:&size length:sizeof(size) atIndex:1];[encoder setFragmentTexture:a atIndex:0];[encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[encoder endEncoding];[cb commit];[cb waitUntilCompleted];return cb.status==MTLCommandBufferStatusCompleted?YES:fail(error,cb.error.localizedDescription);
|
||||
vector_uint2 size={(unsigned)b.width,(unsigned)b.height};id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=b;pass.colorAttachments[0].loadAction=MTLLoadActionDontCare;pass.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>encoder=[cb renderCommandEncoderWithDescriptor:pass];[encoder setRenderPipelineState:pipeline];[encoder setVertexBytes:v length:sizeof(v) atIndex:0];[encoder setVertexBytes:&size length:sizeof(size) atIndex:1];[encoder setFragmentTexture:a atIndex:0];[encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[encoder endEncoding];return [self completeCommands:cb destination:dest texture:b entry:e]?YES:fail(error,cb.error.localizedDescription);
|
||||
}
|
||||
// Extra skin keeps the source reference used by the prior release. All other
|
||||
// extra tools reuse the same isolated native tool path and their own mask group.
|
||||
@@ -50,22 +51,28 @@
|
||||
if([type isEqual:@"mixer"]||[type isEqual:@"film"]){layer.filmFrameKey=[node[@"filmFrameKey"]unsignedIntValue];return [self renderFilmTool:type source:source destination:destination uniforms:layer masks:node[@"masks"] entry:entry error:error];}
|
||||
if(![type isEqual:@"skin"])return [self renderLegacy:source destination:destination uniforms:layer paths:node[@"paths"] spider:node[@"spider"] masks:@{type:node[@"masks"]} error:error];
|
||||
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d],input=[original metalTextureForDevice:d],after=[destination metalTextureForDevice:d];
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:entry[@"dyToolSkin"]];[ce setTexture:before atIndex:0];[ce setTexture:input atIndex:1];[ce setTexture:after atIndex:2];[ce setBytes:&layer length:sizeof(layer) atIndex:0];[ce dispatchThreads:MTLSizeMake(after.width,after.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:@"dyToolSkin" entry:entry error:error];if(!pipeline)return NO;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:input atIndex:1];[ce setTexture:after atIndex:2];[ce setBytes:&layer length:sizeof(layer) atIndex:0];[ce dispatchThreads:MTLSizeMake(after.width,after.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
|
||||
if(![node[@"masks"]count]&&layer.skinFaceOnly<.5&&layer.skinVisualize<.5)return YES;
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:after.width height:after.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;id<MTLTexture>blend=[d newTextureWithDescriptor:desc];if(!blend)return fail(error,@"无法分配新增工具蒙版缓冲区");
|
||||
DYToolMaskHeader h{};h.section=3;h.faceOnly=layer.skinFaceOnly>.5;h.skinPreview=layer.skinProtection.x>.5&&layer.skinVisualize>.5;id<MTLBuffer>buffer=[self maskBuffer:@{type:node[@"masks"]} tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];[self encodeBlend:before after:after output:blend masks:buffer header:h entry:entry commands:cb];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
|
||||
DYToolMaskHeader h{};h.section=3;h.faceOnly=layer.skinFaceOnly>.5;h.skinPreview=layer.skinProtection.x>.5&&layer.skinVisualize>.5;id<MTLBuffer>buffer=[self maskBuffer:@{type:node[@"masks"]} tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];if(![self encodeBlend:before after:after output:blend masks:buffer header:h entry:entry commands:cb error:error]){[blend release];return NO;}[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
|
||||
DYExportTile *blended=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[blended setBounds:source.tilePixelBounds origin:source.imageOrigin];[blended setPixelAspect:source.pixelAspect];[blend release];if(ok)ok=[self copyTile:blended to:destination entry:entry error:error];else fail(error,cb.error.localizedDescription);[blended release];return ok;
|
||||
}
|
||||
- (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
|
||||
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
|
||||
DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
NSArray *layers=tools[@"layers"];BOOL active=NO,anchored=NO;for(NSDictionary *node in layers)if(!DYToolIsNeutral(node)){active=YES;anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];}
|
||||
NSMutableSet *activeIDs=nil;BOOL anchored=NO;
|
||||
for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node)){
|
||||
if(!activeIDs)activeIDs=[NSMutableSet set];
|
||||
[activeIDs addObject:node[@"id"]];
|
||||
anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];
|
||||
}
|
||||
// No active extra tool keeps the exact historical fused path, including HDR.
|
||||
if(!active&&!DYChannelMixerActive(u)&&!DYFilmToolActive(u)&&(u.lensSectionEnabled<.5||(u.lensStrength==0&&u.lensScale==1)))return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
|
||||
if(!activeIDs.count&&!DYChannelMixerActive(u)&&!DYFilmToolActive(u)&&(u.lensSectionEnabled<.5||(u.lensStrength==0&&u.lensScale==1)))return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
|
||||
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>input=[src metalTextureForDevice:d];if(!input)return fail(error,@"宿主图像纹理不可用");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
DYExportTile *tile=nil,*skinReference=nil,*originalReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){NSDictionary *node=DYToolWithID(tools,ID);if(!node||DYToolIsNeutral(node))continue;NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];}
|
||||
DYExportTile *tile=nil,*skinReference=nil,*originalReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){if(![activeIDs containsObject:ID])continue;NSDictionary *node=DYToolWithID(tools,ID);NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];}
|
||||
auto makeTile=[&](){id<MTLTexture>texture=[d newTextureWithDescriptor:desc];if(!texture)return (DYExportTile*)nil;DYExportTile *result=[[DYExportTile alloc]initWithTexture:texture registry:d.registryID];[result setBounds:src.tilePixelBounds origin:src.imageOrigin];[result setPixelAspect:src.pixelAspect];[texture release];return result;};
|
||||
auto replace=[&](DYExportTile *next){[tile release];tile=next;};
|
||||
auto apply=[&](NSString *anchor){for(NSDictionary *node in groups[anchor]){if(!DYRenderWithPool(error,[&]()->BOOL{DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配新增工具缓冲区");BOOL ok=[self renderExtraTool:node source:tile original:src destination:next entry:entry error:error];if(!ok){[next release];return NO;}replace(next);return YES;}))return NO;}return YES;};
|
||||
@@ -99,7 +106,7 @@
|
||||
if(branch==0)bwTile=[tile retain];
|
||||
}
|
||||
DYExportTile *mixed=makeTile();if(!mixed)return fail(error,@"无法分配黑白混合缓冲区");DYToolMaskEntry constant{};constant.section=0;constant.combine=0;constant.mask.parameters=dyDefaultMaskParameters();constant.mask.parameters.kind=DYMaskRectangle;constant.mask.parameters.width=constant.mask.parameters.height=4000;constant.mask.parameters.feather=0;constant.mask.parameters.outputBlack=constant.mask.parameters.outputWhite=1;constant.mask.parameters.strength=bwMix;
|
||||
id<MTLBuffer>weight=[[d newBufferWithBytes:&constant length:sizeof(constant) options:MTLResourceStorageModeShared]autorelease];if(!weight){[mixed release];return fail(error,@"无法分配黑白混合权重");}DYToolMaskHeader h{};h.count=1;h.section=0;h.premultiplied=1;h.scaleX=h.scaleY=1;id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];[self encodeBlend:[tile metalTextureForDevice:d] after:[bwTile metalTextureForDevice:d] output:[mixed metalTextureForDevice:d] masks:weight header:h entry:entry commands:commands];[commands commit];[commands waitUntilCompleted];if(commands.status!=MTLCommandBufferStatusCompleted){[mixed release];return fail(error,commands.error.localizedDescription);}replace(mixed);
|
||||
id<MTLBuffer>weight=[[d newBufferWithBytes:&constant length:sizeof(constant) options:MTLResourceStorageModeShared]autorelease];if(!weight){[mixed release];return fail(error,@"无法分配黑白混合权重");}DYToolMaskHeader h{};h.count=1;h.section=0;h.premultiplied=1;h.scaleX=h.scaleY=1;id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];if(![self encodeBlend:[tile metalTextureForDevice:d] after:[bwTile metalTextureForDevice:d] output:[mixed metalTextureForDevice:d] masks:weight header:h entry:entry commands:commands error:error]){[mixed release];return NO;}[commands commit];[commands waitUntilCompleted];if(commands.status!=MTLCommandBufferStatusCompleted){[mixed release];return fail(error,commands.error.localizedDescription);}replace(mixed);
|
||||
}@finally{[prefix release];[bwTile release];}
|
||||
// An extra skin tool follows the original skin and B&W mixture once.
|
||||
if(!apply(@"base:skin"))return NO;
|
||||
|
||||
@@ -86,7 +86,7 @@ static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p
|
||||
static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);}
|
||||
static CMTime keyTime(NSDictionary *key){return CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);}
|
||||
NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParameters p=dyDefaultMaskParameters();p.kind=(DYMaskKind)kind;p.width=.5;p.height=.5;p.sourceStage=DYMaskSourceOriginal;if(kind==DYMaskHSLKey)p.flags=DYMaskHueEnabled;NSData *nodes=[NSData data];if(kind==DYMaskBezier){DYBezierNode n[4]={};float x[4]={-.5,.5,.5,-.5},y[4]={-.5,-.5,.5,.5};for(int i=0;i<4;i++)n[i]={x[i],y[i],x[i],y[i],x[i],y[i]};nodes=[NSData dataWithBytes:n length:sizeof(n)];}return @{@"id":NSUUID.UUID.UUIDString,@"enabled":@YES,@"combine":@0,@"parameters":parameterData(p),@"nodes":nodes,@"keys":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinEnabled":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
BOOL DYValidToolMask(NSDictionary *mask){
|
||||
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
|
||||
if(mask[@"label"]&&(![mask[@"label"]isKindOfClass:NSString.class]||[mask[@"label"]length]>100))return NO;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
auto dispatch=[&](NSString*name,const void*params,NSUInteger length,const void*extra=nullptr,NSUInteger extraLength=0){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级 CST 缓冲区。");BOOL ok=[self managedDispatch:name textures:@[current,out] data:params length:length extra:extra extraLength:extraLength entry:entry error:error];if(ok)current=out;return ok;};
|
||||
auto transform=[&](CSTParams p){if(p.inputTransfer==p.outputTransfer&&p.inputGamut==p.outputGamut&&!p.toneMapping)return YES;return dispatch(@"dyPrimaryCST",&p,sizeof(p));};
|
||||
auto tile=[&](id<MTLTexture>t){DYExportTile*v=[[[DYExportTile alloc]initWithTexture:t registry:d.registryID]autorelease];[v setBounds:src.tilePixelBounds origin:src.imageOrigin];[v setPixelAspect:src.pixelAspect];return v;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];struct {CSTParams toLinear,fromLinear,originalTo709;float amount;}p={{wg,wt,2,20,0},{2,20,wg,wt,0},{initialGamut,initialTransfer,22,20,0},amount};id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyUnifiedBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setTexture:originalWorking?:before atIndex:3];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];struct {CSTParams toLinear,fromLinear,originalTo709;float amount;}p={{wg,wt,2,20,0},{2,20,wg,wt,0},{initialGamut,initialTransfer,22,20,0},amount};id<MTLComputePipelineState>pipeline=[self computePipeline:@"dyUnifiedBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setTexture:originalWorking?:before atIndex:3];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto grade=[&](DYUniforms values,NSArray*masks,BOOL local){if(values.primarySectionEnabled<.5||values.cm.mix<=0)return YES;DYUniforms neutral=values;neutral.inputSectionEnabled=neutral.cm.outputEnabled=0;BOOL gradeNeutral=identityCM(neutral);if(!local&&gradeNeutral)return YES;if(local&&identityCM(values))return YES;
|
||||
DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;if((int)lroundf(values.cm.workingTransfer)==20){p.reserved|=8;p.basis.colorspace=10;p.basisInput={(int)lroundf(values.cm.workingGamut),20,(int)lroundf(values.cm.workingGamut),10,0};p.basisOutput={(int)lroundf(values.cm.workingGamut),10,(int)lroundf(values.cm.workingGamut),20,0};}CSTParams back={wg,wt,wg,wt,0};
|
||||
if(local){p.stages=(values.inputSectionEnabled>.5?1:0)|(gradeNeutral?0:2)|(values.cm.outputEnabled>.5?4:0);back={values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputGamut):(int)lroundf(values.cm.workingGamut),values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputTransfer):(int)lroundf(values.cm.workingTransfer),wg,wt,0};}
|
||||
|
||||
@@ -61,13 +61,15 @@
|
||||
[NSGraphicsContext restoreGraphicsState];[self text:@"红 橙 黄 绿 青 蓝 紫 洋红" rect:NSMakeRect(r.origin.x,NSMaxY(r)+3*s,r.size.width,15*s)size:9 color:ink alignment:NSTextAlignmentCenter];return;
|
||||
}
|
||||
if([area[@"kind"]isEqual:@"spiderPlot"]){
|
||||
auto mesh=DYSpiderMesh([self spiderData]);CGFloat rad=r.size.width/2;NSPoint center=NSMakePoint(NSMidX(r),NSMidY(r));
|
||||
for(int i=0;i<64;i++){double a=i*2*M_PI/64,b=(i+1)*2*M_PI/64;NSBezierPath *wedge=[NSBezierPath bezierPath];[wedge moveToPoint:center];[wedge lineToPoint:NSMakePoint(center.x+cos(a)*rad,center.y+sin(a)*rad)];[wedge lineToPoint:NSMakePoint(center.x+cos(b)*rad,center.y+sin(b)*rad)];[wedge closePath];[[NSColor colorWithHue:i/64. saturation:.8 brightness:.8 alpha:.24]setFill];[wedge fill];}
|
||||
auto point=[&](int i){return NSMakePoint(r.origin.x+mesh.x[i]*r.size.width,r.origin.y+mesh.y[i]*r.size.height);};NSBezierPath *net=[NSBezierPath bezierPath];net.lineWidth=.6*s;
|
||||
auto mesh=DYSpiderMesh([self spiderData]);
|
||||
DYDrawSpiderScope(r,[_bridge canvasSpiderScopeAtTime:_time],s);
|
||||
auto point=[&](int i){return DYSpiderPlotPoint(r,mesh.x[i],mesh.y[i]);};
|
||||
NSBezierPath *net=[NSBezierPath bezierPath];
|
||||
for(int ring=1;ring<=mesh.rings;ring++)for(int hue=0;hue<=mesh.hues;hue++){NSPoint q=point(dy::meshIndex(mesh,hue%mesh.hues,ring));if(hue==0)[net moveToPoint:q];else[net lineToPoint:q];}
|
||||
for(int hue=0;hue<mesh.hues;hue++){[net moveToPoint:point(dy::meshCount(mesh)-1)];for(int ring=1;ring<=mesh.rings;ring++)[net lineToPoint:point(dy::meshIndex(mesh,hue,ring))];}
|
||||
[[ink colorWithAlphaComponent:.5]setStroke];[net stroke];
|
||||
for(int i=0;i<dy::meshCount(mesh);i++){NSPoint q=point(i);CGFloat rr=(i==_selectedSpider?4:2)*s;[(i==_selectedSpider?accent:ink)setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-rr,q.y-rr,2*rr,2*rr)]fill];if(mesh.pins[i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(q.x-s,q.y-s,2*s,2*s));}}return;
|
||||
DYDrawSpiderNet(net,s);
|
||||
for(int i=0;i<dy::meshCount(mesh);i++)DYDrawSpiderNode(point(i),s,i==_selectedSpider?accent:nil,mesh.pins[i]);
|
||||
return;
|
||||
}
|
||||
if([area[@"kind"]isEqual:@"wheel"]){
|
||||
NSInteger index=[area[@"index"]integerValue];[self text:area[@"title"]rect:NSMakeRect(r.origin.x,r.origin.y-19*s,r.size.width,17*s)size:10 color:ink alignment:NSTextAlignmentCenter];
|
||||
@@ -103,7 +105,7 @@
|
||||
BOOL center=[c[@"kind"]isEqual:@"lensCenter"];NSArray *keys=center?@[@"lensCenterX",@"lensCenterY"]:@[@"lensStrength"];NSMutableArray *descriptors=[NSMutableArray array];NSMutableDictionary *values=[NSMutableDictionary dictionary];for(NSString *key in keys){[descriptors addObject:[self descriptorForKey:key]];values[key]=@([self graphicValue:key]);}c[@"lensStart"]=values;[_captured release];_captured=[c copy];[_bridge beginParameters:descriptors node:_nodeID values:values atTime:_time];return;
|
||||
}
|
||||
|
||||
if([c[@"kind"]isEqual:@"spiderPlot"]){auto mesh=DYSpiderMesh([self spiderData]);double best=12*_scale;NSInteger chosen=-1;for(int i=0;i<dy::meshCount(mesh);i++){double distance=hypot(p.x-(r.origin.x+mesh.x[i]*r.size.width),p.y-(r.origin.y+mesh.y[i]*r.size.height));if(distance<best){best=distance;chosen=i;}}if(chosen<0)return;_selectedSpider=chosen;c[@"meshStart"]=[NSData dataWithBytes:&mesh length:sizeof(mesh)];[_captured release];_captured=[c copy];[self beginSpiderData];return;}
|
||||
if([c[@"kind"]isEqual:@"spiderPlot"]){auto mesh=DYSpiderMesh([self spiderData]);double best=12*_scale;NSInteger chosen=-1;for(int i=0;i<dy::meshCount(mesh);i++){NSPoint q=DYSpiderPlotPoint(r,mesh.x[i],mesh.y[i]);double distance=hypot(p.x-q.x,p.y-q.y);if(distance<best){best=distance;chosen=i;}}if(chosen<0)return;_selectedSpider=chosen;c[@"meshStart"]=[NSData dataWithBytes:&mesh length:sizeof(mesh)];[_captured release];_captured=[c copy];[self beginSpiderData];return;}
|
||||
if([c[@"kind"]isEqual:@"hslPlot"]){NSInteger color=MAX(0,MIN(7,(NSInteger)((p.x-r.origin.x)/r.size.width*8)));NSString *key=[NSString stringWithFormat:@"hsl%ld_%ld",(long)_hslAxis,(long)color];c[@"hslKey"]=key;[_captured release];_captured=[c copy];[_bridge beginParameter:[self descriptorForKey:key]node:_nodeID value:[self graphicValue:key]atTime:_time];return;}
|
||||
if([c[@"kind"]isEqual:@"curvePlot"]){NSDictionary*nearest=nil;double distance=12*_scale;for(NSDictionary*point in [self curvePoints]){NSPoint q=[self curvePosition:point rect:r];double d=hypot(q.x-p.x,q.y-p.y);if(d<distance){distance=d;nearest=point;}}
|
||||
if(!nearest)for(NSDictionary*slot in [self curveSlots])if([self graphicValue:slot[@"xKey"]]<0){nearest=slot;break;}
|
||||
@@ -121,7 +123,7 @@
|
||||
[_draftValues addEntriesFromDictionary:values];[_bridge changeValues:values];return;
|
||||
}
|
||||
|
||||
if([_captured[@"kind"]isEqual:@"spiderPlot"]){NSData *start=_captured[@"meshStart"];if(!start||_selectedSpider<0)return;NSRect r=[_captured[@"rect"]rectValue];auto mesh=DYSpiderMesh(start);std::bitset<dy::SpiderMeshCapacity> selected;selected[_selectedSpider]=true;auto moved=dy::moveMesh(mesh,selected,(p.x-_down.x)/r.size.width,(p.y-_down.y)/r.size.height);[_spiderDraft release];_spiderDraft=[[NSData alloc]initWithBytes:&moved length:sizeof(moved)];[_bridge changeSpider:_spiderDraft];return;}
|
||||
if([_captured[@"kind"]isEqual:@"spiderPlot"]){NSData *start=_captured[@"meshStart"];if(!start||_selectedSpider<0)return;NSRect r=[_captured[@"rect"]rectValue];auto mesh=DYSpiderMesh(start);std::bitset<dy::SpiderMeshCapacity> selected;selected[_selectedSpider]=true;NSPoint delta=DYSpiderMeshDelta(r,mesh.x[_selectedSpider],mesh.y[_selectedSpider],NSMakePoint(p.x-_down.x,p.y-_down.y));auto moved=dy::moveMesh(mesh,selected,delta.x,delta.y);[_spiderDraft release];_spiderDraft=[[NSData alloc]initWithBytes:&moved length:sizeof(moved)];[_bridge changeSpider:_spiderDraft];return;}
|
||||
if([_captured[@"kind"]isEqual:@"hslPlot"]){NSString *key=_captured[@"hslKey"];if(!key)return;NSRect r=[_captured[@"rect"]rectValue];double v=MAX(-100.,MIN(100.,(NSMidY(r)-p.y)/r.size.height*200));_draftValues[key]=@(v);[_bridge changeValue:v];return;}
|
||||
NSString*xKey=_captured[@"xKey"],*yKey=_captured[@"yKey"];if(!xKey||!yKey)return;NSRect r=[_captured[@"rect"]rectValue];double x,y;
|
||||
if([_captured[@"kind"]isEqual:@"curvePlot"]){x=MAX(.001,MIN(.999,(p.x-r.origin.x)/MAX(1.,r.size.width)));double output=MAX(0.,MIN(1.,1-(p.y-r.origin.y)/MAX(1.,r.size.height)));
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
- (void)requestWhiteBalanceAtTime:(CMTime)time;
|
||||
@property(nonatomic,retain) DYRenderer *renderer;
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time;
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time;
|
||||
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time;
|
||||
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
|
||||
- (void)changeSpider:(NSData*)mesh;
|
||||
@@ -95,6 +96,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time {
|
||||
return [_renderer canvasHistogramAtTime:time];
|
||||
}
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time {
|
||||
return [_renderer canvasSpiderScopeAtTime:time];
|
||||
}
|
||||
- (void)requestWhiteBalanceAtTime:(CMTime)time {
|
||||
if(!CMTIME_IS_NUMERIC(time))return;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
|
||||
@@ -118,6 +118,63 @@
|
||||
DYWorkspaceDiagnosticRenderer *otherScope=[[[DYWorkspaceDiagnosticRenderer alloc]init]autorelease];[otherScope setScopeEnabled:YES atTime:CMTimeMake(9,24)];workspaceDrain();run.record(@"workspace-scope-cache-never-crosses-plugin-instances",!otherScope.scopeMetadata&&!otherScope.scopePreview);
|
||||
[otherScope setScopeEnabled:NO];[scopeRenderer setScopeEnabled:NO];
|
||||
|
||||
// The spider reuses the same frame, including when the full scopes are closed.
|
||||
constexpr size_t spiderBytes=dyscope::Bins*dyscope::Bins*4;
|
||||
NSData *osc=[scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(9,24)];
|
||||
NSData *panelRaster=scopeRenderer.scopeMetadata[@"vectorscope"];
|
||||
const uint8_t *spiderRaster=(const uint8_t*)osc.bytes,*workspaceRaster=(const uint8_t*)panelRaster.bytes;
|
||||
BOOL sameMeasuredPixels=osc.length==spiderBytes&&panelRaster.length==spiderBytes;
|
||||
if(sameMeasuredPixels)for(size_t i=0;i<spiderBytes;i+=4)
|
||||
sameMeasuredPixels&=(spiderRaster[i+3]>0)==(workspaceRaster[i]||workspaceRaster[i+1]||workspaceRaster[i+2]);
|
||||
run.record(@"spider-and-workspace-measure-identical-color-managed-pixels",sameMeasuredPixels);
|
||||
run.record(@"spider-osc-uses-exact-instance-output-time",osc.length==spiderBytes&&
|
||||
![scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(8,24)]&&![otherScope canvasSpiderScopeAtTime:CMTimeMake(9,24)]);
|
||||
[scopeRenderer outputSpiderScope];
|
||||
scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;
|
||||
NSData *overlay=nil;
|
||||
while(!(overlay=[scopeRenderer outputSpiderScope])&&NSProcessInfo.processInfo.systemUptime<scopeDeadline)
|
||||
[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
|
||||
run.record(@"spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
[overlay isEqual:osc]&&!scopeRenderer.scopeEnabled);
|
||||
for(unsigned i=0;i<16;i++){finalPixels[i*4]=.5f;finalPixels[i*4+1]=.12f;finalPixels[i*4+2]=.05f;}
|
||||
[[finalTile metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,4,4) mipmapLevel:0 withBytes:finalPixels.data() bytesPerRow:4*8];
|
||||
[scopeRenderer captureScopeTile:finalTile atTime:CMTimeMake(9,24)];
|
||||
scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;
|
||||
NSData *updated=nil;
|
||||
while([(updated=[scopeRenderer outputSpiderScope])isEqual:overlay]&&NSProcessInfo.processInfo.systemUptime<scopeDeadline)
|
||||
[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
|
||||
run.record(@"spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
updated.length==spiderBytes&&![updated isEqual:overlay]&&[updated isEqual:[scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(9,24)]]);
|
||||
|
||||
const dyscope::RGBA vectors[]={{.5f,0,0,.5f},{0,.5f,0,.5f},{0,0,.5f,.5f},{.1f,.1f,.1f,1},
|
||||
{1,0,1,0},{NAN,1,0,1},{1,.2f,0,NAN}};
|
||||
auto density=dyscope::spiderVectorImage(vectors);
|
||||
auto vectorscope=dyscope::measure(vectors,7,1);
|
||||
unsigned nonempty=0,maxAlpha=0;BOOL sameBins=YES;
|
||||
for(size_t i=0;i<vectorscope.vectors.size();i++){
|
||||
unsigned alpha=density[4*i+3];
|
||||
sameBins&=(alpha>0)==(vectorscope.vectors[i]>0);
|
||||
nonempty+=alpha>0;maxAlpha=std::max(maxAlpha,alpha);
|
||||
}
|
||||
run.record(@"spider-shares-cbcr-bins-and-keeps-trace-translucent",
|
||||
nonempty==4&&sameBins&&maxAlpha<185&&maxAlpha>140);
|
||||
NSRect wheel=NSMakeRect(12,24,240,240),panel=NSMakeRect(2,4,100,100);
|
||||
NSPoint a=DYSkinScopePoint(wheel,.93),b=DYSkinScopePoint(panel,.98);
|
||||
double wheelSlope=(a.y-NSMidY(wheel))/(a.x-NSMidX(wheel)),panelSlope=(b.y-NSMidY(panel))/(b.x-NSMidX(panel));
|
||||
run.record(@"spider-and-panel-skin-reference-share-direction",
|
||||
a.x<NSMidX(wheel)&&a.y<NSMidY(wheel)&&fabs(wheelSlope-panelSlope)<1e-8);
|
||||
|
||||
double error=0;
|
||||
for(int hue=0;hue<96;hue++)for(int ring=0;ring<=6;ring++){
|
||||
double theta=hue*(2*M_PI/96),distance=ring/12.;
|
||||
double x=.5+distance*cos(theta),y=.5+distance*sin(theta);
|
||||
NSPoint restored=DYSpiderMeshPoint(wheel,DYSpiderPlotPoint(wheel,x,y));
|
||||
error=std::max(error,hypot(restored.x-x,restored.y-y));
|
||||
}
|
||||
NSPoint delta=DYSpiderMeshDelta(wheel,.68,.58,NSMakePoint(12,-7));
|
||||
NSPoint start=DYSpiderPlotPoint(wheel,.68,.58),end=DYSpiderPlotPoint(wheel,.68+delta.x,.58+delta.y);
|
||||
run.record(@"spider-display-projection-round-trips-and-follows-pointer",
|
||||
error<1e-5&&hypot(end.x-start.x-12,end.y-start.y+7)<1e-3);
|
||||
}
|
||||
// Exercise the new stack workspace against the same authoritative host document
|
||||
// as the regular inspector. Every view stays in an unpresented native fixture.
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.0</string>
|
||||
<string>1.21.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>109</string>
|
||||
<string>114</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.0</string>
|
||||
<string>1.21.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>109</string>
|
||||
<string>114</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -1,14 +1,87 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
更新于 2026-11-06(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
|
||||
更新于 2026-11-08(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
|
||||
|
||||
## 当前基线
|
||||
## 1.21.0(114)流畅性优化
|
||||
|
||||
按首帧、连续渲染和检查器刷新优化。Metal 管线首次使用才创建,中性画面跳过通用调色与查找纹理,保留原来的半精度透明度规则;无蒙版 CST 将解除预乘并入原转换内核。最终画面取样合并进输出命令并复用小缓冲,仍保留暂停帧的示波器样本。检查器复用本轮的宿主读参和工具文档,只在切换色彩管理模式时移动输出控件。胶片颗粒未参与时省去宿主帧时序查询。
|
||||
|
||||
正式 1.21.0(114)已在唯一 FxPlug 路径安装,编译提交 `90e512aabe72fff30046b4bf18d6a35f91c0c113`。APP 公证 `505ed5a4-7b32-49a2-8eef-70c7757a98b4` Accepted,正式版 1050 项原生检查通过,包括 21 组独立 CST 参考。FCP 12.4 的独立验收副本从 00:00:00:00 播到 00:00:11:09,检查器和工作区混合滑杆均写入 0.50 后复位至 1.00,四种示波器回读 57,600 个有效 sRGB 样本。首次打开时请求时间与缓存帧不一致,下一次实际渲染后显示;同帧重开、宿主撤销、拖动延迟、掉帧、Motion 与完整导出未确认。[安装](verification/Delivery1.21.0.json) · [宿主](verification/HostFluidity1.21.0.json)
|
||||
|
||||
M4 两组交错顺序的渲染加隐藏取样基准,1080p 中性 HSL 从 2.10–2.33 降到 1.39–1.62 ms,4K 加基础曝光从 19.15–19.69 降到 14.91–15.03 ms。4K 默认整合版中位数跨运行从 17.47–23.04 到 15.13–19.29 ms,存在重叠。每组的六个末帧及对应示波器样本均与 113 逐字节一致。默认整合版计算管线从 16 套降到 3 套。全尺寸中间纹理按帧释放,小型示波器缓冲按设备复用。[基准](verification/Fluidity1.21.0.json)
|
||||
|
||||
PKG 公证 `29d5f921-6cd4-48a4-856a-2632f9a85e2b` Accepted。20 项验包、192 条载荷权限、签名及票据检查通过,44508770 字节,SHA-256 `ec1a57f23bf369d7a7841848d71d8ab78a7c229cbb5abe1c502e9964f87dbbcb`。本机通过独立正式 APP 验收,未执行包内安装脚本。[验包](verification/Package1.21.0.json)
|
||||
|
||||
入口为 `DYRenderer.mm`、`DYGrade.metal`、`DYScopeCapture.inc.h`、`DYPlugIn.mm` 与 `DYInspector.mm`。当前待核验发行附件下载与独立远端恢复。用户有新卡顿反馈时,先记录宿主、分辨率、发生阶段和启用的实际工具,再用正式安装路径复测。
|
||||
|
||||
## 2026-11-08 默认参数渲染排查
|
||||
|
||||
核对正式安装 1.20.2(113)、编译提交 `046411ba8b2c2bf8549601b2e5a080fd9dccd31b`。整合版、HSL、一级调色和 CST 独立效果的已安装模板、APP 内置模板和源码逐字节一致。整合模板没有额外工具层、LUT 或变形网格,默认执行 Sony S-Log3 / S-Gamut3.Cine 到 Gamma 2.4 / Rec.709 的 CST,自动色调映射开启。独立 HSL 的工具文档移除了一级调色。
|
||||
|
||||
- **模块执行**:`bypassNeutralTools` 跳过默认曲线、HSL、颜色分级、三原色、色阶和色彩平衡。空 LUT、零混合黑白、中性蜘蛛盘、通道混合器、胶片和畸变也不会因眼睛开启而各自运行。`DYToolIsNeutral` 过滤默认的独立工具层。本次对照均未触发 Vision 人脸检测。[渲染入口](大鱼调色/Plugin/DYRenderer.mm#L66) · [工具调度](大鱼调色/Plugin/DYToolRender.inc.h#L59)
|
||||
- **首帧准备**:首次创建设备资源会初始化 16 套计算管线,包括尚未使用的畸变、图章和胶片。融合渲染仍获取白平衡、HSL、分级三张查找纹理,每个新渲染器的中性状态也会创建 33³ 纹理。已确认准备工作存在,未单独计量各项耗时。[设备准备](大鱼调色/Plugin/DYRenderer.mm#L188) · [查找纹理](大鱼调色/Plugin/DYColorTables.mm#L229)
|
||||
- **每帧剩余工作**:整帧无有效调色时仍分配中间纹理,解除预乘并运行融合着色器,没有整帧直通。输出回调在示波器关闭时也同步读取 320×180 画面以保留同帧缓存,供工作区或蜘蛛盘打开时立即取样。[融合渲染](大鱼调色/Plugin/DYRenderer.mm#L248) · [输出取样](大鱼调色/Plugin/DYScopeCapture.inc.h#L83)
|
||||
|
||||
Mac mini M4 无界面基准复用正式 113 的 Release 对象和安装资源,按安装模板的参数与归档构造状态,用逐帧变化的 RGBA16Float 合成渐变,每组跳过首 5 帧,取 12 帧中位数。渲染与隐藏示波器读回分别计时。
|
||||
|
||||
| 对照 | 1080p 渲染 | 4K 渲染 |
|
||||
| --- | ---: | ---: |
|
||||
| 整合模板默认 | 5.12 ms | 16.42 ms |
|
||||
| 整合模板保留一级调色,其余眼睛关闭 | 4.62 ms | 16.30 ms |
|
||||
| 整合模板只关闭一级调色 | 1.72 ms | 4.71 ms |
|
||||
| 独立 HSL 默认 | 1.70 ms | 4.66 ms |
|
||||
| 仅用现有 GPU 图像复制函数 | 0.73 ms | 2.09 ms |
|
||||
|
||||
保留一级调色的两组在末帧逐像素一致。只关一级、独立 HSL 和复制对照的末帧与输入一致。整合默认状态隐藏示波器另耗约 0.68 ms(1080p)和 0.65 ms(4K)。正式安装服务的 980 项基础自检通过,覆盖默认状态无 Vision、无多边形蒙版管线和关闭示波器时缓存最后一帧。以上是渲染器及读回耗时,未测宿主参数桥、解码、播放调度、掉帧或交互延迟,也未操作用户工程。
|
||||
|
||||
本轮仅记录排查,未修改运行代码、模板或安装。接手优化时先以中性独立 HSL 验证整帧直通,并单独计量首帧管线准备与隐藏示波器取样。复核 HDR、负值、透明度、坐标原点以及同帧示波器取样,保留默认 CST 的实际输出。既有工程文件的 Security 引用排序差异留在工作区。
|
||||
|
||||
## 1.20.2(113)蜘蛛盘示波器
|
||||
|
||||
用户实看 1.20.0 后指出轨迹盖过控制网、肤色线与控制面板方向不同。1.20.1 将两处统一到同一份最终输出的色彩转换、Cb/Cr 取样、比例和肤色线方向。蜘蛛盘显示坐标同步投影,底层保留 HSV 网格和预设,拖动与方向键反向映射回原坐标。参照用户配图改为暗中性中心、平滑色相外圈、受限的轨迹透明度、灰色节点与深色描边。1.20.2 按用户追加反馈把网格前景线的白色不透明度由 55% 提至 72%,保留深色底描边。
|
||||
|
||||
新 FCP 整合效果、独立模板和新插入的肤色工具默认关闭保护。FCP 模板显式写入关闭值,注册默认保留历史开启值,兼容省略该参数的旧片段。Motion 直接添加原生滤镜沿用注册默认。显式开启时保护程度默认 60,仅保护人脸默认开启。
|
||||
|
||||
1.20.0(111)与 1.20.1(112)均为本轮正式签名公证的验收候选。1.20.1 安装后通过 1002 项原生检查,在 FCP 实片同帧并排核实两个矢量示波器方向及肤色保护关闭。两版均为本机验收候选。[111 实看](verification/HostSpiderScope1.20.0.json) · [112 实看](verification/HostSpiderScope1.20.1.json) · [112 安装](verification/Delivery1.20.1.json)。最终 **1.20.2(113)已公证安装并在 FCP 12.4 同帧实看**。1002 项原生检查通过,17 套模板静态校验通过。实际编译提交 `046411ba8b2c2bf8549601b2e5a080fd9dccd31b`,APP 公证 `e8c27c08-a78e-4be2-9adf-235e7bfad1f6` Accepted,固定插件路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。同一帧确认网格提亮后仍能看清色度轨迹,两处肤色线均朝左上,检查器肤色保护为关闭。[实片核验](verification/HostSpiderScope1.20.2.json) · [安装](verification/Delivery1.20.2.json)。
|
||||
|
||||
正式 PKG 公证 `1a6834df-840f-47da-9ee8-be6a0a808fee` Accepted,20 项展开验包、票据、Gatekeeper 与 192 条载荷权限通过。包大小 44505420 字节,SHA-256 `8edd792c6a9be629263baee68c4c3e7b67221ffd1e995bd8c9ab1f753eefd2b4`。已独立安装正式 APP,本机验收未再次运行 PKG 安装脚本。[验包](verification/Package1.20.2.json)。Git Release **413** 的 PKG 附件 **59** 已发布,草稿浏览器及发布后均完整下载并核对大小和 SHA-256。标签 `v1.20.2-spider-scope-20261108` 指向 `bc9021271d5e4992a6a63011e4ff197812029ab3`。已独立从远端检出编译节点和发行标签,分别核对 798 与 802 个跟踪文件和 Git 完整性。[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.20.2-spider-scope-20261108) · [发行核验](verification/Release1.20.2.json) · [恢复](verification/Recovery1.20.2.json)。
|
||||
|
||||
本轮两个未发布候选包、草稿下载副本、旧替换 APP、公证 ZIP 和恢复克隆已清理,保留正式包与用户原有历史发行包。[清理](verification/Cleanup1.20.2.json)。入口为 `大鱼调色/Plugin/DYSpiderScopeDrawing.h`、`DYScopeCapture.inc.h`、`DYViewerGraphics.inc.h` 和 `DYModel.mm`。既有工程文件的 Security 引用排序差异留在工作区。
|
||||
|
||||
## 1.19.1 交付基线(历史)
|
||||
|
||||
**1.19.1(110)已正式公证安装,完成本轮默认预览宿主验证,PKG 与 Git Release 已交付。** 实际编译提交 `3642a1dba6cbbc4423bd6928944e0e95d76d9cfa`,APP 公证 `c965f687-ab0b-442b-99e1-4b5013065f50` Accepted。固定路径仍为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;994 项正式安装原生检查、票据、Gatekeeper、唯一 PluginKit 路径通过。
|
||||
|
||||
修复“添加整合效果、未调参数,预览极卡”:空 LUT 默认强度与零混合黑白眼睛错误触发 Vision,随后无效的 `skinFaceOnly` 令整帧执行人脸多边形蒙版。现在按实际有效渲染参数决定检测和人脸蒙版;默认开关、预设、模板和调色算法不变。公开人像基准在 Apple M4 上,1080p 324.37 → 5.23 ms,4K 1248.90 → 16.99 ms;每组 14 次默认渲染不再调用人脸分析。该数字是渲染器耗时,不是宿主显示 FPS。[原因与范围](research/IdlePreview1.19.1.md) · [性能](verification/IdlePreview1.19.1.json)。
|
||||
|
||||
FCP 12.4 使用独立副本 `1.19.1 默认预览性能验收`,先复测恢复默认的旧效果,再移除并新加整合效果,两次播放到 00:00:11:09;真实渲染四秒采样均不含 `prepareFaceSupport`。基础曝光字段测试后恢复 0,默认三组展开恢复。未量化掉帧数、未确认宿主撤销、未重复导出或实片跟踪,不记这些项目为通过。[宿主记录](verification/HostIdlePreview1.19.1.json) · [安装](verification/Delivery1.19.1.json)。
|
||||
|
||||
发行标签 `v1.19.1-idle-preview-20261106` 指向 `6add6f29e357d37e94a8430d6963ec7f91993537`。PKG 公证 `5bf23d87-857d-48d9-856c-f6f05e97867b` Accepted,20 项展开验包和 192 条载荷权限检查通过;本机 APP 独立安装验收,未重复执行 PKG 系统安装脚本。包 44,488,264 字节,SHA-256 `7513be46cc86eb5df26401c9cb4368c8290d276cdcc478e5f16f727a1be4d647`。Release **404**/PKG **51**/符号 **52** 已发布,沿用公测标记和原仓库可见性;草稿附件经已登录浏览器下载,发布后再次完整下载,大小与 SHA-256 均一致。独立远端检出核对编译节点 778 个文件、标签 786 个文件,Git 完整性通过。
|
||||
|
||||
[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.1-idle-preview-20261106) · [发行核验](verification/Release1.19.1.json) · [安装包](verification/Package1.19.1.json) · [符号](verification/Symbols1.19.1.json) · [恢复](verification/Recovery1.19.1.json)。本轮构建 APP、公证 ZIP、旧替换 APP、打包暂存、基准可执行文件、下载副本和恢复 clone 已清理;正式包、匹配符号、历史发行包、原素材及 QA 库保留。原始宿主采样仅留本机诊断缓存。[清理记录](verification/Cleanup1.19.1.json)。
|
||||
|
||||
**2026-11-06 文章更新补记:**按用户要求,已将[文章 15792](https://dayu.media/15792/)的主下载、标题、摘要、相关 SEO 和安装说明更新到 **1.19.1(110)**,补充默认预览卡顿修复,明确同一 PKG 已含整合效果与全部 16 个独立模块。再次展开正式包,核对 17 个可安装效果与 34 张预览图,共 51 个文件逐字节匹配项目及 APP 内资源;安装脚本目标为当前登录用户的 `Movies/Motion Templates.localized/Effects.localized/大鱼调色`。包内完整 APP 为 110,签名与票据通过,复用已发布正式包,未重新打包或执行系统安装。
|
||||
|
||||
文章保存回读、正常地址与新请求的前台标题/SEO/代码区块/全部模块名称/原图片均通过。网站主下载完整取得 44,488,264 字节,SHA-256 与上述 Release 包一致,签名、票据和 Gatekeeper 通过。价格 50 元、会员免费、封面、分类和原 FCPX 同步开关保留;付费资源直链未写入公开正文。发布正文保存在 [文章更新内容](Packaging/article-1.19.1.json),证据见 [文章核验](verification/Article1.19.1.json) 和 [包内模块清单](verification/PackageModules1.19.1.json)。本轮下载和展开副本已清理,原始回读仅留本机缓存。
|
||||
|
||||
**2026-11-06 独立模块配图补记:**用户提供的效果浏览器截图已原样加入同一文章,在 1.19.1 更新说明之后新增“新增独立模块示意”,附图注与替代文本。媒体附件 **15879**,原图 1364×748、384,718 字节,上传后下载 SHA-256 与原图一致;前台仅有一处新图,浏览器实看图像和图注正常。标题、SEO、封面、主下载、价格会员规则及原正文图片保持原样,本轮未重打 PKG。原图保存在 [独立模块示意图](Publishing/1.19.1/independent-modules.png),[文章内容](Packaging/article-1.19.1.json)已同步,证据见 [配图核验](verification/ArticleModuleImage1.19.1.json)。
|
||||
|
||||
接手重点:本次消除默认/无效状态的额外开销;真正启用调色时的人脸肤色保护仍用原逐帧检测和轮廓算法,其性能未优化。文章已为 1.19.1(110),含本次新增独立模块示意图;主 APP 更新通道仍为上次核对的 1.19.0(109),此次仅更新文章,未部署 NAS 后端或更新通道。既有 project.pbxproj 三处 Security 排序差异保留未提交。接手先核对本机 110、以上发行记录及用户真实工程播放反馈,勿用旧版发布记录替代。
|
||||
|
||||
## 1.19.0 交付基线(历史)
|
||||
|
||||
**1.19.0(109)已正式公证安装、通过宿主验收,PKG/Release/文章及更新通道已交付。** 实际编译提交 `867bcfbad3f566ced2170925e8eadd9414cc3b75`,APP 公证 `b83655db-23a9-4312-91e4-bfd697143e44` Accepted。全部正式跟踪改为 Apple Vision,APP 无 OpenCV 符号与资源。马赛克用对象外观跟踪;普通蒙版/钢笔及图章双区用局部图像配准。短时丢失最多预测 0.8 秒,确认回归后补齐,未确认尾部删除;旧工程需重新跟踪。979 项正式原生检查通过。FCP 验收副本 `1.19.0 Vision 全跟踪验收` 完成 285 帧,起点、6 秒与 11.36 秒实际马赛克覆盖头部,两种跟踪回调日志 main=0;面板关闭重开、参数修改/复位、普通蒙版反向单帧与撤销通过。未量化 UI 延迟,未重复完整实片图章或导出。[宿主证据](verification/HostVisionTracking1.19.0.json) · [算法比较](research/TrackingRecoveryCandidates.md)。
|
||||
|
||||
发行标签 `v1.19.0-vision-tracking-20261106` 指向 `a0178f994d71c19e95c70e23f9b056947b063b1c`。PKG 公证 `99abefcb-c1cb-4aff-8b85-8109eab00df9` Accepted,20 项验包与 192 条载荷权限通过,本轮 APP 独立安装,未重复运行系统 PKG 安装脚本。Release **403**/PKG **49**/符号 **50** 已发布,草稿和正式下载分别核对完整大小与哈希。包 44,486,766 字节,SHA-256 `0287d9e153463059730e99aade32a8b24cac19312e00d2450aa3c0819ae44745`;符号 3,472,206 字节,SHA-256 `401cb46a38838a5605b7a1cb6eb3cd5ee03a649a80c7cf6655741a57ec0deb31`。独立远端恢复核对编译节点 766 个文件、发行标签 771 个文件。文章 15792 与 beta 通道均为 1.19.0/109,站点两路完整包下载和票据通过,旧版提示更新/109 不提示更新;价格、会员、封面与既有图片保留。NAS `beta.json` 同目录旁路备份为 `beta-202611062006.jsonbak`,未修改后端 PHP。
|
||||
|
||||
[Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.19.0-vision-tracking-20261106) · [文章](https://dayu.media/15792/) · [发行记录](verification/Release1.19.0.json) · [站点记录](verification/Article1.19.0.json) · [更新通道](verification/BetaPublication1.19.0.json) · [清理记录](verification/Cleanup1.19.0.json)。本轮清理旧替换 APP、对照环境、用户素材派生帧、模型、候选符号、下载及恢复副本;保留原素材、QA 库、历史发行包。原工作区的 project.pbxproj 三处 Security 排序差异继续保留,未混入提交。
|
||||
|
||||
接手第一步核对正式 109 与以上报告;用户已有工程重新执行追踪后播放复核,优先收集真实复杂遮挡和多人交叉片段。不要把单段 285 帧通过推断为所有素材不偏移,也不要把原生图章回归当作本轮完整实片图章验收。
|
||||
|
||||
**1.19.0(109)已正式公证安装并通过宿主验收,PKG/Release/文章及通道正在交付。** 实际编译提交 `867bcfbad3f566ced2170925e8eadd9414cc3b75`,APP 公证 `b83655db-23a9-4312-91e4-bfd697143e44` Accepted。全部正式跟踪改为 Apple Vision,APP 无 OpenCV 符号与资源。马赛克用对象外观跟踪;普通蒙版/钢笔及图章双区用局部图像配准。短时丢失最多预测 0.8 秒,确认回归后补齐,未确认尾部删除;旧工程需重新跟踪。979 项正式原生检查通过。FCP 验收副本 `1.19.0 Vision 全跟踪验收` 完成 285 帧,起点、6 秒与 11.36 秒实际马赛克覆盖头部,两种跟踪回调日志 main=0;面板关闭重开、参数修改/复位、普通蒙版反向单帧与撤销通过。未量化 UI 延迟,未重复完整实片图章或导出。[宿主证据](verification/HostVisionTracking1.19.0.json) · [算法比较](research/TrackingRecoveryCandidates.md)。
|
||||
|
||||
107 为过渡候选未发布;108 全 Vision 候选公证后,FCP 菜单/浮动面板重开时插件 XPC 服务闪退,FCP 宿主仍运行。定位到 `DYColorWorkspace` 的 `_remoteParent` 借用指针在延后布局时已释放,109 改为持有至关闭,新增两项生命周期回归,正式面板重开未复现。[崩溃证据](verification/WorkspaceCrash108.json)。这不是对所有历史闪退原因的结论。
|
||||
|
||||
**1.18.1(106)已正式安装、发布 Git Release,并更新文章 15792 与主 APP 公测通道。** 实际编译提交 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`;发行标签 `v1.18.1-tracking-ui-20261106` 指向 `5fe4b1933e015a906fab36b65dcbc45a0d6bee49`。APP 公证 `2c4e6cba-8178-4a50-9198-83e66be37add` Accepted。安装后 964 项原生检查通过,FCP 独立副本完成两轮 285 帧跟踪及模块/参数交互。
|
||||
前一版本记录:**1.18.1(106)曾正式安装、发布 Git Release,并更新文章 15792 与主 APP 公测通道,现由 109 接替。** 实际编译提交 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`;发行标签 `v1.18.1-tracking-ui-20261106` 指向 `5fe4b1933e015a906fab36b65dcbc45a0d6bee49`。APP 公证 `2c4e6cba-8178-4a50-9198-83e66be37add` Accepted。安装后 964 项原生检查通过,FCP 独立副本完成两轮 285 帧跟踪及模块/参数交互。
|
||||
|
||||
- 跟踪保留 OpenCV LK,Metal 灰度回读减少 75%,目标区域特征检测与金字塔复用减少 CPU 工作。同一 4K 片段算法计算 8.78 秒降至 1.31 秒(约 6.72 倍),轨迹逐帧一致;不含宿主供图、解码、预览与渲染,不等于全流程速度。
|
||||
- 界面减少完整参数重建、重复宿主读取及图层列表重建。未测 UI 延迟分位数,不宣称所有界面卡顿已根治。
|
||||
|
||||
在新工单中引用
屏蔽一个用户