From 0b53fdcdfdd3fe04e3606bf68741d247c92d1785 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 23:15:31 +0800 Subject: [PATCH] fix: make pen drafts immediate and serializable, reject stale edits, and align tracked path ROI and optical flow with local reference evidence --- research/ColorFinaleMasksFollowup.json | 261 +++++++++++++++++++++ research/ColorFinaleMasksFollowup.md | 44 ++++ tools/verify_tool_tracking_followup.mm | 105 +++++++++ 大鱼调色/Plugin/DYToolCanvasEditing.inc.h | 9 +- 大鱼调色/Plugin/DYToolFlow.inc.h | 8 +- 大鱼调色/Plugin/DYToolHostMethods.inc.h | 6 +- 大鱼调色/Plugin/DYToolPenDiagnostics.inc.h | 3 + 大鱼调色/Plugin/DYTracking.metal | 26 +- 大鱼调色/Plugin/MaskCore/DYTracker.hpp | 115 ++++++--- 9 files changed, 522 insertions(+), 55 deletions(-) create mode 100644 research/ColorFinaleMasksFollowup.json create mode 100644 research/ColorFinaleMasksFollowup.md create mode 100644 tools/verify_tool_tracking_followup.mm diff --git a/research/ColorFinaleMasksFollowup.json b/research/ColorFinaleMasksFollowup.json new file mode 100644 index 0000000..3e2f495 --- /dev/null +++ b/research/ColorFinaleMasksFollowup.json @@ -0,0 +1,261 @@ +{ + "date": "2026-11-01", + "scope": "Read-only installed Color Finale 2.16.2(625) static analysis and independent Dayu tracking reconstruction; no target runtime/GUI", + "target": { + "path": "/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/MacOS/ColorFinale", + "sha256": "49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f", + "architecture": "arm64", + "provider": "Ghidra 12.1.4" + }, + "baselineCommit": "745aa1626e1df368290fbbd47a716ff3ce9ca630", + "evidence": [ + { + "evidence_id": "ev_6539e1080a6e0d9cf27d9cb3c26703110b8f50030981b18cc075356840849e08", + "operation": "analyze_function", + "procedure": "FTShapeTrackerView::addShapeForEvent:", + "address": "0x1000e2900", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_0f9372e98efac18d8f666dcf137addc2ecdaffdfdb153f0a31b3ecfc2ba8b9ca", + "operation": "analyze_function", + "procedure": "FTShapeTrackerView::setShapeEditMode:", + "address": "0x1000e1fcc", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_2dd4ac418346bd4d15d05f8145bb2a547ab531d742b4e8edfb3314fc49fdde0a", + "operation": "analyze_function", + "procedure": "FTOnScreenBezierShape::mouseDown:", + "address": "0x10009be0c", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_8aa635a486e91b5af36bc39d424964417e0b6b77706cb24218640ac253b426b6", + "operation": "analyze_function", + "procedure": "FTOnScreenBezierShape::mouseUp:", + "address": "0x10009c084", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_4c3864a55c7dc71ee02b67c4eed011dbe00a9d8072c275ff002607d22618c288", + "operation": "analyze_function", + "procedure": "FTOnScreenPathShape::closePath", + "address": "0x100033ec8", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_2fc54b9d31f2ac894aae0b560fee33284a155fe6505697c0a83be1af0bc0a8ea", + "operation": "analyze_function", + "procedure": "FTOnScreenPathShape::controlPoint:mouseDown:", + "address": "0x10003429c", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_d3bea253005ee2007c110f15d6658e542de8f2075d40585897b875f9b517ec2b", + "operation": "analyze_function", + "procedure": "FTOnScreenPathShape::keyDown:", + "address": "0x1000345c8", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_ba0c6d39ae45e26b8ade69f41f6fb8da934c526a686e64be89690b762a11e585", + "operation": "analyze_function", + "procedure": "FTShapeBezierControlPoint::controlPoint:mouseDragged:", + "address": "0x10009d178", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_ea178e24d10afea13fa74a0d70941648d1ca4c45005a1533df478c9212f6f9b7", + "operation": "analyze_function", + "procedure": "FTShapeTrackerControl::addToolbarButtons", + "address": "0x10001ef7c", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_dcd7aa770925f63c8c14c968ae6b417fda78685c7be7fa739a78209957d40e2d", + "operation": "analyze_function", + "procedure": "FTAreaTracker::track:trackerState:", + "address": "0x100035e40", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_e798c4e6e032e085812f81831ecc16196bd3c2278bf634961379669ee1308f7e", + "operation": "analyze_function", + "procedure": "FTAreaTracker::trackFrame:inScene:", + "address": "0x100036cbc", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_8bad5bbc4bd2890227567b9799cfc1e68c6d56631e67a73224d57971767664c4", + "operation": "analyze_function", + "procedure": "-[FTTrackerShape(FTOnScreenShape)_addKeyFrameForShape:atTime:]", + "address": "0x100047dc4", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_fe677a9c456fc8739e0c33edd513c3f6b94431c7fbb6f1194a78801f39f32072", + "operation": "analyze_function", + "procedure": "FTShapeTrackerControl::shapeTrackerView:geometryDidChangeForShapes:", + "address": "0x100025414", + "authority": "shipped-artifact", + "confidence": "observed" + }, + { + "evidence_id": "ev_533595e2ddf4c96d5c82f3ce25c7ff44a3549f37d8b80e5b5b5a82360e283c77", + "operation": "analyze_function", + "procedure": "FTMaskShapeViewController::viewDidLoad", + "address": "0x10007f3b0", + "authority": "shipped-artifact", + "confidence": "observed" + } + ], + "localOnlyEvidenceDirectory": "/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101", + "sourceApplicationRuntimeDependency": false, + "proprietaryCodeOrResourcesCommitted": false, + "originalArtifactModified": false, + "completeMigrationClaim": false, + "limitations": [ + "Static analysis is not live runtime acceptance.", + "Independent detector/gray conversion/LK/RANSAC safeguards do not exactly reproduce OpenCV results.", + "Interface Builder default 64-document coverage omitted mask nibs; exact full inspector pixel sizes are unknown.", + "B-spline, grouping/parent masks, image/person/external inputs, published masks and full keyframe-region editing are outside this fault-fix implementation.", + "No same-video, same-path, whole-trajectory comparison to the original product has been performed." + ], + "independentVerification": { + "passResult": true, + "count": 18, + "checks": [ + { + "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": 43.247542, + "features": 300, + "name": "cpu-1080p-complete-frame-motion", + "pass": true + }, + { + "generatedFramesAndAnalysisMilliseconds": 111.362708, + "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": 31.447709, + "features": 300, + "name": "metal-1080p-complete-frame-motion", + "pass": true + }, + { + "generatedFramesAndAnalysisMilliseconds": 88.904167, + "features": 300, + "name": "metal-3840x2160-complete-frame-motion", + "pass": true + } + ], + "memoryRunPass": true, + "peakResidentBytes": 299597824, + "generatedImageOracles": true, + "baselineExtendedRegion": { + "started": false, + "features": 0 + }, + "newExtendedRegion": { + "started": true, + "features": 117 + }, + "appLaunched": false, + "scope": "Independent generated images, CPU tracker and optional real Metal optical flow. No app or GUI host launched." + }, + "implementationSHA256": { + "大鱼调色/Plugin/MaskCore/DYTracker.hpp": "68d32e8704e737587729397b0e8dd856f40c26aff479af7a65e5a32c48e95d6b", + "大鱼调色/Plugin/DYToolFlow.inc.h": "f4426c1bc4a36a93561c9d43ea794b89c10767fb94cbc442b82563766b1856d8", + "大鱼调色/Plugin/DYTracking.metal": "e0c13390a952b13eb92081840069f79632c05326aaf1a0cc927200a84d4e4ac0", + "tools/verify_tool_tracking_followup.mm": "961c3ff4359bc06bf7b6d1f71b8fcfa40efee32d2f7722a0af9ba813971d7c64" + }, + "independentShaderSHA256": "2899508dbcff3329531ec23f9fe13f30993ba5416bf7788697557f5d611783f8" +} diff --git a/research/ColorFinaleMasksFollowup.md b/research/ColorFinaleMasksFollowup.md new file mode 100644 index 0000000..19604c0 --- /dev/null +++ b/research/ColorFinaleMasksFollowup.md @@ -0,0 +1,44 @@ +# Color Finale 蒙版与跟踪的本机复核(2026-11-01) + +本轮针对用户报告的“层在最底部新增、蒙版控件太小、钢笔不可用”核对本机发行产物。目标为 ColorFinale 2.16.2(625)的 arm64 插件,完整文件 SHA-256 `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f`,与此前归档研究一致。原程序始终只读,未执行或操作其 FCP 界面。静态观察不是运行行为验收,也不能据此声称整个原版功能已完整迁移。 + +这里只保存行为、接口、参数和 Evidence 索引,不保存原版反编译源码、二进制、图标或其他资源。新功能仍是本产品自己的源码与 Metal 实现,不依赖 Color Finale 安装。 + +## 钢笔状态与可迁移交互 + +| 本机静态观察 | 入口与 Evidence | +| --- | --- | +| 选择 Bezier 新建模式后,首次点击建立可编辑/选中的零尺寸路径,交给新路径处理该点击,随后进入独立的路径编辑模式 | `FTShapeTrackerView::addShapeForEvent:` `0x1000e2900`,`ev_6539e1080a6e0d9cf27d9cb3c26703110b8f50030981b18cc075356840849e08` | +| 新建与编辑路径是不同模式;离开路径编辑模式会尝试闭合当前路径 | `setShapeEditMode:` `0x1000e1fcc`,`ev_0f9372e98efac18d8f666dcf137addc2ecdaffdfdb153f0a31b3ecfc2ba8b9ca` | +| 编辑态可向未闭合路径追加锚点,也有在曲线上插点的分支;放置后可拖出共线双柄 | `FTOnScreenBezierShape::mouseDown:` `0x10009be0c`,`ev_2dd4ac418346bd4d15d05f8145bb2a547ab531d742b4e8edfb3314fc49fdde0a`;`FTShapeBezierControlPoint::controlPoint:mouseDragged:` `0x10009d178`,`ev_ba0c6d39ae45e26b8ade69f41f6fb8da934c526a686e64be89690b762a11e585` | +| 未闭合且至少三个点才允许闭合;点击首锚点会闭合 | `FTOnScreenPathShape::closePath` `0x100033ec8`,`ev_4c3864a55c7dc71ee02b67c4eed011dbe00a9d8072c275ff002607d22618c288`;`controlPoint:mouseDown:` `0x10003429c`,`ev_2fc54b9d31f2ac894aae0b560fee33284a155fe6505697c0a83be1af0bc0a8ea` | +| 原版未闭合路径接收 Return 或 Esc 时均尝试闭合;Delete 删除选中锚点 | `FTOnScreenPathShape::keyDown:` `0x1000345c8`,`ev_d3bea253005ee2007c110f15d6658e542de8f2075d40585897b875f9b517ec2b` | +| 画面工具栏有选择、路径编辑、矩形、椭圆、渐变边、B 样条、Bezier;预览按钮原生最小尺寸为30×22,另有8×8内边距 | `FTShapeTrackerControl::addToolbarButtons` `0x10001ef7c`,`ev_ea178e24d10afea13fa74a0d70941648d1ca4c45005a1533df478c9212f6f9b7` | + +大鱼本轮保留明确的“Esc取消草稿”行为,与原版“Esc尝试结束闭合”不同。不能把新实现描述为所有快捷键均完全相同。当前产品旧钢笔入口未携带绘制态,且通知会清除绘制态;即使菜单项存在,也不能证明进入了放点模式。修复应同时覆盖绘制态、首点/Return结束、删除、草稿预览、提交和取消,以及再次选择已有路径的编辑。 + +形状属性控制器将 `feather`、`opacity`、`position`、`scale`、`rotation` 绑定到对应作者属性,见 `FTMaskShapeViewController::viewDidLoad` `0x10007f3b0`,Evidence `ev_533595e2ddf4c96d5c82f3ce25c7ff44a3549f37d8b80e5b5b5a82360e283c77`。完整检视器字号和运行时像素布局未取得充分静态证据;不能从符号名称推断其可读性。 + +## 跟踪差异与本轮改进 + +原版核心 `FTAreaTracker::track:trackerState:` `0x100035e40`,Evidence `ev_dcd7aa770925f63c8c14c968ae6b417fda78685c7be7fa739a78209957d40e2d`。逐帧作者状态 Evidence `ev_e798c4e6e032e085812f81831ecc16196bd3c2278bf634961379669ee1308f7e`(`0x100036cbc`)。原版每帧接收完整图像、最多3840×2160转换为8位灰度,将 position/rotation/scale 按 effectTime 写入作者键,不是渲染时临时估计。当前大鱼已经有精确时间键、相邻帧参考、丢失停止和这些变换输出;这些并非本轮才补齐。 + +| 项目 | 原版静态观察 | 大鱼1.4.0(24)与本轮选择 | +| --- | --- | --- | +| 区域 | 用形状点的凸包构造特征遮罩 | 原有实际多边形判断更贴合凹路径,但包围框和前置±0.5裁剪错误。本轮改为从实际路径顶点推导变换后搜索边界,保留实际多边形判断,修复默认框外钢笔纹理被裁掉的问题 | +| 特征 | 300点,quality0.03,最小距离10,blockSize3 | 原有180点、0.012相对阈值、按帧大小变化的间距、5×5邻域。本轮调整为300点、0.03、10像素、3×3;仍采用独立中心差分与2像素候选扫描,并不等同OpenCV检测器 | +| 角点精炼 | `cornerSubPix` 半窗10,20次/0.03 | 原有无亚像素精炼。本轮用独立加权梯度交点迭代,半窗10、20次/0.03,限制发散并保留初始点回退;不是复制OpenCV内部实现 | +| 光流 | LK21×21,maxLevel3即最多4级,30次/0.01;前后误差严格小于1 | 原有9×9、最多5级、20次。本轮CPU和Metal统一21×21、最多4级、30次/0.01;保留原有均值去除、RMSE及≤1.1像素前后检查,不声称数值全等 | +| 重检测 | 分析计数小于2或偶数时重检测并精炼 | 原有每5帧或少于60点补点。本轮每2帧或不足60时重选;新点少于12时保留仍可信旧点,后续仍须通过完整拟合/失效条件 | +| 拟合 | `estimateAffine2D` RANSAC2000次、阈值3、confidence0.99、refine10 | 本轮保留确定性400次、1.6/1.5阈值、3次最小二乘、至少8点/52%内点与非线状分布检查。阈值不能无验证地照搬,否则可能把错误帧当作成功 | +| 输出/失效 | 原版持久化位置、旋转和独立XY缩放,失败节点不再继续 | 大鱼保持QR分解位置/旋转/独立XY缩放,丢失停止、置信度和每步缩放/旋转保护。它比已观察到的原版分支更保守,不含透视或剪切输出 | + +独立检查 `tools/verify_tool_tracking_followup.mm` 使用已知仿射变换生成图像,分别运行CPU和真实Metal后端。默认创建框外的钢笔区域在旧提交 `745aa1626e1df368290fbbd47a716ff3ce9ca630` 检出0点、无法启动;新版本检出117点,12帧亚像素移动末帧误差约X0.0073/Y0.0323像素。另覆盖300点实际传输、旋转与非等比缩放、静止重检测、换景拒绝、平坦区域拒绝,以及1920×1080/3840×2160完整帧。18项通过;4K生成两帧及分析本机记录约CPU111ms/Metal89ms,不是所有素材的性能承诺。 + +## “完整移植”的边界 + +本轮是可验证的独立重建与关键交互修复,不能宣称完整复制Color Finale蒙版系统。原版还观察到B样条、形状多选/编组、父蒙版、图像/人物/宿主外部蒙版、HSL取色增减与来源/模糊、发布蒙版/抠出、轨迹区域选择与按键区段编辑等体系;当前大鱼每工具六类蒙版不具备全部对应能力。`FTMaskDetailViewController` 的形状、HSL、图像、人物、FCP控制器方法库存见 Evidence `ev_0497fc6415b6b210fea8a052adf0f93483af228b44063dffd2c76d93a990cef1`。大鱼独立“亮度选区”不能据此称为已复刻原版某个独立Luma类;本次主插件范围没有取得该类的充分证据。 + +算法阈值及默认值对齐不是对真实视频的等价证明。本轮尚未取得原版与大鱼在同一真实视频、相同路径及分析范围下的完整轨迹对照,也未分析原版所有链接框架和动态形状UI。完整范围继续由差异清单追踪,不能把当前故障修复或合成检查通过替代这些开放项。 + +完整REA证据和恢复snapshot仅在本机研究缓存:`/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101/`。当前REA目标已关闭,原产物未修改。Interface Builder decoder默认64文档首先遍历Sparkle,未覆盖后续蒙版nib;不能把该局限解释为蒙版UI不存在。新摘要保留此未知,不复制原版资源作为新产品界面。 diff --git a/tools/verify_tool_tracking_followup.mm b/tools/verify_tool_tracking_followup.mm new file mode 100644 index 0000000..05ada66 --- /dev/null +++ b/tools/verify_tool_tracking_followup.mm @@ -0,0 +1,105 @@ +// Independent generated-image oracles for free-path ROI, subpixel motion, +// anisotropic transforms, feature capacity, and loss protection. No host UI. +#import +#include "../大鱼调色/Plugin/MaskCore/DYTracker.hpp" +#include "../大鱼调色/Plugin/DYToolFlow.inc.h" +#include + +static float noise(int x,int y,uint32_t seed=0) { + uint32_t n=uint32_t(x)*73856093u^uint32_t(y)*19349663u^seed; + n^=n>>13;n*=1274126177u;n^=n>>16; + return .1f+.8f*float(n&65535)/65535.f; +} +static float scene(float x,float y,bool extended=false,uint32_t seed=0) { + if(extended&&(x<251||x>379||y<77||y>307))return .5f; + float gx=x/3.f,gy=y/3.f;int ix=int(std::floor(gx)),iy=int(std::floor(gy)); + float dx=gx-ix,dy=gy-iy; + return (1-dy)*((1-dx)*noise(ix,iy,seed)+dx*noise(ix+1,iy,seed))+ + dy*((1-dx)*noise(ix,iy+1,seed)+dx*noise(ix+1,iy+1,seed)); +} +static dy::GrayFrame frame(int w,int h,double tx=0,double ty=0,double angle=0, + double sx=1,double sy=1,bool extended=false,uint32_t seed=0) { + dy::GrayFrame f{w,h,std::vector(size_t(w)*h)}; + double cx=w*(extended?.35:.5),cy=h*.5,c=cos(angle),s=sin(angle); + for(int y=0;y1?[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]]:nil; + for(int mode=0;mode<(library?2:1);mode++) { + NSString *prefix=mode?@"metal":@"cpu"; + auto setup=[&](dy::Tracker& tracker) { + if(!mode)return true; + NSError *error=nil;auto backend=DYToolCreateMetalFlow(library,&error); + if(!backend){record([prefix stringByAppendingString:@"-backend"],false,@{@"error":error.localizedDescription?:@"unavailable"});return false;} + tracker.setBackend(backend);return true; + }; + { + dy::Tracker tracker;if(!setup(tracker))continue; + tracker.setMask({{.8f,-.5f},{1.8f,-.5f},{1.8f,.5f},{.8f,.5f}}); + auto f=frame(512,384,0,0,0,1,1,true); + bool started=tracker.reset(f,{.35f,.5f,.2f,.45f,0}); + record([prefix stringByAppendingString:@"-pen-texture-outside-creation-box-starts"],started, + @{@"features":@(tracker.result().features)}); + bool passed=started;dy::TrackResult result; + for(int i=1;i<=12&&passed;i++) {result=tracker.track(frame(512,384,1.25*i,.5*i,0,1,1,true));passed=result.valid;} + double ex=fabs(result.cx-(.35+15./512))*512,ey=fabs(result.cy-(.5+6./384))*384; + record([prefix stringByAppendingString:@"-extended-pen-region-subpixel-motion"],passed&&ex<.65&&ey<.65, + @{@"xErrorPixels":@(ex),@"yErrorPixels":@(ey)}); + } + { + dy::Tracker tracker;if(!setup(tracker))continue; + auto f=frame(640,480);bool started=tracker.reset(f,{.5,.5,.85,.85,0}); + record([prefix stringByAppendingString:@"-real-300-feature-capacity"],started&&tracker.result().features==300, + @{@"features":@(tracker.result().features)}); + auto result=tracker.track(frame(640,480,2.25,-1.5,.025,1.025,.98)); + double ex=fabs(result.cx-(.5+2.25/640))*640,ey=fabs(result.cy-(.5-1.5/480))*480; + record([prefix stringByAppendingString:@"-translation-rotation-independent-xy-scale"], + started&&result.valid&&ex<.5&&ey<.5&&fabs(result.rotation-.025)<.004&&fabs(result.scaleX-1.025)<.005&&fabs(result.scaleY-.98)<.005, + @{@"xErrorPixels":@(ex),@"yErrorPixels":@(ey),@"rotation":@(result.rotation),@"scaleX":@(result.scaleX),@"scaleY":@(result.scaleY)}); + } + { + dy::Tracker tracker;if(!setup(tracker))continue; + auto f=frame(640,480);bool passed=tracker.reset(f,{.5,.5,.65,.65,0});dy::TrackResult result; + for(int i=1;i<=6&&passed;i++){result=tracker.track(f);passed=result.valid;} + record([prefix stringByAppendingString:@"-subpixel-refinement-and-redetection-remain-stationary"],passed&&fabs(result.cx-.5)*640<.05&&fabs(result.cy-.5)*480<.05); + } + { + dy::Tracker tracker;if(!setup(tracker))continue; + auto f=frame(640,480);bool started=tracker.reset(f,{.5,.5,.7,.7,0}); + auto result=tracker.track(frame(640,480,0,0,0,1,1,false,0x3344)); + record([prefix stringByAppendingString:@"-unrelated-cut-is-not-trusted-motion"],started&&!result.valid&&!tracker.active()); + dy::GrayFrame flat{640,480,std::vector(640*480,.5f)}; + record([prefix stringByAppendingString:@"-flat-region-still-refuses-tracking"],!tracker.reset(flat,{.5,.5,.7,.7,0})); + } + { + dy::Tracker tracker;if(!setup(tracker))continue; + auto t=std::chrono::steady_clock::now();auto f=frame(1920,1080);bool started=tracker.reset(f,{.5,.5,.5,.5,0}); + auto result=tracker.track(frame(1920,1080,4,2)); + double ms=std::chrono::duration(std::chrono::steady_clock::now()-t).count(); + record([prefix stringByAppendingString:@"-1080p-complete-frame-motion"],started&&result.valid&&fabs(result.cx-(.5+4./1920))*1920<.5&&fabs(result.cy-(.5+2./1080))*1080<.5, + @{@"generatedFramesAndAnalysisMilliseconds":@(ms),@"features":@(result.features)}); + } + { + dy::Tracker tracker;if(!setup(tracker))continue; + auto t=std::chrono::steady_clock::now();auto f=frame(3840,2160);bool started=tracker.reset(f,{.5,.5,.5,.5,0}); + auto result=tracker.track(frame(3840,2160,8,4)); + double ms=std::chrono::duration(std::chrono::steady_clock::now()-t).count(); + record([prefix stringByAppendingString:@"-3840x2160-complete-frame-motion"],started&&result.valid&&fabs(result.cx-(.5+8./3840))*3840<.5&&fabs(result.cy-(.5+4./2160))*2160<.5, + @{@"generatedFramesAndAnalysisMilliseconds":@(ms),@"features":@(result.features)}); + } + } + NSDictionary *report=@{@"pass":@(all),@"checks":checks,@"scope":@"Independent generated images, CPU tracker and optional real Metal optical flow. No app or GUI host launched.",@"sourceApplicationRuntimeDependency":@NO}; + NSData *json=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil]; + fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return all?0:1; +}} diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index d879a29..4eafe98 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -2,7 +2,7 @@ // deferred until the gesture has finished and the callback has returned. - (void)postToolCanvasStatus:(NSString*)message { NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;} - dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; + dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; } - (void)discardToolCanvasDraft { @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; @@ -22,7 +22,7 @@ }@finally{[a endAction:self];} if(changed)[self postToolCanvasStatus:@"蒙版已保存 · 可一次撤销"]; [NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager]; - }@finally{@synchronized(self){self->_toolCanvasCommitPending=NO;}}});[draft release];[original release];[node release];[maskID release]; + }@finally{@synchronized(self){self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release]; } - (void)toolCanvasCommand:(NSNotification*)notification { NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;} @@ -53,6 +53,11 @@ if(type==NSEventTypeKeyDown&&key==27){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"已取消绘制,保留原蒙版。"];return;} if(type==NSEventTypeKeyDown&&(key==13||key==10||key==3)&&_toolDrawingPen){if([_toolCanvasDraft[@"nodes"]length]<3*sizeof(DYBezierNode)){[self postToolCanvasStatus:@"至少放置三个点,再点首节点或完成绘制。"];return;}[self commitToolCanvasDraftAtTime:time];return;} if(type==NSEventTypeKeyDown&&(key==8||key==127)&&_toolDrawingPen){NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];if(nodes.length)[nodes setLength:nodes.length-sizeof(DYBezierNode)];if(nodes)_toolCanvasDraft[@"nodes"]=nodes;[self postToolCanvasStatus:@"已移除最后一个钢笔点,继续点击放置。"];return;} + if(type==NSEventTypeKeyDown&&(key==8||key==127)&&!_toolDrawingPen&&_toolDragPart>=1000){ + NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];DYMaskParameters parameters=DYMaskAtTime(mask,time);NSUInteger count=[mask[@"nodes"]length]/sizeof(DYBezierNode),index=(_toolDragPart-1000)/3;if(parameters.kind!=DYMaskBezier||index>=count)return; + if(count<=3){[self postToolCanvasStatus:@"闭合路径至少保留三个点;可使用重画钢笔重新绘制。"];return;} + [self toolCanvasEvent:NSEventTypeLeftMouseDown point:point part:_toolDragPart modifiers:modifiers key:0 time:time];NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];[nodes replaceBytesInRange:NSMakeRange(index*sizeof(DYBezierNode),sizeof(DYBezierNode)) withBytes:NULL length:0];_toolCanvasDraft[@"nodes"]=nodes;[self commitToolCanvasDraftAtTime:time];return; + } if(type==NSEventTypeLeftMouseDown){ if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;} if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} diff --git a/大鱼调色/Plugin/DYToolFlow.inc.h b/大鱼调色/Plugin/DYToolFlow.inc.h index bb5a63e..df5db7a 100644 --- a/大鱼调色/Plugin/DYToolFlow.inc.h +++ b/大鱼调色/Plugin/DYToolFlow.inc.h @@ -34,20 +34,20 @@ public: if(!ready()||!f.valid())return false; info_={};info_.levels=1;info_.width[0]=f.width;info_.height[0]=f.height; int total=f.width*f.height; - while(info_.levels<5&&info_.width[info_.levels-1]>=80&&info_.height[info_.levels-1]>=80) { + while(info_.levels=80&&info_.height[info_.levels-1]>=80) { int i=info_.levels++;info_.width[i]=info_.width[i-1]/2;info_.height[i]=info_.height[i-1]/2; info_.offset[i]=total;total+=info_.width[i]*info_.height[i]; } for(int i=0;i<2;i++){[frames_[i] release];frames_[i]=nil;}[points_ release];points_=nil;[results_ release];results_=nil; for(int i=0;i<2;i++)frames_[i]=[device_ newBufferWithLength:total*sizeof(float) options:MTLResourceStorageModeShared]; - points_=[device_ newBufferWithLength:180*sizeof(dy::FlowPoint) options:MTLResourceStorageModeShared]; - results_=[device_ newBufferWithLength:180*sizeof(FlowOutput) options:MTLResourceStorageModeShared]; + points_=[device_ newBufferWithLength:dy::TrackerFeatureLimit*sizeof(dy::FlowPoint) options:MTLResourceStorageModeShared]; + results_=[device_ newBufferWithLength:dy::TrackerFeatureLimit*sizeof(FlowOutput) options:MTLResourceStorageModeShared]; if(!frames_[0]||!frames_[1]||!points_||!results_)return false; previous_=0;memcpy(frames_[0].contents,f.pixels.data(),f.pixels.size()*sizeof(float)); idb=[queue_ commandBuffer];pyramid(b,frames_[0]);return finish(b); } bool advance(const dy::GrayFrame& f,const std::vector& points,std::vector& matches) override { - if(!f.valid()||f.width!=info_.width[0]||f.height!=info_.height[0]||points.empty()||points.size()>180)return false; + if(!f.valid()||f.width!=info_.width[0]||f.height!=info_.height[0]||points.empty()||points.size()>dy::TrackerFeatureLimit)return false; int next=1-previous_;memcpy(frames_[next].contents,f.pixels.data(),f.pixels.size()*sizeof(float)); memcpy(points_.contents,points.data(),points.size()*sizeof(dy::FlowPoint)); idb=[queue_ commandBuffer];pyramid(b,frames_[next]); diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index f7e499b..8011da9 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -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();idd=nil;for(idcandidate in devices)if(candidate.registryID==tile.deviceRegistryID)d=candidate;if(d){idlibrary=[d newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];idfunction=[library newFunctionWithName:@"dyToolCapture"];idpipeline=function?[d newComputePipelineStateWithFunction:function error:error]:nil;idqueue=[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 {};} - idtexture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=MAX(.01,tile.pixelAspect),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 {}; + idtexture=[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 {}; idbuffer=[entry[@"device"]newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared];if(!buffer)return {};vector_uint3 info={width,height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};idcommands=[entry[@"queue"]commandBuffer];idencoder=[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(width*height)};memcpy(frame.pixels.data(),buffer.contents,width*height*sizeof(float));}[buffer release];return frame; } } @@ -25,14 +25,14 @@ } - (void)toolCanvasSelection:(NSNotification*)notification { NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected"); - @synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"]; + @synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"]; } - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time { @synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;NSDictionary *m=_toolCanvasDraft?:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"coverage":@(_toolShowCoverage)};} } - (void)toolTrackRequested:(NSNotification*)notification { - NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} + NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消钢笔绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{ idanalysis=[_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;} diff --git a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h index f24bfe5..0a665a7 100644 --- a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h @@ -23,5 +23,8 @@ redraw();click(180,280);click(450,260);click(330,145);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:host userInfo:@{@"node":@"base:hsl",@"mask":maskID,@"command":@"finish",@"timeValue":@0,@"timeScale":@1,@"timeEpoch":@0}];drain();NSDictionary *buttonSaved=DYReadTools(base,kCMTimeZero).document;run.record(@"pen-inspector-finish-commits-without-viewer-keyboard-focus",![buttonSaved isEqual:author]&&base->_undoStarts==undo+2&&[[buttonSaved[@"baseMasks"][@"hsl"]lastObject][@"nodes"]length]==3*sizeof(DYBezierNode)); redraw();click(160,270);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:host userInfo:@{@"node":@"base:hsl",@"mask":maskID,@"command":@"cancel",@"timeValue":@0,@"timeScale":@1,@"timeEpoch":@0}];drain();run.record(@"pen-inspector-cancel-preserves-saved-curve-and-undo-count",[DYReadTools(base,kCMTimeZero).document isEqual:buttonSaved]&&base->_undoStarts==undo+2); redraw();click(190,280);click(460,280);click(300,150);[osc keyDownAtPositionX:300 positionY:150 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain();run.record(@"pen-return-closes-and-saves-native-path",handled&&base->_undoStarts==undo+3&&![[plugin toolCanvasMaskAtTime:kCMTimeZero][@"drawing"]boolValue]); + // Finish and the next drag can arrive before the main queue gets a turn. + redraw();click(170,275);click(445,275);click(300,140);int queuedUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];[osc mouseDownAtPositionX:320 positionY:212.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();NSDictionary *queuedDoc=DYReadTools(base,kCMTimeZero).document;DYMaskParameters moved=DYMaskAtTime([queuedDoc[@"baseMasks"][@"hsl"]lastObject],kCMTimeZero);run.record(@"pen-finish-and-next-gesture-serialize-without-dropping-either",base->_undoStarts==queuedUndo+2&&fabs(moved.centerX-.55)<1e-5&&fabs(moved.centerY-.55)<1e-5); + redraw();click(170,275);click(445,275);click(300,140);[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:CMTimeMake(1,25)];drain();run.record(@"pen-refuses-to-finish-stale-draft-after-playhead-moves",[DYReadTools(base,kCMTimeZero).document isEqual:queuedDoc]&&base->_undoStarts==queuedUndo+2&&![[plugin toolCanvasMaskAtTime:CMTimeMake(1,25)][@"drawing"]boolValue]); [osc release];[plugin release]; } diff --git a/大鱼调色/Plugin/DYTracking.metal b/大鱼调色/Plugin/DYTracking.metal index ad962cd..ec515f4 100644 --- a/大鱼调色/Plugin/DYTracking.metal +++ b/大鱼调色/Plugin/DYTracking.metal @@ -7,12 +7,12 @@ kernel void dyTrackPyramid(device float*f[[buffer(0)]],constant PyramidInfo&i[[b for(int y=-1;y<=1;y++)for(int x=-1;x<=1;x++)sum+=f[i.offset[level-1]+clamp(int(p.y)*2+y,0,sh-1)*sw+clamp(int(p.x)*2+x,0,sw-1)]*(x==0?2.f:1.f)*(y==0?2.f:1.f); f[i.offset[level]+p.y*w+p.x]=sum/16.f; } -inline bool inside(float2 p,int w,int h){return all(p>=6.f)&&p.x=12.f)&&p.x0;level--){float s=float(1<=0;level--) { float2 pp=p/float(1<=81)continue; - float2 pos=pp+float2(int(k%9)-4,int(k/9)-4);ref[j]=pixel(a,w,pos);mean+=ref[j]; + float ref[14],gx[14],gy[14],mean=0,hxx=0,hxy=0,hyy=0; + for(uint j=0;j<14;j++) { + uint k=lane+j*32;ref[j]=gx[j]=gy[j]=0;if(k>=441)continue; + float2 pos=pp+float2(int(k%21)-10,int(k/21)-10);ref[j]=pixel(a,w,pos);mean+=ref[j]; gx[j]=.5f*(pixel(a,w,pos+float2(1,0))-pixel(a,w,pos-float2(1,0))); gy[j]=.5f*(pixel(a,w,pos+float2(0,1))-pixel(a,w,pos-float2(0,1))); hxx+=gx[j]*gx[j];hxy+=gx[j]*gy[j];hyy+=gy[j]*gy[j]; } - mean=simd_sum(mean)/81;hxx=simd_sum(hxx);hxy=simd_sum(hxy);hyy=simd_sum(hyy); + mean=simd_sum(mean)/441;hxx=simd_sum(hxx);hxy=simd_sum(hxy);hyy=simd_sum(hyy); float det=hxx*hyy-hxy*hxy;if(det<1e-8f||hxx+hyy<1e-5f)return false; - for(int iteration=0;iteration<20;iteration++) { - if(!inside(q,w,h))return false;float target[3],tm=0; - for(uint j=0;j<3;j++){uint k=lane+j*32;target[j]=k<81?pixel(b,w,q+float2(int(k%9)-4,int(k/9)-4)):0;tm+=target[j];} - tm=simd_sum(tm)/81;float bx=0,by=0,sse=0; - for(uint j=0;j<3;j++)if(lane+j*32<81){float e=ref[j]-mean-target[j]+tm;bx+=gx[j]*e;by+=gy[j]*e;sse+=e*e;} + for(int iteration=0;iteration<30;iteration++) { + if(!inside(q,w,h))return false;float target[14],tm=0; + for(uint j=0;j<14;j++){uint k=lane+j*32;target[j]=k<441?pixel(b,w,q+float2(int(k%21)-10,int(k/21)-10)):0;tm+=target[j];} + tm=simd_sum(tm)/441;float bx=0,by=0,sse=0; + for(uint j=0;j<14;j++)if(lane+j*32<441){float e=ref[j]-mean-target[j]+tm;bx+=gx[j]*e;by+=gy[j]*e;sse+=e*e;} bx=simd_sum(bx);by=simd_sum(by);sse=simd_sum(sse); float2 delta=float2(hyy*bx-hxy*by,hxx*by-hxy*bx)/det;if(!all(isfinite(delta))||length(delta)>8)return false; - q+=delta;error=sqrt(sse/81);if(dot(delta,delta)<.0001f)break; + q+=delta;error=sqrt(sse/441);if(dot(delta,delta)<.0001f)break; } if(level>0)q*=2; } diff --git a/大鱼调色/Plugin/MaskCore/DYTracker.hpp b/大鱼调色/Plugin/MaskCore/DYTracker.hpp index 9a2bb93..f82ef38 100644 --- a/大鱼调色/Plugin/MaskCore/DYTracker.hpp +++ b/大鱼调色/Plugin/MaskCore/DYTracker.hpp @@ -13,6 +13,12 @@ namespace dy { +// Capacity is shared by the independent detector and its Metal transport. +constexpr size_t TrackerFeatureLimit = 300; +constexpr int TrackerPyramidLevels = 4; +constexpr int TrackerPatchRadius = 10; +constexpr int TrackerIterations = 30; + struct GrayFrame { int width = 0, height = 0; std::vector pixels; @@ -107,7 +113,7 @@ class Tracker { } static Pyramid makePyramid(const GrayFrame& f) { Pyramid p{f}; - while (p.size() < 5 && p.back().width >= 80 && p.back().height >= 80) { + while (p.size() < TrackerPyramidLevels && p.back().width >= 80 && p.back().height >= 80) { const auto& src = p.back(); GrayFrame dst{src.width/2, src.height/2, {}}; dst.pixels.resize(static_cast(dst.width)*dst.height); @@ -126,7 +132,7 @@ class Tracker { } static bool flow(const Pyramid& prev, const Pyramid& next, P p, P guess, P& q, float& rmse) { - constexpr int radius=4, side=radius*2+1, count=side*side; + constexpr int radius=TrackerPatchRadius, side=radius*2+1, count=side*side; int level=static_cast(std::min(prev.size(),next.size()))-1; for (;level>0;--level) { float s=static_cast(1< detect(const GrayFrame& frame, const std::vector

& existing) const { + static P refineCorner(const GrayFrame& frame, P initial) { + constexpr int radius=10; + P point=initial; + for(int iteration=0;iteration<20;++iteration) { + if(!inside(frame,point,radius+2))return initial; + double xx=0,xy=0,yy=0,bx=0,by=0; + for(int y=-radius;y<=radius;++y)for(int x=-radius;x<=radius;++x) { + float px=point.x+x,py=point.y+y; + double gx=.5*(sample(frame,px+1,py)-sample(frame,px-1,py)); + double gy=.5*(sample(frame,px,py+1)-sample(frame,px,py-1)); + double weight=std::exp(-double(x*x+y*y)/(radius*radius)); + double a=weight*gx*gx,b=weight*gx*gy,c=weight*gy*gy; + xx+=a;xy+=b;yy+=c;bx+=a*x+b*y;by+=b*x+c*y; + } + double det=xx*yy-xy*xy; + if(!std::isfinite(det)||det<1e-10)break; + float dx=float((yy*bx-xy*by)/det),dy=float((xx*by-xy*bx)/det); + if(!std::isfinite(dx)||!std::isfinite(dy))return initial; + point.x+=dx;point.y+=dy; + if(distance(point,initial)>radius)return initial; + if(dx*dx+dy*dy<=.03f*.03f)break; + } + return inside(frame,point,radius+2)?point:initial; + } + + std::vector

detect(const GrayFrame& frame) const { struct Candidate {P p;float score;}; std::vector candidates; float halfW=initialROI_.width*width_*.5f; float halfH=initialROI_.height*height_*.5f; float c=std::cos(initialROI_.angle),s=std::sin(initialROI_.angle); double det=cumulative_.determinant(); - float bound=0; - for(float x:{-halfW,halfW})for(float y:{-halfH,halfH}){ + if(!std::isfinite(det)||det<=0)return {}; + float left=float(width_),right=0,top=float(height_),bottom=0; + auto boundPoint=[&](P local){ + float x=local.x*2*halfW,y=local.y*2*halfH; auto p=cumulative_.map({initialROI_.cx*width_+c*x-s*y,initialROI_.cy*height_+s*x+c*y}); - bound=std::max(bound,distance(p,center_)); - } - int minX=std::max(8,static_cast(center_.x-bound)); - int maxX=std::min(width_-9,static_cast(center_.x+bound)); - int minY=std::max(8,static_cast(center_.y-bound)); - int maxY=std::min(height_-9,static_cast(center_.y+bound)); + left=std::min(left,p.x);right=std::max(right,p.x);top=std::min(top,p.y);bottom=std::max(bottom,p.y); + }; + // A free pen path is not constrained to its creation-time width/height. + // Bound the actual path, including points beyond local +/-0.5. + if(mask_.size()>=3)for(P p:mask_)boundPoint(p); + else for(float x:{-.5f,.5f})for(float y:{-.5f,.5f})boundPoint({x,y}); + constexpr int border=TrackerPatchRadius+3; + if(width_<=border*2||height_<=border*2)return {}; + int minX=int(std::clamp(std::floor(left),float(border),float(width_-border))); + int maxX=int(std::clamp(std::ceil(right),float(border),float(width_-border))); + int minY=int(std::clamp(std::floor(top),float(border),float(height_-border))); + int maxY=int(std::clamp(std::ceil(bottom),float(border),float(height_-border))); + auto inRegion=[&](P point){ + float dx=point.x-center_.x,dy=point.y-center_.y; + float oldX=float((cumulative_.d*dx-cumulative_.b*dy)/det); + float oldY=float((-cumulative_.c*dx+cumulative_.a*dy)/det); + float u=(c*oldX+s*oldY)/(2*halfW),v=(-s*oldX+c*oldY)/(2*halfH); + if(mask_.size()<3)return std::abs(u)<=.5f&&std::abs(v)<=.5f; + bool inside=false; + for(size_t i=0,j=mask_.size()-1;iv)!=(b.y>v))if(u<(b.x-a.x)*(v-a.y)/(b.y-a.y)+a.x)inside=!inside; + } + return inside; + }; float best=0; for (int y=minY;y.5f || std::abs(v)>.5f) continue; - if(mask_.size()>=3) { - bool inside=false; - for(size_t i=0,j=mask_.size()-1;iv)!=(b.y>v))if(u<(b.x-a.x)*(v-a.y)/(b.y-a.y)+a.x)inside=!inside; - } - if(!inside)continue; - } + if(!inRegion({float(x),float(y)}))continue; double xx=0,xy=0,yy=0; - for (int j=-2;j<=2;++j) for (int i=-2;i<=2;++i) { + for (int j=-1;j<=1;++j) for (int i=-1;i<=1;++i) { int idx=(y+j)*width_+x+i; float gx=(frame.pixels[idx+1]-frame.pixels[idx-1])*.5f; float gy=(frame.pixels[idx+width_]-frame.pixels[idx-width_])*.5f; @@ -217,16 +257,20 @@ class Tracker { } float score=static_cast((xx+yy-std::sqrt((xx-yy)*(xx-yy)+4*xy*xy))*.5); best=std::max(best,score); - if (score>.0003f) candidates.push_back({{static_cast(x),static_cast(y)},score}); + if (score>1e-7f) candidates.push_back({{static_cast(x),static_cast(y)},score}); } std::sort(candidates.begin(),candidates.end(),[](const auto& a,const auto& b){return a.score>b.score;}); - std::vector

selected=existing; - float minSpacing=std::max(6.f,std::min(width_,height_)*.014f); + std::vector

selected;selected.reserve(TrackerFeatureLimit); + constexpr float minSpacing=10.f; for (const auto& candidate:candidates) { - if (candidate.score < best*.012f || selected.size()>=180) break; + if (candidate.score < best*.03f || selected.size()>=TrackerFeatureLimit) break; bool near=false; for (const auto& p:selected) if (distance(p,candidate.p)8 || roi.height>8 || roi.cx<0 || roi.cx>1 || roi.cy<0 || roi.cy>1) return false; width_=frame.width;height_=frame.height;initialROI_=roi; center_={roi.cx*width_,roi.cy*height_}; - points_=detect(frame,{}); + points_=detect(frame); result_.features=static_cast(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; @@ -352,7 +396,12 @@ public: result_.confidence=confidence;result_.inliers=static_cast(inliers.size());result_.valid=true; points_.clear(); for (int i:inliers) points_.push_back(matches[i].q); - if (++frameIndex_%5==0 || points_.size()<60) points_=detect(frame,points_); + if (++frameIndex_%2==0 || points_.size()<60) { + auto refreshed=detect(frame); + // Keep a still-trusted set when a refresh finds insufficient new + // corners; the next fit must continue to satisfy all loss guards. + if(refreshed.size()>=12)points_=std::move(refreshed); + } previous_=std::move(next); return result_; }