比较提交
28
次代码提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
a06a3a3914 | ||
|
|
c55f3343ea | ||
|
|
3fd0152240 | ||
|
|
94151cad7d | ||
|
|
335ef7a5ee | ||
|
|
386e6d228b | ||
|
|
bea51d2297 | ||
|
|
3373a5365e | ||
|
|
fa82014266 | ||
|
|
504e6d98e3 | ||
|
|
f4bacfbd75 | ||
|
|
6031b3bafb | ||
|
|
b2922811f9 | ||
|
|
da03d16c7e | ||
|
|
64ebd20d54 | ||
|
|
870f0064c2 | ||
|
|
1eacf595fc | ||
|
|
4d88c93b93 | ||
|
|
12fdde332f | ||
|
|
d0eadccc29 | ||
|
|
0d286c3924 | ||
|
|
24520e7848 | ||
|
|
0592458580 | ||
|
|
072bf881b9 | ||
|
|
d5aba63b4e | ||
|
|
0b1b4454b4 | ||
|
|
2cf93fafe5 | ||
|
|
aa9a8d24f2 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,16 @@
|
||||
大鱼调色 1.8.1(57)公测
|
||||
|
||||
修正 1.8.0 固定 ACEScct 接管一级 CST 的设计,恢复输入、工作曲线/色域与输出设置。主输出移至所有一级层及印片之后;新增一级层继承工作空间,默认关闭额外映射。局部 CST、线性混合、负值和超白保留经过回归;线性工作曲线增加明确的 DI 适配。
|
||||
|
||||
在参数顶部明确选择“一级 CST · 延后输出(推荐)”启用。模板与注册缺省、已保存的 nil/v2 状态保持原流程,避免 FCP 把新缺省应用到旧实例。65³ Cube 按一级声明的输入、输出编码导出,所选 Gamma/Log 不再统一写成 sRGB。
|
||||
|
||||
旧工具仍作为输出后的 SDR 修饰;Log/线性码值输出不运行活跃的 SDR 修饰。上游 FCP 已还原或裁切的数据不能由插件恢复,请核对相机 LUT 与颜色符合。受控 Log 码值载体不等于所有相机文件的上游路由认证。
|
||||
|
||||
581 项原生检查通过,包括独立曝光/高光参考、负值/超白、局部 CST、线性混合、印片域和 Cube 输出曲线。
|
||||
|
||||
正式签名、公证、宿主验收与包校验以 verification/Delivery.json、HostPrimaryCST1.8.1.json、Package.json 和 Release.json 为准。安装包已通过20项展开验包;本轮未重新执行系统安装脚本,APP已在正式位置独立安装和宿主验收。
|
||||
|
||||
安装包:大鱼调色-1.8.1.pkg
|
||||
字节数:42999475
|
||||
SHA-256:f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd
|
||||
实际编译源码:059245858035e74f78bd669ef25913408d07d235
|
||||
@@ -0,0 +1,16 @@
|
||||
大鱼调色 1.8.2(59)公测
|
||||
|
||||
高级色彩管理移入顶部“颜色设置”按钮,默认收起。关闭后不留空白,调色模块直接上移;展开/收起不改参数、不增加撤销项。详细说明移入工具提示。
|
||||
|
||||
新增默认黑金渐变主题:黑色与深炭色渐变背景、亮金文字、柔和静态光晕及金色细边。保留五种原有配色及其编号;明确保存的主题偏好保留,可随时切换到黑金。系统增加对比度或减少透明度时去掉文字光晕。
|
||||
|
||||
默认继续原有色彩流程;已保存的 nil/v2/v3 工程及完整预设保持原处理。相机 Log、工作空间和输出转换逻辑沿用 1.8.1 修正,没有更改渲染算法或模板默认。
|
||||
|
||||
本版验证与正式签名、公证、宿主和安装包结果见 verification/Delivery.json、HostCompactUI1.8.2.json、InstalledSelfTest.json、Package.json 和 Release.json。本轮独立替换正式 APP 并验收,PKG 展开验包,不重复执行系统安装脚本。
|
||||
|
||||
595 项原生检查、FCP 中六主题切换/设置反复开关、nil 原流程保持和 v3 完整预设重开逐字节一致通过。独立远程源码重建通过同样595项检查;8个依赖源包按锁定摘要验证,复用已验证的静态运行时缓存。
|
||||
|
||||
安装包:大鱼调色-1.8.2.pkg
|
||||
字节数:43006067
|
||||
SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded
|
||||
实际编译源码:da03d16c7efa87a5d230467334ec73f9a3a12e54
|
||||
@@ -0,0 +1,16 @@
|
||||
大鱼调色 1.8.3(62)公测
|
||||
|
||||
新增“霓虹炫彩”主题:分模块的多色渐变:一级紫红、蜘蛛盘青蓝、基础珊瑚玫红、HSL绿青、曲线青蓝等;大面积卡片、标题及图标均跟随各模块配色。洋红到青色渐变重点按钮与滑杆,白色文字。未设置主题时默认使用炫彩;原六种主题和编号保留,可随时切换。
|
||||
|
||||
曲线编辑器新增真实分析画面的直方图叠层,显示亮度与 RGB 分布;RGB 页叠加四通道,红、绿、蓝页只显示对应通道。支持“直方图”开关,曲线控制点仍可直接添加、拖动、删除。主题、通道和叠层显示不改变调色参数或预设。
|
||||
|
||||
直方图复用 320×180 分析缓存、256 档,最多每秒2次更新,播放或移动播放头时刷新。透明与非有限像素不计,范围外值归到端点,共同峰值平方根缩放。原流程取一级 CST/输入 LUT 后,新 CMS 取显示输出转换后、SDR修饰前;它不是最终输出示波器,也不是每个独立曲线层的即时输入。工具提示可查看来源与范围。
|
||||
|
||||
色彩管理、调色数学和模板默认保持不变。系统要求 Apple Silicon、macOS14.6 或更新。唯一正式位置 /Library/Plug-Ins/FxPlug/大鱼调色.app。
|
||||
|
||||
605项正式原生检查与FCP12.4实机通过;真实视频与色块分布、四通道/显隐、冷重开与8,590字节原预设一致验证完成。APP与PKG均已正式签名、公证Accepted、粘附票据;PKG通过20项展开验包。本轮APP独立正式安装验收,未重复执行PKG安装脚本。
|
||||
|
||||
安装包:大鱼调色-1.8.3.pkg
|
||||
字节数:43010609
|
||||
SHA-256:518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53
|
||||
实际编译源码:3fd015224037df944b428684c43ec8ec7accea85
|
||||
@@ -1,13 +1,40 @@
|
||||
# 大鱼调色
|
||||
|
||||
原生 FxPlug 4 调色器,当前正式安装的公测版本 **1.8.0(55)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
原生 FxPlug 4 调色器,当前公测版本 **1.8.3(62)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
|
||||
2026-11-03完成BASIS、Colour Space Transform和Color Finale的只读色彩管理调查,含原版GPU曝光/映射及当前一级颜色内核的有限检查。宿主边界、重复映射、工具工作域和旧工程迁移的改进方案见[研究报告与实施方案](research/cms-audit-20261103/report.md)。1.8.0(55)已按方案接入新版 CMS,530 项正式原生检查与 FCP 12.4 切换、错误恢复、保存重开及实际导出通过。详见 [宿主验收](verification/HostColorManagement1.8.0.json)。
|
||||
1.8.3 新增默认“霓虹炫彩”:按模块分布紫红、青蓝、玫红、绿青等双色渐变,卡片、标题与图标都使用模块配色,取消统一紫底与深蓝灰底;重点按钮与滑杆用洋红到青色渐变,正文白色。原六种主题与编号保留。本机已从黑金切换到炫彩。曲线新增亮度/RGB直方图叠层、单通道查看与显隐开关,使用真实320×180分析缓存、256档,最多每秒更新2次。
|
||||
|
||||
直方图沿用已有分析画面:原流程为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前;不是最终输出示波器或每层曲线的即时输入。透明/非有限像素不计,范围外归端点,共同峰值平方根缩放。主题与叠层不写入调色预设,曲线数学、CMS及模板保持。
|
||||
|
||||
## 1.8.0 色彩管理
|
||||
[1.8.3安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.3-neon-histogram-20261104)。605项原生检查及正式FCP验收见 verification/HostNeon1.8.3.json。
|
||||
|
||||
在调色参数顶部选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
|
||||
历史1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。
|
||||
|
||||
默认色彩流程仍为“原有流程”,已保存的 v2/v3 工程继续使用原设置。下文的高级色彩流程均从“颜色设置”展开选择。色轮与通道曲线保留实际色相,界面主题不改变图像颜色。
|
||||
|
||||
[1.8.2 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104);595 项原生检查与正式 FCP 验收见[界面验收记录](verification/HostCompactUI1.8.2.json)。
|
||||
|
||||
1.8.1 修正 1.8.0 固定 ACEScct 接管并隐藏一级 CST 的设计问题,恢复原有输入、工作曲线/色域与输出选择,并将主输出放到一级层和印片之后。打开顶部“颜色设置”,明确选择“一级 CST · 延后输出”启用修正流程。模板与插件注册缺省保持原有流程,保护已有未声明 CMS 的工程。1.8.0 ACES 流程作为兼容方式保留,不自动修改已保存画面。
|
||||
|
||||
[1.8.1 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104);[修正约定与验证边界](research/cms-correction-20261104/design.md)。1.8.0 的研究来源与历史实施见[只读调查](research/cms-audit-20261103/report.md)。
|
||||
|
||||
## 1.8.1 一级 CST · 延后输出
|
||||
|
||||
推荐方式的实际顺序:**声明的素材编码 → 一级输入 CST(不做显示映射)→ 所选工作域一级调色 → 独立一级层 → 印片 → 一级输出 CST/可选映射 → SDR 修饰 → 宿主显示**。主输入不先套 Rec.709 显示还原,工作空间由原一级的工作曲线与工作色域决定,可使用 DWG/DaVinci Intermediate、ACEScct/AP1 或其他已列出的独立组合。
|
||||
|
||||
新增独立一级默认继承主工作空间,输入/输出相同且映射关闭。切换主工作空间时跟随更新;手动修改某段曲线/色域后,该段保留独立选择。每层明确设置的 CST 实际执行,完成后按声明的输出空间返回主工作域。混合、蒙版在 AP1 线性中进行。主一级眼睛旁路整个主 CST 模块;其他工具保持既有宿主直通行为。
|
||||
|
||||
印片只在自身所需的 ACEScct/AP1 域处理,随后返回所选工作空间。主输出始终在这些步骤之后。其余旧工具仍是输出后的 SDR 修饰;Log/线性码值输出会拒绝活跃的 SDR 修饰。此修正没有把所有旧工具改写为场景域/HDR 算法。
|
||||
|
||||
新流程的 CST/BASIS 入口、出口和图像传输为 float32,原算术与旧入口保留;线性工作曲线明确经过 DI 适配。纯 Log/线性直通不产生重复编码量化。新流程 Cube 为 65³,输入、输出均依启用的一级 CST 阶段声明,保留所选输出 Gamma/Log 编码;宿主显示另按实际目标配置解释。
|
||||
|
||||
手动 CST 接收 FCP 已交给插件的像素,沿用明确的码值载体。使用相机 Log 时须核对上游相机 LUT、颜色符合和任何其它还原;本插件不能恢复上游已经压缩或裁切的信息。受控宿主样本使用带 sRGB 标签的 16-bit PNG Log 码值载体,不代表验证所有相机文件的上游路由。
|
||||
|
||||
完整预设仍为 v7,新增独立 CMS 状态 v3;旧 nil/v2 状态按原流程渲染,不静默升级。 581 项正式原生检查、FCP12.4 两代预设逐字节保存重开、独立层跟随与撤销重做、65³ Cube、100帧 ProRes 和 XML 回读通过,见[宿主验收](verification/HostPrimaryCST1.8.1.json)。
|
||||
|
||||
## 1.8.0 兼容色彩管理
|
||||
|
||||
打开顶部“颜色设置”选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
|
||||
|
||||
- **跟随 FCP**:按实际源/目标颜色配置转换,不重复还原相机,不加显示映射。内部一级工作空间固定为 ACEScct/AP1。
|
||||
- **相机编码 → ACES**:明确指定输入曲线/原色,再经过一次所选输出变换。此方式保留旧版 sRGB 码值载体约定,使用前须关闭上游相机还原和重复的颜色符合。
|
||||
@@ -15,7 +42,7 @@
|
||||
|
||||
引擎固定 OpenColorIO 2.5.2 / ACES 1.3 studio-config v2.2.0,源码、依赖源包、摘要与许可证保存在 ColorManagement/,不依赖兄弟 APP 的安装。宿主颜色配置用实际 CGColorSpace 描述及指纹分别缓存;只有已知 RGB Linear / Rec.709 或 Rec.2020 才允许缺失配置的回退。
|
||||
|
||||
新版处理顺序固定:所有一级层 → 所有印片(ACEScct)→ 一次输出变换 → SDR 修饰工具 → 实际宿主目标。一级混合、蒙版及印片强度在 AP1 线性域混合。核心图像传输、OCIO 与配置转换采用 float32;沿用的 BASIS 入口及活跃旧工具仍有 half 精度。SDR 修饰域明确为 Rec.709 线性/sRGB,物理色域转换后接入;新版减色用有界效果差量延伸保留超范围残差,旧版限幅保持。
|
||||
1.8.0 兼容方式的处理顺序固定:所有一级层 → 所有印片(ACEScct)→ 一次输出变换 → SDR 修饰工具 → 实际宿主目标。一级混合、蒙版及印片强度在 AP1 线性域混合。核心图像传输、OCIO 与配置转换采用 float32;沿用的 BASIS 入口及活跃旧工具仍有 half 精度。SDR 修饰域明确为 Rec.709 线性/sRGB,物理色域转换后接入;新版减色用有界效果差量延伸保留超范围残差,旧版限幅保持。
|
||||
|
||||
PQ/HLG 输出或跟随 Rec.2020 宿主暂只接受一级与印片;存在活跃 SDR 修饰时返回明确错误,不静默进入有界 LUT。此版本没有把全部旧工具改写成场景/HDR 算法。
|
||||
|
||||
|
||||
+44
@@ -1,3 +1,43 @@
|
||||
# 1.8.3(62)多色渐变与曲线直方图
|
||||
|
||||
仓库 https://dayu.media/git/dayu/dayu-color.git,main。编译源码3fd015224037df944b428684c43ec8ec7accea85;发行标签v1.8.3-neon-histogram-20261104。正式位置、身份、依赖及恢复步骤沿用下文;当前详细交接见大鱼调色FxPlug4交接.md。标签/附件最终完整SHA见verification/Release.json,包校验见Package.json。
|
||||
|
||||
最终主题ID6为分模块饱和双色渐变,无统一紫底或深蓝灰底;候选60/61未发布包。605项正式原生检查、FCP真实视频直方图与冷重开、原8,590字节预设逐字节一致通过。APP公证706a58bb-2fa4-4b1e-b392-de60d93aef49为Accepted。独立远程源码与版本标签恢复范围见NeonRecovery1.8.3.json;本轮未宣称独立重编全部依赖。
|
||||
|
||||
直方图为320×180分析缓存、256档、最多2Hz,非最终输出/HDR示波器或每层即时输入;来源和显示范围见检查框工具提示。源码/模板数学和CMS默认保持。APP独立正式替换并验收,PKG按展开验包记录,本轮未重复执行安装脚本。网站与自动更新清单未修改。
|
||||
|
||||
---
|
||||
|
||||
# 1.8.2(59)黑金界面与高级颜色设置
|
||||
|
||||
仓库 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码 da03d16c7efa87a5d230467334ec73f9a3a12e54;发行标签 v1.8.2-blackgold-20261104。标签包括最终 Package.json;发布后的 Release.json 和最后恢复/清理核验保存在后续 main,标签中的旧 Release.json 属于上版历史。本版安装包以本版 Release 页面和后续 main 的发布记录为准。
|
||||
|
||||
高级颜色设置默认收起,展开/收起不写参数。未保存主题偏好时使用黑金 ID5;原主题 ID0–4 及明确保存的选择保留。渲染实现、模板与色彩流程缺省不变,nil/v2/v3 状态保持。候选58的黑金“添加模块”文字漏绘已在实机发现并回滚,未发布安装包;正式版59修复并增加像素绘制检查。
|
||||
|
||||
595 项正式安装版检查、FCP 12.4 六主题/10次开关、原 nil 工程保持、8590字节完整 v3 预设在更新与冷重开前后逐字节一致通过。独立远程克隆 Release 重建也通过595项检查,8个依赖归档的大小和 SHA-256 校验通过;复用已验证静态依赖缓存,不代表全依赖冷构建。详见 verification/HostCompactUI1.8.2.json、CompactUIRecovery1.8.2.json。
|
||||
|
||||
唯一正式 APP:/Library/Plug-Ins/FxPlug/大鱼调色.app,Bundle ID:com.dayu.color。恢复依赖、Xcode 27.1/FxPlug SDK4.3.5、构建/签名/公证步骤沿用下文;私钥与凭据须独立恢复。正式 APP 已独立替换并在宿主验收;PKG 通过20项展开验包,本轮没有重新运行系统安装脚本。
|
||||
|
||||
安装包:../发行包/大鱼调色-1.8.2.pkg,43006067 字节,SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded。网站文章与自动更新后端未改。
|
||||
|
||||
正式 Release383/附件27已发布,标签完整 SHA:f4bacfbd75404a69f51127356fc861a44c0c27e9。草稿浏览器下载及发布后完整下载均为43,006,067字节,SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded。下载副本和独立恢复副本在验证后清理;完整记录见 verification/Release.json、CompactUICleanup1.8.2.json。
|
||||
|
||||
---
|
||||
|
||||
# 1.8.1(57)CST 修正交付
|
||||
|
||||
实际编译源码:`059245858035e74f78bd669ef25913408d07d235`。仓库:`https://dayu.media/git/dayu/dayu-color.git`;版本标签为 `v1.8.1-cst-correction-20261104`,标签提交 `d0eadccc29782aa30301fff6dbf71c84b5758f59`。Release 382/附件26已发布,正式附件完整下载核验通过:42,999,475字节,SHA-256 `f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd`。标签包含最终 `verification/Package.json`;Release 发布记录在完成上传/下载校验后提交到后续 main。标签快照中的旧 `Release.json` 属于上一版历史,不能当作本版的安装包记录;本版以版本页面及后续 main 的发布校验为准。
|
||||
|
||||
正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID `com.dayu.color`。启用修正流程需在顶部选择“一级 CST · 延后输出(推荐)”;旧 nil/v2 工程与模板缺省保留。候选56自动模板切换在实际宿主验收中发现会影响旧 nil 工程,已回滚,未发布安装包。
|
||||
|
||||
581 项正式原生检查、FCP12.4 两代预设逐字节保存重开、输入/工作/输出及独立层跟随/撤销重做、65³ Cube、100帧 ProRes 与两个项目的 XML1.12 回读通过。独立远程克隆重建源码版本并通过581项检查;8个依赖源包按锁定摘要验证,复用已验证的静态依赖缓存,不宣称全部依赖冷构建。
|
||||
|
||||
恢复源码与构建步骤沿用下文;需要恢复本版时检出上述编译提交或最终版本标签。重新验证证书、FxPlug SDK和 Xcode,正式交付仍需 Release 签名、公证、票据、唯一位置安装和宿主验收。受控 Log 载体可用正式服务的 `--self-test` 生成的 `primary-host-chart.json`,再运行 `tools/create_primary_host_fixture.py --diagnostic <路径>` 重建,不需要用户媒体或预设。
|
||||
|
||||
详细范围:[数值验证](verification/PrimaryCSTNumerical1.8.1.json)、[宿主验收](verification/HostPrimaryCST1.8.1.json)、[恢复构建](verification/PrimaryCSTRecovery1.8.1.json)。Git 保存不包含签名私钥;服务端备份仍遵循仓库指南,不假定已有异地备份。
|
||||
|
||||
---
|
||||
|
||||
# 大鱼调色恢复说明
|
||||
|
||||
## 当前1.8.0(55):版本化 ACES 色彩管理
|
||||
@@ -12,6 +52,10 @@
|
||||
|
||||
包 `../发行包/大鱼调色-1.8.0.pkg`,42851034 字节,SHA-256 `fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42`。签名、票据、Gatekeeper 和 20 项展开验包通过。本轮仅生成并验包,未再次运行 PKG 安装脚本;正式 APP 已有独立安装和宿主验证。源码、版本标签和 Release 的恢复证明另见 `CMSRecovery1.8.0.json`。本任务不改网站文章或自动更新后端。
|
||||
|
||||
正式 [1.8.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.0-cms-20261103),Release381 / 附件25,保留公测标记。发行标签完整 SHA `a5a2bddeb361aac66899c5939671122075a6cffa`;草稿浏览器下载和发布后的完整下载均验证 42851034 字节、SHA-256 `fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42`。发布后的 `Release.json` 与恢复报告保存在 main 的后续核验提交;发行标签内 `Package.json` 为本版已验包记录。
|
||||
|
||||
远端标签独立恢复440个文件,full/strict fsck、八个依赖源包摘要、程序源码与编译节点一致、新检出的 Release 构建及530项无界面集成检查通过。依赖静态库缓存经过内容校验复用,未声称重新冷编译整套依赖。恢复 APP 未以 GUI 或宿主运行。恢复 clone、构建 APP/独立服务、提交 ZIP、旧 APP 备份及浏览器下载副本已核验清理;仅保留正式安装、当前发行包和私人验收资料。签名、票据与正式 PluginKit 唯一路径再次核验通过。
|
||||
|
||||
## 历史1.7.4(52):删除模块和图层
|
||||
|
||||
远程`https://dayu.media/git/dayu/dayu-color.git`,main;实际编译源码`06a00371dfba6d9857dc75f48121232fb0ea01b8`。通过`git switch --detach 06a00371dfba6d9857dc75f48121232fb0ea01b8`恢复,Xcode27.1 / FxPlugSDK4.3.5;无LFS或子模块。新机器签名证书、私钥、公证凭据仍需独立恢复。构建与交付使用`tools/deliver.py`,436项正式安装版原生检查通过。模块删除实现、真实宿主边界见`research/ToolDeletion1.7.4.md`、`verification/HostToolDeletion1.7.4.json`。
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# 1.8.1:恢复一级 CST,延后主输出
|
||||
|
||||
基线:aa9a8d24f298a3bd9a52bf6c7078a0a9a93a78cc;正式 1.8.0(55)。用户指出新版固定 ACEScct 隐藏并覆盖原有一级 CST,要求修正。
|
||||
|
||||
增加独立版本化的“一级 CST · 延后输出”方式。输入、工作曲线/色域、输出、映射来自原一级参数,不再由全局 ACES 状态覆盖。旧 nil/v2 状态的渲染保持,以免已保存工程变色。
|
||||
|
||||
主链:宿主线性像素的既有显式码值载体 → 主输入 CST(仅曲线/色域,无显示映射)→ 用户选定的工作域一级调色 → 独立一级层 → 印片(正确往返 ACEScct/AP1)→ 主输出 CST/可选映射 → SDR 修饰 → 实际宿主配置。主输出不在输入或额外一级层前执行。
|
||||
|
||||
独立一级层默认继承主工作曲线/色域,输入/输出相同,映射关闭。其明确设置的输入/工作/输出 CST 均执行;处理后按声明的输出域返回主工作域。混合与蒙版在 AP1 线性中执行。额外映射只在用户明确开启时执行,主输出则在这些层和印片之后执行。
|
||||
|
||||
未开启输出或选择 Log/线性数据输出时,保留声明的码值并经显式载体交回宿主;有界 SDR 修饰不在这种数据输出上偷偷运行。显示输出以声明的曲线/色域解释,并转换到实际宿主空间。
|
||||
|
||||
原算术 AIR 保留原入口;仅在新流程提供 float32 输入/输出入口,消除原 half 边界的重复量化,内部曲线、矩阵和调色算术沿用原图。需对原入口、OCIO 与生产入口分别回归。
|
||||
|
||||
边界:FxPlug 收到的是上游 FCP 像素,手动模式不能绕开或恢复上游已经进行的相机 LUT、颜色符合或裁切。界面明确说明。其他旧工具继续作为输出后的 SDR 修饰,不声称全部已成为场景域/HDR 算法。旧工程不自动升级;通过明确选择启用新版。
|
||||
|
||||
验收:恢复输入/工作/输出选择;Sony Log→DWG/DI 与 ACEScct 工作;高光先降曝光后映射的独立参考;新层中性;局部 CST、蒙版与混合;印片域往返;显示/码值输出及错误路径;旧 v1/v2 回归;正式路径 FCP 保存重开、实际导出;签名、公证、PKG/Release 与远程恢复。
|
||||
|
||||
独立层输入/工作/输出默认随主工作空间更新;手动修改其中一段的曲线或色域后,该段停止跟随,另外两段继续更新。`primaryFollow` 仅是作者状态,实际渲染仍使用可见的明确参数,绝不在渲染阶段偷偷覆盖。主一级眼睛停用时旁路其完整 CST 模块,其余工具沿用原有宿主直通流程。
|
||||
|
||||
“线性”工作曲线采用明确的线性↔DI适配器进入已验证的 BASIS 模式,避免原内核编号对应错误。Log/线性纯直通不引入无意义的编码往返。Cube 使用声明的输入与输出码值;显示预览另按实际宿主颜色配置处理。
|
||||
|
||||
受控宿主样本是带 sRGB 标签的 16-bit PNG Log 码值载体,用于核对本插件链路,不代表验证任意相机文件的上游 FCP 路由。
|
||||
|
||||
候选 56 的真实 FCP 验收证明:即使 `defaultVal` 与注册缺省保持 nil,修改模板 `dataValue` 仍会影响旧 nil 实例。已回滚该自动启用方案;57 保留模板原 nil 值,由用户明确选择 v3,旧 nil/v2 不自动迁移。候选 56 未制作发行包或 Release,旧版先行恢复。
|
||||
@@ -0,0 +1,104 @@
|
||||
{
|
||||
"saturation": 6,
|
||||
"y": [
|
||||
0.5,
|
||||
0.5,
|
||||
0.5,
|
||||
0.5,
|
||||
0.5,
|
||||
0.5866025686264038,
|
||||
0.6732050776481628,
|
||||
0.7598076462745667,
|
||||
0.8464101552963257,
|
||||
0.9330127239227295,
|
||||
0.5866025686264038,
|
||||
0.6732050776481628,
|
||||
0.7598076462745667,
|
||||
0.8464101552963257,
|
||||
0.9330127239227295,
|
||||
0.5,
|
||||
0.4999999701976776,
|
||||
0.4999999701976776,
|
||||
0.4999999701976776,
|
||||
0.4999999701976776,
|
||||
0.4133974611759186,
|
||||
0.32679492235183716,
|
||||
0.24019235372543335,
|
||||
0.15358981490135193,
|
||||
0.06698727607727051,
|
||||
0.41339749097824097,
|
||||
0.32679495215415955,
|
||||
0.24019242823123932,
|
||||
0.1535899043083191,
|
||||
0.06698739528656006,
|
||||
0.5
|
||||
],
|
||||
"hues": 6,
|
||||
"x": [
|
||||
0.6000000238418579,
|
||||
0.699999988079071,
|
||||
0.800000011920929,
|
||||
0.8999999761581421,
|
||||
1,
|
||||
0.550000011920929,
|
||||
0.6000000238418579,
|
||||
0.6499999761581421,
|
||||
0.699999988079071,
|
||||
0.75,
|
||||
0.44999998807907104,
|
||||
0.3999999761581421,
|
||||
0.34999996423721313,
|
||||
0.29999998211860657,
|
||||
0.2499999701976776,
|
||||
0.4000000059604645,
|
||||
0.30000001192092896,
|
||||
0.19999998807907104,
|
||||
0.09999999403953552,
|
||||
0,
|
||||
0.45000001788139343,
|
||||
0.4000000059604645,
|
||||
0.3500000238418579,
|
||||
0.30000004172325134,
|
||||
0.2500000596046448,
|
||||
0.550000011920929,
|
||||
0.6000000834465027,
|
||||
0.6500000953674316,
|
||||
0.7000001668930054,
|
||||
0.7500001788139343,
|
||||
0.5
|
||||
],
|
||||
"pins": [
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"linked": true
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
# 大鱼调色 FxPlug4 交接
|
||||
|
||||
2026-11-02 当前正式安装为 **1.7.3(49)**。本机已复现“更多空间”灰色区域并定位到SDK提供的外层contentView原点偏移;新增坐标对齐修正,首次打开无需绿色按钮。411项原生、27项几何、23项浏览库检查及本机FCP12.4热/冷重开和缩放通过,目标MacBook/FCP12.3仍待使用者复测。详见[修复与边界](research/BrowserMoreSpace1.7.3.md)、[RECOVERY.md](RECOVERY.md)及 `verification/Delivery.json` / `Package.json` / `Release.json`。保留1.7.1 Cube文字行兼容及1.7.0更新/公测诊断。以下保留1.6.0交接历史。
|
||||
|
||||
## 1.6.0交接历史
|
||||
|
||||
后续主 APP 优化入口:[大鱼调色主APP开发交接.md](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),包含自动更新、登录验证、生产接口只读盘点与待定产品规则;其中自动更新与公测诊断已在1.7.0完成,登录与授权仍未实施。
|
||||
|
||||
2026-11-02,最终正式版 **1.6.0(39)**。本次完成Color Finale本机胶片五组、通道混合器及用户补充的全部八种印片;去掉MOEF作者/网站两行、降低模板格式,并追加一级自动映射默认开启和主标题链接。
|
||||
|
||||
## 正式身份与恢复
|
||||
|
||||
- 唯一APP:`/Library/Plug-Ins/FxPlug/大鱼调色.app`;ID `com.dayu.color` / `com.dayu.color.XPC`,团队B3W25FX5H5。
|
||||
- 实际编译源码:`e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted;签名、票据、Gatekeeper及正式进程路径通过。
|
||||
- 远程:`https://dayu.media/git/dayu/dayu-color.git`,main,最终标签 `v1.6.0-print-looks-20261102`。完整标签SHA及PKG/Release元数据以 `verification/Release.json` 为准;实际编译SHA与文档交付SHA分别记录。
|
||||
- 模板:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`,ozml5.11 / Motion5.4.5,SHA `fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250`。
|
||||
- Apple Silicon/macOS14.6或更新;FCP12.4已验收,旧FCP未实机覆盖。不依赖ColorFinale安装、REA缓存或父插件;无LFS/子模块。
|
||||
|
||||
## 行为与参数
|
||||
|
||||
胶片为减色、晕光、辉光、颗粒、暗角、印片六页。印片默认无:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,独立强度。通道混合器为RGB三输出×三输入,保持亮度/饱和度和混合强度。两工具沿用启停、折叠、复位、蒙版、数量标记、区域跟踪、相邻独立层;旧索引、Uniform前缀、LUT、蜘蛛盘和轨迹保留。
|
||||
|
||||
印片追加在五处理后、全胶片混合/原蒙版前;Rec.709线性→AP1/D60→ACEScct→65³原LMT四面体→线性Rec.709。不包含原版任意完整CMS/ODT迁移。旧1296字节前缀保留,追加filmPrint共1312字节;预设v6读v1–v5。纯印片、矩阵和减色可导出Cube;空间/时间效果和蒙版限制保留。原版CI半透明链与产品预乘合同的已测差异详见研究和完整对照报告。
|
||||
|
||||
MOEF仅发布自定义检查器与混合,无作者/网站Rig。全局技能检查器对5.11返回未知版本guard,如实保存;项目级真实原生样本字段验证与当前FCP加载/渲染分别通过。
|
||||
|
||||
FCP新效果、新加一级层及全部还原的自动映射为开启;主标题链接为“更多插件访问 https://dayu.media”,点击已实际打开网站。原生注册默认维持历史0,新MOEF显式value1/default0;旧独立一级层省略值保持0。FCP沿用模板默认的旧主效果实测会变为开启,三组旧预设仅此0→1,其余277项及全部paths/spider/tools载荷保持。不能宣称更改模板默认后旧主效果完全逐字节不变;新手动关闭后已验证冷重开保持。
|
||||
|
||||
## 验收证据
|
||||
|
||||
正式395项原生检查、四尺寸136项原版印片对照通过,固定容差0.0001,最大线性RGB绝对差0.000004828。最终Metal与完整八外观验收的36候选相同。36候选逐个选择八种印片、两层不同印片/强度、椭圆蒙版100键跟踪、折叠标记、删除撤销重做及三段300帧ProRes通过;最终39保留全部自定义载荷,并完成新默认、实际链接、手动开关冷重开8668字节一致及新增1080p100帧正式导出。完整用户文件只在本机fcp-qa缓存,不进Git或PKG。
|
||||
|
||||
- 最终安装:`verification/Delivery.json` / `InstalledSelfTest.json`。
|
||||
- 最终汇总:`verification/HostPrintLooks1.6.0.json`。
|
||||
- 默认/链接/保存:`verification/HostPrimaryDefaults1.6.0.json`。
|
||||
- 八外观完整宿主操作:`verification/HostPrintLooksBuild36.json`。
|
||||
- 算法/原版边界:`research/PrintLooks1.6.0.md` / `verification/PrintLooksReference.json`。
|
||||
- 独立恢复:`verification/PrintLooksRecovery.json`,最终编译节点294文件全字节、full/strict fsck、Release构建395项和模板重建通过。
|
||||
- 最终安装包/上传/标签恢复/清理:`verification/Package.json`、`Release.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
|
||||
最终PKG由PKG工坊签名、公证、票据与20项展开验包;不再运行系统安装器,APP已有独立正式安装和宿主验收。包与Release下载校验值以Package/Release报告为准。
|
||||
|
||||
## 接续方法
|
||||
|
||||
固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。更改模型后运行 `python3 tools/build_template.py --refresh-model --overwrite`,再 `python3 tools/verify_template.py`;更新SkillAudit及摘要。Release用Wrapper Application方案,按全局产品锁/仓库锁约定交付;仅正式已公证位置做用户可见测试。证书/私钥需独立恢复。
|
||||
|
||||
历史35/37/38候选未发布;36的已验PKG在新需求到达后移除,未上传。37公证等待中停止了本地等待,保留ID查询,未重新上传相同产物。38正式验收发现FCP默认行为,39已记录实际边界。既有历史发行包与标签保留。1.5完整交接归档见 `research/handoffs/DayuColorThrough1.5.0-20261102.md`。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
@@ -0,0 +1,160 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
交接日期:2026年11月4日,Asia/Shanghai;本机用户 mac,Mac mini M4。新对话从已交付的 **1.8.2(59)** 继续开发。色彩管理修正、黑金界面、签名公证、正式安装、PKG和Release均已完成,没有挂起的发布步骤;下一轮具体优化以用户的新需求为准。
|
||||
|
||||
先读本文件、[README](/Volumes/备份/大鱼调色/大鱼调色/README.md)和[恢复说明](/Volumes/备份/大鱼调色/大鱼调色/RECOVERY.md)。开发与交付遵循 `/Users/mac/.codex/AGENTS.md` 及用户最新说明。旧交接已逐字节归档到[1.7.3及之前历史](/Volumes/备份/大鱼调色/大鱼调色/research/handoffs/DayuColorThrough1.7.3-20261104.md),其中旧版本号、检查数量和原始规划不是当前状态。
|
||||
|
||||
## 工程和正式版本
|
||||
|
||||
| 项目 | 已核验内容 |
|
||||
| --- | --- |
|
||||
| 实际工程根目录 | `/Volumes/备份/大鱼调色/大鱼调色`,有两层“大鱼调色” |
|
||||
| 工程和方案 | 根目录下 `大鱼调色.xcodeproj`;Wrapper Application,Release |
|
||||
| 平台 | Apple Silicon,最低macOS14.6;本机Xcode27.1、FxPlug SDK4.3.5、Metal Toolchain |
|
||||
| 唯一正式APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app`,1.8.2(59) |
|
||||
| Bundle ID | 外层 `com.dayu.color`;服务 `com.dayu.color.XPC` |
|
||||
| 内部服务 | `/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 正式模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 远程和分支 | `https://dayu.media/git/dayu/dayu-color.git`,main,保持现有可见性 |
|
||||
| 实际编译源码 | `da03d16c7efa87a5d230467334ec73f9a3a12e54` |
|
||||
| 发行标签 | `v1.8.2-blackgold-20261104` |
|
||||
| 标签提交 | `f4bacfbd75404a69f51127356fc861a44c0c27e9` |
|
||||
| 交接整理前main | `504e6d98e3a820cc7a896db0a32cd6dcc5741081`,已推送核验;本交接另作后续提交,接手时读取实际HEAD |
|
||||
|
||||
无LFS或子模块。OCIO2.5.2 / ACES1.3 studio-config v2.2.0及8个锁定依赖源码归档保存在仓库;私钥和认证不进Git。外置卷会产生 `._*` 元数据文件,不要混入提交。
|
||||
|
||||
## 用户确定的产品要求
|
||||
|
||||
- 高级色彩管理收进独立“颜色设置”按钮,普通用户默认看不到说明区;收起后不留空白。
|
||||
- 默认继续“原有流程”。已保存的nil、v2、v3工程保持各自处理,展开界面不能改写状态或产生调色撤销项。
|
||||
- 一级CST的输入、工作曲线/色域、输出必须生效。用户明确反对先将Log素材显示还原为Rec.709,再让后续一级转换失去意义。
|
||||
- 黑金为新增默认配色:黑色和深色渐变背景、亮金文字、柔和光晕,保留原来五种主题。
|
||||
- 产品名称、Bundle ID和正式路径保持稳定。用户可见验收使用正式安装位置的已公证版本。
|
||||
|
||||
## 1.8.2界面实现
|
||||
|
||||
检查器为 **AppKit / Objective-C++**,不是SwiftUI。采用FxPlug原位展开区域,没有新增浮动设置窗口。
|
||||
|
||||
顶部四个按钮为保存预设、载入预设、导出LUT、颜色设置。宽度小于320时排成两行;六枚主题色块占原标题区,窄栏隐藏版本小字以免重叠。
|
||||
|
||||
`_colorSettingsExpanded` 是检查器实例内的临时布尔状态。打开和关闭不写模型、不产生宿主撤销项;新建检查器默认收起。隐藏的 `DYManagedColorPanel` 不参与布局高度。说明已缩短,完整条件在工具提示中。
|
||||
|
||||
主题ID0–4依次为深空灰、冰川蓝、薰衣草紫、翡翠绿、琥珀橙;追加ID5黑金渐变。偏好域 `com.dayu.color.preferences`、键 `themeIndex`。没有明确保存偏好或索引非法时使用5;明确保存过的旧选择保留。本机已经通过界面选中黑金。
|
||||
|
||||
黑金背景为不透明静态渐变,金色细边与亮金文字。NSShadow模糊半径1.8、alpha0.30;系统增加对比度或减少透明度时去掉光晕。色轮、通道曲线和媒体预览保留真实色相。
|
||||
|
||||
候选58在FCP实机发现“添加模块”标题漏绘:pullsDown菜单的selectedItem可能为nil。正式59从第一项取标题,并增加实际像素绘制检查。候选58已回滚清理,未制作或发布安装包。后续改共用控件时保留普通按钮、弹出选择器和下拉菜单的差别。
|
||||
|
||||
| 入口 | 职责 |
|
||||
| --- | --- |
|
||||
| [DYInspector.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYInspector.mm) | 顶部按钮、展开状态、卡片、参数控件和窄栏布局 |
|
||||
| [DYManagedColorPanel.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedColorPanel.mm) | 色彩方式、帮助、输入输出字段及有撤销的状态写入 |
|
||||
| [DYTheme.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYTheme.h)、[DYTheme.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYTheme.mm) | 六主题、动态颜色、渐变、光晕、共用AppKit控件 |
|
||||
| [DYCompactUIDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h) | 隐藏高度、模型不变、三栏宽、主题、对比度、文字绘制 |
|
||||
| [界面约定](/Volumes/备份/大鱼调色/大鱼调色/research/ui-blackgold-20261104/brief.md) | 本轮需求及实现选择 |
|
||||
|
||||
## 色彩管理的当前合同
|
||||
|
||||
完整预设格式仍为v7,色彩管理有独立版本。全局方式和一级可见参数各自的责任不要混淆。
|
||||
|
||||
| 状态 | 界面方式 | 行为 |
|
||||
| --- | --- | --- |
|
||||
| nil | 原有流程(默认) | 保留历史链,不自动迁移 |
|
||||
| v2 mode1–3 | 1.8兼容,跟随FCP、相机或LUT输入 | 固定ACEScct/AP1,保护1.8.0已存画面 |
|
||||
| v3 mode4 | 一级CST · 延后输出 | 采用原一级输入、工作域和输出,主输出放在一级层与印片之后 |
|
||||
|
||||
v3严格状态为:
|
||||
|
||||
```json
|
||||
{"version":3,"mode":4,"engine":"Dayu-CST-f32","config":"primary-parameters-v1"}
|
||||
```
|
||||
|
||||
v3主链:**声明的素材编码 → 一级输入CST → 所选工作域一级调色 → 独立一级层 → 印片 → 主输出CST及可选映射 → SDR修饰 → 实际宿主空间**。主输入做曲线与色域转换,不先做Rec.709显示映射。工作空间由原一级工作曲线和工作色域选择,可用DWG/DaVinci Intermediate、ACEScct/AP1等现有组合。
|
||||
|
||||
新增独立一级默认继承主工作空间,输入和输出相同、额外映射关闭。`primaryFollow` 为输入/工作/输出三段跟随位,初始7;手动更改某段曲线或色域后该段退出跟随。主工作域变化时,将跟随值写入作者状态,并形成一个宿主撤销组。渲染使用可见参数,不能暗中覆盖。局部CST后按声明的输出域回到主工作域,混合和蒙版在AP1线性中执行。
|
||||
|
||||
印片按需要往返ACEScct/AP1再返回用户工作域。新流程CST/BASIS边界和图像传输为float32;线性工作曲线有明确DI适配。新流程Cube为65³,保留一级声明的输入/输出Gamma或Log编码。旧兼容方式有不同导出合同,不要混用。
|
||||
|
||||
旧基础、HSL等工具仍作为输出后的SDR修饰,没有全部改成场景域或HDR算法。Log/线性码值输出拒绝活跃的SDR修饰;停用项和强度为零的LUT不能误触发拒绝。FxPlug接收到的是上游FCP像素,无法恢复相机LUT、颜色符合或上游裁切已丢失的信息。显式sRGB编解码桥可以是可逆码值载体,不能单凭出现该公式判定链路错误。
|
||||
|
||||
**模板兼容教训:**1.8.1候选56只改模板dataValue,即便defaultVal和原生注册缺省仍为nil,实际FCP也将旧nil实例改成v3。自动启用已回滚,候选56未发布安装包。当前模板与注册缺省均保留原nil,新流程由用户明确选择。不要为了默认启用v3再次直接改模板归档。
|
||||
|
||||
| 入口 | 用途 |
|
||||
| --- | --- |
|
||||
| [DYManagedColor.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedColor.mm) | 状态校验、v3默认值和独立层跟随 |
|
||||
| [DYPrimaryRender.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryRender.inc.h) | v3工作域、顺序、主输出及SDR接续 |
|
||||
| [DYPrimaryKernels.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryKernels.inc.h) | v3内核与边界 |
|
||||
| [DYManagedRender.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedRender.inc.h) | v2兼容链 |
|
||||
| [DYRenderer.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYRenderer.mm) | 管线分派、Cube与宿主接入 |
|
||||
| [DYPrimaryDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h) | 高光、局部CST、线性域、负值、导出与旧链回归 |
|
||||
| [float_air_boundary.py](/Volumes/备份/大鱼调色/大鱼调色/tools/float_air_boundary.py) | float32入口出口生成,原入口保留 |
|
||||
| [1.8.1修正设计](/Volumes/备份/大鱼调色/大鱼调色/research/cms-correction-20261104/design.md) | 当前设计依据与模板问题 |
|
||||
| [三款插件调查](/Volumes/备份/大鱼调色/大鱼调色/research/cms-audit-20261103/report.md) | 历史只读分析,当时待办不能直接当作当前未完成项 |
|
||||
|
||||
此前调查对象为 `/Library/Plug-Ins/FxPlug/BASIS.app`、`/Library/Plug-Ins/FxPlug/Colour Space Transform.app`、`/Applications/ColorFinale.app`。已交付运行时不依赖这三款APP或研究缓存。继续研究发行二进制时使用reverse-engineer-anything技能;普通大鱼源码开发直接读仓库。
|
||||
|
||||
## 验证结果和边界
|
||||
|
||||
1.8.2正式安装版595项原生检查通过,含1.8.1的581项及14项界面检查。FCP12.4实机检查六种主题、10次开关、关闭不留空白、原nil项目仍为原流程、v3保持、添加模块菜单可打开及Escape关闭;冷重开后黑金保留、设置收起。
|
||||
|
||||
更新前、操作后和冷重开后三份完整v3预设均为8,590字节、逐字节一致,SHA-256为 `1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982`。1.8.2没有改渲染算法、模板或预设格式。
|
||||
|
||||
1.8.1另有独立高光参考、负值/超白、局部CST、独立层跟随与撤销重做、两代预设、65³ Cube、1080p25四秒100帧ProRes、两个项目XML1.12回读。受控宿主Log样本为带sRGB标签的16-bit PNG码值载体,不代表任意真实相机的上游路由或完整HDR监看链。1.8.2实际FCP为正常栏宽,280/320/400布局由原生假宿主验证;没有切换系统辅助显示选项。
|
||||
|
||||
独立远程克隆Release重建通过595项,8个依赖归档的大小和摘要通过;复用已验证静态依赖缓存,没有全依赖冷构建。最终标签独立检出,编译输入与实际编译提交一致。临时恢复目录、生成APP、旧安装备份、提交ZIP和浏览器下载副本均已清理。
|
||||
|
||||
| 证据 | 文件 |
|
||||
| --- | --- |
|
||||
| 正式安装、签名、公证及实际源码 | [Delivery.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Delivery.json) |
|
||||
| 595项原生结果 | [InstalledSelfTest.json](/Volumes/备份/大鱼调色/大鱼调色/verification/InstalledSelfTest.json) |
|
||||
| 当前FCP验收 | [HostCompactUI1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/HostCompactUI1.8.2.json) |
|
||||
| CST数值与宿主 | [PrimaryCSTNumerical1.8.1.json](/Volumes/备份/大鱼调色/大鱼调色/verification/PrimaryCSTNumerical1.8.1.json)、[HostPrimaryCST1.8.1.json](/Volumes/备份/大鱼调色/大鱼调色/verification/HostPrimaryCST1.8.1.json) |
|
||||
| 独立恢复与清理 | [CompactUIRecovery1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/CompactUIRecovery1.8.2.json)、[CompactUICleanup1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/CompactUICleanup1.8.2.json) |
|
||||
| 安装包及下载 | [Package.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Package.json)、[Release.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Release.json) |
|
||||
|
||||
## 发布与恢复
|
||||
|
||||
发行包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.2.pkg`,43,006,067字节,SHA-256为 `cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded`。[在线Release383](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104),附件27,保留公测标记。草稿和发布后完整下载均已校验。
|
||||
|
||||
APP公证 `11fcf84b-680e-415e-87d2-bcf4ee8cdb78`;PKG公证 `26361685-6bdd-4c59-bc2c-4824ea190e05`,均Accepted并完成票据验证。PKG通过20项展开验包;APP已独立替换和宿主验收,本轮没有再次运行PKG系统安装脚本。
|
||||
|
||||
标签包含本版最终Package.json,发布后的Release.json在后续main。标签内旧Release.json属于上一版历史。实际编译、标签、最终文档提交不同,不移动标签或改写历史来强求SHA一致。
|
||||
|
||||
签名团队B3W25FX5H5,Application/Installer身份为zhong luo;当前证书有效至2027年2月2日06:12:15(上海),发布时重新核实身份、私钥与有效期。公证profile为 `codex-dayu-notary-B3W25FX5H5`,钥匙串 `/Users/mac/Library/Keychains/login.keychain-db`。不打印或提交凭据,密钥恢复按全局规则。
|
||||
|
||||
## 下一轮开发步骤
|
||||
|
||||
接手先核对工作区、分支、远程、正式版本和用户新需求。交接整理前工作区干净、main已推送。本轮只更新文档,不重编APP。若收到新截图或问题,在当前实现上定位,避免照旧交接重做已完成的CMS或自动更新。
|
||||
|
||||
1. 读取全局及新增项目规则,保护其他对话的修改,先保存本任务基线。
|
||||
2. 使用[checkpoint.py](/Volumes/备份/大鱼调色/大鱼调色/tools/checkpoint.py)提交明确审查过的路径,参数为提交说明和路径;脚本持有仓库锁、推送并核验main,不在外层重复持有同一锁。
|
||||
3. UI修改验证正常/窄栏、主题、展示不改参数和撤销。渲染修改按问题补数值与宿主验证,保护nil/v2/v3。更改模型才按需要刷新模板,不能借刷新自动启用v3。
|
||||
4. 新发布更新外层与内部Info.plist版本和构建,当前为1.8.2(59)。正常保存退出FCP/Motion,不能强杀有未保存工作的宿主。
|
||||
5. 在工程根目录以保持输入会话的终端运行 `python3 tools/deliver.py`。它完成Release、签名、自检、公证、票据、正式替换和发现路径核验。保持HEAD固定直到Delivery.json记录实际sourceCommit。
|
||||
6. 显示FORMAL_INSTALLED后,在正式位置验收。全部通过才向原会话输入 `complete`;`leave`仅保留待验收状态。complete会重写Delivery.json,之后补本版hostVerification路径;失败保留诊断并按可恢复流程处理旧版。
|
||||
7. `python3 Packaging/build_pkg.py`使用PKG工坊制作签名公证包和展开验包。要求Delivery.json为verified,拒绝覆盖已有同版发行包;验包不等于执行系统安装脚本。
|
||||
8. 提交推送记录并创建新的不可变版本标签;`python3 Packaging/publish_beta.py --tag <新标签> --notes <本版说明文件>`创建草稿、上传及下载校验。脚本自带仓库锁。
|
||||
9. 遇到draft-download-required,先确认附件已存在,别重复POST。用已登录Edge打开API返回的真实附件URL;本机下载目录为 `/Volumes/备份`。用独立副本传 `--verified-download`,通过后发布并再次完整下载校验,记录真实URL、附件ID和摘要。
|
||||
10. 独立验证远程源码/标签恢复,清理本任务生成的APP、提交ZIP、旧安装备份和验证副本;保留正式包、源码、历史发行包与私人QA资料。提交推送最终记录并核验远端引用。
|
||||
|
||||
完整路径入口:[deliver.py](/Volumes/备份/大鱼调色/大鱼调色/tools/deliver.py)、[build_pkg.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/build_pkg.py)、[publish_beta.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/publish_beta.py)。这些命令均在上述工程根目录执行,不能将构建缓存当源码。
|
||||
|
||||
产品锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`;Git锁在 `/Users/mac/.codex/git-backup-locks`,以不含凭据的小写完整HTTPS仓库地址SHA-256命名。先核对owner.json进程,不能删除仍在工作的锁。
|
||||
|
||||
正式服务可执行文件加 `--self-test` 可做无界面检查:
|
||||
`/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service`。构建目录只做编译与原生无界面检查,用户可见功能验收使用正式已公证位置。Xcode会登记生成内部服务,独立恢复构建在宿主关闭时执行,随后解除生成副本登记,避免宿主误载。
|
||||
|
||||
## 本机验收资料与后续范围
|
||||
|
||||
私人资料位于 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa`,不进Git或PKG。资源库为该目录下 `大鱼调色_验收.fcpbundle`;本轮项目为1.8.1_Log高光恢复和1.8.1_工作空间与独立层。项目名称不保证当前参数值,比较应以实际完整预设为准。
|
||||
|
||||
三份一致预设为该目录的ui58-before.json、ui59-after.json、ui59-cold-reopened.json。较早Cube、ProRes和XML的范围见1.8.1记录。缓存不是远程恢复资源,合成素材可由原生诊断和[create_primary_host_fixture.py](/Volumes/备份/大鱼调色/大鱼调色/tools/create_primary_host_fixture.py)重建。
|
||||
|
||||
交付结束时FCP为黑金、颜色设置收起,QA项目为1.8.1_Log高光恢复。此前Motion文稿已恢复打开,未编辑。新对话重新获取当前窗口和进程,不沿用历史UI元素编号、PID或工具会话。
|
||||
|
||||
真实相机Log上游路由、HDR/SDR工具域、更广宿主版本及界面细节均可作为后续方向,用户尚未指定优先级。不要把“所有工具已场景化”或“任意HDR链已验证”当作现状。
|
||||
|
||||
主APP自动更新与云端公测诊断已在1.7.0实现;登录、授权、业务加密尚未实施,详见[主APP交接](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md)和[后端说明](/Volumes/备份/大鱼调色/大鱼调色/Backend/README.md)。1.8.0至1.8.2没有同步网站文章或自动更新清单,源码Release发布不等于网站已上新版。
|
||||
|
||||
以后涉及后台,按全局规则先核对NAS生产共享 `/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media` 与本地专项副本的映射、基线和旁路备份;不要把工程内Backend或下载目录当生产源。若优化LUT浏览器,保留1.7.3的FxPlug宿主contentView原点适配,历史记录见[BrowserMoreSpace1.7.3.md](/Volumes/备份/大鱼调色/大鱼调色/research/BrowserMoreSpace1.7.3.md)。
|
||||
@@ -0,0 +1,9 @@
|
||||
# 1.8.2:收起高级颜色设置,新增黑金主题
|
||||
|
||||
基线:12fdde332f3174b2e948ad67df1d1f30aee2d69c。默认色彩流程继续为 nil/原有流程;保留已保存的 v2/v3 设置。此任务只改变检查器的展示和主题。
|
||||
|
||||
采用顶部四个操作按钮(保存、载入、导出、颜色设置),避免在已有六枚主题色块旁挤入图标。颜色设置以单一界面布尔状态控制原位展开/收起,首次和重开默认收起,不占参数区高度;打开/关闭不写调色状态,不制造撤销项。说明缩短,完整条件放入工具提示。
|
||||
|
||||
保留原主题 ID0–4,追加黑金 ID5,未设置偏好的默认值改为5。现有明确主题选择保持;本机验收选择新主题。黑色/炭黑不透明渐变背景、金色边线和亮金文字;文字只附加小范围静态光晕,增加对比度或减少透明度时去掉光晕。真实色轮、曲线通道和媒体图像保留语义颜色。
|
||||
|
||||
沿用 AppKit 与 FxPlug 原位视图,无新浮动窗口、计时器、动画或渲染算法。280窄栏和正常栏分别布局,按钮保持可读。验证默认收起、反复开关、键盘/辅助功能名称、窄栏、六种主题、减少装饰分支及旧工程参数保持;正式签名、公证、安装和 FCP 视觉验收后交付 PKG/Release。
|
||||
@@ -0,0 +1,17 @@
|
||||
# 炫彩界面与曲线直方图
|
||||
|
||||
基线 fa8201426647e2728c9bd344da7823f09a500871,1.8.2(59)。AppKit/FxPlug,macOS14.6+。
|
||||
|
||||
用户要求:参照紫蓝、洋红与青色界面替换黑金观感,曲线叠加真实 RGB/亮度直方图。
|
||||
|
||||
保持现有宿主检查器结构、模块状态、预设、撤销和色彩算法。主题追加编号6,旧0–5保持;新默认为6,本机原黑金选择在正式验收切换为6。背景与卡片不透明静态渐变,正文白色,重点按钮和滑杆用紫青渐变;原生焦点与动作保留,无持续动画。
|
||||
|
||||
直方图复用每0.5秒更新的320×180浮点分析缓存,在渲染工作线程统计256档RGB与亮度,检查器只绘制不可变快照。使用共同最大值与平方根高度,透明区域、非有限像素不计;超范围归到端点。RGB页叠加四通道,单色页显示对应通道。叠层默认开启,支持显隐,不写参数或预设。
|
||||
|
||||
分析画面沿用既有流程:原流程为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前。它不是最终输出示波器,也不保证每个独立曲线层的即时输入。UI工具提示说明来源及采样精度,不误标为最终输出。
|
||||
|
||||
验证:数值分布、透明/NaN/超范围、缓存隔离与失效、四通道绘制与曲线交互、280/320/400栏宽、旧预设不变;正式Release签名公证安装、FCP实测与冷重开、PKG/Release下载校验及远程恢复。
|
||||
|
||||
用户中途视觉反馈:候选60的卡片与图标仍以紫色为主。最终改为中性深蓝灰大面积表面、青色默认强调,按模块使用青/蓝/洋红/绿等细边与标题标记,保留紫青重点按钮及滑杆;不用紫色铺满背景。候选60公证并正式安装用于验收,未制作PKG或发布。
|
||||
|
||||
用户再次反馈:深蓝灰与现有青色主题近似,不要深蓝灰。最终取消中性深蓝灰方案,改为饱和的多色环境渐变和分模块双色渐变表面;紫色仅是其中一种,不再统一铺满所有卡片。候选61未制作PKG或发布。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 炫彩界面验证边界
|
||||
|
||||
选用 expressive 配色,沿用原生 AppKit 控件与现有布局,不增加持续动画、模糊或透明玻璃层。系统增加对比度/减少透明度时,炫彩面板仍为不透明静态表面,炫彩文字不使用光晕。
|
||||
|
||||
SwiftUI 风险扫描器返回 no Swift files,因本产品为 Objective-C++/AppKit,记录为不适用而非通过。Release 构建与原生集成自检覆盖模型、Metal渲染和假宿主;本版新增统计透明/NaN/无穷/范围外像素、亮度系数、采样守恒、缓存初始化/失效、四通道绘制及无参数写入检查。
|
||||
|
||||
布局280/320/400及CMS nil/v2/v3不变沿用并执行已有原生检查。FCP实机使用正常检查器栏宽。AX能发现7个主题按钮、RGB/红/绿/蓝切换、直方图复选框和数据来源/采样量说明;本轮没有启用VoiceOver或改变系统显示辅助选项,也未做Instruments采样,不宣称覆盖全部辅助技术或测得60fps。
|
||||
|
||||
视觉评分暂定84/100:平台14/15、布局13/15、视觉13/15、交互17/20、材质13/15、辅助6/10、实现8/10。此为受证据限制的暂定评价,不作为“Apple品质”或全覆盖承诺;用户的配色反馈优先。
|
||||
|
||||
候选60大量紫色与候选61深蓝灰均在用户实看后被否决,保留各自源码和公证证据,不发布安装包。最终62改为有饱和色相的分模块双色渐变。
|
||||
|
||||
验收中用图表中心单击添加的masterX0=0.5曲线点在61冷重开仍保留,证明曲线编辑与持久化;最终62已通过载入neon60-before.json还原验收工程,neon62-restored.json与neon62-cold.json均与原8,590字节预设逐字节一致。该操作造成的差异与纯主题/直方图显隐不改参数分别记录。
|
||||
@@ -3634,17 +3634,17 @@
|
||||
],
|
||||
"sourceSHA256": {
|
||||
"template/tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
|
||||
"大鱼调色/Plugin/DYCSTTypes.h": "3372e3cd77248eeb374e54675d2902befceea8e00a2afc4f9543116ef3027696",
|
||||
"大鱼调色/Plugin/DYCSTTypes.h": "ed5ba7e7ae35d1bba10e80a81184fa26b1f7eb582e47b2e45c3edd294889c76a",
|
||||
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
|
||||
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
|
||||
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "616c7919bf0889f767ebb68d4b37b775183451b213b8d2d979eeb293be69010c",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "8c9276003ea75c21c8e631122fe9a910bac26b12db69c76e626ec2100a6cbfd1",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "d5901d6ac11d93f3f4438dd8d48bb3a123d06d9b79ed39e8dca38db4261bc87a",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08",
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "29fea6064d3131119933401f554cc04e48cadf07d0c62f25b8d66795201396f8",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "0a83109d2c02626d6b9e7340b74be6e6a74f366f31f9d7622b4a88000d5ad7b9",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "3be23fd6e50f1137a2d5f2c087fd5724d0c41ca0aabb8e3b43dbb0ed7ec6b578",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "be984c73f5c4e563e3ac8de2b911e33071773f3d823b6b2d631444d3aa2baea2",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
|
||||
@@ -4,6 +4,7 @@ from pathlib import Path
|
||||
import argparse
|
||||
import subprocess
|
||||
from build_masked_kernel import masked_kernel
|
||||
from float_air_boundary import float_boundary
|
||||
|
||||
|
||||
def main():
|
||||
@@ -23,6 +24,10 @@ def main():
|
||||
generated = work / 'DYGradeMasked.ll'
|
||||
generated.write_text(masked_kernel(source.read_text()))
|
||||
source = generated
|
||||
if name in ('CSTKernel', 'BasisKernel'):
|
||||
generated = work / (name + 'Float.ll')
|
||||
generated.write_text(float_boundary(source.read_text(), name))
|
||||
source = generated
|
||||
subprocess.run(['xcrun', 'metal-opt', str(source),
|
||||
'-o', str(target)], check=True)
|
||||
objects.append(str(target))
|
||||
|
||||
@@ -130,6 +130,10 @@ def verify(data,model):
|
||||
assert params["10005"].get("value")=="1" and params["10005"].get("flags")=="8589934592" and f.get("pluginVersion")=="0"
|
||||
for row in model['parameters']:
|
||||
p=params[str(row['pid'])];assert float(p.get('default'))==float(row.get('hostDefault',row['default'])) and float(p.get('value'))==float(row['default'])
|
||||
# FCP also applies a changed dataValue to existing nil-state instances.
|
||||
# Keep both carriers at the original registered value; V3 is explicit opt-in.
|
||||
for pid in ['9000','9001','9002']:
|
||||
assert params[pid].findtext('defaultVal')==params[pid].findtext('dataValue')==custom_archive(model['archivesBase64'][pid])[0]
|
||||
assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL'))
|
||||
assert len(root.findall('.//behavior'))==0 and len(root.findall('.//keypoint'))==0
|
||||
assert scene.find('.//scenenode[@name="效果源"]/parameter[@id="2"]/parameter[@id="321"]').get('value')=='3'
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Build a controlled Log-code carrier fixture; never edit an FCP library.
|
||||
|
||||
The 16-bit PNG explicitly carries sRGB metadata so RGB_LINEAR host pixels can be
|
||||
unwrapped with the plugin's existing carrier. It is not raw-camera verification.
|
||||
"""
|
||||
import argparse, base64, json, plistlib, struct, uuid, zlib
|
||||
from pathlib import Path
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
root = Path(__file__).resolve().parent.parent
|
||||
p = argparse.ArgumentParser(description=__doc__)
|
||||
p.add_argument('--diagnostic', type=Path, required=True)
|
||||
args = p.parse_args()
|
||||
fixture = json.loads(args.diagnostic.read_text())
|
||||
qa = Path.home() / 'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
|
||||
qa.mkdir(parents=True, exist_ok=True)
|
||||
width, height = 1920, 1080
|
||||
|
||||
def chunk(name, data):
|
||||
return struct.pack('>I', len(data)) + name + data + struct.pack('>I', zlib.crc32(name + data) & 0xffffffff)
|
||||
|
||||
row = bytearray(b'\0')
|
||||
for x in range(width):
|
||||
code = fixture['patches'][x * 8 // width]['code']
|
||||
row += struct.pack('>HHH', *(round(max(0, min(1, v)) * 65535) for v in code))
|
||||
chart = qa / 'primary-slog3-code-carrier.png'
|
||||
chart.write_bytes(b'\x89PNG\r\n\x1a\n'
|
||||
+ chunk(b'IHDR', struct.pack('>IIBBBBB', width, height, 16, 2, 0, 0, 0))
|
||||
+ chunk(b'sRGB', b'\0') + chunk(b'gAMA', struct.pack('>I', 45455))
|
||||
+ chunk(b'IDAT', zlib.compress(bytes(row) * height)) + chunk(b'IEND', b''))
|
||||
model = json.loads((root / 'template/sources/RegisteredParameters.json').read_text())
|
||||
values = {r['key']: r['default'] for r in model['parameters']}
|
||||
values.update(cmConfigured=1, cmexposure=-4, skinEnabled=0)
|
||||
spider = json.loads((root / 'research/cms-correction-20261104/neutral-spider.json').read_text())
|
||||
preset = dict(format='com.dayu.color.preset', version=7,
|
||||
colorManagement=dict(version=3, mode=4, engine='Dayu-CST-f32', config='primary-parameters-v1'),
|
||||
values=values, paths={}, spider=spider,
|
||||
tools=base64.b64encode(plistlib.dumps(dict(schema=2, layers=[], baseMasks={}), fmt=plistlib.FMT_BINARY)).decode())
|
||||
(qa / 'primary-host-minus4.json').write_text(json.dumps(preset, ensure_ascii=False, indent=2) + '\n')
|
||||
xml = E.Element('fcpxml', version='1.12')
|
||||
r = E.SubElement(xml, 'resources')
|
||||
E.SubElement(r, 'format', id='f1', width=str(width), height=str(height), frameDuration='1/25s', colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r, 'format', id='f2', width=str(width), height=str(height), name='FFVideoFormatRateUndefined')
|
||||
a = E.SubElement(r, 'asset', id='a1', name='SLog3 控制码值', start='0s', duration='0s', format='f2', hasVideo='1', videoSources='1')
|
||||
E.SubElement(a, 'media-rep', kind='original-media', src=chart.as_uri())
|
||||
template = Path.home() / 'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
|
||||
E.SubElement(r, 'effect', id='fx', name='大鱼调色', uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef', src=template.as_uri())
|
||||
event = E.SubElement(E.SubElement(xml, 'library'), 'event', name='大鱼调色_1.8.1_CST修正验收', uid=str(uuid.uuid4()).upper())
|
||||
for title in ['1.8.1_Log高光恢复', '1.8.1_工作空间与独立层']:
|
||||
project = E.SubElement(event, 'project', name=title, uid=str(uuid.uuid4()).upper())
|
||||
sequence = E.SubElement(project, 'sequence', format='f1', duration='4s', tcStart='0s', tcFormat='NDF', audioLayout='stereo', audioRate='48k')
|
||||
clip = E.SubElement(E.SubElement(sequence, 'spine'), 'video', ref='a1', name=title, offset='0s', start='0s', duration='4s')
|
||||
E.SubElement(clip, 'filter-video', ref='fx', name='大鱼调色', enabled='1')
|
||||
E.indent(xml)
|
||||
output = qa / '大鱼调色_1.8.1_CST修正验收.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n' + E.tostring(xml, encoding='unicode') + '\n')
|
||||
(qa / 'primary-host-reference.json').write_text(json.dumps(fixture, ensure_ascii=False, indent=2) + '\n')
|
||||
print(output)
|
||||
@@ -0,0 +1,32 @@
|
||||
"""Add float boundary entry points; preserve all original AIR and arithmetic.
|
||||
|
||||
The recovered arithmetic already calculates in float. Only its sample entry and
|
||||
return were half. The new CST pipeline must not quantize every domain crossing.
|
||||
Legacy entry points remain byte-for-byte in the module and keep their behavior.
|
||||
"""
|
||||
import re
|
||||
|
||||
|
||||
def float_boundary(source, kind):
|
||||
name, size, first, rgb, tag = {
|
||||
'CSTKernel': ('cst', '9CSTParams', (7, 8), 2040, 6),
|
||||
'BasisKernel': ('basis', '11BasisParams', (8, 9), 247, 8),
|
||||
}[kind]
|
||||
old = f'_Z{len(name)+4}{name}_airDv4_DhRU11MTLconstantK{size}'
|
||||
new_name = name + '_float_air'
|
||||
new = f'_Z{len(new_name)}{new_name}Dv4_fRU11MTLconstantK{size}'
|
||||
match = re.search(r'define <4 x float> @' + re.escape(old) + r'\(.*?\n}', source, re.S)
|
||||
assert match, 'Versioned AIR entry changed; review the boundary adapter'
|
||||
function = match.group().replace(old, new, 1).replace('<4 x half> noundef %sample', '<4 x float> noundef %sample', 1)
|
||||
entry = (f' %v{first[0]} = shufflevector <4 x half> %sample, <4 x half> poison, <3 x i32> <i32 0, i32 1, i32 2>\n'
|
||||
f' %v{first[1]} = tail call fast <3 x float> @air.convert.f.v3f32.f.v3f16(<3 x half> %v{first[0]}) #{tag}')
|
||||
assert function.count(entry) == 1
|
||||
function = function.replace(entry, f' %v{first[1]} = shufflevector <4 x float> %sample, <4 x float> poison, <3 x i32> <i32 0, i32 1, i32 2>')
|
||||
exit = (f' %v{rgb+1} = tail call fast <3 x half> @air.convert.f.v3f16.f.v3f32(<3 x float> %v{rgb}) #{tag}\n'
|
||||
f' %v{rgb+2} = shufflevector <3 x half> %v{rgb+1}, <3 x half> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 undef>\n'
|
||||
f' %v{rgb+3} = shufflevector <4 x half> %v{rgb+2}, <4 x half> %sample, <4 x i32> <i32 0, i32 1, i32 2, i32 7>\n'
|
||||
f' %v{rgb+4} = tail call fast <4 x float> @air.convert.f.v4f32.f.v4f16(<4 x half> %v{rgb+3}) #{tag}\n'
|
||||
f' ret <4 x float> %v{rgb+4}')
|
||||
assert function.count(exit) == 1
|
||||
function = function.replace(exit, f' %dayuRGB = shufflevector <3 x float> %v{rgb}, <3 x float> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 undef>\n %dayuRGBA = shufflevector <4 x float> %dayuRGB, <4 x float> %sample, <4 x i32> <i32 0, i32 1, i32 2, i32 7>\n ret <4 x float> %dayuRGBA')
|
||||
return source[:match.end()] + '\n\n; Dayu float boundary, arithmetic unchanged.\n' + function + source[match.end():]
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"status": "host-default-compatibility-failed",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.1",
|
||||
"build": "56",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "9f54c118-8827-494e-9736-84b8f39d7a06",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "072bf881b97930325108cc6126d9d26997ca8425",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-ba2204ac9c814f378eaa57d3bb327276.app",
|
||||
"reason": "Changing template dataValue to v3 also changed an existing nil-state FCP project; automatic template opt-in withdrawn.",
|
||||
"hostObservation": "Existing 大鱼调色_1.8_旧版兼容 displayed 一级 CST · 延后输出 before any author edit."
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -12,5 +12,10 @@
|
||||
}
|
||||
],
|
||||
"formalInstall": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"scope": "Only generated backups created by this CMS task; source, media, historical installers and other apps retained"
|
||||
"scope": "Only generated backups created by this CMS task; source, media, historical installers and other apps retained",
|
||||
"browserDownloadRemoved": "/Volumes/备份/大鱼调色-1.8.0.pkg",
|
||||
"recoveryCloneAndBuildCopiesRemoved": true,
|
||||
"formalPluginRegistry": "com.dayu.color.XPC(1.1)\t636387FF-19DA-454E-ABFD-33256B8F3BCE\t2026-11-03 05:20:18 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)",
|
||||
"remainingGeneratedAPPs": [],
|
||||
"remainingTaskBackups": []
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"tag": "v1.8.0-cms-20261103",
|
||||
"commit": "a5a2bddeb361aac66899c5939671122075a6cffa",
|
||||
"compiledSource": "11a88518280f0665f3cd0f388d1d66e5446ece14",
|
||||
"trackedFiles": 440,
|
||||
"gitFsck": "full/strict passed",
|
||||
"dependencySourceArchives": [
|
||||
"OpenColorIO-2.5.2.tar.gz",
|
||||
"expat-2.7.2.tar.gz",
|
||||
"yaml-cpp-0.8.0.tar.gz",
|
||||
"Imath-3.2.1.tar.gz",
|
||||
"pystring-1.1.4.tar.gz",
|
||||
"minizip-ng-4.0.10.tar.gz",
|
||||
"zlib-1.3.1.tar.gz",
|
||||
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
|
||||
],
|
||||
"programSourcesMatchCompiledCommit": true,
|
||||
"restoredBuildVersion": "1.8.0",
|
||||
"restoredBuild": "55",
|
||||
"nativeChecks": 530,
|
||||
"execution": "headless integration tests only; generated APP never launched as a GUI or loaded in FCP",
|
||||
"buildLog": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/cms-recovery-build.log",
|
||||
"runtimeCache": "Pinned static library cache reused after content checks; all dependency source archives independently present and verified",
|
||||
"cleanup": "Only this recovery clone and generated APP/loose service; formal installation and QA projects retained"
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"status": "draft-download-required",
|
||||
"releaseID": 383,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104",
|
||||
"tag": "v1.8.2-blackgold-20261104",
|
||||
"commit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
|
||||
"assetID": 27,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.2-blackgold-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.2.pkg",
|
||||
"bytes": 43006067,
|
||||
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.2",
|
||||
"build": "58",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "1d8097bd-1e68-4070-a7e4-c0381382b1f6",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "870f0064c2cdf76d1025832512120af8d76f6840",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-86f5ddc4ffcc4e5b97507888122c29b3.app",
|
||||
"hostIssue": "Black-gold pull-down menu selectedItem is nil; missing Add Module caption. Not accepted or published; rolled back to verified 1.8.1 before rebuilding."
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"version": "1.8.2",
|
||||
"build": "59",
|
||||
"removed": [
|
||||
"restore-1.8.2",
|
||||
"restore-build-1.8.2",
|
||||
"unaccepted candidate58 APP",
|
||||
"notarization submission ZIPs",
|
||||
"previous install backup after acceptance"
|
||||
],
|
||||
"retained": [
|
||||
"unique formal APP",
|
||||
"current signed PKG",
|
||||
"previous user release packages",
|
||||
"source and verification records"
|
||||
],
|
||||
"recoveryCloneRemovedAfterValidation": true,
|
||||
"motionPreviousDocumentRestored": true,
|
||||
"scope": "Only task-created product outputs; no whole-disk uniqueness claim.",
|
||||
"passResult": true,
|
||||
"browserDownloadedCopyRemovedAfterBothChecks": true,
|
||||
"generatedAppInventory": {
|
||||
"projectRootAndProductCache": [],
|
||||
"hiddenInstallBackups": [],
|
||||
"ApplicationsOrUserFxPlugAlternate": []
|
||||
},
|
||||
"submissionZIPAbsent": true
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"compiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-1.8.2",
|
||||
"fsck": "full strict passed",
|
||||
"changedSourceFilesIdentical": [
|
||||
"Packaging/Release-1.8.2.md",
|
||||
"README.md",
|
||||
"research/ui-blackgold-20261104/brief.md",
|
||||
"verification/CompactUICandidate58.json",
|
||||
"大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h",
|
||||
"大鱼调色/Plugin/DYDiagnostics.mm",
|
||||
"大鱼调色/Plugin/DYInspector.mm",
|
||||
"大鱼调色/Plugin/DYManagedColorPanel.mm",
|
||||
"大鱼调色/Plugin/DYTheme.h",
|
||||
"大鱼调色/Plugin/DYTheme.mm",
|
||||
"大鱼调色/Plugin/Info.plist",
|
||||
"大鱼调色/Wrapper Application/Info.plist"
|
||||
],
|
||||
"dependencyArchivesVerified": [
|
||||
"OpenColorIO-2.5.2.tar.gz",
|
||||
"expat-2.7.2.tar.gz",
|
||||
"yaml-cpp-0.8.0.tar.gz",
|
||||
"Imath-3.2.1.tar.gz",
|
||||
"pystring-1.1.4.tar.gz",
|
||||
"minizip-ng-4.0.10.tar.gz",
|
||||
"zlib-1.3.1.tar.gz",
|
||||
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
|
||||
],
|
||||
"scope": "Independent remote checkout; build and formal host checks recorded separately.",
|
||||
"passResult": true,
|
||||
"independentBuild": "Release Wrapper Application",
|
||||
"nativeChecks": 595,
|
||||
"nativeChecksPassed": true,
|
||||
"dependenciesBuild": "Eight archived dependencies verified; reuse verified static runtime cache, not a full dependency cold build.",
|
||||
"generatedCopiesNeverShown": true,
|
||||
"generatedRegistrationRemoved": true,
|
||||
"releaseTag": "v1.8.2-blackgold-20261104",
|
||||
"releaseTagCommit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
|
||||
"releaseTagCheckedOut": true,
|
||||
"compiledInputsMatchTag": true
|
||||
}
|
||||
@@ -2,15 +2,15 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.0",
|
||||
"build": "55",
|
||||
"version": "1.8.3",
|
||||
"build": "62",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "ab2b40ea-886f-49fa-8735-aa392e65f036",
|
||||
"notaryID": "706a58bb-2fa4-4b1e-b392-de60d93aef49",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "11a88518280f0665f3cd0f388d1d66e5446ece14",
|
||||
"sourceCommit": "3fd015224037df944b428684c43ec8ec7accea85",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "52a9630ed3f887a0b5f3678da4330254891b15e88f637204473796736a8b7be1",
|
||||
"hostVerification": "verification/HostColorManagement1.8.0.json"
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"hostVerification": "verification/HostNeon1.8.3.json"
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
"version": "1.8.2",
|
||||
"build": "59",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"appPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
|
||||
"checks": {
|
||||
"defaultPanelHidden": true,
|
||||
"closedPanelNoBlankSpace": true,
|
||||
"goldGradientAndLuminousTextObserved": true,
|
||||
"addModuleCaptionVisible": true,
|
||||
"realColorWheelPreserved": true,
|
||||
"allSixThemeSelectors": true,
|
||||
"settingsToggles": 10,
|
||||
"savedV3ModePreserved": true,
|
||||
"presetBeforeAfterByteIdentical": true,
|
||||
"coldReopenPresetByteIdentical": true,
|
||||
"coldReopenSettingsCollapsed": true,
|
||||
"coldReopenGoldThemePersisted": true,
|
||||
"originalNilProjectStillOriginalFlow": true,
|
||||
"addModuleNativeMenuOpensAndEscapeCloses": true
|
||||
},
|
||||
"preset": {
|
||||
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui58-before.json",
|
||||
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui59-after.json",
|
||||
"bytes": 8590,
|
||||
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982",
|
||||
"coldReopened": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui59-cold-reopened.json"
|
||||
},
|
||||
"limitations": [
|
||||
"Width 280/320/400 and CMS nil/v2/v3 invariance checked by native fake-host diagnostics; actual FCP observed at normal inspector width.",
|
||||
"System display accessibility switches were not changed; glow policy code reads current system settings.",
|
||||
"Image rendering code and template unchanged; prior CST numerical/host export acceptance retained."
|
||||
],
|
||||
"pass": true,
|
||||
"formalHostProcess": [
|
||||
"50123 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": "1.8.3",
|
||||
"build": "62",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "3fd015224037df944b428684c43ec8ec7accea85",
|
||||
"nativeChecks": 605,
|
||||
"checks": {
|
||||
"multicolorModuleSurfacesObserved": true,
|
||||
"noUniformPurpleOrBlueGrayTheme": true,
|
||||
"nativeThemeChoicePersisted": true,
|
||||
"realVideoAndColorBarsHistogramsObserved": true,
|
||||
"liveVideoPlaybackObservedFrom": "00:00:04:00",
|
||||
"liveVideoPlaybackObservedTo": "00:00:11:12",
|
||||
"distributionChangedWithVideoFrame": true,
|
||||
"RGBAndIndividualChannelsAndOverlayToggle": true,
|
||||
"coldReopenHistogramReceives57600Samples": true,
|
||||
"coldReopenSettingsCollapsed": true,
|
||||
"originalV3CMSPreserved": true,
|
||||
"originalPresetRestoredAndColdReopenedByteIdentically": true
|
||||
},
|
||||
"preset": {
|
||||
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon60-before.json",
|
||||
"restored": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon62-restored.json",
|
||||
"cold": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon62-cold.json",
|
||||
"bytes": 8590,
|
||||
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
|
||||
},
|
||||
"curveInteraction": "A center point added during candidate60 QA persisted in candidate61 cold reopen; final62 restored baseline through the native preset loader. Original curve math/gesture handlers unchanged. Drag/delete not independently accepted in this pass.",
|
||||
"limitations": [
|
||||
"Histogram uses sampled analysis preview, not final output or every local curve input; details in checkbox help.",
|
||||
"280/320/400 layout and nil/v2/v3 invariance use native fake-host diagnostics; FCP observed at normal inspector width.",
|
||||
"No VoiceOver, system display switch matrix or Instruments profiling; AppKit source has no Swift files.",
|
||||
"Final APP installed and tested directly; package scripts are verified by expansion, not reinstalled."
|
||||
],
|
||||
"passResult": true
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"date": "2026-11-04",
|
||||
"version": "1.8.1",
|
||||
"build": "57",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "059245858035e74f78bd669ef25913408d07d235",
|
||||
"nativeChecks": 581,
|
||||
"hostChecks": [
|
||||
"Existing nil-state project remained 原有流程 after upgrade (candidate56 automatic template seed was rejected and rolled back)",
|
||||
"Old mode3 LUT/ACES project retained original LUT, exposure and exact preset bytes",
|
||||
"Explicit V3 opt-in via full preset; input/work/output selectors visible and effective",
|
||||
"Root exposure -4 and neutral extra layer exposure0 with mapping off",
|
||||
"New primary inherits DWG/DI input/work/output",
|
||||
"Root working-curve change updates all inherited domains; one timeline undo and redo restore all related fields",
|
||||
"Cold reopen preserves V3 state, primaryFollow metadata and all preset bytes",
|
||||
"Real 65cube export completed with declared primary input/output metadata",
|
||||
"1080p25 ProRes422 export: all100 frames decoded",
|
||||
"Two-project FCPXML1.12 import/export without warning; compared fields match"
|
||||
],
|
||||
"preset": {
|
||||
"before": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/primary-host-before57.json",
|
||||
"bytes": 9048,
|
||||
"sha256": "72b88dde2c30d0ed391184f666dbbceef1ad14e76749fee4aadcec98a6ad9e8b"
|
||||
},
|
||||
"after": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/primary-host-after57.json",
|
||||
"bytes": 9048,
|
||||
"sha256": "72b88dde2c30d0ed391184f666dbbceef1ad14e76749fee4aadcec98a6ad9e8b"
|
||||
},
|
||||
"byteIdentical": true
|
||||
},
|
||||
"legacyV2Preset": {
|
||||
"before": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/cms-lut-recovered-before.json",
|
||||
"bytes": 9003,
|
||||
"sha256": "9a0eac72e3c41b26c1553c0a47b3d67acc85e1f63fd2ec4f1c0591805b77a214"
|
||||
},
|
||||
"after": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/primary-v2-preserved57.json",
|
||||
"bytes": 9003,
|
||||
"sha256": "9a0eac72e3c41b26c1553c0a47b3d67acc85e1f63fd2ec4f1c0591805b77a214"
|
||||
},
|
||||
"byteIdentical": true
|
||||
},
|
||||
"cube": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/primary-host-export57.cube",
|
||||
"bytes": 9063074,
|
||||
"sha256": "c3da6ef3bb8ce2118e94ea51b29e7a3e87a228f967f6128ede1ab3e55dd8a939",
|
||||
"side": 65,
|
||||
"rows": 274625,
|
||||
"finite": true,
|
||||
"input": "Sony SLog3/S-Gamut3.Cine",
|
||||
"output": "Gamma2.4/Rec709 declared code values"
|
||||
},
|
||||
"render": {
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/primary-host-render57.mov",
|
||||
"bytes": 3833304,
|
||||
"sha256": "a6afd62ffd44852175e3db3d33c4203e8520c1413c4bed7ce1920e3fda0f1f28",
|
||||
"codec": "ProRes422",
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"fps": "25/1",
|
||||
"framesDecoded": 100,
|
||||
"duration": "4s",
|
||||
"colorTags": "bt709"
|
||||
},
|
||||
"FCPXML": {
|
||||
"version": "1.12",
|
||||
"projects": 2,
|
||||
"DTD": true,
|
||||
"comparison": {
|
||||
"expected_projects": 2,
|
||||
"actual_projects": 2,
|
||||
"status": "compared_fields_match",
|
||||
"differences": [],
|
||||
"scope": "project format/timecode, story timing/identity, static transforms (1e-4 absolute tolerance), title/caption text+role, linear time-map samples, effect references, opaque payload hashes, audio component/volume attributes",
|
||||
"not_covered": "rendered picture/sound, plugin parameter semantics, smooth interpolation, all crop/keyframe/metadata attributes, media/resources not reachable directly inside projects"
|
||||
}
|
||||
},
|
||||
"limitations": [
|
||||
"Controlled 16bit sRGB-tagged Log-code PNG, not generic camera/raw routing certification",
|
||||
"PNG fixture clips code values above1; high64scene reference remains a float32 numerical test",
|
||||
"Host export decoded and structurally verified; monitor/display colorimetry not certified",
|
||||
"Old tools remain post-output SDR finishing; no claim of complete HDR tool conversion",
|
||||
"PKG installation scripts not rerun; APP installed separately and verified in formal path"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 530,
|
||||
"checks": 605,
|
||||
"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/FBA3B728-B160-450E-9D50-3F2DCA624ECA"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/F51D5731-45CD-40CC-9C6E-43173AAAA987"
|
||||
},
|
||||
{
|
||||
"descriptors": 278,
|
||||
@@ -890,7 +890,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FBA3B728-B160-450E-9D50-3F2DCA624ECA/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/F51D5731-45CD-40CC-9C6E-43173AAAA987/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -910,7 +910,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 0,
|
||||
"maximumGapMS": 77.1040416584583,
|
||||
"maximumGapMS": 75.1614166656509,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -2806,8 +2806,366 @@
|
||||
{
|
||||
"name": "cms-preview-still-available",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-independent-state-valid",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-rejects-conflicting-global-input",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-secure-state-roundtrip",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-main-input-grade-output-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-DWG-intermediate-without-display-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 2816,
|
||||
"maxAbsoluteError": 0.00048828125,
|
||||
"name": "primary-input-goes-directly-to-DWG-DI-not-709",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-ACEScct-without-display-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 4276,
|
||||
"maxAbsoluteError": 0.00048828125,
|
||||
"name": "primary-ACEScct-is-selectable-not-forced",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-input-selection-ARRI",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-input-selection-is-effective",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-inherited-neutral-layers",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-new-layer-inherits-workspace-no-remap",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-stop-root-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-stop-extra-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-independent-grade-before-main-output",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-independent-OCIO-reduced-scene-input",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"independentReference": 0.424072265625,
|
||||
"maxDifference": 0.00048828125,
|
||||
"name": "primary-highlights-recovered-before-mapping-reference",
|
||||
"pass": true,
|
||||
"scene64afterMinus4": 0.424072265625
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-DI-contrast",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-ACES-contrast",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-local-working-selection-is-effective",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-input-CST-selection",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-local-input-CST-is-not-overridden",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-zero-mask",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-zero-grade-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-zero-mask-and-mix-retain-CST-boundaries",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-light-half-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-light-mix-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-mix-in-linear-AP1",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-print-DWG-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-print-ACES-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-print-domain-adapts-to-selected-working-space",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-declared-Log-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-declared-output-controls-restored",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-no-output-tone-map",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-tone-mapping-switch-restored",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-Log-data-output-rejects-SDR-finishing",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-main-eye-keeps-other-tools",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-eye-unmanaged-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-main-eye-bypasses-whole-CST-retains-tools",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-negative-superwhite-hidden-RGB",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-float-domain-identity-retains-extended-values",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 11520,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-exposure-extended-values",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"grey": 0.3599466383457184,
|
||||
"name": "primary-one-stop-exposure-is-linear-light-with-negative-values",
|
||||
"negative": -0.05998092517256737,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-data-output-ignores-disabled-SDR-and-LUT-controls",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-inspector-no-v2-selector-override",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-inspector-add-layer-inherits-workspace",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-workspace-change-updates-inherited-domains",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-manual-local-space-retains-choice-and-follows-boundaries",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-complete-preset-stores-v3-state",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-v3-Cube65-declared-encoding",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"Gamma22": 0.7297400236129761,
|
||||
"Gamma26": 0.7659831047058105,
|
||||
"name": "primary-Cube-restores-output-gamma-selection",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-hidden-without-gap",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-button-expands-panel",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-repeated-toggle-does-not-edit-grade",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-1",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-2",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-3",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-header-controls-fit-280",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-header-controls-fit-320",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-header-controls-fit-400",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-new-host-stays-original-flow",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-six-stable-theme-choices",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"minimumContrast": 7.243752441010932,
|
||||
"name": "compact-gold-labels-have-readable-contrast",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"brightCaptionPixels": 242,
|
||||
"name": "compact-gold-pull-down-draws-readable-caption",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-gold-glow-respects-system-display-options",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-rejects-transparent-and-nonfinite",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-rgb-endpoints-and-clamped-headroom",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-luma-primary-coefficients",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-each-channel-conserves-valid-samples",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-malformed-and-empty-safe",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-new-inspector-uses-renderer-cached-snapshot",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-four-channel-drawings-distinct",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-channel-and-overlay-presentation-does-not-edit-grade",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-invalidation-clears-view-and-renderer",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "neon-stable-theme-id-and-no-text-glow",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/FBA3B728-B160-450E-9D50-3F2DCA624ECA",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/F51D5731-45CD-40CC-9C6E-43173AAAA987",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.3",
|
||||
"build": "60",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "6ee7bd89-98b5-46f4-8db4-39491f67385c",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "bea51d2297d813683448c6b15f9049d3f9d42d8b",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-451eaad980494571b90ac2679f1fa80f.app"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.3",
|
||||
"build": "61",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "7989722c-6688-493b-aabf-772158527bed",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "335ef7a5ee310ed8bb1f31dd67098e38e7f31ed7",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-e7645188ecbb400ab7d3efe13cf5b8bb.app"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"removedPriorCandidateBackups": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-451eaad980494571b90ac2679f1fa80f.app",
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-e7645188ecbb400ab7d3efe13cf5b8bb.app"
|
||||
],
|
||||
"scope": "Only generated backups identified by candidate delivery records; final build app and loose plugin cleaned by deliver.py. Formal PKG retained; user QA media and historical packages preserved.",
|
||||
"passResult": true
|
||||
}
|
||||
+15
-15
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.0.pkg",
|
||||
"sha256": "fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42",
|
||||
"bytes": 42851034,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.3.pkg",
|
||||
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53",
|
||||
"bytes": 43010609,
|
||||
"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.8.0",
|
||||
"build": "55"
|
||||
"version": "1.8.3",
|
||||
"build": "62"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.746989a4-8119-4b88-af02-e861254bd9d2/EF8CD85E-8B1E-47BF-8034-51E5439EF770/大鱼调色"
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.0f5903c7-b19d-4375-99d2-56e68fb2bd7e/CC1BE24D-1F08-475E-A494-5A27FFA6BA2C/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.8.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-03 05:16:45 +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.8.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.8.3.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-04 04:27:21 +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.8.3.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.8.0.pkg",
|
||||
"message": "Successfully received submission info",
|
||||
"id": "2d32b77f-b825-4119-afcf-372588ad03c1",
|
||||
"id": "5666e466-7ec5-49fb-beac-f7fc5b4e080c",
|
||||
"name": "大鱼调色-1.8.3.pkg",
|
||||
"status": "Accepted",
|
||||
"createdDate": "2026-11-03T05:16:46.953Z"
|
||||
"createdDate": "2026-11-04T04:27:23.407Z",
|
||||
"message": "Successfully received submission info"
|
||||
},
|
||||
"appCompiledSource": "11a88518280f0665f3cd0f388d1d66e5446ece14",
|
||||
"appBuild": "55",
|
||||
"appCompiledSource": "3fd015224037df944b428684c43ec8ec7accea85",
|
||||
"appBuild": "62",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
@@ -59,6 +59,6 @@
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostColorManagement1.8.0.json",
|
||||
"installedAppHostAcceptance": "verification/HostNeon1.8.3.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"version": "1.8.1",
|
||||
"build": "57",
|
||||
"removed": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-candidate56-retained.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1/Build/Products/Release/大鱼调色 XPC Service.pluginkit",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-1.8.1",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1",
|
||||
"/Volumes/备份/大鱼调色-1.8.1.pkg"
|
||||
],
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"scope": "Current task generated candidates and restore products; user source, media, packages and prior releases retained",
|
||||
"finalSignatureAndTicket": true,
|
||||
"registeredFormalVersions": 1,
|
||||
"registry": "com.dayu.color.XPC(1.1)\tF973B51D-2CC7-4174-92D5-25AC02DDBC1B\t2026-11-04 00:09:45 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)"
|
||||
}
|
||||
@@ -0,0 +1,323 @@
|
||||
{
|
||||
"date": "2026-11-04",
|
||||
"version": "1.8.1",
|
||||
"build": "57",
|
||||
"scope": "Installed Release headless integration; live FCP acceptance recorded separately",
|
||||
"passResult": true,
|
||||
"totalChecks": 581,
|
||||
"previousChecks": 530,
|
||||
"newChecks": 51,
|
||||
"results": [
|
||||
{
|
||||
"name": "primary-balance-wheel-restored-and-palette-loaded",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-master-active-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-master-inactive-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-master-controls-complete-cst-pipeline",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-mask-full-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-mask-bypass-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-cst-mask-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-mask-blends-cst-only-in-selected-region",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-independent-state-valid",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-rejects-conflicting-global-input",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-v3-secure-state-roundtrip",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-main-input-grade-output-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-DWG-intermediate-without-display-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 2816,
|
||||
"maxAbsoluteError": 0.00048828125,
|
||||
"name": "primary-input-goes-directly-to-DWG-DI-not-709",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-ACEScct-without-display-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 4276,
|
||||
"maxAbsoluteError": 0.00048828125,
|
||||
"name": "primary-ACEScct-is-selectable-not-forced",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-input-selection-ARRI",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-input-selection-is-effective",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-inherited-neutral-layers",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-new-layer-inherits-workspace-no-remap",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-stop-root-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-four-stop-extra-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-independent-grade-before-main-output",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-independent-OCIO-reduced-scene-input",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"independentReference": 0.424072265625,
|
||||
"maxDifference": 0.00048828125,
|
||||
"name": "primary-highlights-recovered-before-mapping-reference",
|
||||
"pass": true,
|
||||
"scene64afterMinus4": 0.424072265625
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-DI-contrast",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-ACES-contrast",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-local-working-selection-is-effective",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-local-input-CST-selection",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-local-input-CST-is-not-overridden",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-zero-mask",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-zero-grade-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-zero-mask-and-mix-retain-CST-boundaries",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-light-half-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-light-mix-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-mix-in-linear-AP1",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-print-DWG-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-print-ACES-before-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-print-domain-adapts-to-selected-working-space",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 12288,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-declared-Log-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-declared-output-controls-restored",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-no-output-tone-map",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-tone-mapping-switch-restored",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-Log-data-output-rejects-SDR-finishing",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-main-eye-keeps-other-tools",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "primary-eye-unmanaged-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-main-eye-bypasses-whole-CST-retains-tools",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-negative-superwhite-hidden-RGB",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "primary-float-domain-identity-retains-extended-values",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 11520,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-linear-exposure-extended-values",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"grey": 0.3599466383457184,
|
||||
"name": "primary-one-stop-exposure-is-linear-light-with-negative-values",
|
||||
"negative": -0.05998092517256737,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-data-output-ignores-disabled-SDR-and-LUT-controls",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-inspector-no-v2-selector-override",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-inspector-add-layer-inherits-workspace",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-workspace-change-updates-inherited-domains",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-manual-local-space-retains-choice-and-follows-boundaries",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "primary-complete-preset-stores-v3-state",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "primary-v3-Cube65-declared-encoding",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"Gamma22": 0.7297400236129761,
|
||||
"Gamma26": 0.7659831047058105,
|
||||
"name": "primary-Cube-restores-output-gamma-selection",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"sourceSHA256": {
|
||||
"tools/float_air_boundary.py": "6775344aa79d4fe2d8c3b322f1276b4592904afa5cc50a62defb6211a7836833",
|
||||
"tools/build_kernels.py": "006711689251a4bc49f88ec4685d3baac55c2e56f033f384994a571515622e51",
|
||||
"大鱼调色/Plugin/DYPrimaryRender.inc.h": "adcac0ca85dcfba614060bc87549814507671b5688b3980ec416a9afdffcbfb3",
|
||||
"大鱼调色/Plugin/DYPrimaryKernels.inc.h": "e96c027ffec5a0a454771c93032c8fbed83bf11ca2951b97e0a9b6ee81b93b61",
|
||||
"大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h": "54a83300ed0fbc5588cdd5531271eacff7fca66bf7087336304bac16136e0f5f",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08",
|
||||
"大鱼调色/Plugin/DYRenderer.mm": "9b081acb6cd6e048cee4fe9bbfe4d72ae472ca6e3e2e4afff79f371a1755fad7"
|
||||
},
|
||||
"limitations": [
|
||||
"Controlled code-carrier vectors, not a raw-camera source API certification",
|
||||
"Old bounded tools remain post-output SDR finishing",
|
||||
"Live FCP and unique formal install verified separately"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"sourceCommit": "059245858035e74f78bd669ef25913408d07d235",
|
||||
"trackedFiles": 453,
|
||||
"gitFsck": true,
|
||||
"independentClone": true,
|
||||
"freshReleaseBuild": true,
|
||||
"headlessChecks": 581,
|
||||
"headlessPassed": true,
|
||||
"archives": [
|
||||
{
|
||||
"archive": "OpenColorIO-2.5.2.tar.gz",
|
||||
"sha256": "722601e01b78b7a12da4829cb450674935f404b0e508f3f20046fa77570e3272",
|
||||
"bytes": 14182890
|
||||
},
|
||||
{
|
||||
"archive": "expat-2.7.2.tar.gz",
|
||||
"sha256": "d09e2dd23398805cec1bac2860304714c96dc2fde629a7a1a77d0880ab7cd242",
|
||||
"bytes": 8439887
|
||||
},
|
||||
{
|
||||
"archive": "yaml-cpp-0.8.0.tar.gz",
|
||||
"sha256": "fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16",
|
||||
"bytes": 1017151
|
||||
},
|
||||
{
|
||||
"archive": "Imath-3.2.1.tar.gz",
|
||||
"sha256": "b2c8a44c3e4695b74e9644c76f5f5480767355c6f98cde58ba0e82b4ad8c63ce",
|
||||
"bytes": 689041
|
||||
},
|
||||
{
|
||||
"archive": "pystring-1.1.4.tar.gz",
|
||||
"sha256": "49da0fe2a049340d3c45cce530df63a2278af936003642330287b68cefd788fb",
|
||||
"bytes": 19184
|
||||
},
|
||||
{
|
||||
"archive": "minizip-ng-4.0.10.tar.gz",
|
||||
"sha256": "c362e35ee973fa7be58cc5e38a4a6c23cc8f7e652555daf4f115a9eb2d3a6be7",
|
||||
"bytes": 773269
|
||||
},
|
||||
{
|
||||
"archive": "zlib-1.3.1.tar.gz",
|
||||
"sha256": "17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c",
|
||||
"bytes": 1572744
|
||||
},
|
||||
{
|
||||
"archive": "sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz",
|
||||
"sha256": "3427a495743bb6fd1b5f9f806b80f57d67b1ac7ccf39a5f44aedd487fd7e6da1",
|
||||
"bytes": 136342
|
||||
}
|
||||
],
|
||||
"scope": "Application source rebuilt from independent remote clone; verified static dependency cache reused, not a completely cold dependency build",
|
||||
"cleanupPending": false,
|
||||
"tag": "v1.8.1-cst-correction-20261104",
|
||||
"tagCommit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
|
||||
"taggedTrackedFiles": 456,
|
||||
"taggedApplicationSourcesMatchBuiltCommit": true,
|
||||
"temporaryCloneRemoved": true,
|
||||
"generatedRestoreProductsRemoved": true
|
||||
}
|
||||
+18
-11
@@ -3,17 +3,24 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.7.4-tool-deletion-20261103",
|
||||
"releaseCommit": "468d530bf002a34e407bd5e182cb6b90d6df1eb4",
|
||||
"releaseID": 380,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.7.4-tool-deletion-20261103",
|
||||
"tag": "v1.8.2-blackgold-20261104",
|
||||
"releaseCommit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
|
||||
"releaseID": 383,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104",
|
||||
"prerelease": true,
|
||||
"assetID": 24,
|
||||
"assetName": "大鱼调色-1.7.4.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.7.4-tool-deletion-20261103/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.7.4.pkg",
|
||||
"bytes": 40918925,
|
||||
"sha256": "bab2cb14229de151f73782e4a9bd54ca34ef47b9dd15ef3590dd1cd95d04fce5",
|
||||
"assetID": 27,
|
||||
"assetName": "大鱼调色-1.8.2.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.2-blackgold-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.2.pkg",
|
||||
"bytes": 43006067,
|
||||
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Authenticated full download SHA-256 and byte count, then beta release/asset read-back; original prerelease metadata preserved.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api"
|
||||
"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": "/Volumes/备份/大鱼调色-1.8.2.pkg",
|
||||
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded",
|
||||
"bytes": 43006067,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.2-blackgold-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.2.pkg",
|
||||
"actualVisitedURL": "https://dayu.media/git/attachments/45d8d142-9c34-4635-ab9f-2004c0d5a365"
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,8 @@ typedef struct DayuRenderParams {
|
||||
CSTParams basisInput;
|
||||
CSTParams basisOutput;
|
||||
} DayuRenderParams;
|
||||
// New pipeline only; the original parameter and uniform layouts stay fixed.
|
||||
typedef struct DYCSTMixParams { CSTParams toLinear, fromLinear; float amount; } DYCSTMixParams;
|
||||
#ifndef __METAL_VERSION__
|
||||
_Static_assert(sizeof(CSTParams)==20, "CST target layout");
|
||||
_Static_assert(sizeof(BasisParams)==80, "BASIS target layout");
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
// Presentation-only changes must never rewrite a host's grading parameters.
|
||||
{
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,780)];[view layoutSubtreeIfNeeded];
|
||||
NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"];
|
||||
run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]);
|
||||
NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds;
|
||||
[settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn);
|
||||
for(int i=0;i<9;i++){[settings performClick:nil];[view layoutSubtreeIfNeeded];}
|
||||
run.record(@"compact-color-settings-repeated-toggle-does-not-edit-grade",panel.hidden&&first.frame.origin.y==8&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds);
|
||||
for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){
|
||||
DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil];[settings performClick:nil];
|
||||
run.record([NSString stringWithFormat:@"compact-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]);
|
||||
}
|
||||
for(NSNumber *width in @[@280,@320,@400]){
|
||||
[view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES;
|
||||
for(NSView *button in buttons){fit&=NSMinX(button.frame)>=0&&NSMaxX(button.frame)<=width.doubleValue&&button.frame.size.width>=66;for(NSView *other in buttons)if(button!=other)fit&=!NSIntersectsRect(button.frame,other.frame);}
|
||||
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==7&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
|
||||
run.record([NSString stringWithFormat:@"compact-header-controls-fit-%@",width],fit);
|
||||
}
|
||||
DYDiagnosticManager *fresh=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(fresh,nil);run.record(@"compact-new-host-stays-original-flow",!DYReadAssets(fresh,kCMTimeZero).colorManagement);
|
||||
NSInteger previous=DYThemeIndex();@try{
|
||||
BOOL colors=DYThemeNames().count==7&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
|
||||
for(NSInteger i=0;i<7;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
|
||||
run.record(@"compact-six-stable-theme-choices",colors);
|
||||
DYSetThemeIndex(5);auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);};
|
||||
double minimum=100;for(NSString *text in @[@"text",@"secondary"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop"])minimum=std::min(minimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
|
||||
run.record(@"compact-gold-labels-have-readable-contrast",minimum>=4.5,@{@"minimumContrast":@(minimum)});
|
||||
DYThemePopUpButton *pullDown=[[[DYThemePopUpButton alloc]initWithFrame:NSMakeRect(0,0,240,28) pullsDown:YES]autorelease];[pullDown addItemWithTitle:@"+ 添加模块"];pullDown.font=[NSFont systemFontOfSize:11];
|
||||
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:240 pixelsHigh:28 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease];
|
||||
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[pullDown drawRect:pullDown.bounds];[NSGraphicsContext restoreGraphicsState];NSUInteger glyphPixels=0;
|
||||
for(int y=6;y<23;y++)for(int x=9;x<90;x++){NSColor *c=[bitmap colorAtX:x y:y];if(c.redComponent>.55&&c.greenComponent>.35)glyphPixels++;}
|
||||
run.record(@"compact-gold-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)});
|
||||
BOOL reduced=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
|
||||
run.record(@"compact-gold-glow-respects-system-display-options",reduced?DYThemeTextShadow()==nil:DYThemeTextShadow().shadowBlurRadius<=2);
|
||||
}@finally{DYSetThemeIndex(previous);}
|
||||
}
|
||||
// Histogram math is independent of UI palettes and never edits a host document.
|
||||
{
|
||||
float pixels[][4]={{0,0,0,1},{1,1,1,1},{1,0,0,1},{0,1,0,1},{0,0,1,1},{-.5,2,.5,1},{1,1,1,0},{NAN,0,0,1},{0,0,0,INFINITY}};
|
||||
NSData *input=[NSData dataWithBytes:pixels length:sizeof(pixels)];NSData *data=DYHistogramFromRGBA(input);const DYHistogram *h=(const DYHistogram*)data.bytes;
|
||||
run.record(@"histogram-rejects-transparent-and-nonfinite",h->samples==6);
|
||||
run.record(@"histogram-rgb-endpoints-and-clamped-headroom",h->bins[1][0]==4&&h->bins[1][255]==2&&h->bins[2][255]==3&&h->bins[3][128]==1);
|
||||
run.record(@"histogram-luma-primary-coefficients",h->bins[0][54]==1&&h->bins[0][182]==1&&h->bins[0][18]==1);
|
||||
BOOL totals=YES;for(int c=0;c<4;c++){uint32_t total=0;for(int b=0;b<256;b++)total+=h->bins[c][b];totals&=total==6;}
|
||||
run.record(@"histogram-each-channel-conserves-valid-samples",totals);
|
||||
run.record(@"histogram-malformed-and-empty-safe",!DYHistogramFromRGBA([NSData dataWithBytes:pixels length:3])&&((const DYHistogram*)DYHistogramFromRGBA([NSData data]).bytes)->samples==0);
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];[renderer setValue:data forKey:@"histogram"];
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:renderer]autorelease];[view refresh];NSDictionary *before=[view presetSnapshot];
|
||||
NSView *graph=nil;for(NSView *v in [view valueForKey:@"graphics"])if([v.identifier isEqual:@"curveGraph"])graph=v;
|
||||
NSButton *toggle=[graph valueForKey:@"histogramToggle"];NSSegmentedControl *channels=[graph valueForKey:@"channels"];
|
||||
run.record(@"histogram-new-inspector-uses-renderer-cached-snapshot",[[graph valueForKey:@"histogram"]isEqual:data]&&toggle.state==NSControlStateValueOn);
|
||||
NSMutableSet *images=[NSMutableSet set];
|
||||
for(NSInteger c=0;c<4;c++){
|
||||
channels.selectedSegment=c;[graph performSelector:@selector(channelChanged:) withObject:channels];[graph setFrameSize:NSMakeSize(320,240)];[graph layoutSubtreeIfNeeded];
|
||||
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:320 pixelsHigh:240 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease];
|
||||
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[graph drawRect:graph.bounds];[NSGraphicsContext restoreGraphicsState];[images addObject:[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh]];
|
||||
}
|
||||
[toggle performClick:nil];[toggle performClick:nil];
|
||||
run.record(@"histogram-four-channel-drawings-distinct",images.count==4);
|
||||
run.record(@"histogram-channel-and-overlay-presentation-does-not-edit-grade",[before isEqual:[view presetSnapshot]]&&host->_undoStarts==0&&host->_undoEnds==0);
|
||||
[renderer invalidatePreview];[view performSelector:@selector(previewChanged:) withObject:nil];
|
||||
run.record(@"histogram-invalidation-clears-view-and-renderer",![renderer histogram]&&![graph valueForKey:@"histogram"]);
|
||||
NSInteger previous=DYThemeIndex();DYSetThemeIndex(6);
|
||||
run.record(@"neon-stable-theme-id-and-no-text-glow",[DYThemeNames()[6]isEqual:@"霓虹炫彩"]&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
|
||||
DYSetThemeIndex(previous);
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#include "DYFilmMath.h"
|
||||
#include "DYFilmTime.h"
|
||||
#import "DYDiagnostics.h"
|
||||
@@ -9,6 +10,7 @@
|
||||
#import "DYLUTLibrary.h"
|
||||
#import "DYLUTBrowser.h"
|
||||
#import "DYInspector.h"
|
||||
#import "DYTheme.h"
|
||||
#include "DYSpiderState.h"
|
||||
#include <string>
|
||||
#import <CoreVideo/CoreVideo.h>
|
||||
@@ -500,6 +502,8 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
#include "DYToolPenDiagnostics.inc.h"
|
||||
#include "DYMaskPanelDiagnostics.inc.h"
|
||||
#include "DYManagedDiagnostics.inc.h"
|
||||
#include "DYPrimaryDiagnostics.inc.h"
|
||||
#include "DYCompactUIDiagnostics.inc.h"
|
||||
[gpu release];
|
||||
} @catch(NSException *exception) {
|
||||
run.record(@"diagnostic-exception",false,@{@"exception":exception.name?:@"unknown",@"message":exception.reason?:@"unknown"});
|
||||
|
||||
@@ -326,3 +326,4 @@ fragment half4 dyToolCopyFragment(DYRaster in [[stage_in]],texture2d<half> sourc
|
||||
|
||||
#include "DYFilmKernels.inc.h"
|
||||
#include "DYManagedKernels.inc.h"
|
||||
#include "DYPrimaryKernels.inc.h"
|
||||
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
#import <Foundation/Foundation.h>
|
||||
#include <cmath>
|
||||
#include <cstdint>
|
||||
|
||||
// Immutable renderer-owned snapshot. Channel 0 is Rec.709 luma of the existing
|
||||
// display-encoded analysis samples, not scene-linear luminance or an HDR scope.
|
||||
struct DYHistogram {
|
||||
uint32_t bins[4][256]{};
|
||||
uint32_t samples=0;
|
||||
};
|
||||
static inline NSData *DYHistogramFromRGBA(NSData *rgba) {
|
||||
DYHistogram h;
|
||||
if(rgba.length%sizeof(float[4]))return nil;
|
||||
const float *p=(const float *)rgba.bytes;
|
||||
auto bin=[](double v){return (int)std::lround(std::fmax(0.,std::fmin(1.,v))*255.);};
|
||||
for(NSUInteger i=0;i<rgba.length/sizeof(float[4]);i++,p+=4){
|
||||
if(!std::isfinite(p[0])||!std::isfinite(p[1])||!std::isfinite(p[2])||!std::isfinite(p[3])||p[3]<=0)continue;
|
||||
h.bins[0][bin(.2126*p[0]+.7152*p[1]+.0722*p[2])]++;
|
||||
for(int c=0;c<3;c++)h.bins[c+1][bin(p[c])]++;
|
||||
h.samples++;
|
||||
}
|
||||
return [NSData dataWithBytes:&h length:sizeof(h)];
|
||||
}
|
||||
+90
-40
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#import "DYManagedColorPanel.h"
|
||||
#import "DYManagedColor.h"
|
||||
#import "DYInspector.h"
|
||||
@@ -19,17 +20,17 @@
|
||||
static NSColor *DYAccent(void) { return DYThemeColor(@"accent"); }
|
||||
static NSColor *DYInk(void) { return DYThemeColor(@"text"); }
|
||||
static NSTextField *DYLabel(NSString *text, CGFloat size) {
|
||||
NSTextField *v=[NSTextField labelWithString:text?:@""];
|
||||
NSTextField *v=[DYThemeLabel labelWithString:text?:@""];
|
||||
v.font=[NSFont systemFontOfSize:size weight:size==11?NSFontWeightMedium:NSFontWeightRegular]; v.textColor=DYThemeColor(@"slot15");
|
||||
v.lineBreakMode=NSLineBreakByTruncatingTail;
|
||||
return v;
|
||||
}
|
||||
static NSButton *DYButton(NSString *title,id target,SEL action) {
|
||||
NSButton *b=[NSButton buttonWithTitle:title target:target action:action];
|
||||
NSButton *b=[DYThemeButton buttonWithTitle:title target:target action:action];
|
||||
b.bezelStyle=NSBezelStyleRounded; b.font=[NSFont systemFontOfSize:11];
|
||||
b.contentTintColor=DYAccent(); return b;
|
||||
}
|
||||
@interface DYWebsiteLink : NSButton @end
|
||||
@interface DYWebsiteLink : DYThemeButton @end
|
||||
@implementation DYWebsiteLink
|
||||
- (NSAccessibilityRole)accessibilityRole {return NSAccessibilityLinkRole;}
|
||||
- (void)resetCursorRects {[self addCursorRect:self.bounds cursor:NSCursor.pointingHandCursor];}
|
||||
@@ -86,7 +87,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
|
||||
NSArray *colors=[self trackColors];if(colors){NSGradient *g=[[[NSGradient alloc]initWithColors:colors]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5] angle:0];return;}
|
||||
NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];NSGradient *base=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot8"] endingColor:DYThemePalette()[@"slot9"]]autorelease];[base drawInBezierPath:bar angle:90];[[NSColor colorWithWhite:0 alpha:.28]setStroke];bar.lineWidth=.6;[bar stroke];
|
||||
double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue);
|
||||
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:90];
|
||||
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:DYThemeIndex()==6?0:90];
|
||||
}
|
||||
- (void)drawKnob:(NSRect)knobRect {
|
||||
NSRect circle=NSInsetRect(knobRect,1,1);
|
||||
@@ -100,7 +101,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
|
||||
- (void)drawWithFrame:(NSRect)frame inView:(NSView *)view {
|
||||
NSRect rect=NSInsetRect(frame,.5,.5);NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.5 yRadius:2.5];
|
||||
NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot5"] endingColor:DYThemePalette()[@"slot4"]]autorelease];[gradient drawInBezierPath:p angle:90];[[DYThemePalette()[@"accent"]colorWithAlphaComponent:.65]setStroke];p.lineWidth=.9;[p stroke];
|
||||
[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];
|
||||
[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@end
|
||||
|
||||
@@ -125,6 +126,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
return self;
|
||||
}
|
||||
- (BOOL)isFlipped { return YES; }
|
||||
- (void)drawRect:(NSRect)rect {if([self.identifier isEqual:@"inspectorBackground"])DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}
|
||||
- (BOOL)isAccessibilityElement { return YES; }
|
||||
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
|
||||
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
|
||||
@@ -156,13 +158,26 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
- (void)scrollWheel:(NSEvent*)event{if(!self.hasVerticalScroller){[self.nextResponder scrollWheel:event];return;}[super scrollWheel:event];}
|
||||
@end
|
||||
|
||||
static NSColor *DYModuleColor(NSString *key,BOOL end,CGFloat scale=1) {
|
||||
NSArray *keys=@[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"];
|
||||
NSUInteger i=[keys indexOfObject:key?:@""];if(i==NSNotFound)i=0;
|
||||
static const CGFloat colors[][2][3]={
|
||||
{{.96,.18,.68},{.49,.17,1}},{{.03,.84,1},{.12,.32,1}},{{1,.35,.30},{1,.13,.67}},{{1,.70,.15},{1,.30,.39}},
|
||||
{{.66,.32,1},{1,.20,.69}},{{.12,.94,.48},{.01,.72,.77}},{{.04,.82,1},{.25,.35,1}},{{1,.22,.76},{.65,.20,1}},
|
||||
{{.30,.51,1},{.66,.26,1}},{{.23,.94,.56},{.01,.71,.68}},{{.70,.45,1},{.31,.31,1}},{{1,.37,.40},{1,.69,.20}},
|
||||
{{.08,.73,1},{.16,.95,.74}},{{1,.64,.16},{1,.22,.56}}
|
||||
};
|
||||
const CGFloat *c=colors[i][end?1:0];
|
||||
return [NSColor colorWithSRGBRed:c[0]*scale+(scale<1?.012:0) green:c[1]*scale+(scale<1?.006:0) blue:c[2]*scale+(scale<1?.025:0) alpha:1];
|
||||
}
|
||||
static NSColor *DYModuleAccent(NSString *key){return DYModuleColor(key,NO);}
|
||||
@interface DYCard : DYFlippedView @end
|
||||
@implementation DYCard
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
[DYThemeColor(@"card") setFill];
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11];
|
||||
[path fill]; [DYThemeColor(@"border") setStroke];
|
||||
if(DYThemeIndex()==6){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYModuleColor(self.identifier,NO,.23) endingColor:DYModuleColor(self.identifier,YES,.18)]autorelease];[g drawInBezierPath:path angle:20];[[DYModuleAccent(self.identifier)colorWithAlphaComponent:.55]setStroke];}else{DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];}
|
||||
path.lineWidth=1; [path stroke];
|
||||
if(DYThemeIndex()==6){[NSGraphicsContext saveGraphicsState];[path addClip];NSColor *accent=DYModuleAccent(self.identifier);NSGradient *edge=[[[NSGradient alloc]initWithStartingColor:[accent colorWithAlphaComponent:.85] endingColor:[DYThemeColor(@"accent")colorWithAlphaComponent:.12]]autorelease];[edge drawInRect:NSMakeRect(10,0,self.bounds.size.width-20,2) angle:0];[NSGraphicsContext restoreGraphicsState];}
|
||||
[[NSColor colorWithWhite:.52 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
|
||||
}
|
||||
@end
|
||||
@@ -173,11 +188,12 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
@implementation DYHeader
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=NSInsetRect(self.bounds,.5,2);
|
||||
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];
|
||||
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemeIndex()==6?DYModuleColor(self.identifier,NO,.34):DYThemePalette()[@"headerTop"] endingColor:DYThemeIndex()==6?DYModuleColor(self.identifier,YES,.27):DYThemePalette()[@"headerBottom"]]autorelease];
|
||||
[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:r xRadius:8 yRadius:8] angle:90];
|
||||
NSDictionary *attributes=@{NSFontAttributeName:self.font,NSForegroundColorAttributeName:DYInk()};
|
||||
NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk());
|
||||
[(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes];
|
||||
[self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes];
|
||||
if(DYThemeIndex()==6){[DYModuleAccent(self.identifier)setFill];[[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(2,8,2,14) xRadius:1 yRadius:1]fill];}
|
||||
}
|
||||
- (void)mouseDown:(NSEvent *)event {
|
||||
if(event.clickCount==2) [NSApp sendAction:self.doubleClickAction to:self.target from:self];
|
||||
@@ -192,6 +208,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
- (void)dealloc {[_swatch release];[super dealloc];}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=NSInsetRect(self.bounds,3,3);[_swatch setFill];NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:r xRadius:5 yRadius:5];[p fill];
|
||||
if([self.identifier isEqual:@"themeSwatch"]&&self.tag>=5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:self.tag==6?[NSColor colorWithSRGBRed:.8 green:.12 blue:1 alpha:1]:NSColor.blackColor endingColor:self.tag==6?NSColor.cyanColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];}
|
||||
if([self.identifier isEqual:@"customColorSwatch"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[NSColor.systemRedColor,NSColor.systemYellowColor,NSColor.systemGreenColor,NSColor.systemCyanColor,NSColor.systemBlueColor,NSColor.systemPurpleColor]]autorelease];[g drawInBezierPath:p angle:45];[@"⌾" drawInRect:NSInsetRect(r,3,1) withAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:16],NSForegroundColorAttributeName:NSColor.whiteColor}];}
|
||||
if(self.state==NSControlStateValueOn){[DYInk() setStroke];p.lineWidth=2;[p stroke];}
|
||||
}
|
||||
@@ -226,11 +243,14 @@ static NSArray *DYPresentationSections(void) {
|
||||
@interface DYCurvePanel : DYFlippedView {
|
||||
NSDictionary *_values;
|
||||
NSSegmentedControl *_channels;
|
||||
NSData *_histogram;
|
||||
NSButton *_histogramToggle;
|
||||
NSInteger _channel;
|
||||
NSString *_dragXKey,*_dragYKey;
|
||||
}
|
||||
@property(nonatomic,assign) id<DYGraphicDelegate> delegate;
|
||||
- (void)setValues:(NSDictionary *)values;
|
||||
- (void)setHistogram:(NSData *)histogram;
|
||||
@end
|
||||
|
||||
@implementation DYCurvePanel
|
||||
@@ -239,16 +259,19 @@ static NSArray *DYPresentationSections(void) {
|
||||
_values=[@{} copy];
|
||||
_channels=[[NSSegmentedControl segmentedControlWithLabels:@[@"RGB",@"红",@"绿",@"蓝"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(channelChanged:)] retain];
|
||||
_channels.selectedSegment=0; _channels.controlSize=NSControlSizeSmall; [self addSubview:_channels];
|
||||
_histogramToggle=[[NSButton checkboxWithTitle:@"直方图" target:self action:@selector(histogramToggled:)]retain];_histogramToggle.state=NSControlStateValueOn;_histogramToggle.font=[NSFont systemFontOfSize:10];_histogramToggle.accessibilityLabel=@"显示曲线直方图叠层";_histogramToggle.toolTip=@"亮度与 RGB,256 档、320×180 采样;高度按共同峰值平方根缩放。源为分析画面:原流程在一级 CST/输入 LUT 后,新 CMS 在显示输出转换后、SDR 修饰前;不是最终输出示波器,也不是每个曲线层的即时输入。播放或移动播放头时刷新(最多每秒2次)。";[self addSubview:_histogramToggle];
|
||||
self.accessibilityLabel=@"曲线点编辑器";self.toolTip=@"点击添加点;拖动调整;双击、右键或按住 Option 点击已有点可删除";
|
||||
}
|
||||
return self;
|
||||
}
|
||||
- (void)dealloc { [_values release];[_channels release];[_dragXKey release];[_dragYKey release];[super dealloc]; }
|
||||
- (void)dealloc { [_histogram release];[_histogramToggle release];[_values release];[_channels release];[_dragXKey release];[_dragYKey release];[super dealloc]; }
|
||||
- (BOOL)acceptsFirstResponder { return YES; }
|
||||
- (void)setValues:(NSDictionary *)values { [_values release];_values=[values copy];[self setNeedsDisplay:YES]; }
|
||||
- (void)layout { [super layout];_channels.frame=NSMakeRect(12,4,self.bounds.size.width-24,24); }
|
||||
- (void)layout { [super layout];_channels.frame=NSMakeRect(12,4,MAX(100,self.bounds.size.width-112),24);_histogramToggle.frame=NSMakeRect(self.bounds.size.width-88,5,80,22); }
|
||||
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"分析画面,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
|
||||
- (void)histogramToggled:(id)sender {[self setNeedsDisplay:YES];}
|
||||
- (void)channelChanged:(NSSegmentedControl *)sender { _channel=sender.selectedSegment;[self setNeedsDisplay:YES]; }
|
||||
- (NSRect)plotRect { return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-56)); }
|
||||
- (NSRect)plotRect { return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76)); }
|
||||
- (NSArray *)slots {
|
||||
NSMutableArray *result=[NSMutableArray array];
|
||||
NSInteger n=_channel==0?4:2;
|
||||
@@ -281,7 +304,20 @@ static NSArray *DYPresentationSections(void) {
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=[self plotRect];
|
||||
[[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1] setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
|
||||
[(DYThemeIndex()==6?[NSColor colorWithSRGBRed:.025 green:.02 blue:.06 alpha:1]:DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
|
||||
if(_histogramToggle.state==NSControlStateValueOn){
|
||||
const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;
|
||||
if(h&&h->samples){
|
||||
uint32_t peak=1;for(int c=0;c<4;c++)if(_channel==0||c==_channel)for(int b=0;b<256;b++)peak=MAX(peak,h->bins[c][b]);
|
||||
NSArray *colors=@[NSColor.whiteColor,[NSColor colorWithSRGBRed:1 green:.23 blue:.37 alpha:1],[NSColor colorWithSRGBRed:.23 green:.94 blue:.50 alpha:1],[NSColor colorWithSRGBRed:.19 green:.51 blue:1 alpha:1]];
|
||||
[NSGraphicsContext saveGraphicsState];NSRectClip(r);
|
||||
for(int c=3;c>=0;c--){if(_channel!=0&&c!=_channel)continue;
|
||||
NSBezierPath *area=[NSBezierPath bezierPath],*line=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];
|
||||
for(int b=0;b<256;b++){NSPoint q=NSMakePoint(NSMinX(r)+b/255.*r.size.width,NSMaxY(r)-sqrt(h->bins[c][b]/double(peak))*r.size.height*.86);[area lineToPoint:q];if(b==0)[line moveToPoint:q];else[line lineToPoint:q];}
|
||||
[area lineToPoint:NSMakePoint(NSMaxX(r),NSMaxY(r))];[area closePath];[[colors[c]colorWithAlphaComponent:c==0?.08:.19]setFill];[area fill];[[colors[c]colorWithAlphaComponent:c==0?.65:.62]setStroke];line.lineWidth=.8;[line stroke];
|
||||
}[NSGraphicsContext restoreGraphicsState];
|
||||
}else [@"等待画面 · 请移动播放头" drawAtPoint:NSMakePoint(r.origin.x+8,NSMaxY(r)-20) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
|
||||
}
|
||||
[[NSColor colorWithWhite:1 alpha:.1] setStroke];NSBezierPath *grid=[NSBezierPath bezierPath];grid.lineWidth=.5;
|
||||
for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke];
|
||||
std::vector<NSPoint> p; p.push_back(NSMakePoint(0,0));
|
||||
@@ -305,8 +341,10 @@ static NSArray *DYPresentationSections(void) {
|
||||
NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-fmax(0,fmin(1,y)))*r.size.height);
|
||||
if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q];
|
||||
}
|
||||
NSColor *color=_channel==0?DYAccent():_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
NSColor *color=_channel==0?(DYThemeIndex()==6?NSColor.whiteColor:DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
for(NSDictionary *point in points) {NSPoint q=[self positionOfPoint:point];[color setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] fill];[DYInk() setStroke];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] stroke];}
|
||||
NSDictionary *axis=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:8 weight:NSFontWeightRegular],NSForegroundColorAttributeName:DYThemeColor(@"secondary")};
|
||||
[@"0" drawAtPoint:NSMakePoint(NSMinX(r),NSMaxY(r)+2) withAttributes:axis];[@"128" drawAtPoint:NSMakePoint(NSMidX(r)-7,NSMaxY(r)+2) withAttributes:axis];[@"255" drawAtPoint:NSMakePoint(NSMaxX(r)-14,NSMaxY(r)+2) withAttributes:axis];
|
||||
[@"点击添加 · 拖动调整 · 双击删除" drawAtPoint:NSMakePoint(16,self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:9],NSForegroundColorAttributeName:[NSColor colorWithWhite:.7 alpha:1]}];
|
||||
}
|
||||
- (void)sendValues:(NSDictionary *)values {
|
||||
@@ -434,6 +472,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSArray *_themeButtons;
|
||||
NSMutableDictionary *_tabs;
|
||||
NSInteger _visibleLooks;
|
||||
NSButton *_colorSettings;BOOL _colorSettingsExpanded;
|
||||
BOOL _refreshing,_graphicUndoOpen;
|
||||
BOOL _embedded;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight;
|
||||
DYSpiderPanel *_spiderPanel;
|
||||
@@ -474,11 +513,13 @@ static NSImage *DYWheelImage(void) {
|
||||
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
|
||||
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
|
||||
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
|
||||
_addModule=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
|
||||
_colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起";
|
||||
_save.identifier=@"primaryAction";
|
||||
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
|
||||
for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_addModule]){[self addSubview:v];v.hidden=_embedded;}
|
||||
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<5;i++){
|
||||
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;}
|
||||
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
|
||||
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.identifier=@"themeSwatch";b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
|
||||
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded;[themes addObject:b];
|
||||
}_themeButtons=[themes copy];
|
||||
_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
|
||||
@@ -489,12 +530,13 @@ static NSImage *DYWheelImage(void) {
|
||||
_scroll.contentView.wantsLayer=YES;_scroll.contentView.layer.masksToBounds=YES;
|
||||
_scroll.accessibilityLabel=@"调色参数滚动区";
|
||||
_document=[[DYFlippedView alloc] initWithFrame:NSMakeRect(0,0,360,1000)];
|
||||
_document.accessibilityLabel=@"调色参数";
|
||||
_document.accessibilityLabel=@"调色参数";_document.identifier=@"inspectorBackground";
|
||||
_scroll.documentView=_document; [self addSubview:_scroll];
|
||||
if(!_embedded){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];[_document addSubview:_managedPanel];}
|
||||
if(!_embedded){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];}
|
||||
[self buildCards];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
|
||||
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil];
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
|
||||
if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
|
||||
[self themeChanged:nil];
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
@@ -506,14 +548,15 @@ static NSImage *DYWheelImage(void) {
|
||||
[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;
|
||||
for(id graphic in _graphics)if([graphic isKindOfClass:DYPrimaryBalanceWheel.class])[(DYPrimaryBalanceWheel*)graphic setDelegate:nil];
|
||||
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
|
||||
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
|
||||
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_addModule release];
|
||||
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release];
|
||||
[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
|
||||
[_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];
|
||||
[super dealloc];
|
||||
}
|
||||
- (BOOL)isFlipped { return YES; }
|
||||
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);if(DYThemeIndex()==6&&![self.identifier isEqual:@"inspectorBackground"]){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInRect:NSMakeRect(0,0,self.bounds.size.width,2) angle:0];}}
|
||||
- (BOOL)isAccessibilityElement { return YES; }
|
||||
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
|
||||
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
|
||||
@@ -533,12 +576,18 @@ static NSImage *DYWheelImage(void) {
|
||||
else dispatch_async(dispatch_get_main_queue(),^{ [self refresh]; });
|
||||
}
|
||||
- (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);}
|
||||
- (void)toggleColorSettings:(id)sender {
|
||||
_colorSettingsExpanded=!_colorSettingsExpanded;_managedPanel.hidden=!_colorSettingsExpanded;_colorSettings.state=_colorSettingsExpanded?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已收起";[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
|
||||
[_document scrollPoint:NSZeroPoint];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
|
||||
}
|
||||
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
|
||||
- (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; }
|
||||
- (void)themeChanged:(NSNotification *)notification {
|
||||
for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYModuleAccent(card[@"section"][@"key"]):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
|
||||
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
|
||||
for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:@{NSFontAttributeName:_websiteLink.font,NSForegroundColorAttributeName:DYAccent(),NSUnderlineStyleAttributeName:@(NSUnderlineStyleSingle)}]autorelease];
|
||||
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease];
|
||||
for(NSDictionary *r in _controls.allValues)[r[@"field"] setBackgroundColor:DYThemeColor(@"field")];
|
||||
[_browser updatePalette:DYThemePalette()];[self redrawTree:self];
|
||||
}
|
||||
@@ -548,18 +597,18 @@ static NSImage *DYWheelImage(void) {
|
||||
[self setNeedsLayout:YES];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
|
||||
}
|
||||
- (void)addLook:(id)sender {_visibleLooks=MIN(5,_visibleLooks+1);[self setNeedsLayout:YES];}
|
||||
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)previewChanged:(NSNotification *)note {for(id graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class])[graphic setHistogram:[_renderer histogram]];[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)buildCards {
|
||||
NSInteger index=0;
|
||||
for(NSDictionary *section in _sections) {
|
||||
DYCard *card=[[[DYCard alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
card.accessibilityLabel=section[@"title"];
|
||||
card.accessibilityLabel=section[@"title"];card.identifier=section[@"key"];
|
||||
[_document addSubview:card];
|
||||
DYHeader *header=[[[DYHeader alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
header.title=[section[@"key"] isEqual:@"skin"]?@"肤色保护设置":section[@"title"];
|
||||
[header setButtonType:NSButtonTypePushOnPushOff];
|
||||
header.bordered=NO; header.alignment=NSTextAlignmentLeft; header.font=[NSFont boldSystemFontOfSize:12];
|
||||
header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index;
|
||||
header.identifier=section[@"key"];header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index;
|
||||
header.doubleClickAction=@selector(resetSection:); header.toolTip=@"展开或折叠界面;双击还原本组";
|
||||
[card addSubview:header];
|
||||
NSButton *enabled=DYButton(@"",self,@selector(groupEnabled:));enabled.bordered=NO;[enabled setButtonType:NSButtonTypePushOnPushOff];enabled.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用本组"];
|
||||
@@ -602,7 +651,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSSegmentedControl *tabs=[NSSegmentedControl segmentedControlWithLabels:[key isEqual:@"mixer"]?@[@"红输出",@"绿输出",@"蓝输出"]:@[@"减色",@"晕光",@"辉光",@"颗粒",@"暗角",@"印片"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(tabChanged:)];tabs.identifier=key;tabs.selectedSegment=0;tabs.controlSize=NSControlSizeSmall;tabs.accessibilityLabel=[section[@"title"]stringByAppendingString:@"分组"];[card addSubview:tabs];[body addObject:tabs];
|
||||
}
|
||||
if([key isEqual:@"curve"]) {
|
||||
DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];
|
||||
DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;[graph setHistogram:[_renderer histogram]];graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];
|
||||
}
|
||||
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];
|
||||
@@ -628,7 +677,7 @@ static NSImage *DYWheelImage(void) {
|
||||
toggle.tag=[pid integerValue]; toggle.contentTintColor=DYAccent(); toggle.accessibilityLabel=d[@"title"];
|
||||
[row addSubview:toggle]; record[@"toggle"]=toggle;
|
||||
} else if([kind isEqualToString:@"popup"]) {
|
||||
NSPopUpButton *popup=[[[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO] autorelease];
|
||||
NSPopUpButton *popup=[[[DYThemePopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO] autorelease];
|
||||
[popup addItemsWithTitles:d[@"options"]?:@[]]; popup.font=[NSFont systemFontOfSize:11];
|
||||
popup.target=self; popup.action=@selector(scalarChanged:); popup.tag=[pid integerValue];
|
||||
popup.accessibilityLabel=d[@"title"]; [row addSubview:popup]; record[@"popup"]=popup;
|
||||
@@ -691,7 +740,7 @@ static NSImage *DYWheelImage(void) {
|
||||
if([row.identifier isEqual:@"toolMasks"])return [(DYToolMaskPanel*)row contentHeight]>0;
|
||||
NSString *key=row.identifier?:@"";NSInteger tab=[_tabs[section]integerValue];
|
||||
if(!_embedded&&[section isEqual:@"base"]&&[key isEqual:@"skinEnabled"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"skin"])return ![card[@"removed"]boolValue];
|
||||
if([key isEqual:@"legacyInput"])return ![_tabs[@"managedColor"]boolValue]&&[_tabs[@"legacyInput"]boolValue];
|
||||
if([key isEqual:@"legacyInput"])return ![_tabs[@"primaryCMS"]boolValue]&&![_tabs[@"managedColor"]boolValue]&&[_tabs[@"legacyInput"]boolValue];
|
||||
if([section isEqual:@"primary"]&&[_tabs[@"managedColor"]boolValue]){if([@[@"heading:input",@"heading:output"]containsObject:key])return NO;if([key isEqual:@"cmmix"])return YES;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key]&&d[@"cmTab"]&&[d[@"cmTab"]integerValue]!=1)return NO;}
|
||||
if([section isEqual:@"curve"] && ![key isEqual:@"curveGraph"])return NO;
|
||||
if([section isEqual:@"hsl"]) {
|
||||
@@ -709,16 +758,16 @@ static NSImage *DYWheelImage(void) {
|
||||
- (void)layout {
|
||||
[super layout];
|
||||
CGFloat w=MAX(280,self.bounds.size.width),h=self.bounds.size.height;
|
||||
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);
|
||||
for(NSInteger i=0;i<5;i++)[_themeButtons[i]setFrame:NSMakeRect(w-146+i*22,17,21,22)];
|
||||
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<380;
|
||||
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*16,17,16,22)];
|
||||
_resetAll.frame=NSMakeRect(w-33,16,23,24);
|
||||
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
|
||||
CGFloat gap=7,bw=(w-32-gap*2)/3;
|
||||
_save.frame=NSMakeRect(16,74,bw,27); _load.frame=NSMakeRect(16+bw+gap,74,bw,27); _export.frame=NSMakeRect(16+(bw+gap)*2,74,bw,27);
|
||||
_addModule.frame=NSMakeRect(16,108,w-32,27);
|
||||
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,144,w,MAX(80,h-144));
|
||||
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
|
||||
NSArray *actions=@[_save,_load,_export,_colorSettings];for(NSUInteger i=0;i<actions.count;i++)[actions[i]setFrame:NSMakeRect(16+(bw+gap)*(compact?i%2:i),74+(compact?i/2*34:0),bw,27)];
|
||||
CGFloat top=compact?178:144;_addModule.frame=NSMakeRect(16,top-36,w-32,27);
|
||||
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,top,w,MAX(80,h-top));
|
||||
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
|
||||
if(_managedPanel){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
|
||||
if(_managedPanel&&!_managedPanel.hidden){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
|
||||
for(NSMutableDictionary *c in _cards) {
|
||||
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
|
||||
card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;}
|
||||
@@ -810,8 +859,8 @@ static NSImage *DYWheelImage(void) {
|
||||
[(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版";
|
||||
[card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint];
|
||||
}
|
||||
DYAssetState *assets=DYReadAssets(_manager,t);_tabs[@"managedColor"]=@((_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement).count>0);[_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]?@"调色混合":@"CST 混合"];
|
||||
if([_tabs[@"managedColor"]boolValue])for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:@"启停此层一级调色;全局色彩管理保持当前方式"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
|
||||
DYAssetState *assets=DYReadAssets(_manager,t);NSDictionary *cms=_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement;_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]?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[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];
|
||||
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
|
||||
@@ -857,7 +906,7 @@ static NSImage *DYWheelImage(void) {
|
||||
if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];}
|
||||
else if(old.schema<2){double cfg=0;[get getFloatValue:&cfg fromParameter:2236 atTime:action.currentTime];if(cfg<.5)[set setFloatValue:-1 toParameter:2236 atTime:action.currentTime];}
|
||||
if(old.schema<2){DYInspectorToken *token=[[old copy]autorelease];token.schema=2;[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime];}
|
||||
} }
|
||||
}DYPrimaryControlChanged(_manager,action.currentTime,d[@"key"]); }
|
||||
@finally { [action endAction:self]; }
|
||||
[self postChanged];
|
||||
}
|
||||
@@ -865,7 +914,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSDictionary *r=_controls[@(sender.tag)],*d=r[@"descriptor"];if(!d)return;
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI];if(!action)return;
|
||||
[action startAction:self];
|
||||
@try {id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:[d[@"default"] doubleValue] toParameter:(UInt32)sender.tag atTime:action.currentTime];if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];}}
|
||||
@try {id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:[d[@"default"] doubleValue] toParameter:(UInt32)sender.tag atTime:action.currentTime];if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];}DYPrimaryControlChanged(_manager,action.currentTime,d[@"key"]);}
|
||||
@finally {[action endAction:self];}
|
||||
[self postChanged];
|
||||
}
|
||||
@@ -948,6 +997,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSNumber *extra=section[@"extraEnabled"];if(extra)[set setFloatValue:defaultEnabled toParameter:extra.unsignedIntValue atTime:t];
|
||||
NSString *key=section[@"key"]?:@"";
|
||||
if([key isEqual:@"primary"]){for(NSDictionary *d in DYDescriptors())if([d[@"key"]hasPrefix:@"cm"])[set setFloatValue:[d[@"default"]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];[set setFloatValue:1 toParameter:2236 atTime:t];for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:1 toParameter:linked.unsignedIntValue atTime:t];[set setFloatValue:0 toParameter:2013 atTime:t];DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];NSMutableDictionary *paths=[[state.paths mutableCopy]autorelease];[paths removeObjectForKey:@"input"];state.paths=paths;DYWriteAssets(_manager,state,t);}
|
||||
if([key isEqual:@"primary"])DYPrimaryControlChanged(_manager,t,@"cmworkingTransfer");
|
||||
if([key isEqual:@"spider"]){DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];auto m=DYSpiderMesh(state.spiderMesh);m=dy::neutralMesh(m.hues,m.rings+1);state.spiderMesh=[NSData dataWithBytes:&m length:sizeof(m)];DYWriteAssets(_manager,state,t);}
|
||||
if([key localizedCaseInsensitiveContainsString:@"input"]||[key localizedCaseInsensitiveContainsString:@"look"]) {
|
||||
DYAssetState *assets=[[DYReadAssets(_manager,t) copy] autorelease];
|
||||
|
||||
@@ -3,7 +3,12 @@
|
||||
#import <FxPlug/FxPlugSDK.h>
|
||||
// Separate authoring state; absent state always selects the unchanged v1 renderer.
|
||||
FOUNDATION_EXPORT NSDictionary *DYManagedColorDefaults(void);
|
||||
FOUNDATION_EXPORT NSDictionary *DYPrimaryColorDefaults(void);
|
||||
FOUNDATION_EXPORT BOOL DYPrimaryColorState(NSDictionary *state);
|
||||
FOUNDATION_EXPORT void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut);
|
||||
FOUNDATION_EXPORT BOOL DYManagedColorValid(id state,NSError **error);
|
||||
FOUNDATION_EXPORT void DYFollowPrimaryWorkingSpace(NSMutableDictionary *document,float transfer,float gamut);
|
||||
FOUNDATION_EXPORT void DYPrimaryControlChanged(id<PROAPIAccessing> manager,CMTime time,NSString *key);
|
||||
FOUNDATION_EXPORT NSArray<NSDictionary*> *DYManagedInputSpaces(void);
|
||||
FOUNDATION_EXPORT NSArray<NSDictionary*> *DYManagedOutputSpaces(void);
|
||||
FOUNDATION_EXPORT NSDictionary *DYHostColorContext(FxImageTile *source,FxImageTile *destination,NSInteger primaries);
|
||||
|
||||
@@ -1,11 +1,25 @@
|
||||
#import "DYManagedColor.h"
|
||||
#import "DYToolState.h"
|
||||
#include "../../ColorManagement/Core/DYColorManagement.hpp"
|
||||
#include <CommonCrypto/CommonDigest.h>
|
||||
#include <cmath>
|
||||
NSDictionary *DYManagedColorDefaults(void){return @{@"version":@2,@"mode":@1,@"input":@109,@"output":@1,@"gamutCompression":@YES,@"engine":@"OpenColorIO-2.5.2",@"config":@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"};}
|
||||
NSDictionary *DYPrimaryColorDefaults(void){return @{@"version":@3,@"mode":@4,@"engine":@"Dayu-CST-f32",@"config":@"primary-parameters-v1"};}
|
||||
BOOL DYPrimaryColorState(NSDictionary *s){return [s isKindOfClass:NSDictionary.class]&&[s[@"version"]isEqual:@3]&&[s[@"mode"]isEqual:@4];}
|
||||
void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut){
|
||||
if(![node[@"type"]isEqual:@"primary"])return;NSMutableDictionary*v=node[@"values"];NSUInteger follow=[node[@"primaryFollow"]unsignedIntegerValue],bit=1;
|
||||
for(NSString *part in @[@"input",@"working",@"output"]){NSString*t=[NSString stringWithFormat:@"cm%@Transfer",part],*g=[NSString stringWithFormat:@"cm%@Gamut",part];if(!v[t]&&!v[g])follow|=bit;if(!v[t])v[t]=@(transfer);if(!v[g])v[g]=@(gamut);bit<<=1;}node[@"primaryFollow"]=@(follow);
|
||||
}
|
||||
void DYFollowPrimaryWorkingSpace(NSMutableDictionary *doc,float transfer,float gamut){for(NSMutableDictionary*node in doc[@"layers"]){NSUInteger follow=[node[@"primaryFollow"]unsignedIntegerValue],bit=1;if(![node[@"type"]isEqual:@"primary"])continue;for(NSString*part in @[@"input",@"working",@"output"]){if(follow&bit){node[@"values"][[NSString stringWithFormat:@"cm%@Transfer",part]]=@(transfer);node[@"values"][[NSString stringWithFormat:@"cm%@Gamut",part]]=@(gamut);}bit<<=1;}}}
|
||||
void DYPrimaryControlChanged(id<PROAPIAccessing> manager,CMTime time,NSString *key){
|
||||
if([manager isKindOfClass:DYToolManager.class]||![@[@"cmworkingTransfer",@"cmworkingGamut"]containsObject:key]||!DYPrimaryColorState(DYReadAssets(manager,time).colorManagement))return;
|
||||
DYUniforms u;DYReadUniforms(manager,time,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(manager,time).document);DYFollowPrimaryWorkingSpace(doc,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(manager,doc,time);
|
||||
}
|
||||
|
||||
NSArray<NSDictionary*> *DYManagedInputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::spaces())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
|
||||
NSArray<NSDictionary*> *DYManagedOutputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::outputs())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
|
||||
BOOL DYManagedColorValid(id state,NSError **error){
|
||||
if(DYPrimaryColorState(state)){BOOL valid=[state isEqual:DYPrimaryColorDefaults()];if(!valid&&error)*error=[NSError errorWithDomain:@"com.dayu.color.cms" code:1 userInfo:@{NSLocalizedDescriptionKey:@"一级 CST 设置版本不匹配。"}];return valid;}
|
||||
BOOL valid=[state isKindOfClass:NSDictionary.class]&&[state count]==7&&[state[@"version"]isEqual:@2]&&[state[@"engine"]isEqual:@"OpenColorIO-2.5.2"]&&[state[@"config"]isEqual:@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"];
|
||||
for(NSString *key in @[@"mode",@"input",@"output",@"gamutCompression"]){id v=[state isKindOfClass:NSDictionary.class]?state[key]:nil;double n=[v isKindOfClass:NSNumber.class]?[v doubleValue]:NAN;valid&=std::isfinite(n)&&n==floor(n);}
|
||||
if(valid){valid=[@[@1,@2,@3]containsObject:state[@"mode"]]&&[@[@0,@1]containsObject:state[@"gamutCompression"]];BOOL input=NO,output=NO;for(NSDictionary *s in DYManagedInputSpaces())input|=[s[@"id"]isEqual:state[@"input"]];for(NSDictionary *s in DYManagedOutputSpaces())output|=[s[@"id"]isEqual:state[@"output"]];valid&=input&&output;}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#import "DYModel.h"
|
||||
#import "DYRenderer.h"
|
||||
#import "DYTheme.h"
|
||||
#import "DYToolState.h"
|
||||
@protocol DYManagedAssetTarget <NSObject>
|
||||
- (NSProgress*)setAssetPath:(NSString*)path forKey:(NSString*)key completion:(void(^)(NSError*))completion;
|
||||
@end
|
||||
@@ -12,40 +13,41 @@
|
||||
NSDictionary *_state;NSString *_inputLUTPath;NSUInteger _selectionGeneration;BOOL _refreshing;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?112:m==1?190:302;}
|
||||
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[NSTextField wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
|
||||
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?82:(m==1||m==4)?110:238;}
|
||||
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[DYThemeLabel wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
|
||||
- (instancetype)initWithManager:(id<PROAPIAccessing>)m renderer:(DYRenderer*)r assetTarget:(id)target {
|
||||
if((self=[super initWithFrame:NSZeroRect])){_manager=m;_renderer=[r retain];_assetTarget=target;self.identifier=@"managedColor";
|
||||
_mode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"色彩管理 · 旧版兼容",@"色彩管理 · 跟随 FCP",@"相机编码 → ACES",@"输入 LUT → ACES"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
|
||||
_mode=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"原有流程(默认)",@"1.8 兼容 · 跟随 FCP",@"1.8 兼容 · 相机 → ACES",@"1.8 兼容 · LUT → ACES",@"一级 CST · 延后输出"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
|
||||
_inputLabel=[cmsLabel(@"输入空间")retain];_outputLabel=[cmsLabel(@"输出目标")retain];
|
||||
_input=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
|
||||
_output=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
|
||||
_gamut=[[NSButton checkboxWithTitle:@"ACES 参考色域压缩" target:self action:@selector(settingsChanged:)]retain];_gamut.font=[NSFont systemFontOfSize:11];
|
||||
_lut=[[NSButton buttonWithTitle:@"选择输入 LUT…" target:self action:@selector(chooseLUT:)]retain];_lut.bezelStyle=NSBezelStyleRounded;
|
||||
_input=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
|
||||
_output=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
|
||||
_gamut=[[DYThemeButton checkboxWithTitle:@"ACES 参考色域压缩" target:self action:@selector(settingsChanged:)]retain];_gamut.font=[NSFont systemFontOfSize:11];_gamut.contentTintColor=DYThemeColor(@"accent");
|
||||
_lut=[[DYThemeButton buttonWithTitle:@"选择输入 LUT…" target:self action:@selector(chooseLUT:)]retain];_lut.bezelStyle=NSBezelStyleRounded;
|
||||
_help=[cmsLabel(@"")retain];_help.textColor=DYThemeColor(@"secondary");_context=[cmsLabel(@"宿主颜色信息将在渲染后显示。")retain];_context.textColor=DYThemeColor(@"secondary");_context.accessibilityLabel=@"当前颜色链路";
|
||||
for(NSView*v in @[_mode,_inputLabel,_input,_outputLabel,_output,_gamut,_lut,_help,_context])[self addSubview:v];[self refreshWithState:nil context:nil];
|
||||
}return self;
|
||||
}
|
||||
- (void)dealloc{[_renderer release];[_state release];[_inputLUTPath release];for(id v in @[_mode,_input,_output,_gamut,_lut,_inputLabel,_outputLabel,_help,_context])[v release];[super dealloc];}
|
||||
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,70,22);_input.frame=NSMakeRect(72,32,w-72,26);_outputLabel.frame=NSMakeRect(2,67,70,22);_output.frame=NSMakeRect(72,63,w-72,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,96);_context.frame=NSMakeRect(2,252,w-4,47);if([_state[@"mode"]integerValue]<2){_help.frame=NSMakeRect(2,36,w-4,90);_context.frame=NSMakeRect(2,132,w-4,54);}}
|
||||
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,62,22);_input.frame=NSMakeRect(64,32,w-64,26);_outputLabel.frame=NSMakeRect(2,67,62,22);_output.frame=NSMakeRect(64,63,w-64,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,42);_context.frame=NSMakeRect(2,198,w-4,36);if([_state[@"mode"]integerValue]<2||DYPrimaryColorState(_state)){_help.frame=NSMakeRect(2,36,w-4,42);_context.frame=NSMakeRect(2,80,w-4,28);}}
|
||||
- (void)refreshWithState:(NSDictionary*)s context:(NSDictionary*)context {
|
||||
_refreshing=YES;NSDictionary *saved=[s copy];[_state release];_state=saved;NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode];
|
||||
NSDictionary *values=s.count?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i];
|
||||
_input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
|
||||
_help.stringValue=mode==0?@"保留当前工程的原有颜色。选择新版后,一级层在 ACEScct 中调色,印片位于输出之前;可撤销或切回兼容方式。":mode==1?@"按宿主实际空间处理,不重复还原或映射。顺序:一级层 → 印片 → SDR 修饰。Rec.2020 宿主暂限一级与印片。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
|
||||
_context.stringValue=context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_refreshing=NO;[self setNeedsLayout:YES];
|
||||
NSDictionary *values=s.count&&!DYPrimaryColorState(s)?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i];
|
||||
_input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode==4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
|
||||
_help.toolTip=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
|
||||
_help.stringValue=mode==0?@"保留原有调色顺序。高级流程按需选择。":mode==4?@"使用一级 CST 设置,在一级与印片之后输出。":mode==1?@"保留 1.8 兼容流程,输入跟随 FCP。":mode==2?@"按所选相机编码解释输入;请核对上游转换。":@"按所选编码解释输入 LUT 的输出。";
|
||||
_context.stringValue=mode==4?@"输入 CST → 工作域调色与印片 → 输出 CST":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_context.toolTip=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主。请核对上游相机 LUT 与颜色符合;已裁切信息无法恢复。":_context.stringValue;_refreshing=NO;[self setNeedsLayout:YES];
|
||||
}
|
||||
- (void)setInputLUTPath:(NSString*)path{NSString *saved=[path copy];[_inputLUTPath release];_inputLUTPath=saved;_lut.title=path.length?path.lastPathComponent:@"选择输入 LUT…";_lut.toolTip=path.length?path:@"选择 LUT,并准确指定其输出编码";_lut.accessibilityLabel=path.length?[@"输入 LUT:" stringByAppendingString:path.lastPathComponent]:@"选择输入 LUT";}
|
||||
- (void)refreshContext{[self refreshWithState:_state context:[_renderer colorContext]];}
|
||||
- (void)writeState:(NSDictionary*)state {
|
||||
if(state&&!DYManagedColorValid(state,nil))return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];
|
||||
if(state&&!DYManagedColorValid(state,nil))return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);if(DYPrimaryColorState(state)&&!DYPrimaryColorState(_state)){DYUniforms u;DYReadUniforms(_manager,a.currentTime,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);for(NSMutableDictionary*node in doc[@"layers"])DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);DYFollowPrimaryWorkingSpace(doc,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(_manager,doc,a.currentTime);}[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];
|
||||
}
|
||||
- (void)modeChanged:(id)sender {if(_refreshing)return;NSInteger mode=_mode.indexOfSelectedItem;_selectionGeneration++;if(mode==3&&(!_inputLUTPath.length||![NSFileManager.defaultManager fileExistsAtPath:_inputLUTPath])){[self refreshWithState:_state context:[_renderer colorContext]];[self selectInputLUTAndEnable:YES];return;}if(!mode){[self writeState:nil];return;}NSMutableDictionary *s=[[_state?:DYManagedColorDefaults() mutableCopy]autorelease];s[@"mode"]=@(mode);[self writeState:s];}
|
||||
- (void)modeChanged:(id)sender {if(_refreshing)return;NSInteger mode=_mode.indexOfSelectedItem;_selectionGeneration++;if(mode==3&&(!_inputLUTPath.length||![NSFileManager.defaultManager fileExistsAtPath:_inputLUTPath])){[self refreshWithState:_state context:[_renderer colorContext]];[self selectInputLUTAndEnable:YES];return;}if(!mode){[self writeState:nil];return;}if(mode==4){[self writeState:DYPrimaryColorDefaults()];return;}NSMutableDictionary *s=[[(_state&&!DYPrimaryColorState(_state)?_state:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@(mode);[self writeState:s];}
|
||||
- (void)settingsChanged:(id)sender {if(_refreshing||!_state)return;NSMutableDictionary*s=[[_state mutableCopy]autorelease];s[@"input"]=_input.selectedItem.representedObject;s[@"output"]=_output.selectedItem.representedObject;s[@"gamutCompression"]=@(_gamut.state==NSControlStateValueOn);[self writeState:s];}
|
||||
- (void)selectInputLUTAndEnable:(BOOL)enable {
|
||||
NSUInteger generation=_selectionGeneration;NSOpenPanel *panel=[NSOpenPanel openPanel];panel.allowedFileTypes=@[@"cube"];panel.allowsMultipleSelection=NO;panel.canChooseDirectories=NO;panel.message=@"选择输入 LUT,再指定 LUT 的输出编码";
|
||||
if([panel runModal]!=NSModalResponseOK||!self.window)return;
|
||||
[(id<DYManagedAssetTarget>)_assetTarget setAssetPath:panel.URL.path forKey:@"input" completion:^(NSError *error){if(error||!enable||!self.window||generation!=_selectionGeneration)return;NSMutableDictionary *s=[[(_state?:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@3;[self writeState:s];}];
|
||||
[(id<DYManagedAssetTarget>)_assetTarget setAssetPath:panel.URL.path forKey:@"input" completion:^(NSError *error){if(error||!enable||!self.window||generation!=_selectionGeneration)return;NSMutableDictionary *s=[[(_state&&!DYPrimaryColorState(_state)?_state:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@3;[self writeState:s];}];
|
||||
}
|
||||
- (void)chooseLUT:(id)sender {[self selectInputLUTAndEnable:NO];}
|
||||
@end
|
||||
@@ -3,7 +3,7 @@
|
||||
id<MTLComputePipelineState>p=[self managedKernel:@"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];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];[_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];}}
|
||||
@@ -29,6 +29,7 @@
|
||||
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
|
||||
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
if(DYPrimaryColorState(state))return [self renderPrimarySource:src destination:dst uniforms:u paths:paths spider:spider tools:tools hostPrimaries:primaries error:error];
|
||||
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"色彩管理输入纹理不可用。");
|
||||
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过色彩管理内存预算。");
|
||||
CGColorSpaceRef srcSpace=DYManagedTileSpace(src,primaries),dstSpace=DYManagedTileSpace(dst,primaries),aces=CGColorSpaceCreateWithName(kCGColorSpaceACESCGLinear),linear709=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
// Regression for the user's failure case: scene grading precedes the main ODT.
|
||||
{
|
||||
DYRenderer *primaryRenderer=[[[DYRenderer alloc]init]autorelease];NSDictionary *v3=DYPrimaryColorDefaults();DYToolDocument *empty=[[[DYToolDocument alloc]init]autorelease];
|
||||
run.need(@"primary-v3-independent-state-valid",DYManagedColorValid(v3,nil)&&DYPrimaryColorState(v3));NSMutableDictionary *bad=DYMutablePlist(v3);bad[@"input"]=@109;run.record(@"primary-v3-rejects-conflicting-global-input",!DYManagedColorValid(bad,nil));
|
||||
DYAssetState *saved=[[[DYAssetState alloc]init]autorelease];saved.colorManagement=v3;NSData *encoded=[NSKeyedArchiver archivedDataWithRootObject:saved requiringSecureCoding:YES error:&error];DYAssetState *decoded=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:encoded error:&error];run.record(@"primary-v3-secure-state-roundtrip",[saved isEqual:decoded]);
|
||||
DYUniforms u=defaults;u.skinProtection.x=0;u.cm.configured=1;u.cm.inputTransfer=28;u.cm.inputGamut=27;u.cm.workingTransfer=10;u.cm.workingGamut=16;u.cm.outputTransfer=1002;u.cm.outputGamut=22;u.cm.toneMapping=1;
|
||||
auto decodeCarrier=[](float x){return x<=.04045f?x/12.92f:powf((x+.055f)/1.055f,2.4f);};auto encodeCarrier=[](float x){return x<=.0031308f?12.92f*x:1.055f*powf(x,1/2.4f)-.055f;};
|
||||
std::vector<DYCompositeRGBA>scene(width*height);float levels[]={.002f,.018f,.18f,1,4,16,32,64};for(size_t i=0;i<scene.size();i++){float v=levels[i%8],alpha=i%5?.5f:1;scene[i]={v*alpha,v*(i%3?.9f:1)*alpha,v*(i%3?.6f:1)*alpha,alpha};}
|
||||
auto sceneInput=[&](std::vector<DYCompositeRGBA> pixels){dycm::Transform::convert(dycm::Space::ACEScg,dycm::Space::SonySLog3Cine).apply(pixels,dycm::Alpha::Premultiplied);Pixels out(pixels.size()*4);for(size_t i=0;i<pixels.size();i++){float a=pixels[i].a;out[i*4]=decodeCarrier(pixels[i].r/a)*a;out[i*4+1]=decodeCarrier(pixels[i].g/a)*a;out[i*4+2]=decodeCarrier(pixels[i].b/a)*a;out[i*4+3]=a;}return out;};
|
||||
Pixels logInput=sceneInput(scene);auto upload=[&](const Pixels&p){[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:p.data() bytesPerRow:width*8];};upload(logInput);
|
||||
auto renderPrimary=[&](DYUniforms values,NSDictionary *doc,NSString *name){NSError *e=nil;BOOL ok=[primaryRenderer renderSource:source destination:destination uniforms:values paths:@{} spider:nil tools:doc colorManagement:v3 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.need(name,ok,@{@"error":reason(e)});return read(destination,gpu);};
|
||||
auto inputReference=[&](dycm::Space target){std::vector<DYCompositeRGBA>r(scene.size());for(size_t i=0;i<r.size();i++){float a=logInput[i*4+3];r[i]={encodeCarrier((float)logInput[i*4]/a)*a,encodeCarrier((float)logInput[i*4+1]/a)*a,encodeCarrier((float)logInput[i*4+2]/a)*a,a};}dycm::Transform::convert(dycm::Space::SonySLog3Cine,target).apply(r,dycm::Alpha::Premultiplied);return r;};
|
||||
auto carrierReference=[&](const std::vector<DYCompositeRGBA>&r){Pixels p(r.size()*4);for(size_t i=0;i<r.size();i++){float a=r[i].a;p[i*4]=decodeCarrier(r[i].r/a)*a;p[i*4+1]=decodeCarrier(r[i].g/a)*a;p[i*4+2]=decodeCarrier(r[i].b/a)*a;p[i*4+3]=a;}return p;};
|
||||
Pixels baseline=renderPrimary(u,empty.document,@"primary-main-input-grade-output-render");
|
||||
// No main output: independently compare the working code values against OCIO.
|
||||
DYUniforms data=u;data.cm.outputEnabled=0;data.cm.toneMapping=0;Pixels intermediate=renderPrimary(data,empty.document,@"primary-DWG-intermediate-without-display-output");Difference di=difference(intermediate,carrierReference(inputReference(dycm::Space::DaVinciIntermediate)));run.record(@"primary-input-goes-directly-to-DWG-DI-not-709",di.maximum<.003&&di.nonfinite==0,measure(di));
|
||||
data.cm.workingTransfer=1;data.cm.workingGamut=2;Pixels cct=renderPrimary(data,empty.document,@"primary-ACEScct-without-display-output");Difference aces=difference(cct,carrierReference(inputReference(dycm::Space::ACEScct)));run.record(@"primary-ACEScct-is-selectable-not-forced",aces.maximum<.003&&aces.nonfinite==0,measure(aces));
|
||||
DYUniforms changed=u;changed.cm.inputTransfer=4;changed.cm.inputGamut=4;Pixels arri=renderPrimary(changed,empty.document,@"primary-input-selection-ARRI");run.record(@"primary-input-selection-is-effective",difference(baseline,arri).maximum>.05);
|
||||
// Neutral additional layers are exact bypasses, with no second display map.
|
||||
NSMutableDictionary *doc=DYMutablePlist(empty.document);for(int i=0;i<4;i++)DYSeedPrimaryWorkingSpace((id)DYInsertTool(doc,@"primary",@"base:primary"),10,16);Pixels neutral=renderPrimary(u,doc,@"primary-four-inherited-neutral-layers");run.record(@"primary-new-layer-inherits-workspace-no-remap",difference(baseline,neutral).maximum==0);
|
||||
// Move the entire exposure correction into an independent layer. The result
|
||||
// must be the same as correcting the root before its one final display map.
|
||||
NSMutableDictionary *one=DYMutablePlist(empty.document),*node=(id)DYInsertTool(one,@"primary",@"base:primary");DYSeedPrimaryWorkingSpace(node,10,16);node[@"values"][@"cmexposure"]=@(-4);DYUniforms reduced=u;reduced.cm.exposure=-4;Pixels beforeOutput=renderPrimary(reduced,empty.document,@"primary-four-stop-root-before-output"),extra=renderPrimary(u,one,@"primary-four-stop-extra-before-output");Difference order=difference(beforeOutput,extra);run.record(@"primary-independent-grade-before-main-output",order.maximum<.002&&order.nonfinite==0,measure(order));
|
||||
auto reducedScene=scene;for(auto &p:reducedScene){p.r/=16;p.g/=16;p.b/=16;}Pixels reducedInput=sceneInput(reducedScene);upload(reducedInput);Pixels knownReduced=renderPrimary(u,empty.document,@"primary-independent-OCIO-reduced-scene-input");Difference high=difference(beforeOutput,knownReduced);run.record(@"primary-highlights-recovered-before-mapping-reference",high.maximum<.008&&high.nonfinite==0,@{@"maxDifference":@(high.maximum),@"scene64afterMinus4":@((float)beforeOutput[7*4]),@"independentReference":@((float)knownReduced[7*4])});upload(logInput);
|
||||
NSMutableArray *patches=[NSMutableArray array];for(int k=0;k<8;k++){size_t i=k*5;float a=logInput[i*4+3];[patches addObject:@{@"index":@(i),@"code":@[@(encodeCarrier((float)logInput[i*4]/a)),@(encodeCarrier((float)logInput[i*4+1]/a)),@(encodeCarrier((float)logInput[i*4+2]/a))],@"expectedMinus4Linear709":@[@((float)beforeOutput[i*4]/a),@((float)beforeOutput[i*4+1]/a),@((float)beforeOutput[i*4+2]/a)]}];}NSData *fixture=[NSJSONSerialization dataWithJSONObject:@{@"patches":patches,@"input":@"Sony S-Log3 / S-Gamut3.Cine code carrier",@"exposure":@(-4)} options:NSJSONWritingPrettyPrinted error:nil];[fixture writeToFile:[runtime stringByAppendingPathComponent:@"primary-host-chart.json"] atomically:YES];
|
||||
// Local working curves are read from the node, including BASIS adapters.
|
||||
node[@"values"][@"cmexposure"]=@0;node[@"values"][@"cmcontrast"]=@.3;Pixels localDI=renderPrimary(u,one,@"primary-local-DI-contrast");node[@"values"][@"cmworkingTransfer"]=@1;node[@"values"][@"cmworkingGamut"]=@2;Pixels localACES=renderPrimary(u,one,@"primary-local-ACES-contrast");run.record(@"primary-local-working-selection-is-effective",difference(localDI,localACES).maximum>.001);
|
||||
node[@"values"][@"cminputTransfer"]=@1;node[@"values"][@"cminputGamut"]=@2;Pixels reinterpret=renderPrimary(u,one,@"primary-local-input-CST-selection");run.record(@"primary-local-input-CST-is-not-overridden",difference(reinterpret,localACES).maximum>.01);
|
||||
// Zero masks and zero mix bypass grade while retaining global input/output.
|
||||
NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle)),*masked=DYMutablePlist(empty.document);DYMaskParameters mp=DYMaskAtTime(mask,kCMTimeZero);mp.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&mp length:sizeof(mp)];masked[@"baseMasks"][@"primary"]=@[mask];Pixels zero=renderPrimary(reduced,masked,@"primary-zero-mask");reduced.cm.mix=0;Pixels zeroMix=renderPrimary(reduced,empty.document,@"primary-zero-grade-mix");run.record(@"primary-zero-mask-and-mix-retain-CST-boundaries",difference(zero,baseline).maximum==0&&difference(zeroMix,baseline).maximum==0);
|
||||
// A half-strength one-stop grade is 1.5x light, before mapping.
|
||||
DYUniforms half=u;half.cm.exposure=1;half.cm.mix=.5;Pixels halfFrame=renderPrimary(half,empty.document,@"primary-linear-light-half-mix");half.cm.exposure=log2f(1.5f);half.cm.mix=1;Pixels halfReference=renderPrimary(half,empty.document,@"primary-linear-light-mix-reference");run.record(@"primary-mix-in-linear-AP1",difference(halfFrame,halfReference).maximum<.003,measure(difference(halfFrame,halfReference)));
|
||||
// Print looks cross into their real ACEScct domain, then return to the chosen
|
||||
// working space. Neutral grade must not make the choice alter the print.
|
||||
DYUniforms print=u;print.filmPrint.x=1;print.filmPrint.y=.6;Pixels printDI=renderPrimary(print,empty.document,@"primary-print-DWG-before-output");print.cm.workingTransfer=1;print.cm.workingGamut=2;Pixels printACES=renderPrimary(print,empty.document,@"primary-print-ACES-before-output");Difference printDelta=difference(printDI,printACES);run.record(@"primary-print-domain-adapts-to-selected-working-space",printDelta.maximum<.005&&difference(printDI,baseline).different>20,measure(printDelta));
|
||||
// The output controls change data output, and the optional display map is last.
|
||||
DYUniforms logOut=u;logOut.cm.outputTransfer=10;logOut.cm.outputGamut=16;logOut.cm.toneMapping=0;Pixels selectedOutput=renderPrimary(logOut,empty.document,@"primary-declared-Log-output");run.record(@"primary-declared-output-controls-restored",difference(intermediate,selectedOutput).maximum==0&&difference(selectedOutput,baseline).maximum>.05);
|
||||
DYUniforms unmapped=u;unmapped.cm.toneMapping=0;Pixels noMap=renderPrimary(unmapped,empty.document,@"primary-no-output-tone-map");run.record(@"primary-tone-mapping-switch-restored",difference(noMap,baseline).maximum>.05);
|
||||
DYUniforms invalid=data;invalid.hslHueA.x=20;NSError *e=nil;BOOL bounded=[primaryRenderer renderSource:source destination:destination uniforms:invalid paths:@{} spider:nil tools:empty.document colorManagement:v3 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.record(@"primary-Log-data-output-rejects-SDR-finishing",!bounded&&e.localizedDescription.length>0);
|
||||
DYUniforms bypass=u;bypass.primarySectionEnabled=0;bypass.hslHueA.x=20;Pixels bypassFrame=renderPrimary(bypass,empty.document,@"primary-main-eye-keeps-other-tools");Pixels oldBypass=render(run,primaryRenderer,source,destination,gpu,bypass,@{},@"primary-eye-unmanaged-reference");run.record(@"primary-main-eye-bypasses-whole-CST-retains-tools",difference(bypassFrame,oldBypass).maximum==0);
|
||||
// Float domain crossings retain negative values, overrange and hidden RGB.
|
||||
DYUniforms linear=u;linear.cm.inputTransfer=linear.cm.workingTransfer=linear.cm.outputTransfer=20;linear.cm.inputGamut=linear.cm.workingGamut=linear.cm.outputGamut=2;linear.cm.toneMapping=0;Pixels extended(width*height*4);for(size_t i=0;i<width*height;i++){float a=i%4?.25f:0;extended[i*4]=a?decodeCarrier(-.03f)*a:.07f;extended[i*4+1]=a?decodeCarrier(.18f)*a:-.02f;extended[i*4+2]=a?decodeCarrier(4.f)*a:.5f;extended[i*4+3]=a;}upload(extended);Pixels exact=renderPrimary(linear,empty.document,@"primary-negative-superwhite-hidden-RGB");run.record(@"primary-float-domain-identity-retains-extended-values",difference(extended,exact).maximum<.002&&difference(extended,exact).nonfinite==0,measure(difference(extended,exact)));linear.cm.exposure=1;Pixels doubled=renderPrimary(linear,empty.document,@"primary-linear-exposure-extended-values");BOOL photometric=YES;for(size_t i=1;i<width*height;i++)if(extended[i*4+3]>0){float a=extended[i*4+3];photometric&=fabs(encodeCarrier((float)doubled[i*4+1]/a)-.36f)<.002&&fabs(encodeCarrier((float)doubled[i*4]/a)+.06f)<.002;}run.record(@"primary-one-stop-exposure-is-linear-light-with-negative-values",photometric,@{@"negative":@(encodeCarrier((float)doubled[4]/.25f)),@"grey":@(encodeCarrier((float)doubled[5]/.25f))});upload(logInput);
|
||||
DYUniforms idle=logOut;idle.texture=25;idle.textureEnabled=0;idle.postLUTStrength=0;idle.extraPostLUTStrengths[0]=.8;idle.extraLookSectionEnableds[0]=0;e=nil;BOOL idleOK=[primaryRenderer renderSource:source destination:destination uniforms:idle paths:@{@"look0":@"/nonexistent/disabled.cube",@"look1":@"/nonexistent/disabled2.cube"} spider:nil tools:empty.document colorManagement:v3 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.record(@"primary-data-output-ignores-disabled-SDR-and-LUT-controls",idleOK&&difference(read(destination,gpu),selectedOutput).maximum==0,@{@"error":reason(e)});
|
||||
// Actual inspector must expose all three sets of selectors in V3.
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=v3;DYWriteAssets(host,assets,kCMTimeZero);DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:primaryRenderer]autorelease];[view refresh];[view setFrame:NSMakeRect(0,0,400,780)];[view layoutSubtreeIfNeeded];NSDictionary *tabs=[view valueForKey:@"tabs"];run.record(@"primary-inspector-no-v2-selector-override",![tabs[@"managedColor"]boolValue]&&[tabs[@"primaryCMS"]boolValue]);NSMenuItem *add=[[[NSMenuItem alloc]init]autorelease];add.representedObject=@"primary";[view addModule:add];NSDictionary *added=[DYReadTools(host,kCMTimeZero).document[@"layers"]lastObject];run.record(@"primary-inspector-add-layer-inherits-workspace",[added[@"values"][@"cminputTransfer"]isEqual:@10]&&[added[@"values"][@"cmoutputGamut"]isEqual:@16]&&[added[@"values"][@"cmtoneMapping"]isEqual:@0]);NSMutableDictionary *followed=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYFollowPrimaryWorkingSpace(followed,1,2);NSDictionary *following=[followed[@"layers"]lastObject];run.record(@"primary-workspace-change-updates-inherited-domains",[following[@"values"][@"cminputTransfer"]isEqual:@1]&&[following[@"values"][@"cmworkingGamut"]isEqual:@2]&&[following[@"values"][@"cmoutputTransfer"]isEqual:@1]);DYWriteTools(host,followed,kCMTimeZero);DYToolManager *local=[[[DYToolManager alloc]initWithHost:host node:following]autorelease];UInt32 workingID=0;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"cmworkingTransfer"])workingID=[d[@"pid"]unsignedIntValue];id<FxCustomParameterActionAPI_v4>action=[local apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:nil];[(id<FxParameterSettingAPI_v6>)local setFloatValue:10 toParameter:workingID atTime:kCMTimeZero];[action endAction:nil];followed=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYFollowPrimaryWorkingSpace(followed,4,4);following=[followed[@"layers"]lastObject];run.record(@"primary-manual-local-space-retains-choice-and-follows-boundaries",[following[@"values"][@"cmworkingTransfer"]isEqual:@10]&&[following[@"values"][@"cminputTransfer"]isEqual:@4]&&[following[@"values"][@"cmoutputGamut"]isEqual:@4]&&[following[@"primaryFollow"]isEqual:@5]);NSDictionary *preset=[view presetSnapshot];run.record(@"primary-complete-preset-stores-v3-state",[preset[@"colorManagement"]isEqual:v3]&&[preset[@"version"]isEqual:@7]);
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"primary-v3.cube"]];e=nil;BOOL exported=[primaryRenderer exportLUT:cube uniforms:logOut paths:@{} spider:nil tools:empty.document colorManagement:v3 error:&e];std::vector<float>table;NSUInteger side=0;BOOL parsed=exported&&DYLUTReadCube(cube.path,table,side,&e);run.record(@"primary-v3-Cube65-declared-encoding",parsed&&side==65&&[[NSString stringWithContentsOfURL:cube encoding:NSUTF8StringEncoding error:nil]containsString:@"V3 input"],@{@"error":reason(e)});
|
||||
// Cube output follows the selected encoding, independent of the monitor.
|
||||
linear.cm.exposure=0;linear.cm.outputGamut=22;float gammaValues[2]={};BOOL gammaExports=YES;int gammaIDs[]={1001,1003};for(int j=0;j<2;j++){linear.cm.outputTransfer=gammaIDs[j];NSURL *target=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:[NSString stringWithFormat:@"primary-gamma-%d.cube",gammaIDs[j]]]];e=nil;BOOL ok=[primaryRenderer exportLUT:target uniforms:linear paths:@{} spider:nil tools:empty.document colorManagement:v3 error:&e];std::vector<float>values;NSUInteger n=0;ok=ok&&DYLUTReadCube(target.path,values,n,&e)&&n==65;gammaExports&=ok;if(ok)gammaValues[j]=values[((32*n+32)*n+32)*4];}run.record(@"primary-Cube-restores-output-gamma-selection",gammaExports&&fabs(gammaValues[0]-powf(.5f,1/2.2f))<.001&&fabs(gammaValues[1]-powf(.5f,1/2.6f))<.001,@{@"Gamma22":@(gammaValues[0]),@"Gamma26":@(gammaValues[1])});
|
||||
upload(input);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
// V3 uses the user's declared working encoding, never a hardcoded display space.
|
||||
float4 cst_float_air(float4 sample, constant CSTParams& params);
|
||||
float4 basis_float_air(float4 sample, constant BasisParams& params);
|
||||
constant CSTParams dyPrimaryAP1To709={2,20,22,20,0};
|
||||
kernel void dyPrimaryCST(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],constant CSTParams& p [[buffer(0)]],uint2 xy [[thread_position_in_grid]]){
|
||||
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0)c.rgb=cst_float_air(float4(c.rgb/c.a,1),p).rgb*c.a;b.write(c,xy);
|
||||
}
|
||||
kernel void dyPrimaryGrade(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],constant DayuRenderParams& p [[buffer(0)]],constant CSTParams& back [[buffer(1)]],uint2 xy [[thread_position_in_grid]]){
|
||||
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0){float4 v=float4(c.rgb/c.a,1);if(p.stages&1)v=cst_float_air(v,p.input);if(p.stages&2){if(p.reserved&8)v=cst_float_air(v,p.basisInput);v=basis_float_air(v,p.basis);if(p.reserved&8)v=cst_float_air(v,p.basisOutput);}if(p.stages&4)v=cst_float_air(v,p.output);if(back.inputTransfer!=back.outputTransfer||back.inputGamut!=back.outputGamut||back.toneMapping)v=cst_float_air(v,back);c.rgb=v.rgb*c.a;}b.write(c,xy);
|
||||
}
|
||||
kernel void dyPrimaryBlend(texture2d<float,access::read> before [[texture(0)]],texture2d<float,access::read> after [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],constant DYCSTMixParams& p [[buffer(2)]],uint2 xy [[thread_position_in_grid]]){
|
||||
if(any(xy>=uint2(output.get_width(),output.get_height())))return;float4 a=before.read(xy),b=after.read(xy);if(!(a.a>0)||!(b.a>0)){output.write(a,xy);return;}float3 ac=cst_float_air(float4(a.rgb/a.a,1),p.toLinear).rgb,bc=cst_float_air(float4(b.rgb/b.a,1),p.toLinear).rgb;
|
||||
float2 uv=(float2(xy)+.5f)/float2(output.get_width(),output.get_height());float w=p.amount;if(h.count)w*=dyToolCoverage(uv,dyToolEncode(cst_float_air(float4(ac,1),dyPrimaryAP1To709).rgb),masks,h,h.section);
|
||||
if(w<=0){output.write(a,xy);return;}if(w>=1){output.write(b,xy);return;}output.write(float4(cst_float_air(float4(mix(ac,bc,w),1),p.fromLinear).rgb*a.a,a.a),xy);
|
||||
}
|
||||
kernel void dyPrimaryCodeOutput(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],uint2 xy [[thread_position_in_grid]]){
|
||||
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0)c.rgb=dyDecode(c.rgb/c.a)*c.a;b.write(c,xy);
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
// Opt-in V3. The root primary owns input/working/output; V1/V2 stay frozen.
|
||||
- (BOOL)renderPrimarySource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools hostPrimaries:(NSInteger)primaries error:(NSError**)error {
|
||||
// The main eye bypasses the whole primary/CST module. Other tools retain
|
||||
// their established unmanaged host workflow rather than inheriting a Log tag.
|
||||
if(u.primarySectionEnabled<.5||DYBaseToolRemoved(tools,@"primary"))return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"一级 CST 输入纹理不可用。");
|
||||
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过一级 CST 内存预算。");
|
||||
DYApplyRemovedBaseTools(&u,tools);BOOL root=u.primarySectionEnabled>.5;BOOL transparent=identityCM(u)&&!DYFilmPrintActive(u);int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut);
|
||||
NSMutableArray*pool=[NSMutableArray array];NSMutableSet*pinned=[NSMutableSet set];id<MTLTexture>current=nil;
|
||||
auto next=[&]()->id<MTLTexture>{for(id<MTLTexture>t in pool)if(t!=current&&![pinned containsObject:t])return t;MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:source.width height:source.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[d newTextureWithDescriptor:td];if(t){[pool addObject:t];[t release];}return t;};
|
||||
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 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};}
|
||||
else{p.stages=2;}
|
||||
id<MTLTexture>before=current;[pinned addObject:before];BOOL ok=dispatch(@"dyPrimaryGrade",&p,sizeof(p),&back,sizeof(back));if(ok)ok=blend(before,masks,values.cm.mix,@"primary");[pinned removeObject:before];return ok;
|
||||
};
|
||||
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;[pinned addObject:before];BOOL ok=transform({wg,wt,2,1,0});float amount=values.filmPrint.y*values.film.mix;if(ok){id<MTLTexture>out=next();ok=out&&[self managedDispatch:@"dyManagedPrint" textures:@[current,cube,out] data:&amount length:4 extra:nullptr extraLength:0 entry:entry error:error];if(ok)current=out;}if(ok)ok=transform({2,1,wg,wt,0});if(ok)ok=blend(before,masks,1,@"film");[pinned removeObject:before];return ok;};
|
||||
// Recover only the pre-existing explicit code-value carrier. No display
|
||||
// transform or host-profile-to-709 conversion precedes the declared input.
|
||||
current=source;id<MTLTexture>carrier=next();uint32_t noLUT=0;if(!carrier||![self managedDispatch:@"dyManagedCarrier" textures:@[current,carrier,entry[@"identity"]] data:&noLUT length:4 extra:nullptr extraLength:0 entry:entry error:error])return NO;current=carrier;
|
||||
if(root&&u.inputSectionEnabled>.5&&!transform({(int)lroundf(u.cm.inputGamut),(int)lroundf(u.cm.inputTransfer),wg,wt,0}))return NO;
|
||||
if(!grade(u,tools[@"baseMasks"][@"primary"],NO))return NO;
|
||||
NSMutableDictionary*finishing=DYMutablePlist(tools);NSMutableSet*scene=[NSMutableSet set];for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"primary"]){transparent&=identityCM(DYToolUniforms(node));if(!grade(DYToolUniforms(node),node[@"masks"],YES))return NO;[scene addObject:ID];}}
|
||||
if(!print(u,tools[@"baseMasks"][@"film"]))return NO;for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"film"]){transparent&=!DYFilmPrintActive(DYToolUniforms(node));if(!print(DYToolUniforms(node),node[@"masks"]))return NO;}}
|
||||
for(NSString*ID in scene)DYRemoveTool(finishing,ID);for(NSMutableDictionary*node in finishing[@"layers"])if([node[@"type"]isEqual:@"film"])node[@"values"][@"filmPrintLook"]=@0;
|
||||
BOOL outputEnabled=root&&u.cm.outputEnabled>.5;int ot=outputEnabled?lroundf(u.cm.outputTransfer):wt,og=outputEnabled?lroundf(u.cm.outputGamut):wg;
|
||||
// Only this stage owns the main display rendering / tone mapping.
|
||||
if(outputEnabled&&!transform(DYCMRender(u.cm).output))return NO;
|
||||
u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYPrimaryActiveFinishing(u,finishPaths,spider,finishing);
|
||||
BOOL display=outputEnabled&&ot>=1001&&ot<=1003;
|
||||
if(!display&&activeFinish.count)return fail(error,@"当前是 Log/线性码值输出。SDR 修饰工具需要显示输出,请选择 Gamma 输出,或关闭这些工具并保存完整预设。");
|
||||
if(!display&&transparent&&!activeFinish.count){current=source;[self managedPreview:current origin:src.imageOrigin entry:entry];}else if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];
|
||||
if(activeFinish.count){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配 SDR 修饰缓冲区。");_managedFinishing=YES;BOOL ok=NO;@try{ok=[self renderSource:tile(current) destination:tile(out) uniforms:u paths:finishPaths spider:spider tools:finishing error:error];}@finally{_managedFinishing=NO;}if(!ok)return NO;current=out;}
|
||||
if(_exporting){if(!transform({22,20,og,ot,0})||!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else{CGColorSpaceRef from=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB),to=DYManagedTileSpace(dst,primaries);DYColorProfile*p=to?[[[DYColorProfile alloc]initWithSource:from target:to error:error]autorelease]:nil;CGColorSpaceRelease(from);if(to)CGColorSpaceRelease(to);if(!p)return fail(error,@"宿主未提供明确的目标颜色空间。");id<MTLTexture>out=next();if(!out||![self managedProfile:p input:current output:out entry:entry error:error])return NO;current=out;}
|
||||
}else{if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];}
|
||||
_managedFinishing=YES;@try{return [self copyTile:tile(current) to:dst entry:entry error:error];}@finally{_managedFinishing=NO;}
|
||||
}
|
||||
@@ -14,6 +14,8 @@
|
||||
- (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
- (NSData*)preview;
|
||||
/// 256-bin luma/R/G/B of the existing 320×180 analysis preview.
|
||||
- (NSData*)histogram;
|
||||
/// 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;
|
||||
|
||||
+24
-4
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#import "DYManagedColor.h"
|
||||
#import "../../ColorManagement/Sources/DYColorManagementGPU.h"
|
||||
#import "../../ColorManagement/Sources/DYColorProfile.h"
|
||||
@@ -83,13 +84,29 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
}
|
||||
for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node))[active addObject:node[@"type"]];return active;
|
||||
}
|
||||
// V3 eligibility is based on active math, not differences in disabled switches.
|
||||
// Keep the historical V2 predicate/render behavior unchanged.
|
||||
static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData *spider,NSDictionary *tools){
|
||||
auto normalize=[](DYUniforms v){
|
||||
float *values=&v.exposure,*flags=&v.exposureEnabled;
|
||||
for(int i=0;i<13;i++){BOOL group=i>=6&&i<=9?v.colorSectionEnabled>.5:v.baseSectionEnabled>.5;if(!group||flags[i]<.5)values[i]=0;flags[i]=1;}
|
||||
for(NSDictionary *section in DYSections())for(NSDictionary *row in section[@"rows"])if(row[@"enabled"]){
|
||||
for(NSDictionary *flag in DYDescriptors())if([flag[@"pid"]isEqual:row[@"enabled"]]&&[flag[@"offset"]integerValue]>=0){float*f=(float*)((uint8_t*)&v+[flag[@"offset"]unsignedIntegerValue]);if(*f<.5&&[row[@"offset"]integerValue]>=0)*(float*)((uint8_t*)&v+[row[@"offset"]unsignedIntegerValue])=[row[@"default"]floatValue];*f=[flag[@"default"]floatValue];}
|
||||
}
|
||||
v.postLUTStrength=1;for(int i=0;i<4;i++){v.extraPostLUTStrengths[i]=1;v.extraLookSectionEnableds[i]=1;}
|
||||
return v;
|
||||
};
|
||||
auto visiblePaths=[](NSDictionary*p,DYUniforms v){NSMutableDictionary*out=[[p mutableCopy]autorelease]?:[NSMutableDictionary dictionary];for(int i=0;i<5;i++)if(v.lookSectionEnabled<.5||(i>0&&v.extraLookSectionEnableds[i-1]<.5)||(i==0?v.postLUTStrength:v.extraPostLUTStrengths[i-1])<=0)[out removeObjectForKey:[NSString stringWithFormat:@"look%d",i]];return out;};
|
||||
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);
|
||||
}
|
||||
@interface DYRenderer(){
|
||||
NSMutableDictionary *_devices,*_luts,*_preparedLUTs;
|
||||
NSSet *_activeLUTPaths;
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview;
|
||||
NSData *_preview,*_lookLUTPreview,*_histogram;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
@@ -98,10 +115,11 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
@end
|
||||
@implementation DYRenderer
|
||||
#include "DYFilmRender.inc.h"
|
||||
#include "DYPrimaryRender.inc.h"
|
||||
#include "DYManagedRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_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{[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram 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];
|
||||
@@ -124,7 +142,8 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
progress.completedUnitCount=2;dispatch_async(dispatch_get_main_queue(),^{NSError *result=progress.cancelled?[NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]:error;if(completion)completion(result);});
|
||||
}});return progress;
|
||||
}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;_lastPreview=0;}}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_histogram release];_histogram=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (NSData*)histogram{@synchronized(_previewLock){return [[_histogram retain]autorelease];}}
|
||||
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
@@ -212,6 +231,7 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
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;
|
||||
if(ok&&pb){@synchronized(_previewLock){
|
||||
[_preview release];_preview=[[NSData alloc]initWithBytes:pb.contents length:320*180*16];
|
||||
[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];
|
||||
// The analysis kernel reads physical texture rows. Its result remains intact
|
||||
// for auto grade; only the browser copy is normalized to top-first bitmap rows.
|
||||
[_lookLUTPreview release];
|
||||
@@ -238,7 +258,7 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
if(ok)[output getBytes:_exportManagedState?(void*)precise.data():(void*)values.data() bytesPerRow:width*(_exportManagedState?16:8) fromRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0];[input release];[output release];if(!ok)return NO;
|
||||
NSMutableString *text=[NSMutableString stringWithString:@"TITLE \"大鱼调色\"\n# 包含 CST 与逐像素颜色;不包含纹理、清晰度和逐画面分析。\nLUT_3D_SIZE 33\nDOMAIN_MIN 0 0 0\nDOMAIN_MAX 1 1 1\n"];
|
||||
for(NSUInteger i=0;i<count;i++){float rgb[3];for(int c=0;c<3;c++){float v=_exportManagedState?precise[i*4+c]:(float)values[i*4+c];rgb[c]=v<=.0031308f?v*12.92f:1.055f*powf(v,1/2.4f)-.055f;if(!std::isfinite(rgb[c]))return fail(err,@"LUT 输出含无效值");}[text appendFormat:@"%.8f %.8f %.8f\n",rgb[0],rgb[1],rgb[2]];}
|
||||
if(_exportManagedState){NSData *metadata=[NSJSONSerialization dataWithJSONObject:_exportManagedState options:NSJSONWritingSortedKeys error:nil];if(metadata)[text insertString:[NSString stringWithFormat:@"# DAYU_CMS_STATE %@\n",[[[NSString alloc]initWithData:metadata encoding:NSUTF8StringEncoding]autorelease]] atIndex:0];[text replaceOccurrencesOfString:@"LUT_3D_SIZE 33" withString:@"LUT_3D_SIZE 65" options:0 range:NSMakeRange(0,text.length)];[text insertString:@"# V2 input: declared camera/LUT code values, or sRGB in host mode. Output: sRGB / Rec.709.\n" atIndex:0];}
|
||||
if(_exportManagedState){NSData *metadata=[NSJSONSerialization dataWithJSONObject:_exportManagedState options:NSJSONWritingSortedKeys error:nil];if(metadata)[text insertString:[NSString stringWithFormat:@"# DAYU_CMS_STATE %@\n",[[[NSString alloc]initWithData:metadata encoding:NSUTF8StringEncoding]autorelease]] atIndex:0];[text replaceOccurrencesOfString:@"LUT_3D_SIZE 33" withString:@"LUT_3D_SIZE 65" options:0 range:NSMakeRange(0,text.length)];if(DYPrimaryColorState(_exportManagedState)){[text insertString:[NSString stringWithFormat:@"# V3 input/output: code values defined by enabled primary CST stages; a disabled primary passes unmanaged host code values.\n# PRIMARY_CST enabled=%d input=%d/%d working=%d/%d output=%d/%d mapping=%d\n",u.primarySectionEnabled>.5,(int)(u.inputSectionEnabled>.5?u.cm.inputTransfer:u.cm.workingTransfer),(int)(u.inputSectionEnabled>.5?u.cm.inputGamut:u.cm.workingGamut),(int)u.cm.workingTransfer,(int)u.cm.workingGamut,(int)(u.cm.outputEnabled>.5?u.cm.outputTransfer:u.cm.workingTransfer),(int)(u.cm.outputEnabled>.5?u.cm.outputGamut:u.cm.workingGamut),(int)u.cm.toneMapping] atIndex:0];}else [text insertString:@"# V2 input: declared camera/LUT code values, or sRGB in host mode. Output: sRGB / Rec.709.\n" atIndex:0];}
|
||||
return [text writeToURL:url atomically:YES encoding:NSUTF8StringEncoding error:err];
|
||||
}}
|
||||
@end
|
||||
@@ -7,3 +7,11 @@ FOUNDATION_EXPORT void DYSetThemeIndex(NSInteger index);
|
||||
FOUNDATION_EXPORT NSDictionary<NSString *, NSColor *> *DYThemePalette(void);
|
||||
FOUNDATION_EXPORT NSColor *DYThemeColor(NSString *role);
|
||||
FOUNDATION_EXPORT NSColor *DYThemeSwatch(NSInteger index);
|
||||
|
||||
// Shared AppKit controls keep native actions, focus, and accessibility.
|
||||
FOUNDATION_EXPORT NSShadow *DYThemeTextShadow(void);
|
||||
FOUNDATION_EXPORT NSDictionary *DYThemeTextAttributes(NSFont *font, NSColor *color);
|
||||
FOUNDATION_EXPORT void DYDrawThemeSurface(NSBezierPath *path, BOOL card);
|
||||
@interface DYThemeLabel : NSTextField @end
|
||||
@interface DYThemeButton : NSButton @end
|
||||
@interface DYThemePopUpButton : NSPopUpButton @end
|
||||
+57
-10
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@1}];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@6}];
|
||||
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
|
||||
}
|
||||
return self;
|
||||
@@ -23,25 +23,27 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
}
|
||||
@end
|
||||
static DYThemeStore *store(void){static DYThemeStore *s;static dispatch_once_t once;dispatch_once(&once,^{s=[DYThemeStore new];});return s;}
|
||||
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙"];}
|
||||
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<5?i:1;}
|
||||
static const double paletteRGB[5][17][3]={
|
||||
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变",@"霓虹炫彩"];}
|
||||
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<7?i:6;}
|
||||
static const double paletteRGB[7][17][3]={
|
||||
{{0.11,0.12,0.14},{0.075,0.08,0.095},{0.17,0.18,0.21},{0.12,0.13,0.15},{0.27,0.29,0.33},{0.2,0.22,0.25},{0.36,0.39,0.44},{0.25,0.28,0.32},{0.21,0.23,0.26},{0.15,0.17,0.2},{0.78,0.83,0.9},{0.55,0.61,0.7},{1.0,1.0,1.0},{0.78,0.82,0.88},{0.96,0.97,0.98},{0.86,0.89,0.92},{0.67,0.72,0.77}},
|
||||
{{0.031,0.086,0.148},{0.025,0.075,0.13},{0.07,0.155,0.235},{0.045,0.12,0.19},{0.115,0.22,0.33},{0.07,0.15,0.24},{0.15,0.33,0.5},{0.08,0.24,0.36},{0.23,0.32,0.41},{0.18,0.26,0.35},{0.38,0.76,1.0},{0.23,0.64,0.97},{0.96,0.98,1.0},{0.62,0.7,0.76},{0.88,0.96,1.0},{0.82,0.9,0.96},{0.58,0.7,0.78}},
|
||||
{{0.11,0.09,0.17},{0.07,0.06,0.12},{0.18,0.14,0.28},{0.13,0.1,0.21},{0.27,0.22,0.42},{0.2,0.16,0.31},{0.43,0.34,0.68},{0.31,0.23,0.52},{0.22,0.18,0.31},{0.15,0.12,0.23},{0.78,0.71,1.0},{0.5,0.42,0.93},{0.95,0.9,1.0},{0.63,0.5,0.95},{0.98,0.95,1.0},{0.9,0.86,0.97},{0.7,0.66,0.82}},
|
||||
{{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}},
|
||||
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}}
|
||||
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}},
|
||||
{{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}},
|
||||
{{.15,.04,.24},{.075,.018,.14},{.20,.055,.29},{.13,.025,.23},{.14,.045,.25},{.18,.07,.30},{.23,.07,.34},{.09,.065,.25},{.27,.17,.39},{.13,.07,.23},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.55,.80,.90},{.95,.97,1},{.86,.91,.96},{.72,.78,.85}}
|
||||
};
|
||||
NSColor *DYThemeSwatch(NSInteger index){static const double values[5][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28}};index=MAX(0,MIN(4,index));return rgb(values[index][0],values[index][1],values[index][2]);}
|
||||
void DYSetThemeIndex(NSInteger index){if(index<0||index>4)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
|
||||
NSColor *DYThemeSwatch(NSInteger index){static const double values[7][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36},{.65,.38,1}};index=MAX(0,MIN(6,index));return rgb(values[index][0],values[index][1],values[index][2]);}
|
||||
void DYSetThemeIndex(NSInteger index){if(index<0||index>6)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
|
||||
NSDictionary<NSString *,NSColor *> *DYThemePalette(void){
|
||||
static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSMutableArray *all=[NSMutableArray array];
|
||||
for(NSInteger index=0;index<5;index++){
|
||||
for(NSInteger index=0;index<7;index++){
|
||||
const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary];
|
||||
for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]);
|
||||
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):DYThemeSwatch(index);
|
||||
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];[all addObject:[[d copy]autorelease]];
|
||||
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):index==6?rgb(.08,.79,.94):DYThemeSwatch(index);
|
||||
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.01,.16,.20);d[@"cardEnd"]=rgb(.035,.12,.25);d[@"border"]=[rgb(.47,.37,.88)colorWithAlphaComponent:.55];} [all addObject:[[d copy]autorelease]];
|
||||
}palettes=[all copy];
|
||||
});return palettes[DYThemeIndex()];
|
||||
}
|
||||
@@ -50,3 +52,48 @@ NSColor *DYThemeColor(NSString *role){
|
||||
NSMutableDictionary *all=[NSMutableDictionary dictionary];for(NSString *key in DYThemePalette())all[key]=[NSColor colorWithName:[@"Dayu." stringByAppendingString:key] dynamicProvider:^NSColor *(NSAppearance *appearance){return DYThemePalette()[key];}];colors=[all copy];
|
||||
});return colors[role]?:NSColor.whiteColor;
|
||||
}
|
||||
|
||||
NSShadow *DYThemeTextShadow(void) {
|
||||
NSWorkspace *workspace=NSWorkspace.sharedWorkspace;
|
||||
if(DYThemeIndex()!=5||workspace.accessibilityDisplayShouldIncreaseContrast||workspace.accessibilityDisplayShouldReduceTransparency)return nil;
|
||||
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[DYThemeColor(@"accent")colorWithAlphaComponent:.30];shadow.shadowBlurRadius=1.8;shadow.shadowOffset=NSZeroSize;return shadow;
|
||||
}
|
||||
NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {
|
||||
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:@{NSFontAttributeName:font,NSForegroundColorAttributeName:color}];
|
||||
NSShadow *shadow=DYThemeTextShadow();if(shadow)attributes[NSShadowAttributeName]=shadow;return attributes;
|
||||
}
|
||||
void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
|
||||
NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background";
|
||||
if(DYThemeIndex()==6&&!card){NSGradient *g=[[[NSGradient alloc]initWithColors:@[palette[role],rgb(.035,.035,.21),palette[@"backgroundEnd"]]]autorelease];[g drawInBezierPath:path angle:25];}
|
||||
else if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];}
|
||||
else {[palette[role]setFill];[path fill];}
|
||||
}
|
||||
@implementation DYThemeLabel
|
||||
- (void)drawRect:(NSRect)rect {[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[super drawRect:rect];[NSGraphicsContext restoreGraphicsState];}
|
||||
@end
|
||||
@interface DYThemeButtonCell : NSButtonCell @end
|
||||
@implementation DYThemeButtonCell
|
||||
- (NSRect)drawTitle:(NSAttributedString*)title withFrame:(NSRect)frame inView:(NSView*)view {
|
||||
if(DYThemeIndex()<5)return [super drawTitle:title withFrame:frame inView:view];
|
||||
NSMutableAttributedString *gold=[[title mutableCopy]autorelease];[gold addAttributes:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,gold.length)];return [super drawTitle:gold withFrame:frame inView:view];
|
||||
}
|
||||
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view {
|
||||
if(DYThemeIndex()<5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];if(DYThemeIndex()==6&&[view.identifier isEqual:@"primaryAction"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[DYThemePalette()[@"activeTop"],DYThemePalette()[@"activeBottom"]]]autorelease];[g drawInBezierPath:path angle:0];}else DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke];
|
||||
}
|
||||
@end
|
||||
@implementation DYThemeButton
|
||||
+ (Class)cellClass {return DYThemeButtonCell.class;}
|
||||
@end
|
||||
@implementation DYThemePopUpButton
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
if(DYThemeIndex()<5){[super drawRect:rect];return;}
|
||||
NSRect bounds=NSInsetRect(self.bounds,1,2);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);
|
||||
[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];
|
||||
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45])];NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingTail;attributes[NSParagraphStyleAttributeName]=paragraph;
|
||||
CGFloat y=NSMidY(self.bounds)-(self.font?:[NSFont systemFontOfSize:11]).pointSize*.62;
|
||||
[(self.pullsDown?[self itemAtIndex:0].title:(self.selectedItem.title?:@""))drawInRect:NSMakeRect(9,y,MAX(0,self.bounds.size.width-29),18) withAttributes:attributes];
|
||||
[@"⌄" drawInRect:NSMakeRect(self.bounds.size.width-20,y,13,18) withAttributes:attributes];
|
||||
if(self.window.firstResponder==self){[DYThemeColor(@"accent")setStroke];path.lineWidth=2;[path stroke];}
|
||||
}
|
||||
@end
|
||||
@@ -12,7 +12,7 @@
|
||||
- (void)toolMask:(NSButton*)sender{if(sender.tag<0||sender.tag>=_cards.count)return;[(DYToolMaskPanel*)_cards[sender.tag][@"maskPanel"]addMenu:sender];}
|
||||
- (void)repeatTool:(NSButton*)sender{
|
||||
if(sender.tag<0||sender.tag>=_cards.count)return;id<PROAPIAccessing>host=_embedded?[(DYToolManager*)_manager host]:_manager;id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];
|
||||
NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSDictionary *node=DYInsertTool(doc,type,anchor);if(!node)return;addedID=[node[@"id"]copy];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release];
|
||||
NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSMutableDictionary *node=(id)DYInsertTool(doc,type,anchor);if(!node)return;if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}addedID=[node[@"id"]copy];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release];
|
||||
}
|
||||
- (void)addModule:(NSMenuItem *)sender{
|
||||
if(_embedded)return;NSString *type=sender.representedObject;for(NSUInteger i=0;i<_cards.count;i++)if([_cards[i][@"section"][@"key"]isEqual:type]){NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=i;[self repeatTool:source];return;}
|
||||
@@ -51,4 +51,4 @@
|
||||
|
||||
- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;}
|
||||
|
||||
- (void)resetRepeatedTool{if(!_embedded)return;id<PROAPIAccessing>host=[(DYToolManager*)_manager host];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=fresh[@"values"];node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];}
|
||||
- (void)resetRepeatedTool{if(!_embedded)return;id<PROAPIAccessing>host=[(DYToolManager*)_manager host];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];}
|
||||
@@ -78,6 +78,7 @@ BOOL DYValidToolDocument(NSDictionary *doc){
|
||||
NSMutableSet *ids=[NSMutableSet set];for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids))return NO;}
|
||||
NSMutableDictionary *descriptors=[NSMutableDictionary dictionary];for(NSDictionary *d in DYDescriptors())descriptors[d[@"key"]]=d;
|
||||
for(NSDictionary *node in doc[@"layers"]){if(![node isKindOfClass:NSDictionary.class]||!validID(node[@"id"])||[ids containsObject:node[@"id"]]||![DYToolTypes()containsObject:node[@"type"]]||![node[@"values"]isKindOfClass:NSDictionary.class]||[node[@"values"]count]>descriptors.count||![node[@"paths"]isKindOfClass:NSDictionary.class]||[node[@"paths"]count]>6||!validMasks(node[@"masks"],ids))return NO;[ids addObject:node[@"id"]];
|
||||
if(node[@"primaryFollow"]&&(![node[@"type"]isEqual:@"primary"]||!finiteNumber(node[@"primaryFollow"])||[node[@"primaryFollow"]doubleValue]!=floor([node[@"primaryFollow"]doubleValue])||[node[@"primaryFollow"]integerValue]<0||[node[@"primaryFollow"]integerValue]>7))return NO;
|
||||
for(NSString *key in node[@"values"]){NSDictionary *d=descriptors[key];id v=node[@"values"][key];if(!d||!finiteNumber(v)||[v doubleValue]<[d[@"min"]doubleValue]||[v doubleValue]>[d[@"max"]doubleValue]||(d[@"values"]&&![d[@"values"]containsObject:@((int)llround([v doubleValue]))]))return NO;}
|
||||
for(id key in node[@"paths"]){id p=node[@"paths"][key];if(![@[@"input",@"look0",@"look1",@"look2",@"look3",@"look4"]containsObject:key]||![p isKindOfClass:NSString.class]||[p length]>8192||![p isAbsolutePath]||![[p pathExtension].lowercaseString isEqual:@"cube"])return NO;}if(node[@"spider"]&&(![node[@"spider"]isKindOfClass:NSData.class]||!DYSpiderMeshIsValid(node[@"spider"])))return NO;
|
||||
}
|
||||
@@ -137,7 +138,7 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
|
||||
- (CMTime)currentTime{return _time;}
|
||||
- (NSDictionary*)node{return DYToolWithID(_pending?:DYReadTools(_host,_time).document,_nodeID);}
|
||||
- (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{NSDictionary *n=[self node];DYUniforms u=DYToolUniforms(n?:@{@"type":_type});for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;}
|
||||
- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){n[@"values"][d[@"key"]]=@(v);return YES;}return NO;}
|
||||
- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){NSString *key=d[@"key"];if(n[@"primaryFollow"]&&([key hasSuffix:@"Transfer"]||[key hasSuffix:@"Gamut"])){NSUInteger bit=[key hasPrefix:@"cminput"]?1:[key hasPrefix:@"cmworking"]?2:[key hasPrefix:@"cmoutput"]?4:0;n[@"primaryFollow"]=@([n[@"primaryFollow"]unsignedIntegerValue]&~bit);}n[@"values"][key]=@(v);return YES;}return NO;}
|
||||
- (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;}
|
||||
- (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;}
|
||||
@end
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.0</string>
|
||||
<string>1.8.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>55</string>
|
||||
<string>62</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.8.0</string>
|
||||
<string>1.8.3</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.0</string>
|
||||
<string>1.8.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>55</string>
|
||||
<string>62</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
+19
-33
@@ -1,51 +1,37 @@
|
||||
# 大鱼调色 FxPlug4 交接
|
||||
# 大鱼调色开发交接
|
||||
|
||||
2026-11-02 当前正式安装为 **1.7.3(49)**。本机已复现“更多空间”灰色区域并定位到SDK提供的外层contentView原点偏移;新增坐标对齐修正,首次打开无需绿色按钮。411项原生、27项几何、23项浏览库检查及本机FCP12.4热/冷重开和缩放通过,目标MacBook/FCP12.3仍待使用者复测。详见[修复与边界](research/BrowserMoreSpace1.7.3.md)、[RECOVERY.md](RECOVERY.md)及 `verification/Delivery.json` / `Package.json` / `Release.json`。保留1.7.1 Cube文字行兼容及1.7.0更新/公测诊断。以下保留1.6.0交接历史。
|
||||
2026年11月4日,Asia/Shanghai。本轮正式版本 **1.8.3(62)**,在1.8.2基础上新增炫彩主题与曲线直方图。此前完整CMS、黑金及发布流程交接已逐字节归档到 research/handoffs/DayuColorThrough1.8.2-20261104.md;其旧版本号与黑金默认要求属于历史,用户本轮视觉反馈优先。
|
||||
|
||||
## 1.6.0交接历史
|
||||
实际工程 /Volumes/备份/大鱼调色/大鱼调色;Xcode工程“大鱼调色.xcodeproj”,Wrapper Application / Release;检查器为Objective-C++/AppKit。平台Apple Silicon/macOS14.6+,本机Xcode27.1、FxPlug4.3.5。唯一正式安装 /Library/Plug-Ins/FxPlug/大鱼调色.app,主ID com.dayu.color,内部 com.dayu.color.XPC。固定缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。
|
||||
|
||||
后续主 APP 优化入口:[大鱼调色主APP开发交接.md](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),包含自动更新、登录验证、生产接口只读盘点与待定产品规则;其中自动更新与公测诊断已在1.7.0完成,登录与授权仍未实施。
|
||||
源码远程 https://dayu.media/git/dayu/dayu-color.git,main;实际编译源码 **3fd015224037df944b428684c43ec8ec7accea85**。版本标签 v1.8.3-neon-histogram-20261104;完整标签提交及PKG/Release摘要见最终 verification/Package.json、Release.json、NeonRecovery1.8.3.json。标签包含Package.json,后续发布回读另作main提交,不移动已有标签。无LFS/子模块。
|
||||
|
||||
2026-11-02,最终正式版 **1.6.0(39)**。本次完成Color Finale本机胶片五组、通道混合器及用户补充的全部八种印片;去掉MOEF作者/网站两行、降低模板格式,并追加一级自动映射默认开启和主标题链接。
|
||||
## 用户最新视觉要求
|
||||
|
||||
## 正式身份与恢复
|
||||
用户否决了候选60“大片紫色”,又否决候选61“深蓝灰与青色主题近似”。最终62使用分模块双色渐变表面:一级紫红、蜘蛛盘青蓝、基础珊瑚玫红、肤色橙红、HSL绿青、曲线青蓝等。卡片、标题与图标都跟随模块色相;背景为有色相的紫/蓝/青渐变,不再使用深蓝灰方案。白色正文,洋红到青色的重点按钮与滑杆。不要在后续调整中自动恢复全紫或统一蓝灰。
|
||||
|
||||
- 唯一APP:`/Library/Plug-Ins/FxPlug/大鱼调色.app`;ID `com.dayu.color` / `com.dayu.color.XPC`,团队B3W25FX5H5。
|
||||
- 实际编译源码:`e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted;签名、票据、Gatekeeper及正式进程路径通过。
|
||||
- 远程:`https://dayu.media/git/dayu/dayu-color.git`,main,最终标签 `v1.6.0-print-looks-20261102`。完整标签SHA及PKG/Release元数据以 `verification/Release.json` 为准;实际编译SHA与文档交付SHA分别记录。
|
||||
- 模板:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`,ozml5.11 / Motion5.4.5,SHA `fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250`。
|
||||
- Apple Silicon/macOS14.6或更新;FCP12.4已验收,旧FCP未实机覆盖。不依赖ColorFinale安装、REA缓存或父插件;无LFS/子模块。
|
||||
主题追加ID6“霓虹炫彩”;旧0–5不改编号,未保存偏好默认6,明确旧选择保留。本机已在正式FCP切到6,冷重开保持。偏好域com.dayu.color.preferences/themeIndex;主题不写入工程或预设。大面积表面均为不透明静态渐变,无持续动画,炫彩文字不发光。
|
||||
|
||||
## 行为与参数
|
||||
## 直方图实现与边界
|
||||
|
||||
胶片为减色、晕光、辉光、颗粒、暗角、印片六页。印片默认无:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,独立强度。通道混合器为RGB三输出×三输入,保持亮度/饱和度和混合强度。两工具沿用启停、折叠、复位、蒙版、数量标记、区域跟踪、相邻独立层;旧索引、Uniform前缀、LUT、蜘蛛盘和轨迹保留。
|
||||
DYHistogram.h统计既有320×180浮点分析缓存,在渲染工作线程生成不可变256档亮度/R/G/B快照,主线程只绘制。透明、NaN、无穷像素不计;范围外归端点;各通道共用峰值并作平方根高度。RGB页叠加4通道,单色页只绘对应通道,直方图默认开启、可显隐;新建检查器重置显示开关,不写参数/撤销/预设。
|
||||
|
||||
印片追加在五处理后、全胶片混合/原蒙版前;Rec.709线性→AP1/D60→ACEScct→65³原LMT四面体→线性Rec.709。不包含原版任意完整CMS/ODT迁移。旧1296字节前缀保留,追加filmPrint共1312字节;预设v6读v1–v5。纯印片、矩阵和减色可导出Cube;空间/时间效果和蒙版限制保留。原版CI半透明链与产品预乘合同的已测差异详见研究和完整对照报告。
|
||||
原流程分析源为一级CST/输入LUT后;新CMS为显示输出转换后、SDR修饰前。**不是最终输出示波器,不保证每个局部曲线层的即时输入。** 显示编码亮度是Rec.709系数加权码值,并非场景线性亮度/HDR测量。最多每0.5秒更新,依赖宿主渲染;无缓存显示“等待画面”。工具提示列明来源/采样范围。没有改变GPU数学、Uniform、参数ID、CMS、模板或预设格式。
|
||||
|
||||
MOEF仅发布自定义检查器与混合,无作者/网站Rig。全局技能检查器对5.11返回未知版本guard,如实保存;项目级真实原生样本字段验证与当前FCP加载/渲染分别通过。
|
||||
关键文件:DYTheme.mm、DYInspector.mm、DYHistogram.h、DYRenderer.h/mm、DYManagedRender.inc.h、DYCompactUIDiagnostics.inc.h。独立层共用renderer且各自观察其通知,缓存按renderer隔离,失效时清空旧直方图。勿新增定时器、全分辨率读取或UI线程像素统计。
|
||||
|
||||
FCP新效果、新加一级层及全部还原的自动映射为开启;主标题链接为“更多插件访问 https://dayu.media”,点击已实际打开网站。原生注册默认维持历史0,新MOEF显式value1/default0;旧独立一级层省略值保持0。FCP沿用模板默认的旧主效果实测会变为开启,三组旧预设仅此0→1,其余277项及全部paths/spider/tools载荷保持。不能宣称更改模板默认后旧主效果完全逐字节不变;新手动关闭后已验证冷重开保持。
|
||||
## 正式验证
|
||||
|
||||
## 验收证据
|
||||
605项正式原生检查通过;FCP12.4实看最终多色表面、RGB/红/绿/蓝及显隐、色块与真实运动视频的分布更新;最终冷重开主题保持、颜色设置收起、直方图拿到57,600有效采样。完整原预设8,590字节在恢复测试点及最终冷重开后逐字节一致,SHA-256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。
|
||||
|
||||
正式395项原生检查、四尺寸136项原版印片对照通过,固定容差0.0001,最大线性RGB绝对差0.000004828。最终Metal与完整八外观验收的36候选相同。36候选逐个选择八种印片、两层不同印片/强度、椭圆蒙版100键跟踪、折叠标记、删除撤销重做及三段300帧ProRes通过;最终39保留全部自定义载荷,并完成新默认、实际链接、手动开关冷重开8668字节一致及新增1080p100帧正式导出。完整用户文件只在本机fcp-qa缓存,不进Git或PKG。
|
||||
候选60期间在图表中心添加的masterX0=0.5点在61冷重开后仍保留,最终通过原生载入预设恢复;不能把该主动交互产生的参数差异算作主题修改。拖动/删除没有单独完整验收,不宣称全手势覆盖。无VoiceOver、辅助显示选项矩阵或Instruments全性能采样。SwiftUI扫描器无Swift文件,记录不适用。详细证据见 HostNeon1.8.3.json及 research/ui-neon-20261104/validation.md。
|
||||
|
||||
- 最终安装:`verification/Delivery.json` / `InstalledSelfTest.json`。
|
||||
- 最终汇总:`verification/HostPrintLooks1.6.0.json`。
|
||||
- 默认/链接/保存:`verification/HostPrimaryDefaults1.6.0.json`。
|
||||
- 八外观完整宿主操作:`verification/HostPrintLooksBuild36.json`。
|
||||
- 算法/原版边界:`research/PrintLooks1.6.0.md` / `verification/PrintLooksReference.json`。
|
||||
- 独立恢复:`verification/PrintLooksRecovery.json`,最终编译节点294文件全字节、full/strict fsck、Release构建395项和模板重建通过。
|
||||
- 最终安装包/上传/标签恢复/清理:`verification/Package.json`、`Release.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
APP公证706a58bb-2fa4-4b1e-b392-de60d93aef49,Accepted;正式安装签名/票据/Gatekeeper和实际FCP服务路径通过。发行包由PKG工坊制作并展开验包;本轮APP直接正式安装验收,没有再次执行PKG系统安装脚本。PKG与Release完成状态以相应最终报告为准。未更改NAS后端、网站文章或自动更新清单。
|
||||
|
||||
最终PKG由PKG工坊签名、公证、票据与20项展开验包;不再运行系统安装器,APP已有独立正式安装和宿主验收。包与Release下载校验值以Package/Release报告为准。
|
||||
## 继续开发与交付
|
||||
|
||||
## 接续方法
|
||||
保护nil/v2/v3色彩流程、预设v7及模板默认,不因UI改动修改CMS。高级“颜色设置”仍默认收起,开关不改模型。详细数学与恢复依赖按上述历史完整交接和RECOVERY.md。
|
||||
|
||||
固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。更改模型后运行 `python3 tools/build_template.py --refresh-model --overwrite`,再 `python3 tools/verify_template.py`;更新SkillAudit及摘要。Release用Wrapper Application方案,按全局产品锁/仓库锁约定交付;仅正式已公证位置做用户可见测试。证书/私钥需独立恢复。
|
||||
tools/checkpoint.py对明确文件提交/推送并核验main,自带仓库锁。tools/deliver.py取得产品锁,保持HEAD直到Delivery.json写入实际编译SHA;正式安装验收通过才输入complete。Packaging/build_pkg.py与Packaging/publish_beta.py复用PKG工坊,最终版本包不进入Git。草稿附件404先确认已上传,使用正常已登录浏览器完整下载后传--verified-download,不重复POST、不提前发布。
|
||||
|
||||
历史35/37/38候选未发布;36的已验PKG在新需求到达后移除,未上传。37公证等待中停止了本地等待,保留ID查询,未重新上传相同产物。38正式验收发现FCP默认行为,39已记录实际边界。既有历史发行包与标签保留。1.5完整交接归档见 `research/handoffs/DayuColorThrough1.5.0-20261102.md`。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
源代码、历史发行包、私人QA媒体与预设保留。只清理本任务识别的生成APP、旧安装备份、提交ZIP、恢复clone与下载副本;不能扩大为整盘清理。密钥/证书不在Git,发布时重新验证,身份与锁按本机全局约定。
|
||||
在新工单中引用
屏蔽一个用户