比较提交

...
共修改 28 个文件,包含 770 行新增和 89 行删除

没有与搜索条件相匹配的文件

+1 -1
查看文件
@@ -2,6 +2,6 @@
跟踪参考Color Finale行为独立适配:实际钢笔路径范围、300特征、亚像素精炼、21×21光流,最高3840×2160分析采样。281项原生检查及18项独立CPU/Metal跟踪检查通过。FCP12.4实测相邻插入、独立参数、绘制态与面板、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。
实际鼠标钢笔落点/闭合仍待用户确认:自动化输入没有进入FCP画面回调,原生OSC模拟检查单独通过。当前不含Color Finale全部能力,B样条、编组、人物/图像/外部蒙版和完整轨迹区段编辑等尚有差异;未做同一真实视频的完整轨迹等价对照。跟踪不含透视/剪切。详细证据见仓库交接文档和verification/HostMaskWorkflow1.4.1.json。
用户已用实际鼠标确认钢笔“可以绘制并闭合”,放点与闭合验收通过。自动化输入没有进入FCP画面回调,曲柄/删除等其它手势仍以原生OSC模拟检查为据。当前不含Color Finale全部能力,B样条、编组、人物/图像/外部蒙版和完整轨迹区段编辑等尚有差异;未做同一真实视频的完整轨迹等价对照。跟踪不含透视/剪切。详细证据见仓库交接文档和verification/HostMaskWorkflow1.4.1.json。
版本1.4.1(26),Apple Silicon,macOS14.6起;APP实际编译源码 `0eb56aed126c825ca89712ce90f8cc1c05b03d89`。APP公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326`、PKG公证 `9a5ff448-2ac1-444e-b993-2928cf8c333f` 均Accepted,票据/Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.1.pkg`,14,337,616字节,SHA-256 `0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6`。发行标签保留完整源码和交付记录,APP编译节点与发行记录节点分别列明。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;不含用户LUT、预设或媒体。
+9
查看文件
@@ -0,0 +1,9 @@
修复真实素材从中间帧启动跟踪依赖预览缓存的问题,分析首帧直接作为种子。4K细纹低通后按比例缩小至最高1280×720运动分析,调色输出分辨率不变;重新校准运动拟合容差与置信度,保留可信度和错误变换保护。
失跟显示原因和保留帧数,正常结束宿主后台分析,可立即重新跟踪。修复首帧反向边界互等、带前置片段时单帧定位错误,以及已有相同轨迹的单帧操作不前进问题。
FCP12.4正式31版实测同一4K60素材在25p时间线中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界与连续前后单帧通过。正常退出冷重开完整预设逐字节一致。正式路径293项原生检查与19项独立CPU/Metal检查通过,源码已从远端独立恢复重建核验。
区域仿射跟踪不等同人物分割或非刚性描边;遮挡/变形可能需要手工调整后继续。未宣称完整Color Finale能力等价。原工程与用户媒体保留,包内不含用户媒体、预设或LUT。
版本1.4.2(31),Apple Silicon,macOS14.6起;APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f`、PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` 均Accepted,票据/Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.2.pkg`,14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`。固定正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。发行标签 `v1.4.2-tracking-midpoint-20261102` 另含最终验收和恢复记录,保留全部历史标签及安装包。
+15 -6
查看文件
@@ -1,6 +1,12 @@
# 大鱼调色
原生 FxPlug 4 调色器,当前正式安装版本 **1.4.1(26)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
原生 FxPlug 4 调色器,当前正式安装版本 **1.4.2(31)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
## 1.4.2 跟踪修复
中间帧启动直接使用宿主分析首帧,预览缓存缺失或陈旧不会阻止开始。真实素材的细纹运动采样和拟合容差已调整,仍保留可信度与错误变换保护。失跟说明原因与保留帧数;正常取消标记结束宿主后台任务。单帧跟踪会把源时间转换到时间线位置,支持片段前有其它内容时连续操作。
正式路径293项原生检查和19项独立CPU/Metal跟踪检查通过。FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。
## 色彩管理与一级调色
@@ -28,9 +34,9 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移
蒙版包括椭圆、矩形、钢笔、线性渐变、HSL 和亮度选区,支持相加、减去、相交、反转、羽化和强度。矩形、椭圆和闭合钢笔区域可正向、反向、双向或单帧跟踪。算法从“大鱼调色盘”固定源码适配,随本产品独立构建;不依赖安装父插件。完整预设 v4 保存新增工具、蒙版和逐帧轨迹,兼容旧预设。空间蒙版不能导出到 Cube,导出时会提示。
蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,分析采样上限3840×2160。
蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,运动分析按显示比例限制到1280×720,4K细纹先低通再缩小,调色渲染和输出分辨率保持原设置。
正式版281项原生检查、独立CPU/Metal跟踪18项通过。FCP实测相邻插入、初始化与独立参数、大号面板、绘制态切换、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。画面提示文字方向已修正。自动化鼠标没有触发FCP画面回调,实际鼠标钢笔落点/闭合仍待用户确认,不能将模拟宿主通过写成实机手势通过。1.4.0的中心拖动已有用户确认。新增工具标量仍为静态值,蒙版轨迹按时间求值,跟踪不含透视/剪切。
1.4.1的281项原生检查、独立CPU/Metal跟踪18项通过。FCP实测相邻插入、初始化与独立参数、大号面板、绘制态切换、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。画面提示文字方向已修正。用户随后用实际鼠标确认“可以绘制并闭合”,钢笔放点和闭合实机验收通过;自动化输入未进入OSC回调,曲柄/删除等其它手势仍以原生模拟宿主检查为据。1.4.0的中心拖动已有用户确认。新增工具标量仍为静态值,蒙版轨迹按时间求值,跟踪不含透视/剪切。
旧schema1末尾层保持原保存位置与渲染,避免改变旧工程外观;新添加的层使用schema2插入锚点。原生固定模块的既有处理顺序保留。当前实现参考本机Color Finale的行为和参数独立适配,并非全部功能完整移植;B样条、编组、人物/图像/外部蒙版及完整轨迹区段编辑等差异见专项清单。
旧模板实例可能保留关闭画面控件的状态;可先保存完整预设,再重新应用新版效果并载入预设。不会自动覆盖旧实例。实现与验收边界见 [实现说明](research/ToolMaskImplementation.md)、[宿主记录](verification/HostToolMasks.json) 和 [恢复核验](verification/ToolMaskRecovery.json)。
@@ -38,9 +44,12 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移
## 验证与恢复
- [本轮交接](大鱼调色FxPlug4交接.md)
- [1.4.1 正式版 281 项原生检查](verification/InstalledSelfTest.json)
- [当前正式路径原生检查](verification/InstalledSelfTest.json)
- [中间帧与真实素材跟踪修复](research/TrackingMidpoint1.4.2.md)
- [跟踪宿主验收](verification/HostTrackingMidpoint1.4.2.json)
- [跟踪源码独立恢复](verification/TrackingMidpointRecovery.json)
- [插入、钢笔和跟踪工作流](research/MaskWorkflow1.4.1.md)
- [1.4.1 FCP验收及实际鼠标缺口](verification/HostMaskWorkflow1.4.1.json)
- [1.4.1 FCP验收及用户实际钢笔确认](verification/HostMaskWorkflow1.4.1.json)
- [Color Finale对照和未迁移范围](research/ColorFinaleMasksFollowup.md)
- [1.4.1远端源码独立恢复](verification/MaskWorkflowRecovery.json)
- [每工具蒙版、跟踪、保存重开与用户实际拖动](verification/HostToolMasks.json)
@@ -62,6 +71,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项展开验包通过;Release下载核验以本轮Release.json记录为准。历史[1.4.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.0-tool-masks-20261101)及更早发行包和标签保留。
正式发行包:[大鱼调色-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.3.1 的历史验收包含 Sony 默认、可见复位、浮动浏览器、系统窗口缩放、两种布局、最近排序与关闭重开。原生检查单独覆盖几何/布局持久化和鼠标事件;当时自动化没有独立确认自由标题栏/边缘拖动。1.4.0 另在独立合成工程中完成上文的宿主检查,用户确认中心拖动后保留其试调状态。
+21 -3
查看文件
@@ -1,6 +1,24 @@
# 大鱼调色恢复说明
## 当前 1.4.1(26):相邻插入、蒙版可读性与钢笔流程
## 当前 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)。
从大鱼远程克隆 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` 待完整下载核验后发布。
## 历史 1.4.1(26):相邻插入、蒙版可读性与钢笔流程
APP实际编译 `0eb56aed126c825ca89712ce90f8cc1c05b03d89`,公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326` Accepted;票据、Gatekeeper、唯一正式安装和安装后281项原生检查通过。正式路径、Bundle ID和签名团队不变。PKG/Release以当前验证JSON的版本和成功状态为准。 本轮发行标签 `v1.4.1-mask-workflow-20261101`;包 `../发行包/大鱼调色-1.4.1.pkg`,14,337,616字节,SHA-256 `0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6`。PKG公证 `9a5ff448-2ac1-444e-b993-2928cf8c333f` Accepted,票据/Gatekeeper与20项展开验包通过;本轮未再次执行系统安装器。
@@ -8,9 +26,9 @@ APP实际编译 `0eb56aed126c825ca89712ce90f8cc1c05b03d89`,公证 `1ddc5499-2d
蒙版面板扩大文字/数值和按钮,钢笔有明确的绘制、完成、取消与重画状态;实时草稿不调用宿主API,完成后单次提交。跟踪采用实际路径范围、300特征、亚像素精炼、21×21光流,采样最高3840×2160。Color Finale只读研究与独立适配差异见 `research/ColorFinaleMasksFollowup.md`,并非完整移植所有原版蒙版能力。
FCP12.4相邻插入、独立初始化参数、面板/绘制态、钢笔蒙版正向99键、一次撤销/重做和冷重开完整预设一致;实际鼠标钢笔落点/闭合待用户确认,自动输入未进入OSC回调。原生281项和独立跟踪18项通过,不等同所有真实素材与手势均已验收。详见 `verification/HostMaskWorkflow1.4.1.json`。
FCP12.4相邻插入、独立初始化参数、面板/绘制态、钢笔蒙版正向99键、一次撤销/重做和冷重开完整预设一致;用户实际鼠标钢笔落点/闭合已确认通过,答复“可以绘制并闭合”;自动输入未进入OSC回调。原生281项和独立跟踪18项通过,不等同所有真实素材与手势均已验收。详见 `verification/HostMaskWorkflow1.4.1.json`。
从远端独立恢复224文件、full/strict fsck,并从恢复源码重建模型/模板及Metal,与正式版着色器一致,见 `verification/MaskWorkflowRecovery.json`。无LFS/子模块;临时clone已清理。中间25版及24版临时APP备份在26版验证后清理,历史正式PKG保留。
从远端独立恢复224文件、full/strict fsck,并从恢复源码重建模型/模板及Metal,与正式版着色器一致,见 `verification/MaskWorkflowRecovery.json`。无LFS/子模块;临时clone已清理。中间25版及24版临时APP备份在26版验证后清理,历史正式PKG保留。 发行标签提交 `23d5af7dcfecc9042896a7fa3e8b8b150ed874b8` 已从远端独立恢复228文件并逐字节核对,见 `verification/MaskWorkflowReleaseRecovery.json`。Release369/附件14已经草稿网页和发布后完整下载校验,详见 `verification/Release.json`。
## 历史 1.4.0(24):每工具蒙版与初始化叠层
+1 -1
查看文件
@@ -36,4 +36,4 @@ OSC回调只在锁内更新内存草稿,立即供下一次绘制读取;宿
1.4.1(26)APP公证Accepted,唯一正式安装与281项原生检查通过。FCP12.4在独立合成工程中验证:相邻插入、连续原层点击插入顺序、零参数新层与32色相既有层独立、放大面板、绘制态/跟踪禁用、提示文字方向、钢笔蒙版正向99键和一次撤销/重做。冷重开后完整预设逐字节相同。
CUA坐标输入未进入原生OSC回调;实际鼠标钢笔放点与闭合仍待用户确认。跟踪宿主验收使用现存默认闭合四点钢笔路径,不称为新手绘路径。真实鼠标中心拖动有1.4.0用户确认,但不扩大为本轮钢笔确认。记录见 `verification/HostMaskWorkflow1.4.1.json`。
CUA坐标输入未进入原生OSC回调;用户随后实际鼠标确认“可以绘制并闭合”,钢笔放点与闭合通过。跟踪宿主验收使用现存默认闭合四点钢笔路径,不称为新手绘路径。真实鼠标中心拖动有1.4.0用户确认;本轮钢笔确认仅覆盖放点和闭合,不扩大为曲柄、删除、旋转/缩放等全部手势已实测。记录见 `verification/HostMaskWorkflow1.4.1.json`。
+25
查看文件
@@ -0,0 +1,25 @@
# 1.4.2 中间帧启动与真实素材跟踪修复
本轮针对用户报告的“从中间没有反应、必须首帧正向、失去可靠跟踪”复现。FCP12.4使用当前正式1.4.1(26),把用户工程原生导出到本机验收缓存并导入独立副本,保留原项目、媒体与调色/蒙版设置。4K60源在25帧时间线:首帧正向保留65键;源时间3.68秒中间启动仅增加3键后失败,并弹出宿主分析错误。此前的合成视频检查不能替代这个真实素材问题。
## 修复
启动不再要求当前预览缓存存在且时间完全相等。FCP可以复用已渲染画面而不再进入插件渲染回调,因此缓存只作可选方向校对;实际FxAnalyzer首帧才是跟踪种子。仍检查分析起点范围、精确帧序、取消、冻结目标与迟到写入。新增原生检查覆盖无任何渲染缓存的中间启动、陈旧预览缓存和像素不同的预览缓存。
分析从完整宿主源图读取,按显示长宽比限制到1280×720,不放大小图;降采样前对源像素覆盖范围作低通,避免4K衣物细纹混叠为不一致运动。原调色渲染和输出分辨率不变。上一轮3840×2160是分析采样上限,本轮改用稳定的运动分析尺度;不再把“输入支持4K”写成仍逐像素4K分析。原生GPU检查使用3像素周期纹理,证明4K→720p先低通而非只抽中间像素。
仿射RANSAC细化容差改为3像素,并相应归一化残差置信度惩罚;只扩大容差而保留旧惩罚会在一致运动上过早低置信度停止。至少8内点、52%一致运动、最低0.3置信度、非线状分布、单步缩放/旋转和累计变换保护仍保留。未采用丢失后复制坐标伪造轨迹。新增确定平移、2.15像素非刚性残差和10%离群对应点的拟合检查;另有真实CPU/Metal图像光流、画面切换和平坦区域拒绝。
第一帧开始立即显示进度。失跟按特征不足、运动不一致、置信度、出画或变换问题区分,说明保留的可信帧数。普通失跟、主动取消、单帧完成使用SDK的 `FxPlugErrorDomain / kFxError_UserCancelled` 正常取消标记,既结束宿主后台任务又不弹错误;引擎、无效源图和时序错误仍明确失败。27版候选仅返回NO/nil时,FCP的诊断分析残留在50%并影响退出,已在28版修复;不能把本地trackingActive清理当作宿主任务已结束。SDK证据见本机FxTypes.h的UserCancelled说明。最终31版正式宿主已确认任务回到闲置、可再次启动和正常退出。
单帧完成后先由FxTimingAPI把分析源时间转换为时间线时间,再移动播放头。28版候选在前有4秒片段时错误跳到源3.72秒,29版修正为时间线7.72秒。原生覆盖带4秒偏移的反向单帧和连续两次正向单帧,包含非整数帧率的精确CMTime。
已有相同轨迹的单帧操作也应前进播放头,以实际完成的连续两帧为依据,不以作者数据是否改变为依据;重复结果不增加一次无效作者写入或撤销。
首帧反向不拒绝desiredAnalysisTimeRange,而是返回只含种子的有效一帧范围,正常完成且不写入新轨迹。30版在范围发现回调返回NO/UserCancelled时,FCP主线程等范围回包、SDK工作线程同步调用宿主setAnalysisState而互等;本机进程采样确认。SIGTERM未能结束阻塞的服务,随后仅终止无作者数据的本产品XPC服务后FCP恢复并正常退出,没有强制结束宿主,验收完整预设已提前保存。31版边界回调不再进入该错误路径。
## 验证与边界
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均未发布。
原始媒体、FCPXML快照、作者状态和解码帧均仅在本机验收缓存,普通Git只保存聚合结果与通用诊断源码。未修改父“大鱼调色盘”或Color Finale。不是人物分割/非刚性逐点描边;转身、遮挡、变形和出画仍可能需要手工调整后从当前帧继续。新增工具标量和透视/剪切等既有边界保持。
+7 -2
查看文件
@@ -92,8 +92,13 @@ def main():
if old:unregister(old/PLUGIN)
archive.unlink();backup=CACHE/'previous-template.moef'
if backup.exists():backup.unlink()
run('pluginkit','-a',str(DEST/PLUGIN));registry=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
entries=[l for l in registry.splitlines() if 'com.dayu.color.XPC(' in l]
# Unregistering an old copy can race the host's launch registration. Re-add
# only the verified installed path; never repeat signing/notarization/install.
for attempt in range(3):
run('pluginkit','-a',str(DEST/PLUGIN));registry=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
entries=[l for l in registry.splitlines() if 'com.dayu.color.XPC(' in l]
if entries:break
time.sleep(.5)
if len(entries)!=1 or not entries[0].rstrip().endswith('\t'+str(DEST/PLUGIN)):raise RuntimeError('PluginKit发现多份/错误版本: '+registry)
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=hashlib.sha256(TEMPLATE.read_bytes()).hexdigest(),shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
if old:record['previousInstallBackup']=str(old)
+53
查看文件
@@ -0,0 +1,53 @@
// Read-only tracker probe for caller-decoded top-first gray8 frames.
// Media remains outside the repository. This is independent of host scheduling.
#import <Foundation/Foundation.h>
#include "../大鱼调色/Plugin/MaskCore/DYTracker.hpp"
#include "../大鱼调色/Plugin/DYToolFlow.inc.h"
#include <fstream>
#include <chrono>
class MeasuredFlow final : public dy::FlowBackend {
std::shared_ptr<dy::FlowBackend> base_;
public:
size_t matches=0;
explicit MeasuredFlow(std::shared_ptr<dy::FlowBackend> base):base_(std::move(base)){}
bool reset(const dy::GrayFrame& f) override {matches=0;return base_->reset(f);}
bool advance(const dy::GrayFrame& f,const std::vector<dy::FlowPoint>& p,
std::vector<dy::FlowMatch>& out) override {
bool ok=base_->advance(f,p,out);matches=out.size();return ok;
}
};
int main(int argc,const char*argv[]) {@autoreleasepool {
if(argc!=14){fprintf(stderr,"gray8 width height start end step metallib|- cx cy width height angle output.json\n");return 2;}
const int width=atoi(argv[2]),height=atoi(argv[3]),start=atoi(argv[4]),end=atoi(argv[5]),step=atoi(argv[6]);
if(width<16||height<16||start<0||end<0||(step!=1&&step!=-1)||(end-start)*step<0)return 2;
dy::TrackerROI roi{float(atof(argv[8])),float(atof(argv[9])),float(atof(argv[10])),float(atof(argv[11])),float(atof(argv[12]))};
std::ifstream input(argv[1],std::ios::binary);if(!input)return 2;
auto read=[&](int index){
std::vector<uint8_t> bytes(size_t(width)*height);
input.clear();input.seekg(std::streamoff(index)*bytes.size());input.read((char*)bytes.data(),bytes.size());
if(input.gcount()!=std::streamsize(bytes.size()))return dy::GrayFrame{};
dy::GrayFrame f{width,height,std::vector<float>(bytes.size())};
for(size_t i=0;i<bytes.size();++i)f.pixels[i]=bytes[i]/255.f;
return f;
};
dy::Tracker tracker;std::shared_ptr<MeasuredFlow> measured;
bool metal=strcmp(argv[7],"-")!=0;
if(metal){NSError *error=nil;auto backend=DYToolCreateMetalFlow([NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[7]]],&error);if(!backend){fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);return 2;}measured=std::make_shared<MeasuredFlow>(backend);tracker.setBackend(measured);}
tracker.setMask({{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}});
NSMutableArray *frames=[NSMutableArray array];bool complete=true;
auto beginning=std::chrono::steady_clock::now();
for(int index=start;(end-index)*step>=0;index+=step){
auto frame=read(index);if(!frame.valid())return 2;
bool valid=index==start?tracker.reset(frame,roi):tracker.track(frame).valid;
auto r=tracker.result();
[frames addObject:@{@"frame":@(index),@"valid":@(valid),@"features":@(r.features),@"flowMatches":@(r.matches),@"inliers":@(r.inliers),@"confidence":@(r.confidence),@"medianResidualPixels":@(r.medianError),@"failure":@((int)r.failure),@"centerX":@(r.cx),@"centerY":@(r.cy),@"scaleX":@(r.scaleX),@"scaleY":@(r.scaleY),@"rotation":@(r.rotation)}];
if(!valid){complete=false;break;}
}
auto milliseconds=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-beginning).count();
NSDictionary *report=@{@"complete":@(complete),@"backend":metal?@"Metal":@"CPU",@"width":@(width),@"height":@(height),@"start":@(start),@"end":@(end),@"milliseconds":@(milliseconds),@"frames":frames,@"scope":@"Caller-decoded top-first gray8 frames; no host timing or original-video equivalence claim."};
NSData *json=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil];
if(![json writeToFile:[NSString stringWithUTF8String:argv[13]] atomically:YES])return 2;
fprintf(stdout,"%s frames=%lu last=%d complete=%d\n",metal?"Metal":"CPU",(unsigned long)frames.count,[frames.lastObject[@"frame"]intValue],complete);return 0;
}}
+23
查看文件
@@ -29,6 +29,22 @@ static dy::GrayFrame frame(int w,int h,double tx=0,double ty=0,double angle=0,
return f;
}
// Isolate robust fitting and confidence from optical flow: coherent cloth-like
// 2.15px residuals plus 10% gross outliers, with a known mean translation.
class FitBudgetFlow final : public dy::FlowBackend {
public:
bool reset(const dy::GrayFrame&)override{return true;}
bool advance(const dy::GrayFrame&,const std::vector<dy::FlowPoint>& points,
std::vector<dy::FlowMatch>& out)override{
for(size_t i=0;i<points.size();i++){
float angle=float(i)*2.39996323f;
float dx=2.25f+2.15f*cosf(angle),dy=-1.5f+2.15f*sinf(angle);
if(i%10==0){dx+=35;dy-=25;}
auto p=points[i];out.push_back({p,{p.x+dx,p.y+dy},0});
}return true;
}
};
int main(int argc,const char*argv[]) {@autoreleasepool {
NSMutableArray *checks=[NSMutableArray array];bool all=true;
auto record=[&](NSString *name,bool pass,NSDictionary *extra=nil) {
@@ -36,6 +52,13 @@ int main(int argc,const char*argv[]) {@autoreleasepool {
d[@"name"]=name;d[@"pass"]=@(pass);[checks addObject:d];all&=pass;
};
NSURL *library=argc>1?[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]]:nil;
{
dy::Tracker tracker;tracker.setBackend(std::make_shared<FitBudgetFlow>());
auto image=frame(640,480);bool started=tracker.reset(image,{.5,.5,.85,.85,0});
auto result=tracker.track(image);double ex=fabs(result.cx-(.5+2.25/640))*640,ey=fabs(result.cy-(.5-1.5/480))*480;
record(@"coherent-residual-fit-budget-with-ten-percent-outliers",started&&result.valid&&ex<.8&&ey<.8&&fabs(result.scaleX-1)<.02&&fabs(result.scaleY-1)<.02,
@{@"scope":@"Controlled correspondence unit test; not an optical-flow image oracle",@"inliers":@(result.inliers),@"matches":@(result.matches),@"confidence":@(result.confidence),@"xErrorPixels":@(ex),@"yErrorPixels":@(ey)});
}
for(int mode=0;mode<(library?2:1);mode++) {
NSString *prefix=mode?@"metal":@"cpu";
auto setup=[&](dy::Tracker& tracker) {
+6 -9
查看文件
@@ -2,18 +2,15 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.4.1",
"build": "26",
"version": "1.4.2",
"build": "31",
"team": "B3W25FX5H5",
"notaryID": "1ddc5499-2da3-4d98-8b2d-09272b0ee326",
"notaryID": "0bb9a94e-c54a-4d87-95ec-51338579c04f",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "0eb56aed126c825ca89712ce90f8cc1c05b03d89",
"sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
"shaderSHA256": "757b240921846ed06ca294a9bbfbd4aee5d41c6361a3918254a806187eb997ea",
"hostVerification": "verification/HostMaskWorkflow1.4.1.json",
"hostVerificationLimitations": [
"实际鼠标钢笔落点和闭合待用户确认;原生OSC模拟检查通过。"
]
"shaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e",
"hostVerification": "verification/HostTrackingMidpoint1.4.2.json"
}
+19 -2
查看文件
@@ -1,5 +1,5 @@
{
"status": "verified-with-explicit-pen-gesture-gap",
"status": "verified",
"host": "Final Cut Pro 12.4",
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"fixtureProject": "大鱼调色_1.4.1_25_独立工具与蒙版",
@@ -49,6 +49,11 @@
{
"name": "single-undo-clears-track-and-redo-exactly-restores-full-preset",
"passed": true
},
{
"name": "user-actual-mouse-pen-placement-and-closure",
"passed": true,
"evidence": "User answered: 可以绘制并闭合"
}
],
"presetBefore": {
@@ -57,7 +62,7 @@
"sha256": "9654ff3be150928e20f1b8536227bc39169997f36c6b82f91c3c945ef1fbcb0a"
},
"limitations": [
"CUA coordinate clicks do not enter the FCP native OSC hit/event callback. Actual-mouse pen placement/closure remains unconfirmed pending user reply. Native real-OSC simulated-host tests passed separately.",
"CUA coordinate clicks did not enter native OSC callbacks; actual-mouse pen point placement and closure were separately confirmed by the user. Other pen gestures are covered by native simulated-host tests unless independently noted.",
"No claim of full Color Finale migration or same-real-video trajectory parity.",
"Old schema1 tail layers keep their saved position and rendering for compatibility."
],
@@ -97,5 +102,17 @@
"checks": 281,
"passResult": true,
"timingNote": "First build26 cache run had 280/281: external-activation-main-loop-responsive had 0 heartbeat /155.951ms; repeat, Release preflight, and installed runs all281 pass. Commit0eb56ae message prematurely said281pass before inspecting the initial run."
},
"userPenGestureConfirmation": {
"answer": "可以绘制并闭合",
"method": "User actual mouse in prepared independent FCP acceptance project; reply to three-point pen and closure question",
"build": "26",
"recordedAt": "2026-11-01T23:59:27.929332+08:00",
"scope": [
"pen point placement",
"pen path closure"
],
"otherGesturesNotImplied": true,
"currentUserDrawingPreserved": true
}
}
@@ -0,0 +1,76 @@
{
"passResult": true,
"version": "1.4.2",
"build": "31",
"host": "Final Cut Pro 12.4",
"sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
"formalAppPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"runtimeXPCPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service",
"originalUserProjectPreserved": true,
"media": {
"width": 3840,
"height": 2160,
"sourceFPS": 60,
"timelineFPS": 25,
"durationSeconds": 11.4
},
"testProjects": "Independent copies created as build28 QA projects; final actual runtime is build31. Native XML1.14 strict DTD and all3 source media references verified before import.",
"final31": {
"middleReferenceSeconds": 3.68,
"middleBothTrustedKeys": 285,
"sourceRangeSeconds": [
0,
11.36
],
"forwardFromStartTrustedKeys": 285,
"activeCancelTrustedPrefixKeys": 159,
"activeCancelPrefixEndSeconds": 6.32,
"activeCancelHostTaskIdle": true,
"cancelThenRestartCompleted": true,
"cutLossTrustedKeys": 50,
"cutLossRangeSeconds": [
0,
1.96
],
"cutLossAtSeconds": 2,
"cutLossImmediateRerun": true,
"cutLossModal": false,
"cutLossHostTaskIdle": true,
"firstFrameBackward": "Boundary message, no new keys, host remains responsive, all background tasks idle",
"singleStepsTimeline": [
"00:00:07:17",
"00:00:07:18",
"00:00:07:19",
"00:00:07:18"
],
"singleStepsRepeatExistingKeys": true,
"normalHostQuit": true,
"coldReopenFullPresetByteIdentical": true,
"coldReopenPresetBytes": 77087,
"coldReopenPresetSHA256": "44228227dd318a051f4f6e786b8b756f36792df12b5009464d1ffed34bd50ae2"
},
"candidate27Math": {
"midForwardNewKeys": 193,
"midForwardTotalKeys": 258,
"midBackwardKeys": 93,
"midBothKeys": 285,
"startForwardKeys": 285,
"undoRestoresOriginalFullPreset": true,
"redoRestoresTrackedFullPreset": true,
"xmlRoundtrip": "All5 project format/timecode/clip boundaries/media/static transforms/effect references compared_fields_match; opaque plugin parameter semantics tested through full preset"
},
"candidate28Lifecycle": {
"midBothKeys": 285,
"midForwardNewKeys": 193,
"lossAndRerunHostTaskIdle": true,
"activeCancelHostTaskIdle": true,
"normalHostQuit": true,
"offsetSingleStepBug": "Fixed in29/30; final31 retested"
},
"rejectedCandidate30Boundary": "Range rejection SDK synchronous setAnalysisState deadlocked; stateless XPC service stopped after QA preset saved, FCP recovered and quit normally. No host kill. Final31 seed-only boundary task completes.",
"limits": [
"Region affine tracking, not per-point deformable rotoscoping or subject segmentation; large occlusion/rotation/deformation may need manual adjustment and retracking.",
"Full Color Finale parity is not claimed; Motion, Intel, retiming/crop/non-square-pixel projects were not live verified.",
"No decoded user frames, media, author presets or FCP project contents are stored in Git."
]
}
+59 -5
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 281,
"checks": 293,
"gpu": "Apple M4",
"limitations": [
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
@@ -12,7 +12,7 @@
"error": "未提供错误信息",
"name": "runtime-directory",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61021897-A6C6-4361-A981-22AAA9838782"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574"
},
{
"descriptors": 234,
@@ -816,7 +816,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61021897-A6C6-4361-A981-22AAA9838782/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -836,7 +836,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 88.72558339498937,
"maximumGapMS": 90.35904170013964,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -1367,6 +1367,10 @@
"name": "cancel-keeps-only-contiguous-trusted-segment",
"pass": true
},
{
"name": "cancel-sends-sdk-quiet-analysis-termination",
"pass": true
},
{
"name": "bidirectional-passes-share-reference-and-merge-once",
"pass": true
@@ -1375,6 +1379,56 @@
"name": "backward-single-step-includes-reference-and-one-neighbor",
"pass": true
},
{
"name": "single-step-sends-sdk-quiet-analysis-termination",
"pass": true
},
{
"name": "backward-single-step-seeks-timeline-with-clip-offset",
"pass": true
},
{
"name": "repeated-forward-single-step-continues-source-frames-at-offset-clip",
"pass": true
},
{
"name": "unchanged-single-step-still-advances-without-duplicate-author-write",
"pass": true,
"seekCount": 5,
"writesAfter": 7,
"writesBefore": 7
},
{
"name": "texture-loss-keeps-prefix-and-sends-sdk-quiet-termination",
"pass": true
},
{
"name": "boundary-seed-only-range-completes-without-author-write-or-rejected-range",
"pass": true
},
{
"name": "late-analysis-frame-also-terminates-host-job-quietly",
"pass": true
},
{
"name": "middle-frame-start-with-no-preview-render-cache",
"pass": true
},
{
"name": "middle-frame-start-ignores-stale-preview-cache",
"pass": true
},
{
"name": "analysis-seed-does-not-require-preview-pixel-equality",
"pass": true
},
{
"height": 720,
"maximumError": 4.9269199371315686e-05,
"name": "tracking-4k-frame-lowpass-before-normalized-motion-grid",
"pass": true,
"width": 1280
},
{
"name": "canvas-cold-load-selects-saved-mask-from-immutable-snapshot",
"pass": true
@@ -1483,6 +1537,6 @@
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/61021897-A6C6-4361-A981-22AAA9838782",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
@@ -0,0 +1,16 @@
{
"passResult": true,
"repository": "https://dayu.media/git/dayu/dayu-color.git",
"tag": "v1.4.1-mask-workflow-20261101",
"tagCommit": "23d5af7dcfecc9042896a7fa3e8b8b150ed874b8",
"compiledSource": "0eb56aed126c825ca89712ce90f8cc1c05b03d89",
"restoredFiles": 228,
"fsck": "full strict passed",
"sourceRecovery": "verification/MaskWorkflowRecovery.json",
"packageBytes": 14337616,
"packageSHA256": "0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6",
"allTaggedFilesMatch": true,
"LFS": false,
"submodules": false,
"cloneCleaned": true
}
+15 -15
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.1.pkg",
"sha256": "0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6",
"bytes": 14337616,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.2.pkg",
"sha256": "d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2",
"bytes": 14339640,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,27 +31,27 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.4.1",
"build": "26"
"version": "1.4.2",
"build": "31"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.f2577d05-34d4-4ef1-aa6d-7e7aca56f716/4CA0FF20-56AD-40A6-9383-45374239C928/大鱼调色"
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.433fb568-723d-4910-be75-38a618449778/1C7412DC-13CA-41A2-A6D5-160A227AC15A/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.4.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-01 15:38:31 +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.1.pkg: accepted\nsource=Notarized Developer ID",
"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",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"message": "Successfully received submission info",
"createdDate": "2026-11-01T15:38:33.055Z",
"name": "大鱼调色-1.4.1.pkg",
"id": "9a5ff448-2ac1-444e-b993-2928cf8c333f",
"status": "Accepted"
"status": "Accepted",
"id": "2de9f8bb-91b5-41dc-924c-1136ae7bf73f",
"createdDate": "2026-11-01T17:51:45.227Z",
"name": "大鱼调色-1.4.2.pkg"
},
"appCompiledSource": "0eb56aed126c825ca89712ce90f8cc1c05b03d89",
"appBuild": "26",
"appCompiledSource": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
"appBuild": "31",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
@@ -59,6 +59,6 @@
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostMaskWorkflow1.4.1.json",
"installedAppHostAcceptance": "verification/HostTrackingMidpoint1.4.2.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+12 -9
查看文件
@@ -1,12 +1,15 @@
{
"status": "prepared-before-upload",
"tag": "v1.4.1-mask-workflow-20261101",
"status": "prepared-not-published",
"passResult": false,
"version": "1.4.2",
"build": "31",
"repository": "dayu/dayu-color",
"version": "1.4.1",
"build": "26",
"appCompiledSource": "0eb56aed126c825ca89712ce90f8cc1c05b03d89",
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.1.pkg",
"bytes": 14337616,
"sha256": "0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6",
"previousRelease": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.0-tool-masks-20261101"
"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"
}
@@ -0,0 +1,13 @@
{
"passResult": true,
"method": "Authenticated existing Edge session full web download while release remained draft",
"path": "/Volumes/备份/大鱼调色-1.4.1.pkg",
"bytes": 14337616,
"sha256": "0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6",
"releaseID": 369,
"assetID": 14,
"tag": "v1.4.1-mask-workflow-20261101",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.4.1-mask-workflow-20261101/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.4.1.pkg",
"temporaryDownloadCleaned": true,
"formalPackagePreserved": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.1.pkg"
}
+228
查看文件
@@ -0,0 +1,228 @@
{
"status": "formal-native-and-fcp-validated",
"version": "1.4.2",
"build": "31",
"baselineSource": "847a5ea99903c0b7427301c799e1c40f3fe6c5ad",
"nativeChecks": 293,
"independentChecks": [
{
"pass": true,
"confidence": 0.38259220123291016,
"scope": "Controlled correspondence unit test; not an optical-flow image oracle",
"xErrorPixels": 0.09802246093748579,
"inliers": 270,
"yErrorPixels": 0.011092185974126423,
"name": "coherent-residual-fit-budget-with-ten-percent-outliers",
"matches": 300
},
{
"name": "cpu-pen-texture-outside-creation-box-starts",
"pass": true,
"features": 117
},
{
"yErrorPixels": 0.03234100341796875,
"xErrorPixels": 0.007296752929676131,
"name": "cpu-extended-pen-region-subpixel-motion",
"pass": true
},
{
"name": "cpu-real-300-feature-capacity",
"pass": true,
"features": 300
},
{
"pass": true,
"rotation": 0.02499544620513916,
"scaleX": 1.025027871131897,
"scaleY": 0.9799908995628357,
"xErrorPixels": 0.0009307861328267109,
"yErrorPixels": 0.0005807876586860772,
"name": "cpu-translation-rotation-independent-xy-scale"
},
{
"name": "cpu-subpixel-refinement-and-redetection-remain-stationary",
"pass": true
},
{
"name": "cpu-unrelated-cut-is-not-trusted-motion",
"pass": true
},
{
"name": "cpu-flat-region-still-refuses-tracking",
"pass": true
},
{
"generatedFramesAndAnalysisMilliseconds": 51.241667,
"features": 300,
"name": "cpu-1080p-complete-frame-motion",
"pass": true
},
{
"generatedFramesAndAnalysisMilliseconds": 130.370417,
"features": 300,
"name": "cpu-3840x2160-complete-frame-motion",
"pass": true
},
{
"name": "metal-pen-texture-outside-creation-box-starts",
"pass": true,
"features": 117
},
{
"yErrorPixels": 0.03234100341796875,
"xErrorPixels": 0.007296752929676131,
"name": "metal-extended-pen-region-subpixel-motion",
"pass": true
},
{
"name": "metal-real-300-feature-capacity",
"pass": true,
"features": 300
},
{
"pass": true,
"rotation": 0.02499544620513916,
"scaleX": 1.025027871131897,
"scaleY": 0.9799908995628357,
"xErrorPixels": 0.0009307861328267109,
"yErrorPixels": 0.0005807876586860772,
"name": "metal-translation-rotation-independent-xy-scale"
},
{
"name": "metal-subpixel-refinement-and-redetection-remain-stationary",
"pass": true
},
{
"name": "metal-unrelated-cut-is-not-trusted-motion",
"pass": true
},
{
"name": "metal-flat-region-still-refuses-tracking",
"pass": true
},
{
"generatedFramesAndAnalysisMilliseconds": 37.962792,
"features": 300,
"name": "metal-1080p-complete-frame-motion",
"pass": true
},
{
"generatedFramesAndAnalysisMilliseconds": 109.041875,
"features": 300,
"name": "metal-3840x2160-complete-frame-motion",
"pass": true
}
],
"hostBaseline": {
"version": "1.4.1",
"build": "26",
"sourceWidth": 3840,
"sourceHeight": 2160,
"sourceFPS": 60,
"timelineFPS": 25,
"sourceDurationSeconds": 11.4,
"forwardFromStartTrustedKeys": 65,
"middleReferenceSeconds": 3.68,
"newMiddleKeys": 3,
"displayedFailure": "失去可靠跟踪,保留最后可信帧",
"modalAlert": true,
"originalUserProjectPreserved": true
},
"realMediaOffline": {
"start": {
"complete": true,
"frames": 285,
"startFrame": 0,
"endFrame": 284,
"last": {
"failure": 0,
"confidence": 0.978393018245697,
"rotation": -0.11834434419870377,
"valid": true,
"frame": 284,
"centerY": 0.9093142151832581,
"flowMatches": 252,
"medianResidualPixels": 0.05460958555340767,
"centerX": 0.4167436957359314,
"scaleY": 1.8007324934005737,
"scaleX": 1.2875596284866333,
"features": 252,
"inliers": 252
},
"scope": "Offline decoded gray8 at 1280x720; host confirmation is separate"
},
"middle-forward": {
"complete": true,
"frames": 193,
"startFrame": 92,
"endFrame": 284,
"last": {
"failure": 0,
"confidence": 0.9728200435638428,
"rotation": -0.03911023586988449,
"valid": true,
"frame": 284,
"centerY": 0.8755143284797668,
"flowMatches": 298,
"medianResidualPixels": 0.06889039278030396,
"centerX": 0.4592028260231018,
"scaleY": 2.144608974456787,
"scaleX": 1.803216576576233,
"features": 298,
"inliers": 298
},
"scope": "Offline decoded gray8 at 1280x720; host confirmation is separate"
},
"middle-backward": {
"complete": true,
"frames": 93,
"startFrame": 92,
"endFrame": 0,
"last": {
"failure": 0,
"confidence": 0.8557574152946472,
"rotation": 0.0420353040099144,
"valid": true,
"frame": 0,
"centerY": 0.5898973941802979,
"flowMatches": 165,
"medianResidualPixels": 0.314788281917572,
"centerX": 0.5102063417434692,
"scaleY": 1.157965064048767,
"scaleX": 1.2286995649337769,
"features": 170,
"inliers": 165
},
"scope": "Offline decoded gray8 at 1280x720; host confirmation is separate"
}
},
"analysisMaximum": [
1280,
720
],
"sampling": "Low-pass encoded display luma over the source footprint before decimation, top-first, with pixel aspect correction",
"fitTolerancePixels": 3,
"confidence": "Residual penalty normalized to accepted fit budget; minimum confidence .3, minimum8 inliers,52%consensus and transform/2D-spread guards retained",
"cachePolicy": "First analyzer frame is authoritative; fresh instance, stale cache and changed preview pixels cannot veto the start",
"privacy": "Only aggregate test metadata is committed. User media, exported timeline and decoded frames remain local.",
"limitations": [
"Region affine tracking, not per-point subject segmentation or deformable rotoscoping; occlusion/deformation may need manual adjustment and continuation.",
"Full Color Finale migration is not claimed; live Motion, Intel and retiming/crop/non-square-pixel projects are outside this acceptance."
],
"initialNativeTimingFailure": {
"check": "external-activation-main-loop-responsive",
"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",
"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.",
"existingSingleStep": "An already identical tracked pair must still advance the playhead without duplicating the author write; regression added in30.",
"nativeRegressionFixtureNote": "Initial unchanged-step fixture followed a different reference frame, legitimately changed the reference confidence. Correct fixture repeats the same two-frame operation twice; second pass advances without author write.",
"boundaryPolicy": "At the first frame, backward analysis returns a valid one-seed-frame range and completes with no new author keys; never reject desiredAnalysisTimeRange for this normal boundary. Candidate30 NO/UserCancelled at range discovery deadlocked FCP main waiting for plugin range reply while SDK tried synchronous host setAnalysisState. Own stateless XPC service stopped after saved QA preset, restoring FCP; FCP quit normally, original user project untouched.",
"sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
"hostVerification": "verification/HostTrackingMidpoint1.4.2.json",
"formalNativeChecks": 293
}
+45
查看文件
@@ -0,0 +1,45 @@
{
"passResult": true,
"formalBuild": "31",
"removedKnownCandidateBackups": [
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-d04b2bcc671f4022a6747fa05d7f6822.app",
"build": "26"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-13eeb98213d24a1da3f49781429e4ed5.app",
"build": "27"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-30dacc70582b49b281f331992f0eae95.app",
"build": "28"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6025c526da6a416eb90435cf7a8e3dd1.app",
"build": "29"
}
],
"deliveryScriptRemovedImmediatePreviousBackup": true,
"decodedDiagnosticFramesRemoved": [
{
"name": "real-25fps-3840x2160.gray",
"bytes": 2363904000
},
{
"name": "real-25fps-1920x1080.gray",
"bytes": 590976000
},
{
"name": "real-25fps-1280x720.gray",
"bytes": 262656000
},
{
"name": "real-25fps-960x540.gray",
"bytes": 147744000
}
],
"originalMediaPreserved": true,
"localUserProjectSnapshotsAndPresetsPreserved": true,
"formalPluginKitEntries": 1,
"otherProductBackupsUntouched": true
}
@@ -0,0 +1,14 @@
{
"passResult": true,
"repository": "https://dayu.media/git/dayu/dayu-color.git",
"sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128",
"restoredFiles": 233,
"fsck": "full strict passed",
"rebuiltShaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e",
"formalShaderMatches": true,
"templateRebuiltFromNativeModel": true,
"templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738",
"LFS": false,
"submodules": false,
"cloneCleaned": true
}
+20 -11
查看文件
@@ -15,7 +15,7 @@
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
@synchronized(_toolCaptureDevices){FxRect b=tile.tilePixelBounds,image=tile.imagePixelBounds;if(b.left!=image.left||b.right!=image.right||b.bottom!=image.bottom||b.top!=image.top)return {};
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>d=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)d=candidate;if(d){id<MTLLibrary>library=[d newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>function=[library newFunctionWithName:@"dyToolCapture"];id<MTLComputePipelineState>pipeline=function?[d newComputePipelineStateWithFunction:function error:error]:nil;id<MTLCommandQueue>queue=[d newCommandQueue];if(pipeline&&queue){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"pipeline":pipeline,@"queue":queue}];_toolCaptureDevices[key]=entry;}[pipeline release];[queue release];[function release];[library release];}[devices release];if(!entry)return {};}
id<MTLTexture>texture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=tile.pixelAspect;if(!std::isfinite(aspect)||aspect<=0)return {};aspect=MAX(.01,aspect);double displayHeight=texture.height/aspect,scale=MIN(1.,MIN(3840./texture.width,2160./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>2160||width>3840)return {};
id<MTLTexture>texture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=tile.pixelAspect;if(!std::isfinite(aspect)||aspect<=0)return {};aspect=MAX(.01,aspect);double displayHeight=texture.height/aspect,scale=MIN(1.,MIN(1280./texture.width,720./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>720||width>1280)return {};
id<MTLBuffer>buffer=[entry[@"device"]newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared];if(!buffer)return {};vector_uint3 info={width,height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"pipeline"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info) atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted];dy::GrayFrame frame;if(commands.status==MTLCommandBufferStatusCompleted){frame={int(width),int(height),std::vector<float>(width*height)};memcpy(frame.pixels.data(),buffer.contents,width*height*sizeof(float));}[buffer release];return frame;
}
}
@@ -36,10 +36,14 @@
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{
id<FxAnalysisAPI>analysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;}
CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:notification.userInfo[@"node"] document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;}
@synchronized(self){if(!_toolSourceFrame.valid()||!CMTIME_IS_NUMERIC(_toolSourceTime)||CMTimeCompare(_toolSourceTime,time)!=0){[self toolStatus:@"请移动播放头至起点,等待当前画面完成后再开始跟踪"];return;}_trackingReferenceFrame=_toolSourceFrame;}
// The host may reuse an already rendered frame without calling our renderer.
// Analyzer input is authoritative; a matching preview is only an optional
// orientation check, never a prerequisite for starting at the playhead.
@synchronized(self){_trackingReferenceFrame={};if(_toolSourceFrame.valid()&&CMTIME_IS_NUMERIC(_toolSourceTime)&&CMTimeCompare(_toolSourceTime,time)==0)_trackingReferenceFrame=_toolSourceFrame;}
id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self];_trackingFrameDuration=numerator&&denominator&&numerator<=INT32_MAX?CMTimeMake(denominator,(int32_t)numerator):kCMTimeInvalid;if(!CMTIME_IS_NUMERIC(_trackingFrameDuration)||_trackingFrameDuration.value<=0){[self toolStatus:@"宿主未提供精确帧长,跟踪未启动"];return;}
[_trackingNode release];_trackingNode=[notification.userInfo[@"node"]copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;}
[self toolStatus:@"正在读取宿主源帧并跟踪…"];if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
}@finally{[a endAction:self];}
@@ -50,24 +54,29 @@
- (BOOL)stopToolAnalysis:(NSString*)message error:(NSError**)error {
if(message){[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
}
- (BOOL)finishToolAnalysis:(NSString*)message error:(NSError**)error {
// FxAnalyzer's quiet cancellation is an explicit SDK error sentinel. A bare
// NO/nil can leave FCP's background analysis task active after our cleanup.
[self stopToolAnalysis:message error:nil];if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:@{NSLocalizedDescriptionKey:message?:@"本次跟踪已结束"}];return NO;
}
- (BOOL)desiredAnalysisTimeRange:(CMTimeRange*)out forInputWithTimeRange:(CMTimeRange)input error:(NSError**)error {
CMTime end=CMTimeRangeGetEnd(input),ref=_trackingReferenceTime,step=_trackingFrameDuration;if(!CMTIME_IS_NUMERIC(input.start)||!CMTIME_IS_NUMERIC(end)||!CMTIME_IS_NUMERIC(ref)||ref.epoch!=input.start.epoch||ref.epoch!=end.epoch||CMTimeCompare(ref,input.start)<0||CMTimeCompare(ref,end)>=0||!CMTIME_IS_NUMERIC(step)||step.value<=0)return [self stopToolAnalysis:@"跟踪起点或帧长无效" error:error];
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0)return [self stopToolAnalysis:@"已到片段边界,未产生新轨迹" error:error];*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0&&!_trackingBoth){[_trackingMessage release];_trackingMessage=[@"已到片段边界,未产生新轨迹" copy];}*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
}
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error {
if(!CMTIME_IS_NUMERIC(duration)||duration.value<=0||duration.epoch!=0)return [self stopToolAnalysis:@"宿主分析帧长无效" error:error];_trackingFrameDuration=duration;_trackingPreviousTime=kCMTimeInvalid;_trackingFlip=NO;[_trackingSamples removeAllObjects];auto backend=DYToolCreateMetalFlow([[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"],error);if(!backend)return [self stopToolAnalysis:@"Metal 跟踪后端无法启动" error:error];_toolTracker.setBackend(backend);
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}_toolTracker.setMask(std::move(polygon));return YES;
}
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
if(!_trackingActive.load()||_trackingFinishing.load())return NO;_trackingInFrame.store(true);@try{
if(_trackingCancelled.load())return [self stopToolAnalysis:@"已取消;保留最后连续可信轨迹" error:nil];if(_trackingSingle&&_trackingSamples.count>=2)return [self stopToolAnalysis:nil error:nil];if(_trackingSamples.count>=DYToolKeyLimit)return [self stopToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);@try{
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
dy::GrayFrame frame=[self toolGrayFrame:tile error:error];if(!frame.valid()||frame.width!=_trackingReferenceFrame.width||frame.height!=_trackingReferenceFrame.height)return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
if(!_trackingSamples.count){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);BOOL direct=same<.035&&((same+.008<flip&&same<flip*.8)||flip<.008),reversed=flip<.035&&flip+.008<same&&flip<same*.8;if(!direct&&!reversed)return [self stopToolAnalysis:@"参考画面与分析帧不一致,请重新选择清晰起点" error:error];_trackingFlip=reversed;}
dy::GrayFrame frame=[self toolGrayFrame:tile error:error];if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
if(_trackingFlip)for(int y=0;y<frame.height/2;y++)for(int x=0;x<frame.width;x++)std::swap(frame.pixels[y*frame.width+x],frame.pixels[(frame.height-1-y)*frame.width+x]);
if(!_trackingSamples.count){if(!_toolTracker.reset(frame,{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle}))return [self stopToolAnalysis:@"蒙版内纹理不足,未生成不可靠轨迹" error:error];}else if(!_toolTracker.track(frame).valid)return [self stopToolAnalysis:@"失去可靠跟踪,保留最后可信帧" error:error];
if(!_trackingSamples.count){if(!_toolTracker.reset(frame,{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle}))return [self finishToolAnalysis:@"蒙版内纹理不足,原蒙版已保留" error:error];}else if(!_toolTracker.track(frame).valid){auto lost=_toolTracker.result();NSString *reason=@"区域内运动不一致";switch(lost.failure){case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;case dy::TrackFailure::InvalidTransform:reason=@"运动变换过大";break;case dy::TrackFailure::Backend:case dy::TrackFailure::InvalidFrame:reason=@"源画面或跟踪引擎异常";break;default:break;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整蒙版后从此处继续",reason,(unsigned long)_trackingSamples.count] error:error];}
auto result=_toolTracker.result();DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,time);p.centerX=result.cx;p.centerY=result.cy;p.width=_trackingSeed.width*result.scaleX;p.height=_trackingSeed.height*result.scaleY;p.angle=_trackingSeed.angle+result.rotation;if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error];[_trackingSamples addObject:DYMaskKey(time,p,NO,result.confidence)];_trackingPreviousTime=time;
if(_trackingSamples.count%15==0)[self toolStatus:[NSString stringWithFormat:@"已分析 %lu 帧 · 置信度 %.0f%%",(unsigned long)_trackingSamples.count,result.confidence*100]];return YES;
if(_trackingSamples.count==1||_trackingSamples.count%15==0)[self toolStatus:[NSString stringWithFormat:@"已分析 %lu 帧 · 置信度 %.0f%%",(unsigned long)_trackingSamples.count,result.confidence*100]];return YES;
}@finally{_trackingInFrame.store(false);}
}
- (BOOL)cleanupAnalysis:(NSError**)error {
@@ -77,8 +86,8 @@
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]];
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:self->_trackingNode document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&hasResults&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];[command movePlayheadToTime:stepTime error:nil];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
});return YES;
}
@@ -12,8 +12,36 @@
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
// Mid-analysis author edits must reject the result rather than clobber them.
capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled);
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_state=kFxAnalysisState_NotAnalyzing;request(0);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();BOOL backward=host->_backwardStarts==1;callbacks&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=0&&callbacks;i--){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"bidirectional-passes-share-reference-and-merge-once",callbacks&&backward&&[tracked[@"keys"]count]==6&&base->_undoStarts==writes+2);
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_state=kFxAnalysisState_NotAnalyzing;request(-2);BOOL range=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(1))==0&&CMTimeCompare(desired.duration,timeAt(2))==0;[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=1;i--){setFrame(i);[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}setFrame(0);stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"backward-single-step-includes-reference-and-one-neighbor",range&&stopped&&[tracked[@"keys"]count]==2);
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_timelineOffset=CMTimeMake(4,1);host->_state=kFxAnalysisState_NotAnalyzing;request(-2);BOOL range=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(1))==0&&CMTimeCompare(desired.duration,timeAt(2))==0;[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=1;i--){setFrame(i);[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}setFrame(0);NSError *singleStopError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&singleStopError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"backward-single-step-includes-reference-and-one-neighbor",range&&stopped&&[tracked[@"keys"]count]==2);run.record(@"single-step-sends-sdk-quiet-analysis-termination",[singleStopError.domain isEqual:FxPlugErrorDomain]&&singleStopError.code==kFxError_UserCancelled);
run.record(@"backward-single-step-seeks-timeline-with-clip-offset",host->_seekCount==1&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(1)))==0&&CMTimeCompare(host->_time,timeAt(1))==0);
DYWriteTools(base,doc,kCMTimeZero);capture(2);BOOL repeated=YES;for(int first=2;first<4;first++){request(2);repeated&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=first;i<=first+1&&repeated;i++){setFrame(i);repeated&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();repeated&=CMTimeCompare(host->_time,timeAt(first+1))==0;}run.record(@"repeated-forward-single-step-continues-source-frames-at-offset-clip",repeated&&host->_seekCount==3&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(4)))==0);
int priorWrites=0;for(int repeat=0;repeat<2;repeat++){priorWrites=base->_undoStarts;capture(2);request(2);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<=3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();}run.record(@"unchanged-single-step-still-advances-without-duplicate-author-write",callbacks&&host->_seekCount==5&&CMTimeCompare(host->_time,timeAt(3))==0&&base->_undoStarts==priorWrites,@{@"seekCount":@(host->_seekCount),@"writesBefore":@(priorWrites),@"writesAfter":@(base->_undoStarts)});
// An expected loss must end the host job, not only our local tracking state.
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
Pixels flat(tw*th*4,.1f);for(size_t i=3;i<flat.size();i+=4)flat[i]=1;[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:flat.data() bytesPerRow:tw*8];NSError *lossError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&lossError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"texture-loss-keeps-prefix-and-sends-sdk-quiet-termination",callbacks&&stopped&&[tracked[@"keys"]count]==3&&[lossError.domain isEqual:FxPlugErrorDomain]&&lossError.code==kFxError_UserCancelled);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(-1);NSError *boundaryError=nil;callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&boundaryError]&&CMTimeCompare(desired.start,kCMTimeZero)==0&&CMTimeCompare(desired.duration,timeAt(1))==0&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&boundaryError];setFrame(0);callbacks&=[plugin analyzeFrame:frame atTime:kCMTimeZero error:&boundaryError];host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();run.record(@"boundary-seed-only-range-completes-without-author-write-or-rejected-range",callbacks&&!boundaryError&&[DYReadTools(base,kCMTimeZero).document isEqual:doc]);
NSError *lateError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&lateError];run.record(@"late-analysis-frame-also-terminates-host-job-quietly",stopped&&[lateError.domain isEqual:FxPlugErrorDomain]&&lateError.code==kFxError_UserCancelled);
// A host cache hit can move the playhead without re-entering renderDestinationImage.
// Starting at a middle frame must use analyzer input even on a fresh instance.
DYWriteTools(base,doc,kCMTimeZero);id<DYToolHostProbe>cold=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];host->_time=timeAt(2);host->_state=kFxAnalysisState_NotAnalyzing;int starts=host->_forwardStarts;
[cold toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@1}]];
callbacks=host->_forwardStarts==starts+1&&[cold desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(2))==0&&[cold setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[cold analyzeFrame:frame atTime:timeAt(i) error:nil];}[cold cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"middle-frame-start-with-no-preview-render-cache",callbacks&&[tracked[@"keys"]count]==4&&CMTimeCompare(CMTimeMake([tracked[@"keys"][0][@"value"]longLongValue],[tracked[@"keys"][0][@"scale"]intValue]),timeAt(2))==0);
[cold release];
DYWriteTools(base,doc,kCMTimeZero);capture(0);host->_time=timeAt(2);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"middle-frame-start-ignores-stale-preview-cache",callbacks&&[tracked[@"keys"]count]==4);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
// Deliberately different preview pixels must not veto an authoritative analysis seed.
for(int i=0;i<3&&callbacks;i++){setFrame(i+2);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"analysis-seed-does-not-require-preview-pixel-equality",callbacks&&[tracked[@"keys"]count]==3);
{
const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4);
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){float encoded=x%3==1?.8f:.2f,linear=powf((encoded+.055f)/1.055f,2.4f);auto i=(y*w+x)*4;pixels[i]=pixels[i+1]=pixels[i+2]=linear;pixels[i+3]=1;}
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(float v:gray.pixels)maximum=std::max(maximum,fabs(v-.4));
run.record(@"tracking-4k-frame-lowpass-before-normalized-motion-grid",gray.valid()&&gray.width==1280&&gray.height==720&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
}
[plugin release];
}
@@ -1,13 +1,16 @@
#include "MaskCore/DYTracker.hpp"
@interface DYToolTrackingProbe : NSObject<PROAPIAccessing> {
@public
id _base;CMTime _time;FxAnalysisState _state;int _forwardStarts,_backwardStarts;
id _base;CMTime _time,_timelineOffset,_seekTime;int _seekCount;FxAnalysisState _state;int _forwardStarts,_backwardStarts;
}
@end
@implementation DYToolTrackingProbe
- (id)apiForProtocol:(Protocol*)protocol{NSString *name=NSStringFromProtocol(protocol);if([@[@"FxAnalysisAPI",@"FxTimingAPI_v4",@"FxCustomParameterActionAPI_v4"]containsObject:name])return self;return [_base apiForProtocol:protocol];}
- (id)apiForProtocol:(Protocol*)protocol{NSString *name=NSStringFromProtocol(protocol);if([@[@"FxAnalysisAPI",@"FxTimingAPI_v4",@"FxCustomParameterActionAPI_v4",@"FxCommandAPI_v2"]containsObject:name])return self;return [_base apiForProtocol:protocol];}
- (void)startAction:(id)sender{[(id<FxCustomParameterActionAPI_v4>)_base startAction:sender];}
- (void)endAction:(id)sender{[(id<FxCustomParameterActionAPI_v4>)_base endAction:sender];}
- (CMTime)currentTime{return _time;}
- (void)timelineTime:(CMTime*)timeline fromInputTime:(CMTime)input{*timeline=CMTimeAdd(input,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);}
- (BOOL)movePlayheadToTime:(CMTime)time error:(NSError**)error{_seekTime=time;_seekCount++;_time=CMTimeSubtract(time,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);return YES;}
- (FxAnalysisState)analysisStateForEffect{return _state;}
- (BOOL)startForwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_forwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;}
- (BOOL)startBackwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_backwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;}
@@ -23,6 +26,7 @@
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error;
- (BOOL)analyzeFrame:(FxImageTile*)frame atTime:(CMTime)time error:(NSError**)error;
- (BOOL)cleanupAnalysis:(NSError**)error;
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
@end
@interface DYToolCanvasProbe : DYToolTrackingProbe @end
+6 -3
查看文件
@@ -50,8 +50,11 @@ kernel void dyTrackFlow(device const float*prev[[buffer(0)]],device const float*
if(lane==0)results[idx]=float4(q,error,ok?1.f:0.f);
}
// Full host frame -> top-first display luma. Analysis and reference use the
// same sampler, alpha convention and transfer; no 320x180 inspector preview.
// Full host frame -> top-first display luma. Low-pass the source footprint
// before decimation so 4K fabric detail cannot alias into inconsistent motion.
// This analysis-only image never changes the full-resolution color render.
kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* pixels [[buffer(0)]],constant uint3& info [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
if(pos.x>=info.x||pos.y>=info.y)return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);float2 uv=(float2(pos)+.5f)/float2(info.xy);if(info.z)uv.y=1-uv.y;float4 sample=source.sample(f,uv);float3 linear=sample.a>0?sample.rgb/sample.a:float3(0);float3 encoded=select(1.055f*pow(max(linear,float3(0)),float3(1.f/2.4f))-.055f,linear*12.92f,linear<=.0031308f);pixels[pos.y*info.x+pos.x]=dot(clamp(encoded,0.f,1.f),float3(.2126f,.7152f,.0722f));
if(pos.x>=info.x||pos.y>=info.y)return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);uint2 taps=clamp(uint2(ceil(float2(source.get_width(),source.get_height())/float2(info.xy))),uint2(1),uint2(8));float sum=0;
for(uint y=0;y<taps.y;y++)for(uint x=0;x<taps.x;x++){float2 uv=(float2(pos)+(float2(x,y)+.5f)/float2(taps))/float2(info.xy);if(info.z)uv.y=1-uv.y;float4 sample=source.sample(f,uv);float3 linear=sample.a>0?sample.rgb/sample.a:float3(0);float3 encoded=select(1.055f*pow(max(linear,float3(0)),float3(1.f/2.4f))-.055f,linear*12.92f,linear<=.0031308f);sum+=dot(clamp(encoded,0.f,1.f),float3(.2126f,.7152f,.0722f));}
pixels[pos.y*info.x+pos.x]=sum/float(taps.x*taps.y);
}
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>26</string>
<string>31</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.1</string>
<string>1.4.2</string>
</dict>
<dict>
<key>className</key>
+27 -12
查看文件
@@ -18,6 +18,7 @@ constexpr size_t TrackerFeatureLimit = 300;
constexpr int TrackerPyramidLevels = 4;
constexpr int TrackerPatchRadius = 10;
constexpr int TrackerIterations = 30;
constexpr float TrackerFitTolerance = 3.f;
struct GrayFrame {
int width = 0, height = 0;
@@ -50,6 +51,11 @@ struct TrackerROI {
float cx = .5f, cy = .5f, width = .25f, height = .25f, angle = 0;
};
enum class TrackFailure {
None, InvalidFrame, InsufficientTexture, Backend, InsufficientMatches,
IncoherentMotion, LowConfidence, InvalidTransform, OutsideFrame
};
struct TrackResult {
float cx = .5f, cy = .5f;
float scale = 1.f, rotation = 0.f;
@@ -58,6 +64,9 @@ struct TrackResult {
bool valid = false;
// Analysis-only additions; the legacy on-disk DYTrackKey stays unchanged.
float scaleX = 1.f, scaleY = 1.f;
int matches = 0;
float medianError = 0;
TrackFailure failure = TrackFailure::None;
};
struct FlowPoint { float x,y; };
@@ -307,15 +316,16 @@ class Tracker {
std::vector<int> ids;double e=0;
for (size_t k=0;k<matches.size();++k) {
double d=distance(candidate.map(matches[k].p),matches[k].q);
if (d<1.6) {ids.push_back(static_cast<int>(k));e+=d*d;}
if (d<TrackerFitTolerance+.1f) {ids.push_back(static_cast<int>(k));e+=d*d;}
}
if (ids.size()>best.size() || (ids.size()==best.size() && e<bestError)) {best=std::move(ids);bestError=e;}
}
inliers=best;
if (best.size()<8 || best.size()<matches.size()*.52) return false;
for (int pass=0;pass<3;++pass) {
model=fitModel(matches,best);inliers.clear();
for (size_t i=0;i<matches.size();++i)
if (distance(model.map(matches[i].p),matches[i].q)<1.5f) inliers.push_back(static_cast<int>(i));
if (distance(model.map(matches[i].p),matches[i].q)<TrackerFitTolerance) inliers.push_back(static_cast<int>(i));
if (inliers.size()<8) return false;
best=inliers;
}
@@ -341,23 +351,24 @@ public:
result_={roi.cx,roi.cy,1,0,0,0,0,false};
if (!frame.valid() || !std::isfinite(roi.cx) || !std::isfinite(roi.cy) ||
!std::isfinite(roi.width) || !std::isfinite(roi.height) || !std::isfinite(roi.angle) ||
roi.width<=0 || roi.height<=0 || roi.width>8 || roi.height>8 || roi.cx<0 || roi.cx>1 || roi.cy<0 || roi.cy>1) return false;
roi.width<=0 || roi.height<=0 || roi.width>8 || roi.height>8 || roi.cx<0 || roi.cx>1 || roi.cy<0 || roi.cy>1) {result_.failure=TrackFailure::InvalidFrame;return false;}
width_=frame.width;height_=frame.height;initialROI_=roi;
center_={roi.cx*width_,roi.cy*height_};
points_=detect(frame);
result_.features=static_cast<int>(points_.size());result_.inliers=result_.features;
if (points_.size()<12) return false;
if(backend_){if(!backend_->reset(frame))return false;}else previous_=makePyramid(frame);active_=true;result_.valid=true;result_.confidence=1;
if (points_.size()<12) {result_.failure=TrackFailure::InsufficientTexture;return false;}
if(backend_){if(!backend_->reset(frame)){result_.failure=TrackFailure::Backend;return false;}}else previous_=makePyramid(frame);active_=true;result_.valid=true;result_.confidence=1;
return true;
}
TrackResult track(const GrayFrame& frame) {
if (!active_ || !frame.valid() || frame.width!=width_ || frame.height!=height_) {
result_.valid=false;result_.confidence=0;active_=false;return result_;
result_.valid=false;result_.confidence=0;result_.failure=TrackFailure::InvalidFrame;active_=false;return result_;
}
result_.failure=TrackFailure::None;result_.matches=0;result_.inliers=0;result_.medianError=0;
Pyramid next;if(!backend_)next=makePyramid(frame);
std::vector<Match> matches;matches.reserve(points_.size());
if(backend_) {
if(!backend_->advance(frame,points_,matches)){active_=false;result_.valid=false;result_.confidence=0;return result_;}
if(!backend_->advance(frame,points_,matches)){active_=false;result_.valid=false;result_.confidence=0;result_.failure=TrackFailure::Backend;return result_;}
} else for (P p:points_) {
P q,back;float error=0,backError=0;
if (!flow(previous_,next,p,p,q,error)) continue;
@@ -366,18 +377,22 @@ public:
}
Affine model;std::vector<int> inliers;float medianError=0;
result_.features=static_cast<int>(points_.size());
result_.inliers=0;
result_.matches=static_cast<int>(matches.size());
if (!estimate(matches,model,inliers,medianError)) {
active_=false;result_.valid=false;result_.confidence=0;return result_;
active_=false;result_.valid=false;result_.confidence=0;result_.inliers=static_cast<int>(inliers.size());result_.failure=matches.size()<8?TrackFailure::InsufficientMatches:TrackFailure::IncoherentMotion;return result_;
}
double stepScale=std::sqrt(model.determinant());
double stepRotation=std::atan2(model.c-model.b,model.a+model.d);
P nextCenter=model.map(center_);
float retained=static_cast<float>(inliers.size())/points_.size();
float confidence=std::clamp(retained*std::exp(-medianError*.8f),0.f,1.f);
// Residual quality is relative to the accepted fit budget. Keeping the
// old 1.5px penalty with a 3px fit incorrectly rejects coherent detail
// motion before the geometric/consensus guards can make that decision.
float confidence=std::clamp(retained*std::exp(-medianError*(1.2f/TrackerFitTolerance)),0.f,1.f);
result_.inliers=static_cast<int>(inliers.size());result_.medianError=medianError;
if (stepScale<.9 || stepScale>1.12 || std::abs(stepRotation)>.12 || confidence<.3f ||
!inside(frame,nextCenter,3) || result_.scale*stepScale<.1 || result_.scale*stepScale>10) {
active_=false;result_.valid=false;result_.confidence=confidence;return result_;
active_=false;result_.valid=false;result_.confidence=confidence;result_.failure=confidence<.3f?TrackFailure::LowConfidence:!inside(frame,nextCenter,3)?TrackFailure::OutsideFrame:TrackFailure::InvalidTransform;return result_;
}
auto nextCumulative=Affine::compose(model,cumulative_);
// QR decomposition in the initial shape's axes. Output matches the
@@ -385,7 +400,7 @@ public:
double cs=std::cos(initialROI_.angle),sn=std::sin(initialROI_.angle);
double ax=nextCumulative.a*cs+nextCumulative.b*sn,ay=nextCumulative.c*cs+nextCumulative.d*sn;
double sx=std::hypot(ax,ay),sy=nextCumulative.determinant()/sx;
if(!std::isfinite(sx)||!std::isfinite(sy)||sx<.1||sx>10||sy<.1||sy>10){active_=false;result_.valid=false;result_.confidence=0;return result_;}
if(!std::isfinite(sx)||!std::isfinite(sy)||sx<.1||sx>10||sy<.1||sy>10){active_=false;result_.valid=false;result_.confidence=0;result_.failure=TrackFailure::InvalidTransform;return result_;}
cumulative_=nextCumulative;
center_=nextCenter;
result_.cx=center_.x/width_;result_.cy=center_.y/height_;
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>26</string>
<string>31</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+18 -1
查看文件
@@ -1,3 +1,20 @@
# 大鱼调色: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` 待完整下载核验后发布。
## 以下为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结果以本版本验证记录为准。
@@ -8,7 +25,7 @@
跟踪按Color Finale只读行为证据独立适配实际路径范围、300特征、亚像素精炼、21×21光流及最高4K灰度帧,保留严格失效与过期写入保护。独立CPU/Metal18项通过。不能称为完整Color Finale移植;B样条、编组、人物/图像/外部蒙版、完整轨迹区段编辑等仍有差异,未做同一真实视频的完整轨迹等价对照。
正式版281项原生检查通过。FCP12.4实测相邻插入/初始化独立参数、大号面板/绘制态、钢笔蒙版正向99键、一次撤销和重做、保存重开完整预设逐字节一致。**实际鼠标钢笔落点与闭合仍待用户确认**,自动化鼠标未触发画面回调;模拟宿主的原生OSC回归通过,不混同实机手势。1.4.0用户确认的中心拖动历史保留。
正式版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。