diff --git a/Backend/deploy.py b/Backend/deploy.py index 39d0c39..f8905c0 100644 --- a/Backend/deploy.py +++ b/Backend/deploy.py @@ -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='公测诊断增强:主 APP 关闭窗口后保持后台运行;自动发送本产品崩溃、卡顿调用栈摘要及阶段耗时,可随时关闭诊断。安装器会提示正常退出 FCP、Motion 和大鱼调色主程序,请先保存工作。') + notes='优化蒙版与马赛克跟踪:减少 Metal 灰度回读,复用光流计算数据;减少参数与图层列表重复刷新。转身和遮挡后的目标偏移仍需人工检查。保留可关闭的后台自动诊断。安装前请保存工作并正常退出 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) diff --git a/research/TrackingMetal1.18.1.md b/research/TrackingMetal1.18.1.md index 8dc2d93..73429bb 100644 --- a/research/TrackingMetal1.18.1.md +++ b/research/TrackingMetal1.18.1.md @@ -1,10 +1,10 @@ -# 1.18.1 跟踪与界面候选 +# 1.18.1 跟踪与界面优化 -2026-11-06。尚未正式构建交付,当前正式安装和文章均为 1.18.0(105)。 +2026-11-06。实际编译源码 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`。正式安装 1.18.1(106)已通过 Apple 公证、票据及安装后 964 项原生检查。文章此前已更新 1.18.0。 - 基线实际使用 Metal 预处理、CPU OpenCV 特征检测与双向 LK、CPU RANSAC。旧 Metal 光流存在但未接入当前跟踪器。 -- 候选保留完整 4K 分析分辨率、OpenCV 特征阈值、亚像素细化、仿射估计与可信轨迹保护。特征检测限定至目标凸包加 12px 边缘。HD 以上普通蒙版接入 Metal 金字塔和双向 LK;小图及图章保留 CPU。GPU 初始化不可用时保留 CPU,运行错误明确停止。 -- 同帧六组合生成图及 Metal 版 12 项算法回归通过。4K 小目标 12 帧从 523.46ms 到 161.89ms,不代表宿主整体速度。实拍、正式宿主、遮挡和界面交互待继续验证。 +- 最终版本保留完整 4K 分析分辨率、OpenCV 特征阈值、亚像素细化、仿射估计与可信轨迹保护。特征检测限定至目标凸包加 12px 边缘。双向 LK 保留 CPU OpenCV,复用金字塔和梯度。 +- Metal 光流候选通过六组合生成图及 12 项算法回归,但整段实拍失败,未用于正式路径。候选证据只保留作研究记录。 - UI:DYToolManager 每次单个参数读取都重建完整层状态;Inspector 每组重复读取宿主参数;工作区每次标量变化都重建列表。候选改为单次 Action 快照、复用本次读回、仅在列表模型变化时重建。加入同 Action 写后读与外部编辑失效检查。 - 资料:[Apple GPU 同步](https://developer.apple.com/documentation/metal/resource-synchronization)、[Apple MPS 调优](https://developer.apple.com/documentation/metalperformanceshaders/tuning-hints)、[OpenCV LK](https://docs.opencv.org/3.4.4/dc/d6b/group__video__track.html)。Metal LK 是本产品原有实现,不能声称与 OpenCV 逐帧严格等价。 @@ -12,4 +12,6 @@ 旧 Metal LK 在 4K 实拍转身到第 133 帧时丢轨,CPU 完成 285 帧。该实验不接入正式路径,仅保留可重现基准和拒收证据。最终候选使用 Metal 直接生成 Gray8,读回量从每个 4K 帧约 33.2MB 降为 8.3MB;目标区域特征检测和 OpenCV 双向金字塔复用共同减少 CPU 工作。 -同一整段、相同起点,原 CPU 算法处理 8776.57ms,最终候选 1306.09ms,285 帧中心/缩放/旋转差异均为 0。该数字不含供图、解码、磁盘、宿主 UI 与渲染,不等于整体追踪快 6.7 倍。正式宿主及新版整体自检仍待完成。 +同一整段、相同起点,原 CPU 算法处理 8776.57ms,最终版本 1306.09ms,285 帧中心/缩放/旋转差异均为 0。该数字不含供图、解码、磁盘、宿主 UI 与渲染,不等于整体追踪快 6.7 倍。正式 FCP 独立验收副本中完成两轮 285 帧追踪、模块切换、曝光修改还原及蒙版编辑;未测端到端耗时或 UI 延迟分位数。 + +转身后人脸目标仍会漂移;原版与优化版在相同离线输入上轨迹完全一致。这版优化速度,不宣称解决目标遮挡/转身精度。完成 285 帧不等于目标位置全部准确。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 8b3b062..b6db96f 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -2,13 +2,13 @@ "status": "verified", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", - "version": "1.18.0", - "build": "105", + "version": "1.18.1", + "build": "106", "team": "B3W25FX5H5", - "notaryID": "5a98cab1-23af-4034-abc9-0c9e7b1dc77d", + "notaryID": "2c4e6cba-8178-4a50-9198-83e66be37add", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "d0187695581fa3a8fe5c3cfa8a1bc6337425f5f6", + "sourceCommit": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803", "installedTemplateSHA256": { @@ -64,6 +64,5 @@ "CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306", "CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc" }, - "shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a", - "hostVerification": "verification/Diagnostics1.18.0.json" + "shaderSHA256": "2f96cf158e6a274bce146b7a97141344c6e68e1185f7ac5df7991b0e854e2793" } diff --git a/verification/HostTrackingUI1.18.1.json b/verification/HostTrackingUI1.18.1.json new file mode 100644 index 0000000..085fd3a --- /dev/null +++ b/verification/HostTrackingUI1.18.1.json @@ -0,0 +1,24 @@ +{ + "version": "1.18.1", + "build": 106, + "compiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601", + "installedPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "host": "Final Cut Pro", + "qaProject": "1.18.1 追踪与界面验收", + "originalProjectPreserved": true, + "checks": { + "installedNativeSelfTest": 964, + "uiVersion": "1.18.1", + "forwardTrackingCompletedFrames": 285, + "secondHeadROICompletedFrames": 285, + "workspaceModuleSwitch": true, + "exposureChangeAndReset": true, + "maskEditAndClearOnDuplicate": true, + "scrollInputAccepted": true + }, + "limitations": [ + "No end-to-end timing or UI latency percentile measured.", + "Head mask drifts during turn despite completion. Baseline and optimized algorithm produce identical trajectories on caller-decoded clip; no accuracy improvement claim.", + "APP installed and verified by formal delivery workflow; PKG installer not rerun." + ] +} diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index f3af41d..9ba4982 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -1,6 +1,6 @@ { "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", - "checks": 961, + "checks": 964, "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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B" }, { "descriptors": 285, @@ -898,7 +898,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/diagnostic-export.cube" }, { "bytes": 1186074, @@ -918,7 +918,7 @@ }, { "heartbeats": 1, - "maximumGapMS": 118.30725002801046, + "maximumGapMS": 92.47249999316409, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -968,6 +968,14 @@ "name": "instance-proxy-batches-multiple-fields-without-clobber", "pass": true }, + { + "name": "layer-snapshot-read-after-write-in-one-action", + "pass": true + }, + { + "name": "layer-snapshot-next-action-sees-external-edit", + "pass": true + }, { "name": "two-native-hsl-panels-with-mask-and-repeat-buttons", "pass": true @@ -1389,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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/workspace-topbar.png", + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/workspace-topbar.png", "toolbarPixels": 3867 }, { @@ -1460,7 +1468,7 @@ }, { "name": "workspace-independent-style-fixture-inserted", - "node": "CB75309D-6F1B-4BFC-873F-5C2D7525FF7A", + "node": "CE2B332D-C86F-407E-AE35-C2736E2193CE", "pass": true, "validDocument": true }, @@ -1469,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/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/node.cube" + "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/node.cube" }, "pass": true, - "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/user-new.cube", + "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/user-new.cube", "undoStartsAfter": 3, "undoStartsBefore": 2, "written": true @@ -2741,11 +2749,17 @@ }, { "height": 2160, - "maximumError": 7.175931748815145e-08, + "maximumError": 1.2154672712760828e-08, "name": "tracking-4k-frame-preserves-full-detail-for-opencv", "pass": true, "width": 3840 }, + { + "name": "tracking-metal-gray8-compact-readback-matches-float-reference", + "pass": true, + "previousReadbackBytes": 33177600, + "readbackBytes": 8294400 + }, { "name": "shared-tracking-same-mask-switches-global-hsl-spider-without-interruption", "pass": true @@ -4414,7 +4428,7 @@ { "name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D31C6795-AF34-44D5-8CC5-D08EF6E641C4/viewer-workspace.png" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B/viewer-workspace.png" }, { "name": "canvas-hsl-plot-captures-outside-and-commits-one-undo", @@ -4813,6 +4827,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D31C6795-AF34-44D5-8CC5-D08EF6E641C4", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/2FE6A380-AB9D-4132-A5B5-15339840212B", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/verification/Symbols1.18.1.json b/verification/Symbols1.18.1.json new file mode 100644 index 0000000..0c8c64e --- /dev/null +++ b/verification/Symbols1.18.1.json @@ -0,0 +1,22 @@ +{ + "version": "1.18.1", + "build": 106, + "compiledSource": "1cc7f8edb2acb3cfc62bd72447c2956ad7a01601", + "images": [ + { + "name": "大鱼调色 XPC Service", + "uuid": "78E7C898-7A75-3BBD-93CA-C7B3452BE1CC", + "dSYM": "大鱼调色 XPC Service.pluginkit.dSYM" + }, + { + "name": "大鱼调色", + "uuid": "F952A83C-8229-3789-9945-3936C3C617B9", + "dSYM": "大鱼调色.app.dSYM" + } + ], + "path": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.18.1-symbols.zip", + "bytes": 3595083, + "sha256": "98959c848e4fec298b83ce69c703a8b571811e23a16d70a1b420d94bceb415f5", + "installedBinaryUUIDMatch": true, + "releaseUploaded": false +} diff --git a/verification/TrackingPerformance1.18.1.json b/verification/TrackingPerformance1.18.1.json index 61c7612..fa6cb4a 100644 --- a/verification/TrackingPerformance1.18.1.json +++ b/verification/TrackingPerformance1.18.1.json @@ -107,5 +107,5 @@ "OpenCV pyramids and derivatives reused across both directions and adjacent frames", "CPU OpenCV LK retained; no experimental optical-flow backend enabled" ], - "hostQA": "Pending signed/notarized installed candidate" + "hostQA": "Formal notarized 1.18.1 completed two 285-frame FCP runs and workspace/parameter interactions; see HostTrackingUI1.18.1.json. Head drift persists; no accuracy improvement claim." } diff --git a/开发交接.md b/开发交接.md index 878ccef..490368e 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,6 +4,15 @@ ## 当前基线 +**1.18.1(106)已正式安装并通过宿主验收,安装包与线上发布正在完成。** 实际编译提交 `1cc7f8edb2acb3cfc62bd72447c2956ad7a01601`;APP 公证 `2c4e6cba-8178-4a50-9198-83e66be37add` Accepted。安装后 964 项原生检查通过,FCP 独立副本完成两轮 285 帧跟踪及模块/参数交互。 + +- 跟踪保留 OpenCV LK,Metal 灰度回读减少 75%,目标区域特征检测与金字塔复用减少 CPU 工作。同一 4K 片段算法计算 8.78 秒降至 1.31 秒(约 6.72 倍),轨迹逐帧一致;不含宿主供图、解码、预览与渲染,不等于全流程速度。 +- 界面减少完整参数重建、重复宿主读取及图层列表重建。未测 UI 延迟分位数,不宣称所有界面卡顿已根治。 +- 人脸转身仍有偏移,原版在同一离线输入上也存在;当前优化未改进精度。旧 Metal LK 实验在第 133 帧丢轨,已拒收,没有启用到正式路径。 +- 证据:[性能](verification/TrackingPerformance1.18.1.json) · [宿主验收范围](verification/HostTrackingUI1.18.1.json) · [实现与限制](research/TrackingMetal1.18.1.md)。继续处理时优先关注交互流畅与转身/遮挡精度,避免把渲染平均耗时当作 UI 延迟。 + +## 1.18.0 交付基线(历史) + **1.18.0(105)已正式安装、发布 Git Release,并上线主 APP 公测更新通道。** 本轮完成云端报告调查、取消主 APP 自动退出、增强可关闭的后台诊断。已验证真实卡顿调用栈到达云端;已有用户卡顿的具体算法根因仍待继续分析,不能宣称已根治。 | 项目 | 已核对状态 |