比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
5d9a4ad707 | ||
|
|
7113e49fbb | ||
|
|
90d6022520 | ||
|
|
c664991aa1 | ||
|
|
0743c75a45 | ||
|
|
7bb14ea8da | ||
|
|
4e77cebd5e | ||
|
|
fd25de68fe | ||
|
|
46fb091479 | ||
|
|
0cc51149a6 | ||
|
|
d635e09ff3 | ||
|
|
e5affd3f09 | ||
|
|
96fa0a49a5 | ||
|
|
378cd2b6ec | ||
|
|
378956e130 | ||
|
|
1e7b7682c1 | ||
|
|
1a33ab335b | ||
|
|
f97320bbee | ||
|
|
b243751f86 | ||
|
|
2b2d657de7 | ||
|
|
ab7cb759e5 | ||
|
|
7d895750cf | ||
|
|
e7fa8e6cf5 | ||
|
|
85b6590944 | ||
|
|
06d531c443 | ||
|
|
eeeee102cd | ||
|
|
f575c01893 | ||
|
|
a249436776 | ||
|
|
b640b5da06 | ||
|
|
7814a03f95 | ||
|
|
301b31438e | ||
|
|
100941fab3 | ||
|
|
26a888f453 | ||
|
|
b4dc7e3267 | ||
|
|
f664887de3 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,7 @@
|
||||
修复模块折叠时蒙版控件没有一起收起的问题,展开后恢复已有蒙版面板。原模块和独立叠层都遵循自身折叠状态。
|
||||
|
||||
标题栏的蒙版按钮旁新增数量标记;无蒙版时隐藏,已停用的蒙版也计入已添加数量。折叠后数量仍可见,删除和撤销会即时更新,便于辨认哪一层有蒙版。
|
||||
|
||||
正式路径293项既有原生检查通过。FCP12.4验证原模块/独立层分别折叠和展开、2/1数量、删除至0及撤销、保存冷重开;完整预设逐字节一致,用户现有286个轨迹键保留。仅改变布局及标题状态,不修改调色渲染、跟踪算法或数据结构;未另做Motion/Intel实机验收。
|
||||
|
||||
版本1.4.3(33),Apple Silicon,macOS14.6起。APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`;APP公证 `e755670d-8fb3-46d2-95c3-1206f014d16d`、PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` 均Accepted,签名、票据、Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,包内不含用户预设、媒体或LUT。历史标签和发行包保留。
|
||||
@@ -0,0 +1,7 @@
|
||||
新增通道混合器:RGB三输出矩阵、保持亮度、保持饱和度和混合强度。新增胶片模拟:减色、晕光、辉光、颗粒、暗角五组,独立启停;颗粒支持固定种子与1–5帧保持。新模块均支持蒙版、区域跟踪、相邻初始化叠层和完整预设保存,既有调色链与旧工程数据保留。
|
||||
|
||||
参考本机Color Finale 2.16.2组件独立实现,产品运行和构建不加载原厂二进制。减色/颗粒接入既有sRGB边界,其余在线性纹理上;本版不含八种ACES印片外观,不承诺原版任意ACES链完全等价。纯矩阵及减色可导出Cube,活跃空间/时间效果或蒙版会提示无法保存为静态Cube。
|
||||
|
||||
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证用户旧234参数、资产路径、蜘蛛盘和287键蒙版载荷保持,新增层/蒙版/折叠及删除撤销重做通过。正式ProRes导出确认颗粒两帧保持,组合与颗粒完整预设冷重开前后逐字节一致,三项目FCPXML回导通过。Motion、Intel未实机验收。
|
||||
|
||||
版本1.5.0(34),Apple Silicon,macOS14.6起。APP实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`;APP公证 `164abf2b-4e67-4504-b72a-04122da9e381`、PKG公证 `05f849da-5567-4351-9556-742d17b95723` 均Accepted,签名、票据、Gatekeeper和20项展开验包通过。包 `大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,包内不含用户预设、媒体或LUT。APP已独立安装并在FCP验收;PKG仅展开验包,未再次运行系统安装器。历史标签和发行包保留。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 大鱼调色 1.6.0(39)
|
||||
|
||||
胶片模拟新增“印片”页,包含Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30八种外观与独立强度,默认无。保留现有减色、晕光、辉光、暗角、颗粒、通道混合器、调色、蒙版、跟踪和相邻独立层。完整预设v6兼容v1–v5。
|
||||
|
||||
按用户要求删除MOEF作者/网站两行;输出ozml5.11 / Motion5.4.5格式。FCP新效果、全部还原和新加一级层的自动映射默认开启,主标题新增可点击的“更多插件访问 https://dayu.media”。FCP沿用模板默认的旧主效果也会跟随开启,手动关闭可保存并冷重开保持。
|
||||
|
||||
Apple Silicon,macOS14.6或更新。FCP12.4已验证;旧版FCP尚未实机覆盖,降低模板格式不等于保证所有旧版宿主兼容。
|
||||
|
||||
395项正式原生检查及独立恢复构建通过;四尺寸136项原版印片颜色函数对照通过,最大线性RGB绝对差0.000004828。完成八外观、独立印片层、100键蒙版跟踪、折叠/撤销重做、四段共400帧ProRes导出及冷重开检查。39版三组旧印片预设仅自动映射0→1,其余277值及完整自定义载荷保持;手动关闭/独立层开启的8668字节预设冷重开逐字节一致。
|
||||
|
||||
正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,团队B3W25FX5H5。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`;APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。当前包含正式APP及模板,不含用户媒体、LUT库或预设。安装包20项展开验包通过,本轮未再次运行系统安装器,APP已有独立正式安装及宿主验收。
|
||||
|
||||
安装包 `大鱼调色-1.6.0.pkg`,40,833,847字节;SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`。PKG由Developer ID Installer签名、公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,票据和Gatekeeper通过。
|
||||
@@ -0,0 +1,15 @@
|
||||
# 大鱼调色 1.6.1(44)
|
||||
|
||||
主 APP 改为深色产品介绍界面,发布地址 https://dayu.media 位于顶部。展示完整调色、LUT、胶片和局部蒙版/叠层特色。
|
||||
|
||||
启动自动检查并提交 PluginKit 注册,核对实际内嵌组件路径。成功后在状态卡显示清晰的3→2→1秒倒计时再退出;查看功能介绍可保留窗口。打开 FCP 检查会保留窗口,由用户确认画面和调节后点击“已确认正常,退出”。注册状态与宿主功能确认分开。
|
||||
|
||||
按用户要求关闭外层 APP 沙盒。保留 Developer ID、Hardened Runtime、可信时间戳、公证及票据。本轮未加入登录、授权、加密、自动更新或后端模块,调色/渲染/Metal/模板未改。
|
||||
|
||||
Apple Silicon,macOS14.6或更新。正式安装位置 /Library/Plug-Ins/FxPlug/大鱼调色.app,主/服务ID为com.dayu.color、com.dayu.color.XPC,团队B3W25FX5H5。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。
|
||||
|
||||
正式路径395项原生检查通过;已有登记、缺失登记重建、精确唯一路径回读、3秒退出、保留介绍和重复检查通过。FCP实际使用按主APP指引由用户确认,本说明不将登记成功等同渲染验收。安装包已展开核验,本轮未再次运行系统安装器。
|
||||
|
||||
APP公证23d7b69c-5585-435d-ad07-faee061e0ccb Accepted;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted。最终PKG由Developer ID Installer签署,签名、票据及Gatekeeper通过。
|
||||
|
||||
安装包 大鱼调色-1.6.1.pkg,40,854,422字节;SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`。包含正式APP和既有FCP模板,不含用户媒体、LUT库或预设。
|
||||
+1
-1
@@ -77,7 +77,7 @@ def main():
|
||||
badgeImage=str(ROOT / "design/dayu-color-app-icon-v1.png"), authorContact="https://dayu.media"),
|
||||
pages=dict(welcome="安装大鱼调色 " + version + ",包含原生 FxPlug 调色插件和 Final Cut Pro 效果入口。",
|
||||
readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。",
|
||||
license="", conclusion="大鱼调色已安装。请完成插件 APP 的系统提示,随后退出并重新打开 Final Cut Pro / Motion。\n如果效果未出现,可在访达打开 /Library/Plug-Ins/FxPlug/大鱼调色.app 后再次启动宿主。"))
|
||||
license="", conclusion="大鱼调色已安装。主 APP 自动注册插件,成功后显示3秒倒计时退出。可点击“打开 FCP 检查”保留窗口,并在宿主中实际检查效果。"))
|
||||
manifest_path = CACHE / "dayu-color-package-manifest.json"
|
||||
manifest_path.write_text(json.dumps(manifest, ensure_ascii=False, indent=2) + "\n")
|
||||
command = ["/usr/bin/python3", str(skill / "package_fxplug.py"), "--repo", str(forge), "--manifest", str(manifest_path)]
|
||||
|
||||
@@ -1,18 +1,50 @@
|
||||
# 大鱼调色
|
||||
|
||||
原生 FxPlug 4 调色器,当前正式安装版本 **1.4.2(31)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.1(44)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
|
||||
交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
主 APP 已改为深色产品介绍界面,发布地址置顶;启动自动注册并回读系统登记,成功后在状态卡显示3秒倒计时退出。查看介绍或打开FCP检查可保留窗口;FCP中的实际效果由用户确认。外层沙盒按用户要求关闭,登录、授权、加密、自动更新及后端暂未接入。见[本轮说明](research/MainApp1.6.1.md)与[主APP验证](verification/MainApp1.6.1.json);后续账号工作仍参考[原交接](大鱼调色主APP开发交接.md)。
|
||||
|
||||
## 胶片模拟与通道混合器
|
||||
|
||||
新增可重复的胶片模拟和通道混合器,现有调色、蒙版、区域跟踪和相邻叠层保留。每个新工具都有独立眼睛、折叠、复位、蒙版、数量标记和“再加一层”;新增层从默认值开始。
|
||||
|
||||
通道混合器按红、绿、蓝输出分组,每个输出有三个输入系数,并提供保持亮度、保持饱和度和混合强度。胶片包含减色、晕光、辉光、颗粒、暗角五组,各自启停;颗粒支持精确帧时间、1–5帧保持和固定种子。默认保持中性,旧工程缺省不改变画面。
|
||||
|
||||
本机Color Finale 2.16.2的相关数学已单独取证并对照,产品独立构建,不加载原版APP或原版二进制。新阶段位于既有显示域链之后;减色/颗粒沿用本工程sRGB边界,其余在线性域。活跃减色沿用原核的0–1限幅;不宣称与原版全部ACES管理路径完全等价。1.6.0追加第六页“印片”:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,支持独立强度,默认“无”。以明确的Rec.709线性↔AP1/ACEScct边界接入原版LMT颜色函数;不代表原版完整CMS/ODT链。
|
||||
|
||||
完整预设升级为v6,兼容v1–v5。纯通道矩阵、减色和印片可导出Cube;活跃晕光、辉光、颗粒、暗角和蒙版不能保存为静态Cube,导出时说明原因。
|
||||
|
||||
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证旧234参数、LUT路径、蜘蛛盘和全部287键蒙版载荷不变;新增层默认值、蒙版数量、折叠、删除撤销/重做、冷重开通过。1920×1080正式导出验证“两帧保持”,组合预设8987字节及颗粒预设8420字节重开前后逐字节一致。见[研究与边界](research/ColorFinaleFilmMixer.md)、[组件对照](verification/FilmMixerReference.json)、[宿主验收](verification/HostFilmMixer1.5.0.json)。
|
||||
|
||||
FCP新实例、全部还原及新加一级层的自动色调映射默认开启;旧独立一级层的缺省关闭保持;FCP沿用模板默认值的旧主效果会跟随为开启,新版中手动关闭后可独立保存并在冷重开后保留。在主标题区增加可点击的“更多插件访问 https://dayu.media”。
|
||||
|
||||
## 1.6.0 八种印片与简洁模板
|
||||
|
||||
正式安装395项原生检查和四尺寸136项原版印片颜色函数对照通过,最大线性RGB绝对差0.000004828。FCP12.4逐个选择八种外观、独立印片层、100帧椭圆蒙版跟踪、折叠计数、删除/撤销/重做通过;彩色、黑白、蒙版叠层三段ProRes共300帧完整解码,黑白RGB通道完全一致。八外观候选36冷重开后8474、8456、32554字节三份预设分别逐字节一致;八外观候选36升级时276个用户参数及既有路径/蜘蛛盘/蒙版载荷保持;最终39版三组预设仅自动映射默认0→1,其余277项值及全部载荷保持。
|
||||
|
||||
按用户要求移除MOEF作者和网站两行,已有实例与新实例均已确认。模板采用真实原生样本支持的ozml5.11 / Motion5.4.5格式,保留自定义检查器和混合。FCP12.4加载和渲染通过;低版本FCP未实机测试,程序仍要求Apple Silicon / macOS14.6或更新。全局技能检查器不支持5.11,原始guard报告保留;项目原生字段验证与宿主验收分别记录。
|
||||
|
||||
见[印片来源与适配](research/PrintLooks1.6.0.md)、[原版对照](verification/PrintLooksReference.json)、[正式宿主验收](verification/HostPrintLooks1.6.0.json)、[模板兼容验证](template/verification/Compatibility.json)。
|
||||
|
||||
## 蒙版折叠与标题标记
|
||||
|
||||
蒙版面板随所属模块一起折叠,展开后恢复已有控件。标题栏蒙版按钮旁显示已添加的蒙版数量,无蒙版时隐藏标记;原模块与独立叠层分别计数,已停用的蒙版也计入数量。标记在折叠后仍可见,不改变蒙版和轨迹。
|
||||
|
||||
1.4.3正式路径293项既有原生检查通过;FCP12.4验证原模块、独立层、删除到零/撤销、折叠后数量标记及冷重开,完整预设逐字节一致。当前用户设置中的286个轨迹键保留。见[本轮宿主验收](verification/HostMaskFolding1.4.3.json)。
|
||||
|
||||
## 1.4.2 跟踪修复
|
||||
|
||||
中间帧启动直接使用宿主分析首帧,预览缓存缺失或陈旧不会阻止开始。真实素材的细纹运动采样和拟合容差已调整,仍保留可信度与错误变换保护。失跟说明原因与保留帧数;正常取消标记结束宿主后台任务。单帧跟踪会把源时间转换到时间线位置,支持片段前有其它内容时连续操作。
|
||||
|
||||
正式路径293项原生检查和19项独立CPU/Metal跟踪检查通过。FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。
|
||||
1.4.2的293项原生检查和19项独立CPU/Metal跟踪检查通过。该版FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。
|
||||
|
||||
## 色彩管理与一级调色
|
||||
|
||||
前段已改为 **输入转换 → 工作空间一级调色 → 输出转换**,复用大鱼 CST 仓库的固定源码与原生 GPU 数学。曲线和色域独立选择,工作空间统一供一级调色及输出使用,不经相机还原 LUT 近似。
|
||||
|
||||
新实例输入为 Sony S-Log3 / S-Gamut3.Cine,输出为 Gamma 2.4 / Rec.709,工作空间为 DaVinci Intermediate / DaVinci Wide Gamut,自动色调映射关闭。请按素材实际编码选择相机输入;不会根据片段或曲线名称猜测、覆盖手选色域。一级调色包含曝光、色彩平衡、饱和度、对比度与轴心、分区影调、黑白点、趾部/肩部压缩。输入、工作空间和输出已合并到一级调色卡片,四个旁路选项移除,由一级眼睛统一启停。一级白平衡改用原 CST 色轮,支持精细拖动、方向键微调、双击复位,以及可见的“复位”按钮;按钮只重置一级白平衡。
|
||||
新实例输入为 Sony S-Log3 / S-Gamut3.Cine,输出为 Gamma 2.4 / Rec.709,工作空间为 DaVinci Intermediate / DaVinci Wide Gamut,自动色调映射默认开启。请按素材实际编码选择相机输入;不会根据片段或曲线名称猜测、覆盖手选色域。一级调色包含曝光、色彩平衡、饱和度、对比度与轴心、分区影调、黑白点、趾部/肩部压缩。输入、工作空间和输出已合并到一级调色卡片,四个旁路选项移除,由一级眼睛统一启停。一级白平衡改用原 CST 色轮,支持精细拖动、方向键微调、双击复位,以及可见的“复位”按钮;按钮只重置一级白平衡。
|
||||
|
||||
CST 后的基础调整、HSL、曲线、色轮、五层风格 LUT 等仍属于既有显示域调色链。保留肤色保护、三原色、色阶、黑白、自动调色、吸管、预设和 Cube 导出。Cube 导出包含 CST、一级调色(含白平衡色轮)、蜘蛛盘及其它已启用的逐像素颜色操作。折叠不影响导出,眼睛关闭的模块不计入;纹理、清晰度、去朦胧和逐画面统计不写入 LUT。导出为 33³ Cube,应应用于与导出时相同编码的输入,避免重复叠加 CST/一级处理。
|
||||
|
||||
@@ -30,9 +62,9 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移
|
||||
|
||||
## 每工具蒙版与再次添加工具
|
||||
|
||||
十二个模块标题均有“添加蒙版”和“再加一层”。新增工具紧接点击的原工具或新增工具插入,从本工具的初始化参数开始,拥有独立启停、折叠、复位、删除、LUT 和蒙版;不会复制原层当前设置。新增一级采用 Rec.709/Gamma 2.4 同域输入输出,新增肤色保护强度为零。
|
||||
十四个模块标题均有“添加蒙版”和“再加一层”。新增工具紧接点击的原工具或新增工具插入,从本工具的初始化参数开始,拥有独立启停、折叠、复位、删除、LUT 和蒙版;不会复制原层当前设置。新增一级采用 Rec.709/Gamma 2.4 同域输入输出,新增肤色保护强度为零。
|
||||
|
||||
蒙版包括椭圆、矩形、钢笔、线性渐变、HSL 和亮度选区,支持相加、减去、相交、反转、羽化和强度。矩形、椭圆和闭合钢笔区域可正向、反向、双向或单帧跟踪。算法从“大鱼调色盘”固定源码适配,随本产品独立构建;不依赖安装父插件。完整预设 v4 保存新增工具、蒙版和逐帧轨迹,兼容旧预设。空间蒙版不能导出到 Cube,导出时会提示。
|
||||
蒙版包括椭圆、矩形、钢笔、线性渐变、HSL 和亮度选区,支持相加、减去、相交、反转、羽化和强度。矩形、椭圆和闭合钢笔区域可正向、反向、双向或单帧跟踪。算法从“大鱼调色盘”固定源码适配,随本产品独立构建;不依赖安装父插件。完整预设 v6 保存新增工具、蒙版和逐帧轨迹,兼容旧预设。空间蒙版不能导出到 Cube,导出时会提示。
|
||||
|
||||
蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,运动分析按显示比例限制到1280×720,4K细纹先低通再缩小,调色渲染和输出分辨率保持原设置。
|
||||
|
||||
@@ -71,6 +103,6 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移
|
||||
|
||||
正式发行包由 PKG 工坊技能生成,包含 APP 与 FCP 模板,不含用户 LUT、预设或媒体。安装与发布证据分别保存在 [Package.json](verification/Package.json) 和 [Release.json](verification/Release.json);以其中记录的版本和成功状态为准。
|
||||
|
||||
正式发行包:[大鱼调色-1.4.1.pkg](../发行包/大鱼调色-1.4.1.pkg);APP与PKG均已签名、公证、粘附票据和通过Gatekeeper,20项展开验包通过;[1.4.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.1-mask-workflow-20261101)已发布,草稿网页下载和发布后完整下载的字节数及SHA-256均一致。历史[1.4.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.0-tool-masks-20261101)及更早发行包和标签保留。
|
||||
当前发行包:[大鱼调色-1.6.1.pkg](../发行包/大鱼调色-1.6.1.pkg),主APP与注册验证见[1.6.1记录](verification/MainApp1.6.1.json)。历史发行包:[大鱼调色-1.6.0.pkg](../发行包/大鱼调色-1.6.0.pkg)。当前安装、公证、验包与Release下载结果分别以[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)为准。[1.6.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102)已发布(Release373 / 附件18),草稿正常浏览器下载和发布后完整下载均校验40,833,847字节及SHA-256一致。标签296个文件远端逐字节恢复核验通过,本轮恢复/下载及生成APP副本已清理,见[标签恢复](verification/PrintLooksReleaseRecovery.json)与[清理记录](verification/PrintLooksCleanup.json)。历史[1.5.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102)及更早标签和发行包保留。
|
||||
|
||||
1.3.1 的历史验收包含 Sony 默认、可见复位、浮动浏览器、系统窗口缩放、两种布局、最近排序与关闭重开。原生检查单独覆盖几何/布局持久化和鼠标事件;当时自动化没有独立确认自由标题栏/边缘拖动。1.4.0 另在独立合成工程中完成上文的宿主检查,用户确认中心拖动后保留其试调状态。
|
||||
+54
-2
@@ -1,6 +1,54 @@
|
||||
# 大鱼调色恢复说明
|
||||
|
||||
## 当前 1.4.2(31):真实素材与中间起点跟踪
|
||||
当前交接:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
## 当前1.6.1(44):主 APP 界面与自动注册
|
||||
|
||||
远程 https://dayu.media/git/dayu/dayu-color.git ,main。实际编译源码 `90d6022520c59ea34f42b511daee85ac2936cfd9`,签名团队B3W25FX5H5,唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。主/服务Bundle ID维持com.dayu.color、com.dayu.color.XPC,Apple Silicon / macOS14.6或更新。Xcode27.1、FxPlugSDK4.3.5;无LFS或子模块。
|
||||
|
||||
主界面、显式注册、精确路径回读和3秒倒计时通过;独立用户FCP确认单独记录,不把登记当作渲染验收。调色/Metal/模板未改,395项正式原生检查通过。证书、私钥和公证凭据需独立恢复,不在Git中;准备本机签名身份与profile后用tools/deliver.py进行Release构建和正式交付。
|
||||
|
||||
通过克隆仓库并 `git switch --detach 90d6022520c59ea34f42b511daee85ac2936cfd9` 可恢复实际编译节点;`verification/Delivery.json`、MainApp1.6.1.json、MainAppRecovery1.6.1.json分别记录安装、UI/登记及远端恢复。正式PKG `大鱼调色-1.6.1.pkg`,40,854,422字节,SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted,20项展开检查通过。未再次执行系统安装器。发行标签为v1.6.1-main-app-20261102,Release上传及下载结果见verification/Release.json;FCP用户确认仍单独记录。
|
||||
|
||||
## 历史1.6.0(39):八种印片、低版本模板与默认映射
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,main;发行标签 `v1.6.0-print-looks-20261102`。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。APP和内部XPC固定ID、唯一正式路径与签名团队不变。正式395项自检、独立原版136项印片对照、FCP12.4八外观/叠层/蒙版100键跟踪/三个完整导出与冷重开通过,见 `verification/HostPrintLooks1.6.0.json`。
|
||||
|
||||
完整八份65³印片数据、独立导入器、原生Metal/CPU采样和矩阵均在Git,无LFS/子模块;恢复不依赖ColorFinale安装或REA缓存。完整旧1296字节GPU前缀保留,预设v6读取v1–v5,新参数缺省中性。原版CI半透明链与产品预乘合同的适配边界保存在 `research/PrintLooks1.6.0.md` 和完整对照报告中。
|
||||
|
||||
FCP新效果、全部还原和新加一级层自动映射默认开启。宿主参数保留历史注册默认0,新MOEF显式value1/default0,保持原生参数存储合同;新一级层显式保存1,旧独立层缺省0。FCP沿用模板默认的旧主效果实测也采用开启,三份旧预设仅此默认0→1,其余277值及所有自定义载荷保持;不宣称模板默认改变后旧主效果完全逐字节不变。手动关闭后冷重开保持。主标题可点击“更多插件访问 https://dayu.media”。
|
||||
|
||||
MOEF去掉作者/网站Rig,输出5.11 / Motion5.4.5,有真实本机模板字段证据。全局技能检查器仅因不识别5.11停止,未伪造通过;项目级验证及当前FCP12.4加载/渲染通过。旧FCP未实机验证,APP最低Apple Silicon/macOS14.6。恢复执行 `python3 tools/build_template.py --overwrite` 和 `python3 tools/verify_template.py`;固定发布模板与正式安装资源逐字节一致。
|
||||
|
||||
远端编译节点已独立恢复294文件、全字节比较、full/strict fsck、Release构建和393检查;低版本模板重建摘要完全一致,见 `verification/PrintLooksRecovery.json`。最终标签恢复与安装包Release下载见 `verification/PrintLooksReleaseRecovery.json` / `Release.json`。用户完整预设、FCP资源库和导出仅在本机fcp-qa缓存,不在Git或PKG。PKG仅生成并展开验包,未再次执行系统安装器;正式APP已有独立安装和宿主验收。
|
||||
|
||||
恢复新机器时正常登录大鱼站取得相同权限凭据,克隆后 `git switch --detach <所需完整提交SHA>`,按Xcode/FxPlug SDK构建。签名证书和私钥须独立恢复,Git不能替代;当前证据以发布记录的标签SHA和编译SHA为准。
|
||||
|
||||
## 历史1.5.0(34):胶片与通道混合器
|
||||
|
||||
正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Bundle ID `com.dayu.color` / `com.dayu.color.XPC`。实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`;APP公证 `164abf2b-4e67-4504-b72a-04122da9e381` Accepted,签名、票据和Gatekeeper通过。安装与启动从唯一正式位置执行,FCP12.4已验收,记录见 `verification/Delivery.json` 与 `verification/HostFilmMixer1.5.0.json`。
|
||||
|
||||
主分支远程 `https://dayu.media/git/dayu/dayu-color.git`,无LFS或子模块。新增胶片与RGB混合的全部源码、Metal、参数/模板均在仓库,不依赖本机Color Finale、REA缓存或父工程。42个参数追加,944字节GPU前缀和1104字节旧版完整前缀保持。恢复时使用固定标签/提交,证书与私钥须单独恢复,不能由Git替代。
|
||||
|
||||
远端独立clone已完成Release构建及349项检查,四种尺寸原版组件对照184项通过。组件证据、域/顺序及限制见 `research/ColorFinaleFilmMixer.md`。当前用户媒体、完整预设、FCP资源库和验收导出只在本机,不进入仓库或安装包。安装包与Release元数据见本轮Package/Release记录。
|
||||
|
||||
正式PKG `../发行包/大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`;PKG公证 `05f849da-5567-4351-9556-742d17b95723` Accepted,签名、票据、Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装和宿主验收。发行标签 `v1.5.0-film-mixer-20261102` 对应 `85b6590944c4fb64825cf45f61c5280d4ffaa824`;[Release372](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102) / 附件17已经草稿正常网页下载及发布后完整下载,大小与SHA-256一致,仓库可见性不变。远端发行标签264文件逐字节核对及full/strict fsck通过,见 `verification/FilmMixerReleaseRecovery.json`;该标签与完成Release构建及349项检查的恢复节点之间,程序源码未改变,仅交付脚本的失败诊断记录改进及文档/验证记录更新。恢复clone、独立构建目录和下载副本已清理,唯一正式APP及历史安装包保留,见 `verification/FilmMixerCleanup.json`。
|
||||
|
||||
## 历史 1.4.3(33):蒙版折叠与数量标记
|
||||
|
||||
当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。
|
||||
|
||||
修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。
|
||||
|
||||
FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。
|
||||
|
||||
入口:[本轮说明](research/MaskFolding1.4.3.md)、[正式宿主验收](verification/HostMaskFolding1.4.3.json)、[远端源码恢复](verification/MaskFoldingRecovery.json)、[副本清理](verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。
|
||||
|
||||
|
||||
|
||||
本轮正式安装包 `../发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`;PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` Accepted,签名/票据/Gatekeeper与20项展开验包通过。APP已有独立正式安装及宿主验收,本轮未再次运行系统安装器。Release标签 `v1.4.3-mask-fold-20261102` 已发布,标签提交 `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`;[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16在草稿和发布后均完整下载校验14,340,650字节及SHA-256一致。发行标签已从远端独立恢复244文件,全部字节比较及full/strict fsck通过,见 `verification/MaskFoldingReleaseRecovery.json`。核验下载副本和恢复clone已清理,仓库可见性不变。
|
||||
|
||||
## 历史 1.4.2(31):真实素材与中间起点跟踪
|
||||
|
||||
当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。
|
||||
|
||||
@@ -16,7 +64,7 @@ FCP12.4正式31版在同一4K60素材的25p时间线中:中间双向285键、
|
||||
从大鱼远程克隆 main 后检出上述实际编译SHA,构建方法沿用本文件下文。已独立恢复233个提交文件并核对每个字节,full/strict fsck、原生模型模板与Metal重建通过;着色器SHA `b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e` 与正式库一致。无LFS/子模块,恢复clone已清理。用户媒体、预设、签名私钥不在Git中。
|
||||
|
||||
|
||||
本轮正式PKG `../发行包/大鱼调色-1.4.2.pkg`:14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`;PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` Accepted,签名/票据/Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装与宿主验收。Release标签 `v1.4.2-tracking-midpoint-20261102` 待完整下载核验后发布。
|
||||
本轮正式PKG `../发行包/大鱼调色-1.4.2.pkg`:14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`;PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` Accepted,签名/票据/Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装与宿主验收。Release标签 `v1.4.2-tracking-midpoint-20261102` 已发布,标签提交 `38bf12326e74f2f026bc4c7627729121b6aa261d`;[Release370](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.2-tracking-midpoint-20261102) / 附件15在草稿与发布后均完整下载核对14,339,640字节及SHA-256一致,仓库可见性保持原状。发行标签从远端独立恢复237个文件,见 `verification/TrackingMidpointReleaseRecovery.json`,全部字节比较和full/strict fsck通过;核验下载副本与恢复clone已清理。
|
||||
|
||||
## 历史 1.4.1(26):相邻插入、蒙版可读性与钢笔流程
|
||||
|
||||
@@ -246,3 +294,7 @@ python3 Packaging/build_pkg.py --pkg-forge-repo /实际/PKG工坊源码目录 --
|
||||
## 蒙版、跟踪与可重复工具的文档交接(2026-11-01)
|
||||
|
||||
文档整理前 main 为 `bbdd47d1d74e241f1f144bb2c245204e86973b3f`。交接标签 `handoff-mask-tracking-tools-20261101` 保存最新 `大鱼调色FxPlug4交接.md` 及 `research/MaskTrackingAndToolStack.md`,区分正式 1.3.1(19)与尚未实现的多个独立 HSL、每实例蒙版和跟踪。本文档提交未重新构建、安装或发布 APP/PKG,不移动原发行标签;父级“大鱼调色盘”只读参考。接续时保护用户当前窗口、布局、LUT 选择和工程。
|
||||
|
||||
正式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,52 @@
|
||||
# Color Finale 胶片与通道混合:本机移植记录
|
||||
|
||||
2026-11-02,基线 `b640b5da06f4c4455bb79c9b6bc16daa3088fa92`,正式1.4.3(33)。当前为研究检查点,尚未替换正式程序。
|
||||
|
||||
## 目标身份与保存位置
|
||||
|
||||
参考为本机 ColorFinale 2.16.2(625)。插件 SHA-256 `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f`;RenderingEngine `32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3`;GradeKit `e868a8c6df64bf03b7c24af5657c5ac7a2259a1943dfe06e01dbb7881df018a3`。
|
||||
|
||||
REA/Ghidra12.1.4目标绑定;Hopper在本机不可用,未改环境或安装工具。原始反编译、AIR和原版运行探针数据仅在 `/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-film-mixer-20261102/` 及其父目录的本轮 evidence/snapshot 文件中。产品不得依赖这些缓存或 Color Finale 的安装。
|
||||
|
||||
在改动前通过现有正式插件保存当前用户完整预设到 `.../com.dayu.color/fcp-qa/film-mixer-before-user.json`,77437字节;界面显示286个轨迹键。该私有预设不入Git或发行包。接手源码工作区干净,main与远程完整SHA一致,无待补推分支。
|
||||
|
||||
## 已观察的原版合同
|
||||
|
||||
| 模块 | 观察 | 证据 |
|
||||
| --- | --- | --- |
|
||||
| 通道混合器 | RGB三个输出行各读取RGB三系数,独立保持亮度、保持饱和度;缺省恒等矩阵,两保持选项为关 | `ev_de17c8b567e4f5b5975b7f65df03a00b6b48ccbc1053283619c02b95a8543387`、`ev_05d57fdd47b4aeca7b6928f1e37f3dd1f7d8ea482cb53c62689f0ed01d0194a4`;原版AIR `ChannelMixer` |
|
||||
| 减色 | gammaAll/Cyan/Magenta/Yellow、density、densitySwitch、valueSwitch进入SubSat;通道归一化幂函数再以白归一化,不是简单RGB幂函数 | `ev_90babd33318d6df4735fc2b4fd8ff79a76e6a035939d53e9dff1abdd99c0fa0d`;AIR `SubSat`、`compute_norm` |
|
||||
| 晕光 | 原图clamp边缘→CIGaussianBlur(scatter)→HalationKernel;R/G使用boost/dyeTransmission,B保持 | `ev_a187b1b5479b8dcd3419136e4d6c7b4de8b1fd692e3469f8ce760277fc82e5b3`;AIR `HalationKernel` |
|
||||
| 辉光 | sensitivity、blurRadius、intensity送入独立通用kernel,后续Fx包装仍需追查 | `ev_91b77df09f4b079fb6dd3ec48048b920a1712de647717a18349585dab51035d2` |
|
||||
| 颗粒 | seed、intensity、grainSize、filmResponse、correlation及RGB标准差;PCG哈希+Box-Muller正态噪声;grainSize>1由MPS高斯扩散;逐通道响应与相关性混合 | `ev_ff3cd2863e3fcf6d834c2a9e80a550bb6c2c85fa28ccdd1f8c4ac941aba9f469`、`ev_591f74d294cd90958b4b5212f004171b38a49fc1799547b93b062c29f04b68ef`、`ev_6ddb156a25bce95378ef3b21653a84779d5a9a9f4924820f46a14d103359ff5e`;AIR `BoxMullerPCG`、`GrainFilter` |
|
||||
|
||||
RenderingEngine `default.metallib` SHA-256 `6fd43083a38e76c95c6256a331eabb85d97b48c32d3418e8fee4c1d28480c7ff`;`metal_kernels.metallib` `ee21f6115ef96937d7e2c41e5293bcdb8a0fbaeee9570c60e547f550399920a3`。用本机Apple Metal工具只读解析指令;静态观察不能替代实际输出对照。
|
||||
|
||||
原版最终根级顺序已由身份匹配的既有证据 `ev_c0a2873d5bcdbddba37830f470f8face16b6ffef6f4ca3da012a3abd863f3164` 建立:图层树→减色→晕光→辉光→颗粒→暗角→输出;ACES输出可选八种印片LMT。各Fx的数值映射、工作域、暗角和LMT仍在追查,不能宣称已经移植或等效。
|
||||
|
||||
## 本工程接入边界
|
||||
|
||||
保留原参数ID及944字节GPU前缀;新的参数仅追加。新增可重复通道混合器与胶片工具,沿用现有启停、折叠、蒙版、数量标记和相邻插入。旧工程缺省为严格中性,保留schema1尾层、schema2锚点及286键用户状态。
|
||||
|
||||
Cube只允许可静态表示的颜色数学;空间效果、颗粒和蒙版必须明确拒绝,完整预设保留其状态。待本机原版图像对照、原生回归和正式宿主验收完成后再记录结论。
|
||||
|
||||
## 开发检查点
|
||||
|
||||
已追加两种工具、42个宿主浮点参数及完整预设v5;旧ID与1104字节完整前缀保留。CST及原调色/蒙版/跟踪调度不重排;两个新根工具位于原显示域链/蜘蛛盘之后,schema1尾层之前。减色与颗粒用既有sRGB编码边界,晕光/辉光/暗角用宿主线性纹理;这属于本工程接入合同,并不声称与任意ACES管理的原版整条CMS完全等效。
|
||||
|
||||
原版Fx包装确认辉光使用固定2.5像素稀疏高斯预滤→向量Sobel阈值→用户diffusion高斯扩散→相加;晕光scatter缺省5,透射参数/500,boost缺省1;颗粒PCG与Box-Muller直接原版shader输出逐样本相符,相关性=1−2×colorVariation。暗角直接复用同一系统CIVignetteEffect及参数映射。证据:`ev_f0221c32adbaa1e108aa560f0f8fa60c067619ac9f5b06225df548e2671a448f`、`ev_932531fcd8aaebf06eabd6e22f1a56615ba2462f6efc3fb53cfdbdb9fd618816`、`ev_b500f2f762efd1dbbd8ae7efab9d48016482ff1463775039d25504cb4ccd9d3f`、`ev_850af09a4640201b65745c78a10a0e0a0ef67eee9614d129517f6bf13c54c11e`。
|
||||
|
||||
当前原生346项通过;独立原版CI/Metal对照仍在修正辉光边界采样。CI读取bitmap的上下行与Metal纹理相反,对照工具已有往返控制;产品CI→Metal往返验证无翻转。颗粒比对采用原版BoxMullerPCG/GrainFilter明确尺寸/种子,避免把Core Image内部切块的噪声坐标当作固定全帧坐标。此检查点尚未正式安装和宿主验收。
|
||||
|
||||
|
||||
独立原版对照38项现已全部通过:四组通道保持选项、12组减色、3种晕光半径、3种辉光阈值、4种PCG种子与12组颗粒。最大线性RGB绝对差0.0001328(通道双保持),低于预先记录的0.00015浮点容差;其余各项有各自阈值。辉光普通区域采用可分离预滤,最外一圈直接求原25点邻域,保留原版clamp边界,避免把裁切中间图的边界当作原图边界。见 `verification/FilmMixerReference.json`。这只覆盖声明的有限组件和参数,不代表原版整条CMS、全部素材或全部印片外观等价。
|
||||
|
||||
|
||||
正式构建准备:1.5.0(34),349项原生检查通过;独立原版对照在64×48、63×47、1×17、17×1四种尺寸共184项全部通过,含零矩阵/灰矩阵退化分支。上下纹理方向的颗粒固定全帧坐标验证通过;元数据旧前缀、原有跟踪/钢笔检查仍包含在原生回归中。静态3D Cube允许通道矩阵和纯减色,拒绝活跃的晕光/辉光/颗粒/暗角。FCP夹具只有三个独立合成项目,FCPXML1.12严格DTD与素材检查通过,不把内部FxPlug ID冒充模板发布参数路径;通过正式检视器设置验收参数。
|
||||
|
||||
兼容边界:新模块关闭/零混合以及旧工程缺省走原融合链;活跃减色沿用原SubSat对0…1的限幅。晕光/辉光保留邻域alpha权重,所有新处理保留入口alpha,非正alpha旁路;颗粒全帧种子不依赖Core Image内部切块顺序。原厂八种印片外观是ACES输出的另外一组资源,本轮五组胶片处理未使用这些资源,也不以相机F-Log名称冒充印片外观。
|
||||
## 正式1.5.0(34)验收完成
|
||||
|
||||
实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`。正式安装349项原生检查通过,FCP12.4对用户旧234参数、资产路径、蜘蛛盘及287键蒙版载荷核验保持。新工具、胶片椭圆蒙版、折叠数量、独立初始化叠层及删除撤销/重做通过。正式ProRes导出验证颗粒两帧保持,组合/颗粒完整预设冷重开前后逐字节相同。三项目原生FCPXML回导严格校验与字段比较通过。见 `verification/HostFilmMixer1.5.0.json`;四尺寸184项独立组件对照见 `verification/FilmMixerReference.json`。本轮交付五组胶片处理及矩阵,不含八种ACES印片外观。
|
||||
|
||||
APP和PKG均Developer ID签名、公证Accepted、票据/Gatekeeper通过;PKG有20项展开验包,未再次执行安装脚本。发行包、标签、全量下载和恢复结果分别见 `verification/Package.json`、`verification/Release.json` 与本版恢复记录。
|
||||
@@ -0,0 +1,31 @@
|
||||
# 主 APP 1.6.1(44)
|
||||
|
||||
本轮只改现有主 APP 的产品介绍、系统插件注册及退出体验。按用户最新说明,发布地址位于最顶部,关闭外层 APP 沙盒;登录、授权、加密、自动更新及后端均未接入。调色、渲染、参数、Uniform、预设、Metal 和 FCP 模板保持原样。
|
||||
|
||||
## 最终界面与交互
|
||||
|
||||
沿用 Objective-C/AppKit、Nib 连线和手动内存管理。采用 standard 档原生交互,深色静态渐变、圆角彩色卡片和胶囊按钮呼应参考图。比较单列介绍、左右双栏、状态+使用指引+双列特色三种结构后,选择第三种:顶部可点击的发布地址 https://dayu.media,随后产品名称/版本、插件注册与宿主检查,最后四张完整调色、LUT、胶片、蒙版叠层特色卡。默认920×850,最小760×620,纵向滚动。
|
||||
|
||||
每次启动:检查内嵌组件 → 提交注册 → 系统回读确认。成功后在注册卡片内清晰显示3→2→1秒倒计时并退出,取消了旧版底部难以看到的提示。查看介绍/⌘I取消本次自动退出;⌘R可重新检查,工作期间防止重复提交;⌘W关闭窗口、⌘Q退出。失败时保留窗口和重试入口。
|
||||
|
||||
“打开FCP检查”会保留本窗口,并按Bundle ID打开Final Cut Pro。用户在FCP内将大鱼调色应用到片段,确认画面与调节正常后,可点击“已确认正常,退出”。系统注册成功与宿主功能确认分开记录;自动化不代替用户点击确认。Motion也有明确入口,覆盖正式及历史两种宿主Bundle ID。
|
||||
|
||||
## 系统登记与权限
|
||||
|
||||
外层AppDelegate拥有唯一注册状态:checking → registering → ready/failed。PluginKit操作在后台队列,UI在主线程。先验证精确内嵌组件的Bundle ID、当前构建号、FxPlug协议及登记版本1.1,再向/usr/bin/pluginkit提交独立路径参数;查询返回的标识/协议/完整路径必须匹配。1.1是登记协议版本,不是APP版本。不使用shell字符串、不需管理员提权、不改变其他插件的用户选择。
|
||||
|
||||
40/41候选发现沙盒允许注册却拒绝CLI的PKDiscoverAll查询,即使不带-A也会失败,不能把它解释为“插件未注册”。用户随后明确允许关闭沙盒。最终移除主APP的app-sandbox entitlement,查询可直接回读;不采用42候选的应答降级。内嵌服务原本未启用该沙盒,Developer ID、Hardened Runtime、可信时间戳、公证、票据及Gatekeeper要求保持。
|
||||
|
||||
本机诊断写入 ~/Library/Application Support/com.dayu.color/Registration.json,记录登记应答、实际路径、版本、进程、退出原因及用户确认,不联网、不含凭据。--show-introduction可保留介绍,仍执行真实注册流程。
|
||||
|
||||
## 视觉与无障碍
|
||||
|
||||
使用原生按钮、可访问文本、键盘快捷键、焦点环和状态播报。不使用透明采样、模糊、着色器或装饰性动画;增强对比度加粗边界,进度采用系统控件。实际测试、未覆盖的VoiceOver/系统显示选项及暂定评分以verification/MainApp1.6.1.json为准,不仅凭截图宣称90分质量。
|
||||
|
||||
## 来源、身份与交付
|
||||
|
||||
只读参考用户指定的 https://dayu.media/git/dayu/fcpx-qwen3-asr.git ,提交113069c74aff935db2082b5bcd8e1aa47fe1fbf2中的ContentView.swift、LicenseViewModel.swift;借鉴配色和层级,没有引入其会员、计费或识别业务代码。
|
||||
|
||||
唯一正式路径 /Library/Plug-Ins/FxPlug/大鱼调色.app;主/服务Bundle ID为com.dayu.color、com.dayu.color.XPC,版本同步1.6.1(44)。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。40/41/43是本轮定位或界面候选,42未安装,均不发布安装包;历史已发布版本及用户验收媒体/预设保留。
|
||||
|
||||
APP签名、公证、票据、正式安装、自检见verification/Delivery.json和InstalledSelfTest.json;主界面/注册验证见MainApp1.6.1.json;安装包、Release及独立恢复见Package.json、Release.json和MainAppRecovery1.6.1.json。以各记录的实际状态为准,不将系统登记等同于用户已确认宿主功能。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 1.4.3(33)蒙版面板随模块折叠
|
||||
|
||||
用户报告模块收起后蒙版面板仍显示。正式1.4.2(31)中已复现:蜘蛛盘标题为折叠状态,蒙版类型、几何参数与跟踪控件仍出现在检视器。当前完整预设(含286个轨迹键)已先保存到本机验收缓存。
|
||||
|
||||
原因是DYInspector布局在内容高度累计和行显示两处,均把DYToolMaskPanel排除在collapsed条件之外。两处统一遵循模块折叠状态,折叠后隐藏整个蒙版面板并去掉占用高度;展开后恢复已有蒙版控件。原模块和新增独立层使用同一布局代码。
|
||||
|
||||
用户补充希望折叠后能辨认有蒙版的层:标题栏蒙版图标增加数量徽标(1–16),无蒙版时隐藏,启停蒙版都计入已添加数量。徽标不拦截鼠标,蒙版按钮的提示及辅助说明同步数量。五套主题从现有配色取色,展开和折叠时均保留标记。32版仅折叠修复候选完成公证安装,未发布;33版包含本次补充。
|
||||
|
||||
本次只改布局、标题栏状态显示和版本元数据,不改变启用、调色、蒙版几何、轨迹、合成方式或渲染代码。沿用现有原生检查,在正式签名公证安装后验证原模块及新增层的折叠、展开和状态保留;不为这次布局修复另写重复单元测试。
|
||||
|
||||
正式宿主和交付结果见 verification/HostMaskFolding1.4.3.json、Delivery.json、Package.json、Release.json 对应版本记录。用户预设和项目快照保留在本机,不进入Git。
|
||||
|
||||
最终33版正式路径293项检查通过。FCP验证蒙版面板随原模块和独立HSL层分别折叠,折叠后保留2/1数量标记;删除到零隐藏、撤销恢复,包含停用蒙版。用户77276字节预设和286个轨迹键不变,合成片段8471字节预设在操作前后及冷重开逐字节一致。蓝色主题实屏标记清楚可读;未单独遍历其它主题、Motion或Intel。
|
||||
@@ -0,0 +1,61 @@
|
||||
# 八种印片外观:1.6.0接续
|
||||
|
||||
2026-11-02。用户补充明确纳入八种印片外观,接续已交付1.5.0(34);基线main `e7fa8e6cf5690395272cbb76d7698dba77883b01`,正式版在开发期间保留。
|
||||
|
||||
## 参考取证
|
||||
|
||||
本机Color Finale 2.16.2(625),RenderingEngine SHA `32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3`,GradeKit SHA `e868a8c6df64bf03b7c24af5657c5ac7a2259a1943dfe06e01dbb7881df018a3`。REA/Ghidra12.1.4只读分析,两个会话均已关闭。快照在本机ColorResearch的 `dayu-print-rendering-snapshot-20261102.json` / `dayu-print-gradekit-snapshot-20261102.json`,原版运行探针和导出留在同目录的 `dayu-film-mixer-20261102/print-reference`。
|
||||
|
||||
- 资源装载与binary16转RGBA32:`ev_2963c6285fc85f3255d57d56657e98c3a81446bd0d0cafa5046d6298b84af7cb`;65³红轴最快。独立解码后八份RGBA32全部与原版 `cubeData` 逐字节一致,摘要见 `PrintLooksResources.json`。移入产品的只有重新封装的数值数据,没有原版可执行文件、framework或shader。
|
||||
- 原版LMT processor:`ev_64067f2914fc23f8e1e2a47a9a272076b4c7842907dfde08a6308de87d46904e`;Metal AIR `FTAcesLMT` 用0–1限幅、六分支四面体插值,保留预乘alpha。
|
||||
- 顺序:`ev_b38658366c168d4336e0998f030a8024b73f79119b764eff1df82fc822118462`,stack转换→LMT→ODT;stack曲线合同 `ev_9993ec73114bb2de791e5ddb43bc422ad4666b34e40dd0d2d9e2326ddb8ba27e`。
|
||||
- 默认工作空间明确为ACEScct:`ev_7f30f36b78c55e71b807e378fd6b53e6d0f75db2123160d35800b6b60dcf788b`。ACEScc仅是未指定时的旧回退,不替代当前默认。
|
||||
- `inspect_colorfinale_print --matrix` 通过原版FTColorSpaceFilter核对Rec.709线性↔ACEScg(AP1/D60)矩阵,白点往返为1;Core Image上下方向另由输出对照控制。
|
||||
|
||||
## 接入合同
|
||||
|
||||
在胶片五处理之后、全胶片mix和蒙版之前追加印片点阶段。沿用本工程显示链宿主线性Rec.709边界,转换AP1/D60→ACEScct→原LMT四面体采样→ACEScct解码→线性Rec.709;按印片强度混合,再沿用总强度与原蒙版。这是独立模块接入,不将原版任意ACES ODT或完整CMS偷偷移入旧链。
|
||||
|
||||
新增第六页“印片”,默认无,八项Kodak2383/2393/2302 BW、Fuji3510/3513/3519/3521、AgfaCP30;旧参数、1.5.0的1296字节前缀及颗粒时间位置保留。预设v6继续读旧版本,新参数缺省中性,独立层默认无。印片是逐像素变换,可写入静态Cube;空间、时间和蒙版限制继续保留。
|
||||
|
||||
1.6.0候选阶段渲染和模板已经编译。393项原生检查全部通过,含既有349项及八种印片资源/输出、强度/眼睛/总混合精确旁路、独立两层归档、蒙版和Cube格点对照。四尺寸64×48、63×47、1×17、17×1共136项原版颜色函数对照通过,固定容差0.0001,最大线性RGB绝对差0.000004827976;记录 `verification/PrintLooksNative.json`、`PrintLooksReference.json`。远端节点 `ab7cb759e57cc9c2a4725426bced67af55155654` 已独立恢复280文件、全字节比较/full-strict fsck、Release构建及393检查通过,见 `PrintLooksRecovery.json`。
|
||||
|
||||
透明度边界已单独取证:原版FTColorSpaceFilter将RGB当直色值转换,LMT processor则按预乘alpha读取。直接用fractional-alpha把两者串联不等于颜色函数,最大偏差3.975311214;八外观alpha=1颜色对照全部通过。32个保活转换filter身份互异,排除共享可变单例。对照工具完整保留原始链、每alpha分组及各中间图样本的诊断,不调整容差掩盖差异。正式算法采用原版alpha=1颜色函数并保持本产品的输入/输出预乘合同,透明像素保留、非透明像素显式解预乘/再预乘;这是有记录的适配,不声称原版Core Image直串在半透明时逐像素等效。
|
||||
|
||||
上述为开发检查点;最终正式交付与宿主结果见下节。
|
||||
|
||||
## 用户补充:去除模板版权与较低版本格式
|
||||
|
||||
用户截图要求去掉MOEF顶部作者和网站两行,并尽量兼容旧FCP。生成器已移除完整Rig、两个展示菜单、相关factory与发布项,仅保留自定义检查器和混合两个发布入口。按真实本机ColorFinale/Pro同结构模板,输出采用ozml5.11 / Motion5.4.5;移除本壳未使用的Object3DEnvironments、DRTSupport、onHDRDisplay和missingDynamicRangeType提示,内部factory/scenenode版本及色彩域不改。来源与schema边界见 `template/sources/Provenance.json`、`template/verification/Compatibility.json`。
|
||||
|
||||
全局技能检查器的5.11版本guard未知如实保留;项目级验证有真实5.11相同选择字段证据。只降低格式门槛,不据此承诺旧FCP实机通过,程序的Apple Silicon/macOS14.6依赖保持。
|
||||
|
||||
35候选已公证Accepted `3819fbc3-6b7d-4b89-b09a-3e5d9c0f0851` 并粘附,但宿主在替换前重开,交付安全门保留正式1.5.0未替换。用户截图显示1.6.0,随后发现PluginKit同时登记正式1.5和构建目录候选,说明宿主可能发现了构建副本;未将此计为正式验收。之后用户新增模板要求,候选35及提交ZIP已清理,不重新提交同一包。最终版本递增为1.6.0(36),包含新的模板和签名。`tools/deliver.py`现在会在Xcode构建后立刻移除构建副本的PluginKit登记,避免公证等待期间被宿主发现。该阶段的状态见 `verification/PrintLooksBuild35Superseded.json`。
|
||||
|
||||
## 八外观候选36的正式安装与FCP验收
|
||||
|
||||
八外观候选1.6.0(36)实际编译源码 `f97320bbee6d469596f2db72a48436b73a41b324`;APP公证 `91224ae2-68d3-4776-a9b7-2fdf8ffaea4f` Accepted。正式路径签名、票据、Gatekeeper通过;PluginKit仅正式路径,FCP12.4实际XPC也来自该路径。393项正式自检通过,八外观独立对照仍为136项,容差未放宽。
|
||||
|
||||
升级前用户v5完整预设276个旧值、LUT路径、蜘蛛盘和工具载荷保持;新v6增加look0/strength1两个中性参数。已存在效果和新效果均无作者/网站两行。正式FCP逐一选择八种印片;新增独立层从“无”初始化。组合项目base Kodak2383强度1、独立Fuji3513强度0.4、base椭圆蒙版100个跟踪键通过,折叠标记、删除/撤销/重做保留。
|
||||
|
||||
Agfa、Kodak黑白、叠层蒙版三个4秒/25p ProRes共300帧完整解码;黑白16位RGB通道最大差0。正常退出宿主并冷启动后,三份完整预设8474、8456、32554字节分别与重开前逐字节一致。完整私人文件不上传,仅记录摘要和数量于 `verification/HostPrintLooks1.6.0.json`。
|
||||
|
||||
APP模板ozml5.11 / Motion5.4.5的当前FCP12.4加载、渲染及清洁界面通过;旧FCP未实机测试。恢复节点已更新为最终编译SHA,287文件逐字节比较、Release构建、393项检查、低版本模板字节重建通过。PKG与Release最终证据见Package/Release记录。
|
||||
|
||||
## 默认映射与标题链接接续
|
||||
|
||||
用户随后要求一级自动映射默认开启,并在主标题放置可点击的“更多插件访问 https://dayu.media”。39版保留Native参数的历史存储默认0,以新MOEF的value1/default0明确初始化新FCP效果,模型还原默认1;新独立一级层显式保存1,旧层省略值保持0。新层自动映射开启时不能被中性层优化跳过。标题链接为原生可访问Link控件,有指针/下划线/主题色,位于主标题区;不恢复MOEF的作者/网站Rig。
|
||||
|
||||
候选37预检394项通过,但最终检查发现独立一级层的中性判断需更新,公证等待被中断并保留原submission ID查询,未重复上传该产物。38版已公证并正式安装验证,发现FCP会省略旧零默认,直接改注册默认会把旧项目改成开启,因此未验收发布;据此采用稳定注册默认与显式模板初值分离。候选36的已验PKG在用户新增需求后移除,未上传Release;历史说明及摘要保留在Build36/37/38记录中。
|
||||
|
||||
最终1.6.0(39)编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`。395项检查覆盖原有渲染、八印片及旧省略值/显式开关、新层处理等;原版136项印片对照及Metal摘要未改变。独立远端恢复294文件、全字节比较、Release构建、395检查及低版本模板字节重建通过。最终FCP默认与链接验收见 `verification/HostPrimaryDefaults1.6.0.json`,八外观完整历史验收见 `HostPrintLooksBuild36.json`;最终版保留验证见 `HostPrintLooks1.6.0.json`。
|
||||
|
||||
### 最终宿主边界与结果
|
||||
|
||||
39版APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted,唯一正式位置FCP12.4验收完成。新FCP效果自动映射1,新独立一级层1,全部还原1;实际点击标题Link后Edge打开 `https://dayu.media`。8668字节“主效果手动关闭/独立一级层开启”完整预设在冷重开前后逐字节一致。正式39版1080p25/4秒ProRes100帧完整解码通过。
|
||||
|
||||
稳定原生注册默认0保持原API合同,但实机证明它不能冻结FCP关联模板的旧默认:三组已保存印片主效果也从0跟随新模板到1。对比仅此用户要求的默认变化,其余277项值及paths/spider/tools完整载荷不变,主效果eye在这些印片夹具中原本关闭,印片渲染链不受该开关变化影响。不得把原生模拟宿主的旧默认0检查等同于旧FCP主效果逐字节不变。实际新手动关闭能保存,冷重开结果已证实。旧独立一级层省略值保留0的兼容逻辑仍有效。
|
||||
|
||||
最终Metal SHA `6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d` 与候选36及独立136项原版印片对照完全相同;最后两次补充只修改参数默认和原生界面/叠层跳过逻辑,没有修改八种印片数学。最终交付结合Build36完整八外观/100键跟踪/导出证据及Build39完整载荷对比、默认/链接/保存/当前导出证据,不将旧构建的界面操作冒充最终构建重复执行。
|
||||
|
||||
最终1.6.0(39)PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,20项展开验包通过。Release373/附件18发布,草稿与正式完整下载40,833,847字节和SHA `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca` 一致;标签0cc51149a6f21ebe09465b4fd7130451bedd57bb已独立恢复296文件,程序源码与编译节点e5affd3一致。当前APP和资源在固定位置;恢复构建、下载及生成APP副本已清理。
|
||||
@@ -0,0 +1,97 @@
|
||||
{
|
||||
"referenceVersion": "2.16.2 (625)",
|
||||
"referenceSHA256": "32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3",
|
||||
"tables": [
|
||||
{
|
||||
"index": 1,
|
||||
"name": "kodak_2383",
|
||||
"side": 65,
|
||||
"sourceSHA256": "9224997a8996a1c4d44ad489d66b3886e8137924f019e7001b3491b22020c269",
|
||||
"rgba32SHA256": "462407f0105a9588d78306f136dc1aacabadb8ac51771c540c9be2d7a85da06f",
|
||||
"bytes": 1256178,
|
||||
"sha256": "466a88c64ce7c96255acb081b5ff68bb02ba53cbfa54561fece5ef09397df666",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2383.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 2,
|
||||
"name": "kodak_2393",
|
||||
"side": 65,
|
||||
"sourceSHA256": "6bf05ba88600cf4597b8969e030179db2baef08b638ca05654df3c2472df06dd",
|
||||
"rgba32SHA256": "024e046ac2d4fad2493b1ba17de6b9269ea2ce2924ad0801700a57651fa2ff5b",
|
||||
"bytes": 1239890,
|
||||
"sha256": "fc49e73830eb12763cab29329de8485ba85476ec5823ce967e2d0d5e089984cc",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2393.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 3,
|
||||
"name": "kodak_2302_bw",
|
||||
"side": 65,
|
||||
"sourceSHA256": "00c4841c2f7fb1e40fe6452935b7c133a628fc8b41990aedfdc457907eeb1472",
|
||||
"rgba32SHA256": "6ef56e8e0ea4c16c1c333471db1ad3898335f2b336b7f1a76c8da4f7ac759ab0",
|
||||
"bytes": 466705,
|
||||
"sha256": "69e995a585b8386426b11f1839d817866194ceca34caab9dda4bf691b233ef33",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2302_bw.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 4,
|
||||
"name": "fuji_3510",
|
||||
"side": 65,
|
||||
"sourceSHA256": "bd39cdd4e719a6fafdc7097e15d81ddb58a388f4a1c28bf147ce9a1cb7ecb28b",
|
||||
"rgba32SHA256": "b8658f5a0659f3a72bb98a3d171b90d20fe960a27d5220177ec8639fdd6b279e",
|
||||
"bytes": 1256103,
|
||||
"sha256": "2383db3a8e4c523af09d952709b3638459c9bef710080f787756d1c8cba26daf",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3510.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 5,
|
||||
"name": "fuji_3513",
|
||||
"side": 65,
|
||||
"sourceSHA256": "58eb01a447c21f4670765e435cdb7fddf3b3b4e042a76b30b91a906413723d6b",
|
||||
"rgba32SHA256": "946a1fbbbd9ddcbb98f9a3227e42d9e31cb15191051047134c7a69adc5c069d6",
|
||||
"bytes": 1233606,
|
||||
"sha256": "56c281c30f21c3344d21195ba16a5d8b850f5493cf487f4511929d036f6abdcf",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3513.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 6,
|
||||
"name": "fuji_3519",
|
||||
"side": 65,
|
||||
"sourceSHA256": "84ace607eefdac45c7f6b9c6ffe50271d70f7bbe56223dc47de19900ae9401c6",
|
||||
"rgba32SHA256": "01ea1984dc24998735ab42034f8d7bd19ef9f4c001f748e39a91c8923f1d6b1f",
|
||||
"bytes": 1231622,
|
||||
"sha256": "8c4891cc331634a36dbf40ead21c78f4a1dbd5283d29f351a43aadd6615040ee",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3519.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 7,
|
||||
"name": "fuji_3521",
|
||||
"side": 65,
|
||||
"sourceSHA256": "ac13b327ea6a2d5752b201f3cf0ecea1df375341935b6a3aa3c9494c0b6b866b",
|
||||
"rgba32SHA256": "592dd37648e2568e3747714bc87590126dac052e4b06f839d09590c462e86c00",
|
||||
"bytes": 1267728,
|
||||
"sha256": "8b508f5e2168657814f533c281d234a374299503f8abed5da769ac9989438e4e",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3521.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 8,
|
||||
"name": "agfa_cp30",
|
||||
"side": 65,
|
||||
"sourceSHA256": "62b71c675e89ce161e4ad5cc37ffa28d882b1b724de4bb15a30da70fb3daa0d9",
|
||||
"rgba32SHA256": "744b01a229f4132aa5a95c468aad7d25d8d9407ddc28771d0398369bdcdba6e5",
|
||||
"bytes": 1276279,
|
||||
"sha256": "55f6c58df7959bbc2cf9c2d2893d6971674f13a257dbd4c2d2a285136279cd56",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/agfa_cp30.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
}
|
||||
],
|
||||
"cubeOrder": "red fastest; green; blue",
|
||||
"interpolation": "tetrahedral (six cases)",
|
||||
"sourceRole": "data only; no reference executable or shader shipped"
|
||||
}
|
||||
@@ -20,6 +20,6 @@
|
||||
|
||||
## 验证与边界
|
||||
|
||||
31版正式Release原生293项通过,包含真实Metal采样、三组新增中间启动回调和五组SDK正常终止与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后FCP12.4验证同一素材:中间双向285键、首帧正向285键;中途取消保留159键并回到闲置,随后可重启跟完整段;画面切换在2秒失跟,保留0–1.96秒50键,连续重试无弹窗且后台任务闲置。首帧反向正常提示边界,连续单帧在前有4秒片段时7:17→7:18→7:19→7:18,已有相同轨迹仍正常移动。正常退出、冷重开后完整77087字节预设逐字节一致。27/28候选中间正向193新键、反向93键与撤销重做记录单列在宿主报告;27–30均未发布。
|
||||
31版正式Release原生293项通过,包含真实Metal采样、三组新增中间启动回调和五组宿主正常终止/边界与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后FCP12.4验证同一素材:中间双向285键、首帧正向285键;中途取消保留159键并回到闲置,随后可重启跟完整段;画面切换在2秒失跟,保留0–1.96秒50键,连续重试无弹窗且后台任务闲置。首帧反向正常提示边界,连续单帧在前有4秒片段时7:17→7:18→7:19→7:18,已有相同轨迹仍正常移动。正常退出、冷重开后完整77087字节预设逐字节一致。27/28候选中间正向193新键、反向93键与撤销重做记录单列在宿主报告;27–30均未发布。
|
||||
|
||||
原始媒体、FCPXML快照、作者状态和解码帧均仅在本机验收缓存,普通Git只保存聚合结果与通用诊断源码。未修改父“大鱼调色盘”或Color Finale。不是人物分割/非刚性逐点描边;转身、遮挡、变形和出画仍可能需要手工调整后从当前帧继续。新增工具标量和透视/剪切等既有边界保持。
|
||||
@@ -0,0 +1,122 @@
|
||||
# 大鱼调色交接:1.4.3 基线与 Color Finale 胶片模拟接续
|
||||
|
||||
更新日期:2026-11-02(Asia/Shanghai)。本轮只整理交接文档,未改程序、未重新安装或重启宿主,也未开始胶片模块的算法迁移。下一阶段目标是从本机 Color Finale 分析并移植胶片模拟模块。
|
||||
|
||||
## 1. 先认准项目与可恢复基线
|
||||
|
||||
| 项目 | 当前值 |
|
||||
| --- | --- |
|
||||
| 当前源码根目录 | `/Volumes/备份/大鱼调色/大鱼调色` |
|
||||
| 远程 / 分支 | `https://dayu.media/git/dayu/dayu-color.git` / `main` |
|
||||
| 交接文档编辑前 main | `7814a03f95f9f3c3461af2566e7412c1e5c561e1`;后续文档提交在此节点之上 |
|
||||
| 正式 APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app`,1.4.3(33) |
|
||||
| 主 / XPC Bundle ID | `com.dayu.color` / `com.dayu.color.XPC` |
|
||||
| APP 实际编译源码 | `26a888f4534792481c6a9933091cb0b23307cd24` |
|
||||
| 已发布标签 | `v1.4.3-mask-fold-20261102` |
|
||||
| 标签对应提交 | `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`,含最终交付记录,区别于 APP 编译节点 |
|
||||
| FCP 模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 父“大鱼调色盘”源码 | `/Volumes/备份/大鱼调色/大鱼调色盘`,只读参考固定提交 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` |
|
||||
|
||||
接手后先查看实际工作区、分支和远端;不要用本表覆盖其他任务的新改动。当前大鱼调色是独立 FxPlug 程序,不依赖父项目或 Color Finale APP 才能运行。历史各轮说明已归档到 [历史交接](research/handoffs/DayuColorThrough1.4.3-20261102.md)。
|
||||
|
||||
## 2. 已完成并应保留的行为
|
||||
|
||||
- 一级调色包含输入 CST → 工作空间一级处理 → 输出 CST;后续基础调整、HSL、曲线等仍按既有显示域链处理。胶片接入时要重新确定域和位置,不能把父项目的顺序直接套进来。
|
||||
- 各模块标题只控制展开/折叠,眼睛控制启用/旁路。再次添加工具在点击处相邻插入初始化层,旧 schema1 尾层保留位置;新增层参数独立。
|
||||
- 每工具蒙版含椭圆、矩形、钢笔、线性渐变、HSL、亮度选区;支持组合、反转、羽化和强度。矩形/椭圆/闭合钢笔有区域运动跟踪。
|
||||
- 1.4.1 已有用户实际鼠标确认钢笔可绘制并闭合;1.4.0 已有中心拖动确认。自动化鼠标未可靠进入 FCP 的画面回调,不能把其余手势扩大为实鼠验收。
|
||||
- 1.4.2 修复中间帧起跟、4K细纹误失跟、取消/失跟后的宿主任务结束、偏移片段单帧定位和边界互等。运动分析最高1280×720,先低通再降采样;调色渲染和输出分辨率不变。区域仿射跟踪不是人物分割或非刚性描边。
|
||||
- 1.4.3 蒙版面板随所属模块一起折叠;标题栏蒙版按钮旁显示数量标记,无蒙版时隐藏。计入已停用蒙版,原模块和独立层分别计数,删除/撤销即时更新。
|
||||
|
||||
正式1.4.3通过293项既有原生检查。FCP12.4验证折叠/展开、数量2/1、删除到零和撤销、正常退出冷重开;用户当时完整77276字节预设逐字节一致,286个轨迹键保留,独立合成片段8471字节预设操作前后及重开也一致。293项检查不是对尚未实现的胶片模块的验收。
|
||||
|
||||
最近用户试调位于独立验收项目“大鱼调色_28_中间帧双向”,不能当作随时可复位的空白实例。完整预设和 FCPXML 仅在本机 `.../com.dayu.color/fcp-qa/`:`fold31-before.json`、`fold33-user-after.json`、`fold33-fixture-reopen.json` 等;不要写进 Git、PKG 或覆盖原素材。
|
||||
|
||||
## 3. 源码接入入口
|
||||
|
||||
下表路径相对于当前源码根目录。
|
||||
|
||||
| 入口 | 用途 |
|
||||
| --- | --- |
|
||||
| `大鱼调色/Plugin/DYModel.mm`、`DYModel.h` | 参数描述、分组、默认值、宿主参数与预设 |
|
||||
| `大鱼调色/Plugin/DYUniforms.h` | CPU/Metal ABI;当前自检1104字节,`cm`偏移944的前缀有静态断言 |
|
||||
| `大鱼调色/Plugin/DYRenderer.mm` | Metal设备、渲染调度、LUT资源、输入输出与导出 |
|
||||
| `大鱼调色/Plugin/DYGrade.metal` | 现有 GPU 包装、色彩管理及逐像素处理入口 |
|
||||
| `大鱼调色/Plugin/DYToolRender.inc.h`、`DYToolGPU.h` | 独立工具计划、逐层处理与蒙版混合 |
|
||||
| `大鱼调色/Plugin/DYToolState.mm`、`DYToolState.h` | `DYToolTypes`、工具默认状态、schema1/2、after锚点、蒙版与安全归档 |
|
||||
| `大鱼调色/Plugin/DYInspector.mm` | 模块布局、`toggleSection:`、`DYMaskCountBadge`、蒙版数量刷新 |
|
||||
| `大鱼调色/Plugin/DYToolInspector.inc.h` | 相邻插入、独立层界面及其布局 |
|
||||
| `大鱼调色/Plugin/DYMaskPanel.inc.h` | 蒙版控件、状态和跟踪按钮 |
|
||||
| `大鱼调色/Plugin/DYToolHostMethods.inc.h` | FxAnalyzer 生命周期;胶片任务无需顺带改写 |
|
||||
| `tools/build_kernels.py`、`tools/kernels/` | 可版本恢复的 AIR/Metal 生成与链接,不能只替换某个本机 metallib |
|
||||
| `tools/build_template.py`、`template/sources/` | 原生模板与参数档案;模型改变后重建并核对 |
|
||||
|
||||
当前 `DYToolTypes` 有12类,未注册独立胶片模拟工具。相机输入项里的 Blackmagic Film / Fujifilm F-Log 是色彩管理输入名称,不能据此认定已有胶片模拟模块。完整预设当前为 v4,已有9000/9001/9002自定义载荷及9003画布会话;参数ID、归档兼容和既有 Uniform 前缀不能挪作新用途。
|
||||
|
||||
## 4. Color Finale 参考身份与已有证据
|
||||
|
||||
本次只复核了本机包元数据和可执行文件摘要,未新做胶片函数分析或原版输出对照。
|
||||
|
||||
| 项目 | 本机已核对值 |
|
||||
| --- | --- |
|
||||
| APP | `/Applications/ColorFinale.app`,2.16.2(625),`com.colorfinale.app` |
|
||||
| 主插件二进制 | `/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/MacOS/ColorFinale` |
|
||||
| 插件 Bundle ID | `com.colorfinale.ColorFinaleFxPlug` |
|
||||
| 二进制 SHA-256 | `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f` |
|
||||
| 胶片界面定位线索 | `Contents/PlugIns/ColorFinale.pluginkit/Contents/Resources/zh-Hans.lproj/FTFilmEmulationViewController.strings`(相对APP) |
|
||||
| 既有只读研究 | [ColorFinaleMasksFollowup.md](research/ColorFinaleMasksFollowup.md) 与对应 JSON |
|
||||
| 既有本机 REA 缓存 | `/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101/` |
|
||||
|
||||
现有 REA 证据主要对应蒙版/跟踪,不能当作胶片模块已分析。下一轮先核对目标摘要、可用会话及保留证据;仅复用身份匹配的资料。原版胶片的参数、默认值、阶段、数学、资源依赖和实际图像行为均需要单独取证。
|
||||
|
||||
REA 技能入口:`/Users/mac/.agents/skills/reverse-engineer-anything/SKILL.md`。分析原厂二进制时使用其目标绑定和证据流程;查看当前完整源码则直接读工程,不为普通源码阅读启动逆向工具。静态字符串/类名只是定位线索,不能代替执行行为或图像对照。
|
||||
|
||||
## 5. 父项目可以参考什么
|
||||
|
||||
`research/color-finale/` 内四份研究资料是父工程提交 `4458dc0c0ae7f51046b8cfa4b19626e80f7cf6ca` 的快照,见 [快照来源](research/color-finale/README.md)。其中“已接入”“正式版”等表述属于父工程,不能当作当前大鱼调色的完成项。快照里部分相对链接没有随包文件,应回到父工程查找。
|
||||
|
||||
父工程固定提交 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` 中可只读参考:
|
||||
|
||||
- `research/film-processing-contract.md`、`research/colorfinale-film-chart-findings.md`;
|
||||
- `Core/DYFilm.h`、`Core/DYFilmCPU.hpp`;
|
||||
- `Sources/DYFilmState.h`、`DYFilmState.inc`、`DYPanelFilm.inc`、`DYFilmEditor.inc`;
|
||||
- `Tools/film_test.mm`、`film_panel_test.inc`、`test_film.py` 与 `verification/film-development.json`。
|
||||
|
||||
父合同记录的是独立算法v1:减色→晕光→辉光→暗角→颗粒,父工程根级状态、线性域处理及保守拒绝活跃胶片的LUT导出。可复用其工程组织、时间一致性和边界测试思路;不代表当前工程已有相同链路,更不代表与 Color Finale 数学或同名胶片外观一致。不要把父工程“只在根级”的约束当作用户已经确定的本工程设计。
|
||||
|
||||
## 6. 下一阶段建议的工作顺序
|
||||
|
||||
1. **先建立原版功能与参数表。** 从本机胶片面板定位 Film Look、减色、Halation、Bloom、Vignette、Grain 等候选功能,逐项确认本机版本是否具备、名称、默认、范围、单位、开关、预设及资源依赖;候选清单不是已证实功能清单。
|
||||
2. **确认处理域和顺序。** 跟进面板状态→归档/参数→渲染调度→CPU/Metal/表格资源,明确与输入、工作空间、输出CST、HDR、alpha和混合的关系。先记录已观察、推断、未知,再决定当前大鱼的接入位置。
|
||||
3. **确定模块形态。** 尚未定为全局胶片阶段还是可重复工具。若进入现有工具模块体系,接好独立初始化、眼睛、折叠、蒙版及数量标记;若全局阶段有不同语义,先把具体设计说明写清。保留旧工程缺省时的旁路与原画面。
|
||||
4. **做可比较的图像验证。** 同一输入、同一色彩空间、同一参数分别取得原版与大鱼输出,覆盖灰阶/色块/高光、真实素材、不同分辨率及透明边缘。不能只靠“视觉像胶片”或加一个LUT宣称等价;确属独立重建的部分写明差异。
|
||||
5. **补齐空间与时间行为。** 晕光/辉光若涉及邻域需独立中间纹理和预算;颗粒若随时间变化需精确帧时间、固定种子/状态、随机访问/并发/重开的一致性。零强度与关闭保持中性,保留负值/HDR、alpha与非有限值处理。
|
||||
6. **完成持久化、导出和正式验收。** 新参数ID不复用,归档/预设兼容旧版本;纯色变换与空间/时间效果的Cube能力分别判定,不能把颗粒、晕光等错误写成静态3D LUT。随后做撤销/重做、保存重开、旧工程、蒙版/重复层、FCP实际渲染和正式交付。
|
||||
|
||||
## 7. 构建、交付与恢复入口
|
||||
|
||||
沿用本机全局规则与项目现有工具。本轮是文档更新,未生成新构建或移动已发布标签;下一轮真正改程序后再递增构建与版本。
|
||||
|
||||
```sh
|
||||
# 在源码根目录;模型改变时先更新原生参数档案和模板
|
||||
python3 tools/build_template.py --refresh-model --overwrite
|
||||
# Release构建、由内到外签名、公证Accepted、票据、唯一安装;等待宿主验收
|
||||
python3 tools/deliver.py
|
||||
# 宿主验收通过后才在交付进程输入complete,并补写本轮hostVerification记录
|
||||
python3 Packaging/build_pkg.py --pkg-forge-repo /Users/mac/Documents/dayu-git/repositories/pkg-forge
|
||||
```
|
||||
|
||||
- 正式宿主测试使用固定位置的已公证APP;不从DerivedData启动临时GUI,不强制结束宿主绕过保存。
|
||||
- 产品交付锁:`/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`。Git检查点用 `tools/checkpoint.py` 的仓库锁;只提交已审查的本任务文件。
|
||||
- 签名团队 `B3W25FX5H5`;Application / Installer身份和公证profile按本机规则重新验证。公证profile `codex-dayu-notary-B3W25FX5H5`,钥匙串 `/Users/mac/Library/Keychains/login.keychain-db`。文档中不存凭据。
|
||||
- 正式PKG生成后,标签先推送核验,再用 `Packaging/publish_release.py` 上传草稿;完整下载核对大小及SHA-256后发布,再核验已发布下载。保持现有仓库可见性,不覆盖旧附件或移动标签。
|
||||
- 无LFS/子模块。恢复任一已保存源码:克隆上述远程,检出明确提交或标签,再依 RECOVERY 构建;证书私钥、用户媒体与预设独立保存。
|
||||
|
||||
当前发行包:`/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`。APP公证 `e755670d-8fb3-46d2-95c3-1206f014d16d`,PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655`,均Accepted;签名/票据/Gatekeeper、20项展开验包通过。PKG未再次运行安装器,APP已有独立正式安装和宿主验收。
|
||||
|
||||
[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16已在草稿与发布后完整下载核验。对应证据:[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)、[本轮宿主验收](verification/HostMaskFolding1.4.3.json)、[编译源码恢复](verification/MaskFoldingRecovery.json)、[发行标签恢复](verification/MaskFoldingReleaseRecovery.json)、[RECOVERY](RECOVERY.md)。
|
||||
|
||||
## 8. 新对话的接手提示
|
||||
|
||||
> 阅读 `/Volumes/备份/大鱼调色/大鱼调色/大鱼调色FxPlug4交接.md`。以当前正式1.4.3(33)和已推送源码为基线,接下来分析本机Color Finale 2.16.2(625)的胶片模拟模块,先产出功能/参数/处理域与顺序的证据表,再按现有大鱼调色架构移植并完成正式交付。父“大鱼调色盘”的胶片代码仅作有出处的参考;保留用户现有调色、蒙版、轨迹、相邻叠层、折叠和数量标记行为。
|
||||
@@ -0,0 +1,183 @@
|
||||
# 历史交接归档:截至 1.4.3(33)
|
||||
|
||||
本文归档自提交 `7814a03f95f9f3c3461af2566e7412c1e5c561e1` 的根目录交接文档。原文件 SHA-256:`2c750076d4c44e8f024298f3da23f093f79735bd8b0cb81e26e499b42702f6dd`。正文保留,调整了相对链接。下文“当前”等表述属于各轮历史记录;现行接手入口为 [大鱼调色FxPlug4交接.md](../../大鱼调色FxPlug4交接.md)。
|
||||
|
||||
# 大鱼调色:1.4.3(33)蒙版折叠与数量标记交接
|
||||
|
||||
当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。
|
||||
|
||||
修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。
|
||||
|
||||
FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。
|
||||
|
||||
入口:[本轮说明](../../research/MaskFolding1.4.3.md)、[正式宿主验收](../../verification/HostMaskFolding1.4.3.json)、[远端源码恢复](../../verification/MaskFoldingRecovery.json)、[副本清理](../../verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。
|
||||
|
||||
本轮正式安装包 `../发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`;PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` Accepted,签名/票据/Gatekeeper与20项展开验包通过。APP已有独立正式安装及宿主验收,本轮未再次运行系统安装器。Release标签 `v1.4.3-mask-fold-20261102` 已发布,标签提交 `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`;[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16在草稿和发布后均完整下载校验14,340,650字节及SHA-256一致。发行标签已从远端独立恢复244文件,全部字节比较及full/strict fsck通过,见 `verification/MaskFoldingReleaseRecovery.json`。核验下载副本和恢复clone已清理,仓库可见性不变。
|
||||
|
||||
## 以下为1.4.2(31)的历史交接
|
||||
|
||||
# 大鱼调色:1.4.2(31)中间帧与真实素材跟踪修复交接
|
||||
|
||||
当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。
|
||||
|
||||
中间起点以宿主分析首帧为准,不再依赖预览缓存。4K细纹先低通再按比例缩到最高1280×720运动分析,调色渲染输出分辨率不变;拟合容差与置信度一致归一化,保留失效与过期写入保护。失跟显示具体原因、保留可信帧数并正常结束宿主任务;首帧反向使用有效种子范围正常结束;单帧经源时间到时间线转换,已有相同轨迹也正常前进。
|
||||
|
||||
FCP12.4正式31版在同一4K60素材的25p时间线中:中间双向285键、首帧正向285键;取消保留159键后任务闲置,可重新跟完整段;切换画面在2秒失跟、保留50键,连续重试无弹窗且任务闲置。带4秒前置片段的连续单帧7:17→7:18→7:19→7:18;首帧反向保持响应。正常退出冷重开完整预设77087字节逐字节一致。原工程、原媒体与原65键设置保留,验收只在独立副本进行。候选27–30发现的生命周期、单帧和边界问题均有记录,未发布候选包。
|
||||
|
||||
新增层相邻插入、加大的蒙版面板、实际鼠标钢笔/中心拖动确认等1.4.1与1.4.0历史保留。仍不是完整Color Finale移植或人物分割,遮挡/变形可能需要手工修正再从当前帧继续。Motion、Intel、变速/裁剪/非方像素工程未实机验收。
|
||||
|
||||
入口:[实现与边界](../../research/TrackingMidpoint1.4.2.md)、[正式宿主验收](../../verification/HostTrackingMidpoint1.4.2.json)、[原生及离线聚合](../../verification/TrackingMidpoint1.4.2.json)、[编译源码远端恢复](../../verification/TrackingMidpointRecovery.json)、[本轮清理](../../verification/TrackingMidpointCleanup.json)、[恢复方法](../../RECOVERY.md)。
|
||||
|
||||
|
||||
本轮正式PKG `../发行包/大鱼调色-1.4.2.pkg`:14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`;PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` Accepted,签名/票据/Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装与宿主验收。Release标签 `v1.4.2-tracking-midpoint-20261102` 已发布,标签提交 `38bf12326e74f2f026bc4c7627729121b6aa261d`;[Release370](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.2-tracking-midpoint-20261102) / 附件15在草稿与发布后均完整下载核对14,339,640字节及SHA-256一致,仓库可见性保持原状。发行标签从远端独立恢复237个文件,见 `verification/TrackingMidpointReleaseRecovery.json`,全部字节比较和full/strict fsck通过;核验下载副本与恢复clone已清理。
|
||||
|
||||
## 以下为1.4.1(26)的历史交接
|
||||
|
||||
# 大鱼调色:1.4.1(26)相邻插入、蒙版面板和钢笔修复交接
|
||||
|
||||
当前正式版为1.4.1(26)。APP编译源码 `0eb56aed126c825ca89712ce90f8cc1c05b03d89` 已推送;公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326` Accepted,正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。PKG和Release结果以本版本验证记录为准。
|
||||
|
||||
新添加工具紧接点击处插入,重复点击原层也插在原层与既有子层之间;参数初始化且相互独立。schema2保存after锚点,实际渲染也插入对应阶段;旧schema1末尾工具保持原位置与画面。蒙版参数和数值为13pt、按钮32–36pt、滑杆单独整行,跟踪按钮两列并保留完整中文。
|
||||
|
||||
钢笔入口现可进入空白草稿绘制态,放点/拖柄、首点或Return/面板完成闭合、Delete回退、取消/重画、即时预览、单次撤销及连续手势已实现。修正画面提示文字上下翻转。同步内存草稿与延后作者提交分离,避免宿主回调内读写、过期目标与跨帧草稿覆盖。
|
||||
|
||||
跟踪按Color Finale只读行为证据独立适配实际路径范围、300特征、亚像素精炼、21×21光流及最高4K灰度帧,保留严格失效与过期写入保护。独立CPU/Metal18项通过。不能称为完整Color Finale移植;B样条、编组、人物/图像/外部蒙版、完整轨迹区段编辑等仍有差异,未做同一真实视频的完整轨迹等价对照。
|
||||
|
||||
正式版281项原生检查通过。FCP12.4实测相邻插入/初始化独立参数、大号面板/绘制态、钢笔蒙版正向99键、一次撤销和重做、保存重开完整预设逐字节一致。**用户已用实际鼠标确认钢笔可以绘制并闭合**,原答复“可以绘制并闭合”;自动化鼠标未触发画面回调。其它曲柄/删除等手势的模拟宿主原生OSC回归通过,不扩大为全部实机手势验收。1.4.0用户确认的中心拖动历史保留。
|
||||
|
||||
入口:[本轮实现](../../research/MaskWorkflow1.4.1.md)、[Color Finale证据与差异](../../research/ColorFinaleMasksFollowup.md)、[实际宿主记录](../../verification/HostMaskWorkflow1.4.1.json)、[远端独立恢复](../../verification/MaskWorkflowRecovery.json)、[副本清理](../../verification/MaskWorkflowCleanup.json)、[恢复与构建](../../RECOVERY.md)。正式包和下载核验见Package.json/Release.json。
|
||||
|
||||
## 以下为1.4.0(24)的历史交接
|
||||
|
||||
更新日期:2026-11-01,Asia/Shanghai。当前 APP 已完成正式签名、公证、票据、唯一安装与宿主工作流检查;PKG/Release 状态以本仓库相应验证记录为准。
|
||||
|
||||
## 本轮结果与入口
|
||||
|
||||
十二个模块标题右侧已有“添加蒙版”和“再加一层”。第二个HSL等新增工具使用独立UUID、初始化参数、折叠/启停/复位/删除和自己的蒙版;新增工具依次排在原模块之后。原固定float ID、9001资产和1104字节ABI不变,无蒙版旧工程保留原融合内核。新增一级使用Rec.709/Gamma2.4同域默认,新增肤色保护强度零。
|
||||
|
||||
六种蒙版是椭圆、矩形、钢笔、线性渐变、HSL、亮度;支持相加/减去/相交、启停、反转、羽化、强度和几何数值。几何跟踪从父库固定节点 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` 移植Metal光流和仿射RANSAC,并适配本产品FxAnalyzer生命周期;支持正向、反向、双向、单帧、取消及单次撤销,过期目标不回写。当前没有新增对Color Finale二进制的依赖,父工程未修改。
|
||||
|
||||
作者状态:`DYToolState.h/.mm`,9002静态工具文档、9003不保存的OSC会话。渲染:`DYToolRender.inc.h`、`DYToolGPU.h`、`DYGrade.metal`、`tools/build_masked_kernel.py`。面板:`DYMaskPanel.inc.h`、`DYInspector.mm`。原生画面与跟踪:`DYToolOSC.inc.h`、`DYToolHost*.inc.h`、`DYToolFlow.inc.h`、`DYTracking.metal`、`MaskCore/`。归档使用安全类白名单,预设v4包含完整工具/蒙版/轨迹,兼容v1–3。
|
||||
|
||||
实际编译源码 `dbf25fe6719f17075362538dad0404951102524d` 已推送。APP公证 `40fdaaaa-1821-4cc8-bec3-c5dc6d8b9f77` Accepted;正式位置仍为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID仍为 `com.dayu.color`。Release前后均通过222项原生检查。FCP12.4独立合成工程实测HSL第二层0→32而原层0,独立椭圆/矩形、数值编辑、正向99键、双向100键、新增层单帧2键与播放头前进;一次撤销/重做及正常退出重开后完整预设逐字节一致。
|
||||
|
||||
**用户已确认实际鼠标可拖动蒙版中心。** 初次自动化坐标点击未进入宿主回调,随后用户实测“可以拖动,蒙版随鼠标移动”;真实hit/mouseDown/mouseDragged日志已捕获,原层中心由0.6/0.5变成0.378/0.379,新增层矩形仍为0.5/0.5。用户试调结果保留,不再自动复位或重启宿主。旋转、缩放和钢笔手势未实机确认,原生模拟宿主相关检查通过;不要扩大为所有手势都已实测。Motion、Intel、变速/裁剪/非方像素工程未实测;跟踪不含透视/剪切。新增工具标量为静态作者值,只有蒙版轨迹随时间求值;空间蒙版拒绝Cube导出,应保存完整预设。
|
||||
|
||||
旧模板实例可能保留关闭OSC的10005值,可先存完整预设,再应用新版效果并载入;不自动覆盖旧效果。当前模板使用父库Boolean发布契约,最新插件解析。中间20–23版均未发布最终包,旧生成APP备份在24版宿主确认后清理。远端独立恢复210文件、strict/full fsck、模型模板和着色器重建一致,临时clone已清理。
|
||||
|
||||
证据:[实现说明](../../research/ToolMaskImplementation.md)、[移植来源](../../research/ToolMaskPort.json)、[正式安装](../../verification/Delivery.json)、[222项原生检查](../../verification/InstalledSelfTest.json)、[宿主结果及缺口](../../verification/HostToolMasks.json)、[远端恢复](../../verification/ToolMaskRecovery.json)、[副本清理](../../verification/ToolMaskCleanup.json)。打包入口 `Packaging/build_pkg.py`,发布入口 `Packaging/publish_release.py`;版本标签、PKG公证和下载摘要见 `verification/Package.json`、`verification/Release.json`,不要将历史版本记录当作当前发行成功。
|
||||
|
||||
## 以下为1.3.1接手时的历史快照
|
||||
|
||||
下面各节中的“当前”“下一阶段”和“尚未实现”均指本轮开发前的1.3.1(19),保留作为兼容背景;最新实现以上文和实现说明为准。历史说明整理本身未编译、替换或操作当时的FCP窗口。
|
||||
|
||||
## 1. 下一阶段目标与当前边界
|
||||
|
||||
用户最新需求:继续增加**蒙版、跟踪,以及自行添加工具的能力**。明确例子是:一层 HSL 不够时,可以再添加一个 HSL,分别调整。
|
||||
|
||||
这里的核心是“同类工具可有多个独立实例”。新增 HSL 不能只是另一张面板共用原 HSL 的参数。蒙版应能绑定到具体工具实例,跟踪结果应驱动对应蒙版。
|
||||
|
||||
**上述功能尚未在“大鱼调色”实现。** 当前 1.3.1 是固定模块调色器;“大鱼调色盘”的图层、蒙版和跟踪代码只是下一阶段参考,不能把父库已完成的功能写成当前产品已完成。
|
||||
|
||||
建议开发次序:工具实例和第二个 HSL → 每实例蒙版 → 宿主画面控件 → 蒙版跟踪 → 持久化、撤销和正式交付。设计、源码入口、迁移风险及验收清单见 [蒙版跟踪与工具栈续作方案](../../research/MaskTrackingAndToolStack.md)。其中标为“建议”的内容是接手方案,不代表用户已经逐项指定所有类型和操作。
|
||||
|
||||
## 2. 实际项目与可恢复节点
|
||||
|
||||
| 项目 | 当前值 |
|
||||
| --- | --- |
|
||||
| 主源码目录 | `/Volumes/备份/大鱼调色/大鱼调色` |
|
||||
| 远程 / 分支 | `https://dayu.media/git/dayu/dayu-color.git` / `main` |
|
||||
| 文档整理前 main | `bbdd47d1d74e241f1f144bb2c245204e86973b3f` |
|
||||
| 本次交接标签 | `handoff-mask-tracking-tools-20261101`;最终提交可通过此标签解析 |
|
||||
| 当前正式版本 | **1.3.1(19)** |
|
||||
| APP 实际编译源码 | `dbb7ca4a995ef832178a32f35939aed7d3a85012` |
|
||||
| 正式版本标签 | `v1.3.1-browser-recents-20261101` |
|
||||
| 正式版本标签提交 | `281721bda11484c23f294b4f0d9e0b30ef829288` |
|
||||
| 主 ID / 插件 ID | `com.dayu.color` / `com.dayu.color.XPC` |
|
||||
| 唯一正式 APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app` |
|
||||
| 唯一 FCP 模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 工程 / Scheme | `大鱼调色.xcodeproj` / `Wrapper Application`,Release |
|
||||
|
||||
工作目录、APP 编译提交、发行标签提交与后续文档提交是不同概念。恢复正式程序源码取编译提交;恢复含包记录的发行节点取版本标签;继续下一阶段从最新 main 或本次交接标签开始。已有历史版本、标签和安装包保留。
|
||||
|
||||
## 3. 已交付行为,后续须保留
|
||||
|
||||
- 一级调色将输入转换、工作空间、一级参数和输出转换放在一张卡片中。使用大鱼 CST 的固定源码数学取代新实例的输入还原 LUT;四个可见旁路选项已移除,一级眼睛统一启停。旧输入 LUT、旧参数 ID 和兼容解释仍保留。
|
||||
- 新实例及全部还原:输入 **Sony S-Log3(28)/ S-Gamut3.Cine(27)**;工作 **DaVinci Intermediate(10)/ DaVinci Wide Gamut(16)**;输出 **Gamma 2.4(1002)/ Rec.709(22)**;自动色调映射关闭。不要根据曲线名称覆盖用户手选色域。
|
||||
- 一级白平衡采用原 CST 色轮,保留原图、+104° 方位、/5 精细拖动、双击复位和方向键微调。底部可见“复位”只将该色轮方向、强度置零。原 BASIS 强度平方×4 的数学不变。
|
||||
- 蜘蛛盘来自“大鱼调色盘”,默认联动 6×6、31 节点;两轴可分别选择 6/8/12/16/24。固定、多选、同列自由点联动、整环/整列、复位、归档和 Cube 导出已接入。中性盘精确直通。
|
||||
- 新实例默认展开**一级调色、蜘蛛盘校色仪、基础调整**,其他模块折叠,全部眼睛打开。标题仅折叠,眼睛仅启停;状态独立保存。黑白混合默认 0%。
|
||||
- 风格 LUT 最多五层。库路径 `/Users/mac/Movies/大鱼调色LUT/look LUTs`。后台导入、取消、最后一次选择生效和 UTF-8/16/32 等编码兼容均保留。
|
||||
- LUT 浏览器在 FCP 中使用独立宿主浮动窗口。网格/列表、缩略图大小、可调整侧栏、窗口/布局偏好按库保存。最近使用分类第一位,成功应用后去重、最新优先,最多 40 个;全部及文件夹也优先显示最近项。旧版未记录的所有历史不能凭空补造;首次打开可从已有当前 LUT 初始化。
|
||||
- 33³ Cube 导出包含开启的 CST、一级白平衡、蜘蛛盘及其它逐像素色彩操作,遵循眼睛开关,折叠不影响导出;不含纹理、清晰度、去朦胧和逐画面统计。将来出现空间蒙版/跟踪后必须重新定义并明确提示导出边界。
|
||||
|
||||
## 4. 当前实现结构与兼容约束
|
||||
|
||||
| 文件 / 位置 | 接手用途 |
|
||||
| --- | --- |
|
||||
| `大鱼调色/Plugin/DYModel.h/.mm` | 234 个固定 float 参数、参数 ID、默认值、资产与界面归档 |
|
||||
| `大鱼调色/Plugin/DYUniforms.h` | 当前 CPU/Metal 缓冲 1104 字节;原 944 字节前缀保持;CST 在偏移 944 追加 |
|
||||
| `大鱼调色/Plugin/DYInspector.mm` | 固定卡片、标题/眼睛、预设 v3、LUT 提交与浏览器宿主 API |
|
||||
| `大鱼调色/Plugin/DYNewPanels.inc.h` | 一级白平衡色轮、可见复位、蜘蛛盘面板 |
|
||||
| `大鱼调色/Plugin/DYColorTables.mm` | HSL、白平衡、颜色分级等 LUT 构建与缓存 |
|
||||
| `大鱼调色/Plugin/DYRenderer.mm` | CST 前段、固定调色链、蜘蛛盘、Metal 资源、预览、Cube 导出 |
|
||||
| `大鱼调色/Plugin/DYGrade.metal`、`tools/kernels/*.ll` | Metal 边界和已版本化运算内核;当前固定调色链有融合执行,尚非工具栈 |
|
||||
| `大鱼调色/Plugin/DYPlugIn.mm` | FxTileableEffect、按宿主时间生成渲染状态、归档白名单及导出 |
|
||||
| `大鱼调色/Plugin/DYLUTBrowser.mm`、`DYLUTLibrary.mm` | 窗口/布局、异步确认、最近使用;不要混入工具作者数据 |
|
||||
|
||||
当前两项 custom 参数:`9000 DYInspectorToken`(schema 2,folds 字典),`9001 DYAssetState`(LUT paths、spiderMesh、spiderLinked)。**9001 注册为 NOT_ANIMATABLE**,不能简单把动态工具塞进去就宣称支持宿主参数关键帧。预设 JSON 版本是 **3**;插件临时渲染状态的 schema 是 **1**;它们是不同格式的版本号。
|
||||
|
||||
当前 HSL 只有一组 `hsl*` 固定字段和一份 HSL 查表。重复工具需要独立身份、参数、缓存和撤销目标。父库 `DYGrade` 是 1032 字节,与本项目 `DYUniforms` 不同;不能直接复制其参数号、POD、Bundle ID 或整个插件入口覆盖当前产品。
|
||||
|
||||
归档、预设、复制、相等性、hash、允许解码类和渲染状态都必须一起演进。旧字段与数学 ID 不重排;旧工程无新增状态时保留原画面。UI 折叠键在多工具场景下应按实例 ID 隔离,不能全部共用 `hsl`。
|
||||
|
||||
## 5. 可复用参考:父级“大鱼调色盘”
|
||||
|
||||
只读目录 `/Volumes/备份/大鱼调色/大鱼调色盘`;远程 `https://dayu.media/git/dayu/dayu-colorplate.git`。本次核对干净 HEAD `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7`。其正式 2.0.0(68)编译源码为 `d05994d5f4547687511bef524efe8c881e8a5c9c`,标签 `v2.0.0-build68`。
|
||||
|
||||
先读父库 `HANDOFF.md`、`research/tracking-host-lifecycle.md` 及 `verification/release-2.0.0-build68.json`。该库记录了矩形/椭圆/闭合钢笔区域、前后/双向/单帧、位置/旋转/独立横纵缩放、取消保留可信段和一次撤销等实现与宿主证据。它输出仿射分解后的这些变换,不能宣传为透视/剪切跟踪或任意遮挡均可靠。
|
||||
|
||||
下一阶段按具体功能复用其作者状态、蒙版数学、OSC 和 FxAnalyzer 生命周期适配,源文件导航见续作方案。父库现有交接另有胶片/CMS等任务,**不属于本次“大鱼调色”新增范围**。不改动兄弟仓库、不替换兄弟 APP、不恢复或覆盖其用户调色文件。
|
||||
|
||||
## 6. 验证现状与用户工作保护
|
||||
|
||||
| 证据 | 本版本实际覆盖 |
|
||||
| --- | --- |
|
||||
| `verification/InstalledSelfTest.json` | 正式路径常规 158 项原生检查 |
|
||||
| `verification/BrowserNative.json` | 正式路径 201 项,含独立 CST 像素参照、色轮/蜘蛛盘、归档与渲染 |
|
||||
| `verification/BrowserCustomization.json` | 23 项离屏浏览器、几何/布局/历史检查 |
|
||||
| `verification/BrowserRegression.json` | 67 项回归,含 3,025 项目录虚拟化、取消及应用确认 |
|
||||
| `verification/SpiderMath.json` | 25 种网格、204,683 项数学检查 |
|
||||
| `verification/HostBrowserAndReset.json` | FCP 12.4 的 Sony 默认、可见复位、独立窗口及系统缩放、两种布局、最近排序、浏览器关闭重开 |
|
||||
| `verification/BrowserRecovery.json` | 编译节点远端恢复 178 文件、fsck、Metal 重建与正式库一致 |
|
||||
| `verification/BrowserReleaseRecovery.json` | 发行节点远端恢复 184 文件、fsck |
|
||||
|
||||
自由标题栏/窗口边缘拖动未由自动化独立确认。用户开始操作浏览器后,保留其当时的网格布局、约 197.97 缩略图大小、窗口位置和 LUT 选择,**未再次重启 FCP 或全部还原**。这些是当时观察,不是要求下一轮强制恢复的偏好;接手以用户最新操作为准。浏览器关闭重开已测,不写成此次已重新冷启动宿主。Motion、Intel、旧系统未验收。
|
||||
|
||||
测试库位于 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/大鱼调色_验收.fcpbundle`;本轮独立项目 `大鱼调色_1.3.1_浏览器与复位`。只读/引用现有 LUT,未导入或删除用户 LUT。新功能用独立合成运动素材验收,不修改用户正在工作的调色、跟踪或媒体。
|
||||
|
||||
## 7. 正式交付与发布记录
|
||||
|
||||
- APP 公证:`9e93dc7f-04a3-44f9-a1e4-792bd7b31533`,Accepted。
|
||||
- PKG 公证:`85cad776-c3d7-4037-9643-24041b269002`,Accepted。
|
||||
- 正式包:`/Volumes/备份/大鱼调色/发行包/大鱼调色-1.3.1.pkg`;14,073,683 字节。
|
||||
- SHA-256:`954b10c581f31d23a8c417a6f37b24fae19939786dce8733b4d6f09c7ed3adae`。
|
||||
- [1.3.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.3.1-browser-recents-20261101),Release ID 366,附件 ID 12;附件下载链接见 `verification/Release.json`。
|
||||
- APP/PKG 的 Developer ID、票据、Gatekeeper、20 项展开验包通过。草稿与正式链接均完整下载校验,只上传一次。正式 APP 已安装,本轮未重复执行 PKG 安装器。
|
||||
|
||||
详细恢复与历史仍在 [RECOVERY.md](../../RECOVERY.md)。本次整理不修改上述正式发行标签、附件或程序版本。
|
||||
|
||||
## 8. 下一位接手的操作入口
|
||||
|
||||
1. 读取本文件、续作方案和本机 `/Users/mac/.codex/AGENTS.md`;核对 main、本地未提交改动、远端及同产品任务,保留用户正在操作的 FCP 状态。
|
||||
2. 先完成工具实例/参数/顺序/迁移合同,以“两个独立 HSL”形成可验收的第一阶段;避免先给所有模块套一个全局蒙版而日后重做。
|
||||
3. 再按续作方案接蒙版、OSC、精确时间分析、取消和单次 Undo/Redo。每阶段提交并立即推送;只暂存本任务文件。
|
||||
4. 模型修改后刷新模板:`python3 tools/build_template.py --refresh-model --overwrite`。
|
||||
5. 编译和 CLI 检查可在固定缓存执行;用户可见验收必须从正式安装的已公证版本进行。正式交付使用 `python3 tools/deliver.py`,它持有产品锁并等待宿主验收输入 `complete`。
|
||||
6. PKG 入口:`python3 Packaging/build_pkg.py --pkg-forge-repo /Users/mac/Documents/dayu-git/repositories/pkg-forge`。发布入口:`python3 Packaging/publish_release.py --tag <新标签> --notes <对应说明>`。不要复用本次版本号、覆盖旧包或移动旧标签。
|
||||
7. 产品身份、正式路径、逐层签名、公证、票据、PluginKit 唯一登记、生成副本清理、Release 完整下载及远端恢复都继续按全局约定执行。证书/profile/权限在下次发布时重新复核,凭据不进文档或源码。
|
||||
|
||||
可直接用于下一聊的任务描述:
|
||||
|
||||
> 先读“大鱼调色FxPlug4交接.md”和 research/MaskTrackingAndToolStack.md,从当前 1.3.1(19)继续。我要能添加多个独立工具,例如第二个 HSL,并给具体工具添加蒙版及蒙版跟踪。参考父级“大鱼调色盘”,保留当前 CST、折叠/眼睛、蜘蛛盘、LUT 浏览器和最近使用行为,保护已有工程和当前用户操作,分阶段验证并完成正式交付。
|
||||
@@ -0,0 +1,50 @@
|
||||
# 大鱼调色FxPlug4交接:1.5.0胶片与通道混合器
|
||||
|
||||
2026-11-02(Asia/Shanghai)。当前正式1.5.0(34),APP已经签名、公证、粘附并安装,FCP12.4宿主验收完成。安装包/Release最终结果读取 `verification/Package.json`、`verification/Release.json`,与APP编译节点分别记录。
|
||||
|
||||
## 身份与恢复
|
||||
|
||||
- 源码:`/Volumes/备份/大鱼调色/大鱼调色`;远程 `https://dayu.media/git/dayu/dayu-color.git`,main。
|
||||
- 正式:`/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、XPC `com.dayu.color.XPC`。
|
||||
- APP实际编译源码:`06d531c443b0bb2f179022a4e64148394f5d0690`。
|
||||
- APP公证:`164abf2b-4e67-4504-b72a-04122da9e381` Accepted;团队B3W25FX5H5。
|
||||
- 固定构建缓存:`/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。
|
||||
- 模板唯一位置:`/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。
|
||||
- 无LFS/子模块;程序不依赖Color Finale安装、REA缓存或父“大鱼调色盘”。
|
||||
|
||||
正式PKG `../发行包/大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`。PKG公证 `05f849da-5567-4351-9556-742d17b95723` Accepted,20项展开验包通过;本轮未再次运行系统安装器。[Release372](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102) / 附件17已发布,草稿和正式链接均完整下载校验一致。发行标签 `v1.5.0-film-mixer-20261102` 对应 `85b6590944c4fb64825cf45f61c5280d4ffaa824`,远端独立恢复264文件、逐字节核对和full/strict fsck通过。详见 `verification/Release.json`、`FilmMixerReleaseRecovery.json`、`ReleaseDraftDownload1.5.0.json`。核验用下载副本、恢复clone及独立构建目录已清理;已知本产品根目录仅保留唯一正式APP,详见 `verification/FilmMixerCleanup.json`,不宣称全盘唯一。
|
||||
|
||||
## 本轮实现
|
||||
|
||||
通道混合器采用RGB三输出×三输入矩阵,含保持亮度、保持饱和度与混合。胶片含减色、晕光、辉光、颗粒、暗角,五页参数各自启停。两类工具沿用原启停、折叠、蒙版、数量标记、区域跟踪和相邻初始化层;工具类型由12追加到14,原索引不移动。
|
||||
|
||||
42个宿主参数只追加,旧参数ID、944字节GPU前缀及1104字节完整旧Uniform前缀保留。完整预设v5兼容v1–v4;读旧预设时新参数恢复中性。schema1尾层、schema2锚点、已有9000–9003载荷保留。新工具置于既有显示域/蜘蛛盘之后、历史尾层之前,不能因此推断UI中全部旧工具都按视觉顺序渲染。
|
||||
|
||||
减色与颗粒用既有sRGB编码边界,晕光/辉光/暗角在线性纹理上。减色是原SubSat归一化幂函数,活跃时限幅0–1。晕光为高斯散射后R/G通道加权归一化;辉光为稀疏预滤→向量Sobel→扩散→相加。颗粒使用PCG/Box-Muller、MPS扩散、精确有理帧和规范化全帧坐标;与原版CI内部切块的空间噪声排列不做全局逐像素等效承诺。暗角复用相同系统CIVignetteEffect。纯矩阵和减色支持Cube,活跃空间/时间效果及蒙版明确拒绝Cube。
|
||||
|
||||
原厂八种印片外观属于另外的ACES输出资源,本版五组处理未纳入这些外观。不能把F-Log输入菜单当作胶片外观,也不能将本工程接入域声称为原版任意ACES链等效。来源、证据ID与边界见[研究记录](research/ColorFinaleFilmMixer.md)。
|
||||
|
||||
## 验收与用户资料
|
||||
|
||||
- 349项原生检查;四种尺寸64×48、63×47、1×17、17×1共184项原版组件对照通过。
|
||||
- FCP12.4正式版加载;用户234个既有参数、资产路径、蜘蛛盘和蒙版载荷逐项/逐字节保持。界面显示286个可信跟踪键,载荷共287键(含作者键)。
|
||||
- 新模块、五页胶片控制、独立混合器初始化、胶片椭圆蒙版、折叠数量1、删除/撤销/重做通过。
|
||||
- 1080p/25fps/4秒ProRes正式导出验证grainHold2:0/1、2/3、4/5帧分别相同,组间不同。
|
||||
- 960×540/25fps/4秒组合导出全部帧解码通过;三个项目FCPXML1.14原生回导严格校验与比较通过。
|
||||
- 正常退出冷重开,组合预设8987字节、颗粒预设8420字节前后均逐字节相同。
|
||||
|
||||
记录:`verification/HostFilmMixer1.5.0.json`、`FilmMixerNative.json`、`FilmMixerReference.json`、`FilmMixerRecovery.json`。私有完整预设与FCPXML只在本机 `.../com.dayu.color/fcp-qa/`,文件名前缀 `film-mixer-`。不写入Git、PKG或覆盖用户原素材。
|
||||
|
||||
## 源码入口
|
||||
|
||||
- `DYFilmTypes.h`、`DYFilmMath.h`:状态/中性判断与共享数学。
|
||||
- `DYFilmKernels.inc.h`:原生Metal点处理、PCG、辉光预滤与Sobel;由DYGrade.metal包含,经tools/build_kernels.py构建。
|
||||
- `DYFilmRender.inc.h`:惰性缓冲、CI/MPS空间阶段、内存预算、混合及现有蒙版。
|
||||
- `DYFilmTime.h`、DYPlugIn.mm:冻结宿主帧长/起点,精确签名帧索引和1–5帧保持。
|
||||
- DYModel.mm / DYUniforms.h:只追加描述符、Uniform;DYInspector.mm五页分组和RGB三输出分组。
|
||||
- DYToolState.mm / DYToolRender.inc.h:新类型、独立初始化、相邻锚点、尾层和Cube限制。
|
||||
- tools/verify_film_reference.mm:本机原版只读CI/Metal对照,不参与产品运行。
|
||||
|
||||
按本机全局规则继续交付。`tools/deliver.py`持有产品锁,正式宿主完成后才输入complete;其自检输出现在会先保存诊断再判定,避免失败时丢失输出。首次预检曾在与恢复自检并行时退出1,旧工具未保留当次JSON;未替换旧版。随后串行349项、正式安装349项和独立恢复349项全部通过,不把未知原因写成已证实的程序缺陷。
|
||||
|
||||
上一阶段详细基线保留于[1.4.3胶片接续原文](research/handoffs/DayuColorFilmStart1.4.3-20261102.md),更早历史见[历史交接](research/handoffs/DayuColorThrough1.4.3-20261102.md)。
|
||||
+5
-3
@@ -4,9 +4,9 @@
|
||||
|
||||
正式安装目标:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。插件依赖唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,滤镜 UUID `1C17B73B-F229-4C09-A434-EAF6DFF5F22A`。
|
||||
|
||||
四个发布入口依次是用户技能要求的两个空绑定版权菜单、大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器与 LUT 文件状态分别保存为 `DYInspectorToken`、`DYAssetState`;两个双重 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部 196 个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
|
||||
两个发布入口为大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器、LUT 文件与工具蒙版状态分别保存为 `DYInspectorToken`、`DYAssetState`、`DYToolDocument`;原生 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部278个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
|
||||
|
||||
版权结构保留完整原生 Rig 与两菜单:作者 ID `10081`、网站 ID `10082`,共同位于 Rig `10080`。菜单精确显示 `大鱼先森Media` 与 `dayu.media`,没有绑定任何画面通道。结构核验逐字段反向重编号对照原始 Rig。版本沿用技能原生效果器母版的 `5.13 / 5.6.7`,没有从较高版本参考传播顶层版本。
|
||||
按2026-11-02用户明确要求,删除作者和网址的两个展示菜单、Rig节点与相应发布项;生成器也停止添加这些内容,历史参考 `CopyrightRig.xml` 不再参与生成。模板顶层降为 `5.11 / 5.4.5`,有本机Color Finale同类EffectSource/FxPlug/custom参数真实样本作结构依据;移除较新且本壳未使用的3D/HDR编辑提示,保留原factory和场景节点内部版本、效果源及色彩设置。来源摘要见 `sources/Provenance.json`。这降低模板格式门槛,旧FCP仍受本程序Apple Silicon、macOS14.6及FxPlug/宿主API要求约束;未实机覆盖的版本不宣称兼容。
|
||||
|
||||
生成入口:
|
||||
|
||||
@@ -16,6 +16,8 @@ python3 tools/build_template.py --output /绝对路径/大鱼调色.moef
|
||||
|
||||
工程模型有变更时,先审查变更,再加 `--refresh-model` 重新导出实际注册表与自有归档。它只编译并执行短时命令行元数据工具,仅用于本工程的参数元数据导出。既有输出必须明确加 `--overwrite`;普通重建直接复用版本化原始归档并核对模型源码哈希,以保持模板字节稳定。
|
||||
|
||||
`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、四项发布、真实空绑定、无内容图层选中、源引用及无动画。实际 FCP 验收和导出记录见工程根目录 `verification/Host.json` 与 `HostThemeLUT.json`。
|
||||
`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、两项发布、无版权展示、无内容图层选中、源引用及无动画。实际 FCP 验收以工程根目录对应版本的宿主记录为准。
|
||||
|
||||
全局技能的选择状态检查器目前只接纳较新模板,对5.11返回版本guard未知;该原始结果保留在 `SkillAudit.json`,没有改写成技能工具通过。本项目以真实ColorFinalePro 5.11样本的相同字段和选择位建立 `tools/verify_template.py`,独立结果为 `verification/Compatibility.json`、`SavedSelection.json`;除版本guard外无其他结构错误。
|
||||
|
||||
`large.png`(640×360)与 `small.png`(240×135)使用本产品的光谱鱼和“大鱼调色”品牌图。原图和生成提示词在 `design/`,运行 `python3 tools/build_brand_assets.py` 可重建。`verification/Preview.json` 记录来源与导出哈希;正式安装时设置预览文件锁,防止宿主自动覆盖。
|
||||
@@ -17,13 +17,22 @@
|
||||
"feature": "two unbound copyright popup widgets",
|
||||
"path": "/Users/mac/.codex/skills/ae-to-motion/assets/publication/copyright-info/版权信息.moti",
|
||||
"sha256": "fd0e0414e957dbe1b5837250a38a4799defceedc0e09f7a6c7b9e1baf8b5e4c0",
|
||||
"retained": "CopyrightRig.xml"
|
||||
"retained": "CopyrightRig.xml (historical source only; no longer generated or shipped in the template)"
|
||||
}
|
||||
],
|
||||
"versionPolicy": {
|
||||
"ozml": "5.13",
|
||||
"displayversion": "5.6.7",
|
||||
"basis": "skill native effect source; no version value inferred from vendor or CST source"
|
||||
"ozml": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"basis": "Identity-verified local Color Finale EffectSource/FxPlug/custom-archive template; no vendor preset/archive copied",
|
||||
"referenceTemplate": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinale/ColorFinale.moef",
|
||||
"referenceSHA256": "61b07cab981566dd4fd80f08fdcb9be9f26f3f0389062420dafc3331aaa95749",
|
||||
"removedLaterOptionalHints": [
|
||||
"Object3DEnvironments",
|
||||
"DRTSupport",
|
||||
"onHDRDisplay",
|
||||
"missingDynamicRangeType"
|
||||
],
|
||||
"oldFCPActuallyTested": false
|
||||
},
|
||||
"runtimeDependency": {
|
||||
"app": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
@@ -31,5 +40,10 @@
|
||||
"pluginUUID": "1C17B73B-F229-4C09-A434-EAF6DFF5F22A",
|
||||
"noVendorRuntimeDependency": true
|
||||
},
|
||||
"scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate"
|
||||
"scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate",
|
||||
"copyrightPolicy": {
|
||||
"userRequestedRemoval": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"rigGenerated": false
|
||||
}
|
||||
}
|
||||
@@ -852,7 +852,8 @@
|
||||
},
|
||||
{
|
||||
"cmTab": 2,
|
||||
"default": 0,
|
||||
"default": 1,
|
||||
"hostDefault": 0,
|
||||
"key": "cmtoneMapping",
|
||||
"kind": "popup",
|
||||
"max": 1,
|
||||
@@ -3062,18 +3063,587 @@
|
||||
"pid": 2188,
|
||||
"step": 0.01,
|
||||
"title": "色彩平衡"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "mixer00",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 0,
|
||||
"offset": 1104,
|
||||
"pid": 2276,
|
||||
"step": 0.01,
|
||||
"title": "红输出 ← 红输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer01",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 0,
|
||||
"offset": 1108,
|
||||
"pid": 2277,
|
||||
"step": 0.01,
|
||||
"title": "红输出 ← 绿输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer02",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 0,
|
||||
"offset": 1112,
|
||||
"pid": 2278,
|
||||
"step": 0.01,
|
||||
"title": "红输出 ← 蓝输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer10",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 1,
|
||||
"offset": 1120,
|
||||
"pid": 2280,
|
||||
"step": 0.01,
|
||||
"title": "绿输出 ← 红输入"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "mixer11",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 1,
|
||||
"offset": 1124,
|
||||
"pid": 2281,
|
||||
"step": 0.01,
|
||||
"title": "绿输出 ← 绿输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer12",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 1,
|
||||
"offset": 1128,
|
||||
"pid": 2282,
|
||||
"step": 0.01,
|
||||
"title": "绿输出 ← 蓝输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer20",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 2,
|
||||
"offset": 1136,
|
||||
"pid": 2284,
|
||||
"step": 0.01,
|
||||
"title": "蓝输出 ← 红输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixer21",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 2,
|
||||
"offset": 1140,
|
||||
"pid": 2285,
|
||||
"step": 0.01,
|
||||
"title": "蓝输出 ← 绿输入"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "mixer22",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"mixerTab": 2,
|
||||
"offset": 1144,
|
||||
"pid": 2286,
|
||||
"step": 0.01,
|
||||
"title": "蓝输出 ← 蓝输入"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixerPreserveLuma",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1156,
|
||||
"pid": 2289,
|
||||
"step": 0.01,
|
||||
"title": "保持亮度"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"key": "mixerPreserveSaturation",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1160,
|
||||
"pid": 2290,
|
||||
"step": 0.01,
|
||||
"title": "保持饱和度"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "mixerMix",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1164,
|
||||
"pid": 2291,
|
||||
"step": 0.01,
|
||||
"title": "通道混合强度"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "mixerEnabled",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1152,
|
||||
"pid": 2288,
|
||||
"step": 0.01,
|
||||
"title": "通道混合器"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": -1,
|
||||
"key": "filmMix",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1172,
|
||||
"pid": 2293,
|
||||
"step": 0.01,
|
||||
"title": "胶片混合强度"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 0,
|
||||
"key": "filmSubtractive",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1176,
|
||||
"pid": 2294,
|
||||
"step": 0.01,
|
||||
"title": "启用减色"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 0,
|
||||
"key": "filmGammaAll",
|
||||
"kind": "float",
|
||||
"max": 4,
|
||||
"min": 0.25,
|
||||
"offset": 1180,
|
||||
"pid": 2295,
|
||||
"step": 0.01,
|
||||
"title": "整体减色"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 0,
|
||||
"key": "filmGammaCyan",
|
||||
"kind": "float",
|
||||
"max": 4,
|
||||
"min": 0.25,
|
||||
"offset": 1184,
|
||||
"pid": 2296,
|
||||
"step": 0.01,
|
||||
"title": "青色减色"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 0,
|
||||
"key": "filmGammaMagenta",
|
||||
"kind": "float",
|
||||
"max": 4,
|
||||
"min": 0.25,
|
||||
"offset": 1188,
|
||||
"pid": 2297,
|
||||
"step": 0.01,
|
||||
"title": "洋红减色"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 0,
|
||||
"key": "filmGammaYellow",
|
||||
"kind": "float",
|
||||
"max": 4,
|
||||
"min": 0.25,
|
||||
"offset": 1192,
|
||||
"pid": 2298,
|
||||
"step": 0.01,
|
||||
"title": "黄色减色"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 0,
|
||||
"key": "filmDensity",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": -1,
|
||||
"offset": 1196,
|
||||
"pid": 2299,
|
||||
"step": 0.01,
|
||||
"title": "密度"
|
||||
},
|
||||
{
|
||||
"default": 2,
|
||||
"filmTab": 0,
|
||||
"key": "filmDensityMode",
|
||||
"kind": "popup",
|
||||
"max": 2,
|
||||
"min": 1,
|
||||
"offset": 1200,
|
||||
"options": [
|
||||
"模式 1 · 最大值",
|
||||
"模式 2 · 平均值"
|
||||
],
|
||||
"pid": 2300,
|
||||
"step": 0.01,
|
||||
"title": "密度模式",
|
||||
"values": [
|
||||
2,
|
||||
1
|
||||
]
|
||||
},
|
||||
{
|
||||
"default": 6,
|
||||
"key": "filmValueMode",
|
||||
"kind": "float",
|
||||
"max": 6,
|
||||
"min": 1,
|
||||
"offset": 1204,
|
||||
"pid": 2301,
|
||||
"step": 0.01,
|
||||
"title": "胶片亮度模型"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 1,
|
||||
"key": "filmHalation",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1208,
|
||||
"pid": 2302,
|
||||
"step": 0.01,
|
||||
"title": "启用晕光"
|
||||
},
|
||||
{
|
||||
"default": 5,
|
||||
"filmTab": 1,
|
||||
"key": "filmScatter",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1212,
|
||||
"pid": 2303,
|
||||
"step": 1,
|
||||
"title": "散射半径"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 1,
|
||||
"key": "filmTransmission",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1216,
|
||||
"pid": 2304,
|
||||
"step": 1,
|
||||
"title": "染料透射"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 1,
|
||||
"key": "filmBoost",
|
||||
"kind": "float",
|
||||
"max": 5,
|
||||
"min": 0,
|
||||
"offset": 1220,
|
||||
"pid": 2305,
|
||||
"step": 0.01,
|
||||
"title": "晕光增强"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 2,
|
||||
"key": "filmBloom",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1224,
|
||||
"pid": 2306,
|
||||
"step": 0.01,
|
||||
"title": "启用辉光"
|
||||
},
|
||||
{
|
||||
"default": 50,
|
||||
"filmTab": 2,
|
||||
"key": "filmSensitivity",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1228,
|
||||
"pid": 2307,
|
||||
"step": 1,
|
||||
"title": "辉光灵敏度"
|
||||
},
|
||||
{
|
||||
"default": 30,
|
||||
"filmTab": 2,
|
||||
"key": "filmDiffusion",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1232,
|
||||
"pid": 2308,
|
||||
"step": 1,
|
||||
"title": "辉光扩散"
|
||||
},
|
||||
{
|
||||
"default": 50,
|
||||
"filmTab": 2,
|
||||
"key": "filmIntensity",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1236,
|
||||
"pid": 2309,
|
||||
"step": 1,
|
||||
"title": "辉光强度"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrain",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1240,
|
||||
"pid": 2310,
|
||||
"step": 0.01,
|
||||
"title": "启用颗粒"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainAmount",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1244,
|
||||
"pid": 2311,
|
||||
"step": 0.01,
|
||||
"title": "颗粒数量"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainSize",
|
||||
"kind": "float",
|
||||
"max": 20,
|
||||
"min": 1,
|
||||
"offset": 1248,
|
||||
"pid": 2312,
|
||||
"step": 1,
|
||||
"title": "颗粒大小"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainResponse",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": -1,
|
||||
"offset": 1252,
|
||||
"pid": 2313,
|
||||
"step": 0.01,
|
||||
"title": "胶片响应"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainColor",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1256,
|
||||
"pid": 2314,
|
||||
"step": 0.01,
|
||||
"title": "颜色变化"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainHold",
|
||||
"kind": "popup",
|
||||
"max": 5,
|
||||
"min": 1,
|
||||
"offset": 1260,
|
||||
"options": [
|
||||
"每帧更新",
|
||||
"保持 2 帧",
|
||||
"保持 3 帧",
|
||||
"保持 4 帧",
|
||||
"保持 5 帧"
|
||||
],
|
||||
"pid": 2315,
|
||||
"step": 0.01,
|
||||
"title": "颗粒帧保持",
|
||||
"values": [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5
|
||||
]
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 3,
|
||||
"key": "filmGrainSeed",
|
||||
"kind": "float",
|
||||
"max": 65535,
|
||||
"min": 0,
|
||||
"offset": 1264,
|
||||
"pid": 2316,
|
||||
"step": 1,
|
||||
"title": "颗粒种子"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 4,
|
||||
"key": "filmVignette",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1268,
|
||||
"pid": 2317,
|
||||
"step": 0.01,
|
||||
"title": "启用暗角"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 4,
|
||||
"key": "filmVignetteIntensity",
|
||||
"kind": "float",
|
||||
"max": 2,
|
||||
"min": -2,
|
||||
"offset": 1272,
|
||||
"pid": 2318,
|
||||
"step": 0.01,
|
||||
"title": "暗角强度"
|
||||
},
|
||||
{
|
||||
"default": 50,
|
||||
"filmTab": 4,
|
||||
"key": "filmVignetteRadius",
|
||||
"kind": "float",
|
||||
"max": 100,
|
||||
"min": 0,
|
||||
"offset": 1276,
|
||||
"pid": 2319,
|
||||
"step": 1,
|
||||
"title": "暗角半径"
|
||||
},
|
||||
{
|
||||
"default": 0.5,
|
||||
"filmTab": 4,
|
||||
"key": "filmVignetteFalloff",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1280,
|
||||
"pid": 2320,
|
||||
"step": 0.01,
|
||||
"title": "暗角过渡"
|
||||
},
|
||||
{
|
||||
"default": 0,
|
||||
"filmTab": 5,
|
||||
"key": "filmPrintLook",
|
||||
"kind": "popup",
|
||||
"max": 8,
|
||||
"min": 0,
|
||||
"notAnimatable": true,
|
||||
"offset": 1296,
|
||||
"options": [
|
||||
"无",
|
||||
"Kodak 2383",
|
||||
"Kodak 2393",
|
||||
"Kodak 2302 BW",
|
||||
"Fuji 3510",
|
||||
"Fuji 3513",
|
||||
"Fuji 3519",
|
||||
"Fuji 3521",
|
||||
"Agfa CP30"
|
||||
],
|
||||
"pid": 2324,
|
||||
"step": 0.01,
|
||||
"title": "印片外观",
|
||||
"values": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
6,
|
||||
7,
|
||||
8
|
||||
]
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"filmTab": 5,
|
||||
"key": "filmPrintStrength",
|
||||
"kind": "float",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1300,
|
||||
"pid": 2325,
|
||||
"step": 0.01,
|
||||
"title": "印片强度"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"key": "filmEnabled",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"offset": 1168,
|
||||
"pid": 2292,
|
||||
"step": 0.01,
|
||||
"title": "胶片模拟"
|
||||
}
|
||||
],
|
||||
"sourceSHA256": {
|
||||
"template/tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
|
||||
"大鱼调色/Plugin/DYCSTTypes.h": "3372e3cd77248eeb374e54675d2902befceea8e00a2afc4f9543116ef3027696",
|
||||
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
|
||||
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
|
||||
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
|
||||
"大鱼调色/Plugin/DYModel.h": "80e88add97deeac7a9dc47d12f68b0245905786297de2e6553b3da15c729da6e",
|
||||
"大鱼调色/Plugin/DYModel.mm": "beadabb0773e911581dedc263f55a49e03dde6e6d1fc2329df18cb384710d234",
|
||||
"大鱼调色/Plugin/DYModel.mm": "bde987e48f79e5cf8e2e6bccc49cac27d420979d27e0e6859a27e98d0bd7bad7",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "28088ec819307a60f2e52334fd807a514c3ff8a550bc0efbe7069b68a6242320",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "9ddc4b7509ad63fc24d1724359b4a218609f90b971eee57f6cdeda0c1b309129",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "8ef480025c739b29f55884ba0c7218e9d6fd8d80c46cfc72d6ee3da90215abe4",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "7b113450ae43e0e5d478d8f0e4212b7d25e47d3cc8bc0d4d868ab58c98d3c56c",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
"大鱼调色/Plugin/SpiderCore/DYColorMath.h": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9",
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"nativeReference": {
|
||||
"path": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef",
|
||||
"sha256": "bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"projectBaseFlags": 268435473,
|
||||
"currentObject": "10000",
|
||||
"scenenodeVersion": "5",
|
||||
"widgetBaseFlags": 16,
|
||||
"layerAndSourceBaseFlags": 524304,
|
||||
"fxPlugBaseFlags": 8589934608,
|
||||
"allContentSelectionBits": 0
|
||||
},
|
||||
"staticContract": {
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
"nativeFloatParameters": 278,
|
||||
"customParameters": 3,
|
||||
"publications": [
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./9000",
|
||||
"name": "大鱼调色"
|
||||
},
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./10001",
|
||||
"name": "混合"
|
||||
}
|
||||
],
|
||||
"effectSourceType": 3,
|
||||
"externalMediaRequired": false,
|
||||
"placeholder": "native Drop Zone.tiff",
|
||||
"animationObjects": 0,
|
||||
"copyright": {
|
||||
"removedAtUserRequest": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"displayRigAbsent": true
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"selectedContentCount": 0,
|
||||
"currentObjectIsProject": true
|
||||
},
|
||||
"hostUIVerified": false,
|
||||
"hostRenderVerified": false
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 4,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"nativeUIVerified": false,
|
||||
"validator": "project-scoped native-5.11 field comparison",
|
||||
"scope": "Saved fields only; no rendering or old-FCP execution"
|
||||
},
|
||||
"skillCheckerStatus": "unsupported-version-guard; original SkillAudit.json retained unchanged",
|
||||
"otherSkillStructuralErrors": [],
|
||||
"copyrightDisplayRows": 0,
|
||||
"oldFCPActuallyTested": false,
|
||||
"scope": "Native-template structure and saved-state comparison only; FCP host acceptance is separate"
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
{
|
||||
"README.md": "db063c6b56acf80eec8c17613539ce99202c9771d108f392c13cf90ed962a038",
|
||||
"README.md": "6be40447052793855fba6f1a6756625d86da0363827ebb53e55c2980506ec987",
|
||||
"sources/CopyrightRig.xml": "842afc58ecda0fc8c22675a0191f53dccb9ea6aaba10acd0a272cecee9b72067",
|
||||
"sources/NativeEffectSource.moef": "4424b5ee3b5dc137bc8e8baa9091b24c2431adf32a3d79b2662cff079c35031c",
|
||||
"sources/NativeFactories.xml": "5db79ab22e948ca2bdf9162beb60d8380a95ceff6c74e86ff095804ae1d832b6",
|
||||
"sources/NativeFxPlugShell.xml": "5d2a1e807fb7148e5a682c83ba30d7022c8680d2ca8309c502d30f4b12efad64",
|
||||
"sources/Provenance.json": "32063c48ef02a47e42555537421bfc95f767e96fc88d3478e9116c85a0205baf",
|
||||
"sources/RegisteredParameters.json": "1d8c9c1a58c289d855e1f57add064dd4d96342961df6c2796f705a90b287e38c",
|
||||
"tools/dump_model.mm": "2ef22e010e0cae15b73107d39fb2c125f6049b1e5405e88078f936cf29e79350",
|
||||
"verification/SavedSelection.json": "ef90b0afa1df26f2a5d299f86f675422c8b433e3f833ff1a9a61bb1228e6c9ca",
|
||||
"verification/SkillAudit.json": "d6931eb103fb1fe3e30a331b47ff957ef9d69cf409276d13a3f1bb423df5ad80",
|
||||
"verification/StaticContract.json": "a03aa582320dff857f860a90c120b829604a8a3f2aa1997a5131b825b4fdbf1b",
|
||||
"大鱼调色.moef": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b"
|
||||
"sources/Provenance.json": "9cfa41fd1f02b35b99cad56a4a048bafa1c627da181006f5b9186a104664f421",
|
||||
"sources/RegisteredParameters.json": "9937a076df8b1f8dba7aea8701810bf84f9819337bbfe87ddcecb36d6f279289",
|
||||
"tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
|
||||
"verification/SavedSelection.json": "7408fb149fcb88db9335af7076d6e7afb07c3074a19e9935343b4d8c5c76bec5",
|
||||
"verification/SkillAudit.json": "eda67532a7ab8abaf24d8eff890235d2dd13bf4c70472684fcfbbd9b2b21e08b",
|
||||
"verification/StaticContract.json": "afc6ed629d21b6f535b767f180891566bc6700ea9a7d85e1e364a435efe2d063",
|
||||
"大鱼调色.moef": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"verification/Compatibility.json": "517cff6f5cb7229fdf725adf687e6039e91b20359c412e4bdbd71e4fcb1bed88"
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b",
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"nativeUIVerified": false,
|
||||
"scope": "Saved selection fields for observed schema; no rendering or GUI operation",
|
||||
"version": "5.13",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 7,
|
||||
"contentObjectsChecked": 4,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"errors": []
|
||||
"nativeUIVerified": false,
|
||||
"validator": "project-scoped native-5.11 field comparison",
|
||||
"scope": "Saved fields only; no rendering or old-FCP execution"
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
"checksPassed": true,
|
||||
"errors": [],
|
||||
"checksPassed": false,
|
||||
"errors": [
|
||||
"Saved selection: Unverified Motion XML version/schema; obtain native evidence first"
|
||||
],
|
||||
"warnings": [
|
||||
"Parent time conversion is supplied explicitly in contracts; not inferred for arbitrary nesting.",
|
||||
"No native rendering, font/glyph availability, full dynamic/private reference graph, or visual validation performed."
|
||||
@@ -13,19 +15,14 @@
|
||||
"NTSC": "1"
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b",
|
||||
"passed": false,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"selectionMask": "0x10000001",
|
||||
"nativeUIVerified": false,
|
||||
"scope": "Saved selection fields for observed schema; no rendering or GUI operation",
|
||||
"version": "5.13",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 7,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"errors": []
|
||||
"errors": [
|
||||
"Unverified Motion XML version/schema; obtain native evidence first"
|
||||
]
|
||||
},
|
||||
"savedSelectionRequired": true,
|
||||
"buildMarkers": false,
|
||||
@@ -48,10 +45,10 @@
|
||||
"nativeVisualValidation": false
|
||||
},
|
||||
"basic": {
|
||||
"entity_count": 10,
|
||||
"entity_count": 7,
|
||||
"entity_ids_unique": true,
|
||||
"duplicate_entities": {},
|
||||
"published_count": 4,
|
||||
"published_count": 2,
|
||||
"unresolved_media": []
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,12 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
|
||||
"version": "5.13",
|
||||
"displayversion": "5.6.7",
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
"nativeFloatParameters": 234,
|
||||
"nativeFloatParameters": 278,
|
||||
"customParameters": 3,
|
||||
"publications": [
|
||||
{
|
||||
"object": "10081",
|
||||
"channel": "./2/100",
|
||||
"name": "FCP 版本作者→"
|
||||
},
|
||||
{
|
||||
"object": "10082",
|
||||
"channel": "./2/100",
|
||||
"name": "更多模板浏览器访问→"
|
||||
},
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./9000",
|
||||
@@ -33,11 +23,9 @@
|
||||
"placeholder": "native Drop Zone.tiff",
|
||||
"animationObjects": 0,
|
||||
"copyright": {
|
||||
"passed": true,
|
||||
"rig": "10080",
|
||||
"author": "10081",
|
||||
"site": "10082",
|
||||
"unbound": true
|
||||
"removedAtUserRequest": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"displayRigAbsent": true
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
|
||||
+47
-75
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE ozxmlscene>
|
||||
<ozml version="5.13">
|
||||
<displayversion>5.6.7</displayversion>
|
||||
<ozml version="5.11">
|
||||
<displayversion>5.4.5</displayversion>
|
||||
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
|
||||
<description>Channel</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
@@ -27,16 +27,6 @@
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="6" uuid="402246385249454b90e08b2ee1b6bf06">
|
||||
<description>绑定</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="7" uuid="e35c74f01d5042f6b468eb530169bfb7">
|
||||
<description>小组件</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<build />
|
||||
<description />
|
||||
<canvas>
|
||||
@@ -145,14 +135,9 @@
|
||||
<animateFlag>0</animateFlag>
|
||||
<parameterColorSpaceID>3</parameterColorSpaceID>
|
||||
<savePreviewMovie>0</savePreviewMovie>
|
||||
<Object3DEnvironments>100</Object3DEnvironments>
|
||||
<DRTSupport>0</DRTSupport>
|
||||
<onHDRDisplay>0</onHDRDisplay>
|
||||
</sceneSettings>
|
||||
<publishSettings>
|
||||
<version>2</version>
|
||||
<target object="10081" channel="./2/100" name="FCP 版本作者→" />
|
||||
<target object="10082" channel="./2/100" name="更多模板浏览器访问→" />
|
||||
<target object="10060" channel="./9000" name="大鱼调色" />
|
||||
<target object="10060" channel="./10001" name="混合" />
|
||||
</publishSettings>
|
||||
@@ -186,62 +171,6 @@
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<scenenode name="绑定" id="10080" factoryID="6" version="5">
|
||||
<scenenode name="弹出式菜单 1" id="10082" factoryID="7" version="5">
|
||||
<affecting>2</affecting>
|
||||
<snapshot>3</snapshot>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688">
|
||||
<parameter name="初始值" id="106" flags="68736319504" default="0" value="0" />
|
||||
</parameter>
|
||||
<parameter name="Hidden" id="102" flags="8606711824" default="0" value="3" />
|
||||
<parameter name="快照" id="101" flags="8589938706">
|
||||
<parameter name="快照" id="3" flags="4112">
|
||||
<parameter name="值" id="1" flags="16" default="0" value="2" />
|
||||
<parameter name="插值" id="2" flags="65552" default="1" value="1" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="弹出式菜单" id="100" flags="16842769" default="2" value="2">
|
||||
<entry name="dayu.media" tag="2" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<scenenode name="弹出式菜单" id="10081" factoryID="7" version="5">
|
||||
<affecting>2</affecting>
|
||||
<snapshot>3</snapshot>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688">
|
||||
<parameter name="初始值" id="106" flags="68736319504" default="0" value="0" />
|
||||
</parameter>
|
||||
<parameter name="Hidden" id="102" flags="8606711824" default="0" value="3" />
|
||||
<parameter name="快照" id="101" flags="8589938706">
|
||||
<parameter name="快照" id="3" flags="4112">
|
||||
<parameter name="值" id="1" flags="16" default="0" value="2" />
|
||||
<parameter name="插值" id="2" flags="65552" default="1" value="1" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="弹出式菜单" id="100" flags="16842768" default="2" value="2">
|
||||
<entry name="大鱼先森Media" tag="2" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<layer name="群组 1" id="10047">
|
||||
<scenenode name="效果源" id="10050" factoryID="3" version="5">
|
||||
<validTracks>1</validTracks>
|
||||
@@ -341,7 +270,7 @@
|
||||
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
|
||||
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
|
||||
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
|
||||
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
|
||||
@@ -540,6 +469,50 @@
|
||||
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
|
||||
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
|
||||
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
|
||||
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
|
||||
@@ -585,7 +558,6 @@
|
||||
<missingWidth>1200</missingWidth>
|
||||
<missingHeight>1200</missingHeight>
|
||||
<missingDuration>0.033333333333333333</missingDuration>
|
||||
<missingDynamicRangeType>0</missingDynamicRangeType>
|
||||
<creationDuration>1</creationDuration>
|
||||
<mediaID />
|
||||
<flags>0</flags>
|
||||
|
||||
+22
-28
@@ -12,6 +12,8 @@ TEMPLATE=ROOT/'template'
|
||||
SOURCES=TEMPLATE/'sources'
|
||||
PROJECT_UUID='7d468273c013498e9806a0d7bc32fddf'
|
||||
PLUGIN_UUID='1C17B73B-F229-4C09-A434-EAF6DFF5F22A'
|
||||
OUTPUT_VERSION='5.11'
|
||||
OUTPUT_DISPLAY_VERSION='5.4.5'
|
||||
NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
|
||||
STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
|
||||
CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
@@ -20,7 +22,7 @@ CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
def sha(data):return hashlib.sha256(data).hexdigest()
|
||||
|
||||
def model_identity():
|
||||
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm','大鱼调色/Plugin/DYToolState.h','大鱼调色/Plugin/DYToolState.mm','大鱼调色/Plugin/MaskCore/DYMaskOperator.h','大鱼调色/Plugin/MaskCore/DYMask.h']
|
||||
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm','大鱼调色/Plugin/DYFilmTypes.h','大鱼调色/Plugin/DYFilmMath.h','大鱼调色/Plugin/DYToolState.h','大鱼调色/Plugin/DYToolState.mm','大鱼调色/Plugin/MaskCore/DYMaskOperator.h','大鱼调色/Plugin/MaskCore/DYMask.h']
|
||||
return {name:sha((ROOT/name).read_bytes()) for name in files}
|
||||
|
||||
def refresh_metadata():
|
||||
@@ -60,10 +62,17 @@ def build(model):
|
||||
scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]')
|
||||
source=scene.find('.//scenenode[@name="效果源"]')
|
||||
if source is None or root.get('version')!='5.13' or root.findtext('displayversion')!='5.6.7':raise ValueError('Unexpected native EffectSource source')
|
||||
# Same EffectSource/FxPlug/custom-archive shape exists in the identity-
|
||||
# recorded native 5.11 / Motion 5.4.5 reference. Drop only later optional
|
||||
# 3D/HDR editor hints; keep factory/node versions and color settings intact.
|
||||
root.set('version',OUTPUT_VERSION);root.find('displayversion').text=OUTPUT_DISPLAY_VERSION
|
||||
for parent in root.iter():
|
||||
for child in list(parent):
|
||||
if child.tag in {'Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'}:parent.remove(child)
|
||||
if source.find('parameter[@id="2"]/parameter[@id="321"]').get('value')!='3':raise ValueError('Expected native EffectSource type 3')
|
||||
native_factories=E.parse(SOURCES/'NativeFactories.xml').getroot()
|
||||
lookup={f.get('uuid'):f for f in native_factories}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5','402246385249454b90e08b2ee1b6bf06':'6','e35c74f01d5042f6b468eb530169bfb7':'7'}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5'}
|
||||
insert_at=list(root).index(root.findall('factory')[-1])+1
|
||||
for uuid,fid in factory_ids.items():
|
||||
factory=copy.deepcopy(lookup[uuid]);factory.set('id',fid);root.insert(insert_at,factory);insert_at+=1
|
||||
@@ -82,22 +91,17 @@ def build(model):
|
||||
E.SubElement(param,'defaultVal').text=text;E.SubElement(param,'dataValue').text=text
|
||||
for row in model['parameters']:
|
||||
value=format(float(row['default']),'.17g')
|
||||
E.SubElement(filt,'parameter',name=row['title'],id=str(row['pid']),flags='12889161776' if row.get('notAnimatable') else '12889161760',default=value,value=value)
|
||||
host_default=format(float(row.get('hostDefault',row['default'])),'.17g')
|
||||
E.SubElement(filt,'parameter',name=row['title'],id=str(row['pid']),flags='12889161776' if row.get('notAnimatable') else '12889161760',default=host_default,value=value)
|
||||
for node in host:
|
||||
if node.get("id")=="10005":node.set("value","1");node.set("default","0");node.set("flags","8589934592")
|
||||
filt.append(node)
|
||||
source.append(filt)
|
||||
copyright=E.parse(SOURCES/'CopyrightRig.xml').getroot()
|
||||
entity_map={'3356608241':'10080','3356608243':'10081','3356608245':'10082'}
|
||||
for node in copyright.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','6' if node.get('factoryID')=='1' else '7')
|
||||
# Native Rig stays directly below scene, after its native project.
|
||||
scene.insert(list(scene).index(project)+1,copyright)
|
||||
# User requested removal of the author's two display-only Rig widgets.
|
||||
# Do not regenerate their nodes, factories or published parameter rows.
|
||||
pub=scene.find('publishSettings')
|
||||
for node in list(pub):
|
||||
if node.tag!='version':pub.remove(node)
|
||||
for object_id,name in [('10081','FCP 版本作者→'),('10082','更多模板浏览器访问→')]:
|
||||
E.SubElement(pub,'target',object=object_id,channel='./2/100',name=name)
|
||||
E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色')
|
||||
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
|
||||
current=scene.find('currentObject')
|
||||
@@ -116,13 +120,15 @@ def build(model):
|
||||
|
||||
def verify(data,model):
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
assert root.get('version')==OUTPUT_VERSION and root.findtext('displayversion')==OUTPUT_DISPLAY_VERSION
|
||||
assert all(not list(root.iter(tag)) for tag in ['Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'])
|
||||
filters=root.findall('.//filter')
|
||||
assert len(filters)==1 and filters[0].get('pluginUUID')==PLUGIN_UUID
|
||||
f=filters[0];params={p.get('id'):p for p in f.findall('parameter')}
|
||||
assert len(params)==len(list(f.findall('parameter')))
|
||||
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['default'])==float(p.get('value'))
|
||||
p=params[str(row['pid'])];assert float(p.get('default'))==float(row.get('hostDefault',row['default'])) and float(p.get('value'))==float(row['default'])
|
||||
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'
|
||||
@@ -134,24 +140,12 @@ def verify(data,model):
|
||||
if node.tag in CONTENT_TAGS and node is not project and node.find('baseFlags') is not None and int(node.findtext('baseFlags'))&0x10000001:selected.append(node.get('id'))
|
||||
assert not selected and scene.findtext('currentObject')==project.get('id')
|
||||
pub=scene.find('publishSettings').findall('target')
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10081','./2/100','FCP 版本作者→'),('10082','./2/100','更多模板浏览器访问→'),('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
# Compare every native Rig/widget field after reversing entity/factory IDs.
|
||||
rig=scene.find('scenenode[@id="10080"]');assert factories[rig.get('factoryID')]=='402246385249454b90e08b2ee1b6bf06'
|
||||
reverse=copy.deepcopy(rig)
|
||||
entity_map={'10080':'3356608241','10081':'3356608243','10082':'3356608245'}
|
||||
for node in reverse.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','1' if node.get('factoryID')=='6' else '6')
|
||||
def structure(node):return (node.tag,dict(node.attrib),(node.text or '').strip(),[structure(child) for child in node])
|
||||
assert structure(reverse)==structure(E.parse(SOURCES/'CopyrightRig.xml').getroot())
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
assert all(scene.find('.//scenenode[@id="'+identity+'"]') is None for identity in ['10080','10081','10082'])
|
||||
assert all(text.encode() not in data for text in ['FCP 版本作者','更多模板浏览器访问','大鱼先森Media','dayu.media'])
|
||||
assert not any(f.get('uuid')=='dd0036f96c9e4bfdadb82f71fbf5c9d8' for f in root.findall('factory'))
|
||||
for widget_id,title,flags in [('10081','大鱼先森Media','16842768'),('10082','dayu.media','16842769')]:
|
||||
widget=rig.find('scenenode[@id="'+widget_id+'"]');assert factories[widget.get('factoryID')]=='e35c74f01d5042f6b468eb530169bfb7'
|
||||
menu=widget.find('parameter[@id="2"]/parameter[@id="100"]')
|
||||
assert menu.attrib=={'name':'弹出式菜单','id':'100','flags':flags,'default':'2','value':'2'}
|
||||
assert [entry.attrib for entry in menu.findall('entry')]==[{'name':title,'tag':'2'}]
|
||||
assert widget.findtext('affecting')=='2' and widget.findtext('snapshot')=='3'
|
||||
assert len({n.get('id') for n in scene.iter() if n.tag in CONTENT_TAGS})==len([n for n in scene.iter() if n.tag in CONTENT_TAGS])
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'passed':True,'rig':'10080','author':'10081','site':'10082','unbound':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'removedAtUserRequest':True,'publishedDisplayRows':0,'displayRigAbsent':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Isolated synthetic FCP acceptance; never edits a library or user media."""
|
||||
from pathlib import Path
|
||||
import json,uuid,xml.etree.ElementTree as E
|
||||
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
qa=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa')
|
||||
model=json.loads((root/'template/sources/RegisteredParameters.json').read_text())
|
||||
by_key={p['key']:p for p in model['parameters']}
|
||||
movie=qa/'大鱼调色_蒙版合成运动.mov'
|
||||
chart=qa/'大鱼调色验收图.png'
|
||||
assert movie.is_file() and chart.is_file()
|
||||
xml=E.Element('fcpxml',version='1.12');resources=E.SubElement(xml,'resources')
|
||||
E.SubElement(resources,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(resources,'format',id='f2',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(resources,'format',id='f3',width='1920',height='1080',name='FFVideoFormatRateUndefined')
|
||||
for ident,path,fmt,duration in [('a1',movie,'f1','4s'),('a2',chart,'f3','0s')]:
|
||||
asset=E.SubElement(resources,'asset',id=ident,name=path.stem,start='0s',duration=duration,format=fmt,hasVideo='1',videoSources='1')
|
||||
E.SubElement(asset,'media-rep',kind='original-media',src=path.resolve().as_uri())
|
||||
template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef')
|
||||
E.SubElement(resources,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri())
|
||||
event=E.SubElement(E.SubElement(xml,'library'),'event',name='大鱼调色_1.5_胶片与通道验收',uid=str(uuid.uuid4()).upper())
|
||||
settings=[('大鱼调色_1.5_胶片与混合器','a1','f1',dict(mixer01=.2,filmSubtractive=1,filmGammaCyan=1.2,filmHalation=1,filmScatter=5,filmBloom=1,filmSensitivity=25,filmDiffusion=5,filmIntensity=25,filmGrain=1,filmGrainAmount=.25,filmGrainHold=2,filmVignette=1,filmVignetteIntensity=.5,filmVignetteRadius=30)),('大鱼调色_1.5_初始化与叠层','a1','f1',{}),('大鱼调色_1.5_颗粒时间验收','a2','f2',dict(filmGrain=1,filmGrainAmount=.65,filmGrainHold=2))]
|
||||
for name,asset,fmt,values in settings:
|
||||
project=E.SubElement(event,'project',name=name,uid=str(uuid.uuid4()).upper())
|
||||
sequence=E.SubElement(project,'sequence',format=fmt,duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k')
|
||||
spine=E.SubElement(sequence,'spine');clip=E.SubElement(spine,'video' if asset=='a2' else 'asset-clip',ref=asset,name=name,offset='0s',start='0s',duration='4s')
|
||||
effect=E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
# Hidden FxPlug IDs are not invented as Motion/FCPXML parameter paths.
|
||||
# Apply the intended settings through the formal native inspector in host QA.
|
||||
E.indent(xml);output=qa/'film-mixer-1.5.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(xml,encoding='unicode')+'\n')
|
||||
print(output)
|
||||
@@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create isolated print-look host projects using existing synthetic QA media."""
|
||||
from pathlib import Path
|
||||
import uuid
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
QA=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa')
|
||||
CHART=QA/'\u5927\u9c7c\u8c03\u8272\u9a8c\u6536\u56fe.png'
|
||||
MOVIE=QA/'\u5927\u9c7c\u8c03\u8272_\u8499\u7248\u5408\u6210\u8fd0\u52a8.mov'
|
||||
assert CHART.is_file() and MOVIE.is_file()
|
||||
xml=E.Element('fcpxml',version='1.12');r=E.SubElement(xml,'resources')
|
||||
E.SubElement(r,'format',id='f1',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r,'format',id='f2',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r,'format',id='still',width='1920',height='1080',name='FFVideoFormatRateUndefined')
|
||||
for ident,path,fmt,duration in [('chart',CHART,'still','0s'),('movie',MOVIE,'f2','4s')]:
|
||||
a=E.SubElement(r,'asset',id=ident,name=path.stem,start='0s',duration=duration,format=fmt,hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=path.as_uri())
|
||||
E.SubElement(r,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef')
|
||||
event=E.SubElement(E.SubElement(xml,'library'),'event',name='大鱼调色_1.6_八种印片验收',uid=str(uuid.uuid4()).upper())
|
||||
for name,asset,fmt in [('大鱼调色_1.6_八种印片','chart','f1'),('大鱼调色_1.6_黑白印片','chart','f1'),('大鱼调色_1.6_印片叠层与蒙版','movie','f2')]:
|
||||
project=E.SubElement(event,'project',name=name,uid=str(uuid.uuid4()).upper());seq=E.SubElement(project,'sequence',format=fmt,duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k');spine=E.SubElement(seq,'spine')
|
||||
clip=E.SubElement(spine,'video' if asset=='chart' else 'asset-clip',ref=asset,name=name,offset='0s',start='0s',duration='4s');E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
# Apply settings through the installed native inspector, never hidden XML IDs.
|
||||
E.indent(xml);destination=QA/'print-looks-1.6.fcpxml';destination.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(xml,encoding='unicode')+'\n');print(destination)
|
||||
+25
-7
@@ -19,16 +19,31 @@ def run(*args,log=None):
|
||||
with Path(log).open('w') as f:subprocess.run(args,cwd=ROOT,stdout=f,stderr=subprocess.STDOUT,check=True)
|
||||
return ''
|
||||
return subprocess.check_output(args,cwd=ROOT,text=True,stderr=subprocess.STDOUT).strip()
|
||||
def hosts_closed():
|
||||
lines=run('ps','-axo','pid=,comm=').splitlines()
|
||||
live=[l for l in lines if l.endswith(('/Contents/MacOS/Final Cut Pro','/Contents/MacOS/Motion'))]
|
||||
if live:raise RuntimeError('请先正常退出宿主,再继续交付:'+str(live))
|
||||
def hosts_closed(wait=False):
|
||||
announced=False
|
||||
while True:
|
||||
lines=run('ps','-axo','pid=,comm=').splitlines()
|
||||
live=[l for l in lines if l.endswith(('/Contents/MacOS/Final Cut Pro','/Contents/MacOS/Motion'))]
|
||||
if not live:return
|
||||
if not wait:raise RuntimeError('请先正常退出宿主,再继续交付:'+str(live))
|
||||
if not announced:print('Notarized APP retained; waiting for the host to save and quit normally before replacement.',flush=True);announced=True
|
||||
time.sleep(1)
|
||||
def identity(path,expected):
|
||||
p=plistlib.loads((path/'Contents/Info.plist').read_bytes())
|
||||
if p['CFBundleIdentifier']!=expected:raise RuntimeError('产品身份不匹配: '+str(path))
|
||||
def unregister(path):
|
||||
reg=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
|
||||
if any(l.rstrip().endswith('\t'+str(path)) for l in reg.splitlines()):run('pluginkit','-r',str(path))
|
||||
def self_test(executable,report):
|
||||
result=subprocess.run([str(executable),'--self-test'],cwd=ROOT,text=True,capture_output=True)
|
||||
report.write_text(result.stdout)
|
||||
report.with_suffix('.stderr').write_text(result.stderr)
|
||||
try:parsed=json.loads(result.stdout)
|
||||
except json.JSONDecodeError:raise RuntimeError('原生自检未返回有效结果,诊断已保留:'+str(report))
|
||||
if result.returncode or not parsed.get('pass'):
|
||||
failed=[x.get('name') for x in parsed.get('results',[]) if not x.get('pass',True)]
|
||||
raise RuntimeError('原生自检未通过,正式旧版未替换。诊断:'+str(report)+';失败项:'+str(failed))
|
||||
return parsed
|
||||
def main():
|
||||
hosts_closed();CACHE.mkdir(parents=True,exist_ok=True);LOCK.parent.mkdir(parents=True,exist_ok=True);LOCK.mkdir()
|
||||
(LOCK/'owner.json').write_text(json.dumps(dict(PID=os.getpid(),cwd=str(ROOT),product='大鱼调色',started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
|
||||
@@ -43,13 +58,16 @@ def main():
|
||||
for name in ['large.png','small.png']:
|
||||
if (ROOT/'template'/name).exists():shutil.copy2(ROOT/'template'/name,b.parent/name)
|
||||
identity(APP,'com.dayu.color');plugin=APP/PLUGIN;identity(plugin,'com.dayu.color.XPC')
|
||||
# Xcode registers its build product with Launch Services. Keep the host from
|
||||
# discovering this generated copy while signing/notarization are pending.
|
||||
unregister(plugin);unregister(LOOSE)
|
||||
for name in ['FxPlug','PluginManager']:run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin/'Contents/Frameworks'/(name+'.framework')))
|
||||
run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin))
|
||||
run('codesign','--force','--timestamp','--options','runtime','--entitlements',str(ROOT/'大鱼调色/Wrapper Application/SandboxEntitlements.entitlements'),'--sign',IDENTITY,str(APP))
|
||||
run('codesign','--verify','--deep','--strict',str(APP))
|
||||
details=run('codesign','-dvvv',str(APP))
|
||||
if 'TeamIdentifier=B3W25FX5H5' not in details or 'Timestamp=' not in details or 'runtime' not in details:raise RuntimeError('签名身份/时间戳/runtime未通过')
|
||||
preflight=json.loads(run(str(plugin/'Contents/MacOS/大鱼调色 XPC Service'),'--self-test'))
|
||||
preflight=self_test(plugin/'Contents/MacOS/大鱼调色 XPC Service',CACHE/'release-preflight.json')
|
||||
(CACHE/'release-preflight.json').write_text(json.dumps(preflight,ensure_ascii=False,indent=2)+'\n')
|
||||
if not preflight.get('pass'):raise RuntimeError('Release集成自检失败,正式旧版未替换')
|
||||
archive=CACHE/'notarization-submission.zip'
|
||||
@@ -59,14 +77,14 @@ def main():
|
||||
if result.get('status')!='Accepted':
|
||||
if result.get('id'):run('xcrun','notarytool','log',result['id'],'--keychain-profile',PROFILE,'--keychain',KEYCHAIN,str(CACHE/'notary-rejection.json'))
|
||||
raise RuntimeError('Apple未Accepted,正式旧版未替换')
|
||||
run('xcrun','stapler','staple',str(APP));run('xcrun','stapler','validate',str(APP));hosts_closed()
|
||||
run('xcrun','stapler','staple',str(APP));run('xcrun','stapler','validate',str(APP));hosts_closed(wait=True)
|
||||
stage=DEST.parent/('.dayu-color-staging-'+uuid.uuid4().hex+'.app');run('ditto',str(APP),str(stage))
|
||||
if DEST.exists():
|
||||
identity(DEST,'com.dayu.color');old=DEST.parent/('.dayu-color-previous-'+uuid.uuid4().hex+'.app');os.replace(DEST,old)
|
||||
os.replace(stage,DEST);stage=None
|
||||
try:
|
||||
identity(DEST,'com.dayu.color');run('codesign','--verify','--deep','--strict',str(DEST));run('xcrun','stapler','validate',str(DEST));gate=run('spctl','--assess','--type','execute','--verbose=2',str(DEST))
|
||||
installedTest=json.loads(run(str(DEST/PLUGIN/'Contents/MacOS/大鱼调色 XPC Service'),'--self-test'))
|
||||
installedTest=self_test(DEST/PLUGIN/'Contents/MacOS/大鱼调色 XPC Service',CACHE/'installed-self-test.json')
|
||||
if not installedTest.get('pass'):raise RuntimeError('正式安装版原生集成自检失败')
|
||||
(ROOT/'verification/InstalledSelfTest.json').write_text(json.dumps(installedTest,ensure_ascii=False,indent=2)+'\n')
|
||||
run('open',str(DEST))
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Import the eight identity-verified local LMT tables into standalone Dayu data.
|
||||
|
||||
Run inspect_colorfinale_print --export first. Independent half decoding must
|
||||
match every float returned by the installed reference's own cubeData property.
|
||||
No vendor executable or shader is copied into the product.
|
||||
"""
|
||||
from pathlib import Path
|
||||
import argparse
|
||||
import array
|
||||
import hashlib
|
||||
import json
|
||||
import math
|
||||
import struct
|
||||
import zlib
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
REFERENCE = Path('/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A')
|
||||
IDENTITY = '32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3'
|
||||
NAMES = ['kodak_2383', 'kodak_2393', 'kodak_2302_bw', 'fuji_3510', 'fuji_3513', 'fuji_3519', 'fuji_3521', 'agfa_cp30']
|
||||
|
||||
|
||||
def digest(data):
|
||||
return hashlib.sha256(data).hexdigest()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--reference-export', required=True, type=Path)
|
||||
args = parser.parse_args()
|
||||
assert digest((REFERENCE / 'RenderingEngine').read_bytes()) == IDENTITY, 'Reference identity changed'
|
||||
output = ROOT / '\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
records = []
|
||||
for number, name in enumerate(NAMES, 1):
|
||||
source = (REFERENCE / 'Resources' / (name + '.lmt')).read_bytes()
|
||||
# Observed local resource format: repeated SHA256 mask, RGB binary16,
|
||||
# 65 cubed, red axis fastest. The literal prefix is exactly 23 bytes.
|
||||
mask = hashlib.sha256(b'FT.ColorFinale.LMT.2026' + name.encode()).digest()
|
||||
half = bytes(value ^ mask[index % 32] for index, value in enumerate(source))
|
||||
assert len(half) == 65**3 * 6
|
||||
floats = array.array('f')
|
||||
for pixel in struct.iter_unpack('<eee', half):
|
||||
assert all(math.isfinite(value) for value in pixel)
|
||||
floats.extend((*pixel, 1.0))
|
||||
if struct.pack('=I', 1) != struct.pack('<I', 1):
|
||||
floats.byteswap()
|
||||
raw = floats.tobytes()
|
||||
assert raw == (args.reference_export / (name + '.rgba32f')).read_bytes(), name + ': native cubeData mismatch'
|
||||
blob = struct.pack('<4sII6f', b'DYLT', 65, len(raw), 0, 0, 0, 1, 1, 1) + zlib.compress(raw, 9)
|
||||
destination = output / (name + '.dylut')
|
||||
destination.write_bytes(blob)
|
||||
records.append(dict(index=number, name=name, side=65, sourceSHA256=digest(source), rgba32SHA256=digest(raw),
|
||||
bytes=len(blob), sha256=digest(blob), resource=str(destination.relative_to(ROOT)),
|
||||
nativeCubeDataByteIdentical=True))
|
||||
manifest = dict(referenceVersion='2.16.2 (625)', referenceSHA256=IDENTITY, tables=records,
|
||||
cubeOrder='red fastest; green; blue', interpolation='tetrahedral (six cases)',
|
||||
sourceRole='data only; no reference executable or shader shipped')
|
||||
(ROOT / 'research/PrintLooksResources.json').write_text(json.dumps(manifest, indent=2) + '\n')
|
||||
print(json.dumps(dict(tables=len(records), bytes=sum(item['bytes'] for item in records), nativeCubeDataByteIdentical=True)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,30 @@
|
||||
// Read-only research probe. Loads only the user's installed reference framework.
|
||||
// No reference binary, texture, preset or disassembly is bundled with Dayu.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <objc/runtime.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
NSString *path=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";
|
||||
void *handle=dlopen(path.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL);
|
||||
if(!handle){fprintf(stderr,"%s\n",dlerror());return 1;}
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
for(NSString *name in @[@"FTChannelMixerFilter",@"FTFilmSaturationFilter",@"FTHalationFilter",@"FTBloomFilter",@"FTGrainFilter",@"FTGrainProcessor",@"FTNoiseGeneratorSimple"]){
|
||||
Class cls=NSClassFromString(name);NSMutableDictionary *entry=[NSMutableDictionary dictionary];
|
||||
for(int meta=0;meta<2;meta++){
|
||||
unsigned count=0;Method *methods=class_copyMethodList(meta?object_getClass(cls):cls,&count);NSMutableArray *list=[NSMutableArray array];
|
||||
for(unsigned i=0;i<count;i++)[list addObject:@{@"selector":NSStringFromSelector(method_getName(methods[i])),@"encoding":@(method_getTypeEncoding(methods[i]))}];free(methods);entry[meta?@"class":@"instance"]=list;
|
||||
}
|
||||
if([cls isSubclassOfClass:CIFilter.class]){@try{CIFilter *filter=[[cls alloc]init];[filter setDefaults];entry[@"attributes"]=filter.attributes?:@{};entry[@"inputKeys"]=filter.inputKeys?:@[];
|
||||
NSMutableDictionary *values=[NSMutableDictionary dictionary];
|
||||
for(NSString *key in @[@"gammaAll",@"gammaCyan",@"gammaMagenta",@"gammaYellow",@"density",@"densitySwitch",@"valueSwitch",@"scatter",@"dyeTransmission",@"boost",@"sensitivity",@"blurRadius",@"intensity",@"grainSize",@"filmResponse",@"correlation",@"stdRed",@"stdGreen",@"stdBlue",@"seed"]){@try{id value=[filter valueForKey:key];if([value isKindOfClass:NSNumber.class])values[key]=value;}@catch(NSException *e){}}
|
||||
for(NSString *key in @[@"colorKernel",@"genericKernel"]){@try{id value=[filter valueForKey:key];if(value)values[key]=[value name]?:@"";}@catch(NSException *e){}}
|
||||
entry[@"defaults"]=values;
|
||||
}@catch(NSException *e){entry[@"exception"]=e.reason;}}
|
||||
if([name isEqual:@"FTNoiseGeneratorSimple"]){id object=[[cls alloc]init];entry[@"defaults"]=@{@"radius":[object valueForKey:@"radius"],@"blurSize":[object valueForKey:@"blurSize"]};}
|
||||
out[name]=entry;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];
|
||||
if(!json)return 2;fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,48 @@
|
||||
// Read-only reference metadata probe; never linked into the product.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <objc/runtime.h>
|
||||
#import <objc/message.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
NSString *path=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";
|
||||
if(!dlopen(path.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL)){fprintf(stderr,"%s\n",dlerror());return 1;}
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
if(argc==2&&strcmp(argv[1],"--matrix")==0){
|
||||
Class space=NSClassFromString(@"FTColorSpace");id from=((id(*)(id,SEL))objc_msgSend)((id)space,sel_registerName("Rec709Linear"));id to=((id(*)(id,SEL))objc_msgSend)((id)space,sel_registerName("ACEScg"));
|
||||
CIContext *context=[CIContext contextWithOptions:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}];
|
||||
float input[16]={1,0,0,1,0,1,0,1,0,0,1,1,1,1,1,1};
|
||||
for(int direction=0;direction<2;direction++){
|
||||
CIFilter *f=((id(*)(id,SEL,id,id))objc_msgSend)((id)NSClassFromString(@"FTColorSpaceFilter"),sel_registerName("filterFromColorSpace:toColorSpace:"),direction?to:from,direction?from:to);
|
||||
if(!f)return 5;[f setValue:[CIImage imageWithBitmapData:[NSData dataWithBytes:input length:sizeof(input)] bytesPerRow:sizeof(input) size:CGSizeMake(4,1) format:kCIFormatRGBAf colorSpace:nil]forKey:kCIInputImageKey];float result[16]={};[context render:f.outputImage toBitmap:result rowBytes:sizeof(result) bounds:CGRectMake(0,0,4,1) format:kCIFormatRGBAf colorSpace:nil];
|
||||
NSMutableArray *values=[NSMutableArray array];for(int i=0;i<16;i++)[values addObject:@(result[i])];out[direction?@"AP1-to-709":@"709-to-AP1"]=values;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted error:nil];fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}
|
||||
if(argc==3&&strcmp(argv[1],"--export")==0){
|
||||
NSString *directory=@(argv[2]);[[NSFileManager defaultManager]createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:nil];
|
||||
NSMutableArray *exports=[NSMutableArray array];
|
||||
for(NSString *name in @[@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"]){
|
||||
id filter=((id(*)(id,SEL,id))objc_msgSend)((id)NSClassFromString(@"FTAcesLMTFilter"),sel_registerName("filterWithLMT:"),name);
|
||||
NSData *data=[filter valueForKey:@"cubeData"];if(data.length!=65*65*65*16)return 3;
|
||||
NSString *destination=[directory stringByAppendingPathComponent:[name stringByAppendingString:@".rgba32f"]];
|
||||
if(![data writeToFile:destination atomically:YES])return 4;
|
||||
[exports addObject:@{@"name":name,@"bytes":@(data.length),@"path":destination}];
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:exports options:NSJSONWritingPrettyPrinted error:nil];fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}
|
||||
for(NSString *name in @[@"FTAcesLMTFilter",@"FTLMTCIImageProcessor",@"FTCubeProcessor",@"FTCubeCIImageProcessor",@"FTColorCubeFilter",@"FTAcesTypes",@"FTColorSpace"]){
|
||||
Class cls=NSClassFromString(name);if(!cls)continue;
|
||||
NSMutableDictionary *entry=[NSMutableDictionary dictionary];
|
||||
for(int meta=0;meta<2;meta++){
|
||||
unsigned count=0;Method *methods=class_copyMethodList(meta?object_getClass(cls):cls,&count);NSMutableArray *list=[NSMutableArray array];
|
||||
for(unsigned i=0;i<count;i++)[list addObject:@{@"selector":NSStringFromSelector(method_getName(methods[i])),@"encoding":@(method_getTypeEncoding(methods[i]))}];free(methods);entry[meta?@"class":@"instance"]=list;
|
||||
}
|
||||
unsigned n=0;Ivar *ivars=class_copyIvarList(cls,&n);NSMutableArray *ivs=[NSMutableArray array];
|
||||
for(unsigned i=0;i<n;i++)[ivs addObject:@{@"name":@(ivar_getName(ivars[i])),@"type":@(ivar_getTypeEncoding(ivars[i])),@"offset":@(ivar_getOffset(ivars[i]))}];free(ivars);entry[@"ivars"]=ivs;
|
||||
out[name]=entry;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];
|
||||
if(!json)return 2;fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,68 @@
|
||||
// Executes the user's installed Color Finale only as a read-only test oracle.
|
||||
// Product builds and product rendering never load these reference frameworks.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <Metal/Metal.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#include <dlfcn.h>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include "../大鱼调色/Plugin/DYFilmMath.h"
|
||||
using Floats=std::vector<float>;
|
||||
static id<MTLDevice> gpu;
|
||||
static id<MTLCommandQueue> queue;
|
||||
static CIContext *context;
|
||||
static unsigned W=64,H=48;
|
||||
static void require(bool p,NSString *m){if(!p)@throw [NSException exceptionWithName:@"FilmReference" reason:m userInfo:nil];}
|
||||
static float encode(float v){return v<=.0031308f?v*12.92f:1.055f*powf(fmaxf(0,v),1/2.4f)-.055f;}
|
||||
static float decode(float v){return v<=.04045f?v/12.92f:powf(fmaxf(0,(v+.055f)/1.055f),2.4f);}
|
||||
static id<MTLTexture> texture(const Floats& data={}){MTLTextureDescriptor *d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:W height:H mipmapped:NO];d.storageMode=MTLStorageModeShared;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[gpu newTextureWithDescriptor:d];require(t!=nil,@"texture allocation");if(!data.empty())[t replaceRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0 withBytes:data.data() bytesPerRow:W*16];return t;}
|
||||
static Floats read(id<MTLTexture> t){Floats v(W*H*4);[t getBytes:v.data() bytesPerRow:W*16 fromRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0];return v;}
|
||||
static void finish(id<MTLCommandBuffer> c){[c commit];[c waitUntilCompleted];require(c.status==MTLCommandBufferStatusCompleted,c.error.description?:@"GPU command");}
|
||||
static CIImage *image(id<MTLTexture> t){return [CIImage imageWithMTLTexture:t options:@{kCIImageColorSpace:NSNull.null}];}
|
||||
static Floats render(CIImage *ci){require(ci!=nil,@"reference output image");Floats v(W*H*4);[context render:ci toBitmap:v.data() rowBytes:W*16 bounds:CGRectMake(0,0,W,H) format:kCIFormatRGBAf colorSpace:nil];Floats top(v.size());for(unsigned y=0;y<H;y++)memcpy(top.data()+y*W*4,v.data()+(H-1-y)*W*4,W*16);return top;}
|
||||
static id<MTLComputePipelineState> pipeline(id<MTLLibrary> library,NSString *name){NSError *error=nil;id<MTLFunction> f=[library newFunctionWithName:name];require(f!=nil,name);id<MTLComputePipelineState>p=[gpu newComputePipelineStateWithFunction:f error:&error];require(p!=nil,error.description);return p;}
|
||||
static void dispatch(id<MTLComputeCommandEncoder> e){[e dispatchThreads:MTLSizeMake(W,H,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[e endEncoding];}
|
||||
static Floats point(id<MTLLibrary> library,id<MTLTexture> src,id<MTLTexture> aux,DYUniforms u,int operation){id<MTLTexture>out=texture();id<MTLCommandBuffer>c=[queue commandBuffer];id<MTLComputeCommandEncoder>e=[c computeCommandEncoder];[e setComputePipelineState:pipeline(library,@"dyFilmPoint")];[e setTexture:src atIndex:0];[e setTexture:aux?:src atIndex:1];[e setTexture:out atIndex:2];[e setBytes:&u length:sizeof(u) atIndex:0];struct {int operation;float radius;unsigned frame,reserved;}p={operation,0,u.filmFrameKey,0};[e setBytes:&p length:sizeof(p) atIndex:1];dispatch(e);finish(c);return read(out);}
|
||||
static NSDictionary *difference(const Floats&a,const Floats&b){double maximum=0,sum=0;unsigned count=0,nonfinite=0,different=0;for(size_t i=0;i<a.size();i++){if(i%4==3)continue;if(a[(i/4)*4+3]<=0)continue;double d=fabs(a[i]-b[i]);if(!std::isfinite(d))nonfinite++;else{maximum=fmax(maximum,d);sum+=d*d;count++;if(d>1e-5)different++;}}return @{@"maximum":@(maximum),@"rms":@(sqrt(sum/fmax(1,count))),@"nonfinite":@(nonfinite),@"different":@(different)};}
|
||||
int main(int argc,const char **argv){@autoreleasepool{@try{
|
||||
require(argc==2||argc==4,@"Usage: verify_film_reference /absolute/path/default.metallib [width height]");if(argc==4){W=atoi(argv[2]);H=atoi(argv[3]);require(W>0&&H>0&&W<=4096&&H<=4096,@"bounded reference dimensions");}gpu=MTLCreateSystemDefaultDevice();queue=[gpu newCommandQueue];context=[CIContext contextWithMTLDevice:gpu options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}];NSError *error=nil;
|
||||
id<MTLLibrary> dayu=[gpu newLibraryWithURL:[NSURL fileURLWithPath:@(argv[1])] error:&error];require(dayu!=nil,error.description);
|
||||
NSString *framework=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A";
|
||||
require(dlopen([[framework stringByAppendingPathComponent:@"RenderingEngine"]fileSystemRepresentation],RTLD_NOW|RTLD_LOCAL)!=nullptr,@"load installed reference framework");
|
||||
id<MTLLibrary> original=[gpu newLibraryWithURL:[NSURL fileURLWithPath:[framework stringByAppendingPathComponent:@"Resources/metal_kernels.metallib"]] error:&error];require(original!=nil,error.description);
|
||||
Floats linear(W*H*4),encoded(linear.size());for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++){unsigned i=(y*W+x)*4;float a=(x%11==0&&W>1)?0:(x%3==0?.25f:1);for(int k=0;k<3;k++){float c=float((x*17+y*23+k*71)%257)/256;if(x%17==0)c=k==0?1.3f:k==1?-.02f:c;linear[i+k]=float((__fp16)(decode(c)*a));encoded[i+k]=encode(a>0?linear[i+k]/a:0)*a;}linear[i+3]=encoded[i+3]=a;}
|
||||
id<MTLTexture>source=texture(linear),codes=texture(encoded);Floats probe=render(image(source));require([difference(linear,probe)[@"maximum"]doubleValue]==0,@"CI bitmap orientation control");id<MTLTexture>roundtrip=texture();id<MTLCommandBuffer>roundtripCommands=[queue commandBuffer];[context render:image(source) toMTLTexture:roundtrip commandBuffer:roundtripCommands bounds:CGRectMake(0,0,W,H) colorSpace:nil];finish(roundtripCommands);require([difference(linear,read(roundtrip))[@"maximum"]doubleValue]==0,@"CI texture orientation control");NSMutableArray *rows=[NSMutableArray array];bool passed=true;
|
||||
auto check=[&](NSString*name,const Floats&a,const Floats&b,double tolerance){NSDictionary *d=difference(a,b);BOOL ok=[d[@"nonfinite"]intValue]==0&&[d[@"maximum"]doubleValue]<tolerance;NSMutableDictionary *r=[d mutableCopy];r[@"name"]=name;r[@"pass"]=@(ok);r[@"tolerance"]=@(tolerance);[rows addObject:r];passed&=ok;};
|
||||
DYUniforms u={};u.mixerMix=1;u.mixerRed=(DYFloat4){.75,.3,-.05,0};u.mixerGreen=(DYFloat4){.15,.85,0,0};u.mixerBlue=(DYFloat4){.05,-.1,1.05,0};u.film.gammaAll=u.film.gammaCyan=u.film.gammaMagenta=u.film.gammaYellow=1;u.film.valueMode=6;
|
||||
for(int matrixCase=0;matrixCase<3;matrixCase++){
|
||||
if(matrixCase==1)u.mixerRed=u.mixerGreen=u.mixerBlue=(DYFloat4){0,0,0,0};
|
||||
if(matrixCase==2)u.mixerRed=u.mixerGreen=u.mixerBlue=(DYFloat4){1.f/3,1.f/3,1.f/3,0};
|
||||
for(int options=0;options<4;options++){
|
||||
u.mixerPreserveLuma=options&1;u.mixerPreserveSaturation=(options>>1)&1;CIFilter *f=[[NSClassFromString(@"FTChannelMixerFilter")alloc]init];[f setDefaults];[f setValue:image(codes) forKey:kCIInputImageKey];[f setValue:[CIVector vectorWithX:u.mixerRed.x Y:u.mixerRed.y Z:u.mixerRed.z]forKey:@"inputRVector"];[f setValue:[CIVector vectorWithX:u.mixerGreen.x Y:u.mixerGreen.y Z:u.mixerGreen.z]forKey:@"inputGVector"];[f setValue:[CIVector vectorWithX:u.mixerBlue.x Y:u.mixerBlue.y Z:u.mixerBlue.z]forKey:@"inputBVector"];[f setValue:@(u.mixerPreserveLuma>0) forKey:@"inputPreserveLuma"];[f setValue:@(u.mixerPreserveSaturation>0)forKey:@"inputPreserveSaturation"];
|
||||
Floats expected=render(f.outputImage);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-mixer-case-%d-options-%d",matrixCase,options],expected,point(dayu,source,nil,u,0),.00015);
|
||||
}
|
||||
}
|
||||
for(int mode=1;mode<=2;mode++)for(float density:{-.4f,0.f,.65f})for(float gamma:{.75f,1.3f}){
|
||||
u.film.densityMode=mode;u.film.density=density;u.film.gammaAll=gamma;u.film.gammaCyan=1.2;u.film.gammaMagenta=.9;u.film.gammaYellow=1.1;CIFilter *f=[[NSClassFromString(@"FTFilmSaturationFilter")alloc]init];[f setDefaults];[f setValue:image(codes)forKey:kCIInputImageKey];[f setValue:@(gamma)forKey:@"gammaAll"];[f setValue:@1.2 forKey:@"gammaCyan"];[f setValue:@.9 forKey:@"gammaMagenta"];[f setValue:@1.1 forKey:@"gammaYellow"];[f setValue:@(density)forKey:@"density"];[f setValue:@(mode)forKey:@"densitySwitch"];
|
||||
Floats expected=render(f.outputImage);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-subtractive-%d-%.2f-%.2f",mode,density,gamma],expected,point(dayu,source,nil,u,1),.00012);
|
||||
}
|
||||
for(float scatter:{1.f,5.f,20.f}){
|
||||
u.film.scatter=scatter;u.film.boost=1.7;u.film.dyeTransmission=70;CIFilter *f=[[NSClassFromString(@"FTHalationFilter")alloc]init];[f setDefaults];[f setValue:image(source)forKey:kCIInputImageKey];[f setValue:@(scatter)forKey:@"scatter"];[f setValue:@1.7 forKey:@"boost"];[f setValue:@(70.f/500)forKey:@"dyeTransmission"];
|
||||
CIImage *blur=[[[image(source)imageByClampingToExtent]imageByApplyingFilter:@"CIGaussianBlur" withInputParameters:@{kCIInputRadiusKey:@(scatter)}]imageByCroppingToRect:CGRectMake(0,0,W,H)];id<MTLTexture>aux=texture(render(blur));check([NSString stringWithFormat:@"original-halation-radius-%.0f",scatter],render(f.outputImage),point(dayu,source,aux,u,2),.00012);
|
||||
}
|
||||
for(float sensitivity:{20.f,50.f,80.f}){
|
||||
DYFilmSettings settings={};settings.sensitivity=sensitivity;settings.intensity=70;
|
||||
CIFilter *filter=[[NSClassFromString(@"FTBloomFilter")alloc]init];[filter setValue:image(source)forKey:kCIInputImageKey];[filter setValue:@2.5 forKey:@"blurRadius"];[filter setValue:@(sensitivity/100)forKey:@"sensitivity"];[filter setValue:@.7 forKey:@"intensity"];
|
||||
id<MTLTexture>horizontal=texture(),vertical=texture(),edges=texture();id<MTLCommandBuffer>commands=[queue commandBuffer];
|
||||
for(int direction=0;direction<2;direction++){id<MTLComputeCommandEncoder>e=[commands computeCommandEncoder];[e setComputePipelineState:pipeline(dayu,@"dyFilmSparseBlur")];[e setTexture:direction?horizontal:source atIndex:0];[e setTexture:direction?vertical:horizontal atIndex:1];[e setBytes:&direction length:4 atIndex:0];dispatch(e);}
|
||||
id<MTLComputeCommandEncoder>e=[commands computeCommandEncoder];[e setComputePipelineState:pipeline(dayu,@"dyFilmBloomEdges")];[e setTexture:vertical atIndex:0];[e setTexture:source atIndex:1];[e setTexture:edges atIndex:2];[e setBytes:&settings length:sizeof(settings) atIndex:0];dispatch(e);finish(commands);
|
||||
Floats actual=read(edges),expected=render(filter.outputImage);unsigned inside=0,border=0;for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++)if(expected[(y*W+x)*4+3]>0&&fabs(actual[(y*W+x)*4]-expected[(y*W+x)*4])>.01){if(x>=8&&x<W-8&&y>=8&&y<H-8)inside++;else border++;}fprintf(stderr,"bloom %.0f mismatches interior=%u border=%u\n",sensitivity,inside,border);check([NSString stringWithFormat:@"original-bloom-edge-sensitivity-%.0f",sensitivity],expected,actual,.00001);
|
||||
}
|
||||
for(unsigned seed:{0u,1u,7919u,0xffffffffu}){
|
||||
auto noise=[&](id<MTLLibrary>lib,NSString *name){id<MTLTexture>out=texture();id<MTLCommandBuffer>c=[queue commandBuffer];id<MTLComputeCommandEncoder>e=[c computeCommandEncoder];[e setComputePipelineState:pipeline(lib,name)];[e setTexture:out atIndex:0];[e setBytes:&seed length:4 atIndex:0];if([name isEqual:@"dyFilmNoise"]){unsigned bottom=0;[e setBytes:&bottom length:4 atIndex:1];}dispatch(e);finish(c);return out;};
|
||||
id<MTLTexture>ref=noise(original,@"BoxMullerPCG"),ours=noise(dayu,@"dyFilmNoise");check([NSString stringWithFormat:@"original-pcg-box-muller-%u",seed],read(ref),read(ours),.00002);
|
||||
for(float color:{0.f,.35f,1.f}){u.film.grainAmount=.5;u.film.grainSize=1;u.film.grainResponse=.4;u.film.grainColor=color;float corr=1-2*color,other=1-corr,norm=sqrtf(corr*corr+other*other);float params[9]={.4f,.6f,corr/norm,other/norm,corr/norm,other/norm,.025f,.025f,.025f};id<MTLTexture>referenceOutput=texture();id<MTLCommandBuffer>commands=[queue commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:pipeline(original,@"GrainFilter")];[encoder setTexture:codes atIndex:0];[encoder setTexture:ref atIndex:1];[encoder setTexture:referenceOutput atIndex:2];[encoder setBytes:params length:sizeof(params) atIndex:0];dispatch(encoder);finish(commands);Floats expected=read(referenceOutput);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-grain-%u-%.2f",seed,color],expected,point(dayu,source,ours,u,4),.0002);}
|
||||
}
|
||||
NSDictionary *result=@{@"pass":@(passed),@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"gpu":gpu.name,@"referenceVersion":@"ColorFinale 2.16.2 (625)",@"scope":@"Independent installed-reference CI/Metal output versus authored production Metal point kernels; source grayscale/color/HDR/negative and fractional-alpha vectors; reference frame seed is explicit.",@"results":rows};NSData *json=[NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];fwrite(json.bytes,1,json.length,stdout);puts("");return passed?0:1;
|
||||
}@catch(NSException *e){fprintf(stderr,"%s\n",e.reason.UTF8String);return 2;}}}
|
||||
@@ -0,0 +1,127 @@
|
||||
// Read-only oracle tool. Neither product builds nor product rendering load
|
||||
// the installed Color Finale framework used here.
|
||||
// Build with clang++ -std=c++17 -fno-objc-arc, Foundation/CoreImage/Metal.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <Metal/Metal.h>
|
||||
#import <objc/message.h>
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
#include <dlfcn.h>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include "../大鱼调色/Plugin/DYUniforms.h"
|
||||
|
||||
using Floats=std::vector<float>;
|
||||
static unsigned W=64,H=48;
|
||||
static id<MTLDevice> gpu;
|
||||
static id<MTLCommandQueue> queue;
|
||||
static CIContext *context;
|
||||
static BOOL bitmapNeedsVerticalFlip=NO;
|
||||
static NSMutableArray *rows;
|
||||
static NSMutableArray *conversionFilters,*conversionCalls;
|
||||
static bool passed=true;
|
||||
static constexpr double tolerance=1e-4;
|
||||
|
||||
static void require(bool condition,NSString *message){
|
||||
if(!condition)@throw [NSException exceptionWithName:@"PrintReference" reason:message?:@"reference requirement failed" userInfo:nil];
|
||||
}
|
||||
static NSString *sha256(NSData *data){
|
||||
require(data!=nil,@"identity file could not be read for SHA-256");
|
||||
unsigned char digest[CC_SHA256_DIGEST_LENGTH];CC_SHA256(data.bytes,(CC_LONG)data.length,digest);
|
||||
NSMutableString *text=[NSMutableString stringWithCapacity:64];for(unsigned char byte:digest)[text appendFormat:@"%02x",byte];return text;
|
||||
}
|
||||
static id finiteValue(float value){return std::isfinite(value)?(id)@(value):(id)@"nonfinite";}
|
||||
static Floats flipped(const Floats& input){
|
||||
Floats output(input.size());for(unsigned y=0;y<H;y++)memcpy(output.data()+y*W*4,input.data()+(H-1-y)*W*4,W*16);return output;
|
||||
}
|
||||
static NSDictionary *difference(const Floats& expected,const Floats& actual,const Floats *alphaSource=nullptr,float selectedAlpha=-1){
|
||||
require(expected.size()==actual.size(),@"comparison dimensions differ");
|
||||
double maximum=0,rgbMaximum=0,alphaMaximum=0,sum=0,straightMaximum=0;size_t count=0,nonfinite=0,worst=0,different=0;
|
||||
for(size_t i=0;i<expected.size();i++){
|
||||
if(alphaSource&&(*alphaSource)[(i/4)*4+3]!=selectedAlpha)continue;
|
||||
double delta=fabs(double(expected[i])-actual[i]);
|
||||
if(!std::isfinite(delta)){nonfinite++;continue;}
|
||||
if(delta>maximum){maximum=delta;worst=i;}
|
||||
if(i%4==3)alphaMaximum=fmax(alphaMaximum,delta);
|
||||
else{rgbMaximum=fmax(rgbMaximum,delta);sum+=delta*delta;count++;if(delta>tolerance)different++;}
|
||||
}
|
||||
for(size_t i=0;i<expected.size()/4;i++){
|
||||
if(alphaSource&&(*alphaSource)[i*4+3]!=selectedAlpha)continue;
|
||||
float ea=expected[i*4+3],aa=actual[i*4+3];if(!(ea>0&&aa>0))continue;
|
||||
for(int c=0;c<3;c++){double delta=fabs(double(expected[i*4+c])/ea-double(actual[i*4+c])/aa);if(std::isfinite(delta))straightMaximum=fmax(straightMaximum,delta);}
|
||||
}
|
||||
return @{@"maximum":@(maximum),@"rgbMaximum":@(rgbMaximum),@"alphaMaximum":@(alphaMaximum),@"rmsRGB":@(sqrt(sum/fmax(1,count))),@"straightRGBMaximum":@(straightMaximum),@"nonfinite":@(nonfinite),@"pixels":@(count/3),@"rgbComponentsOverTolerance":@(different),@"worstPixel":@{@"x":@((worst/4)%W),@"y":@((worst/4)/W),@"channel":@(worst%4),@"expected":finiteValue(expected[worst]),@"actual":finiteValue(actual[worst])}};
|
||||
}
|
||||
static NSArray *differencesByAlpha(const Floats& expected,const Floats& actual,const Floats& source){NSMutableArray *groups=[NSMutableArray array];for(float alpha:{0.f,1.f/65536,1e-4f,.03125f,.25f,1.f}){NSMutableDictionary *group=[NSMutableDictionary dictionaryWithDictionary:difference(expected,actual,&source,alpha)];group[@"sourceAlpha"]=@(alpha);[groups addObject:group];}return groups;}
|
||||
static NSArray *samples(const Floats& source,const Floats& converted,const Floats& lmt,const Floats& decoded,const Floats& actual){NSMutableArray *result=[NSMutableArray array];for(NSUInteger index:{NSUInteger(0),NSUInteger(1),NSUInteger(6),NSUInteger(30),NSUInteger(54),NSUInteger(78),NSUInteger(102),NSUInteger(126)}){if(index>=size_t(W)*H)continue;auto pixel=[&](const Floats& values){NSMutableArray *array=[NSMutableArray array];for(int c=0;c<4;c++)[array addObject:finiteValue(values[index*4+c])];return array;};[result addObject:@{@"x":@(index%W),@"y":@(index/W),@"source":pixel(source),@"convertedToCCT":pixel(converted),@"lmt":pixel(lmt),@"decodedTo709":pixel(decoded),@"production":pixel(actual)}];}return result;}
|
||||
static void record(NSString *name,NSDictionary *metrics,double limit,NSDictionary *extra=nil){
|
||||
BOOL ok=[metrics[@"nonfinite"]unsignedLongLongValue]==0&&[metrics[@"maximum"]doubleValue]<=limit;
|
||||
NSMutableDictionary *row=[NSMutableDictionary dictionaryWithDictionary:metrics];row[@"name"]=name;row[@"pass"]=@(ok);row[@"tolerance"]=@(limit);if(extra)[row addEntriesFromDictionary:extra];[rows addObject:row];passed&=ok;
|
||||
}
|
||||
static id<MTLTexture> texture(const Floats& values={}){
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:W height:H mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
|
||||
id<MTLTexture> result=[gpu newTextureWithDescriptor:desc];require(result!=nil,@"RGBA32Float texture allocation failed");if(!values.empty()){require(values.size()==size_t(W)*H*4,@"source texture byte count");[result replaceRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0 withBytes:values.data() bytesPerRow:W*16];}return [result autorelease];
|
||||
}
|
||||
static id<MTLTexture> cubeTexture(NSData *data){
|
||||
const NSUInteger n=65;require(data.length==n*n*n*16,@"reference cubeData is not 65-cubed RGBA32Float");const float *values=(const float*)data.bytes;for(NSUInteger i=0;i<data.length/4;i++)require(std::isfinite(values[i]),@"reference cubeData contains nonfinite values");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor new];desc.textureType=MTLTextureType3D;desc.pixelFormat=MTLPixelFormatRGBA32Float;desc.width=desc.height=desc.depth=n;desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead;
|
||||
id<MTLTexture> result=[gpu newTextureWithDescriptor:desc];[desc release];require(result!=nil,@"print cube texture allocation failed");[result replaceRegion:MTLRegionMake3D(0,0,0,n,n,n) mipmapLevel:0 slice:0 withBytes:data.bytes bytesPerRow:n*16 bytesPerImage:n*n*16];return [result autorelease];
|
||||
}
|
||||
static Floats read(id<MTLTexture> value){Floats result(size_t(W)*H*4);[value getBytes:result.data() bytesPerRow:W*16 fromRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0];return result;}
|
||||
static void finish(id<MTLCommandBuffer> commands){[commands commit];[commands waitUntilCompleted];require(commands.status==MTLCommandBufferStatusCompleted,commands.error.description?:@"Metal command failed");}
|
||||
static CIImage *image(id<MTLTexture> value){CIImage *result=[CIImage imageWithMTLTexture:value options:@{kCIImageColorSpace:NSNull.null}];require(result!=nil,@"CIImage from Metal texture failed");return result;}
|
||||
static Floats bitmapRaw(CIImage *value){require(value!=nil,@"reference output image missing");Floats result(size_t(W)*H*4);[context render:value toBitmap:result.data() rowBytes:W*16 bounds:CGRectMake(0,0,W,H) format:kCIFormatRGBAf colorSpace:nil];return result;}
|
||||
static Floats bitmap(CIImage *value){Floats result=bitmapRaw(value);return bitmapNeedsVerticalFlip?flipped(result):result;}
|
||||
static id colorSpace(NSString *name){
|
||||
Class cls=NSClassFromString(@"FTColorSpace");SEL selector=NSSelectorFromString(name);require(cls&&[(id)cls respondsToSelector:selector],[@"reference color space missing: " stringByAppendingString:name]);id value=((id(*)(id,SEL))objc_msgSend)((id)cls,selector);require(value!=nil,@"reference color space factory failed");return value;
|
||||
}
|
||||
static CIImage *converted(CIImage *input,id from,id to){
|
||||
Class cls=NSClassFromString(@"FTColorSpaceFilter");SEL selector=sel_registerName("filterFromColorSpace:toColorSpace:");require(cls&&[(id)cls respondsToSelector:selector],@"reference color conversion factory missing");CIFilter *filter=((id(*)(id,SEL,id,id))objc_msgSend)((id)cls,selector,from,to);require(filter!=nil,@"reference color conversion factory failed");[conversionFilters addObject:filter];[filter setValue:input forKey:kCIInputImageKey];CIImage *output=filter.outputImage;require(output!=nil,@"reference color conversion returned no image");[conversionCalls addObject:@{@"filter": [NSString stringWithFormat:@"%p",(void*)filter],@"outputImage":[NSString stringWithFormat:@"%p",(void*)output],@"fromSpace":[NSString stringWithFormat:@"%p",(void*)from],@"toSpace":[NSString stringWithFormat:@"%p",(void*)to]}];return output;
|
||||
}
|
||||
static Floats production(id<MTLComputePipelineState> pipeline,id<MTLTexture> source,id<MTLTexture> cube,DYUniforms uniforms){
|
||||
id<MTLTexture> output=texture();id<MTLCommandBuffer> commands=[queue commandBuffer];id<MTLComputeCommandEncoder> encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:pipeline];[encoder setTexture:source atIndex:0];[encoder setTexture:cube atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBytes:&uniforms length:sizeof(uniforms) atIndex:0];[encoder dispatchThreads:MTLSizeMake(W,H,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];finish(commands);return read(output);
|
||||
}
|
||||
static void orientationControls(){
|
||||
Floats probe(size_t(W)*H*4);for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++){size_t i=(size_t(y)*W+x)*4;probe[i]=float(x+1)/(W+1)*.6f;probe[i+1]=float(y+1)/(H+1)*.7f;probe[i+2]=float((x+y*3)%17+1)/19;probe[i+3]=1;}
|
||||
id<MTLTexture> source=texture(probe);CIImage *ci=image(source);Floats raw=bitmapRaw(ci);NSDictionary *direct=difference(probe,raw),*vertical=difference(probe,flipped(raw));double directMaximum=[direct[@"maximum"]doubleValue],verticalMaximum=[vertical[@"maximum"]doubleValue];bitmapNeedsVerticalFlip=verticalMaximum<directMaximum;
|
||||
NSDictionary *selected=bitmapNeedsVerticalFlip?vertical:direct;record(@"ci-bitmap-orientation-control",selected,1e-7,@{@"rawMaximum":@(directMaximum),@"flippedMaximum":@(verticalMaximum),@"bitmapToMetalMemory":bitmapNeedsVerticalFlip?@"vertical-flip":@"identity"});require([selected[@"nonfinite"]unsignedLongLongValue]==0&&[selected[@"maximum"]doubleValue]<=1e-7,@"CI bitmap orientation control failed; comparisons not run");
|
||||
id<MTLTexture> output=texture();id<MTLCommandBuffer> commands=[queue commandBuffer];[context render:ci toMTLTexture:output commandBuffer:commands bounds:CGRectMake(0,0,W,H) colorSpace:nil];finish(commands);NSDictionary *metrics=difference(probe,read(output));record(@"ci-texture-orientation-control",metrics,1e-7);require([metrics[@"nonfinite"]unsignedLongLongValue]==0&&[metrics[@"maximum"]doubleValue]<=1e-7,@"CI texture orientation control failed; comparisons not run");
|
||||
}
|
||||
static Floats sourcePixels(){
|
||||
static const float patches[][3]={{0,0,0},{.001f,.001f,.001f},{.0078125f,.0078125f,.0078125f},{.18f,.18f,.18f},{1,1,1},{4,4,4},{16,16,16},{-.02f,-.02f,-.02f},{1,0,0},{0,1,0},{0,0,1},{1,1,0},{0,1,1},{1,0,1},{4,.1f,.01f},{.01f,.2f,8},{-.05f,.18f,.8f},{.25f,-.125f,.04f},{.01f,4,.5f},{.7f,.3f,.1f},{.035f,.07f,.14f},{2,.6f,-.02f},{-.1f,.04f,1.2f},{.5f,.5f,.5f}};
|
||||
static const float alpha[]={0,1.f/65536,1e-4f,.03125f,.25f,1};Floats result(size_t(W)*H*4);for(size_t i=0;i<size_t(W)*H;i++){size_t patch=i%24;float a=alpha[(i+i/24)%6];for(int c=0;c<3;c++)result[i*4+c]=patches[patch][c]*a;result[i*4+3]=a;}return result;
|
||||
}
|
||||
static void writeJSON(NSDictionary *value){NSError *error=nil;NSData *data=[NSJSONSerialization dataWithJSONObject:value options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];require(data!=nil,error.description?:@"JSON encoding failed");fwrite(data.bytes,1,data.length,stdout);fputc('\n',stdout);}
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
rows=[NSMutableArray array];conversionFilters=[NSMutableArray array];conversionCalls=[NSMutableArray array];NSMutableDictionary *identity=[NSMutableDictionary dictionary];
|
||||
@try{
|
||||
require(argc==2||argc==4,@"Usage: verify_print_reference /absolute/path/default.metallib [width height]");if(argc==4){char *endW=nullptr,*endH=nullptr;long width=strtol(argv[2],&endW,10),height=strtol(argv[3],&endH,10);require(endW&&!*endW&&endH&&!*endH&&width>0&&height>0&&width<=4096&&height<=4096,@"reference dimensions must be integers from 1 through 4096");W=(unsigned)width;H=(unsigned)height;}
|
||||
gpu=MTLCreateSystemDefaultDevice();require(gpu!=nil,@"Metal device unavailable");queue=[gpu newCommandQueue];require(queue!=nil,@"Metal command queue unavailable");context=[CIContext contextWithMTLDevice:gpu options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null,kCIContextWorkingFormat:@(kCIFormatRGBAf),kCIContextCacheIntermediates:@NO}];require(context!=nil,@"RGBAf CIContext unavailable");
|
||||
NSError *error=nil;NSString *libraryPath=@(argv[1]);id<MTLLibrary> dayu=[gpu newLibraryWithURL:[NSURL fileURLWithPath:libraryPath] error:&error];require(dayu!=nil,error.description?:@"product Metal library unavailable");id<MTLFunction> function=[dayu newFunctionWithName:@"dyFilmPrint"];require(function!=nil,@"product dyFilmPrint function missing");id<MTLComputePipelineState> pipeline=[gpu newComputePipelineStateWithFunction:function error:&error];[function release];require(pipeline!=nil,error.description?:@"dyFilmPrint pipeline creation failed");identity[@"productMetallib"]=libraryPath;identity[@"productMetallibSHA256"]=sha256([NSData dataWithContentsOfFile:libraryPath]);
|
||||
NSString *framework=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";require(dlopen(framework.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL)!=nullptr,@"cannot load installed reference RenderingEngine");NSBundle *reference=[NSBundle bundleWithPath:@"/Applications/ColorFinale.app"];identity[@"referenceVersion"]=[reference objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"unknown";identity[@"referenceBuild"]=[reference objectForInfoDictionaryKey:@"CFBundleVersion"]?:@"unknown";identity[@"referenceFrameworkSHA256"]=sha256([NSData dataWithContentsOfFile:framework]);
|
||||
orientationControls();Floats source=sourcePixels(),opaqueSource=source;for(size_t i=0;i<source.size()/4;i++){float a=source[i*4+3];for(int c=0;c<3;c++)opaqueSource[i*4+c]=a>0?source[i*4+c]/a:0;opaqueSource[i*4+3]=1;}id<MTLTexture> input=texture(source),opaqueInput=texture(opaqueSource);id from=colorSpace(@"Rec709Linear"),to=colorSpace(@"ACEScct");NSArray *names=@[@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"];NSMutableArray *cubes=[NSMutableArray array],*diagnostics=[NSMutableArray array];double rawChainDiscrepancyMaximum=0;
|
||||
for(NSUInteger look=0;look<names.count;look++){@autoreleasepool{
|
||||
NSString *name=names[look];Class cls=NSClassFromString(@"FTAcesLMTFilter");SEL selector=sel_registerName("filterWithLMT:");require(cls&&[(id)cls respondsToSelector:selector],@"reference LMT factory missing");CIFilter *filter=((id(*)(id,SEL,id))objc_msgSend)((id)cls,selector,name);require(filter!=nil,[@"reference LMT factory failed: " stringByAppendingString:name]);NSData *data=[filter valueForKey:@"cubeData"];require([data isKindOfClass:NSData.class],@"reference LMT cubeData unavailable");id<MTLTexture> cube=cubeTexture(data);[cubes addObject:@{@"name":name,@"bytes":@(data.length),@"sha256":sha256(data)}];
|
||||
CIImage *rawConverted=converted(image(input),from,to);[filter setValue:rawConverted forKey:kCIInputImageKey];CIImage *rawLMT=filter.outputImage,*output=converted(rawLMT,to,from);Floats referenceOutput=bitmap(output),convertedValues=bitmap(rawConverted),lmtValues=bitmap(rawLMT);double nativeAlphaMaximum=0;for(size_t i=0;i<source.size()/4;i++)nativeAlphaMaximum=fmax(nativeAlphaMaximum,fabs(double(referenceOutput[i*4+3])-source[i*4+3]));
|
||||
CIFilter *opaqueFilter=((id(*)(id,SEL,id))objc_msgSend)((id)cls,selector,name);CIImage *opaqueConverted=converted(image(opaqueInput),from,to);[opaqueFilter setValue:opaqueConverted forKey:kCIInputImageKey];CIImage *opaqueLMT=opaqueFilter.outputImage;Floats opaqueReference=bitmap(converted(opaqueLMT,to,from)),opaqueConvertedValues=bitmap(opaqueConverted),opaqueLMTValues=bitmap(opaqueLMT);DYUniforms opaqueUniforms={};opaqueUniforms.film.enabled=opaqueUniforms.film.mix=1;opaqueUniforms.filmPrint=(DYFloat4){float(look+1),1,0,0};Floats opaqueActual=production(pipeline,opaqueInput,cube,opaqueUniforms);record([@"opaque-colour-control-" stringByAppendingString:name],difference(opaqueReference,opaqueActual),tolerance);
|
||||
DYUniforms rawUniforms=opaqueUniforms;Floats rawActual=production(pipeline,input,cube,rawUniforms);NSDictionary *rawMetrics=difference(referenceOutput,rawActual);rawChainDiscrepancyMaximum=fmax(rawChainDiscrepancyMaximum,[rawMetrics[@"maximum"]doubleValue]);[diagnostics addObject:@{@"name":name,@"rawPremultipliedChainComparison":rawMetrics,@"rawChainBySourceAlpha":differencesByAlpha(referenceOutput,rawActual,source),@"rawChainSamples":samples(source,convertedValues,lmtValues,referenceOutput,rawActual),@"opaqueChainSamples":samples(opaqueSource,opaqueConvertedValues,opaqueLMTValues,opaqueReference,opaqueActual)}];
|
||||
for(float strength:{1.f,.35f,0.f}){
|
||||
// FTColorSpaceFilter is a straight-colour function, while the original
|
||||
// LMT image processor unpremultiplies its input and premultiplies output.
|
||||
// A raw fractional-alpha concatenation therefore does not implement a
|
||||
// consistent image contract. Keep its measured discrepancy above. The
|
||||
// independent colour oracle uses the original chain at alpha one, then
|
||||
// explicitly restores the host's premultiplied-alpha contract here.
|
||||
DYUniforms uniforms={};uniforms.film.enabled=1;uniforms.film.mix=1;uniforms.filmPrint=(DYFloat4){float(look+1),strength,0,0};Floats expected=source;if(strength>0)for(size_t i=0;i<expected.size()/4;i++){float a=source[i*4+3];if(a>0)for(int c=0;c<3;c++)expected[i*4+c]=source[i*4+c]*(1-strength)+opaqueReference[i*4+c]*a*strength;}
|
||||
Floats actual=production(pipeline,input,cube,uniforms);NSDictionary *metrics=difference(expected,actual);record([NSString stringWithFormat:@"original-print-%@-strength-%.2f",name,strength],metrics,tolerance,@{@"lookID":@(look+1),@"strength":@(strength),@"nativeReferenceAlphaMaximum":@(nativeAlphaMaximum),@"bySourceAlpha":differencesByAlpha(expected,actual,source)});
|
||||
}
|
||||
}}
|
||||
NSMutableSet *factoryPointers=[NSMutableSet set];for(NSDictionary *call in conversionCalls)[factoryPointers addObject:call[@"filter"]];identity[@"conversionFactoryCallCount"]=@(conversionCalls.count);identity[@"distinctLiveConversionFilters"]=@(factoryPointers.count);identity[@"conversionFactorySingletonObserved"]=@(factoryPointers.count!=conversionCalls.count);
|
||||
NSDictionary *result=@{@"pass":@(passed),@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"gpu":gpu.name,@"tolerance":@(tolerance),@"textureFormat":@"RGBA32Float",@"ciWorkingFormat":@"RGBAf",@"referenceChain":@"Original FTColorSpaceFilter Rec709Linear -> ACEScct; FTAcesLMTFilter filterWithLMT: (native defaults); FTColorSpaceFilter ACEScct -> Rec709Linear, evaluated at alpha one, then explicitly premultiplied with the source alpha",@"rawPremultipliedChainEquivalent":@(rawChainDiscrepancyMaximum<=tolerance),@"rawPremultipliedChainDiscrepancyMaximum":@(rawChainDiscrepancyMaximum),@"scope":@"All eight original print tables, strengths 1/0.35/0, premultiplied linear Rec.709 grayscale/color/negative/HDR vectors, alpha {0,1/65536,0.0001,0.03125,0.25,1}. Bitmap orientation is measured against an asymmetric identity control before comparing; texture roundtrip must be identity. The original colour chain is independently checked at alpha one. Its raw fractional-alpha chain is retained as a non-gating diagnostic because FTColorSpaceFilter treats RGB as straight while the LMT processor unpremultiplies/premultiplies. Host alpha restoration is explicit, not claimed as full reference CMS equivalence. All pixels, including alpha zero, are compared. Straight RGB maximum is diagnostic; pass uses absolute premultiplied RGBA error. No half-float quantization or relaxed tolerance is applied.",@"identity":identity,@"referenceCubes":cubes,@"diagnostics":diagnostics,@"conversionFactories":conversionCalls,@"results":rows};writeJSON(result);[pipeline release];[dayu release];return passed?0:1;
|
||||
}@catch(NSException *exception){
|
||||
writeJSON(@{@"pass":@NO,@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"tolerance":@(tolerance),@"identity":identity,@"error":exception.reason?:@"unknown reference failure",@"results":rows});return 2;
|
||||
}
|
||||
}}
|
||||
@@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Project-scoped 5.11 validation against recorded native FxPlug structure.
|
||||
|
||||
The global skill checker currently admits 5.13+, so its original 5.11 guard
|
||||
result is retained separately; this does not relabel that checker as passed.
|
||||
"""
|
||||
from pathlib import Path
|
||||
import hashlib
|
||||
import json
|
||||
import runpy
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
module=runpy.run_path(str(ROOT/'tools/build_template.py'),run_name='template_contract')
|
||||
file=ROOT/'template'/'\u5927\u9c7c\u8c03\u8272.moef'
|
||||
data=file.read_bytes();contract=module['verify'](data,module['metadata']())
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
project=[node for node in scene.findall('scenenode') if factories.get(node.get('factoryID'))==module['PROJECT_UUID']][0]
|
||||
assert root.get('version')=='5.11' and root.findtext('displayversion')=='5.4.5'
|
||||
mask=0x10000001;selected=[];checked=0
|
||||
for node in scene.iter():
|
||||
if node.tag in module['CONTENT_TAGS'] and node is not project:
|
||||
if node.find('baseFlags') is not None:
|
||||
checked+=1
|
||||
if int(node.findtext('baseFlags'))&mask:selected.append(node.get('id'))
|
||||
assert not selected and scene.findtext('currentObject')==project.get('id')
|
||||
assert int(project.findtext('baseFlags'))==268435473
|
||||
selection=dict(passed=True,sha256=hashlib.sha256(data).hexdigest(),version='5.11',selectionMask=hex(mask),projectID=project.get('id'),contentObjectsChecked=checked,selectedContent=[],selectedContentCount=0,currentObject=scene.findtext('currentObject'),currentObjectIsProject=True,nativeUIVerified=False,validator='project-scoped native-5.11 field comparison',scope='Saved fields only; no rendering or old-FCP execution')
|
||||
qa=ROOT/'template/verification';(qa/'SavedSelection.json').write_text(json.dumps(selection,indent=2)+'\n')
|
||||
skill=json.loads((qa/'SkillAudit.json').read_text())
|
||||
assert skill['errors']==['Saved selection: Unverified Motion XML version/schema; obtain native evidence first']
|
||||
assert skill['basic']['entity_ids_unique'] and skill['basic']['published_count']==2 and not skill['basic']['unresolved_media']
|
||||
evidence=dict(path='~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef',sha256='bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69',version='5.11',displayversion='5.4.5',projectBaseFlags=268435473,currentObject='10000',scenenodeVersion='5',widgetBaseFlags=16,layerAndSourceBaseFlags=524304,fxPlugBaseFlags=8589934608,allContentSelectionBits=0)
|
||||
report=dict(passed=True,sha256=selection['sha256'],version='5.11',displayversion='5.4.5',nativeReference=evidence,staticContract=contract,savedSelection=selection,skillCheckerStatus='unsupported-version-guard; original SkillAudit.json retained unchanged',otherSkillStructuralErrors=[],copyrightDisplayRows=0,oldFCPActuallyTested=False,scope='Native-template structure and saved-state comparison only; FCP host acceptance is separate')
|
||||
(qa/'Compatibility.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
|
||||
print(json.dumps(dict(passed=True,version=report['version'],displayversion=report['displayversion'],copyrightDisplayRows=0,contentSelected=0,oldFCPActuallyTested=False)))
|
||||
+10
-7
@@ -2,15 +2,18 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.4.2",
|
||||
"build": "31",
|
||||
"version": "1.6.1",
|
||||
"build": "44",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "0bb9a94e-c54a-4d87-95ec-51338579c04f",
|
||||
"notaryID": "23d7b69c-5585-435d-ad07-faee061e0ccb",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
|
||||
"sourceCommit": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
|
||||
"shaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e",
|
||||
"hostVerification": "verification/HostTrackingMidpoint1.4.2.json"
|
||||
"templateSHA256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"verificationScope": "Formal installation, main APP UI, PluginKit registration, 3-second exit and 395 native checks. FCP interactive functionality is confirmed by the user.",
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"mainAppVerification": "verification/MainApp1.6.1.json",
|
||||
"nativeChecks": 395
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "36",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "91224ae2-68d3-4776-a9b7-2fdf8ffaea4f",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "f97320bbee6d469596f2db72a48436b73a41b324",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"hostVerification": "verification/HostPrintLooks1.6.0.json",
|
||||
"nativeChecks": 393,
|
||||
"printReferenceChecks": 136,
|
||||
"hostAcceptanceCompleted": "2026-11-02T07:09:11.437885+00:00",
|
||||
"completionNote": "Delivery worker stdin ended after formal installation; finalization resumed under the product lock after cold-reopen host acceptance.",
|
||||
"historicalBuild": true,
|
||||
"supersededByBuild": "38"
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.5.0",
|
||||
"build": "34",
|
||||
"bundleID": "com.dayu.color",
|
||||
"scannedRoots": [
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Applications",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Library/Plug-Ins/FxPlug"
|
||||
],
|
||||
"remainingOuterApps": [
|
||||
"/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"pluginKit": "com.dayu.color.XPC(1.1)\tB407E365-8C67-47E2-9BAD-2A72A2E551AC\t2026-11-02 05:58:09 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)",
|
||||
"removedNow": [
|
||||
"/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData",
|
||||
"/Volumes/备份/大鱼调色-1.5.0.pkg"
|
||||
],
|
||||
"generatedAppCopiesAlreadyRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"formalDeliveryCopiesRemovedBy": "tools/deliver.py complete",
|
||||
"historicalInstallersPreserved": true,
|
||||
"userMediaAndPresetsPreserved": true,
|
||||
"finalPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.5.0.pkg",
|
||||
"wholeDiskUniquenessClaimed": false
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"status": "verified-formal-install-and-host",
|
||||
"baseline": "1.4.3 (33)",
|
||||
"nativePass": true,
|
||||
"checks": 349,
|
||||
"referenceComparison": {
|
||||
"passed": true,
|
||||
"checks": 184,
|
||||
"dimensions": [
|
||||
[
|
||||
64,
|
||||
48
|
||||
],
|
||||
[
|
||||
63,
|
||||
47
|
||||
],
|
||||
[
|
||||
1,
|
||||
17
|
||||
],
|
||||
[
|
||||
17,
|
||||
1
|
||||
]
|
||||
]
|
||||
},
|
||||
"formalInstallUnchanged": false,
|
||||
"formalVersion": "1.5.0",
|
||||
"formalBuild": "34",
|
||||
"compiledSource": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"hostVerification": "verification/HostFilmMixer1.5.0.json",
|
||||
"packageVerification": "verification/Package.json",
|
||||
"targetVersion": "1.5.0",
|
||||
"targetBuild": "34"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"commit": "eeeee102cd78b8f99be743be634739286fed8a76",
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"releaseBuild": true,
|
||||
"nativeChecks": 349,
|
||||
"nativePass": true,
|
||||
"sourceHasAllFilmMath": true,
|
||||
"generatedAppsRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
]
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"tag": "v1.5.0-film-mixer-20261102",
|
||||
"commit": "85b6590944c4fb64825cf45f61c5280d4ffaa824",
|
||||
"filesByteCompared": 264,
|
||||
"fsck": "full/strict passed",
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"independentReleaseBuildAnd349Checks": "verification/FilmMixerRecovery.json",
|
||||
"recoveryBuildCommit": "eeeee102cd78b8f99be743be634739286fed8a76",
|
||||
"compiledAppCommit": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"sourceDifference": [
|
||||
"tools/deliver.py"
|
||||
],
|
||||
"appSourceUnchanged": true,
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"cloneRemoved": true,
|
||||
"recoveryDerivedDataRemoved": true,
|
||||
"releaseTagAppSourceMatchesCompiledCommit": true
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
{
|
||||
"status": "passed",
|
||||
"targetVersion": "1.5.0",
|
||||
"build": "34",
|
||||
"sourceCommit": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"baseline": {
|
||||
"version": 4,
|
||||
"presetBytes": 77437,
|
||||
"presetSHA256": "02b4f0e8ff52b9d27449d208fd7b2b09ed92440a578f09688a1a5f461cfcc172",
|
||||
"floatParameterCount": 234,
|
||||
"toolLayers": 0,
|
||||
"masks": 1,
|
||||
"trackKeys": 287
|
||||
},
|
||||
"nativeChecks": 349,
|
||||
"referenceCases": 184,
|
||||
"privacy": "User media, project and full presets stay local; report contains aggregate counts and hashes.",
|
||||
"userCompatibility": {
|
||||
"allExisting234ValuesUnchanged": true,
|
||||
"assetPathsAndSpiderUnchanged": true,
|
||||
"toolsAndAll287KeysByteIdentical": true,
|
||||
"uiTrustedKeys": 286,
|
||||
"newDefaultParameters": 42,
|
||||
"afterVersion": 5,
|
||||
"afterBytes": 78460,
|
||||
"afterSHA256": "40772a5b481f197a4f1bf75e51f14159d02416ef68a7e68fca2397c2fc26e094"
|
||||
},
|
||||
"hostGrainExport": {
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"fps": "25/1",
|
||||
"duration": "4.000000",
|
||||
"codec": "prores",
|
||||
"frames": [
|
||||
"7719df2ae1cf5ea9375041270cf71e926472250e6813797b31f0a7a76bed11fb",
|
||||
"7719df2ae1cf5ea9375041270cf71e926472250e6813797b31f0a7a76bed11fb",
|
||||
"84b06b3dbb1f4acf6540a93f3f9ddfec1e806ca09bf6523bcf2f4853c292b252",
|
||||
"84b06b3dbb1f4acf6540a93f3f9ddfec1e806ca09bf6523bcf2f4853c292b252",
|
||||
"36fb6225db64ecafbc98bac0c864b9b7406226ff452e1b8c32b52f7fe282c4e1",
|
||||
"36fb6225db64ecafbc98bac0c864b9b7406226ff452e1b8c32b52f7fe282c4e1"
|
||||
],
|
||||
"adjacentEqual": [
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
true
|
||||
],
|
||||
"presetHold": 2
|
||||
},
|
||||
"hostChecks": {
|
||||
"newModulesVisible": true,
|
||||
"mixerThreeOutputsAndPreserveControls": true,
|
||||
"filmFiveTabs": true,
|
||||
"subtractiveHalationBloomVignetteAdjusted": true,
|
||||
"filmMaskCount": 1,
|
||||
"foldHidesMaskControlsKeepsBadge": true,
|
||||
"independentMixerLayerInitialized": true,
|
||||
"layerDeleteUndoRedoRestored": true,
|
||||
"normalQuitConfirmed": true,
|
||||
"coldReopenAllStatePreserved": true
|
||||
},
|
||||
"combinedPresetBefore": {
|
||||
"bytes": 8987,
|
||||
"sha256": "6c7c08c8b17add17c22d165b2190eff3919c742b8dfae46703ff399cabd71581"
|
||||
},
|
||||
"roundtrip": {
|
||||
"projects": 3,
|
||||
"format": "FCPXML 1.14",
|
||||
"strictDTD": "pass",
|
||||
"missingMedia": 0,
|
||||
"comparedFields": "match",
|
||||
"differences": []
|
||||
},
|
||||
"hostCombinedExport": {
|
||||
"width": 960,
|
||||
"height": 540,
|
||||
"fps": "25/1",
|
||||
"durationSeconds": 4,
|
||||
"allFramesDecode": true
|
||||
},
|
||||
"coldReopen": {
|
||||
"combined": {
|
||||
"semanticEqual": true,
|
||||
"byteIdentical": true,
|
||||
"bytes": 8987,
|
||||
"sha256": "6c7c08c8b17add17c22d165b2190eff3919c742b8dfae46703ff399cabd71581"
|
||||
},
|
||||
"grain": {
|
||||
"semanticEqual": true,
|
||||
"byteIdentical": true,
|
||||
"bytes": 8420,
|
||||
"sha256": "f87d0cf75c77c01ffa5076592f133f3a957a0480077752f0fcdef8be765c468d"
|
||||
}
|
||||
},
|
||||
"passResult": true,
|
||||
"appSourceIdenticalToReferenceCandidate": "eeeee102cd78b8f99be743be634739286fed8a76"
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.4.3",
|
||||
"build": "33",
|
||||
"sourceCommit": "26a888f4534792481c6a9933091cb0b23307cd24",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"nativeChecks": 293,
|
||||
"baseline": {
|
||||
"version": "1.4.2",
|
||||
"build": "31",
|
||||
"spiderCollapsed": true,
|
||||
"maskControlsStillVisible": true,
|
||||
"userTrustedKeys": 286
|
||||
},
|
||||
"userState": {
|
||||
"fullPresetBytes": 77276,
|
||||
"fullPresetSHA256": "1563d53e6e7b9d45ee3e959a008713401e5c8a7cf82c960443dcc35d7a04d330",
|
||||
"foldUnfoldByteIdentical": true,
|
||||
"trustedKeysPreserved": 286
|
||||
},
|
||||
"hostChecks": {
|
||||
"originalModuleFoldHidesMaskPanel": true,
|
||||
"originalModuleUnfoldRestoresControls": true,
|
||||
"foldedHeaderBadgeVisible": true,
|
||||
"fixtureOriginalHSLMaskCount": 2,
|
||||
"fixtureOriginalHSLDisabledMasks": 1,
|
||||
"fixtureRepeatedHSLMaskCount": 1,
|
||||
"repeatedLayerFoldUnfoldIndependent": true,
|
||||
"bothFoldedVisibleMaskPanels": 0,
|
||||
"deleteCounts": [
|
||||
2,
|
||||
1,
|
||||
0
|
||||
],
|
||||
"noMasksBadgeHidden": true,
|
||||
"undoCounts": [
|
||||
0,
|
||||
1,
|
||||
2
|
||||
],
|
||||
"noMaskModuleNoBadge": true,
|
||||
"normalQuitAndColdReopen": true,
|
||||
"coldReopenBothHSLFolded": true,
|
||||
"coldReopenBadgeCounts": [
|
||||
2,
|
||||
1
|
||||
],
|
||||
"fixturePresetBytes": 8471,
|
||||
"fixtureFullPresetSHA256": "ee8f0e2d165b41478ca9bae5176b9bcd2bf95d07a60baae7ddfda0c26f79f05a",
|
||||
"fixtureBeforeAfterAndColdReopenByteIdentical": true,
|
||||
"visualBlueThemeBadgeReadable": true
|
||||
},
|
||||
"scope": "Only fold layout and header status UI changed; no renderer/tracking/data-schema change. Existing native checks reused; no new redundant unit tests.",
|
||||
"privacy": "Synthetic fixture is local only. User media, project and full presets remain local; only aggregate checks/hashes are committed.",
|
||||
"limits": [
|
||||
"Live host QA on Apple Silicon Final Cut Pro12.4; Motion, Intel and all alternate themes were not separately live verified."
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
{
|
||||
"status": "passed",
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"compiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"previousPrintHostVerification": "verification/HostPrintLooksBuild36.json",
|
||||
"nativeChecks": 395,
|
||||
"printReferenceChecks": 136,
|
||||
"existingPresetBaselines": {
|
||||
"agfa": {
|
||||
"bytes": 8474,
|
||||
"sha256": "3e21a09a4710709a75b09320928522864fa9facfcdf0cb3910588f7de64294b0"
|
||||
},
|
||||
"bw": {
|
||||
"bytes": 8456,
|
||||
"sha256": "c0fb7408b15231c96a7af0e6baab17ec433e90afdf3478476701063e40246be0"
|
||||
},
|
||||
"layer-mask": {
|
||||
"bytes": 32554,
|
||||
"sha256": "3713101dee2937c4a0730bca9dd1a667d2aa43c16f3c1114af5924ea706ea6ff"
|
||||
}
|
||||
},
|
||||
"requestedWebsite": "https://dayu.media",
|
||||
"requestedLinkText": "更多插件访问 https://dayu.media",
|
||||
"privacy": "User presets, media and FCP libraries remain local.",
|
||||
"oldPrintPresetComparison": {
|
||||
"bw": {
|
||||
"bytes": 8456,
|
||||
"sha256": "969b37b5eae60207a9f905693a345017163584b1dce342c91fac744784d594de",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
},
|
||||
"agfa": {
|
||||
"bytes": 8474,
|
||||
"sha256": "8030589872ce70180615c4ee7ae70db47232403a2142d127b85a6777cc8c4fde",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
},
|
||||
"layer-mask": {
|
||||
"bytes": 32554,
|
||||
"sha256": "3b8ba9285599f48def26b5f87c3c83a270dd01b7fac26f434ca96df3dfda1597",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
}
|
||||
},
|
||||
"newFCPInstanceMapping": 1,
|
||||
"newIndependentPrimaryMapping": 1,
|
||||
"explicitManualBaseMapping": 0,
|
||||
"headerLinkObservedAs": "NSAccessibilityLinkRole",
|
||||
"clickedBrowser": "Microsoft Edge",
|
||||
"clickedURL": "https://dayu.media",
|
||||
"copyrightRowsAbsent": true,
|
||||
"defaultMigrationBoundary": "FCP instances using omitted/default values adopted the new template enabled value. Other saved values and custom payloads were unchanged. The legacy host registration default remains zero; this alone does not freeze old FCP template defaults.",
|
||||
"passResult": true,
|
||||
"completed": "2026-11-02T07:27:53.369385+00:00",
|
||||
"manualOffIndependentOnColdReopen": {
|
||||
"byteIdentical": true,
|
||||
"bytes": 8668,
|
||||
"sha256": "303137a11458c65cafee331478c270670a6fbb1a39c59bdd6a1c0ec65ee9080a"
|
||||
},
|
||||
"resetAllMapping": 1,
|
||||
"headerVisualLayoutVerified": true,
|
||||
"export": {
|
||||
"name": "print-default-header-1.6.mov",
|
||||
"bytes": 16053180,
|
||||
"codec_name": "prores",
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"r_frame_rate": "25/1",
|
||||
"duration": "4.000000",
|
||||
"nb_frames": "100",
|
||||
"allFramesDecoded": true
|
||||
},
|
||||
"formalRuntime": [
|
||||
"30802 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
"status": "passed",
|
||||
"passResult": true,
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"compiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"nativeChecks": 395,
|
||||
"referenceChecks": 136,
|
||||
"kernelSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"kernelIdenticalToBuild36": true,
|
||||
"detailedEightLookHostAcceptance": "verification/HostPrintLooksBuild36.json",
|
||||
"finalDefaultLinkAndRetentionAcceptance": "verification/HostPrimaryDefaults1.6.0.json",
|
||||
"retention": {
|
||||
"bw": {
|
||||
"bytes": 8456,
|
||||
"sha256": "969b37b5eae60207a9f905693a345017163584b1dce342c91fac744784d594de",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
},
|
||||
"agfa": {
|
||||
"bytes": 8474,
|
||||
"sha256": "8030589872ce70180615c4ee7ae70db47232403a2142d127b85a6777cc8c4fde",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
},
|
||||
"layer-mask": {
|
||||
"bytes": 32554,
|
||||
"sha256": "3b8ba9285599f48def26b5f87c3c83a270dd01b7fac26f434ca96df3dfda1597",
|
||||
"unchangedOtherValues": 277,
|
||||
"changedDefault": {
|
||||
"cmtoneMapping": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
},
|
||||
"pathsSpiderToolsUnchanged": true
|
||||
}
|
||||
},
|
||||
"template": {
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"copyrightRowsAbsent": true,
|
||||
"headerLinkClickedURL": "https://dayu.media",
|
||||
"oldFCPActuallyTested": false
|
||||
},
|
||||
"privacy": "Full user presets/media/FCP library remain local."
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
"status": "passed",
|
||||
"version": "1.6.0",
|
||||
"build": "36",
|
||||
"compiledSource": "f97320bbee6d469596f2db72a48436b73a41b324",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"userCompatibility": {
|
||||
"beforePresetVersion": 5,
|
||||
"afterPresetVersion": 6,
|
||||
"oldValues": 276,
|
||||
"newValues": 278,
|
||||
"allExistingValuesUnchanged": true,
|
||||
"pathsSpiderAndToolsUnchanged": true,
|
||||
"printDefaultNone": true,
|
||||
"beforeBytes": 8669,
|
||||
"afterBytes": 8723,
|
||||
"beforeSHA256": "b7c2f31e763b641b86eea4a4a94100e9aa953fd0c56741b97f26c428370f6351",
|
||||
"afterSHA256": "96e886f2fe5b3b79630d5ec9d392ef2075f4dd44f6f109757e8634fef2e795f9"
|
||||
},
|
||||
"template": {
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"authorAndWebsiteRowsAbsentInExistingInstance": true,
|
||||
"authorAndWebsiteRowsAbsentInFreshInstance": true,
|
||||
"currentFCPHostVerified": true,
|
||||
"olderFCPActuallyTested": false
|
||||
},
|
||||
"nativeChecks": 393,
|
||||
"referenceChecks": 136,
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"privacy": "Full presets and media remain local; aggregate counts and hashes only",
|
||||
"exports": [
|
||||
{
|
||||
"name": "print-agfa-1.6.mov",
|
||||
"bytes": 14402174,
|
||||
"codec": "prores",
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"fps": "25/1",
|
||||
"frames": 100,
|
||||
"allFramesDecoded": true
|
||||
},
|
||||
{
|
||||
"name": "print-bw-1.6.mov",
|
||||
"bytes": 9634782,
|
||||
"codec": "prores",
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"fps": "25/1",
|
||||
"frames": 100,
|
||||
"allFramesDecoded": true
|
||||
},
|
||||
{
|
||||
"name": "print-layer-mask-1.6.mov",
|
||||
"bytes": 24182892,
|
||||
"codec": "prores",
|
||||
"width": 960,
|
||||
"height": 540,
|
||||
"fps": "25/1",
|
||||
"frames": 100,
|
||||
"allFramesDecoded": true
|
||||
}
|
||||
],
|
||||
"bwExportChannelMaxDifference16bit": 0,
|
||||
"hostChecks": {
|
||||
"allEightMenuSelections": true,
|
||||
"newLayerDefaultNone": true,
|
||||
"baseLook": 1,
|
||||
"repeatLook": 5,
|
||||
"repeatStrength": 0.4,
|
||||
"filmMaskCount": 1,
|
||||
"trackKeyCount": 100,
|
||||
"foldHidesMaskKeepsBadge": true,
|
||||
"layerDeleteUndoRedoRestored": true
|
||||
},
|
||||
"preReopenLayerPreset": {
|
||||
"bytes": 32554,
|
||||
"sha256": "3713101dee2937c4a0730bca9dd1a667d2aa43c16f3c1114af5924ea706ea6ff"
|
||||
},
|
||||
"passResult": true,
|
||||
"coldReopen": {
|
||||
"agfa": {
|
||||
"byteIdentical": true,
|
||||
"bytes": 8474,
|
||||
"sha256": "3e21a09a4710709a75b09320928522864fa9facfcdf0cb3910588f7de64294b0"
|
||||
},
|
||||
"bw": {
|
||||
"byteIdentical": true,
|
||||
"bytes": 8456,
|
||||
"sha256": "c0fb7408b15231c96a7af0e6baab17ec433e90afdf3478476701063e40246be0"
|
||||
},
|
||||
"layer-mask": {
|
||||
"byteIdentical": true,
|
||||
"bytes": 32554,
|
||||
"sha256": "3713101dee2937c4a0730bca9dd1a667d2aa43c16f3c1114af5924ea706ea6ff"
|
||||
}
|
||||
},
|
||||
"completed": "2026-11-02T07:08:36.959977+00:00",
|
||||
"formalRuntime": [
|
||||
"27940 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
]
|
||||
}
|
||||
+543
-13
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 293,
|
||||
"checks": 395,
|
||||
"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,14 +12,14 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2"
|
||||
},
|
||||
{
|
||||
"descriptors": 234,
|
||||
"descriptors": 278,
|
||||
"name": "descriptor-unique-id-offset-key",
|
||||
"pass": true,
|
||||
"sections": 15,
|
||||
"uniformBytes": 1104
|
||||
"sections": 17,
|
||||
"uniformBytes": 1312
|
||||
},
|
||||
{
|
||||
"name": "finite-real-model-defaults",
|
||||
@@ -38,6 +38,10 @@
|
||||
"name": "native-parameter-creation",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "historical-host-mapping-default-and-explicit-on-off-preserved",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-get-set-model-roundtrip",
|
||||
"pass": true
|
||||
@@ -65,7 +69,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"modules": 12,
|
||||
"modules": 14,
|
||||
"name": "default-primary-spider-base-expanded-all-eyes-on",
|
||||
"pass": true
|
||||
},
|
||||
@@ -154,7 +158,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "complete-version-four-preset-includes-mesh",
|
||||
"name": "complete-version-six-preset-includes-mesh",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -816,7 +820,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -836,7 +840,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 0,
|
||||
"maximumGapMS": 90.35904170013964,
|
||||
"maximumGapMS": 92.54920833333813,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -920,12 +924,16 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "all-twelve-initialized-tool-types-render",
|
||||
"name": "new-primary-layer-auto-mapping-on-old-omitted-default-stays-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "initialized-repeated-tools-are-exactly-neutral",
|
||||
"error": "未提供错误信息",
|
||||
"name": "all-initialized-tool-types-with-legacy-primary-mapping-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "legacy-neutral-repeated-tools-preserve-pixels",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -1339,6 +1347,528 @@
|
||||
"name": "cube-export-follows-identical-anchored-tool-order",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-neutral-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "new-tools-default-to-neutral",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "new-neutral-tools-preserve-existing-alpha",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "channel-mixer-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 5387,
|
||||
"maxAbsoluteError": 0.283203125,
|
||||
"name": "channel-mixer-affects-real-frame",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "channel-mixer-eye-bypass-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "channel-mixer-eye-exact-bypass",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "channel-mixer-zero-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "channel-mixer-zero-exact-bypass",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-0-production",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7368,
|
||||
"maxAbsoluteError": 0.135498046875,
|
||||
"name": "film-stage-0-finite-active-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-0-zero-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-0-zero-is-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-0-eye-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-0-eye-preserves-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-1-production",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 4916,
|
||||
"maxAbsoluteError": 0.3251953125,
|
||||
"name": "film-stage-1-finite-active-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-1-zero-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-1-zero-is-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-1-eye-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-1-eye-preserves-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-2-production",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7374,
|
||||
"maxAbsoluteError": 0.37451171875,
|
||||
"name": "film-stage-2-finite-active-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-2-zero-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-2-zero-is-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-2-eye-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-2-eye-preserves-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-3-production",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7351,
|
||||
"maxAbsoluteError": 0.1650390625,
|
||||
"name": "film-stage-3-finite-active-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "grain-random-access-repeat",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "grain-identical-frozen-frame-is-bit-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "grain-next-frozen-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "grain-frame-changes-noise",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-3-zero-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-3-zero-is-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-3-eye-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-3-eye-preserves-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-4-production",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7374,
|
||||
"maxAbsoluteError": 0.85009765625,
|
||||
"name": "film-stage-4-finite-active-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 5168,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-4-zero-mix",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-4-zero-is-exact",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-stage-4-eye-off",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-stage-4-eye-preserves-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "grain-top-origin-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "grain-bottom-origin-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 0,
|
||||
"maxAbsoluteError": 0,
|
||||
"name": "grain-canonical-coordinates-survive-texture-origin",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "grain-exact-ntsc-signed-frame-and-hold",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-mixer-adjacent-schema-two-valid",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-mixer-adjacent-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-mixer-adjacent-layers-affect-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-mixer-mask-archive-exact-roundtrip",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "film-zero-mask-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "film-zero-mask-exact-source",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "grain-rejected-by-static-cube",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "pure-subtractive-cube-supported",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "channel-mixer-cube-supported",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-1-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-1-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7373,
|
||||
"maxAbsoluteError": 0.337890625,
|
||||
"name": "print-1-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-2-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-2-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7372,
|
||||
"maxAbsoluteError": 0.340576171875,
|
||||
"name": "print-2-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-3-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-3-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7370,
|
||||
"maxAbsoluteError": 0.6531982421875,
|
||||
"name": "print-3-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-4-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-4-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7373,
|
||||
"maxAbsoluteError": 0.3828125,
|
||||
"name": "print-4-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-5-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-5-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7366,
|
||||
"maxAbsoluteError": 0.361328125,
|
||||
"name": "print-5-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-6-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-6-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7373,
|
||||
"maxAbsoluteError": 0.372314453125,
|
||||
"name": "print-6-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-7-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-7-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7368,
|
||||
"maxAbsoluteError": 0.403076171875,
|
||||
"name": "print-7-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-8-shipped-65cube",
|
||||
"pass": true,
|
||||
"side": 65
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-8-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"changedComponents": 7372,
|
||||
"maxAbsoluteError": 0.36572265625,
|
||||
"name": "print-8-active-finite-preserves-alpha",
|
||||
"nonfiniteComponents": 0,
|
||||
"nonzeroComponents": 9832,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "all-eight-print-looks-have-distinct-production-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-zero-strength-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-zero-strength-exact-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-zero-film-mix-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-zero-film-mix-exact-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-eye-off-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-eye-off-exact-old-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "new-film-layer-print-default-is-none",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-only-independent-layer-is-active",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-only-independent-layer-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-only-independent-layer-affects-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "two-print-layers-archive-independent-choices-and-strength",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "two-print-layers-production-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "second-print-layer-is-rendered-independently",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-zero-mask-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "print-zero-mask-exact-source",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-only-static-cube-supported",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-cube-production-lattice-point",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "print-static-cube-matches-production-lattice-point",
|
||||
"pass": true,
|
||||
"side": 33
|
||||
},
|
||||
{
|
||||
"name": "print-with-grain-still-rejected-by-static-cube",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "tracking-captures-real-full-input-texture",
|
||||
"pass": true
|
||||
@@ -1537,6 +2067,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ED00D426-57B3-45AD-86FA-0A5A8B38E1F2",
|
||||
"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,107 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.6.1",
|
||||
"build": "44",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"existingRegistrationStartup": {
|
||||
"before": {
|
||||
"output": " com.dayu.color.XPC(1.1)\tB4382CC6-0A29-4014-95DF-17FF12BD426A\t2026-11-02 08:19:21 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"submissionAccepted": true,
|
||||
"submission": {
|
||||
"output": "",
|
||||
"code": 0
|
||||
},
|
||||
"plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"version": "1.6.1",
|
||||
"terminationReason": "registration-succeeded",
|
||||
"executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"registered": true,
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"bundleID": "com.dayu.color",
|
||||
"confirmationMethod": "exact-path-discovery",
|
||||
"after": {
|
||||
"output": " com.dayu.color.XPC(1.1)\t46C65B43-DF7C-4DEF-A159-4C46E0C6F2E3\t2026-11-02 08:19:22 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"pid": 1957,
|
||||
"discoveryVerified": true,
|
||||
"status": "registered",
|
||||
"build": "44"
|
||||
},
|
||||
"sandboxDisabled": true,
|
||||
"nativeChecks": 395,
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"registryAfterRemoval": " (no matches)\n",
|
||||
"externalRegistryAfterRepair": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"keyboardShortcuts": [
|
||||
"Command-I preserved introduction",
|
||||
"Command-R repeated three times without re-entry failure"
|
||||
],
|
||||
"visualReview": [
|
||||
"top publication link is clickable",
|
||||
"successful registration state matches registry",
|
||||
"four feature cards and FCP confirmation controls visible"
|
||||
],
|
||||
"uiProfile": "standard",
|
||||
"swiftUIAudit": "not applicable: Objective-C/AppKit; audit reports no Swift files",
|
||||
"unverified": [
|
||||
"Actual user FCP confirmation",
|
||||
"VoiceOver spoken reading and system accessibility display settings",
|
||||
"Full runtime resize matrix"
|
||||
],
|
||||
"appleFidelityProvisional": {
|
||||
"total": 84,
|
||||
"platform": 14,
|
||||
"layout": 13,
|
||||
"semantics": 13,
|
||||
"interaction": 18,
|
||||
"motion": 13,
|
||||
"accessibility": 5,
|
||||
"implementation": 8,
|
||||
"evidenceCap": "Assistive technology and reduced-effects settings not fully exercised; no 90-point quality claim."
|
||||
},
|
||||
"countdownSeconds": 3,
|
||||
"countdownVisibleInRegistrationCard": true,
|
||||
"automaticExitVerified": true,
|
||||
"automaticExitProcessAbsent": true,
|
||||
"registrationRepairPreviousBuild": "43: same registration implementation; only countdown/UI placement changed in44",
|
||||
"priorBuild43MissingRegistrationEvidence": "Missing registration was repaired and externally verified on43 before countdown-only change.",
|
||||
"missingRegistrationRepaired": {
|
||||
"before": {
|
||||
"output": " (no matches)\n",
|
||||
"code": 0
|
||||
},
|
||||
"submissionAccepted": true,
|
||||
"submission": {
|
||||
"output": "",
|
||||
"code": 0
|
||||
},
|
||||
"plugin": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"version": "1.6.1",
|
||||
"executable": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"registered": true,
|
||||
"hostVerification": "awaiting-user-confirmation",
|
||||
"bundleID": "com.dayu.color",
|
||||
"confirmationMethod": "exact-path-discovery",
|
||||
"after": {
|
||||
"output": " com.dayu.color.XPC(1.1)\t7594B515-4788-4BD2-8F31-DA38C23CFF88\t2026-11-02 08:20:00 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
|
||||
"code": 0
|
||||
},
|
||||
"pid": 2000,
|
||||
"discoveryVerified": true,
|
||||
"status": "registered",
|
||||
"build": "44"
|
||||
},
|
||||
"finalEntitlements": {},
|
||||
"actualProcessPaths": [
|
||||
"2000 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
|
||||
"2040 /Applications/Final Cut Pro.app/Contents/MacOS/Final Cut Pro",
|
||||
"2048 /Library/Plug-Ins/FxPlug/大鱼调色盘.app/Contents/PlugIns/DayuColorService.pluginkit/Contents/MacOS/DayuColorService",
|
||||
"2050 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
],
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"renderingSourceUnchanged": true
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"compiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"recoveredFiles": 301,
|
||||
"contentByteComparison": true,
|
||||
"gitFsck": "full strict passed",
|
||||
"LFS": false,
|
||||
"submodules": false,
|
||||
"scope": "Compiled source recovered from remote; final release tag recovery follows packaging."
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.4.3",
|
||||
"build": "33",
|
||||
"removedKnownPriorBackups": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-f88addf10c2a4cfc983ef8cf3361852c.app",
|
||||
"build": "31"
|
||||
}
|
||||
],
|
||||
"immediate32BackupRemovedByDelivery": true,
|
||||
"originalUserPresetsAndMediaPreserved": true,
|
||||
"otherProductsUntouched": true,
|
||||
"scannedRoots": [
|
||||
"/Applications",
|
||||
"/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Users/mac/Desktop",
|
||||
"/Users/mac/Downloads"
|
||||
],
|
||||
"remainingProductApps": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"build": "33"
|
||||
}
|
||||
],
|
||||
"pluginKit": "com.dayu.color.XPC(1.1)\tBAE13DB2-1BF0-42D1-AFA3-86DF1B0496E7\t2026-11-02 04:27:46 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)"
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"sourceCommit": "26a888f4534792481c6a9933091cb0b23307cd24",
|
||||
"restoredFiles": 240,
|
||||
"fsck": "full strict passed",
|
||||
"rebuiltShaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e",
|
||||
"formalShaderMatches": true,
|
||||
"templateRebuiltFromNativeModel": true,
|
||||
"templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
|
||||
"LFS": false,
|
||||
"submodules": false,
|
||||
"cloneCleaned": true
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"tag": "v1.4.3-mask-fold-20261102",
|
||||
"releaseCommit": "301b31438e8da95dc4e6e1c09498ad814a0ebcfc",
|
||||
"appCompiledSource": "26a888f4534792481c6a9933091cb0b23307cd24",
|
||||
"restoredFiles": 244,
|
||||
"fsck": "full strict passed",
|
||||
"everyTrackedFileByteCompared": true,
|
||||
"packageBytes": 14340650,
|
||||
"packageSHA256": "41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2",
|
||||
"formalNativeAndHostReportsRecovered": true,
|
||||
"compiledSourceRebuildRecord": "verification/MaskFoldingRecovery.json",
|
||||
"LFS": false,
|
||||
"submodules": false,
|
||||
"cloneCleaned": true
|
||||
}
|
||||
+16
-16
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.2.pkg",
|
||||
"sha256": "d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2",
|
||||
"bytes": 14339640,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.1.pkg",
|
||||
"sha256": "d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0",
|
||||
"bytes": 40854422,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,34 +31,34 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.4.2",
|
||||
"build": "31"
|
||||
"version": "1.6.1",
|
||||
"build": "44"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.433fb568-723d-4910-be75-38a618449778/1C7412DC-13CA-41A2-A6D5-160A227AC15A/大鱼调色"
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.21611cce-8ce5-4aba-b084-8c1502807f9e/96DEBA59-1D5C-4848-AB60-9D8772D73B72/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.4.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-01 17:51:43 +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.4.2.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.6.1.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-02 08:22:37 +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.6.1.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-02T08:22:39.341Z",
|
||||
"message": "Successfully received submission info",
|
||||
"status": "Accepted",
|
||||
"id": "2de9f8bb-91b5-41dc-924c-1136ae7bf73f",
|
||||
"createdDate": "2026-11-01T17:51:45.227Z",
|
||||
"name": "大鱼调色-1.4.2.pkg"
|
||||
"name": "大鱼调色-1.6.1.pkg",
|
||||
"id": "7315225d-a350-4c65-9e87-5784035ea018"
|
||||
},
|
||||
"appCompiledSource": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
|
||||
"appBuild": "31",
|
||||
"appCompiledSource": "90d6022520c59ea34f42b511daee85ac2936cfd9",
|
||||
"appBuild": "44",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色.moef": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
|
||||
"大鱼调色.moef": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostTrackingMidpoint1.4.2.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
"installedAppHostAcceptance": "awaiting-user-confirmation",
|
||||
"installScope": "本轮生成并展开验包,未运行系统安装器;正式APP的UI、登记、3秒倒计时、退出及395项原生检查通过。FCP实际使用由用户确认。"
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"sha256": "4ede128d78c2438aaeaf3e22926dfc5fcd584035e9574bea4110c2b5d01c7c2a",
|
||||
"bytes": 40832822,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
"PKG Developer ID Installer signature",
|
||||
"PKG stapled ticket and Gatekeeper install assessment",
|
||||
"must-close attached to root-authorized payload",
|
||||
"all four FCP/Motion host identifiers",
|
||||
"bundle relocation disabled",
|
||||
"desktop and Bundle ID preinstall guards",
|
||||
"postinstall contains actual FxPlug verification invocations",
|
||||
"GUI worker, registration repair and Finder reveal present",
|
||||
"successful completion and consecutive registration checks",
|
||||
"exact payload contents: 大鱼调色.app",
|
||||
"fixed FxPlug outer APP install path",
|
||||
"outer APP has one real verification action",
|
||||
"service path/identifier/registration version: com.dayu.color.XPC",
|
||||
"nonempty FxPlug service manifest",
|
||||
"payload APP signature, independent ticket and Gatekeeper",
|
||||
"exact payload contents: 大鱼调色",
|
||||
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
|
||||
"complete outer APP payload present",
|
||||
"welcome warns to save work and close hosts",
|
||||
"conclusion gives manual APP and host restart instructions"
|
||||
],
|
||||
"resources": [
|
||||
{
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "36"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.4c82157b-b550-46a2-b491-bb86c9e054ed/CD46DBA3-A872-4706-BDAC-4250D66E83D1/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.6.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-02 07:09:18 +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.6.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"id": "90d7ba03-2fac-4bd0-ae4a-32780ae7ae75",
|
||||
"name": "大鱼调色-1.6.0.pkg",
|
||||
"createdDate": "2026-11-02T07:09:19.757Z",
|
||||
"message": "Successfully received submission info",
|
||||
"status": "Accepted"
|
||||
},
|
||||
"appCompiledSource": "f97320bbee6d469596f2db72a48436b73a41b324",
|
||||
"appBuild": "36",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色.moef": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostPrintLooks1.6.0.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。",
|
||||
"status": "superseded-before-publication",
|
||||
"packageRemoved": true,
|
||||
"published": false,
|
||||
"supersededReason": "User added automatic-mapping default and clickable title website link before the final 1.6.0 publication."
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"version": "1.6.0",
|
||||
"build": "37",
|
||||
"status": "superseded-before-install",
|
||||
"compiledSource": "378956e130d36d9cf83f8331e72aae60ce54af4a",
|
||||
"notaryID": "6783e9cd-b84e-4849-9312-6a4ac91959a7",
|
||||
"notaryStatusAtInterruption": "In Progress",
|
||||
"submissionSHA256": "7ff9e5b3f0a26152071eb36c0235ed80b0e928e127fb35892b14171a4a1aa382",
|
||||
"submissionBytes": 40152455,
|
||||
"nativeChecks": 394,
|
||||
"nativePassed": true,
|
||||
"reason": "Final inspection found new primary automatic-mapping layer would be skipped by neutral detection; corrected before host installation. Submission is not reused or resubmitted.",
|
||||
"formalInstallRemainedBuild": "36",
|
||||
"published": false,
|
||||
"notaryFinalStatus": "In Progress"
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"status": "superseded-during-host-acceptance",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "38",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "9dc58db0-4d1d-4019-9735-c163198ad772",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "378cd2b6ec6ed9654bf9a33c807779d0c2636728",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-684c5c21673647e88760e9a82acc0564.app",
|
||||
"reason": "FCP omits historical default-zero values; host acceptance detected old instance mapping changed. Preserve the registered zero default and explicitly seed enabled in new MOEF.",
|
||||
"published": false
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": "1.6.0",
|
||||
"build": "35",
|
||||
"compiledSource": "2b2d657de754dd5b362cc0be07cb10d5e671a745",
|
||||
"notarization": {
|
||||
"id": "3819fbc3-6b7d-4b89-b09a-3e5d9c0f0851",
|
||||
"status": "Accepted",
|
||||
"message": "Processing complete"
|
||||
},
|
||||
"stapled": true,
|
||||
"installed": false,
|
||||
"reason": "Host reopened before replacement. Delivery safety gate retained installed 1.5.0. User then requested template copyright removal and lower version, superseding this candidate.",
|
||||
"supersededByBuild": "36",
|
||||
"submittedZipSHA256": "ba3ee8a2a0e5dfbaabaeabaed0aa9ebc3bd4eccd854a6c6b62c38ac762afc44e",
|
||||
"generatedCopiesRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notarization-submission.zip"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"onlyMatchingInstalledAppInCheckedLocations": [
|
||||
"/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"productRegistry": [
|
||||
"com.dayu.color.XPC(1.1)\t0FFF5BF4-DF9D-4769-B3E0-CEF0B697EA9D\t2026-11-02 07:21:24 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexRecovery/dayu-color-print-1.6.0",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData",
|
||||
"/Volumes/备份/大鱼调色-1.6.0.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template.moef",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template38.moef",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/print-recovered-template39.moef"
|
||||
],
|
||||
"generatedBuildAppAndLoosePluginAbsent": true,
|
||||
"submissionZIPAbsent": true,
|
||||
"previousCandidatesRemoved": true,
|
||||
"retainedCurrentPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"retainedHistoricalPackages": true,
|
||||
"privateQAMediaAndPresetsRetained": true,
|
||||
"scope": "Task cache, task recovery clone, project generated roots and known installation/Desktop/Downloads locations; no whole-disk uniqueness claim.",
|
||||
"completed": "2026-11-02T07:34:06.072844+00:00"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"commit": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-print-1.6.0",
|
||||
"filesByteCompared": 294,
|
||||
"fsck": "full/strict passed",
|
||||
"releaseBuild": true,
|
||||
"nativeChecks": 395,
|
||||
"nativePass": true,
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"recoveredTemplateByteIdentical": true,
|
||||
"templateSHA256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"generatedAppsRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"recoveryCloneRemovedAfterVerification": true
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"tag": "v1.6.0-print-looks-20261102",
|
||||
"tagCommit": "0cc51149a6f21ebe09465b4fd7130451bedd57bb",
|
||||
"compiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"sourceCodeIdenticalBetweenCompileAndTag": true,
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-print-1.6.0",
|
||||
"filesByteCompared": 296,
|
||||
"fsck": "full/strict passed",
|
||||
"compiledSourceRecovery": "verification/PrintLooksRecovery.json",
|
||||
"releaseBuildNativeChecks": 395,
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"recoveryCloneRemovedAfterVerification": true
|
||||
}
|
||||
+20
-11
@@ -1,15 +1,24 @@
|
||||
{
|
||||
"status": "prepared-not-published",
|
||||
"passResult": false,
|
||||
"version": "1.4.2",
|
||||
"build": "31",
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"repositoryVisibilityUnchanged": true,
|
||||
"tag": "v1.4.2-tracking-midpoint-20261102",
|
||||
"appCompiledSource": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
|
||||
"assetName": "大鱼调色-1.4.2.pkg",
|
||||
"bytes": 14339640,
|
||||
"sha256": "d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2",
|
||||
"priorReleasePreserved": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.1-mask-workflow-20261101"
|
||||
"tag": "v1.6.0-print-looks-20261102",
|
||||
"releaseCommit": "0cc51149a6f21ebe09465b4fd7130451bedd57bb",
|
||||
"releaseID": 373,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102",
|
||||
"assetID": 18,
|
||||
"assetName": "大鱼调色-1.6.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.0-print-looks-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.0.pkg",
|
||||
"bytes": 40833847,
|
||||
"sha256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"version": "1.6.0",
|
||||
"build": "39",
|
||||
"appCompiledSource": "e5affd3f097fc96f87f41be8e1a3f131ed01daeb",
|
||||
"draftDownloadVerification": "verification/ReleaseDraftDownload1.6.0.json",
|
||||
"hostVerification": "verification/HostPrintLooks1.6.0.json",
|
||||
"repositoryVisibilityUnchanged": true
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.4.2",
|
||||
"build": "31",
|
||||
"releaseID": 370,
|
||||
"assetID": 15,
|
||||
"releaseCommit": "38bf12326e74f2f026bc4c7627729121b6aa261d",
|
||||
"draft": true,
|
||||
"method": "Complete download through existing authenticated browser session; verified before publishing",
|
||||
"bytes": 14339640,
|
||||
"sha256": "d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.4.2-tracking-midpoint-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.4.2.pkg"
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"version": "1.4.3",
|
||||
"build": "33",
|
||||
"releaseID": 371,
|
||||
"assetID": 16,
|
||||
"releaseCommit": "301b31438e8da95dc4e6e1c09498ad814a0ebcfc",
|
||||
"draft": true,
|
||||
"method": "Complete download through existing authenticated browser session; verified before publishing",
|
||||
"bytes": 14340650,
|
||||
"sha256": "41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.4.3-mask-fold-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.4.3.pkg"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"releaseID": 372,
|
||||
"assetID": 17,
|
||||
"tag": "v1.5.0-film-mixer-20261102",
|
||||
"method": "Authenticated normal Edge browser download; actual downloaded copy hashed before publication",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.5.0-film-mixer-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.5.0.pkg",
|
||||
"downloadedFile": "/Volumes/备份/大鱼调色-1.5.0.pkg",
|
||||
"bytes": 14380104,
|
||||
"sha256": "3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294",
|
||||
"temporaryDownloadCleaned": true
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"releaseID": 373,
|
||||
"assetID": 18,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.6.0-print-looks-20261102/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.6.0.pkg",
|
||||
"expectedBytes": 40833847,
|
||||
"expectedSHA256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"localPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
|
||||
"tag": "v1.6.0-print-looks-20261102",
|
||||
"tagCommit": "0cc51149a6f21ebe09465b4fd7130451bedd57bb",
|
||||
"passResult": true,
|
||||
"actualDownloadedPath": "/Volumes/备份/大鱼调色-1.6.0.pkg",
|
||||
"actualBytes": 40833847,
|
||||
"actualSHA256": "13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca",
|
||||
"verifiedAt": "2026-11-02T07:32:32.753960+00:00",
|
||||
"verification": "Actual authenticated Edge download completed; independent downloaded file byte count and SHA-256 matched before publishing."
|
||||
}
|
||||
@@ -215,7 +215,7 @@
|
||||
"maximumGapMS": 178.33579168654978,
|
||||
"context": "Initial run overlapped diagnostic decoding; quiet complete repeat285/285 passed. No test threshold changed."
|
||||
},
|
||||
"quietTermination": "FxPlugErrorDomain/kFxError_UserCancelled SDK sentinel for expected loss, cancel, single step, boundary and late frames; five native lifecycle checks pass; formal FCP task-idle verification pending",
|
||||
"quietTermination": "FxPlugErrorDomain/kFxError_UserCancelled for expected loss, explicit cancel, extra single-step frames and late callbacks. A normal backward boundary returns a valid seed-only analysis range and completes successfully; no rejected range.",
|
||||
"candidate27Rejected": "NO/nil suppressed the modal but left the diagnostic host background analysis at 50%; candidate not released. Own diagnostic task canceled normally before host quit.",
|
||||
"singleStepTimeMapping": "FxTimingAPI_v4 timelineTime:fromInputTime: converts source analysis time before FxCommandAPI_v2 seek; exact rational offset-clip backward step and consecutive forward-step checks pass",
|
||||
"candidate28Host": "Midpoint both285, midpoint forward193 new/258 total, loss50 keys task idle with immediate rerun, active cancel task idle and normal quit passed. Offset-clip single-step sought source3.72 as timeline3.72 instead of7.72; candidate not released; corrected in29.",
|
||||
|
||||
@@ -41,5 +41,20 @@
|
||||
"originalMediaPreserved": true,
|
||||
"localUserProjectSnapshotsAndPresetsPreserved": true,
|
||||
"formalPluginKitEntries": 1,
|
||||
"otherProductBackupsUntouched": true
|
||||
"otherProductBackupsUntouched": true,
|
||||
"scannedRoots": [
|
||||
"/Applications",
|
||||
"/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Users/mac/Desktop",
|
||||
"/Users/mac/Downloads"
|
||||
],
|
||||
"remainingProductApps": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"build": "31"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"tag": "v1.4.2-tracking-midpoint-20261102",
|
||||
"releaseCommit": "38bf12326e74f2f026bc4c7627729121b6aa261d",
|
||||
"appCompiledSource": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
|
||||
"restoredFiles": 237,
|
||||
"fsck": "full strict passed",
|
||||
"everyTrackedFileByteCompared": true,
|
||||
"packageBytes": 14339640,
|
||||
"packageSHA256": "d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2",
|
||||
"formalNativeAndHostReportsRecovered": true,
|
||||
"compiledSourceRebuildRecord": "verification/TrackingMidpointRecovery.json",
|
||||
"LFS": false,
|
||||
"submodules": false,
|
||||
"cloneCleaned": true
|
||||
}
|
||||
@@ -378,6 +378,8 @@
|
||||
"-framework",
|
||||
Metal,
|
||||
"-framework",
|
||||
MetalPerformanceShaders,
|
||||
"-framework",
|
||||
QuartzCore,
|
||||
"-lcompression",
|
||||
"-lz",
|
||||
@@ -409,6 +411,8 @@
|
||||
"-framework",
|
||||
Metal,
|
||||
"-framework",
|
||||
MetalPerformanceShaders,
|
||||
"-framework",
|
||||
QuartzCore,
|
||||
"-lcompression",
|
||||
"-lz",
|
||||
@@ -435,6 +439,8 @@
|
||||
"-framework",
|
||||
Metal,
|
||||
"-framework",
|
||||
MetalPerformanceShaders,
|
||||
"-framework",
|
||||
QuartzCore,
|
||||
"-lcompression",
|
||||
"-lz",
|
||||
@@ -460,6 +466,8 @@
|
||||
"-framework",
|
||||
Metal,
|
||||
"-framework",
|
||||
MetalPerformanceShaders,
|
||||
"-framework",
|
||||
QuartzCore,
|
||||
"-lcompression",
|
||||
"-lz",
|
||||
|
||||
+14
-4
@@ -1,3 +1,5 @@
|
||||
#include "DYFilmMath.h"
|
||||
#include "DYFilmTime.h"
|
||||
#import "DYDiagnostics.h"
|
||||
#import "DYModel.h"
|
||||
#import "DYRenderer.h"
|
||||
@@ -173,13 +175,18 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
for(NSDictionary *row in descriptors)if([row[@"offset"]integerValue]>=0){float value=*field(&defaults,row);finite&=std::isfinite(value);matches&=value==[row[@"default"]floatValue];}
|
||||
for(int c=0;c<3;c++)finite&=std::isfinite(defaults.primariesM0[c])&&std::isfinite(defaults.primariesM1[c])&&std::isfinite(defaults.primariesM2[c]);
|
||||
run.need(@"finite-real-model-defaults",finite&&matches);
|
||||
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22);
|
||||
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22&&defaults.cm.toneMapping==1);
|
||||
bool initialGroups=true;
|
||||
for(NSDictionary *section in sections){BOOL base=YES;for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
|
||||
run.record(@"all-module-eyes-enabled-by-default",initialGroups);
|
||||
DYDiagnosticManager *manager=[[[DYDiagnosticManager alloc]init]autorelease];error=nil;
|
||||
run.need(@"native-parameter-creation",DYCreateParameters(manager,&error)&&!manager->_duplicate&&manager->_values.count==descriptors.count&&manager->_custom.count==4,@{@"error":reason(error)});
|
||||
id<FxParameterSettingAPI_v6> setter=[manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];id<FxParameterRetrievalAPI_v6> getter=[manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
UInt32 mappingPID=0;for(NSDictionary *d in descriptors)if([d[@"key"]isEqual:@"cmtoneMapping"])mappingPID=[d[@"pid"]unsignedIntValue];
|
||||
DYUniforms mappingRead;DYReadUniforms(manager,kCMTimeZero,&mappingRead);BOOL storedMapping=mappingRead.cm.toneMapping==0;
|
||||
[setter setFloatValue:1 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==1;
|
||||
[setter setFloatValue:0 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==0;
|
||||
run.record(@"historical-host-mapping-default-and-explicit-on-off-preserved",mappingPID&&storedMapping);
|
||||
[setter setFloatValue:.75 toParameter:2000 atTime:kCMTimeZero];double value=0;[getter getFloatValue:&value fromParameter:2000 atTime:kCMTimeZero];DYUniforms restored;DYReadUniforms(manager,kCMTimeZero,&restored);
|
||||
run.record(@"native-get-set-model-roundtrip",value==.75&&restored.exposure==.75f);
|
||||
[setter setFloatValue:999 toParameter:2000 atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&restored);run.record(@"model-clamps-host-out-of-range",restored.exposure==5);
|
||||
@@ -217,7 +224,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
NSWindow *interactionWindow=[[[NSWindow alloc]initWithContentRect:NSMakeRect(0,0,400,780) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]autorelease];interactionWindow.contentView=inspector;[inspector layoutSubtreeIfNeeded];
|
||||
NSArray *graphics=[inspector valueForKey:@"graphics"];NSView *wheel=nil;for(NSView *graphic in graphics)if([NSStringFromClass(graphic.class)isEqual:@"DYPrimaryBalanceWheel"])wheel=graphic;
|
||||
run.need(@"primary-balance-wheel-restored-and-palette-loaded",wheel&&[wheel valueForKey:@"wheel"]!=nil);
|
||||
BOOL merged=cards.count==12&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]];
|
||||
BOOL merged=cards.count==14&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]];
|
||||
NSDictionary *controls=[inspector valueForKey:@"controls"];for(NSDictionary *record in controls.allValues)merged&=![[record[@"descriptor"]objectForKey:@"key"]hasPrefix:@"cmbypass"];
|
||||
run.record(@"single-primary-card-no-bypass-checkboxes",merged);
|
||||
auto mouseFor=[&](NSView *view,NSEventType type,NSPoint point,NSEventModifierFlags flags=0,NSInteger clicks=1){return [NSEvent mouseEventWithType:type location:[view convertPoint:point toView:nil] modifierFlags:flags timestamp:0 windowNumber:interactionWindow.windowNumber context:nil eventNumber:0 clickCount:clicks pressure:type==NSEventTypeLeftMouseUp?0:1];};
|
||||
@@ -239,7 +246,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
run.record(@"spider-single-drag-spoke-following-and-pin",dragged.x[0]>initialMesh.x[0]&&dragged.x[1]>initialMesh.x[1]&&dragged.x[3]>initialMesh.x[3]&&dragged.x[4]==initialMesh.x[4]&&dragged.x[5]==initialMesh.x[5]&&dragged.pins[2]);
|
||||
run.record(@"spider-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive);
|
||||
error=nil;NSData *spiderArchive=[NSKeyedArchiver archivedDataWithRootObject:spiderSaved requiringSecureCoding:YES error:&error];DYAssetState *decodedSpider=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:spiderArchive error:&error];run.record(@"spider-archive-retains-mesh-pins-and-lut-paths",decodedSpider&&[decodedSpider isEqual:spiderSaved],@{@"error":reason(error)});
|
||||
NSDictionary *snapshot=[inspector performSelector:@selector(presetSnapshot)];NSData *presetJSON=[NSJSONSerialization dataWithJSONObject:snapshot options:0 error:&error];NSDictionary *decodedPreset=[NSJSONSerialization JSONObjectWithData:presetJSON options:0 error:&error];run.record(@"complete-version-four-preset-includes-mesh",[decodedPreset[@"version"]isEqual:@4]&&[DYSpiderFromJSON(decodedPreset[@"spider"])isEqual:spiderSaved.spiderMesh]);
|
||||
NSDictionary *snapshot=[inspector performSelector:@selector(presetSnapshot)];NSData *presetJSON=[NSJSONSerialization dataWithJSONObject:snapshot options:0 error:&error];NSDictionary *decodedPreset=[NSJSONSerialization JSONObjectWithData:presetJSON options:0 error:&error];run.record(@"complete-version-six-preset-includes-mesh",[decodedPreset[@"version"]isEqual:@6]&&[DYSpiderFromJSON(decodedPreset[@"spider"])isEqual:spiderSaved.spiderMesh]);
|
||||
NSDictionary *portable=DYSpiderJSON(spiderSaved.spiderMesh,spiderSaved.spiderLinked);NSData *decodedPortable=DYSpiderFromJSON(portable);run.record(@"spider-json-preset-exact-roundtrip",[decodedPortable isEqual:spiderSaved.spiderMesh]);
|
||||
NSMutableDictionary *badJSON=[[portable mutableCopy]autorelease];badJSON[@"hues"]=@7;run.record(@"spider-json-rejects-unsupported-topology",!DYSpiderFromJSON(badJSON));auto corrupt=dragged;corrupt.x[0]=NAN;run.record(@"spider-archive-rejects-nonfinite-coordinates",!DYSpiderMeshIsValid([NSData dataWithBytes:&corrupt length:sizeof(corrupt)]));
|
||||
[disc changeHueCount:12 saturationCount:8];spiderSaved=DYReadAssets(uiHost,kCMTimeZero);auto dense=DYSpiderMesh(spiderSaved.spiderMesh);run.record(@"spider-independent-resolution-and-resample",dense.hues==12&&dense.rings==7&&fabs(dy::meshDelta(dense,0,.6).x)>0);
|
||||
@@ -256,7 +263,9 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
|
||||
// Color-tool parity fixtures deliberately use a display-space identity
|
||||
// input; the user's new Sony camera default is checked independently above.
|
||||
defaults.cm.inputTransfer=1002;defaults.cm.inputGamut=22;
|
||||
// Pixel-isolation fixtures use an identity CST. The real new-instance
|
||||
// default was verified above; mapped CST cases below enable it explicitly.
|
||||
defaults.cm.inputTransfer=1002;defaults.cm.inputGamut=22;defaults.cm.toneMapping=0;
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];Pixels neutral=render(run,renderer,source,destination,gpu,defaults,@{},@"renderer-default-pass");Difference neutralDifference=difference(input,neutral);
|
||||
run.record(@"transparent-premultiplied-neutral",neutralDifference.nonfinite==0&&neutralDifference.maximum<=.001,measure(neutralDifference));
|
||||
NSString *cstReference=NSProcessInfo.processInfo.environment[@"DY_DIAGNOSTIC_CST_REFERENCE"];
|
||||
@@ -419,6 +428,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
}
|
||||
#include "DYToolDiagnostics.inc.h"
|
||||
#include "DYToolInsertionDiagnostics.inc.h"
|
||||
#include "DYFilmDiagnostics.inc.h"
|
||||
#include "DYToolTrackingDiagnostics.inc.h"
|
||||
#include "DYToolCanvasDiagnostics.inc.h"
|
||||
#include "DYToolPenDiagnostics.inc.h"
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
DYToolDocument *empty=[[[DYToolDocument alloc]init]autorelease];
|
||||
auto uploadFilm=[&](const Pixels& pixels){[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:width*8];};
|
||||
auto filmRender=[&](DYUniforms value,NSDictionary *tools,NSString *name){NSError *failure=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:value paths:@{} spider:nil tools:tools?:empty.document error:&failure];run.need(name,ok,@{@"error":reason(failure)});return read(destination,gpu);};
|
||||
uploadFilm(input);DYUniforms neutral=DYToolUniforms(@{@"type":@"mixer"});neutral.mixerSectionEnabled=1;
|
||||
Pixels before=filmRender(neutral,nil,@"film-neutral-production-render");
|
||||
run.record(@"new-tools-default-to-neutral",!DYChannelMixerActive(neutral)&&!DYFilmActive(defaults.film)&&DYToolTypes().count==14&&DYToolIsNeutral(DYNewTool(@"film"))&&DYToolIsNeutral(DYNewTool(@"mixer")));
|
||||
BOOL alpha=YES;for(size_t i=0;i<before.size()/4;i++)alpha&=before[i*4+3]==input[i*4+3];run.record(@"new-neutral-tools-preserve-existing-alpha",alpha);
|
||||
DYUniforms matrix=neutral;matrix.mixerRed=(DYFloat4){.8,.25,-.05,0};matrix.mixerBlue=(DYFloat4){.1,0,.9,0};
|
||||
Pixels mixed=filmRender(matrix,nil,@"channel-mixer-production-render");auto delta=difference(before,mixed);run.record(@"channel-mixer-affects-real-frame",delta.different>50&&delta.nonfinite==0,measure(delta));
|
||||
matrix.mixerSectionEnabled=0;Pixels bypass=filmRender(matrix,nil,@"channel-mixer-eye-bypass-render");run.record(@"channel-mixer-eye-exact-bypass",difference(before,bypass).maximum==0);
|
||||
matrix.mixerSectionEnabled=1;matrix.mixerMix=0;bypass=filmRender(matrix,nil,@"channel-mixer-zero-render");run.record(@"channel-mixer-zero-exact-bypass",difference(before,bypass).maximum==0);
|
||||
for(int stage=0;stage<5;stage++){
|
||||
DYUniforms value=neutral;value.film.enabled=1;
|
||||
if(stage==0){value.film.subtractiveEnabled=1;value.film.gammaCyan=1.4;value.film.gammaYellow=.8;value.film.density=.35;}
|
||||
if(stage==1){value.film.halationEnabled=1;value.film.scatter=4;value.film.boost=2;value.film.dyeTransmission=60;}
|
||||
if(stage==2){value.film.bloomEnabled=1;value.film.sensitivity=1;value.film.diffusion=3;value.film.intensity=75;}
|
||||
if(stage==3){value.film.grainEnabled=1;value.film.grainAmount=.7;value.film.grainColor=.35;value.film.grainSize=3;value.filmFrameKey=7;}
|
||||
if(stage==4){value.film.vignetteEnabled=1;value.film.vignetteIntensity=1;value.film.vignetteRadius=15;}
|
||||
Pixels after=filmRender(value,nil,[NSString stringWithFormat:@"film-stage-%d-production",stage]);Difference change=difference(before,after);BOOL sameAlpha=YES;for(size_t i=0;i<after.size()/4;i++)sameAlpha&=after[i*4+3]==before[i*4+3];run.record([NSString stringWithFormat:@"film-stage-%d-finite-active-alpha",stage],change.different>20&&change.nonfinite==0&&sameAlpha,measure(change));
|
||||
if(stage==3){Pixels repeat=filmRender(value,nil,@"grain-random-access-repeat");run.record(@"grain-identical-frozen-frame-is-bit-exact",difference(after,repeat).maximum==0);value.filmFrameKey=8;Pixels next=filmRender(value,nil,@"grain-next-frozen-frame");run.record(@"grain-frame-changes-noise",difference(after,next).different>100);}
|
||||
value.film.mix=0;bypass=filmRender(value,nil,[NSString stringWithFormat:@"film-stage-%d-zero-mix",stage]);run.record([NSString stringWithFormat:@"film-stage-%d-zero-is-exact",stage],difference(before,bypass).maximum==0);
|
||||
value.film.mix=1;value.film.enabled=0;bypass=filmRender(value,nil,[NSString stringWithFormat:@"film-stage-%d-eye-off",stage]);run.record([NSString stringWithFormat:@"film-stage-%d-eye-preserves-old-frame",stage],difference(before,bypass).maximum==0);
|
||||
}
|
||||
DYUniforms originGrain=neutral;originGrain.film.enabled=1;originGrain.film.grainEnabled=1;originGrain.film.grainAmount=.7;originGrain.filmFrameKey=31;
|
||||
Pixels topGrain=filmRender(originGrain,nil,@"grain-top-origin-render"),bottomInput(input.size());for(NSUInteger y=0;y<height;y++)memcpy(bottomInput.data()+y*width*4,input.data()+(height-1-y)*width*4,width*8);uploadFilm(bottomInput);[source setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];Pixels bottomGrain=filmRender(originGrain,nil,@"grain-bottom-origin-render");run.record(@"grain-canonical-coordinates-survive-texture-origin",difference(topGrain,bottomGrain).maximum==0,measure(difference(topGrain,bottomGrain)));[source setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];uploadFilm(input);
|
||||
CMTime duration=CMTimeMake(1001,30000),origin=CMTimeMake(17,3);BOOL rational=YES;
|
||||
for(int i=-12;i<=12;i++){CMTime t=CMTimeAdd(origin,CMTimeMultiply(duration,i));rational&=DYFilmFrameIndex(t,duration,origin)==i;for(int hold=1;hold<=5;hold++)rational&=DYFilmFrameKey(i,hold,0)==(uint32_t)(int64_t)floor(double(i)/hold);}
|
||||
rational&=DYFilmFrameIndex(CMTimeMake(-1,1000000),duration,kCMTimeZero)==-1;
|
||||
run.record(@"grain-exact-ntsc-signed-frame-and-hold",rational);
|
||||
NSMutableDictionary *doc=DYMutablePlist(empty.document);NSMutableDictionary *mixer=(id)DYInsertTool(doc,@"mixer",@"base:mixer");mixer[@"values"][@"mixer01"]=@.3;
|
||||
NSMutableDictionary *film=(id)DYInsertTool(doc,@"film",mixer[@"id"]);film[@"values"][@"filmSubtractive"]=@1;film[@"values"][@"filmGammaCyan"]=@1.5;
|
||||
run.record(@"film-mixer-adjacent-schema-two-valid",DYValidToolDocument(doc)&&[[DYToolDisplayOrder(doc) objectAtIndex:13]isEqual:mixer[@"id"]]&&[[DYToolDisplayOrder(doc)objectAtIndex:14]isEqual:film[@"id"]]);
|
||||
Pixels layered=filmRender(neutral,doc,@"film-mixer-adjacent-render");run.record(@"film-mixer-adjacent-layers-affect-frame",difference(before,layered).different>50);
|
||||
NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(mask,kCMTimeZero);p.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];[mixer[@"masks"]addObject:mask];[film[@"masks"]addObject:DYMutablePlist(DYNewMask(DYMaskEllipse))];
|
||||
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:saved requiringSecureCoding:YES error:&error];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:&error];run.record(@"film-mixer-mask-archive-exact-roundtrip",[saved isEqual:restored]);
|
||||
NSMutableDictionary *baseMask=DYMutablePlist(empty.document);baseMask[@"baseMasks"][@"film"]=@[mask];DYUniforms masked=neutral;masked.film.enabled=1;masked.film.grainEnabled=1;masked.film.grainAmount=.5;Pixels zeroMask=filmRender(masked,baseMask,@"film-zero-mask-render");run.record(@"film-zero-mask-exact-source",difference(before,zeroMask).maximum==0);
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"film-mixer.cube"]];error=nil;
|
||||
BOOL rejected=![renderer exportLUT:cube uniforms:masked paths:@{} spider:nil tools:empty.document error:&error];run.record(@"grain-rejected-by-static-cube",rejected&&error!=nil);
|
||||
masked.film.grainEnabled=0;masked.film.subtractiveEnabled=1;masked.film.gammaAll=1.1;error=nil;run.record(@"pure-subtractive-cube-supported",[renderer exportLUT:cube uniforms:masked paths:@{} spider:nil tools:empty.document error:&error],@{@"error":reason(error)});
|
||||
masked=matrix;masked.mixerMix=1;error=nil;run.record(@"channel-mixer-cube-supported",[renderer exportLUT:cube uniforms:masked paths:@{} spider:nil tools:empty.document error:&error],@{@"error":reason(error)});
|
||||
// Exercise the shipped print resources through the complete production path.
|
||||
// The separate installed-reference oracle checks interpolation and color math.
|
||||
NSArray *printNames=@[@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"];
|
||||
std::vector<Pixels> printFrames;BOOL printFramesDistinct=YES;
|
||||
DYUniforms printValue=neutral;printValue.film.enabled=1;printValue.filmPrint.y=1;
|
||||
for(NSUInteger index=0;index<printNames.count;index++){
|
||||
NSString *resource=[[NSBundle bundleForClass:renderer.class]pathForResource:printNames[index] ofType:@"dylut" inDirectory:@"PrintLooks"];std::vector<float> table;NSUInteger side=0;error=nil;
|
||||
BOOL resourceOK=resource&&DYLUTReadCube(resource,table,side,&error)&&side==65&&table.size()==65*65*65*4;
|
||||
run.record([NSString stringWithFormat:@"print-%lu-shipped-65cube",(unsigned long)index+1],resourceOK,@{@"error":reason(error),@"side":@(side)});
|
||||
printValue.filmPrint.x=index+1;Pixels printed=filmRender(printValue,nil,[NSString stringWithFormat:@"print-%lu-production-render",(unsigned long)index+1]);Difference change=difference(before,printed);BOOL sameAlpha=YES;
|
||||
for(size_t pixel=0;pixel<printed.size()/4;pixel++)sameAlpha&=printed[pixel*4+3]==before[pixel*4+3];
|
||||
run.record([NSString stringWithFormat:@"print-%lu-active-finite-preserves-alpha",(unsigned long)index+1],change.different>20&&change.nonfinite==0&&sameAlpha,measure(change));
|
||||
for(const Pixels& previous:printFrames)printFramesDistinct&=difference(previous,printed).different>20;printFrames.push_back(printed);
|
||||
}
|
||||
run.record(@"all-eight-print-looks-have-distinct-production-output",printFramesDistinct);
|
||||
printValue.filmPrint.y=0;bypass=filmRender(printValue,nil,@"print-zero-strength-render");run.record(@"print-zero-strength-exact-old-frame",difference(before,bypass).maximum==0);
|
||||
printValue.filmPrint.y=1;printValue.film.mix=0;bypass=filmRender(printValue,nil,@"print-zero-film-mix-render");run.record(@"print-zero-film-mix-exact-old-frame",difference(before,bypass).maximum==0);
|
||||
printValue.film.mix=1;printValue.film.enabled=0;bypass=filmRender(printValue,nil,@"print-eye-off-render");run.record(@"print-eye-off-exact-old-frame",difference(before,bypass).maximum==0);printValue.film.enabled=1;
|
||||
DYUniforms freshPrint=DYToolUniforms(DYNewTool(@"film"));run.record(@"new-film-layer-print-default-is-none",freshPrint.filmPrint.x==0&&freshPrint.filmPrint.y==1&&DYToolIsNeutral(DYNewTool(@"film")));
|
||||
NSMutableDictionary *printDoc=DYMutablePlist(empty.document),*printLayer=(id)DYInsertTool(printDoc,@"film",@"base:film");printLayer[@"values"][@"filmPrintLook"]=@2;
|
||||
run.record(@"print-only-independent-layer-is-active",DYValidToolDocument(printDoc)&&!DYToolIsNeutral(printLayer)&&DYFilmPrintActive(DYToolUniforms(printLayer)));
|
||||
Pixels printLayerFrame=filmRender(neutral,printDoc,@"print-only-independent-layer-render");run.record(@"print-only-independent-layer-affects-frame",difference(before,printLayerFrame).different>20);
|
||||
NSMutableDictionary *secondPrintLayer=(id)DYInsertTool(printDoc,@"film",printLayer[@"id"]);secondPrintLayer[@"values"][@"filmPrintLook"]=@8;secondPrintLayer[@"values"][@"filmPrintStrength"]=@.4;
|
||||
DYToolDocument *printSaved=[[[DYToolDocument alloc]init]autorelease];printSaved.document=printDoc;error=nil;NSData *printArchive=[NSKeyedArchiver archivedDataWithRootObject:printSaved requiringSecureCoding:YES error:&error];DYToolDocument *printRestored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:printArchive error:&error];
|
||||
DYUniforms firstRestored=DYToolUniforms(DYToolWithID(printRestored.document,printLayer[@"id"])),secondRestored=DYToolUniforms(DYToolWithID(printRestored.document,secondPrintLayer[@"id"]));
|
||||
run.record(@"two-print-layers-archive-independent-choices-and-strength",[printSaved isEqual:printRestored]&&firstRestored.filmPrint.x==2&&firstRestored.filmPrint.y==1&&secondRestored.filmPrint.x==8&&secondRestored.filmPrint.y==.4f,@{@"error":reason(error)});
|
||||
Pixels twoPrintLayers=filmRender(neutral,printRestored.document,@"two-print-layers-production-render");run.record(@"second-print-layer-is-rendered-independently",difference(printLayerFrame,twoPrintLayers).different>20);
|
||||
Pixels printZeroMask=filmRender(printValue,baseMask,@"print-zero-mask-render");run.record(@"print-zero-mask-exact-source",difference(before,printZeroMask).maximum==0);
|
||||
printValue.filmPrint.x=1;error=nil;BOOL printExported=[renderer exportLUT:cube uniforms:printValue paths:@{} spider:nil tools:empty.document error:&error];run.record(@"print-only-static-cube-supported",printExported,@{@"error":reason(error)});
|
||||
std::vector<float> printCubeValues;NSUInteger printCubeSide=0;error=nil;BOOL printCubeParsed=printExported&&DYLUTReadCube(cube.path,printCubeValues,printCubeSide,&error)&&printCubeSide==33;
|
||||
Pixels printCubeInput(input.size());float printCodes[3]={.5f,.25f,.75f};for(size_t pixel=0;pixel<printCubeInput.size()/4;pixel++){for(int channel=0;channel<3;channel++){float code=printCodes[channel];printCubeInput[pixel*4+channel]=code<=.04045f?code/12.92f:powf((code+.055f)/1.055f,2.4f);}printCubeInput[pixel*4+3]=1;}
|
||||
uploadFilm(printCubeInput);Pixels printCubeRendered=filmRender(printValue,nil,@"print-cube-production-lattice-point");BOOL printCubeMatches=printCubeParsed&&printCubeValues.size()==33*33*33*4;
|
||||
for(int channel=0;channel<3&&printCubeMatches;channel++){float code=printCubeValues[((24*33+8)*33+16)*4+channel],linear=code<=.04045f?code/12.92f:powf((code+.055f)/1.055f,2.4f);printCubeMatches&=fabs(linear-(float)printCubeRendered[channel])<.0005;}
|
||||
run.record(@"print-static-cube-matches-production-lattice-point",printCubeMatches,@{@"side":@(printCubeSide),@"error":reason(error)});
|
||||
printValue.film.grainEnabled=1;printValue.film.grainAmount=.5;error=nil;run.record(@"print-with-grain-still-rejected-by-static-cube",![renderer exportLUT:cube uniforms:printValue paths:@{} spider:nil tools:empty.document error:&error]&&error!=nil);
|
||||
uploadFilm(input);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
// Included after DYGrade.metal's sRGB boundary helpers.
|
||||
#include "DYFilmMath.h"
|
||||
struct DYFilmPass {int operation;float radius;uint frameKey;uint reserved;};
|
||||
kernel void dyFilmPoint(texture2d<float,access::read> source [[texture(0)]],texture2d<float,access::read> auxiliary [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],constant DYUniforms& uniforms [[buffer(0)]],constant DYFilmPass& pass [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;
|
||||
float4 pixel=source.read(pos);if(!(pixel.a>0)){output.write(pixel,pos);return;}
|
||||
float3 c=pixel.rgb/pixel.a,result=c;DYFilmSettings film=uniforms.film;
|
||||
if(pass.operation==0)result=dyDecode(dyFilmMixer(dyEncode(c),uniforms));
|
||||
else if(pass.operation==1)result=dyDecode(dyFilmSubtractive(dyEncode(c),film));
|
||||
else if(pass.operation==2){float3 b=auxiliary.read(pos).rgb;float3 w=float3(film.boost,film.dyeTransmission/500.f,0);result=(c+b*w)/(1+w);}
|
||||
else if(pass.operation==3)result=c+auxiliary.read(pos).rgb;
|
||||
else if(pass.operation==4)result=dyDecode(dyFilmGrain(dyEncode(c),auxiliary.read(pos).rgb,film));
|
||||
else if(pass.operation==5){float4 filtered=auxiliary.read(pos);result=filtered.rgb/pixel.a;}
|
||||
float amount=pass.operation==0?uniforms.mixerMix:1;
|
||||
pixel.rgb=dyLimit((c*(1-amount)+result*amount)*pixel.a);output.write(pixel,pos);
|
||||
}
|
||||
kernel void dyFilmNoise(texture2d<float,access::write> output [[texture(0)]],constant uint& seed [[buffer(0)]],constant uint& bottomOrigin [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;uint y=bottomOrigin?output.get_height()-1-pos.y:pos.y;output.write(float4(dyFilmNormal(pos.x,y,seed),1),pos);
|
||||
}
|
||||
// Separable form of the reference's sparse 5x5 prefilter: same 25 weighted
|
||||
// samples, followed by its 3x3 vector Sobel norm. Only two 5-tap passes.
|
||||
kernel void dyFilmSparseBlur(texture2d<float,access::sample> source [[texture(0)]],texture2d<float,access::write> output [[texture(1)]],constant int& vertical [[buffer(0)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;constexpr sampler f(coord::pixel,address::clamp_to_edge,filter::linear);
|
||||
float3 value=0;float total=0;float radius=2.5f;
|
||||
for(int i=-2;i<=2;i++){float weight=exp(-float(i*i)/(2*radius*radius));float2 delta=vertical?float2(0,i*radius):float2(i*radius,0);value+=source.sample(f,float2(pos)+.5f+delta).rgb*weight;total+=weight;}
|
||||
output.write(float4(value/total,1),pos);
|
||||
}
|
||||
inline float3 dyFilmBorderPrefilter(texture2d<float,access::sample> source,float2 coordinate){
|
||||
constexpr sampler f(coord::pixel,address::clamp_to_edge,filter::linear);float3 value=0;float sum=0;
|
||||
for(int x=-2;x<=2;x++)for(int y=-2;y<=2;y++){float weight=exp(-float(x*x+y*y)/12.5f);value+=source.sample(f,coordinate+float2(x,y)*2.5f).rgb*weight;sum+=weight;}return value/sum;
|
||||
}
|
||||
kernel void dyFilmBloomEdges(texture2d<float,access::sample> blurred [[texture(0)]],texture2d<float,access::sample> original [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],constant DYFilmSettings& film [[buffer(0)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;constexpr sampler f(coord::pixel,address::clamp_to_edge,filter::linear);
|
||||
float3 gx=0,gy=0;
|
||||
bool border=pos.x==0||pos.y==0||pos.x+1==output.get_width()||pos.y+1==output.get_height();
|
||||
for(int x=-1;x<=1;x++)for(int y=-1;y<=1;y++){float2 coordinate=float2(pos)+.5f+float2(x,y);float3 c=border?dyFilmBorderPrefilter(original,coordinate):blurred.sample(f,coordinate).rgb;gx+=c*float(y)*(x==0?2.f:1.f);gy+=c*float(x)*(y==0?2.f:1.f);}
|
||||
float magnitude=sqrt(dot(gx,gx)+dot(gy,gy)),a=original.read(pos).a;
|
||||
float strength=magnitude>=film.sensitivity/100.f?film.intensity/100.f:0;
|
||||
output.write(float4(float3(strength*a),a),pos);
|
||||
}
|
||||
kernel void dyFilmMix(texture2d<float,access::read> before [[texture(0)]],texture2d<float,access::read> after [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],constant float& amount [[buffer(0)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 a=before.read(pos),b=after.read(pos);output.write(float4(dyLimit(mix(a.rgb,b.rgb,amount)),a.a),pos);
|
||||
}
|
||||
// Six tetrahedra, matching the reference LMT's integer texel fetches.
|
||||
inline float3 dyPrintTetra(texture3d<float,access::read> cube,float3 c){
|
||||
float n=float(cube.get_width()-1);float3 scaled=clamp(c,0.f,1.f)*n;uint3 p=uint3(clamp(floor(scaled),0.f,n-1));float3 f=scaled-float3(p);
|
||||
float3 a=cube.read(p).rgb,h=cube.read(p+uint3(1)).rgb;
|
||||
float3 r=cube.read(p+uint3(1,0,0)).rgb,g=cube.read(p+uint3(0,1,0)).rgb,b=cube.read(p+uint3(0,0,1)).rgb;
|
||||
float3 rg=cube.read(p+uint3(1,1,0)).rgb,rb=cube.read(p+uint3(1,0,1)).rgb,gb=cube.read(p+uint3(0,1,1)).rgb;
|
||||
if(f.x>f.y){if(f.y>f.z)return a*(1-f.x)+r*(f.x-f.y)+rg*(f.y-f.z)+h*f.z;
|
||||
if(f.x>f.z)return a*(1-f.x)+r*(f.x-f.z)+rb*(f.z-f.y)+h*f.y;
|
||||
return a*(1-f.z)+b*(f.z-f.x)+rb*(f.x-f.y)+h*f.y;
|
||||
}
|
||||
if(f.z>f.y)return a*(1-f.z)+b*(f.z-f.y)+gb*(f.y-f.x)+h*f.x;
|
||||
if(f.z>f.x)return a*(1-f.y)+g*(f.y-f.z)+gb*(f.z-f.x)+h*f.x;
|
||||
return a*(1-f.y)+g*(f.y-f.x)+rg*(f.x-f.z)+h*f.z;
|
||||
}
|
||||
kernel void dyFilmPrint(texture2d<float,access::read> source [[texture(0)]],texture3d<float,access::read> cube [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],constant DYUniforms& u [[buffer(0)]],uint2 p [[thread_position_in_grid]]){
|
||||
if(p.x>=output.get_width()||p.y>=output.get_height())return;float4 value=source.read(p);
|
||||
if(value.a>0&&u.filmPrint.y>0){float3 c=value.rgb/value.a;float3 printed=dyPrintDecode(dyPrintTetra(cube,dyPrintEncode(c)));value.rgb=mix(c,printed,u.filmPrint.y)*value.a;}
|
||||
output.write(value,p);
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
#pragma once
|
||||
#include "DYUniforms.h"
|
||||
#include "SpiderCore/DYColorMath.h"
|
||||
// Re-expressed mathematical contracts from the local reference's AIR.
|
||||
// Research identities, operating domains and deviations: ColorFinaleFilmMixer.md.
|
||||
inline float dyFilmMax(float3 c){return c.x>c.y?(c.x>c.z?c.x:c.z):(c.y>c.z?c.y:c.z);}
|
||||
inline float dyFilmMin(float3 c){return c.x<c.y?(c.x<c.z?c.x:c.z):(c.y<c.z?c.y:c.z);}
|
||||
inline float dyFilmLuma(float3 c){return c.x*.2126f+c.y*.7152f+c.z*.0722f;}
|
||||
inline float dyFilmSat(float3 c){float m=dyFilmMax(c);return m!=0?(m-dyFilmMin(c))/m:0;}
|
||||
inline float3 dyFilmPositive(float3 c){for(int i=0;i<3;i++)if(c[i]<0)c[i]=0;return c;}
|
||||
inline bool DYChannelMixerActive(DYUniforms u){return u.mixerSectionEnabled>.5f&&u.mixerMix>0&&(u.mixerRed.x!=1||u.mixerRed.y!=0||u.mixerRed.z!=0||u.mixerGreen.x!=0||u.mixerGreen.y!=1||u.mixerGreen.z!=0||u.mixerBlue.x!=0||u.mixerBlue.y!=0||u.mixerBlue.z!=1);}
|
||||
inline bool DYFilmPrintActive(DYUniforms u){return u.film.enabled>.5f&&u.film.mix>0&&u.filmPrint.x>=1&&u.filmPrint.x<=8&&u.filmPrint.y>0;}
|
||||
inline bool DYFilmToolActive(DYUniforms u){return DYFilmActive(u.film)||DYFilmPrintActive(u);}
|
||||
// AP1/D60 conversion verified against the local reference's color-space filter.
|
||||
// The print tables operate on ACEScct code values, not display RGB.
|
||||
inline float3 dyPrintToAP1(float3 c){return {c.x*.6130974293f+c.y*.3395231366f+c.z*.0473794527f,c.x*.0701937228f+c.y*.9163538814f+c.z*.0134523986f,c.x*.0206155926f+c.y*.1095697731f+c.z*.8698146343f};}
|
||||
inline float3 dyPrintFromAP1(float3 c){return {c.x*1.7050509453f-c.y*.6217921376f-c.z*.0832588747f,-c.x*.1302564144f+c.y*1.1408047676f-c.z*.0105483187f,-c.x*.0240033567f-c.y*.1289689690f+c.z*1.1529723406f};}
|
||||
inline float dyPrintCCTEncode(float c){return c<=.0078125f?10.5402377416545f*c+.0729055341958355f:(log2(c)+9.72f)/17.52f;}
|
||||
inline float dyPrintCCTDecode(float c){return c<=.155251141552511f?(c-.0729055341958355f)/10.5402377416545f:exp2(c*17.52f-9.72f);}
|
||||
inline float3 dyPrintEncode(float3 c){c=dyPrintToAP1(c);return {dyPrintCCTEncode(c.x),dyPrintCCTEncode(c.y),dyPrintCCTEncode(c.z)};}
|
||||
inline float3 dyPrintDecode(float3 c){return dyPrintFromAP1(float3{dyPrintCCTDecode(c.x),dyPrintCCTDecode(c.y),dyPrintCCTDecode(c.z)});}
|
||||
inline float3 dyFilmMixer(float3 c,DYUniforms u){
|
||||
float3 r={c.x*u.mixerRed.x+c.y*u.mixerRed.y+c.z*u.mixerRed.z,c.x*u.mixerGreen.x+c.y*u.mixerGreen.y+c.z*u.mixerGreen.z,c.x*u.mixerBlue.x+c.y*u.mixerBlue.y+c.z*u.mixerBlue.z};
|
||||
if(u.mixerPreserveLuma>.5f){r=dyFilmPositive(r);float ratio=dyFilmLuma(c)/dyFilmLuma(r);if(!isfinite(ratio))ratio=1;r*=ratio;}
|
||||
if(u.mixerPreserveSaturation>.5f){float3 p=dyFilmPositive(r);float source=dyFilmSat(c),ratio=source/dyFilmSat(p);if(isfinite(ratio)){float y=dyFilmLuma(p);r=source==0?float3{y,y,y}:float3{y,y,y}*(1-ratio)+p*ratio;}}
|
||||
return r;
|
||||
}
|
||||
inline float dyFilmNorm(float3 c,int mode){
|
||||
if(mode==2)return dyFilmMax(c);
|
||||
if(mode==1)return (c.x+c.y+c.z)/3;
|
||||
if(mode==6){float3 e={exp(c.x*3),exp(c.y*3),exp(c.z*3)};return (e.x*c.x+e.y*c.y+e.z*c.z)/(e.x+e.y+e.z);}
|
||||
return dyFilmMax(c);
|
||||
}
|
||||
inline float3 dyFilmSubtractive(float3 input,DYFilmSettings p){
|
||||
float3 c=input;for(int i=0;i<3;i++)c[i]=dyClamp(c[i],0,1);
|
||||
float n=dyFilmNorm(c,int(p.densityMode));if(n<=0)return float3{0,0,0};
|
||||
float v=dyFilmNorm(c,int(p.valueMode));float weight=n*(1-p.density)+v*p.density;
|
||||
float gamma[3]={p.gammaAll*p.gammaCyan,p.gammaAll*p.gammaMagenta,p.gammaAll*p.gammaYellow};
|
||||
// Both UI density choices (mean/max), and softmax value, normalize white to 1.
|
||||
for(int i=0;i<3;i++)c[i]=dyClamp(weight*pow(c[i]/n,gamma[i]),0,1);
|
||||
return c;
|
||||
}
|
||||
inline DYUInt dyFilmPCG(DYUInt value){DYUInt state=value*747796405u+2891336453u;DYUInt word=((state>>((state>>28u)+4u))^state)*277803737u;return (word>>22u)^word;}
|
||||
inline float3 dyFilmNormal(DYUInt x,DYUInt y,DYUInt seed){
|
||||
DYUInt h=dyFilmPCG(dyFilmPCG(dyFilmPCG(x)^y)^seed);
|
||||
float u1=(float(dyFilmPCG(h^2769414579u)>>8)+.5f)/16777216.f;
|
||||
float u2=(float(dyFilmPCG(h^1675113877u)>>8)+.5f)/16777216.f;
|
||||
float u3=(float(dyFilmPCG(h^2135587861u)>>8)+.5f)/16777216.f;
|
||||
float u4=(float(dyFilmPCG(h^476689394u)>>8)+.5f)/16777216.f;
|
||||
float a=sqrt(-2*log(u1>1e-7f?u1:1e-7f)),b=sqrt(-2*log(u3>1e-7f?u3:1e-7f));
|
||||
return {a*cos(6.28318530718f*u2),a*sin(6.28318530718f*u2),b*cos(6.28318530718f*u4)};
|
||||
}
|
||||
inline float3 dyFilmGrain(float3 c,float3 noise,DYFilmSettings p){
|
||||
float corr=1-2*p.grainColor,other=1-corr,den=sqrt(corr*corr+other*other);
|
||||
float3 n={(corr*noise.y+other*noise.x)/den,noise.y,(corr*noise.y+other*noise.z)/den};
|
||||
float amount=.05f*p.grainAmount*((p.grainSize-1)*.5f+1),offset=p.grainResponse>=0?1-p.grainResponse:1;
|
||||
for(int i=0;i<3;i++){float response=p.grainResponse*c[i]+offset;if(response<0)response=0;c[i]+=n[i]*response*amount;}
|
||||
return c;
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
// All work uses the renderer instance's lock and frozen state. No vendor code
|
||||
// or vendor runtime is loaded by the product.
|
||||
- (BOOL)renderFilmTool:(NSString*)type source:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)u masks:(NSArray*)masks entry:(NSMutableDictionary*)entry error:(NSError**)error {
|
||||
BOOL mixer=[type isEqual:@"mixer"],active=mixer?DYChannelMixerActive(u):DYFilmToolActive(u);
|
||||
if(!active)return [self copyTile:source to:destination entry:entry error:error];
|
||||
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d];
|
||||
if(!before)return fail(error,@"胶片输入纹理不可用");
|
||||
// At most two working, two auxiliary half-float textures and two float32
|
||||
// bloom prefilters. Allocate lazily; reuse between all five stages.
|
||||
uint64_t bytes=uint64_t(before.width)*before.height*(mixer?16:DYFilmBloomActive(u.film)?64:32);
|
||||
uint64_t budget=MIN(uint64_t(2)*1024*1024*1024,MAX(uint64_t(512)*1024*1024,d.recommendedMaxWorkingSetSize/3));
|
||||
if(bytes>budget)return fail(error,@"当前画面超过胶片处理内存预算,请降低工程分辨率后重试。");
|
||||
NSMutableArray *textures=[NSMutableArray array];id<MTLTexture>slots[6]={nil,nil,nil,nil,nil,nil};
|
||||
auto texture=[&](int slot)->id<MTLTexture>{if(!slots[slot]){MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:slot>=4?MTLPixelFormatRGBA32Float:MTLPixelFormatRGBA16Float width:before.width height:before.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[d newTextureWithDescriptor:desc];if(t){[textures addObject:t];slots[slot]=t;[t release];}}return slots[slot];};
|
||||
CIContext *context=entry[@"filmCIContext"];if(!context){context=[CIContext contextWithMTLDevice:d options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null,kCIContextCacheIntermediates:@NO}];if(!context)return fail(error,@"胶片空间处理器不可用");entry[@"filmCIContext"]=context;}
|
||||
CGRect bounds=CGRectMake(0,0,before.width,before.height);id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];
|
||||
auto image=[&](id<MTLTexture>t){return [CIImage imageWithMTLTexture:t options:@{kCIImageColorSpace:NSNull.null}];};
|
||||
auto blur=[&](id<MTLTexture>input,id<MTLTexture>output,float radius,BOOL clamp){
|
||||
CIImage *ci=image(input);if(!ci)return NO;if(clamp)ci=[ci imageByClampingToExtent];
|
||||
ci=[[ci imageByApplyingFilter:@"CIGaussianBlur" withInputParameters:@{kCIInputRadiusKey:@(radius)}]imageByCroppingToRect:bounds];
|
||||
[context render:ci toMTLTexture:output commandBuffer:commands bounds:bounds colorSpace:nil];return YES;
|
||||
};
|
||||
auto encode=[&](NSString *name,id<MTLTexture>a,id<MTLTexture>b,id<MTLTexture>out,const void *data,NSUInteger length){
|
||||
id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[name]];[ce setTexture:a atIndex:0];if(b)[ce setTexture:b atIndex:1];[ce setTexture:out atIndex:b?2:1];if(data)[ce setBytes:data length:length atIndex:0];[ce dispatchThreads:MTLSizeMake(out.width,out.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
};
|
||||
id<MTLTexture>current=before;
|
||||
auto point=[&](int operation,id<MTLTexture>aux){id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return NO;struct {int operation;float radius;unsigned frameKey,reserved;}pass={operation,0,u.filmFrameKey,0};id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[@"dyFilmPoint"]];[ce setTexture:current atIndex:0];[ce setTexture:aux?:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBytes:&u length:sizeof(u) atIndex:0];[ce setBytes:&pass length:sizeof(pass) atIndex:1];[ce dispatchThreads:MTLSizeMake(out.width,out.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];current=out;return YES;};
|
||||
@try{
|
||||
if(mixer){if(!point(0,nil))return fail(error,@"无法分配通道混合缓冲区");}
|
||||
else {
|
||||
if(DYFilmSubActive(u.film)&&!point(1,nil))return fail(error,@"无法分配减色缓冲区");
|
||||
if(DYFilmHaloActive(u.film)){id<MTLTexture>aux=texture(2);if(!aux||!blur(current,aux,u.film.scatter,YES)||!point(2,aux))return fail(error,@"晕光空间处理失败");}
|
||||
if(DYFilmBloomActive(u.film)){
|
||||
id<MTLTexture>a=texture(4),b=texture(5),edges=texture(2),spread=texture(3);if(!a||!b||!edges||!spread)return fail(error,@"无法分配辉光缓冲区");
|
||||
int direction=0;encode(@"dyFilmSparseBlur",current,nil,a,&direction,sizeof(direction));direction=1;encode(@"dyFilmSparseBlur",a,nil,b,&direction,sizeof(direction));
|
||||
encode(@"dyFilmBloomEdges",b,current,edges,&u.film,sizeof(u.film));if(!blur(edges,spread,u.film.diffusion,NO)||!point(3,spread))return fail(error,@"辉光空间处理失败");
|
||||
}
|
||||
if(DYFilmGrainActive(u.film)){
|
||||
id<MTLTexture>noise=texture(2);if(!noise)return fail(error,@"无法分配颗粒缓冲区");
|
||||
id<MTLComputeCommandEncoder>ce=[commands computeCommandEncoder];[ce setComputePipelineState:entry[@"dyFilmNoise"]];[ce setTexture:noise atIndex:0];[ce setBytes:&u.filmFrameKey length:4 atIndex:0];unsigned bottom=source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;[ce setBytes:&bottom length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(noise.width,noise.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
|
||||
if(u.film.grainSize>1){id<MTLTexture>smooth=texture(3);if(!smooth)return fail(error,@"无法分配颗粒扩散缓冲区");
|
||||
// Reference radius=2. Recover the same sigma search without frame state.
|
||||
double sigma=1,step=1;for(int iteration=0;iteration<20000;iteration++){double density=exp(-4/(sigma*sigma))/(sigma*sigma*6.283185307179586);if(.02/5<density){if(step<=.02)break;sigma-=step;step*=.1;}sigma+=step;if(sigma>1000){sigma=1;break;}}
|
||||
MPSImageGaussianBlur *gaussian=[[[MPSImageGaussianBlur alloc]initWithDevice:d sigma:float(sigma*u.film.grainSize/5)]autorelease];gaussian.edgeMode=MPSImageEdgeModeClamp;[gaussian encodeToCommandBuffer:commands sourceTexture:noise destinationTexture:smooth];noise=smooth;
|
||||
}
|
||||
if(!point(4,noise))return fail(error,@"颗粒处理失败");
|
||||
}
|
||||
if(DYFilmVignetteActive(u.film)){
|
||||
id<MTLTexture>aux=texture(2);if(!aux)return fail(error,@"无法分配暗角缓冲区");CIImage *ci=image(current);if(!ci)return fail(error,@"暗角输入不可用");
|
||||
ci=[ci imageByApplyingFilter:@"CIVignetteEffect" withInputParameters:@{kCIInputCenterKey:[CIVector vectorWithX:before.width*.5 Y:before.height*.5],kCIInputIntensityKey:@(u.film.vignetteIntensity),kCIInputRadiusKey:@(u.film.vignetteRadius/100.f*MAX(before.width,before.height)),@"inputFalloff":@(u.film.vignetteFalloff)}];[context render:ci toMTLTexture:aux commandBuffer:commands bounds:bounds colorSpace:nil];if(!point(5,aux))return fail(error,@"暗角处理失败");
|
||||
}
|
||||
if(DYFilmPrintActive(u)){
|
||||
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)u.filmPrint.x] ofType:@"dylut" inDirectory:@"PrintLooks"];
|
||||
if(!path)return fail(error,@"印片外观资源缺失,请重新安装正式版。");id<MTLTexture>cube=[self lut:path entry:entry error:error];if(!cube)return NO;
|
||||
if(cube.width!=65||cube.height!=65||cube.depth!=65)return fail(error,@"印片外观尺寸不正确,请重新安装正式版。");
|
||||
id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return fail(error,@"无法分配印片缓冲区");
|
||||
encode(@"dyFilmPrint",current,cube,out,&u,sizeof(u));current=out;
|
||||
}
|
||||
if(u.film.mix<1){id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return fail(error,@"无法分配胶片混合缓冲区");encode(@"dyFilmMix",before,current,out,&u.film.mix,4);current=out;}
|
||||
}
|
||||
// Finish the effect before the module's existing mask blend. Source and
|
||||
// result retain identical alpha, and an empty mask group means full coverage.
|
||||
if(masks.count){id<MTLTexture>out=texture(current==slots[0]?1:0);if(!out)return fail(error,@"无法分配胶片蒙版缓冲区");DYToolMaskHeader header{};header.section=(int)[DYToolTypes()indexOfObject:type];id<MTLBuffer>buffer=[self maskBuffer:@{type:masks} tile:source device:d header:&header];[self encodeBlend:before after:current output:out masks:buffer header:header entry:entry commands:commands];current=out;}
|
||||
[commands commit];[commands waitUntilCompleted];if(commands.status!=MTLCommandBufferStatusCompleted)return fail(error,commands.error.localizedDescription);
|
||||
DYExportTile *result=[[[DYExportTile alloc]initWithTexture:current registry:d.registryID]autorelease];[result setBounds:source.tilePixelBounds origin:source.imageOrigin];[result setPixelAspect:source.pixelAspect];return [self copyTile:result to:destination entry:entry error:error];
|
||||
}@catch(NSException *exception){return fail(error,[@"胶片处理失败:" stringByAppendingString:exception.reason?:@""]);}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
#pragma once
|
||||
#import <CoreMedia/CoreMedia.h>
|
||||
#include <stdint.h>
|
||||
// Exact signed rational floor. Freeze once in pluginState, never from wall time.
|
||||
inline int64_t DYFilmFrameIndex(CMTime time,CMTime duration,CMTime origin){
|
||||
if(!CMTIME_IS_NUMERIC(time))return 0;
|
||||
if(!CMTIME_IS_NUMERIC(duration)||duration.value<=0)duration=CMTimeMake(1,30);
|
||||
if(CMTIME_IS_NUMERIC(origin)&&origin.epoch==time.epoch)time=CMTimeSubtract(time,origin);
|
||||
__int128 n=(__int128)time.value*duration.timescale,d=(__int128)time.timescale*duration.value;
|
||||
if(d<=0)return 0;__int128 q=n/d;if(n<0&&n%d)q--;
|
||||
if(q>INT64_MAX)return INT64_MAX;if(q<INT64_MIN)return INT64_MIN;return (int64_t)q;
|
||||
}
|
||||
inline uint32_t DYFilmFrameKey(int64_t frame,float hold,float seed){
|
||||
int64_t divisor=(int64_t)llroundf(hold);if(divisor<1)divisor=1;if(divisor>5)divisor=5;
|
||||
int64_t value=frame/divisor;if(frame<0&&frame%divisor)value--;
|
||||
return (uint32_t)value+(uint32_t)llroundf(seed);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
// Host float parameters, appended after the complete 1.4.3 uniform prefix.
|
||||
typedef struct DYFilmSettings {
|
||||
float enabled,mix;
|
||||
float subtractiveEnabled,gammaAll,gammaCyan,gammaMagenta,gammaYellow,density,densityMode,valueMode;
|
||||
float halationEnabled,scatter,dyeTransmission,boost;
|
||||
float bloomEnabled,sensitivity,diffusion,intensity;
|
||||
float grainEnabled,grainAmount,grainSize,grainResponse,grainColor,grainHold,grainSeed;
|
||||
float vignetteEnabled,vignetteIntensity,vignetteRadius,vignetteFalloff;
|
||||
} DYFilmSettings;
|
||||
|
||||
inline bool DYFilmSubActive(DYFilmSettings p){return p.subtractiveEnabled>.5f&&(p.gammaAll!=1||p.gammaCyan!=1||p.gammaMagenta!=1||p.gammaYellow!=1||p.density!=0);}
|
||||
inline bool DYFilmHaloActive(DYFilmSettings p){return p.halationEnabled>.5f&&p.scatter>0&&(p.boost>0||p.dyeTransmission>0);}
|
||||
inline bool DYFilmBloomActive(DYFilmSettings p){return p.bloomEnabled>.5f&&p.intensity>0;}
|
||||
inline bool DYFilmGrainActive(DYFilmSettings p){return p.grainEnabled>.5f&&p.grainAmount>0&&p.grainSize>0;}
|
||||
inline bool DYFilmVignetteActive(DYFilmSettings p){return p.vignetteEnabled>.5f&&p.vignetteIntensity!=0;}
|
||||
inline bool DYFilmSpatialActive(DYFilmSettings p){return DYFilmHaloActive(p)||DYFilmBloomActive(p)||DYFilmGrainActive(p)||DYFilmVignetteActive(p);}
|
||||
inline bool DYFilmActive(DYFilmSettings p){return p.enabled>.5f&&p.mix>0&&(DYFilmSubActive(p)||DYFilmSpatialActive(p));}
|
||||
@@ -323,3 +323,5 @@ kernel void dyToolSkin(texture2d<float,access::read> before [[texture(0)]],textu
|
||||
}
|
||||
|
||||
fragment half4 dyToolCopyFragment(DYRaster in [[stage_in]],texture2d<half> source [[texture(0)]]){constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);return source.sample(f,in.uv);}
|
||||
|
||||
#include "DYFilmKernels.inc.h"
|
||||
+54
-13
@@ -26,6 +26,31 @@ static NSButton *DYButton(NSString *title,id target,SEL action) {
|
||||
b.bezelStyle=NSBezelStyleRounded; b.font=[NSFont systemFontOfSize:11];
|
||||
b.contentTintColor=DYAccent(); return b;
|
||||
}
|
||||
@interface DYWebsiteLink : NSButton @end
|
||||
@implementation DYWebsiteLink
|
||||
- (NSAccessibilityRole)accessibilityRole {return NSAccessibilityLinkRole;}
|
||||
- (void)resetCursorRects {[self addCursorRect:self.bounds cursor:NSCursor.pointingHandCursor];}
|
||||
@end
|
||||
// Header status stays visible while the body is folded and never intercepts clicks.
|
||||
@interface DYMaskCountBadge : NSView
|
||||
@property(nonatomic) NSUInteger count;
|
||||
@end
|
||||
@implementation DYMaskCountBadge
|
||||
- (void)setCount:(NSUInteger)count {_count=count;self.hidden=count==0;[self setNeedsDisplay:YES];}
|
||||
- (NSView*)hitTest:(NSPoint)point {return nil;}
|
||||
- (BOOL)isAccessibilityElement {return YES;}
|
||||
- (NSString*)accessibilityRole {return NSAccessibilityStaticTextRole;}
|
||||
- (id)accessibilityValue {return [NSString stringWithFormat:@"%lu 个蒙版",(unsigned long)_count];}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
if(!_count)return;NSRect frame=NSInsetRect(self.bounds,.6,.6);
|
||||
NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:frame xRadius:6 yRadius:6];
|
||||
[DYThemeColor(@"field") setFill];[pill fill];[DYAccent() setStroke];pill.lineWidth=1.2;[pill stroke];
|
||||
NSString *text=[NSString stringWithFormat:@"%lu",(unsigned long)_count];
|
||||
NSDictionary *attributes=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:10.5 weight:NSFontWeightBold],NSForegroundColorAttributeName:DYInk()};
|
||||
NSSize size=[text sizeWithAttributes:attributes];[text drawAtPoint:NSMakePoint(NSMidX(self.bounds)-size.width/2,NSMidY(self.bounds)-size.height/2) withAttributes:attributes];
|
||||
}
|
||||
@end
|
||||
|
||||
static BOOL DYStrengthUsesUnitRange(NSDictionary *d) {
|
||||
return [d[@"key"] hasSuffix:@"Strength"] && [d[@"max"] doubleValue]<=1;
|
||||
}
|
||||
@@ -184,7 +209,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
for(NSString *key in @[@"temperature",@"tint",@"exposure",@"contrast",@"highlights",@"shadows",@"whites",@"blacks",@"texture",@"clarity",@"dehaze",@"vibrance",@"saturation",@"skinEnabled",@"copyAutoGrade"]){NSDictionary*d=byKey[key];if(d)[rows addObject:d];}
|
||||
base[@"rows"]=rows;base[@"extraEnabled"]=bySection[@"color"][@"enabled"];
|
||||
base[@"title"]=@"基础调整";
|
||||
return @[primary,bySection[@"spider"],base,bySection[@"skin"],bySection[@"look"],bySection[@"hsl"],bySection[@"curve"],bySection[@"grading"],bySection[@"primaries"],bySection[@"levels"],bySection[@"blackwhite"],bySection[@"balance"]];
|
||||
return @[primary,bySection[@"spider"],base,bySection[@"skin"],bySection[@"look"],bySection[@"hsl"],bySection[@"curve"],bySection[@"grading"],bySection[@"primaries"],bySection[@"levels"],bySection[@"blackwhite"],bySection[@"balance"],bySection[@"mixer"],bySection[@"film"]];
|
||||
}
|
||||
|
||||
|
||||
@@ -391,7 +416,7 @@ static NSImage *DYWheelImage(void) {
|
||||
DYFlippedView *_document;
|
||||
NSTextField *_brand;
|
||||
NSTextField *_subtitle;
|
||||
NSButton *_resetAll, *_save, *_load, *_export;
|
||||
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink;
|
||||
NSArray *_sections;
|
||||
NSMutableArray *_cards;
|
||||
NSMutableDictionary *_controls;
|
||||
@@ -436,11 +461,14 @@ static NSImage *DYWheelImage(void) {
|
||||
self.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
_brand=[DYLabel(@"◒ 大鱼调色",16) retain]; _brand.font=[NSFont boldSystemFontOfSize:16];_brand.textColor=DYInk();
|
||||
_subtitle=[DYLabel([[NSBundle bundleForClass:self.class]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"1.1.5",9) retain]; _subtitle.textColor=DYThemeColor(@"secondary");
|
||||
_websiteLink=[[DYWebsiteLink alloc]initWithFrame:NSZeroRect];_websiteLink.title=@"更多插件访问 https://dayu.media";
|
||||
_websiteLink.font=[NSFont systemFontOfSize:11];_websiteLink.bordered=NO;_websiteLink.alignment=NSTextAlignmentLeft;
|
||||
_websiteLink.target=self;_websiteLink.action=@selector(openWebsite:);_websiteLink.toolTip=@"https://dayu.media";_websiteLink.accessibilityLabel=_websiteLink.title;
|
||||
_resetAll=[DYButton(@"↺",self,@selector(resetAll:)) retain];_resetAll.bordered=NO; _resetAll.toolTip=@"恢复全部调色参数与 LUT";_resetAll.accessibilityLabel=@"全部还原";
|
||||
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
|
||||
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
|
||||
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
|
||||
for(NSView *v in @[_brand,_subtitle,_resetAll,_save,_load,_export]){[self addSubview:v];v.hidden=_embedded;}
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export]){[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;
|
||||
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded;[themes addObject:b];
|
||||
@@ -471,7 +499,7 @@ static NSImage *DYWheelImage(void) {
|
||||
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
|
||||
[_brand release]; [_subtitle release]; [_resetAll release]; [_save release]; [_load release]; [_export release];
|
||||
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export 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];
|
||||
@@ -496,10 +524,12 @@ static NSImage *DYWheelImage(void) {
|
||||
else dispatch_async(dispatch_get_main_queue(),^{ [self refresh]; });
|
||||
}
|
||||
- (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);}
|
||||
- (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 {
|
||||
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];
|
||||
for(NSDictionary *r in _controls.allValues)[r[@"field"] setBackgroundColor:DYThemeColor(@"field")];
|
||||
[_browser updatePalette:DYThemePalette()];[self redrawTree:self];
|
||||
}
|
||||
@@ -559,6 +589,9 @@ static NSImage *DYWheelImage(void) {
|
||||
if([key isEqual:@"levels"]||[key isEqual:@"balance"]) {
|
||||
NSSegmentedControl *tabs=[NSSegmentedControl segmentedControlWithLabels:[key isEqual:@"levels"]?@[@"RGB",@"红",@"绿",@"蓝"]:@[@"阴影",@"中间调",@"高光"] 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:@"mixer"]||[key isEqual:@"film"]){
|
||||
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];
|
||||
}
|
||||
@@ -624,6 +657,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key];
|
||||
DYToolMaskPanel *maskPanel=[[[DYToolMaskPanel alloc]initWithManager:host nodeID:nodeID]autorelease];[card addSubview:maskPanel];[body insertObject:maskPanel atIndex:0];record[@"maskPanel"]=maskPanel;
|
||||
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
|
||||
DYMaskCountBadge *maskBadge=[[[DYMaskCountBadge alloc]initWithFrame:NSZeroRect]autorelease];maskBadge.hidden=YES;maskBadge.accessibilityLabel=[section[@"title"] stringByAppendingString:@"蒙版数量"];[card addSubview:maskBadge];record[@"maskBadge"]=maskBadge;
|
||||
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
|
||||
if(_embedded){NSButton *remove=DYButton(@"删除此层",self,@selector(removeTool:));remove.identifier=@"removeTool";[card addSubview:remove];[body addObject:remove];}
|
||||
[_cards addObject:record];
|
||||
@@ -656,6 +690,7 @@ static NSImage *DYWheelImage(void) {
|
||||
if([section isEqual:@"grading"]){int wheel=0,axis=0;if(sscanf(key.UTF8String,"grade%d_%d",&wheel,&axis)==2)return axis==2;}
|
||||
if([section isEqual:@"levels"]){int channel=0,axis=0;if(sscanf(key.UTF8String,"level%d_%d",&channel,&axis)==2)return channel==tab;}
|
||||
if([section isEqual:@"balance"]){int channel=0,axis=0;if(sscanf(key.UTF8String,"balance%d_%d",&channel,&axis)==2)return channel==tab;}
|
||||
if([section isEqual:@"mixer"]||[section isEqual:@"film"]){for(NSDictionary *d in DYToolSection(section)[@"rows"])if([d[@"key"]isEqual:key]){NSNumber *group=d[[section isEqual:@"mixer"]?@"mixerTab":@"filmTab"];return !group||group.intValue<0||group.intValue==tab;}}
|
||||
if([section isEqual:@"look"]){int slot=0;if(sscanf(key.UTF8String,"asset:look%d",&slot)==1)return slot<_visibleLooks;if([key isEqual:@"postLUTStrength"])return YES;int number=0;if(sscanf(key.UTF8String,"look%dStrength",&number)==1)return number-1<_visibleLooks;return NO;}
|
||||
return YES;
|
||||
}
|
||||
@@ -666,25 +701,26 @@ static NSImage *DYWheelImage(void) {
|
||||
_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)];
|
||||
_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,50,bw,27); _load.frame=NSMakeRect(16+bw+gap,50,bw,27); _export.frame=NSMakeRect(16+(bw+gap)*2,50,bw,27);
|
||||
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,88,w,MAX(80,h-88));
|
||||
_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);
|
||||
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,112,w,MAX(80,h-112));
|
||||
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
|
||||
for(NSMutableDictionary *c in _cards) {
|
||||
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
|
||||
NSArray *body=c[@"body"];CGFloat contentHeight=0;
|
||||
for(NSView *row in body)if([self showRow:row section:key]&&(!collapsed||[row isKindOfClass:DYToolMaskPanel.class]))contentHeight+=[self heightForRow:row];
|
||||
for(NSView *row in body)if([self showRow:row section:key]&&!collapsed)contentHeight+=[self heightForRow:row];
|
||||
[c[@"enabled"]setFrame:NSMakeRect(12,12,20,20)];
|
||||
CGFloat titleWidth=MIN(cw-143,MAX(94,[[(NSButton *)c[@"header"]title]sizeWithAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:12]}].width+36));
|
||||
[c[@"header"]setFrame:NSMakeRect(42,8,titleWidth,28)];
|
||||
CGFloat headerHeight=43;
|
||||
card.frame=NSMakeRect(16,y,cw,headerHeight+(contentHeight>0?contentHeight+8:0));y+=card.frame.size.height+12;
|
||||
[c[@"reset"]setFrame:NSMakeRect(cw-34,10,24,24)];
|
||||
[c[@"repeatButton"]setFrame:NSMakeRect(cw-62,10,24,24)];[c[@"maskButton"]setFrame:NSMakeRect(cw-90,10,24,24)];
|
||||
[c[@"repeatButton"]setFrame:NSMakeRect(cw-62,10,24,24)];[c[@"maskButton"]setFrame:NSMakeRect(cw-90,10,24,24)];[c[@"maskBadge"]setFrame:NSMakeRect(cw-83,3,18,16)];
|
||||
[c[@"add"]setFrame:NSMakeRect(cw-33,headerHeight+contentHeight-28,20,24)];[c[@"add"]setEnabled:_visibleLooks<5];[c[@"add"]setHidden:collapsed];
|
||||
CGFloat rowY=headerHeight;
|
||||
for(NSView *row in body) {
|
||||
BOOL show=(!collapsed||[row isKindOfClass:DYToolMaskPanel.class])&&[self showRow:row section:key];row.hidden=!show;if(!show)continue;
|
||||
BOOL show=!collapsed&&[self showRow:row section:key];row.hidden=!show;if(!show)continue;
|
||||
CGFloat rh=[self heightForRow:row];row.frame=NSMakeRect(12,rowY,cw-24,rh-1);rowY+=rh;
|
||||
if([row.identifier isEqual:@"removeTool"]){/* NSButton fills its row. */}
|
||||
if([row.identifier isEqual:@"primaryBalance"])for(NSView *v in row.subviews)v.frame=row.bounds;
|
||||
@@ -753,7 +789,12 @@ static NSImage *DYWheelImage(void) {
|
||||
[c[@"enabled"]setToolTip:enabled?@"停用本组,保留参数和展开状态":@"启用本组,保留展开状态"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];
|
||||
for(NSView *row in c[@"body"])row.alphaValue=enabled?1:.45;
|
||||
}
|
||||
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards)[card[@"maskPanel"]refreshWithDocument:tools time:t];
|
||||
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards){
|
||||
[card[@"maskPanel"]refreshWithDocument:tools time:t];
|
||||
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:card[@"section"][@"key"]];NSUInteger count=[DYMasksForTool(tools,nodeID) count];
|
||||
[(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);[_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];
|
||||
@@ -1039,7 +1080,7 @@ static NSImage *DYWheelImage(void) {
|
||||
DYUniforms effective;DYReadUniforms(_manager,t,&effective);values[@"cmConfigured"]=@(effective.cm.configured);values[@"blackWhiteMix"]=@(effective.cm.blackWhiteMix);
|
||||
DYAssetState *state=DYReadAssets(_manager,t);paths=[[state.paths copy]autorelease]?:@{};spider=DYSpiderJSON(state.spiderMesh,state.spiderLinked);NSData *toolData=[NSPropertyListSerialization dataWithPropertyList:DYReadTools(_manager,t).document format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil];tools=[toolData base64EncodedStringWithOptions:0];
|
||||
} @finally {[action endAction:self];}
|
||||
return @{@"format":@"com.dayu.color.preset",@"version":@4,@"values":values,@"paths":paths,@"spider":spider,@"tools":tools?:@""};
|
||||
return @{@"format":@"com.dayu.color.preset",@"version":@6,@"values":values,@"paths":paths,@"spider":spider,@"tools":tools?:@""};
|
||||
}
|
||||
- (void)savePreset:(id)sender {
|
||||
NSDictionary *snapshot=[self presetSnapshot];if(!snapshot)return;
|
||||
@@ -1054,7 +1095,7 @@ static NSImage *DYWheelImage(void) {
|
||||
NSError *error=nil;NSData *data=[NSData dataWithContentsOfURL:panel.URL options:0 error:&error];
|
||||
if(!data||data.length>32*1024*1024){[self showError:error.localizedDescription?:@"预设文件过大"];return;}
|
||||
id json=[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
|
||||
if(![json isKindOfClass:NSDictionary.class]||![json[@"format"] isEqual:@"com.dayu.color.preset"]||![@[@1,@2,@3,@4]containsObject:json[@"version"]]||![json[@"values"] isKindOfClass:NSDictionary.class]||![json[@"paths"] isKindOfClass:NSDictionary.class]){[self showError:@"这不是有效的大鱼调色预设。"];return;}
|
||||
if(![json isKindOfClass:NSDictionary.class]||![json[@"format"] isEqual:@"com.dayu.color.preset"]||![@[@1,@2,@3,@4,@5,@6]containsObject:json[@"version"]]||![json[@"values"] isKindOfClass:NSDictionary.class]||![json[@"paths"] isKindOfClass:NSDictionary.class]){[self showError:@"这不是有效的大鱼调色预设。"];return;}
|
||||
NSDictionary *values=json[@"values"],*paths=json[@"paths"];NSData *mesh=[json[@"version"]integerValue]>=3?DYSpiderFromJSON(json[@"spider"]):nil;if([json[@"version"]integerValue]>=3&&!mesh){[self showError:@"预设包含无效蜘蛛盘,当前调色未修改。"];return;}
|
||||
NSDictionary *tools=[[[DYToolDocument alloc]init]autorelease].document;if([json[@"version"]integerValue]>=4){id encoded=json[@"tools"];NSData *binary=[encoded isKindOfClass:NSString.class]?[[[NSData alloc]initWithBase64EncodedString:encoded options:0]autorelease]:nil;tools=binary?[NSPropertyListSerialization propertyListWithData:binary options:NSPropertyListImmutable format:NULL error:nil]:nil;if(!DYValidToolDocument(tools)){[self showError:@"预设包含无效工具或蒙版,当前调色未修改。"];return;}}
|
||||
for(NSDictionary *d in DYDescriptors()) {
|
||||
@@ -1073,7 +1114,7 @@ static NSImage *DYWheelImage(void) {
|
||||
[action startAction:self];
|
||||
@try {
|
||||
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
for(NSDictionary *d in DYDescriptors())if(values[d[@"key"]])[set setFloatValue:[values[d[@"key"]] doubleValue] toParameter:[d[@"pid"] unsignedIntValue] atTime:t];
|
||||
for(NSDictionary *d in DYDescriptors()){id value=values[d[@"key"]];if(!value&&[d[@"offset"]integerValue]>=1104)value=d[@"default"];if(value)[set setFloatValue:[value doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];}
|
||||
if([json[@"version"]isEqual:@1]&&!values[@"cmConfigured"]){[set setFloatValue:-1 toParameter:2236 atTime:t];[set setFloatValue:1 toParameter:2270 atTime:t];}
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,tools,t);
|
||||
} @finally {[action endAction:self];}
|
||||
|
||||
+37
-2
@@ -110,7 +110,10 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
CM(white,@"白点",.5,1.5,1,1);CM(shoulder,@"肩部压缩",0,1,.5,1);CM(highlights,@"一级高光",-1,1,0,1);CM(midtones,@"一级中间调",-1,1,0,1);CM(shadows,@"一级阴影",-1,1,0,1);CM(black,@"黑点",-1,1,0,1);CM(toe,@"趾部压缩",0,1,.5,1);CM(chromaMix,@"色度混合",0,1,.5,1);
|
||||
CM(bypassExposure,@"旁路一级曝光",0,1,0,1);CM(bypassBalance,@"旁路一级色彩",0,1,0,1);CM(bypassContrast,@"旁路一级对比",0,1,0,1);CM(bypassTone,@"旁路一级影调",0,1,0,1);
|
||||
CM(outputEnabled,@"输出转换启用",0,1,1,2);CH(outputTransfer,@"输出曲线",1002,2,transfers);CH(outputGamut,@"输出色域",22,2,DYCMGamuts());
|
||||
[cm addObject:cmRow(@"cmtoneMapping",@"自动色调映射",offsetof(DYCMSettings,toneMapping),0,1,0,2,@[@{@"id":@0,@"name":@"关闭"},@{@"id":@1,@"name":@"开启"}])];
|
||||
NSMutableDictionary *mapping=[[cmRow(@"cmtoneMapping",@"自动色调映射",offsetof(DYCMSettings,toneMapping),0,1,1,2,@[@{@"id":@0,@"name":@"关闭"},@{@"id":@1,@"name":@"开启"}]) mutableCopy]autorelease];
|
||||
// Keep the host's historical stored default. FCP omits unchanged values in
|
||||
// old projects; the current template explicitly seeds the new enabled value.
|
||||
mapping[@"hostDefault"]=@0;[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:mapping];[cm addObject:mapping];
|
||||
#undef CM
|
||||
#undef CH
|
||||
NSMutableArray *input=[NSMutableArray array],*primary=[NSMutableArray array],*output=[NSMutableArray array];
|
||||
@@ -155,6 +158,38 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSMutableArray*levels=[NSMutableArray array];for(int c=0;c<4;c++)for(int a=0;a<5;a++)[levels addObject:scalar([NSString stringWithFormat:@"level%d_%d",c,a],[NSString stringWithFormat:@"%@ %@",@[@"RGB",@"红",@"绿",@"蓝"][c],@[@"输入黑",@"伽马",@"输入白",@"输出黑",@"输出白"][a]],624+a*16+c*4,a==1?.1:0,a==1?10:255,a==1?1:(a==2||a==4)?255:0)];section(@"levels",@"色阶",608,levels);
|
||||
NSMutableArray*bw=[NSMutableArray array];for(int c=0;c<6;c++)[bw addObject:scalar([NSString stringWithFormat:@"bw%d",c],[NSString stringWithFormat:@"黑白 %@",@[@"红",@"黄",@"绿",@"青",@"蓝",@"洋红"][c]],c<4?720+c*4:736+(c-4)*4,0,200,((double[]){40,60,40,60,20,80})[c])];[bw addObject:scalar(@"bwHue",@"着色色相",744,0,360)];[bw addObject:scalar(@"bwSat",@"着色饱和度",748,0,100)];[bw insertObject:scalar(@"blackWhiteMix",@"黑白混合",offsetof(DYUniforms,cm)+offsetof(DYCMSettings,blackWhiteMix),0,1,0) atIndex:0];section(@"blackwhite",@"黑白混色",704,bw,1);
|
||||
NSMutableArray*balance=[NSMutableArray arrayWithObject:row(@"preserveLuma",@"保持明度",756,0,1,1,@"bool")];for(int c=0;c<3;c++)for(int a=0;a<3;a++)[balance addObject:scalar([NSString stringWithFormat:@"balance%d_%d",c,a],[NSString stringWithFormat:@"%@ %@",@[@"阴影",@"中间调",@"高光"][c],@[@"青 ↔ 红",@"洋红 ↔ 绿",@"黄 ↔ 蓝"][a]],768+c*16+a*4)];section(@"balance",@"色彩平衡",752,balance);
|
||||
NSMutableArray *mixer=[NSMutableArray array];
|
||||
for(int output=0;output<3;output++)for(int input=0;input<3;input++){
|
||||
NSMutableDictionary *d=[[scalar([NSString stringWithFormat:@"mixer%d%d",output,input],[NSString stringWithFormat:@"%@输出 ← %@输入",@[@"红",@"绿",@"蓝"][output],@[@"红",@"绿",@"蓝"][input]],offsetof(DYUniforms,mixerRed)+output*16+input*4,-2,2,output==input?1:0)mutableCopy]autorelease];
|
||||
d[@"mixerTab"]=@(output);[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:d];[mixer addObject:d];
|
||||
}
|
||||
[mixer addObject:row(@"mixerPreserveLuma",@"保持亮度",offsetof(DYUniforms,mixerPreserveLuma),0,1,0,@"bool")];
|
||||
[mixer addObject:row(@"mixerPreserveSaturation",@"保持饱和度",offsetof(DYUniforms,mixerPreserveSaturation),0,1,0,@"bool")];
|
||||
[mixer addObject:scalar(@"mixerMix",@"通道混合强度",offsetof(DYUniforms,mixerMix),0,1,1)];
|
||||
section(@"mixer",@"通道混合器",offsetof(DYUniforms,mixerSectionEnabled),mixer);
|
||||
NSMutableArray *film=[NSMutableArray array];
|
||||
auto filmRow=[&](NSString *key,NSString *title,NSUInteger offset,double lo,double hi,double value,int tab,NSString *kind=@"float"){
|
||||
NSMutableDictionary *d=[[row(key,title,offsetof(DYUniforms,film)+offset,lo,hi,value,kind)mutableCopy]autorelease];d[@"filmTab"]=@(tab);[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:d];[film addObject:d];return d;
|
||||
};
|
||||
#define FR(f,key,title,lo,hi,value,tab) filmRow(key,title,offsetof(DYFilmSettings,f),lo,hi,value,tab)
|
||||
#define FE(f,key,title,tab) filmRow(key,title,offsetof(DYFilmSettings,f),0,1,0,tab,@"bool")
|
||||
FR(mix,@"filmMix",@"胶片混合强度",0,1,1,-1);
|
||||
FE(subtractiveEnabled,@"filmSubtractive",@"启用减色",0);
|
||||
FR(gammaAll,@"filmGammaAll",@"整体减色",.25,4,1,0);FR(gammaCyan,@"filmGammaCyan",@"青色减色",.25,4,1,0);FR(gammaMagenta,@"filmGammaMagenta",@"洋红减色",.25,4,1,0);FR(gammaYellow,@"filmGammaYellow",@"黄色减色",.25,4,1,0);FR(density,@"filmDensity",@"密度",-1,1,0,0);
|
||||
NSMutableDictionary *density=FR(densityMode,@"filmDensityMode",@"密度模式",1,2,2,0);density[@"kind"]=@"popup";density[@"values"]=@[@2,@1];density[@"options"]=@[@"模式 1 · 最大值",@"模式 2 · 平均值"];
|
||||
row(@"filmValueMode",@"胶片亮度模型",offsetof(DYUniforms,film)+offsetof(DYFilmSettings,valueMode),1,6,6,@"float");
|
||||
FE(halationEnabled,@"filmHalation",@"启用晕光",1);FR(scatter,@"filmScatter",@"散射半径",0,100,5,1);FR(dyeTransmission,@"filmTransmission",@"染料透射",0,100,0,1);FR(boost,@"filmBoost",@"晕光增强",0,5,1,1);
|
||||
FE(bloomEnabled,@"filmBloom",@"启用辉光",2);FR(sensitivity,@"filmSensitivity",@"辉光灵敏度",0,100,50,2);FR(diffusion,@"filmDiffusion",@"辉光扩散",0,100,30,2);FR(intensity,@"filmIntensity",@"辉光强度",0,100,50,2);
|
||||
FE(grainEnabled,@"filmGrain",@"启用颗粒",3);FR(grainAmount,@"filmGrainAmount",@"颗粒数量",0,1,0,3);FR(grainSize,@"filmGrainSize",@"颗粒大小",1,20,1,3);FR(grainResponse,@"filmGrainResponse",@"胶片响应",-1,1,0,3);FR(grainColor,@"filmGrainColor",@"颜色变化",0,1,0,3);
|
||||
NSMutableDictionary *hold=FR(grainHold,@"filmGrainHold",@"颗粒帧保持",1,5,1,3);hold[@"kind"]=@"popup";hold[@"options"]=@[@"每帧更新",@"保持 2 帧",@"保持 3 帧",@"保持 4 帧",@"保持 5 帧"];hold[@"values"]=@[@1,@2,@3,@4,@5];FR(grainSeed,@"filmGrainSeed",@"颗粒种子",0,65535,0,3);
|
||||
FE(vignetteEnabled,@"filmVignette",@"启用暗角",4);FR(vignetteIntensity,@"filmVignetteIntensity",@"暗角强度",-2,2,1,4);FR(vignetteRadius,@"filmVignetteRadius",@"暗角半径",0,100,50,4);FR(vignetteFalloff,@"filmVignetteFalloff",@"暗角过渡",0,1,.5,4);
|
||||
NSMutableDictionary *printLook=[[row(@"filmPrintLook",@"印片外观",offsetof(DYUniforms,filmPrint),0,8,0,@"popup")mutableCopy]autorelease];
|
||||
printLook[@"filmTab"]=@5;printLook[@"notAnimatable"]=@YES;printLook[@"values"]=@[@0,@1,@2,@3,@4,@5,@6,@7,@8];printLook[@"options"]=@[@"无",@"Kodak 2383",@"Kodak 2393",@"Kodak 2302 BW",@"Fuji 3510",@"Fuji 3513",@"Fuji 3519",@"Fuji 3521",@"Agfa CP30"];
|
||||
[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:printLook];[film addObject:printLook];
|
||||
NSMutableDictionary *printStrength=[[row(@"filmPrintStrength",@"印片强度",offsetof(DYUniforms,filmPrint)+sizeof(float),0,1,1,@"float")mutableCopy]autorelease];printStrength[@"filmTab"]=@5;[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:printStrength];[film addObject:printStrength];
|
||||
section(@"film",@"胶片模拟",offsetof(DYUniforms,film)+offsetof(DYFilmSettings,enabled),film);
|
||||
#undef FR
|
||||
#undef FE
|
||||
});}
|
||||
NSArray<NSDictionary*> *DYSections(void){initialize();return sections;} NSArray<NSDictionary*> *DYDescriptors(void){initialize();return descriptors;}
|
||||
void DYDefaultUniforms(DYUniforms*u){memset(u,0,sizeof(*u));for(NSDictionary*r in DYDescriptors())if([r[@"offset"]integerValue]>=0)*(float*)((uint8_t*)u+[r[@"offset"]unsignedIntegerValue])=[r[@"default"]floatValue];u->primariesM0=(DYFloat3){1,0,0};u->primariesM1=(DYFloat3){0,1,0};u->primariesM2=(DYFloat3){0,0,1};}
|
||||
@@ -163,7 +198,7 @@ void DYReadUniforms(id<PROAPIAccessing>m,CMTime t,DYUniforms*u){DYDefaultUniform
|
||||
}
|
||||
BOOL DYCreateParameters(id<PROAPIAccessing>m,NSError**error){id<FxParameterCreationAPI_v5>a=[m apiForProtocol:@protocol(FxParameterCreationAPI_v5)];BOOL ok=a!=nil;
|
||||
ok=[a addCustomParameterWithName:@"大鱼调色" parameterID:DYInspectorParameterID defaultValue:[[[DYInspectorToken alloc]init]autorelease] parameterFlags:kFxParameterFlag_CUSTOM_UI|kFxParameterFlag_USE_FULL_VIEW_WIDTH|kFxParameterFlag_DONT_DISPLAY_IN_DASHBOARD|kFxParameterFlag_NOT_ANIMATABLE]&&ok;
|
||||
for(NSDictionary*r in DYDescriptors())ok=[a addFloatSliderWithName:r[@"title"] parameterID:[r[@"pid"]unsignedIntValue] defaultValue:[r[@"default"]doubleValue] parameterMin:[r[@"min"]doubleValue] parameterMax:[r[@"max"]doubleValue] sliderMin:[r[@"min"]doubleValue] sliderMax:[r[@"max"]doubleValue] delta:[r[@"step"]doubleValue] parameterFlags:kFxParameterFlag_HIDDEN|([r[@"notAnimatable"]boolValue]?kFxParameterFlag_NOT_ANIMATABLE:0)]&&ok;
|
||||
for(NSDictionary*r in DYDescriptors())ok=[a addFloatSliderWithName:r[@"title"] parameterID:[r[@"pid"]unsignedIntValue] defaultValue:[r[@"hostDefault"]?:r[@"default"] doubleValue] parameterMin:[r[@"min"]doubleValue] parameterMax:[r[@"max"]doubleValue] sliderMin:[r[@"min"]doubleValue] sliderMax:[r[@"max"]doubleValue] delta:[r[@"step"]doubleValue] parameterFlags:kFxParameterFlag_HIDDEN|([r[@"notAnimatable"]boolValue]?kFxParameterFlag_NOT_ANIMATABLE:0)]&&ok;
|
||||
ok=[a addCustomParameterWithName:@"LUT 文件" parameterID:DYAssetsParameterID defaultValue:[[[DYAssetState alloc]init]autorelease] parameterFlags:kFxParameterFlag_HIDDEN|kFxParameterFlag_NOT_ANIMATABLE]&&ok;
|
||||
ok=[a addCustomParameterWithName:@"工具与蒙版" parameterID:DYToolsParameterID defaultValue:[[[DYToolDocument alloc]init]autorelease] parameterFlags:kFxParameterFlag_HIDDEN|kFxParameterFlag_NOT_ANIMATABLE]&&ok;
|
||||
ok=[a addStringParameterWithName:@"蒙版画布会话" parameterID:DYCanvasSessionParameterID defaultValue:@"" parameterFlags:kFxParameterFlag_HIDDEN|kFxParameterFlag_NOT_ANIMATABLE|kFxParameterFlag_DONT_SAVE]&&ok;
|
||||
|
||||
+3
-2
@@ -5,6 +5,7 @@
|
||||
#import "DYColorTables.h"
|
||||
#import "DYAutoGrade.h"
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <os/log.h>
|
||||
#include "MaskCore/DYTracker.hpp"
|
||||
@@ -19,13 +20,13 @@
|
||||
#include "DYToolHostMethods.inc.h"
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{if((self=[super init])){_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}return self;}
|
||||
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[super dealloc];}
|
||||
- (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@NO,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;}
|
||||
- (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;}
|
||||
- (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);}
|
||||
- (NSSet<Class>*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];}
|
||||
- (NSView*)createViewForParameterID:(UInt32)pid{[self scheduleToolCanvasRegistration];return pid==DYInspectorParameterID?[[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]:[[NSView alloc]initWithFrame:NSZeroRect];}
|
||||
- (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self.apiManager];});return YES;}
|
||||
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSDictionary*s=@{@"schema":@2,@"tools":DYToolRenderSnapshot(tools.document,t),@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSDictionary*s=@{@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
|
||||
}
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
#import "DYModel.h"
|
||||
#include "DYSpiderState.h"
|
||||
#include "DYToolGPU.h"
|
||||
#include "DYFilmMath.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#import "DYColorTables.h"
|
||||
#import "DYLUTLibrary.h"
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
@@ -65,6 +68,7 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
}
|
||||
@end
|
||||
@implementation DYRenderer
|
||||
#include "DYFilmRender.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];[_previewLock release];[super dealloc];}
|
||||
@@ -99,7 +103,7 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
NSURL*url=[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"];
|
||||
id<MTLLibrary>lib=[d newLibraryWithURL:url error:err];if(!lib){[d release];return nil;}
|
||||
id<MTLCommandQueue>q=[d newCommandQueue];entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"library":lib,@"queue":q,@"pipelines":[NSMutableDictionary dictionary]}];
|
||||
for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
|
||||
for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
|
||||
float identity[32];for(int z=0;z<2;z++)for(int y=0;y<2;y++)for(int x=0;x<2;x++){int i=((z*2+y)*2+x)*4;identity[i]=x;identity[i+1]=y;identity[i+2]=z;identity[i+3]=1;}id<MTLTexture>neutral=texture3D(d,identity,2);if(!neutral){fail(err,@"无法分配中性 LUT");return nil;}entry[@"identity"]=neutral;
|
||||
// Preparing before the first frame may use registry 0. Reuse those pipelines
|
||||
// when the host subsequently supplies that device's actual registry ID.
|
||||
@@ -129,7 +133,7 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
id<MTLTexture>h=[_tables hslForDevice:d uniforms:u],w=[_tables whiteBalanceForDevice:d uniforms:u],g=[_tables gradingForDevice:d uniforms:u];if(!h||!w||!g){fail(err,_tables.lastError?:@"颜色查表构建失败");return nil;}[ts addObjectsFromArray:@[h,w,g]];return ts;
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self renderSource:src destination:dst uniforms:u paths:paths spider:nil error:err];}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:@{} error:err];}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider error:(NSError**)err{return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:nil error:err];}
|
||||
- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:masks stageFirst:-1 stageLast:-1 skinReference:nil originalReference:nil captureOriginal:nullptr suppressBlackWhite:NO error:err];}
|
||||
- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks stageFirst:(NSInteger)stageFirst stageLast:(NSInteger)stageLast skinReference:(FxImageTile*)skinReference originalReference:(FxImageTile*)originalReference captureOriginal:(DYExportTile**)captureOriginal suppressBlackWhite:(BOOL)suppressBlackWhite error:(NSError**)err{@synchronized(self){@autoreleasepool{
|
||||
BOOL segmented=stageFirst>=0;if(segmented&&(stageFirst>stageLast||stageLast>11))return fail(err,@"原生工具分段范围无效");
|
||||
@@ -190,6 +194,7 @@ static void bypassIdleSkin(DYUniforms *u){
|
||||
}}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self exportLUT:url uniforms:u paths:paths spider:nil error:err];}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)err{@synchronized(self){
|
||||
if(DYFilmToolActive(u)&&DYFilmSpatialActive(u.film))return fail(err,@"胶片空间和颗粒处理不能保存到静态 Cube,请保存完整预设。");
|
||||
NSMutableDictionary *e=[self device:0 error:err];if(!e)return NO;id<MTLDevice>d=e[@"device"];const NSUInteger n=33,count=n*n*n,width=n*n,height=n;
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:width height:height mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
|
||||
id<MTLTexture>input=[d newTextureWithDescriptor:desc],output=[d newTextureWithDescriptor:desc];if(!input||!output){[input release];[output release];return fail(err,@"无法分配 LUT 色格");}
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
auto renderTools=[&](NSDictionary *tools,DYUniforms u,NSData *mesh,NSString *name){NSError *failure=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:tools error:&failure];run.need(name,ok,@{@"error":reason(failure)});return read(destination,gpu);};
|
||||
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
|
||||
Pixels baseline=renderTools(empty.document,defaults,nil,@"empty-tool-document-render");run.record(@"empty-tool-document-preserves-legacy-pixels-exactly",difference(baseline,neutral).maximum==0);
|
||||
doc=DYMutablePlist(empty.document);for(NSString *type in DYToolTypes())[doc[@"layers"]addObject:DYNewTool(type)];Pixels initialized=renderTools(doc,defaults,nil,@"all-twelve-initialized-tool-types-render");run.record(@"initialized-repeated-tools-are-exactly-neutral",difference(initialized,neutral).maximum==0);
|
||||
DYUniforms newPrimary=DYToolUniforms(DYNewTool(@"primary")),oldPrimary=DYToolUniforms(@{@"type":@"primary",@"values":@{}});
|
||||
run.record(@"new-primary-layer-auto-mapping-on-old-omitted-default-stays-off",newPrimary.cm.toneMapping==1&&oldPrimary.cm.toneMapping==0&&!DYToolIsNeutral(DYNewTool(@"primary"))&&DYToolIsNeutral(@{@"type":@"primary",@"values":@{}}));
|
||||
doc=DYMutablePlist(empty.document);for(NSString *type in DYToolTypes()){NSMutableDictionary *n=DYMutablePlist(DYNewTool(type));if([type isEqual:@"primary"])n[@"values"][@"cmtoneMapping"]=@0;[doc[@"layers"]addObject:n];}Pixels initialized=renderTools(doc,defaults,nil,@"all-initialized-tool-types-with-legacy-primary-mapping-render");run.record(@"legacy-neutral-repeated-tools-preserve-pixels",difference(initialized,neutral).maximum==0);
|
||||
// Reference is two explicit isolated native operations, which catches shared
|
||||
// uniform or lookup caches, ordering, repeated CST and accidental base replay.
|
||||
DYUniforms layerOne=DYToolUniforms(first),layerTwo=DYToolUniforms(second);render(run,renderer,source,destination,gpu,layerOne,@{},@"hsl-stack-first-reference");DYDiagnosticTile *intermediate=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease];Pixels single=read(destination,gpu);[[intermediate metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:single.data() bytesPerRow:width*8];Pixels expected=render(run,renderer,intermediate,destination,gpu,layerTwo,@{},@"hsl-stack-second-reference");
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
BOOL found=NO;float low=1,high=1;for(NSDictionary *mask in node[@"masks"]){if(![mask[@"enabled"]boolValue])continue;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);float a=0,b=p.strength==0?0:1;NSInteger combine=[mask[@"combine"]integerValue];if(!found){low=combine==1?1-b:a;high=combine==1?1-a:b;found=YES;}else if(combine==1){low*=1-b;high*=1-a;}else if(combine==2){low*=a;high*=b;}else{low=1-(1-low)*(1-a);high=1-(1-high)*(1-b);}}
|
||||
if(found&&high==0)return [self copyTile:source to:destination entry:entry error:error];
|
||||
DYUniforms layer=DYToolUniforms(node);NSString *type=node[@"type"];
|
||||
if([type isEqual:@"mixer"]||[type isEqual:@"film"]){layer.filmFrameKey=[node[@"filmFrameKey"]unsignedIntValue];return [self renderFilmTool:type source:source destination:destination uniforms:layer masks:node[@"masks"] entry:entry error:error];}
|
||||
if(![type isEqual:@"skin"])return [self renderLegacy:source destination:destination uniforms:layer paths:node[@"paths"] spider:node[@"spider"] masks:@{type:node[@"masks"]} error:error];
|
||||
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d],input=[original metalTextureForDevice:d],after=[destination metalTextureForDevice:d];
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:entry[@"dyToolSkin"]];[ce setTexture:before atIndex:0];[ce setTexture:input atIndex:1];[ce setTexture:after atIndex:2];[ce setBytes:&layer length:sizeof(layer) atIndex:0];[ce dispatchThreads:MTLSizeMake(after.width,after.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
|
||||
@@ -40,10 +41,10 @@
|
||||
DYExportTile *blended=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[blended setBounds:source.tilePixelBounds origin:source.imageOrigin];[blended setPixelAspect:source.pixelAspect];[blend release];if(ok)ok=[self copyTile:blended to:destination entry:entry error:error];else fail(error,cb.error.localizedDescription);[blended release];return ok;
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){@autoreleasepool{
|
||||
if(!tools)return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:@{} error:error];if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
|
||||
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
|
||||
NSArray *layers=tools[@"layers"];BOOL active=NO,anchored=NO;for(NSDictionary *node in layers)if(!DYToolIsNeutral(node)){active=YES;anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];}
|
||||
// No active extra tool keeps the exact historical fused path, including HDR.
|
||||
if(!active)return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
|
||||
if(!active&&!DYChannelMixerActive(u)&&!DYFilmToolActive(u))return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
|
||||
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>input=[src metalTextureForDevice:d];if(!input)return fail(error,@"宿主图像纹理不可用");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
DYExportTile *tile=nil,*skinReference=nil,*originalReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){NSDictionary *node=DYToolWithID(tools,ID);if(!node||DYToolIsNeutral(node))continue;NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];}
|
||||
@@ -88,12 +89,15 @@
|
||||
if(u.spiderSectionEnabled>.5&&u.spiderMix>0&&spider.length){DYUniforms sp=DYToolUniforms(@{@"type":@"spider"});sp.spiderSectionEnabled=u.spiderSectionEnabled;sp.spiderMix=u.spiderMix;DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配蜘蛛盘缓冲区");BOOL ok=[self renderLegacy:tile destination:next uniforms:sp paths:@{} spider:spider masks:@{@"spider":tools[@"baseMasks"][@"spider"]?:@[]} error:error];if(!ok){[next release];return NO;}replace(next);}
|
||||
if(!apply(@"base:spider"))return NO;
|
||||
}
|
||||
// New end-of-chain base tools do not move any historical color stages.
|
||||
for(NSString *type in @[@"mixer",@"film"]){BOOL enabled=[type isEqual:@"mixer"]?DYChannelMixerActive(u):DYFilmToolActive(u);if(enabled){DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配胶片工具缓冲区");BOOL ok=[self renderFilmTool:type source:tile destination:next uniforms:u masks:tools[@"baseMasks"][type]?:@[] entry:entry error:error];if(!ok){[next release];return NO;}replace(next);}if(!apply([@"base:" stringByAppendingString:type]))return NO;}
|
||||
// Schema 1 extra layers (and children inserted after those layers) retain
|
||||
// their old end-of-chain order. Saving does not silently migrate old looks.
|
||||
if(!apply(@"tail"))return NO;return [self copyTile:tile to:dst entry:entry error:error];
|
||||
}@finally{[originalReference release];[skinReference release];[tile release];}
|
||||
}}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
|
||||
if(DYFilmToolActive(u)&&DYFilmSpatialActive(u.film))return fail(error,@"当前胶片含晕光、辉光、颗粒或暗角,无法完整保存到静态 Cube。请保存完整预设,或关闭这些处理后再导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"]&&DYFilmToolActive(layer)&&DYFilmSpatialActive(layer.film))return fail(error,@"新增胶片层含空间或时间处理,无法完整保存到静态 Cube。请保存完整预设。");}
|
||||
for(NSArray *masks in [tools[@"baseMasks"]allValues])if(masks.count)return fail(error,@"当前调色含空间蒙版或跟踪,Cube 无法保存这些信息。请先保存完整预设,或移除蒙版后导出。");for(NSDictionary *node in tools[@"layers"])if([node[@"masks"]count])return fail(error,@"新增工具含蒙版,无法完整导出为 Cube。请保存完整预设。");
|
||||
_toolDocument=tools;BOOL ok=NO;@try{ok=[self exportLUT:url uniforms:u paths:paths spider:spider error:error];}@finally{_toolDocument=nil;}return ok;
|
||||
}}
|
||||
@@ -1,9 +1,10 @@
|
||||
#import "DYToolState.h"
|
||||
#include "DYSpiderState.h"
|
||||
#include "DYFilmMath.h"
|
||||
#include <set>
|
||||
#import <objc/runtime.h>
|
||||
|
||||
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance"];}
|
||||
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"];}
|
||||
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
|
||||
NSMutableDictionary *DYMutablePlist(NSDictionary *value){if(!value)return [NSMutableDictionary dictionary];NSData *data=[NSPropertyListSerialization dataWithPropertyList:value format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil];return [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListMutableContainersAndLeaves format:NULL error:nil];}
|
||||
static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};}
|
||||
@@ -13,7 +14,7 @@ static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p
|
||||
static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);}
|
||||
static CMTime keyTime(NSDictionary *key){return CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);}
|
||||
NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParameters p=dyDefaultMaskParameters();p.kind=(DYMaskKind)kind;p.width=.5;p.height=.5;p.sourceStage=DYMaskSourceOriginal;if(kind==DYMaskHSLKey)p.flags=DYMaskHueEnabled;NSData *nodes=[NSData data];if(kind==DYMaskBezier){DYBezierNode n[4]={};float x[4]={-.5,.5,.5,-.5},y[4]={-.5,-.5,.5,.5};for(int i=0;i<4;i++)n[i]={x[i],y[i],x[i],y[i],x[i],y[i]};nodes=[NSData dataWithBytes:n length:sizeof(n)];}return @{@"id":NSUUID.UUID.UUIDString,@"enabled":@YES,@"combine":@0,@"parameters":parameterData(p),@"nodes":nodes,@"keys":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@1}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
BOOL DYValidToolMask(NSDictionary *mask){
|
||||
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
|
||||
DYMaskParameters p;if(!readParameters(mask[@"parameters"],&p))return NO;NSData *nodes=mask[@"nodes"];if(![nodes isKindOfClass:NSData.class]||nodes.length%sizeof(DYBezierNode)||nodes.length>32*sizeof(DYBezierNode))return NO;
|
||||
@@ -69,9 +70,11 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
|
||||
}
|
||||
DYUniforms DYToolUniforms(NSDictionary *node){DYUniforms u;DYDefaultUniforms(&u);NSString *type=node[@"type"];for(NSDictionary *s in DYSections())for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:s[@"enabled"]])*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=0;u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.skinProtection.x=0;
|
||||
NSArray *parts=[type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];for(NSString *part in parts){NSDictionary *s=DYToolSection(part);for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:s[@"enabled"]])*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=1;}
|
||||
if([type isEqual:@"primary"]){u.primarySectionEnabled=1;u.cm.configured=1;u.cm.inputTransfer=u.cm.outputTransfer;u.cm.inputGamut=u.cm.outputGamut;}
|
||||
// Old independent layers omitted the former zero default. Keep their image;
|
||||
// new layers explicitly store the user's new automatic-mapping default.
|
||||
if([type isEqual:@"primary"]){u.primarySectionEnabled=1;u.cm.configured=1;u.cm.inputTransfer=u.cm.outputTransfer;u.cm.inputGamut=u.cm.outputGamut;u.cm.toneMapping=0;}
|
||||
for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&[d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=v.floatValue;}return u;}
|
||||
BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms u=DYToolUniforms(node);NSDictionary *section=DYToolSection(type);BOOL enabled=YES;if([type isEqual:@"primary"])enabled=u.primarySectionEnabled>.5;else if([type isEqual:@"base"])enabled=u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;else for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:section[@"enabled"]])enabled=*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;if(!enabled)return YES;if([type isEqual:@"skin"])return u.skinProtection.y==0;if([node[@"type"]isEqual:@"spider"]&&[node[@"spider"]length]){auto mesh=DYSpiderMesh(node[@"spider"]);for(float v:dy::meshSamples(mesh))if(v!=0)return NO;}if([node[@"paths"]count])return NO;for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
|
||||
BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms u=DYToolUniforms(node);NSDictionary *section=DYToolSection(type);BOOL enabled=YES;if([type isEqual:@"primary"])enabled=u.primarySectionEnabled>.5;else if([type isEqual:@"base"])enabled=u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;else for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:section[@"enabled"]])enabled=*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;if(!enabled)return YES;if([type isEqual:@"primary"]&&u.cm.toneMapping>.5)return NO;if([type isEqual:@"mixer"])return !DYChannelMixerActive(u);if([type isEqual:@"film"])return !DYFilmToolActive(u);if([type isEqual:@"skin"])return u.skinProtection.y==0;if([node[@"type"]isEqual:@"spider"]&&[node[@"spider"]length]){auto mesh=DYSpiderMesh(node[@"spider"]);for(float v:dy::meshSamples(mesh))if(v!=0)return NO;}if([node[@"paths"]count])return NO;for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
|
||||
|
||||
@implementation DYToolManager {
|
||||
id<PROAPIAccessing> _host;NSString *_nodeID,*_type;NSInteger _depth;CMTime _time;NSMutableDictionary *_pending;DYInspectorToken *_token;
|
||||
|
||||
@@ -17,6 +17,7 @@ typedef uint32_t DYUInt;
|
||||
#endif
|
||||
|
||||
#include "DYColorManagement.h"
|
||||
#include "DYFilmTypes.h"
|
||||
|
||||
typedef struct DYUniforms {
|
||||
float exposure; // offset 0
|
||||
@@ -125,6 +126,12 @@ typedef struct DYUniforms {
|
||||
float primarySectionEnabled;
|
||||
float spiderSectionEnabled;
|
||||
float spiderMix;
|
||||
float legacyPadding;
|
||||
DYFloat4 mixerRed,mixerGreen,mixerBlue;
|
||||
float mixerSectionEnabled,mixerPreserveLuma,mixerPreserveSaturation,mixerMix;
|
||||
DYFilmSettings film;
|
||||
DYUInt filmFrameKey; // frozen render time, never an author parameter
|
||||
DYFloat4 filmPrint; // appended after the complete 1.5.0 prefix: look, strength, reserved, reserved
|
||||
} DYUniforms;
|
||||
|
||||
typedef struct DYVertex2D { DYFloat2 position; DYFloat2 textureCoordinate; } DYVertex2D;
|
||||
@@ -141,6 +148,11 @@ typedef struct DYRenderOptions {
|
||||
#define DY_ABI_ASSERT _Static_assert
|
||||
#endif
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, cm) == 944, "DYUniforms must match recovered GPU ABI");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, mixerRed) == 1104, "complete 1.4.3 prefix stays fixed");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, film) == 1168, "1.5.0 film settings stay fixed");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, filmFrameKey) == 1284, "1.5.0 frozen frame key stays fixed");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, filmPrint) == 1296, "complete 1.5.0 prefix stays fixed");
|
||||
DY_ABI_ASSERT(sizeof(DYUniforms) == 1312, "1.6.0 uniform size");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, exposure) == 0, "exposure offset");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, contrast) == 4, "contrast offset");
|
||||
DY_ABI_ASSERT(offsetof(DYUniforms, highlights) == 8, "highlights offset");
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.4.2</string>
|
||||
<string>1.6.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>31</string>
|
||||
<string>44</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.4.2</string>
|
||||
<string>1.6.1</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
二进制文件未显示。
@@ -1,15 +1,349 @@
|
||||
#import "AppDelegate.h"
|
||||
|
||||
static NSString *const DYPluginID = @"com.dayu.color.XPC";
|
||||
static NSString *const DYReleaseAddress = @"https://dayu.media";
|
||||
static NSColor *DYColor(CGFloat r, CGFloat g, CGFloat b) { return [NSColor colorWithSRGBRed:r green:g blue:b alpha:1]; }
|
||||
static NSColor *DYBlue(void) { return DYColor(.36,.65,1); }
|
||||
static NSColor *DYGreen(void) { return DYColor(.26,.86,.53); }
|
||||
static NSColor *DYSecondary(void) { return DYColor(.70,.74,.81); }
|
||||
|
||||
// Static opaque surfaces preserve the reference palette without expensive blur or motion.
|
||||
@interface DYSurface : NSView
|
||||
@property(retain) NSColor *tint;
|
||||
@property BOOL backdrop;
|
||||
@end
|
||||
@implementation DYSurface
|
||||
- (BOOL)isFlipped { return YES; }
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
BOOL contrast = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
|
||||
NSBezierPath *shape = [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:self.backdrop ? 0 : 22 yRadius:self.backdrop ? 0 : 22];
|
||||
NSColor *base = DYColor(.105,.115,.14);
|
||||
NSColor *start = self.backdrop ? DYColor(.105,.14,.20) : [base blendedColorWithFraction:.17 ofColor:self.tint];
|
||||
NSColor *end = self.backdrop ? DYColor(.105,.115,.115) : base;
|
||||
NSGradient *gradient = [[[NSGradient alloc] initWithStartingColor:start endingColor:end] autorelease];
|
||||
[gradient drawInBezierPath:shape angle:35];
|
||||
if (!self.backdrop) {
|
||||
[[self.tint blendedColorWithFraction:contrast ? .15 : .62 ofColor:base] setStroke];
|
||||
shape.lineWidth = contrast ? 2 : 1; [shape stroke];
|
||||
}
|
||||
}
|
||||
- (void)dealloc { [_tint release]; [super dealloc]; }
|
||||
@end
|
||||
|
||||
@interface DYActionButton : NSButton
|
||||
@property(retain) NSColor *tint;
|
||||
@property BOOL prominent;
|
||||
@end
|
||||
@implementation DYActionButton
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
NSRect rect = NSInsetRect(self.bounds,2,2);
|
||||
NSBezierPath *shape = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:rect.size.height/2 yRadius:rect.size.height/2];
|
||||
NSColor *base = self.prominent ? self.tint : [DYColor(.10,.12,.16) blendedColorWithFraction:.18 ofColor:self.tint];
|
||||
if (self.highlighted) base = [base blendedColorWithFraction:.2 ofColor:NSColor.blackColor];
|
||||
[base setFill]; [shape fill];
|
||||
[[self.tint blendedColorWithFraction:.35 ofColor:NSColor.whiteColor] setStroke];
|
||||
shape.lineWidth = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast ? 2 : 1; [shape stroke];
|
||||
NSColor *text = self.enabled ? (self.prominent ? NSColor.whiteColor : self.tint) : DYSecondary();
|
||||
NSDictionary *attrs = @{NSFontAttributeName:[NSFont systemFontOfSize:13 weight:NSFontWeightSemibold],NSForegroundColorAttributeName:text};
|
||||
NSSize size = [self.title sizeWithAttributes:attrs];
|
||||
[self.title drawAtPoint:NSMakePoint((NSWidth(self.bounds)-size.width)/2,(NSHeight(self.bounds)-size.height)/2) withAttributes:attrs];
|
||||
}
|
||||
- (void)drawFocusRingMask { [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,2,2) xRadius:20 yRadius:20] fill]; }
|
||||
- (NSRect)focusRingMaskBounds { return self.bounds; }
|
||||
- (void)dealloc { [_tint release]; [super dealloc]; }
|
||||
@end
|
||||
|
||||
static NSTextField *DYLabel(NSString *text, CGFloat size, NSFontWeight weight, NSColor *color) {
|
||||
NSTextField *label = [NSTextField wrappingLabelWithString:text];
|
||||
label.font = [NSFont systemFontOfSize:size weight:weight]; label.textColor = color;
|
||||
label.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[label setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
return label;
|
||||
}
|
||||
static NSStackView *DYStack(NSArray *views, NSUserInterfaceLayoutOrientation orientation, CGFloat spacing) {
|
||||
NSStackView *stack = [NSStackView stackViewWithViews:views];
|
||||
stack.orientation = orientation; stack.spacing = spacing;
|
||||
stack.alignment = orientation == NSUserInterfaceLayoutOrientationVertical ? NSLayoutAttributeLeading : NSLayoutAttributeTop;
|
||||
stack.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
if (orientation == NSUserInterfaceLayoutOrientationHorizontal) stack.distribution = NSStackViewDistributionFillEqually;
|
||||
return stack;
|
||||
}
|
||||
static void DYPin(NSView *child, NSView *parent, CGFloat inset) {
|
||||
child.translatesAutoresizingMaskIntoConstraints = NO; [parent addSubview:child];
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
[child.leadingAnchor constraintEqualToAnchor:parent.leadingAnchor constant:inset],
|
||||
[child.trailingAnchor constraintEqualToAnchor:parent.trailingAnchor constant:-inset],
|
||||
[child.topAnchor constraintEqualToAnchor:parent.topAnchor constant:inset],
|
||||
[child.bottomAnchor constraintEqualToAnchor:parent.bottomAnchor constant:-inset]]];
|
||||
}
|
||||
static DYActionButton *DYButton(NSString *title, NSColor *tint, BOOL prominent, id target, SEL action) {
|
||||
DYActionButton *button = [DYActionButton buttonWithTitle:title target:target action:action];
|
||||
button.tint = tint; button.prominent = prominent; button.bordered = NO;
|
||||
button.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[button.heightAnchor constraintEqualToConstant:42].active = YES;
|
||||
[button.widthAnchor constraintGreaterThanOrEqualToConstant:124].active = YES;
|
||||
return button;
|
||||
}
|
||||
static DYSurface *DYCard(NSColor *tint, NSStackView *content) {
|
||||
DYSurface *card = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
card.tint = tint; card.translatesAutoresizingMaskIntoConstraints = NO; DYPin(content,card,22);
|
||||
for (NSView *view in content.arrangedSubviews) [view.widthAnchor constraintEqualToAnchor:content.widthAnchor].active = YES;
|
||||
return card;
|
||||
}
|
||||
static NSTextField *DYHeading(NSString *symbol, NSString *text, NSColor *color) {
|
||||
NSTextField *label = DYLabel(text,15,NSFontWeightSemibold,color);
|
||||
NSImage *image = [NSImage imageWithSystemSymbolName:symbol accessibilityDescription:nil];
|
||||
if (image) {
|
||||
NSTextAttachment *attachment = [[[NSTextAttachment alloc] init] autorelease];
|
||||
attachment.image = image; attachment.bounds = NSMakeRect(0,-3,18,18);
|
||||
NSMutableAttributedString *value = [[[NSMutableAttributedString alloc] initWithAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]] autorelease];
|
||||
[value appendAttributedString:[[[NSAttributedString alloc] initWithString:[@" " stringByAppendingString:text]
|
||||
attributes:@{NSFontAttributeName:label.font,NSForegroundColorAttributeName:color}] autorelease]];
|
||||
label.attributedStringValue = value; label.accessibilityLabel = text;
|
||||
}
|
||||
return label;
|
||||
}
|
||||
|
||||
typedef NS_ENUM(NSInteger,DYRegistrationState) { DYChecking, DYRegistering, DYReady, DYFailed };
|
||||
@interface AppDelegate ()
|
||||
@property(weak) IBOutlet NSWindow *window;
|
||||
@property(assign) NSTextField *statusTitle, *statusDetail, *exitDetail;
|
||||
@property(assign) DYActionButton *retryButton, *keepButton, *confirmationButton;
|
||||
@property(assign) NSProgressIndicator *progress;
|
||||
@property(assign) DYSurface *registrationCard;
|
||||
@property DYRegistrationState registrationState;
|
||||
@property BOOL keepOpen, terminating;
|
||||
@property NSInteger secondsRemaining;
|
||||
@property(retain) NSTimer *exitTimer;
|
||||
@property(retain) NSMutableDictionary *diagnostics;
|
||||
@end
|
||||
|
||||
@implementation AppDelegate
|
||||
- (void)applicationDidFinishLaunching:(NSNotification*)n{
|
||||
self.window.title=@"大鱼调色";[self.window setContentSize:NSMakeSize(540,280)];[self.window center];
|
||||
NSView*v=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,540,280)]autorelease];v.wantsLayer=YES;v.layer.backgroundColor=[NSColor colorWithSRGBRed:.025 green:.08 blue:.13 alpha:1].CGColor;self.window.contentView=v;
|
||||
NSTextField*title=[NSTextField labelWithString:@"大鱼调色"];title.font=[NSFont boldSystemFontOfSize:28];title.textColor=[NSColor colorWithSRGBRed:.3 green:.75 blue:1 alpha:1];title.frame=NSMakeRect(32,212,460,42);[v addSubview:title];
|
||||
NSTextField*body=[NSTextField wrappingLabelWithString:@"已安装原生 FxPlug 调色效果。\n\n在 Final Cut Pro 的「效果 → 大鱼调色」中应用,或在 Motion 的滤镜中选择「大鱼调色」。\n\n输入转换、光影、曲线、HSL、色轮与 LUT 均在宿主检查器中编辑。"];body.font=[NSFont systemFontOfSize:14];body.textColor=[NSColor colorWithWhite:.86 alpha:1];body.frame=NSMakeRect(34,65,470,140);[v addSubview:body];
|
||||
NSButton*b=[NSButton buttonWithTitle:@"打开 Final Cut Pro" target:self action:@selector(openHost:)];b.frame=NSMakeRect(30,20,170,32);[v addSubview:b];[self.window makeKeyAndOrderFront:nil];
|
||||
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
|
||||
self.keepOpen = [NSProcessInfo.processInfo.arguments containsObject:@"--show-introduction"];
|
||||
self.window.title = @"大鱼调色";
|
||||
self.window.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
self.window.titlebarAppearsTransparent = YES; self.window.backgroundColor = DYColor(.105,.14,.20);
|
||||
self.window.contentMinSize = NSMakeSize(760,620); [self.window setContentSize:NSMakeSize(920,850)]; [self.window center];
|
||||
[self buildInterface]; [self buildMenu];
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(accessibilityChanged:)
|
||||
name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
|
||||
[self.window makeKeyAndOrderFront:nil]; [self checkRegistration:nil];
|
||||
}
|
||||
- (void)openHost:(id)sender{NSURL*u=[NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:@"com.apple.FinalCut"];if(u)[NSWorkspace.sharedWorkspace openApplicationAtURL:u configuration:NSWorkspaceOpenConfiguration.configuration completionHandler:nil];}
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication*)app{return YES;}
|
||||
- (void)buildMenu {
|
||||
NSMenu *menu = [[[NSMenu alloc] initWithTitle:@"大鱼调色"] autorelease];
|
||||
NSMenuItem *root = [[[NSMenuItem alloc] initWithTitle:@"大鱼调色" action:NULL keyEquivalent:@""] autorelease]; [menu addItem:root];
|
||||
NSMenu *app = [[[NSMenu alloc] initWithTitle:@"大鱼调色"] autorelease]; root.submenu = app;
|
||||
for (NSArray *entry in @[@[@"关于大鱼调色",NSStringFromSelector(@selector(orderFrontStandardAboutPanel:)),@""],
|
||||
@[@"查看功能介绍",NSStringFromSelector(@selector(keepIntroduction:)),@"i"],
|
||||
@[@"重新检查插件",NSStringFromSelector(@selector(checkRegistration:)),@"r"],
|
||||
@[@"访问发布地址",NSStringFromSelector(@selector(openWebsite:)),@""],
|
||||
@[@"关闭窗口",NSStringFromSelector(@selector(closeWindow:)),@"w"],
|
||||
@[@"退出大鱼调色",NSStringFromSelector(@selector(terminate:)),@"q"]]) {
|
||||
NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:entry[0] action:NSSelectorFromString(entry[1]) keyEquivalent:entry[2]] autorelease];
|
||||
item.target = [entry[0] isEqualToString:@"退出大鱼调色"] || [entry[0] isEqualToString:@"关于大鱼调色"] ? NSApp : self; [app addItem:item];
|
||||
}
|
||||
NSApp.mainMenu = menu;
|
||||
}
|
||||
- (void)buildInterface {
|
||||
DYSurface *backdrop = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease]; backdrop.backdrop = YES; self.window.contentView = backdrop;
|
||||
NSScrollView *scroll = [[[NSScrollView alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
scroll.drawsBackground = NO; scroll.hasVerticalScroller = YES; scroll.autohidesScrollers = YES; DYPin(scroll,backdrop,0);
|
||||
DYSurface *document = [[[DYSurface alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
document.backdrop = YES; document.translatesAutoresizingMaskIntoConstraints = NO; scroll.documentView = document;
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
[document.leadingAnchor constraintEqualToAnchor:scroll.contentView.leadingAnchor],
|
||||
[document.topAnchor constraintEqualToAnchor:scroll.contentView.topAnchor],
|
||||
[document.widthAnchor constraintEqualToAnchor:scroll.contentView.widthAnchor]]];
|
||||
NSButton *website = [NSButton buttonWithTitle:@"发布地址 https://dayu.media ↗" target:self action:@selector(openWebsite:)];
|
||||
website.bordered = NO; website.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
website.attributedTitle = [[[NSAttributedString alloc] initWithString:website.title attributes:@{
|
||||
NSFontAttributeName:[NSFont systemFontOfSize:13 weight:NSFontWeightMedium],NSForegroundColorAttributeName:DYBlue()}] autorelease];
|
||||
[website.heightAnchor constraintEqualToConstant:28].active = YES;
|
||||
NSDictionary *info = NSBundle.mainBundle.infoDictionary;
|
||||
NSArray *heroLabels = @[DYLabel(@"FINAL CUT PRO / MOTION",11,NSFontWeightSemibold,DYBlue()),
|
||||
DYLabel(@"大鱼调色",42,NSFontWeightBold,NSColor.whiteColor),
|
||||
DYLabel(@"从色彩还原到胶片质感,让每一次调色更从容。",15,NSFontWeightRegular,DYSecondary()),
|
||||
DYLabel([NSString stringWithFormat:@"v%@ · 构建 %@ / 原生 FxPlug 4 · Apple Silicon",info[@"CFBundleShortVersionString"],info[@"CFBundleVersion"]],11,NSFontWeightMedium,DYSecondary())];
|
||||
NSStackView *hero = DYStack(heroLabels,NSUserInterfaceLayoutOrientationVertical,8);
|
||||
for (NSTextField *label in heroLabels) { label.alignment = NSTextAlignmentCenter; [label.widthAnchor constraintEqualToAnchor:hero.widthAnchor].active = YES; }
|
||||
self.statusTitle = DYLabel(@"正在检查插件…",22,NSFontWeightSemibold,NSColor.whiteColor);
|
||||
self.statusDetail = DYLabel(@"正在检查本机插件登记,随后自动提交注册。",13,NSFontWeightRegular,DYSecondary());
|
||||
[self.statusDetail.heightAnchor constraintGreaterThanOrEqualToConstant:42].active = YES;
|
||||
self.progress = [[[NSProgressIndicator alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
self.progress.style = NSProgressIndicatorStyleBar; self.progress.indeterminate = YES; self.progress.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
self.retryButton = DYButton(@"检查中…",DYBlue(),NO,self,@selector(checkRegistration:));
|
||||
self.keepButton = DYButton(@"查看功能介绍",DYColor(.20,.46,.94),YES,self,@selector(keepIntroduction:));
|
||||
self.exitDetail = DYLabel(@"注册成功后,将显示 3 秒退出倒计时。",15,NSFontWeightSemibold,DYGreen());
|
||||
[self.exitDetail.heightAnchor constraintGreaterThanOrEqualToConstant:38].active = YES;
|
||||
NSStackView *registration = DYStack(@[DYHeading(@"puzzlepiece.extension",@"插件连接",DYBlue()),self.statusTitle,self.statusDetail,self.progress,
|
||||
self.exitDetail,DYStack(@[self.retryButton,self.keepButton],NSUserInterfaceLayoutOrientationHorizontal,8)],NSUserInterfaceLayoutOrientationVertical,13);
|
||||
self.registrationCard = DYCard(DYBlue(),registration);
|
||||
self.confirmationButton = DYButton(@"已确认正常,退出",DYGreen(),NO,self,@selector(confirmHost:));
|
||||
self.confirmationButton.enabled = NO;
|
||||
self.confirmationButton.toolTip = @"请先在 Final Cut Pro 中应用大鱼调色并确认效果正常,再点击此按钮。";
|
||||
NSStackView *host = DYStack(@[DYHeading(@"play.rectangle",@"在 Final Cut Pro 中检查",DYGreen()),
|
||||
DYLabel(@"调色,留在时间线里。",22,NSFontWeightSemibold,NSColor.whiteColor),
|
||||
DYLabel(@"Final Cut Pro:效果 → 大鱼调色\n将效果应用到片段,确认画面与调节正常。\n打开宿主检查会保留本窗口,等待你确认。",13,NSFontWeightRegular,DYSecondary()),
|
||||
DYStack(@[DYButton(@"打开 FCP 检查",DYColor(.20,.46,.94),YES,self,@selector(openFinalCut:)),DYButton(@"打开 Motion",DYGreen(),NO,self,@selector(openMotion:))],NSUserInterfaceLayoutOrientationHorizontal,8),
|
||||
self.confirmationButton],NSUserInterfaceLayoutOrientationVertical,13);
|
||||
DYSurface *hostCard = DYCard(DYGreen(),host);
|
||||
NSStackView *top = DYStack(@[self.registrationCard,hostCard],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[self.registrationCard.heightAnchor constraintEqualToAnchor:hostCard.heightAnchor].active = YES;
|
||||
NSArray *features = @[
|
||||
@[@"slider.horizontal.3",@"完整调色",@"精准还原,自由塑造",@"CST 色彩管理、光影与曲线\nHSL、色轮、蜘蛛盘与白平衡",DYBlue()],
|
||||
@[@"square.grid.2x2",@"LUT 与风格",@"灵感,所见即所得",@"LUT 缩略图浏览与实时预览\n快速收藏,管理常用风格",DYColor(.67,.59,1)],
|
||||
@[@"film",@"胶片质感",@"让画面更有温度",@"八种印片外观、颗粒与晕光\n辉光、暗角及通道混合器",DYColor(1,.67,.30)],
|
||||
@[@"square.on.circle",@"局部与叠层",@"每个细节,都有层次",@"独立工具层、逐层蒙版\n画面控件与关键帧跟踪",DYGreen()]];
|
||||
NSMutableArray *cards = [NSMutableArray array];
|
||||
for (NSArray *feature in features) [cards addObject:DYCard(feature[4],DYStack(@[DYHeading(feature[0],feature[1],feature[4]),
|
||||
DYLabel(feature[2],17,NSFontWeightSemibold,NSColor.whiteColor),DYLabel(feature[3],13,NSFontWeightRegular,DYSecondary())],NSUserInterfaceLayoutOrientationVertical,12))];
|
||||
NSStackView *row1 = DYStack(@[cards[0],cards[1]],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
NSStackView *row2 = DYStack(@[cards[2],cards[3]],NSUserInterfaceLayoutOrientationHorizontal,14);
|
||||
[((NSView *)cards[0]).heightAnchor constraintEqualToAnchor:((NSView *)cards[1]).heightAnchor].active = YES;
|
||||
[((NSView *)cards[2]).heightAnchor constraintEqualToAnchor:((NSView *)cards[3]).heightAnchor].active = YES;
|
||||
NSStackView *content = DYStack(@[website,hero,top,DYHeading(@"sparkles",@"一套工具,完成你的色彩表达",NSColor.whiteColor),row1,row2],NSUserInterfaceLayoutOrientationVertical,18);
|
||||
DYPin(content,document,30);
|
||||
for (NSView *view in content.arrangedSubviews) [view.widthAnchor constraintEqualToAnchor:content.widthAnchor].active = YES;
|
||||
[document.heightAnchor constraintGreaterThanOrEqualToAnchor:scroll.contentView.heightAnchor].active = YES;
|
||||
}
|
||||
|
||||
// PluginKit runs on a worker queue. Arguments are never interpreted as shell commands.
|
||||
- (NSDictionary *)runPluginKit:(NSArray *)arguments {
|
||||
NSTask *task = [[[NSTask alloc] init] autorelease]; task.executableURL = [NSURL fileURLWithPath:@"/usr/bin/pluginkit"]; task.arguments = arguments;
|
||||
NSPipe *pipe = [NSPipe pipe]; task.standardOutput = pipe; task.standardError = pipe;
|
||||
NSError *error = nil;
|
||||
if (![task launchAndReturnError:&error]) return @{@"code":@(-1),@"output":error.localizedDescription ?: @"无法启动插件登记服务"};
|
||||
NSDate *deadline = [NSDate dateWithTimeIntervalSinceNow:8];
|
||||
while (task.running && deadline.timeIntervalSinceNow > 0) [NSThread sleepForTimeInterval:.05];
|
||||
if (task.running) { [task terminate]; return @{@"code":@(-2),@"output":@"插件登记服务响应超时"}; }
|
||||
NSData *data = [pipe.fileHandleForReading readDataToEndOfFile];
|
||||
NSString *output = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease] ?: @"";
|
||||
return @{@"code":@(task.terminationStatus),@"output":output};
|
||||
}
|
||||
- (BOOL)registry:(NSDictionary *)query containsPlugin:(NSString *)path {
|
||||
if ([query[@"code"] intValue] != 0) return NO;
|
||||
for (NSString *line in [query[@"output"] componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]) {
|
||||
NSArray *fields = [line componentsSeparatedByString:@"\t"]; if (fields.count < 4) continue;
|
||||
NSString *identity = [fields[0] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
if ([identity hasPrefix:@"+"]) identity = [[identity substringFromIndex:1] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
NSString *registered = [[fields lastObject] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
||||
// 1.1 is the registration protocol, not the APP version.
|
||||
NSString *expected = [DYPluginID stringByAppendingString:@"(1.1)"];
|
||||
if ([identity isEqualToString:expected] &&
|
||||
[registered.stringByResolvingSymlinksInPath isEqualToString:path.stringByResolvingSymlinksInPath]) return YES;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
- (void)checkRegistration:(id)sender {
|
||||
if (self.diagnostics && (self.registrationState == DYChecking || self.registrationState == DYRegistering)) return;
|
||||
[self.exitTimer invalidate]; self.exitTimer = nil; self.registrationState = DYChecking;
|
||||
self.retryButton.enabled = NO; self.retryButton.title = @"检查中…";
|
||||
self.statusTitle.stringValue = @"正在检查插件…"; self.statusTitle.textColor = NSColor.whiteColor;
|
||||
self.statusDetail.stringValue = @"正在检查本机插件登记,随后自动提交注册。";
|
||||
self.progress.indeterminate = YES; [self.progress startAnimation:nil];
|
||||
NSString *path = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"Contents/PlugIns/大鱼调色 XPC Service.pluginkit"];
|
||||
self.diagnostics = [NSMutableDictionary dictionaryWithDictionary:@{
|
||||
@"bundleID":NSBundle.mainBundle.bundleIdentifier,@"version":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
|
||||
@"build":[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"],@"executable":NSBundle.mainBundle.executablePath,
|
||||
@"pid":@(NSProcessInfo.processInfo.processIdentifier),@"plugin":path,@"status":@"checking"}];
|
||||
dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0), ^{
|
||||
@autoreleasepool {
|
||||
NSBundle *plugin = [NSBundle bundleWithPath:path];
|
||||
NSDictionary *attributes = [plugin objectForInfoDictionaryKey:@"PlugInKit"][@"Attributes"];
|
||||
BOOL validComponent = [plugin.bundleIdentifier isEqualToString:DYPluginID] &&
|
||||
[[plugin objectForInfoDictionaryKey:@"CFBundleVersion"] isEqual:[NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]] &&
|
||||
[attributes[@"com.apple.protocol"] isEqual:@"FxPlug"] && [attributes[@"com.apple.version"] isEqual:@"1.1"];
|
||||
if (!validComponent) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:NO details:@"未找到完整的插件组件。请从发布地址重新安装大鱼调色。" results:@{}]; }); return;
|
||||
}
|
||||
// The stand-alone wrapper can inspect the registry directly. Registration
|
||||
// and actual host rendering remain separate states; the user confirms FCP.
|
||||
NSDictionary *before = [self runPluginKit:@[@"-m",@"-v",@"-i",DYPluginID]];
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self.registrationState = DYRegistering; self.statusTitle.stringValue = @"正在注册插件…";
|
||||
self.statusDetail.stringValue = @"正在向系统提交插件注册,并核对当前安装位置。";
|
||||
});
|
||||
NSDictionary *add = [self runPluginKit:@[@"-a",path]];
|
||||
NSDictionary *after = nil; BOOL registered = NO;
|
||||
for (NSInteger attempt=0; attempt<4; attempt++) {
|
||||
if (attempt) [NSThread sleepForTimeInterval:.35];
|
||||
after = [self runPluginKit:@[@"-m",@"-v",@"-i",DYPluginID]];
|
||||
registered = [self registry:after containsPlugin:path]; if (registered) break;
|
||||
}
|
||||
BOOL submissionAccepted = [add[@"code"] intValue] == 0;
|
||||
NSString *message = registered ?
|
||||
@"已确认当前插件登记。请在 Final Cut Pro 中实际应用并确认效果正常;若宿主已打开,请保存后重新打开。" :
|
||||
@"插件注册尚未完成。请点击“重新检查”,或重新安装后再试。窗口将保持打开。";
|
||||
NSDictionary *results = @{@"before":before,@"submission":add,@"after":after ?: @{},@"registered":@(registered),
|
||||
@"discoveryVerified":@(registered),@"submissionAccepted":@(submissionAccepted),@"hostVerification":@"awaiting-user-confirmation",
|
||||
@"confirmationMethod":registered ? @"exact-path-discovery" : @"unconfirmed"};
|
||||
dispatch_async(dispatch_get_main_queue(), ^{ [self finishRegistration:registered details:message results:results]; });
|
||||
}
|
||||
});
|
||||
}
|
||||
- (void)finishRegistration:(BOOL)success details:(NSString *)details results:(NSDictionary *)results {
|
||||
if (self.terminating) return;
|
||||
self.registrationState = success ? DYReady : DYFailed;
|
||||
[self.progress stopAnimation:nil]; self.progress.indeterminate = NO; self.progress.doubleValue = success ? 100 : 0;
|
||||
self.registrationCard.tint = success ? DYGreen() : DYColor(1,.67,.30); [self.registrationCard setNeedsDisplay:YES];
|
||||
self.statusTitle.stringValue = success ? @"✓ 插件注册成功" : @"需要重新检查";
|
||||
self.statusTitle.textColor = success ? DYGreen() : DYColor(1,.75,.4); self.statusDetail.stringValue = details;
|
||||
self.retryButton.title = @"重新检查"; self.retryButton.enabled = YES;
|
||||
self.confirmationButton.enabled = success;
|
||||
[self.diagnostics addEntriesFromDictionary:results]; self.diagnostics[@"status"] = success ? @"registered" : @"failed"; [self writeDiagnostics];
|
||||
NSAccessibilityPostNotificationWithUserInfo(self.window,NSAccessibilityAnnouncementRequestedNotification,
|
||||
@{NSAccessibilityAnnouncementKey:self.statusTitle.stringValue,NSAccessibilityPriorityKey:@(NSAccessibilityPriorityHigh)});
|
||||
if (success && !self.keepOpen) {
|
||||
self.secondsRemaining = 3; [self updateCountdown];
|
||||
self.exitTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(exitTick:) userInfo:nil repeats:YES];
|
||||
} else self.exitDetail.stringValue = success ? @"插件已就绪。关闭此窗口后,可继续在宿主中使用。" : @"注册尚未完成,应用会保留此窗口以便重试。";
|
||||
}
|
||||
- (void)updateCountdown { self.exitDetail.stringValue = [NSString stringWithFormat:@"%ld 秒后自动退出\n点击“查看功能介绍”可保留窗口",(long)self.secondsRemaining]; }
|
||||
- (void)exitTick:(NSTimer *)timer {
|
||||
if (--self.secondsRemaining <= 0) {
|
||||
[timer invalidate]; self.exitTimer = nil; self.diagnostics[@"terminationReason"] = @"registration-succeeded"; [self writeDiagnostics]; [NSApp terminate:nil];
|
||||
} else [self updateCountdown];
|
||||
}
|
||||
- (void)keepIntroduction:(id)sender {
|
||||
self.keepOpen = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
self.keepButton.title = @"正在浏览介绍"; self.keepButton.enabled = NO;
|
||||
self.exitDetail.stringValue = @"已保留功能介绍窗口。插件可独立在宿主中使用。";
|
||||
}
|
||||
- (void)confirmHost:(id)sender {
|
||||
if (self.registrationState != DYReady) return;
|
||||
self.diagnostics[@"hostVerification"] = @"user-confirmed";
|
||||
self.diagnostics[@"terminationReason"] = @"user-confirmed-host";
|
||||
[self writeDiagnostics]; [NSApp terminate:nil];
|
||||
}
|
||||
- (void)writeDiagnostics {
|
||||
NSURL *base = [NSFileManager.defaultManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask].firstObject;
|
||||
NSURL *folder = [base URLByAppendingPathComponent:@"com.dayu.color" isDirectory:YES];
|
||||
[NSFileManager.defaultManager createDirectoryAtURL:folder withIntermediateDirectories:YES attributes:nil error:nil];
|
||||
NSData *data = [NSJSONSerialization dataWithJSONObject:self.diagnostics options:NSJSONWritingPrettyPrinted error:nil];
|
||||
[data writeToURL:[folder URLByAppendingPathComponent:@"Registration.json"] options:NSDataWritingAtomic error:nil];
|
||||
}
|
||||
- (void)openHostWithIdentifiers:(NSArray *)identifiers name:(NSString *)name {
|
||||
[self keepIntroduction:nil]; NSURL *url = nil;
|
||||
for (NSString *identifier in identifiers) { url = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:identifier]; if (url) break; }
|
||||
if (!url) { [self showMessage:[@"未找到 " stringByAppendingString:name] detail:@"请先安装宿主应用,再从效果或滤镜中使用大鱼调色。"]; return; }
|
||||
[NSWorkspace.sharedWorkspace openApplicationAtURL:url configuration:NSWorkspaceOpenConfiguration.configuration completionHandler:^(NSRunningApplication *app,NSError *error) {
|
||||
if (error) dispatch_async(dispatch_get_main_queue(), ^{ [self showMessage:@"无法打开宿主" detail:error.localizedDescription]; });
|
||||
}];
|
||||
}
|
||||
- (void)openFinalCut:(id)sender { [self openHostWithIdentifiers:@[@"com.apple.FinalCut",@"com.apple.FinalCutApp"] name:@"Final Cut Pro"]; }
|
||||
- (void)openMotion:(id)sender { [self openHostWithIdentifiers:@[@"com.apple.motionapp",@"com.apple.motionappApp"] name:@"Motion"]; }
|
||||
- (void)openWebsite:(id)sender { [self keepIntroduction:nil]; if (![NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:DYReleaseAddress]]) [self showMessage:@"无法打开发布地址" detail:DYReleaseAddress]; }
|
||||
- (void)showMessage:(NSString *)title detail:(NSString *)detail {
|
||||
NSAlert *alert = [[[NSAlert alloc] init] autorelease]; alert.messageText = title; alert.informativeText = detail;
|
||||
[alert addButtonWithTitle:@"好"]; [alert beginSheetModalForWindow:self.window completionHandler:nil];
|
||||
}
|
||||
- (void)closeWindow:(id)sender { [self.window performClose:sender]; }
|
||||
- (void)accessibilityChanged:(NSNotification *)note { [self.window.contentView setNeedsDisplay:YES]; }
|
||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app { return YES; }
|
||||
- (void)applicationWillTerminate:(NSNotification *)note {
|
||||
self.terminating = YES; [self.exitTimer invalidate]; self.exitTimer = nil;
|
||||
[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
|
||||
}
|
||||
- (void)dealloc { [_exitTimer invalidate]; [_exitTimer release]; [_diagnostics release]; [super dealloc]; }
|
||||
@end
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.4.2</string>
|
||||
<string>1.6.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>31</string>
|
||||
<string>44</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
已加载 100/103 个文件。由于本次变更涉及的文件过多,其余文件未显示。
显示更多
在新工单中引用
屏蔽一个用户