Replace every production tracking path with Apple Vision; remove OpenCV linkage
这个提交包含在:
1 父节点
dbab2ab0cc
当前提交
8af7013ad4
22 个文件已更改
+600
-43
没有与搜索条件相匹配的文件
+1
-1
@@ -75,7 +75,7 @@ def main():
|
||||
result=deploy_file(local,NAS/relative,allow_new=True)
|
||||
manifest=dict(bundle_id='com.dayu.color',channel='beta',version=version,build=build,package_type='pkg',install_mode='pkg_installer',
|
||||
size=package.stat().st_size,sha256=digest,download_url='https://dayu.media/'+str(relative),minimum_system_version='14.6',
|
||||
notes='优化蒙版与马赛克跟踪:减少 Metal 灰度回读,复用光流计算数据;减少参数与图层列表重复刷新。转身和遮挡后的目标偏移仍需人工检查。保留可关闭的后台自动诊断。安装前请保存工作并正常退出 FCP、Motion 和大鱼调色主程序。')
|
||||
notes='全部跟踪改用 Apple Vision;普通蒙版和图章使用局部配准,马赛克使用目标外观跟踪,短时丢失后尝试重新定位并补齐轨迹;超过确认范围自动停止,未确认尾部不写入。预览限频,减少界面刷新负担;需重新跟踪并播放复核遮挡范围。保留可关闭的后台自动诊断。安装前请保存工作并正常退出 FCP、Motion 和大鱼调色主程序。')
|
||||
dest=NAS/UPLOAD/'beta.json';old=json.loads(dest.read_text()) if dest.exists() else None
|
||||
if old:assert int(old['build'])<=build, '禁止更新通道倒退'
|
||||
localManifest=LOCAL/UPLOAD/'beta.json';write_json(localManifest,manifest)
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"title": "大鱼调色 1.19.0 公测版|Vision 马赛克跟踪与后台自动诊断",
|
||||
"content": "<!-- wp:paragraph -->\n<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。1.19.0(构建 108)公测版为局部马赛克加入 Apple Vision 目标跟踪、短时预测与遮挡后重新确认,继续减少界面刷新负担,并保留后台自动诊断。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>本文主下载已更新为 1.19.0(构建 108)。勾选用于局部马赛克的矩形、椭圆或钢笔蒙版后,重新运行跟踪即可使用新方案。仍需播放复核遮盖范围;此前的后台诊断和安装完整性修复继续保留。</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>官方原始安装包不加密,不限制安装数量。</strong> 安装和使用无需登录、激活码或机器码。原始 PKG 可以原样转发,请保持安装包完整。禁止二次加密或加上一机一码后分发。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.19.0 马赛克目标跟踪</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>马赛克蒙版改用 Apple Vision 目标跟踪。</strong>先在“局部马赛克”菜单中勾选目标蒙版,再到控制面板逐个执行正向、反向或双向跟踪。转身时保留蒙版的宽高比例,减少框过度变窄。已有轨迹不会自动改变,需要重新跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>短时丢失后尝试重新找到目标。</strong>丢失时冻结最后确认的外观,根据之前运动做最多约 0.8 秒的暂时预测;连续两次确认目标后,再用丢失前后位置补齐中间轨迹。超过范围仍未确认则停止,末尾未确认预测不保存为正常关键帧,补齐的片段会提示复核。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>跟踪预览最多每秒刷新 15 次,只显示最新画面,减少面板刷新负担。普通调色蒙版和图章统一改用 Apple Vision 局部配准,保留位置、缩放和旋转;图章取样区和覆盖区分别跟踪。APP 已移除 OpenCV 跟踪依赖。新方案已用同一段转身素材与 CSRT、VitTrack 做本机比较,并覆盖人工短遮挡、长遮挡停止、突切停止和反向跟踪;单段测试不能保证所有素材都不偏移,长时间离开画面或相似人物交叉仍需分段修正。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.18.1 跟踪提速与界面刷新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>跟踪使用 Metal 生成紧凑灰度数据,减少 GPU 到 CPU 的回读;特征检测集中在目标范围,并复用相邻帧的光流计算数据。参数面板减少重复读取与图层列表刷新,让操作少做重复工作。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>同一段 4K 实拍素材的 285 帧测试中,纯追踪计算由约 8.78 秒降至 1.31 秒,轨迹与旧版逐帧一致。该测试不含宿主供图、解码、预览和渲染,不代表 FCP 整体处理速度提升相同比例。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>1.18.1 当时完成了 FCP 285 帧追踪和模块切换、参数修改还原测试,但旧光流方案仍有转身偏移。上述速度数据是该历史版本的独立计算测试;1.19.0 的马赛克矩形/椭圆已改用目标外观跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.18.0 自动诊断与后台运行</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>主 App 关闭窗口后继续在后台运行。</strong> 注册完成后不再倒计时退出,可从菜单栏重新打开窗口、发送诊断摘要或主动退出。保持主 App 运行有助于持续发现本插件的崩溃报告。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>开启公测诊断后,自动收集并发送限量摘要。</strong> 内容包括本插件主 App/服务的崩溃信息、卡顿调用栈,以及界面刷新、跟踪和渲染耗时统计。离线时排队,恢复连接后重试;诊断可在主 App 中关闭,云端保留 30 天。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>诊断不上传素材、LUT、个人预设、账号或原始系统报告;不会自动上传 Final Cut Pro 本身的完整崩溃报告。如果宿主再次闪退,请记下发生时间,并提供主 App 显示的报告标识,便于对应排查。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>近期版本还加入独立调色效果、水平校正和多目标马赛克。</strong> 检视器恢复折叠与内部滚动;“全部人脸”可逐帧识别,也可将暂停画面中的人脸转为可选蒙版,再对指定目标执行跟踪。实际多人运动、遮挡和界面流畅度仍需继续验证。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.14.3 界面展示</h2>\n<!Line truncated
|
||||
"excerpt": "大鱼调色 1.19.0(108)为马赛克蒙版加入 Apple Vision 目标跟踪、短时预测和遮挡后重新确认,减少界面刷新负担,保留可关闭的后台自动诊断。跟踪后仍需播放复核。",
|
||||
"seo": {
|
||||
"title": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.19.0 公测版|Vision 马赛克跟踪与后台自动诊断"
|
||||
},
|
||||
"description": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色 1.19.0 是适用于 Final Cut Pro 和 Motion 的原生调色插件。马赛克蒙版采用 Apple Vision,支持短时预测与遮挡后重新确认,保留后台自动诊断与 16 个独立效果。官方 PKG 已签名公证,无需激活。"
|
||||
},
|
||||
"keywords": {
|
||||
"enabled": true,
|
||||
"value": "大鱼调色,Final Cut Pro,Motion,FxPlug4,调色插件,仿制图章,蒙版跟踪,逐帧预览"
|
||||
}
|
||||
},
|
||||
"resource": {
|
||||
"cao_original_filename": "大鱼调色-1.19.0.pkg"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
大鱼调色 1.19.0(108)公测版
|
||||
|
||||
用于局部马赛克的矩形、椭圆和钢笔蒙版改用成熟的目标外观跟踪。转身时保留蒙版宽高比;短时丢失时冻结可信外观、最多预测约 0.8 秒,重新连续确认目标后用前后端点补齐,末尾未确认预测不写入轨迹。需重新运行跟踪并播放复核。
|
||||
|
||||
预览最多刷新 15 次/秒,只显示最新帧;保留上一版的轻量参数与图层刷新。普通调色蒙版和图章统一改用 Apple Vision 局部配准,保留位置、缩放和旋转;图章取样区和覆盖区分别跟踪。APP 已移除 OpenCV 跟踪依赖。主 APP 关闭窗口后继续后台诊断,可主动退出或关闭诊断。
|
||||
|
||||
同一段转身素材已比较 CSRT、VitTrack 和本次方案;人工短遮挡、长遮挡停止、突切停止、反向跟踪均有独立回归记录。单段测试不能保证长期遮挡、相似人物交叉或所有素材均不偏移。
|
||||
|
||||
安装前请保存工作,正常退出 Final Cut Pro、Motion 和大鱼调色。固定安装位置:/Library/Plug-Ins/FxPlug/大鱼调色.app。使用最终 Developer ID 签名、公证并粘附票据的 PKG;具体源码、验包和宿主验收见本版本 verification 记录。附匹配 dSYM 供崩溃定位。
|
||||
@@ -1,6 +1,6 @@
|
||||
# 转身与短时遮挡:成熟跟踪器比较
|
||||
|
||||
2026-11-06,接续正式 1.18.1(106)。1.19.0(107)源代码已接入,正式安装与宿主验收待完成。用户素材和逐帧位置只留在本机缓存,不上传仓库。
|
||||
2026-11-06,接续正式 1.18.1(106)。1.19.0(108)源代码已接入,正式安装与宿主验收待完成。用户素材和逐帧位置只留在本机缓存,不上传仓库。
|
||||
|
||||
原 OpenCV LK 只有局部光流与仿射拟合,没有完整对象外观模型;转身时背景特征仍可能给出高内点率。仅沿此结果继续外推会延续偏移。
|
||||
|
||||
@@ -23,7 +23,7 @@ Mac mini M4,640×360 BGRA、25fps、285 帧同一实拍。开源候选使用
|
||||
|
||||
## 选择与集成边界
|
||||
|
||||
先采用实测更稳的系统对象跟踪,应用于被局部马赛克选中的矩形/椭圆蒙版。保留作者宽高比和角度,采用保守统一缩放;旋转蒙版先转换到真实外接矩形。普通调色蒙版、钢笔和图章保留现有 OpenCV 多边形光流/仿射路径,避免用矩形对象框改变其精确形状行为。切换后需重新运行跟踪,已有工程轨迹不会静默改写。
|
||||
用户追加要求所有跟踪统一改为 Apple。107 已公证安装但未做宿主验收、未发布;108 移除 APP OpenCV 构建和链接。局部马赛克的矩形/椭圆/钢笔使用 Vision 对象跟踪,保留作者比例和角度,按真实路径外接矩形及中心偏移映射。普通蒙版和图章使用 Vision 局部图像配准,恢复中心、缩放和旋转;图章取样区与覆盖区分别配准。配准结果按实际多边形内像素相关性验证,纹理丢失/变换异常即停。分析裁剪最长 320 像素,保留原帧读取以精确截取小区域。已有工程轨迹不静默改写,需重新运行跟踪。
|
||||
|
||||
计算在宿主分析回调,界面预览最多 15Hz,只保留最新待显示帧;不逐帧重建参数面板。需正式宿主验证回调线程和实际操作响应,不能用算法耗时替代 UI 延迟。
|
||||
|
||||
@@ -33,7 +33,7 @@ Mac mini M4,640×360 BGRA、25fps、285 帧同一实拍。开源候选使用
|
||||
- [OSTrack](https://github.com/botaoye/OSTrack):MIT,研究工程主要面向 PyTorch / CUDA;未本机实测,未来可评估 Core ML 转换后的速度与恢复能力。
|
||||
- [ByteTrack](https://github.com/FoundationVision/ByteTrack):MIT,多目标检测框关联;还需要检测器,单独引入不能解决转身后没有人脸检测框的问题。
|
||||
|
||||
VitTrack 模型来自官方 OpenCV Zoo,714726 字节,SHA-256 `2990f0b7cd44d92afa48cd97db6de7be113fc1d9594fddb74e2725c10478e91d`;目录声明 Apache-2.0。仅在缓存中用于比较,未加入 APP 或 Git。现有 APP OpenCV 4.5.1 依赖不因基准 wheel 变化而升级。
|
||||
VitTrack 模型来自官方 OpenCV Zoo,714726 字节,SHA-256 `2990f0b7cd44d92afa48cd97db6de7be113fc1d9594fddb74e2725c10478e91d`;目录声明 Apache-2.0。仅在缓存中用于比较,未加入 APP 或 Git。OpenCV 源码锁和独立对照工具保留为研究记录,正式 APP 不再构建或链接 OpenCV。
|
||||
|
||||
## 复测入口
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../../大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp"
|
||||
#include <cstdio>
|
||||
#include <chrono>
|
||||
float noise(int x,int y){uint32_t n=uint32_t(x)*73856093u^uint32_t(y)*19349663u;n^=n>>13;n*=1274126177u;return .15f+.7f*((n>>8)&255)/255.f;}
|
||||
float texture(float u,float v){int x=std::floor(u),y=std::floor(v);float fx=u-x,fy=v-y;return (noise(x,y)*(1-fx)+noise(x+1,y)*fx)*(1-fy)+(noise(x,y+1)*(1-fx)+noise(x+1,y+1)*fx)*fy;}
|
||||
dy::GrayFrame frame(int step,bool paired,bool rotate,bool flat=false){dy::GrayFrame f{320,192,{}};f.pixels.resize(320*192);for(int y=0;y<192;y++)for(int x=0;x<320;x++){
|
||||
bool left=paired&&x<160;float cx=paired?(left?80:240):160,cy=96,scale=1+step*(paired?(left?-.025f:.035f):.01f),angle=rotate?.01f*step:0,tx=step*(paired?(left?-1.5f:2.f):2.f),ty=step*(paired?(left?1.f:-.75f):1.f);
|
||||
float a=(x-cx-tx)/scale,b=(y-cy-ty)/scale,u=(cx+a*std::cos(angle)+b*std::sin(angle))/4,v=(cy-a*std::sin(angle)+b*std::cos(angle))/4;f.pixels[y*320+x]=flat?.4f:texture(u,v);}return f;}
|
||||
int main(){@autoreleasepool{NSMutableArray *results=[NSMutableArray array];bool all=true;auto begin=std::chrono::steady_clock::now();
|
||||
for(int mode=0;mode<4;mode++){
|
||||
bool paired=mode>=2,rotate=mode==1;float cx=paired?(mode==2?.25:.75):.5;dy::VisionRegionTracker tracker;
|
||||
std::vector<dy::FlowPoint> polygon={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
|
||||
if(mode==1)polygon={{-.45,-.5},{.5,-.5},{.5,0},{0,0},{0,.5},{-.45,.5}};
|
||||
tracker.setMask(polygon);bool ok=tracker.reset(frame(0,paired,rotate),{cx,.5,paired?.32f:.65f,paired?.54f:.65f,0});dy::TrackResult r=tracker.result();
|
||||
NSMutableArray *steps=[NSMutableArray array];for(int i=1;i<6&&ok;i++){r=tracker.track(frame(i,paired,rotate));ok&=r.valid;[steps addObject:@{@"i":@(i),@"cx":@(r.cx),@"cy":@(r.cy),@"sx":@(r.scaleX),@"sy":@(r.scaleY),@"angle":@(r.rotation),@"confidence":@(r.confidence),@"valid":@(r.valid),@"failure":@(int(r.failure))}];}
|
||||
float expectedX=cx+5*(paired?(mode==2?-1.5f:2.f):2.f)/320,expectedY=.5+5*(paired?(mode==2?1.f:-.75f):1.f)/192,expectedScale=1+5*(paired?(mode==2?-.025f:.035f):.01f);
|
||||
bool precise=ok&&std::abs(r.cx-expectedX)<.006&&std::abs(r.cy-expectedY)<.008&&std::abs(r.scaleX-expectedScale)<.04&&std::abs(r.scaleY-expectedScale)<.04&&(!rotate||std::abs(r.rotation-.05)<.02);
|
||||
bool loss=ok&&!tracker.track(frame(6,paired,rotate,true)).valid;all&=precise&&loss;[results addObject:@{@"mode":@(mode),@"geometryPass":@(precise),@"flatLossPass":@(loss),@"steps":steps}];
|
||||
}
|
||||
auto report=@{@"pass":@(all),@"milliseconds":@(std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-begin).count()),@"results":results};NSData *data=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil];fwrite(data.bytes,1,data.length,stdout);return all?0:1;}}
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
"status": "superseded-before-host-acceptance",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.19.0",
|
||||
"build": "107",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "fe333a3c-e024-47cb-b88a-c74336e2eb7f",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "dbab2ab0cc1efa263d11a35d9d60983ed9d2a247",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-1430a23853ba4af19998a456211e8479.app",
|
||||
"reason": "User requested replacing all tracking with Apple Vision, including ordinary masks, Bezier and clone stamp. Build 107 not published."
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"version": "1.19.0",
|
||||
"build": 107,
|
||||
"compiledSource": "dbab2ab0cc1efa263d11a35d9d60983ed9d2a247",
|
||||
"images": [
|
||||
{
|
||||
"name": "大鱼调色",
|
||||
"uuid": "F952A83C-8229-3789-9945-3936C3C617B9",
|
||||
"dSYM": "大鱼调色.app.dSYM"
|
||||
},
|
||||
{
|
||||
"name": "大鱼调色 XPC Service",
|
||||
"uuid": "23882794-4B37-3785-8A5C-588BF4C68CBF",
|
||||
"dSYM": "大鱼调色 XPC Service.pluginkit.dSYM"
|
||||
}
|
||||
],
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/candidate107-symbols.zip",
|
||||
"bytes": 3620218,
|
||||
"sha256": "54df8d8494ff7de5b8e0dd87abbe216c11eedc8a16a37b3bdb415d68843ea18b",
|
||||
"installedBinaryUUIDMatch": true,
|
||||
"releaseUploaded": false,
|
||||
"candidateOnly": true
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.18.1",
|
||||
"build": "106",
|
||||
"version": "1.19.0",
|
||||
"build": "107",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "2c4e6cba-8178-4a50-9198-83e66be37add",
|
||||
"notaryID": "fe333a3c-e024-47cb-b88a-c74336e2eb7f",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601",
|
||||
"sourceCommit": "dbab2ab0cc1efa263d11a35d9d60983ed9d2a247",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
@@ -65,5 +65,5 @@
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793",
|
||||
"hostVerification": "verification/HostTrackingUI1.18.1.json"
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-1430a23853ba4af19998a456211e8479.app"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 964,
|
||||
"checks": 977,
|
||||
"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/2FE6A380-AB9D-4132-A5B5-15339840212B"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -898,7 +898,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +918,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 92.47249999316409,
|
||||
"maximumGapMS": 101.9619166618213,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1397,7 +1397,7 @@
|
||||
"closePixels": 128,
|
||||
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1468,7 +1468,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "CE2B332D-C86F-407E-AE35-C2736E2193CE",
|
||||
"node": "D126C5DF-5F2A-457D-818B-88257D334B3F",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1477,10 +1477,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -2808,6 +2808,58 @@
|
||||
"name": "host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-selected-mask-uses-object-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "bezier-mosaic-preserves-polygon-flow-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "disabled-mosaic-keeps-precise-flow-path",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-object-host-callbacks-produce-six-frames",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-tracking-discards-unconfirmed-tail-before-commit",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-short-loss-predicts-prior-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-reacquisition-requires-two-consistent-observations",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-motion-rejects-distant-distractor",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-long-loss-stops-bounded-prediction",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-invalid-fps-does-not-enable-prediction",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-gap-repair-uses-both-endpoints-in-reverse-order",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-gap-repair-rejects-missing-confirmed-anchor",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "object-gap-repair-never-overwrites-manual-key",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "canvas-cold-load-selects-saved-mask-from-immutable-snapshot",
|
||||
"pass": true
|
||||
@@ -4428,7 +4480,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4827,6 +4879,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/183228A3-41D5-4AB1-9C73-3C24216C220E",
|
||||
"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,10 @@
|
||||
{
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"compiledSource": "dbab2ab0cc1efa263d11a35d9d60983ed9d2a247",
|
||||
"compiledFilesVerified": 755,
|
||||
"byteExact": true,
|
||||
"gitFsck": true,
|
||||
"lfsPointers": [],
|
||||
"submodules": [],
|
||||
"scope": "Independent remote clone and byte checks; did not repeat third-party cold build or store user media"
|
||||
}
|
||||
@@ -0,0 +1,256 @@
|
||||
{
|
||||
"pass": true,
|
||||
"milliseconds": 114.938334,
|
||||
"results": [
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0.00030116166453808546,
|
||||
"confidence": 0.997211217880249,
|
||||
"cy": 0.505378246307373,
|
||||
"sx": 1.0120620727539062,
|
||||
"valid": true,
|
||||
"i": 1,
|
||||
"failure": 0,
|
||||
"sy": 1.0123298168182373,
|
||||
"cx": 0.5061646699905396
|
||||
},
|
||||
{
|
||||
"angle": 0.00041505444096401334,
|
||||
"confidence": 0.9982037544250488,
|
||||
"cy": 0.5109624266624451,
|
||||
"sx": 1.0229401588439941,
|
||||
"valid": true,
|
||||
"i": 2,
|
||||
"failure": 0,
|
||||
"sy": 1.0244232416152954,
|
||||
"cx": 0.5123989582061768
|
||||
},
|
||||
{
|
||||
"angle": 0.0008218093425966799,
|
||||
"confidence": 0.9970992207527161,
|
||||
"cy": 0.5163348913192749,
|
||||
"sx": 1.0351276397705078,
|
||||
"valid": true,
|
||||
"i": 3,
|
||||
"failure": 0,
|
||||
"sy": 1.0366443395614624,
|
||||
"cx": 0.5185526013374329
|
||||
},
|
||||
{
|
||||
"angle": 0.001055820262990892,
|
||||
"confidence": 0.9984501004219055,
|
||||
"cy": 0.5216847062110901,
|
||||
"sx": 1.0463300943374634,
|
||||
"valid": true,
|
||||
"i": 4,
|
||||
"failure": 0,
|
||||
"sy": 1.0480226278305054,
|
||||
"cx": 0.5247405767440796
|
||||
},
|
||||
{
|
||||
"angle": 0.0012197730829939246,
|
||||
"confidence": 0.9983993172645569,
|
||||
"cy": 0.5270904898643494,
|
||||
"sx": 1.0567429065704346,
|
||||
"valid": true,
|
||||
"i": 5,
|
||||
"failure": 0,
|
||||
"sy": 1.0597118139266968,
|
||||
"cx": 0.5310028791427612
|
||||
}
|
||||
],
|
||||
"flatLossPass": true,
|
||||
"mode": 0,
|
||||
"geometryPass": true
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0.009967775084078312,
|
||||
"confidence": 0.9949162602424622,
|
||||
"cy": 0.5055747032165527,
|
||||
"sx": 1.0111944675445557,
|
||||
"valid": true,
|
||||
"i": 1,
|
||||
"failure": 0,
|
||||
"sy": 1.0095919370651245,
|
||||
"cx": 0.5062549710273743
|
||||
},
|
||||
{
|
||||
"angle": 0.02062590979039669,
|
||||
"confidence": 0.9966701865196228,
|
||||
"cy": 0.5111720561981201,
|
||||
"sx": 1.0224586725234985,
|
||||
"valid": true,
|
||||
"i": 2,
|
||||
"failure": 0,
|
||||
"sy": 1.0171892642974854,
|
||||
"cx": 0.5125352740287781
|
||||
},
|
||||
{
|
||||
"angle": 0.03139157593250275,
|
||||
"confidence": 0.9969140887260437,
|
||||
"cy": 0.5167808532714844,
|
||||
"sx": 1.033342957496643,
|
||||
"valid": true,
|
||||
"i": 3,
|
||||
"failure": 0,
|
||||
"sy": 1.0242987871170044,
|
||||
"cx": 0.5188140869140625
|
||||
},
|
||||
{
|
||||
"angle": 0.042038943618535995,
|
||||
"confidence": 0.9961121678352356,
|
||||
"cy": 0.5224273800849915,
|
||||
"sx": 1.0442034006118774,
|
||||
"valid": true,
|
||||
"i": 4,
|
||||
"failure": 0,
|
||||
"sy": 1.0314151048660278,
|
||||
"cx": 0.5251041650772095
|
||||
},
|
||||
{
|
||||
"angle": 0.05254638195037842,
|
||||
"confidence": 0.9968076944351196,
|
||||
"cy": 0.5280846953392029,
|
||||
"sx": 1.0549098253250122,
|
||||
"valid": true,
|
||||
"i": 5,
|
||||
"failure": 0,
|
||||
"sy": 1.0389935970306396,
|
||||
"cx": 0.531261682510376
|
||||
}
|
||||
],
|
||||
"flatLossPass": true,
|
||||
"mode": 1,
|
||||
"geometryPass": true
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0.0012855837121605873,
|
||||
"confidence": 0.996295690536499,
|
||||
"cy": 0.505118191242218,
|
||||
"sx": 0.9726772308349609,
|
||||
"valid": true,
|
||||
"i": 1,
|
||||
"failure": 0,
|
||||
"sy": 0.9731171131134033,
|
||||
"cx": 0.24520695209503174
|
||||
},
|
||||
{
|
||||
"angle": 0.0026874535251408815,
|
||||
"confidence": 0.9993696808815002,
|
||||
"cy": 0.5102159976959229,
|
||||
"sx": 0.9476237893104553,
|
||||
"valid": true,
|
||||
"i": 2,
|
||||
"failure": 0,
|
||||
"sy": 0.9473755359649658,
|
||||
"cx": 0.24039006233215332
|
||||
},
|
||||
{
|
||||
"angle": 0.00400719977915287,
|
||||
"confidence": 0.9978270530700684,
|
||||
"cy": 0.5151881575584412,
|
||||
"sx": 0.9213101863861084,
|
||||
"valid": true,
|
||||
"i": 3,
|
||||
"failure": 0,
|
||||
"sy": 0.9214370846748352,
|
||||
"cx": 0.23562279343605042
|
||||
},
|
||||
{
|
||||
"angle": 0.0054705156944692135,
|
||||
"confidence": 0.9968448281288147,
|
||||
"cy": 0.5200582146644592,
|
||||
"sx": 0.8955021500587463,
|
||||
"valid": true,
|
||||
"i": 4,
|
||||
"failure": 0,
|
||||
"sy": 0.8958438634872437,
|
||||
"cx": 0.23082032799720764
|
||||
},
|
||||
{
|
||||
"angle": 0.0065700458362698555,
|
||||
"confidence": 0.9971773028373718,
|
||||
"cy": 0.5250596404075623,
|
||||
"sx": 0.8697163462638855,
|
||||
"valid": true,
|
||||
"i": 5,
|
||||
"failure": 0,
|
||||
"sy": 0.8707844614982605,
|
||||
"cx": 0.22602543234825134
|
||||
}
|
||||
],
|
||||
"flatLossPass": true,
|
||||
"mode": 2,
|
||||
"geometryPass": true
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": -0.0033070251811295748,
|
||||
"confidence": 0.9962567090988159,
|
||||
"cy": 0.49610283970832825,
|
||||
"sx": 1.0306658744812012,
|
||||
"valid": true,
|
||||
"i": 1,
|
||||
"failure": 0,
|
||||
"sy": 1.034022569656372,
|
||||
"cx": 0.7563123106956482
|
||||
},
|
||||
{
|
||||
"angle": -0.006257329136133194,
|
||||
"confidence": 0.9978556632995605,
|
||||
"cy": 0.4922579526901245,
|
||||
"sx": 1.0616891384124756,
|
||||
"valid": true,
|
||||
"i": 2,
|
||||
"failure": 0,
|
||||
"sy": 1.068353533744812,
|
||||
"cx": 0.762669563293457
|
||||
},
|
||||
{
|
||||
"angle": -0.009793867357075214,
|
||||
"confidence": 0.997668445110321,
|
||||
"cy": 0.48837438225746155,
|
||||
"sx": 1.0926778316497803,
|
||||
"valid": true,
|
||||
"i": 3,
|
||||
"failure": 0,
|
||||
"sy": 1.1025370359420776,
|
||||
"cx": 0.7689304351806641
|
||||
},
|
||||
{
|
||||
"angle": -0.011967367492616177,
|
||||
"confidence": 0.9984378814697266,
|
||||
"cy": 0.48451682925224304,
|
||||
"sx": 1.127761721611023,
|
||||
"valid": true,
|
||||
"i": 4,
|
||||
"failure": 0,
|
||||
"sy": 1.1363595724105835,
|
||||
"cx": 0.7753861546516418
|
||||
},
|
||||
{
|
||||
"angle": -0.01359553448855877,
|
||||
"confidence": 0.9974396228790283,
|
||||
"cy": 0.48052653670310974,
|
||||
"sx": 1.166257619857788,
|
||||
"valid": true,
|
||||
"i": 5,
|
||||
"failure": 0,
|
||||
"sy": 1.1704301834106445,
|
||||
"cx": 0.7819676399230957
|
||||
}
|
||||
],
|
||||
"flatLossPass": true,
|
||||
"mode": 3,
|
||||
"geometryPass": true
|
||||
}
|
||||
],
|
||||
"scope": "CLI synthetic regions: rectangle translation/scale; nonrectangular polygon rotation/scale; two independently moving/scaling clone regions; flat loss. Host acceptance pending.",
|
||||
"build": 108
|
||||
}
|
||||
@@ -333,7 +333,6 @@
|
||||
shellPath = /bin/sh;
|
||||
shellScript = (
|
||||
"set -eu",
|
||||
"/usr/bin/python3 \"$SRCROOT/tools/build_tracking_opencv.py\" --resources \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/ThirdParty/OpenCV\"",
|
||||
"/usr/bin/python3 \"$SRCROOT/ColorManagement/build_runtime.py\" \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"",
|
||||
"/usr/bin/python3 \"$SRCROOT/tools/build_kernels.py\" --output \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/default.metallib\" --intermediates \"$DERIVED_FILE_DIR/DayuKernels\"",
|
||||
"/usr/bin/python3 - \"$SRCROOT/大鱼调色/Plugin/Resources\" \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\" <<'PYBUILD'",
|
||||
@@ -388,7 +387,6 @@
|
||||
MACOSX_DEPLOYMENT_TARGET = 14.6;
|
||||
OTHER_LDFLAGS = (
|
||||
"@/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/cms-runtime/bridge-link.rsp",
|
||||
"@/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/tracking-opencv/link.rsp",
|
||||
"$(inherited)",
|
||||
"-framework",
|
||||
Metal,
|
||||
@@ -425,7 +423,6 @@
|
||||
MACOSX_DEPLOYMENT_TARGET = 14.6;
|
||||
OTHER_LDFLAGS = (
|
||||
"@/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/cms-runtime/bridge-link.rsp",
|
||||
"@/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/tracking-opencv/link.rsp",
|
||||
"$(inherited)",
|
||||
"-framework",
|
||||
Metal,
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#import <os/log.h>
|
||||
#include "MaskCore/DYTracker.hpp"
|
||||
#include "MaskCore/DYOpenCVTracker.hpp"
|
||||
#include "MaskCore/DYVisionRegionTracker.hpp"
|
||||
#include "MaskCore/DYObjectTracker.hpp"
|
||||
#include <atomic>
|
||||
#include "DYViewerParameterBridge.inc.h"
|
||||
|
||||
@@ -22,7 +22,9 @@
|
||||
DYMaskParameters _trackingSeed;
|
||||
DYStampMotion _trackingStampMotion;
|
||||
dy::TrackerROI _trackingStampSourceSeed;
|
||||
dy::OpenCVTracker _toolTracker,_stampSourceTracker;
|
||||
dy::VisionRegionTracker _toolTracker,_stampSourceTracker;
|
||||
std::vector<dy::FlowPoint> _trackingShapePolygon;
|
||||
dy::TrackerROI _trackingObjectROI;
|
||||
dy::ObjectTracker _objectTracker;
|
||||
BOOL _trackingObjectMode;
|
||||
NSUInteger _trackingObjectPending,_trackingObjectRepaired;
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
}
|
||||
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)});}
|
||||
if(_trackingStampMotion.active)_stampSourceTracker.setMask(polygon);
|
||||
_toolTracker.setMask(std::move(polygon));return YES;
|
||||
_trackingShapePolygon=polygon;_toolTracker.setMask(std::move(polygon));return YES;
|
||||
}
|
||||
- (BOOL)finishToolTrackingLoss:(const dy::TrackResult&)lost region:(NSString*)region atTime:(CMTime)time error:(NSError**)error {
|
||||
NSString *reason=@"区域内运动不一致";
|
||||
@@ -250,21 +250,17 @@
|
||||
NSData *rgba=preview[@"rgba"];int width=[preview[@"width"]intValue],height=[preview[@"height"]intValue];
|
||||
if(width<16||height<16||width>640||height>640||rgba.length!=size_t(width)*height*4)return [self finishToolAnalysis:@"目标跟踪未取得完整分析画面,原轨迹已保留" error:error];
|
||||
if(!_trackingSamples.count){
|
||||
// Vision consumes an axis-aligned object rectangle. Track the true bounds
|
||||
// of a rotated authored shape, then apply only its uniform scale/position.
|
||||
float aspect=float(width)/height,ca=std::cos(_trackingSeed.angle),sa=std::sin(_trackingSeed.angle);
|
||||
float w=_trackingSeed.width*aspect,h=_trackingSeed.height;
|
||||
BOOL ellipse=_trackingSeed.kind==DYMaskEllipse;
|
||||
float bw=ellipse?std::hypot(w*ca,h*sa):fabs(w*ca)+fabs(h*sa);
|
||||
float bh=ellipse?std::hypot(w*sa,h*ca):fabs(w*sa)+fabs(h*ca);
|
||||
dy::TrackerROI roi={_trackingSeed.centerX,_trackingSeed.centerY,bw/aspect,bh,0};
|
||||
dy::TrackerROI seed={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
dy::TrackerROI roi=dy::visionMaskBounds(seed,_trackingShapePolygon,float(width)/height);_trackingObjectROI=roi;
|
||||
os_log(OS_LOG_DEFAULT,"dayu_object_track_worker main=%{public}d",(int)NSThread.isMainThread);
|
||||
if(!_objectTracker.reset((const uint8_t*)rgba.bytes,width,height,_trackingFlip,roi,1./CMTimeGetSeconds(_trackingFrameDuration)))return [self finishToolAnalysis:@"无法建立目标外观,请调整蒙版后重试" error:error];
|
||||
objectStep={{roi.cx,roi.cy,roi.width,roi.height,1},true,false,false,0};
|
||||
}else objectStep=_objectTracker.track((const uint8_t*)rgba.bytes,width,height,_trackingFlip);
|
||||
target=_objectTracker.result(objectStep);
|
||||
target.cx+=(_trackingSeed.centerX-_trackingObjectROI.cx)*target.scale;target.cy+=(_trackingSeed.centerY-_trackingObjectROI.cy)*target.scale;
|
||||
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
|
||||
}else if(!_trackingSamples.count){
|
||||
os_log(OS_LOG_DEFAULT,"dayu_vision_region_worker main=%{public}d stamp=%{public}d",(int)NSThread.isMainThread,(int)stamp);
|
||||
dy::TrackerROI targetROI={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
if(!_toolTracker.reset(frame,targetROI))
|
||||
return [self finishToolAnalysis:stamp?@"覆盖区域内纹理不足,原图章已保留":@"蒙版内纹理不足,原蒙版已保留" error:error];
|
||||
|
||||
@@ -320,7 +320,7 @@ BOOL DYMosaicTracksMask(NSDictionary *doc,NSString *maskID){
|
||||
NSDictionary *mosaic=doc[@"mosaic"],*mask=DYSharedMaskWithID(doc,maskID);
|
||||
NSArray *ids=mosaic[@"maskIDs"]?: (mosaic[@"maskID"]?@[mosaic[@"maskID"]]:@[]);
|
||||
DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);
|
||||
return mask&&(p.kind==DYMaskEllipse||p.kind==DYMaskRectangle)&&!mask[@"stampSource"]&&[mask[@"enabled"]boolValue]&&[mosaic[@"enabled"]boolValue]&&[mosaic[@"source"]isEqual:@"mask"]&&[ids containsObject:maskID];
|
||||
return mask&&(p.kind<=DYMaskBezier)&&!mask[@"stampSource"]&&[mask[@"enabled"]boolValue]&&[mosaic[@"enabled"]boolValue]&&[mosaic[@"source"]isEqual:@"mask"]&&[ids containsObject:maskID];
|
||||
}
|
||||
BOOL DYRepairObjectTrackingGap(NSMutableArray *samples,DYMaskParameters next,NSUInteger gap){
|
||||
if(!gap)return YES;if(samples.count<=gap||!dyValidMaskParameters(next))return NO;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
NSMutableArray *updates=[NSMutableArray array];
|
||||
id observer=[NSNotificationCenter.defaultCenter addObserverForName:@"DYToolTrackingStatus" object:host queue:nil usingBlock:^(NSNotification *note){if(note.userInfo[@"tracking"])[updates addObject:note.userInfo];}];
|
||||
run.need(@"tracking-renders-valid-source-before-analysis",capture(0));run.record(@"inactive-tracking-avoids-full-frame-motion-readback",[[plugin valueForKey:@"toolCaptureDevices"]count]==0);int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-opencv-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-vision-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
NSDictionary *lastPreview=updates.count>=2?updates[updates.count-2]:nil;
|
||||
DYMaskParameters shown{};
|
||||
[lastPreview[@"shape"] getBytes:&shown length:sizeof(shown)];
|
||||
@@ -62,7 +62,7 @@
|
||||
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(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){double code=x%3==1?.8:.2;double expected=std::round(std::pow(std::pow((code+.055)/1.055,2.4),1/2.2)*255)/255.;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-opencv",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-vision-crops",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
auto compact=[plugin toolGrayFrame:fine preview:nullptr error:nil];BOOL identical=compact.valid()&&compact.pixels.empty()&&compact.bytes.size()==w*h;
|
||||
for(size_t i=0;i<compact.bytes.size()&&identical;++i)identical=compact.at(i)==gray.pixels[i];
|
||||
run.record(@"tracking-metal-gray8-compact-readback-matches-float-reference",identical,@{@"readbackBytes":@(compact.bytes.size()),@"previousReadbackBytes":@(gray.pixels.size()*sizeof(float))});
|
||||
@@ -178,9 +178,9 @@
|
||||
objectDoc[@"mosaic"]=[NSMutableDictionary dictionaryWithDictionary:@{@"enabled":@YES,@"source":@"mask",@"maskIDs":@[ID],@"size":@16}];
|
||||
run.record(@"mosaic-selected-mask-uses-object-tracking",DYMosaicTracksMask(objectDoc,ID)&&!DYMosaicTracksMask(objectDoc,@"missing"));
|
||||
shape.kind=DYMaskBezier;objectMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];
|
||||
run.record(@"bezier-mosaic-preserves-polygon-flow-tracking",!DYMosaicTracksMask(objectDoc,ID));
|
||||
run.record(@"bezier-mosaic-uses-vision-object-tracking",DYMosaicTracksMask(objectDoc,ID));
|
||||
shape.kind=DYMaskRectangle;objectMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];
|
||||
objectDoc[@"mosaic"][@"enabled"]=@NO;run.record(@"disabled-mosaic-keeps-precise-flow-path",!DYMosaicTracksMask(objectDoc,ID));objectDoc[@"mosaic"][@"enabled"]=@YES;
|
||||
objectDoc[@"mosaic"][@"enabled"]=@NO;run.record(@"disabled-mosaic-uses-precise-vision-registration",!DYMosaicTracksMask(objectDoc,ID));objectDoc[@"mosaic"][@"enabled"]=@YES;
|
||||
DYWriteTools(base,objectDoc,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"direction":@1}]];
|
||||
BOOL ok=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
|
||||
@@ -162,7 +162,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(current&&[faces[@"boxes"]count])add([NSString stringWithFormat:@"将本帧 %lu 张人脸转为可选跟踪蒙版",(unsigned long)[faces[@"boxes"]count]],@{@"importFaces":faces,@"actionTime":[(NSDictionary*)CMTimeCopyAsDictionary(actionTime,kCFAllocatorDefault)autorelease]},NO);
|
||||
else {NSMenuItem *hint=[menu addItemWithTitle:current?@"本帧未识别到人脸":@"先开启全部人脸,暂停后再次打开以指定人脸" action:nil keyEquivalent:@""];hint.enabled=NO;}
|
||||
[menu addItem:NSMenuItem.separatorItem];
|
||||
NSMenuItem *hint=[menu addItemWithTitle:@"勾选后逐个跟踪;矩形/椭圆支持短时预测与重新定位" action:nil keyEquivalent:@""];hint.enabled=NO;
|
||||
NSMenuItem *hint=[menu addItemWithTitle:@"勾选后逐个跟踪;支持短时预测与重新定位" action:nil keyEquivalent:@""];hint.enabled=NO;
|
||||
NSArray *IDs=settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[]);NSInteger count=0;
|
||||
for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=mask[@"label"]?:[NSString stringWithFormat:@"蒙版 %ld · %@",(long)count,@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]];
|
||||
add([shape stringByAppendingString:[mask[@"keys"]count]?@" · 已跟踪":@" · 静态"],@{@"toggleMask":mask[@"id"]},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[IDs containsObject:mask[@"id"]]);
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>107</string>
|
||||
<string>108</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
#pragma once
|
||||
#import <Vision/Vision.h>
|
||||
#import <CoreVideo/CoreVideo.h>
|
||||
#include "DYTracker.hpp"
|
||||
|
||||
namespace dy {
|
||||
inline TrackerROI visionMaskBounds(TrackerROI roi,const std::vector<FlowPoint>& polygon,float aspect){
|
||||
float x0=1e9f,y0=1e9f,x1=-1e9f,y1=-1e9f,c=std::cos(roi.angle),s=std::sin(roi.angle);
|
||||
for(auto p:polygon){float x=p.x*roi.width*aspect,y=p.y*roi.height;
|
||||
float xx=roi.cx+(x*c-y*s)/aspect,yy=roi.cy+x*s+y*c;
|
||||
x0=std::min(x0,xx);x1=std::max(x1,xx);y0=std::min(y0,yy);y1=std::max(y1,yy);}
|
||||
return polygon.size()<3?roi:TrackerROI{(x0+x1)*.5f,(y0+y1)*.5f,x1-x0,y1-y0,0};
|
||||
}
|
||||
|
||||
// Precision path for authored masks and independently moving clone regions.
|
||||
// Vision estimates the local projective motion. We validate it against pixels
|
||||
// inside the actual polygon, then expose the existing center/scale/angle format.
|
||||
// No OpenCV code or fallback is used.
|
||||
class VisionRegionTracker {
|
||||
struct H {
|
||||
double a[9]={1,0,0,0,1,0,0,0,1};
|
||||
FlowPoint map(FlowPoint p)const{double z=a[6]*p.x+a[7]*p.y+a[8];return {float((a[0]*p.x+a[1]*p.y+a[2])/z),float((a[3]*p.x+a[4]*p.y+a[5])/z)};}
|
||||
static H mul(const H& l,const H& r){H h;for(int y=0;y<3;y++)for(int x=0;x<3;x++){h.a[y*3+x]=0;for(int k=0;k<3;k++)h.a[y*3+x]+=l.a[y*3+k]*r.a[k*3+x];}return h;}
|
||||
} cumulative_;
|
||||
GrayFrame previous_;
|
||||
std::vector<FlowPoint> polygon_,samples_;
|
||||
TrackerROI seed_{};
|
||||
TrackResult result_;
|
||||
int width_=0,height_=0;
|
||||
bool active_=false;
|
||||
static float pixel(const GrayFrame& f,float x,float y){
|
||||
x=std::clamp(x,0.f,float(f.width-1));y=std::clamp(y,0.f,float(f.height-1));
|
||||
int ix=int(x),iy=int(y),jx=std::min(ix+1,f.width-1),jy=std::min(iy+1,f.height-1);float fx=x-ix,fy=y-iy;
|
||||
return (f.at(iy*f.width+ix)*(1-fx)+f.at(iy*f.width+jx)*fx)*(1-fy)+(f.at(jy*f.width+ix)*(1-fx)+f.at(jy*f.width+jx)*fx)*fy;
|
||||
}
|
||||
static bool inside(const std::vector<FlowPoint>& polygon,float x,float y){bool yes=false;for(size_t i=0,j=polygon.size()-1;i<polygon.size();j=i++){
|
||||
auto a=polygon[i],b=polygon[j];if((a.y>y)!=(b.y>y))if(x<(b.x-a.x)*(y-a.y)/(b.y-a.y)+a.x)yes=!yes;}return yes;}
|
||||
bool framePoint(FlowPoint p)const{return std::isfinite(p.x)&&std::isfinite(p.y)&&p.x>=1&&p.y>=1&&p.x<width_-2&&p.y<height_-2;}
|
||||
double correlation(const GrayFrame& current,const H& next,int& count)const{
|
||||
double a=0,b=0,aa=0,bb=0,ab=0;count=0;
|
||||
for(auto p:samples_){auto l=cumulative_.map(p),r=next.map(p);if(!framePoint(l)||!framePoint(r))continue;double x=pixel(previous_,l.x,l.y),y=pixel(current,r.x,r.y);a+=x;b+=y;aa+=x*x;bb+=y*y;ab+=x*y;++count;}
|
||||
if(count<30)return -1;double va=aa-a*a/count,vb=bb-b*b/count;if(va/count<.0004||vb/count<.0004)return -1;
|
||||
return (ab-a*b/count)/std::sqrt(va*vb);
|
||||
}
|
||||
CVPixelBufferRef crop(const GrayFrame& frame,float ox,float oy,float rw,float rh,int w,int h){
|
||||
CVPixelBufferRef p=nullptr;if(CVPixelBufferCreate(kCFAllocatorDefault,w,h,kCVPixelFormatType_32BGRA,nullptr,&p)!=kCVReturnSuccess)return nullptr;
|
||||
CVPixelBufferLockBaseAddress(p,0);auto *out=(uint8_t*)CVPixelBufferGetBaseAddress(p);size_t stride=CVPixelBufferGetBytesPerRow(p);
|
||||
for(int y=0;y<h;y++)for(int x=0;x<w;x++){uint8_t v=std::lround(std::clamp(pixel(frame,ox+x*rw/w,oy+y*rh/h),0.f,1.f)*255);auto *d=out+y*stride+x*4;d[0]=d[1]=d[2]=v;d[3]=255;}
|
||||
CVPixelBufferUnlockBaseAddress(p,0);return p;
|
||||
}
|
||||
TrackResult fail(TrackFailure reason){active_=false;result_.valid=false;result_.failure=reason;return result_;}
|
||||
public:
|
||||
void setMask(std::vector<FlowPoint> p){polygon_=std::move(p);}
|
||||
void stop(){active_=false;previous_={};samples_.clear();}
|
||||
bool active()const{return active_;}
|
||||
TrackResult result()const{return result_;}
|
||||
bool reset(const GrayFrame& frame,TrackerROI roi){
|
||||
stop();result_={};seed_=roi;width_=frame.width;height_=frame.height;cumulative_=H{};
|
||||
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)return false;
|
||||
if(polygon_.size()<3)polygon_={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
|
||||
float loX=1e9,loY=1e9,hiX=-1e9,hiY=-1e9;for(auto p:polygon_){loX=std::min(loX,p.x);hiX=std::max(hiX,p.x);loY=std::min(loY,p.y);hiY=std::max(hiY,p.y);}
|
||||
float c=std::cos(roi.angle),s=std::sin(roi.angle);
|
||||
for(int y=0;y<24;y++)for(int x=0;x<24;x++){
|
||||
float u=loX+(hiX-loX)*(x+.5f)/24,v=loY+(hiY-loY)*(y+.5f)/24;if(!inside(polygon_,u,v))continue;
|
||||
float xx=u*roi.width*width_,yy=v*roi.height*height_;FlowPoint p{roi.cx*width_+xx*c-yy*s,roi.cy*height_+xx*s+yy*c};if(framePoint(p))samples_.push_back(p);
|
||||
}
|
||||
previous_=frame;int count;double score=correlation(frame,cumulative_,count);if(score<.6){stop();result_.failure=TrackFailure::InsufficientTexture;return false;}
|
||||
result_.cx=roi.cx;result_.cy=roi.cy;result_.valid=true;result_.confidence=1;result_.features=result_.inliers=count;active_=true;return true;
|
||||
}
|
||||
TrackResult track(const GrayFrame& frame){
|
||||
if(!active_||!frame.valid()||frame.width!=width_||frame.height!=height_)return fail(TrackFailure::InvalidFrame);
|
||||
float x0=1e9,y0=1e9,x1=-1e9,y1=-1e9;
|
||||
for(auto p:samples_){auto q=cumulative_.map(p);x0=std::min(x0,q.x);y0=std::min(y0,q.y);x1=std::max(x1,q.x);y1=std::max(y1,q.y);}
|
||||
float cx=(x0+x1)*.5f,cy=(y0+y1)*.5f,rw=std::min(float(width_),std::max(96.f,(x1-x0)*1.5f)),rh=std::min(float(height_),std::max(96.f,(y1-y0)*1.5f));
|
||||
float ox=std::clamp(cx-rw*.5f,0.f,width_-rw),oy=std::clamp(cy-rh*.5f,0.f,height_-rh);
|
||||
float factor=std::min(1.f,320.f/std::max(rw,rh));int w=std::max(16,int(std::lround(rw*factor))),h=std::max(16,int(std::lround(rh*factor)));
|
||||
CVPixelBufferRef from=crop(previous_,ox,oy,rw,rh,w,h),to=crop(frame,ox,oy,rw,rh,w,h);if(!from||!to){if(from)CVPixelBufferRelease(from);if(to)CVPixelBufferRelease(to);return fail(TrackFailure::Backend);}
|
||||
H m;bool found=false;
|
||||
@autoreleasepool {
|
||||
auto request=[[VNHomographicImageRegistrationRequest alloc]initWithTargetedCVPixelBuffer:from options:@{}];
|
||||
auto handler=[[VNImageRequestHandler alloc]initWithCVPixelBuffer:to options:@{}];NSError *error=nil;
|
||||
if([handler performRequests:@[request] error:&error]&&request.results.count){auto warp=request.results.firstObject.warpTransform;found=true;for(int y=0;y<3;y++)for(int x=0;x<3;x++){m.a[y*3+x]=warp.columns[x][y];found&=std::isfinite(m.a[y*3+x]);}}
|
||||
[handler release];[request release];
|
||||
}
|
||||
CVPixelBufferRelease(from);CVPixelBufferRelease(to);if(!found)return fail(TrackFailure::Backend);
|
||||
double sx=w/rw,sy=h/rh;H into{{sx,0,-ox*sx,0,-sy,h-1+oy*sy,0,0,1}},out{{1/sx,0,ox,0,-1/sy,oy+(h-1)/sy,0,0,1}};
|
||||
H step=H::mul(out,H::mul(m,into)),next=H::mul(step,cumulative_);
|
||||
FlowPoint seed{seed_.cx*width_,seed_.cy*height_};auto center=next.map(seed),before=cumulative_.map(seed);
|
||||
float c=std::cos(seed_.angle),s=std::sin(seed_.angle);auto xp=next.map({seed.x+20*c,seed.y+20*s}),yp=next.map({seed.x-20*s,seed.y+20*c});
|
||||
float ax=(xp.x-center.x)/20,ay=(xp.y-center.y)/20,bx=(yp.x-center.x)/20,by=(yp.y-center.y)/20;
|
||||
float scaleX=std::hypot(ax,ay),scaleY=std::hypot(bx,by),angle=std::atan2(ay,ax)-seed_.angle;
|
||||
if(!framePoint(center)||!std::isfinite(scaleX)||!std::isfinite(scaleY)||scaleX<.0625||scaleY<.0625||scaleX>16||scaleY>16||ax*by-ay*bx<=0||
|
||||
scaleX/result_.scaleX<.8||scaleX/result_.scaleX>1.25||scaleY/result_.scaleY<.8||scaleY/result_.scaleY>1.25||std::abs(std::remainder(angle-result_.rotation,float(2*M_PI)))>.2||std::hypot(center.x-before.x,center.y-before.y)>std::max(rw,rh)*.3)
|
||||
return fail(TrackFailure::InvalidTransform);
|
||||
int count;double ncc=correlation(frame,next,count);if(ncc<.65||count<samples_.size()*.6)return fail(TrackFailure::LowConfidence);
|
||||
cumulative_=next;previous_=frame;result_.cx=center.x/width_;result_.cy=center.y/height_;result_.scaleX=scaleX;result_.scaleY=scaleY;result_.scale=std::sqrt(scaleX*scaleY);result_.rotation=angle;result_.confidence=ncc;result_.valid=true;result_.features=result_.inliers=result_.matches=count;result_.failure=TrackFailure::None;return result_;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>107</string>
|
||||
<string>108</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
## 当前基线
|
||||
|
||||
2026-11-06 后续开发中:1.19.0(107)已接入马赛克矩形/椭圆对象追踪、冻结可信模板、0.8 秒内预测、两次确认及前后端点补齐,尾部未确认键不提交。CSRT、VitTrack 同片段已实测,当前 Vision 组合更稳。长遮挡/突切停止与反向独立基准通过,正在正式构建和宿主验收。[比较与限制](research/TrackingRecoveryCandidates.md)。正式安装与线上暂仍为 1.18.1。
|
||||
2026-11-06 后续开发中:用户追加“全部改用 Apple Vision”。1.19.0(107)候选已公证、977 项安装后原生检查通过,但未做宿主验收/未发布,已保留记录并继续升级 108。108 已把普通蒙版/钢笔/图章改为 Vision 局部配准,马赛克使用 Vision 对象跟踪、冻结可信模板与短时恢复;APP 移除 OpenCV 构建链接。独立区域平移/缩放/旋转、双目标不同运动、纹理丢失停止已通过,正式构建和宿主验收待完成。[比较与限制](research/TrackingRecoveryCandidates.md)。线上仍为 1.18.1;107 安装备份见 `verification/Candidate107.json`。
|
||||
|
||||
**1.18.1(106)已正式安装、发布 Git Release,并更新文章 15792 与主 APP 公测通道。** 实际编译提交 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`;发行标签 `v1.18.1-tracking-ui-20261106` 指向 `5fe4b1933e015a906fab36b65dcbc45a0d6bee49`。APP 公证 `2c4e6cba-8178-4a50-9198-83e66be37add` Accepted。安装后 964 项原生检查通过,FCP 独立副本完成两轮 285 帧跟踪及模块/参数交互。
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户