比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
8b96e8b8c1 | ||
|
|
6515e0fa67 | ||
|
|
d2b6f8ef81 | ||
|
|
687a366e1c | ||
|
|
7b6a3106ca | ||
|
|
89eeaa9ba1 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,11 @@
|
||||
# 大鱼调色 1.14.3(94)
|
||||
|
||||
仿制图章现在平滑取样点、覆盖区和两边的缩放轨迹,减少相邻帧跳动。跟踪中的复制画面随小于一个像素的移动连续变化,在相对缩放经过 1 倍或取样区域经过画面边缘时平滑过渡。
|
||||
|
||||
仿制图章与普通蒙版共用跟踪进度和同步预览。控制面板右侧显示分析方向、帧数、百分比和当前源帧。图章同时标出取样与覆盖区域,蒙版显示对应轮廓。跟踪结束后可查看最后一帧,再返回示波器。
|
||||
|
||||
已有图章可选中后重新执行双向跟踪,应用新的轨迹平滑。
|
||||
|
||||
支持 Apple Silicon 和 macOS 14.6 或更新版本。安装包已完成 Developer ID Installer 签名、公证及票据验证。
|
||||
|
||||
安装包共 45,381,192 字节。SHA-256 为 `6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4`。
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
|
||||
用 `Packaging/build_pkg.py` 从已验收的正式 APP 生成 `../发行包/大鱼调色-1.14.0.pkg`。Developer ID Installer 签名、Apple 公证 `bea7b45f-7d68-4b6d-9173-93ee5ad8b162` Accepted、票据与 20 项展开验包通过。大小 45,370,597 字节,SHA-256 `884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8`。[安装包报告](verification/Package.json)
|
||||
|
||||
版本标签 `v1.14.0-clone-tracking-20261106` 关联正式包核验与发行说明。站点文章 15792 对应 1.13.2,主 APP 公测清单对应 1.12.0。
|
||||
版本标签 `v1.14.0-clone-tracking-20261106` 指向 `c86925d967d5d13a5ea1ffba31a8221608bc8345`。独立检出标签验证 626 个文件、正式包报告和 Git 完整性。公测 Release 394/附件 38 已发布,草稿和发布后附件分别完整下载,字节数及 SHA-256 一致。旧 APP、构建 APP、公证 ZIP、远端恢复副本和草稿下载副本已清理。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.0-clone-tracking-20261106) · [下载](https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.0-clone-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.0.pkg) · [发布核验](verification/Release.json)站点文章 15792 对应 1.13.2,主 APP 公测清单对应 1.12.0。
|
||||
|
||||
# 2026-11-05 安装完整性加固 1.13.2(86)
|
||||
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.14.0",
|
||||
"build": "90",
|
||||
"version": "1.14.3",
|
||||
"build": "94",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "1e7a48fe-dd0a-4643-b587-66eaa05ed46a",
|
||||
"notaryID": "2a47ad51-e07e-48df-960d-1f182635e03d",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "810bbf4dfb0a05bc2fa66da546ca75b9610985a3",
|
||||
"sourceCommit": "6515e0fa67511a7c5ba2cc3320b7c5d9688c41a3",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"shaderSHA256": "dd5593f8d4e5af7d5513ab5fecdb6f412805672bc052f5447890b9c35de16cb5",
|
||||
"hostVerification": "verification/HostCloneTracking1.14.0.json"
|
||||
"shaderSHA256": "dfb36a120cd4d3ba09c960ac5d5905f61b5dc6d2d5024444b49aebd3d3fd43f1",
|
||||
"hostVerification": "verification/HostTrackingPreview1.14.3.json"
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
{
|
||||
"version": "1.14.3",
|
||||
"build": "94",
|
||||
"compiledSource": "6515e0fa67511a7c5ba2cc3320b7c5d9688c41a3",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"sourceRecovery": {
|
||||
"trackedFiles": 627,
|
||||
"exactRemoteTree": true,
|
||||
"strictFsck": true
|
||||
},
|
||||
"offlineReplay": {
|
||||
"reference": "verification/HostCloneTracking1.14.0.json",
|
||||
"frames": 257,
|
||||
"sourceSize": [
|
||||
3840,
|
||||
2160
|
||||
],
|
||||
"metric": "RMS second frame difference of the two coordinate axes, or of the two log relative zoom values",
|
||||
"targetCenterPixels": {
|
||||
"before": 2.4323,
|
||||
"after": 0.9187
|
||||
},
|
||||
"sourceCenterPixels": {
|
||||
"before": 2.7051,
|
||||
"after": 0.9482
|
||||
},
|
||||
"relativeZoomLogPercent": {
|
||||
"before": 0.6032,
|
||||
"after": 0.1976
|
||||
}
|
||||
},
|
||||
"liveBuild93": {
|
||||
"source": "Independent FCP project copy, 4K real footage, trimmed 25 fps timeline",
|
||||
"playheadBefore": "00:00:04:15",
|
||||
"playheadAfter": "00:00:04:15",
|
||||
"stamp": {
|
||||
"observedCompletedFrames": [
|
||||
1,
|
||||
76,
|
||||
136,
|
||||
190
|
||||
],
|
||||
"total": 190,
|
||||
"pairedKeys": 190,
|
||||
"outlinedRegions": [
|
||||
"source",
|
||||
"target"
|
||||
]
|
||||
},
|
||||
"rectangle": {
|
||||
"observedCompletedFrames": [
|
||||
4,
|
||||
92,
|
||||
190
|
||||
],
|
||||
"total": 190,
|
||||
"keys": 190,
|
||||
"outlinedRegions": [
|
||||
"mask"
|
||||
]
|
||||
},
|
||||
"savedPresetReadback": {
|
||||
"firstSourceTime": "68/25",
|
||||
"lastSourceTime": "257/25",
|
||||
"frameStep": "1/25",
|
||||
"continuous": true
|
||||
},
|
||||
"previewClippedToImageArea": true,
|
||||
"switchingMasksRestoredScopes": true,
|
||||
"remainingAtBuild93": "Native animated progress bar visibly lagged its frame count during analysis."
|
||||
},
|
||||
"status": "passed",
|
||||
"nativeChecks": 893,
|
||||
"hostPID": 50718,
|
||||
"servicePID": 50748,
|
||||
"liveBuild94": {
|
||||
"stamp": {
|
||||
"completed": 190,
|
||||
"total": 190,
|
||||
"finalSourceTime": 2.72,
|
||||
"visualSourceAndTarget": true
|
||||
},
|
||||
"rectangle": {
|
||||
"completed": 190,
|
||||
"total": 190,
|
||||
"sampleProgress": {
|
||||
"completed": 96,
|
||||
"sourceTime": 8.4,
|
||||
"percent": 51
|
||||
},
|
||||
"visualFillMatchesCount": true
|
||||
},
|
||||
"finalPreviewRetained": true,
|
||||
"coldReopenShowsBothObjects": true,
|
||||
"pluginKitPathVerified": true
|
||||
},
|
||||
"scope": "Final Cut Pro 12.4 on this Mac. Native checks include cancellation, forward/reverse single-step seeking, paired frame geometry, and the production Metal rendering path."
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 881,
|
||||
"checks": 893,
|
||||
"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/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -898,7 +898,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +918,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 60.37237495183945,
|
||||
"maximumGapMS": 74.53212502878159,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1389,7 +1389,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/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4/workspace-topbar.png",
|
||||
"toolbarPixels": 3557
|
||||
},
|
||||
{
|
||||
@@ -1410,6 +1410,14 @@
|
||||
"pass": true,
|
||||
"toolbarPixels": 3557
|
||||
},
|
||||
{
|
||||
"name": "workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "workspace-preview-stop-routes-to-analysis-and-dismiss-restores-scopes",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "workspace-reopens-existing-host-remote-window",
|
||||
"pass": true
|
||||
@@ -1452,7 +1460,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "46CEE99C-5E6D-416C-9C41-67430E63593A",
|
||||
"node": "980F42D4-6E6D-48F0-B509-4800D4FCD7C3",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1461,10 +1469,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -2648,6 +2656,10 @@
|
||||
"name": "host-callback-opencv-tracking-six-exact-frames",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mask-analysis-emits-matching-frame-geometry-and-completed-progress",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "tracking-results-use-one-undo-action",
|
||||
"pass": true
|
||||
@@ -2676,6 +2688,10 @@
|
||||
"name": "bidirectional-passes-share-reference-and-merge-once",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "bidirectional-progress-counts-reference-once-and-never-regresses",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "backward-single-step-includes-reference-and-one-neighbor",
|
||||
"pass": true
|
||||
@@ -2742,6 +2758,10 @@
|
||||
"name": "shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-analysis-preview-displays-both-regions-on-the-same-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"keys": 6,
|
||||
@@ -4241,7 +4261,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4443,6 +4463,29 @@
|
||||
"name": "clone-stamp-equal-zoom-preserves-pixel-exact-copy",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "clone-stamp-fractional-translation-at-unit-zoom",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "clone-stamp-fractional-translation-near-unit-zoom",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-stamp-fractional-translation-is-continuous-through-unit-zoom",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "clone-stamp-fractional-source-crossing-image-edge",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-stamp-source-fades-continuously-at-image-edge",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-stamp-retracking-updates-paired-data-without-overwriting-manual-target",
|
||||
"pass": true
|
||||
@@ -4451,6 +4494,14 @@
|
||||
"name": "clone-stamp-replaces-same-frame-automatic-keys-from-offset-host-clock",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-stamp-smooths-both-positions-and-log-scales-and-keeps-analysis-endpoints",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "clone-stamp-smoothing-is-independent-of-analysis-direction",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "clone-stamp-disabled-render",
|
||||
@@ -4465,6 +4516,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/00ED28FF-B8AE-46A7-A2A7-AAFAB95E88CB",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5B5C4E09-E33F-4969-A739-5DF84AE0A6D4",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
+14
-14
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.0.pkg",
|
||||
"sha256": "884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8",
|
||||
"bytes": 45370597,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.3.pkg",
|
||||
"sha256": "6df64ae33f99bab95f8dc4e80d70a717fb210b35f90ce52cb38d47d814e709f4",
|
||||
"bytes": 45381192,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,27 +31,27 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.14.0",
|
||||
"build": "90"
|
||||
"version": "1.14.3",
|
||||
"build": "94"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.a1e7f89f-048f-4282-b523-bc6cd921e9de/ACE57BBF-79C5-410F-AAB7-D7D93A5BE218/大鱼调色"
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.5b978874-1943-4e8b-91af-9cd2b1d63f11/23A81F69-0372-40CF-B3E0-AFA7883120D6/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.14.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-05 16:41:55 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.14.3.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-05 18:06:15 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.3.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"createdDate": "2026-11-05T16:41:57.526Z",
|
||||
"name": "大鱼调色-1.14.3.pkg",
|
||||
"message": "Successfully received submission info",
|
||||
"name": "大鱼调色-1.14.0.pkg",
|
||||
"id": "bea7b45f-7d68-4b6d-9173-93ee5ad8b162",
|
||||
"id": "7b430f78-cb9c-42d2-95aa-ea5fbe440ea5",
|
||||
"createdDate": "2026-11-05T18:06:17.510Z",
|
||||
"status": "Accepted"
|
||||
},
|
||||
"appCompiledSource": "810bbf4dfb0a05bc2fa66da546ca75b9610985a3",
|
||||
"appBuild": "90",
|
||||
"appCompiledSource": "6515e0fa67511a7c5ba2cc3320b7c5d9688c41a3",
|
||||
"appBuild": "94",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
@@ -59,6 +59,6 @@
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostCloneTracking1.14.0.json",
|
||||
"installedAppHostAcceptance": "verification/HostTrackingPreview1.14.3.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
+28
-14
@@ -3,24 +3,38 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.13.2-integrity-20261105",
|
||||
"releaseCommit": "5252296b7b628c8df7e68dfb48df0db38cd12a75",
|
||||
"releaseID": 393,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.2-integrity-20261105",
|
||||
"tag": "v1.14.0-clone-tracking-20261106",
|
||||
"releaseCommit": "c86925d967d5d13a5ea1ffba31a8221608bc8345",
|
||||
"releaseID": 394,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.0-clone-tracking-20261106",
|
||||
"prerelease": true,
|
||||
"assetID": 37,
|
||||
"assetName": "大鱼调色-1.13.2.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.13.2-integrity-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.13.2.pkg",
|
||||
"bytes": 45359239,
|
||||
"sha256": "6c18bc081cd9d5099ae821df5d5da43585f9db292345c18db4a4e12cce1f133f",
|
||||
"assetID": 38,
|
||||
"assetName": "大鱼调色-1.14.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.14.0-clone-tracking-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.14.0.pkg",
|
||||
"bytes": 45370597,
|
||||
"sha256": "884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.13.2.pkg",
|
||||
"sha256": "6c18bc081cd9d5099ae821df5d5da43585f9db292345c18db4a4e12cce1f133f",
|
||||
"bytes": 45359239,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.13.2-integrity-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.13.2.pkg",
|
||||
"localCopyRemoved": true
|
||||
"path": "/Volumes/备份/大鱼调色-1.14.0.pkg",
|
||||
"sha256": "884342ab5ef0c42d873a6411b6c2bf0ae3cec2e07dedda90b308b057ff59f5e8",
|
||||
"bytes": 45370597,
|
||||
"sourceURL": "https://dayu.media/git/attachments/bb5fc5c4-7920-454a-aba0-f84a17518563",
|
||||
"temporaryDownloadRemoved": true
|
||||
},
|
||||
"recovery": {
|
||||
"compiledSourceFiles": 624,
|
||||
"releaseTagFiles": 626,
|
||||
"exactTrees": true,
|
||||
"strictFsck": true,
|
||||
"packageRecordMatches": true,
|
||||
"temporaryCheckoutsRemoved": true
|
||||
},
|
||||
"deliveryCleanup": {
|
||||
"oldInstallRemoved": true,
|
||||
"generatedBuildAppRemoved": true,
|
||||
"notarizationZIPRemoved": true,
|
||||
"formalInstallKept": true
|
||||
}
|
||||
}
|
||||
@@ -124,6 +124,24 @@ if(faceFixture.length){
|
||||
stamp[@"keys"]=@[DYStampKey(next,moved,YES,1,endMotion)];
|
||||
Pixels equalZoom=frame(next,@"clone-stamp-equal-scale-production-render");
|
||||
run.record(@"clone-stamp-equal-zoom-preserves-pixel-exact-copy",pixel(equalZoom,52,38,baseline,24,18)==0);
|
||||
DYStampMotion subpixel=startMotion;
|
||||
subpixel.sourceOffsetX=.5f/w;
|
||||
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
|
||||
Pixels atUnit=frame(next,@"clone-stamp-fractional-translation-at-unit-zoom");
|
||||
subpixel.sourceScaleX=1.0002f;
|
||||
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
|
||||
Pixels nearUnit=frame(next,@"clone-stamp-fractional-translation-near-unit-zoom");
|
||||
float unitPixel=(baseline[(12*w+16)*4]+baseline[(12*w+17)*4])*.5f;
|
||||
run.record(@"clone-stamp-fractional-translation-is-continuous-through-unit-zoom",
|
||||
fabs(atUnit[(24*w+48)*4]-unitPixel)<.0004f&&pixel(atUnit,48,24,nearUnit,48,24)<.0004f);
|
||||
subpixel.sourceOffsetX=-16.5f/w;
|
||||
subpixel.sourceScaleX=1;
|
||||
stamp[@"keys"]=@[DYStampKey(next,p,NO,1,subpixel)];
|
||||
Pixels atEdge=frame(next,@"clone-stamp-fractional-source-crossing-image-edge");
|
||||
float edgePixel=(baseline[(12*w)*4]+baseline[(24*w+48)*4])*.5f;
|
||||
run.record(@"clone-stamp-source-fades-continuously-at-image-edge",
|
||||
fabs(atEdge[(24*w+48)*4]-edgePixel)<.0005f);
|
||||
stamp[@"keys"]=@[DYStampKey(next,moved,YES,1,endMotion)];
|
||||
DYMaskParameters differentTarget=moved;differentTarget.centerY=.45f;
|
||||
endMotion.sourceScaleX=1.25f;
|
||||
run.record(@"clone-stamp-retracking-updates-paired-data-without-overwriting-manual-target",
|
||||
@@ -141,6 +159,31 @@ if(faceFixture.length){
|
||||
merged&&mergedKeys.count==5&&[mergedKeys[0] isEqual:DYMaskKey(previous,p,NO,1)]&&
|
||||
[mergedKeys[1] isEqual:pairKeys[0]]&&[mergedKeys[2] isEqual:DYMaskKey(authored,p,YES,1)]&&
|
||||
[mergedKeys[3] isEqual:pairKeys[1]]&&[mergedKeys[4] isEqual:DYMaskKey(following,p,NO,1)]);
|
||||
NSMutableArray *jitter=[NSMutableArray array];
|
||||
for(int i=0;i<7;i++){
|
||||
DYMaskParameters shape=p;
|
||||
shape.centerX+=i*.01f+(i==3?.04f:0);
|
||||
DYStampMotion motion=startMotion;
|
||||
motion.sourceOffsetY=i*.01f+(i==3?.04f:0);
|
||||
motion.sourceScaleX=expf(i*.02f+(i==3?.08f:0));
|
||||
motion.targetScaleY=expf(i*-.02f+(i==3?-.08f:0));
|
||||
[jitter addObject:DYStampKey(CMTimeMake(i,25),shape,NO,.9f,motion)];
|
||||
}
|
||||
stamp[@"keys"]=@[];
|
||||
BOOL stable=DYMergeTracking(stamp,jitter,frameDuration);
|
||||
NSArray *smoothed=stamp[@"keys"];
|
||||
CMTime center=CMTimeMake(3,25);
|
||||
auto filtered=DYStampMotionAtTime(stamp,center);
|
||||
float expectedSpike=.04f*6/16;
|
||||
run.record(@"clone-stamp-smooths-both-positions-and-log-scales-and-keeps-analysis-endpoints",
|
||||
stable&&smoothed.count==7&&[smoothed.firstObject isEqual:jitter.firstObject]&&
|
||||
[smoothed.lastObject isEqual:jitter.lastObject]&&
|
||||
fabs(DYMaskAtTime(stamp,center).centerX-p.centerX-.03f-expectedSpike)<1e-6&&
|
||||
fabs(filtered.sourceOffsetY-.03f-expectedSpike)<1e-6&&
|
||||
fabs(logf(filtered.sourceScaleX)-.09f)<1e-6&&fabs(logf(filtered.targetScaleY)+.09f)<1e-6);
|
||||
stamp[@"keys"]=@[];
|
||||
stable=DYMergeTracking(stamp,jitter.reverseObjectEnumerator.allObjects,frameDuration);
|
||||
run.record(@"clone-stamp-smoothing-is-independent-of-analysis-direction",stable&&[stamp[@"keys"] isEqual:smoothed]);
|
||||
stamp[@"enabled"]=@NO;Pixels disabled=frame(next,@"clone-stamp-disabled-render");
|
||||
run.record(@"clone-stamp-disabled-is-identical",difference(disabled,baseline).maximum==0);
|
||||
stamp[@"enabled"]=@YES;NSError *failure=nil;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <cmath>
|
||||
|
||||
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
|
||||
#include "DYTrackingPreview.inc.h"
|
||||
static NSString *DYWorkspaceSymbol(NSString *type){return @{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"}[type]?:@"square";}
|
||||
static NSDictionary *DYWorkspacePalette(void){NSMutableDictionary *palette=[[DYThemePalette()mutableCopy]autorelease];BOOL light=DYThemeIsLight();palette[@"background"]=[NSColor colorWithWhite:light?.88:.145 alpha:1];palette[@"card"]=[NSColor colorWithWhite:light?.84:.17 alpha:1];palette[@"field"]=[NSColor colorWithWhite:light?.78:.23 alpha:1];palette[@"border"]=[NSColor colorWithWhite:light?.6:.31 alpha:1];return palette;}
|
||||
static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;}
|
||||
@@ -38,6 +39,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
@interface DYColorWorkspace (Internal)
|
||||
- (void)layoutWorkspace;
|
||||
- (void)scopeChanged:(NSNotification *)notification;
|
||||
- (void)setTrackingPreviewVisible:(BOOL)visible;
|
||||
@end
|
||||
@interface DYWorkspaceLifetime:NSObject
|
||||
@property(nonatomic,assign) DYColorWorkspace *owner;
|
||||
@@ -93,6 +95,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
DYRenderer *_renderer;DYLUTLibrary *_library;DYLUTBrowser *_browser;
|
||||
DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane;
|
||||
DYScopePlot *_plot;NSArray *_scopePlots;NSInteger _editorMode;
|
||||
DYTrackingPreview *_trackingPreview;
|
||||
NSTextField *_heading,*_description,*_status,*_lutExplanation;
|
||||
NSButton *_close,*_hostScopes,*_sizeMode;
|
||||
DYWorkspaceLifetime *_lifetime;
|
||||
@@ -122,6 +125,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
_hostScopes=[DYWorkspaceButton(@"FCP",self,@selector(toggleHostScopes:))retain];_hostScopes.toolTip=@"切换宿主示波器";[_scopePane addSubview:_hostScopes];
|
||||
_description=[[DYThemeLabel labelWithString:@"示波器 · 显示参考"]retain];_description.font=[NSFont systemFontOfSize:10];[_scopePane addSubview:_description];
|
||||
NSMutableArray *plots=[NSMutableArray array];for(NSInteger i=0;i<4;i++){DYScopePlot *plot=[[[DYScopePlot alloc]init]autorelease];plot.mode=i;plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:plot];[plots addObject:plot];}_scopePlots=[plots copy];_plot=[_scopePlots[0]retain];
|
||||
_trackingPreview=[[DYTrackingPreview alloc]initWithTarget:self action:@selector(trackingPreviewAction:)];
|
||||
[_scopePane addSubview:_trackingPreview];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(trackingPreviewChanged:) name:@"DYToolTrackingStatus" object:[self rootHost]];
|
||||
_status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status];
|
||||
_lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES;
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer];
|
||||
@@ -133,7 +139,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
}
|
||||
- (void)dealloc{
|
||||
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
|
||||
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
|
||||
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_trackingPreview release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
|
||||
[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
|
||||
}
|
||||
- (BOOL)visible{return _visible||_opening;}
|
||||
@@ -183,8 +189,27 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
_sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace];
|
||||
_lutPane.frame=_editorHost.bounds;_lutExplanation.hidden=YES;
|
||||
CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES;
|
||||
_trackingPreview.frame=_scopePane.bounds;
|
||||
CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)];
|
||||
}
|
||||
- (void)setTrackingPreviewVisible:(BOOL)visible {
|
||||
_trackingPreview.hidden=!visible;_description.hidden=visible;_hostScopes.hidden=visible;
|
||||
for(DYScopePlot *plot in _scopePlots)plot.hidden=visible;
|
||||
}
|
||||
- (void)trackingPreviewChanged:(NSNotification *)note {
|
||||
NSDictionary *info=note.userInfo;
|
||||
if(!info[@"tracking"]||(!_visible&&!_opening))return;
|
||||
BOOL active=[info[@"tracking"] boolValue];
|
||||
if(active&&_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
|
||||
if(!_trackingPreview.hidden)[_trackingPreview applyUpdate:info];
|
||||
}
|
||||
- (void)trackingPreviewAction:(id)sender {
|
||||
if(_trackingPreview.running){
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:[self rootHost] userInfo:@{@"direction":@9}];
|
||||
}else{
|
||||
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
|
||||
}
|
||||
}
|
||||
- (void)pageChanged:(id)sender{
|
||||
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2;
|
||||
CMTime displayTime=_toolTime;id<FxCustomParameterActionAPI_v4>action=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{
|
||||
@@ -265,6 +290,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;}
|
||||
- (void)close{
|
||||
if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO];
|
||||
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
|
||||
BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;
|
||||
[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=nil;_maskScroll.documentView=nil;[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=nil;
|
||||
if(_remoteParent)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter removeObserver:self name:name object:_remoteParent];_remoteParent=nil;
|
||||
|
||||
+12
-8
@@ -367,18 +367,22 @@ kernel void dyCloneStamps(texture2d<float,access::read> input [[texture(0)]],
|
||||
float2 sampleCenter(stamp.sourceX,stamp.sourceY);
|
||||
float2 sampleScale(stamp.samplingScaleX,stamp.samplingScaleY);
|
||||
float4 sampled;
|
||||
if(all(abs(sampleScale-1.f)<.0001f)){
|
||||
float sourceCoverage=1;
|
||||
float2 offset=(sampleCenter-center+(uv-center)*(sampleScale-1))*float2(size);
|
||||
if(flip)offset.y=-offset.y;
|
||||
if(!stamp.subpixel){
|
||||
// Preserve pixel values for stamps with translation alone.
|
||||
float2 offset=(sampleCenter-center)*float2(size);
|
||||
if(flip)offset.y=-offset.y;
|
||||
int2 source=int2(gid)+int2(round(offset));
|
||||
if(any(source<0)||any(source>=int2(size)))continue;
|
||||
sampled=input.read(uint2(source));
|
||||
}else{
|
||||
float2 source=sampleCenter+(uv-center)*sampleScale;
|
||||
if(flip)source.y=1-source.y;
|
||||
if(any(source<0)||any(source>=1))continue;
|
||||
float2 pixel=clamp(source*float2(size)-.5f,0.f,float2(size-1));
|
||||
// Follow fractional motion through unit zoom and fade the sample
|
||||
// across the last pixel instead of dropping it at the image edge.
|
||||
float2 source=float2(gid)+offset;
|
||||
float2 edge=min(source+1,float2(size)-source);
|
||||
sourceCoverage=saturate(min(edge.x,edge.y));
|
||||
if(sourceCoverage<=0)continue;
|
||||
float2 pixel=clamp(source,0.f,float2(size-1));
|
||||
uint2 lo=uint2(floor(pixel)),hi=min(lo+1,size-1);
|
||||
float2 blend=fract(pixel);
|
||||
float4 top=mix(input.read(lo),input.read(uint2(hi.x,lo.y)),blend.x);
|
||||
@@ -388,7 +392,7 @@ kernel void dyCloneStamps(texture2d<float,access::read> input [[texture(0)]],
|
||||
float coverage=stamp.feather>0?1-smoothstep(1-stamp.feather,1.f,sqrt(radiusSquared)):1;
|
||||
coverage=saturate((coverage-stamp.inputBlack)/(stamp.inputWhite-stamp.inputBlack));
|
||||
if(stamp.inputGamma!=1)coverage=pow(coverage,1/stamp.inputGamma);
|
||||
color=mix(color,sampled,coverage*stamp.strength);
|
||||
color=mix(color,sampled,coverage*stamp.strength*sourceCoverage);
|
||||
}
|
||||
output.write(color,gid);
|
||||
}
|
||||
@@ -610,11 +610,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
}
|
||||
- (void)openWorkspace:(id)sender {
|
||||
if(_embedded||_workspaceEditor||!self.window||!_renderer)return;
|
||||
BOOL tracking=[sender isKindOfClass:NSNotification.class]&&[[sender userInfo][@"page"]isEqual:@"tracking"];
|
||||
if(tracking&&_workspace.visible)return;
|
||||
[_browser close];
|
||||
if(!_workspace)_workspace=[[DYColorWorkspace alloc]initWithManager:_manager renderer:_renderer library:_library title:@"大鱼调色 · 当前片段"];
|
||||
if(_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
|
||||
if(!tracking&&_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
|
||||
[_workspace showRelativeToView:self];
|
||||
if([sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
|
||||
if(!tracking&&[sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
|
||||
}
|
||||
- (void)rememberWorkspaceSelection:(NSNotification*)note {NSString*node=note.userInfo[@"node"];if(!node.length)return;NSString*saved=[node copy];[_workspaceSelectedNode release];_workspaceSelectedNode=saved;}
|
||||
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
NSArray *scale=mask[@"stampSamplingScale"];
|
||||
stamps.push_back({p.centerX,p.centerY,[patch[0]floatValue],[patch[1]floatValue],
|
||||
scale?[scale[0]floatValue]:1.f,scale?[scale[1]floatValue]:1.f,
|
||||
2/p.width,2/p.height,p.feather,p.strength,p.inputBlack,p.inputWhite,p.inputGamma});
|
||||
2/p.width,2/p.height,p.feather,p.strength,p.inputBlack,p.inputWhite,p.inputGamma,scale?1u:0u});
|
||||
}
|
||||
if(stamps.empty())return source;
|
||||
if(image.left!=bounds.left||image.right!=bounds.right||image.top!=bounds.top||image.bottom!=bounds.bottom){
|
||||
|
||||
@@ -8,4 +8,5 @@ struct DYToolStageRange {int first,last,suppressBlackWhite;};
|
||||
struct DYCloneStamp {
|
||||
float centerX,centerY,sourceX,sourceY,samplingScaleX,samplingScaleY;
|
||||
float inverseRadiusX,inverseRadiusY,feather,strength,inputBlack,inputWhite,inputGamma;
|
||||
unsigned subpixel;
|
||||
};
|
||||
@@ -2,13 +2,22 @@
|
||||
// CF asks the host for video gamma 2.2, then Lanczos-scales to RGBA8 before
|
||||
// OpenCV gray conversion. Adapt our linear host contract in a separate texture.
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
|
||||
return [self toolGrayFrame:tile preview:nil error:error];
|
||||
}
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error {
|
||||
@synchronized(_toolCaptureDevices){
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;
|
||||
if(bounds.left!=image.left||bounds.right!=image.right||bounds.bottom!=image.bottom||bounds.top!=image.top)return {};
|
||||
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];
|
||||
if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>device=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)device=candidate;
|
||||
if(device){id<MTLLibrary>library=[device newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>gray=[library newFunctionWithName:@"dyToolCapture"],gamma=[library newFunctionWithName:@"dyToolEncodeGamma22"];id<MTLComputePipelineState>grayPipeline=gray?[device newComputePipelineStateWithFunction:gray error:error]:nil,gammaPipeline=gamma?[device newComputePipelineStateWithFunction:gamma error:error]:nil;id<MTLCommandQueue>queue=[device newCommandQueue];MPSImageLanczosScale *scale=[[MPSImageLanczosScale alloc]initWithDevice:device];
|
||||
if(grayPipeline&&gammaPipeline&&queue&&scale){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;}
|
||||
if(grayPipeline&&gammaPipeline&&queue&&scale){
|
||||
entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;
|
||||
id<MTLFunction>function=[library newFunctionWithName:@"dyToolTrackingPreview"];
|
||||
id<MTLComputePipelineState>pipeline=function?[device newComputePipelineStateWithFunction:function error:nil]:nil;
|
||||
entry[@"previewPipeline"]=pipeline;
|
||||
[pipeline release];[function release];
|
||||
}
|
||||
[scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release];
|
||||
}[devices release];if(!entry)return {};
|
||||
}
|
||||
@@ -21,8 +30,34 @@
|
||||
id<MTLBuffer>buffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height*sizeof(float)){buffer=[[device newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;}
|
||||
id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gamma"]];[encoder setTexture:source atIndex:0];[encoder setTexture:encoded atIndex:1];[encoder dispatchThreads:MTLSizeMake(source.width,source.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
[entry[@"scale"]encodeToCommandBuffer:commands sourceTexture:encoded destinationTexture:bytes];
|
||||
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes 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];
|
||||
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes 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];
|
||||
id<MTLBuffer>previewBuffer=nil;
|
||||
vector_uint3 previewInfo={0,0,info.z};
|
||||
if(preview&&entry[@"previewPipeline"]){
|
||||
double scale=std::min({1.,640./width,360./height});
|
||||
previewInfo.x=std::max(1u,(unsigned)(width*scale));previewInfo.y=std::max(1u,(unsigned)(height*scale));
|
||||
NSUInteger size=previewInfo.x*previewInfo.y*4;
|
||||
previewBuffer=entry[@"previewBuffer"];
|
||||
if(previewBuffer.length!=size){
|
||||
previewBuffer=[[device newBufferWithLength:size options:MTLResourceStorageModeShared]autorelease];
|
||||
entry[@"previewBuffer"]=previewBuffer;
|
||||
}
|
||||
if(previewBuffer){
|
||||
encoder=[commands computeCommandEncoder];
|
||||
[encoder setComputePipelineState:entry[@"previewPipeline"]];[encoder setTexture:bytes atIndex:0];
|
||||
[encoder setBuffer:previewBuffer offset:0 atIndex:0];[encoder setBytes:&previewInfo length:sizeof(previewInfo) atIndex:1];
|
||||
[encoder dispatchThreads:MTLSizeMake(previewInfo.x,previewInfo.y,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];
|
||||
[encoder endEncoding];
|
||||
}
|
||||
}
|
||||
[commands commit];[commands waitUntilCompleted];
|
||||
if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return {};}
|
||||
if(previewBuffer){
|
||||
double pixelAspect=tile.pixelAspect;
|
||||
double aspect=double(width)/height*(std::isfinite(pixelAspect)&&pixelAspect>0?pixelAspect:1);
|
||||
*preview=@{@"rgba":[NSData dataWithBytes:previewBuffer.contents length:previewBuffer.length],
|
||||
@"width":@(previewInfo.x),@"height":@(previewInfo.y),@"aspect":@(aspect)};
|
||||
}
|
||||
dy::GrayFrame result{int(width),int(height),std::vector<float>(width*height)};memcpy(result.pixels.data(),buffer.contents,width*height*sizeof(float));return result;
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,10 @@
|
||||
NSString *_trackingNode,*_trackingMaskID,*_trackingMessage;
|
||||
NSDictionary *_trackingFrozenMask;NSMutableDictionary *_trackingCandidate;
|
||||
NSMutableArray *_trackingSamples;
|
||||
CMTimeRange _trackingPreviewInputRange;
|
||||
NSUInteger _trackingPreviewTotal,_trackingPreviewCompleted;
|
||||
NSDictionary *_trackingPreviewFrame;
|
||||
BOOL _trackingPreviewQueued;
|
||||
DYMaskParameters _trackingSeed;
|
||||
DYStampMotion _trackingStampMotion;
|
||||
dy::TrackerROI _trackingStampSourceSeed;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
- (void)tearDownToolHost {
|
||||
[_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil;
|
||||
[_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];}
|
||||
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_toolCaptureDevices release];
|
||||
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];
|
||||
}
|
||||
- (void)adoptToolCanvasDocument:(NSDictionary*)document {
|
||||
if(!document)return;@synchronized(self){[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
|
||||
@@ -19,6 +19,37 @@
|
||||
- (void)toolStatus:(NSString*)message {
|
||||
NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});
|
||||
}
|
||||
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
|
||||
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
|
||||
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
|
||||
info[@"tracking"]=@(active);info[@"message"]=message;
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:_apiManager userInfo:info];
|
||||
}
|
||||
- (void)publishTrackingPreview {
|
||||
NSDictionary *frame=nil;
|
||||
@synchronized(self){
|
||||
frame=[_trackingPreviewFrame autorelease];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;
|
||||
}
|
||||
if(!frame||!_trackingActive.load())return;
|
||||
NSUInteger done=[frame[@"completed"]unsignedIntegerValue],total=[frame[@"total"]unsignedIntegerValue];
|
||||
NSString *direction=[frame[@"backward"]boolValue]?@"反向":@"正向";
|
||||
NSString *message=total?[NSString stringWithFormat:@"%@ · %lu / %lu 帧 · %.0f%%",direction,(unsigned long)done,(unsigned long)total,100.*done/total]
|
||||
:[NSString stringWithFormat:@"%@ · 已分析 %lu 帧",direction,(unsigned long)done];
|
||||
[self postTrackingPreview:frame active:YES message:message];
|
||||
}
|
||||
- (void)queueTrackingPreview:(NSDictionary*)frame {
|
||||
uint64_t generation=_trackingGeneration;
|
||||
@synchronized(self){
|
||||
[_trackingPreviewFrame release];_trackingPreviewFrame=[frame copy];
|
||||
if(_trackingPreviewQueued)return;
|
||||
_trackingPreviewQueued=YES;
|
||||
}
|
||||
// Keep one coherent packet pending. A slow UI may skip intermediate updates
|
||||
// without ever pairing geometry from one frame with pixels from another.
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
|
||||
if(self->_trackingGeneration==generation)[self publishTrackingPreview];
|
||||
});
|
||||
}
|
||||
- (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(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";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];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
|
||||
@@ -98,9 +129,20 @@
|
||||
std::min(8.f,[source[3] floatValue]*_trackingStampMotion.sourceScaleY),0};
|
||||
}
|
||||
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
|
||||
_trackingPreviewInputRange=kCMTimeRangeInvalid;_trackingPreviewTotal=_trackingPreviewCompleted=0;
|
||||
@synchronized(self){[_trackingPreviewFrame release];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
|
||||
NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;}
|
||||
[self toolStatus:@"正在读取宿主源帧并跟踪…"];if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
|
||||
if(_trackingSingle)[self toolStatus:@"正在读取下一张源帧…"];
|
||||
else{
|
||||
uint64_t generation=_trackingGeneration;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
if(self->_trackingGeneration!=generation||!self->_trackingActive.load())return;
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
|
||||
[self postTrackingPreview:nil active:YES message:@"正在读取宿主源帧…"];
|
||||
});
|
||||
}
|
||||
if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
|
||||
}@finally{[a endAction:self];}
|
||||
}
|
||||
- (void)pollToolAnalysis:(NSTimer*)timer {
|
||||
@@ -116,10 +158,20 @@
|
||||
}
|
||||
- (BOOL)desiredAnalysisTimeRange:(CMTimeRange*)out forInputWithTimeRange:(CMTimeRange)input error:(NSError**)error {
|
||||
CMTime end=CMTimeRangeGetEnd(input),ref=_trackingReferenceTime,step=_trackingFrameDuration;if(!CMTIME_IS_NUMERIC(input.start)||!CMTIME_IS_NUMERIC(end)||!CMTIME_IS_NUMERIC(ref)||ref.epoch!=input.start.epoch||ref.epoch!=end.epoch||CMTimeCompare(ref,input.start)<0||CMTimeCompare(ref,end)>=0||!CMTIME_IS_NUMERIC(step)||step.value<=0)return [self stopToolAnalysis:@"跟踪起点或帧长无效" error:error];
|
||||
_trackingPreviewInputRange=input;
|
||||
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0&&!_trackingBoth){[_trackingMessage release];_trackingMessage=[@"已到片段边界,未产生新轨迹" copy];}*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
|
||||
}
|
||||
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error {
|
||||
if(!CMTIME_IS_NUMERIC(duration)||duration.value<=0||duration.epoch!=0)return [self stopToolAnalysis:@"宿主分析帧长无效" error:error];_trackingFrameDuration=duration;_trackingPreviousTime=kCMTimeInvalid;_trackingFlip=NO;[_trackingSamples removeAllObjects];
|
||||
if(!_trackingSingle&&CMTIMERANGE_IS_VALID(_trackingPreviewInputRange)){
|
||||
double step=CMTimeGetSeconds(duration);
|
||||
double forward=CMTimeGetSeconds(CMTimeSubtract(CMTimeRangeGetEnd(_trackingPreviewInputRange),_trackingReferenceTime))/step;
|
||||
double backward=CMTimeGetSeconds(CMTimeSubtract(_trackingReferenceTime,_trackingPreviewInputRange.start))/step;
|
||||
// Backward includes the reference frame. A bidirectional run counts it once.
|
||||
forward=std::max(1.,std::ceil(forward-1e-7));backward=std::floor(backward+1e-7);
|
||||
double total=_trackingBoth?forward+backward:_trackingBackward?backward+1:forward;
|
||||
_trackingPreviewTotal=NSUInteger(std::clamp(total,1.,double(INT_MAX)));
|
||||
}
|
||||
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;
|
||||
@@ -142,7 +194,9 @@
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);@try{
|
||||
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
|
||||
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
|
||||
dy::GrayFrame frame=[self toolGrayFrame:tile error:error];if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
|
||||
NSDictionary *preview=nil;
|
||||
dy::GrayFrame frame=[self toolGrayFrame:tile preview:_trackingSingle?nullptr:&preview error:error];
|
||||
if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
|
||||
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
|
||||
if(_trackingFlip)for(int y=0;y<frame.height/2;y++)for(int x=0;x<frame.width;x++)std::swap(frame.pixels[y*frame.width+x],frame.pixels[(frame.height-1-y)*frame.width+x]);
|
||||
BOOL stamp=_trackingStampMotion.active;
|
||||
@@ -183,9 +237,28 @@
|
||||
}
|
||||
if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error];
|
||||
[_trackingSamples addObject:DYStampKey(time,p,NO,confidence,motion)];_trackingPreviousTime=time;
|
||||
if(!_trackingSingle){
|
||||
if(!(_trackingBoth&&_trackingBackward&&_trackingSamples.count==1&&_trackingPreviewCompleted))++_trackingPreviewCompleted;
|
||||
DYMaskParameters covered=p;
|
||||
NSMutableDictionary *packet=[NSMutableDictionary dictionaryWithDictionary:preview?:@{}];
|
||||
if(stamp){
|
||||
covered.width*=motion.targetScaleX;covered.height*=motion.targetScaleY;
|
||||
DYMaskParameters sampled=covered;
|
||||
sampled.centerX=source.cx;sampled.centerY=source.cy;
|
||||
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
|
||||
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
|
||||
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
|
||||
}
|
||||
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];
|
||||
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
|
||||
packet[@"flip"]=@(_trackingFlip);packet[@"time"]=@(CMTimeGetSeconds(time));
|
||||
packet[@"completed"]=@(_trackingPreviewCompleted);
|
||||
packet[@"total"]=@(MAX(_trackingPreviewTotal,_trackingPreviewCompleted));
|
||||
packet[@"backward"]=@(_trackingBackward);
|
||||
[self queueTrackingPreview:packet];
|
||||
}
|
||||
if(_trackingSamples.count==1||_trackingSamples.count%15==0){
|
||||
if(stamp)os_log(OS_LOG_DEFAULT,"dayu_stamp_track_pair time=%{public}.6f target=%{public}.5f,%{public}.5f source=%{public}.5f,%{public}.5f target_scale=%{public}.4f,%{public}.4f source_scale=%{public}.4f,%{public}.4f",CMTimeGetSeconds(time),target.cx,target.cy,source.cx,source.cy,motion.targetScaleX,motion.targetScaleY,motion.sourceScaleX,motion.sourceScaleY);
|
||||
[self toolStatus:[NSString stringWithFormat:stamp?@"已跟踪取样与覆盖 %lu 帧 · 置信度 %.0f%%":@"已分析 %lu 帧 · 置信度 %.0f%%",(unsigned long)_trackingSamples.count,confidence*100]];
|
||||
}
|
||||
return YES;
|
||||
}@finally{_trackingInFrame.store(false);}
|
||||
@@ -196,12 +269,15 @@
|
||||
if(_trackingStampMotion.active)_stampSourceTracker.stop();
|
||||
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
|
||||
if(!self->_trackingSingle)[self publishTrackingPreview];
|
||||
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
|
||||
BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]];
|
||||
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
|
||||
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
|
||||
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer"]];}
|
||||
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer",@"previewBuffer"]];}
|
||||
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
if(self->_trackingSingle)[self toolStatus:message];
|
||||
else [self postTrackingPreview:nil active:NO message:message];
|
||||
});return YES;
|
||||
}
|
||||
|
||||
|
||||
+38
-1
@@ -251,6 +251,42 @@ NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confid
|
||||
@(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)];
|
||||
return paired;
|
||||
}
|
||||
// Analysis supplies a contiguous pass in either time direction. A symmetric
|
||||
// kernel has no phase lag, and shrinking it at the ends keeps the seed and
|
||||
// the last trusted frame fixed. Work in log scale so zoom in/out is symmetric.
|
||||
static NSArray *smoothStampTrackingSamples(NSArray *samples){
|
||||
if(samples.count<3)return samples;
|
||||
for(NSDictionary *key in samples)
|
||||
if(!key[@"stampMotion"]||[key[@"manual"]boolValue])return samples;
|
||||
|
||||
NSMutableArray *result=[NSMutableArray arrayWithCapacity:samples.count];
|
||||
[result addObject:samples.firstObject];
|
||||
for(NSUInteger i=1;i+1<samples.count;i++){
|
||||
NSUInteger radius=std::min<NSUInteger>(2,std::min(i,samples.count-1-i));
|
||||
const double weights[]={1,4,6,4,1};
|
||||
const double endWeights[]={1,2,1};
|
||||
double values[8]={};
|
||||
for(NSUInteger j=0;j<=2*radius;j++){
|
||||
NSDictionary *neighbor=samples[i-radius+j];
|
||||
DYMaskParameters p;
|
||||
if(!readParameters(neighbor[@"parameters"],&p))return samples;
|
||||
auto m=stampMotionFromKey(neighbor);
|
||||
double weight=radius==2?weights[j]/16:endWeights[j]/4;
|
||||
const double components[]={p.centerX,p.centerY,m.sourceOffsetX,m.sourceOffsetY,
|
||||
std::log(m.sourceScaleX),std::log(m.sourceScaleY),std::log(m.targetScaleX),std::log(m.targetScaleY)};
|
||||
for(int k=0;k<8;k++)values[k]+=weight*components[k];
|
||||
}
|
||||
NSDictionary *original=samples[i];
|
||||
DYMaskParameters p;
|
||||
if(!readParameters(original[@"parameters"],&p))return samples;
|
||||
p.centerX=values[0];p.centerY=values[1];
|
||||
auto scale=[&](int index){return float(std::clamp(std::exp(values[index]),1./16,16.));};
|
||||
DYStampMotion m={float(values[2]),float(values[3]),scale(4),scale(5),scale(6),scale(7),true};
|
||||
[result addObject:DYStampKey(keyTime(original),p,NO,[original[@"confidence"]floatValue],m)];
|
||||
}
|
||||
[result addObject:samples.lastObject];
|
||||
return result;
|
||||
}
|
||||
BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuration){
|
||||
if(!samples.count)return YES;
|
||||
NSMutableArray *all=[NSMutableArray array];
|
||||
@@ -258,6 +294,7 @@ BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuratio
|
||||
CMTime lo=keyTime(samples.firstObject),hi=keyTime(samples.lastObject);
|
||||
if(CMTimeCompare(lo,hi)>0)std::swap(lo,hi);
|
||||
if(m[@"stampSource"]&&CMTIME_IS_NUMERIC(frameDuration)&&frameDuration.value>0){
|
||||
samples=smoothStampTrackingSamples(samples);
|
||||
// FCP can shift analysis timestamps by a fraction of a frame between passes.
|
||||
// Replace an older automatic key belonging to the first or last new frame.
|
||||
CMTime half=CMTimeMultiplyByRatio(frameDuration,1,2);
|
||||
@@ -300,7 +337,7 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
|
||||
NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"parameters"]=parameterData(DYMaskAtTime(mask,t));m[@"keys"]=@[];
|
||||
if(mask[@"stampSource"]){
|
||||
m[@"stampSource"]=DYStampSourceAtTime(mask,t);
|
||||
m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(mask,t);
|
||||
m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(mask,t)?:@[@1,@1];
|
||||
}
|
||||
[result addObject:m];
|
||||
}
|
||||
|
||||
@@ -7,13 +7,34 @@
|
||||
auto timeAt=[](int frame){return CMTimeMake(frame*1001,24000);};auto capture=[&](int step){setFrame(step);host->_time=timeAt(step);NSData *state=nil;[plugin pluginState:&state atTime:host->_time quality:(FxQuality)0 error:&error];return [plugin renderDestinationImage:out sourceImages:@[frame] pluginState:state atTime:host->_time error:&error];};
|
||||
auto request=[&](int direction){if(direction!=9)host->_state=kFxAnalysisState_NotAnalyzing;[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@(direction)}]];};
|
||||
auto drain=[&](){double end=NSProcessInfo.processInfo.systemUptime+.15;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];};CMTimeRange inputRange=CMTimeRangeMake(kCMTimeZero,CMTimeMake(6*1001,24000)),desired;
|
||||
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)});
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
NSDictionary *lastPreview=updates.count>=2?updates[updates.count-2]:nil;
|
||||
DYMaskParameters shown{};
|
||||
[lastPreview[@"shape"] getBytes:&shown length:sizeof(shown)];
|
||||
NSData *previewPixels=lastPreview[@"rgba"];
|
||||
run.record(@"mask-analysis-emits-matching-frame-geometry-and-completed-progress",
|
||||
[lastPreview[@"completed"]intValue]==6&&[lastPreview[@"total"]intValue]==6&&
|
||||
fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
|
||||
previewPixels.length==tw*th*4&&shown.centerX==end.centerX&&shown.centerY==end.centerY&&
|
||||
!lastPreview[@"sourceShape"]&&![updates.lastObject[@"tracking"]boolValue]&&host->_seekCount==0);
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"]&&!entry[@"previewBuffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
// Mid-analysis author edits must reject the result rather than clobber them.
|
||||
capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes);
|
||||
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled);
|
||||
[updates removeAllObjects];
|
||||
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_state=kFxAnalysisState_NotAnalyzing;request(0);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();BOOL backward=host->_backwardStarts==1;callbacks&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=0&&callbacks;i--){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"bidirectional-passes-share-reference-and-merge-once",callbacks&&backward&&[tracked[@"keys"]count]==6&&base->_undoStarts==writes+2);
|
||||
NSUInteger previous=0;BOOL progress=YES,sawForward=NO,sawBackward=NO;
|
||||
for(NSDictionary *update in updates){
|
||||
if(!update[@"shape"])continue;
|
||||
NSUInteger current=[update[@"completed"]unsignedIntegerValue];
|
||||
progress&=current>=previous&&[update[@"total"]intValue]==6;
|
||||
if([update[@"backward"]boolValue])sawBackward=YES;else sawForward=YES;
|
||||
previous=current;
|
||||
}
|
||||
run.record(@"bidirectional-progress-counts-reference-once-and-never-regresses",progress&&sawForward&&sawBackward&&previous==6);
|
||||
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_timelineOffset=CMTimeMake(4,1);host->_state=kFxAnalysisState_NotAnalyzing;request(-2);BOOL range=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(1))==0&&CMTimeCompare(desired.duration,timeAt(2))==0;[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=1;i--){setFrame(i);[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}setFrame(0);NSError *singleStopError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&singleStopError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"backward-single-step-includes-reference-and-one-neighbor",range&&stopped&&[tracked[@"keys"]count]==2);run.record(@"single-step-sends-sdk-quiet-analysis-termination",[singleStopError.domain isEqual:FxPlugErrorDomain]&&singleStopError.code==kFxError_UserCancelled);
|
||||
run.record(@"backward-single-step-seeks-timeline-with-clip-offset",host->_seekCount==1&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(1)))==0&&CMTimeCompare(host->_time,timeAt(1))==0);
|
||||
DYWriteTools(base,doc,kCMTimeZero);capture(2);BOOL repeated=YES;for(int first=2;first<4;first++){request(2);repeated&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=first;i<=first+1&&repeated;i++){setFrame(i);repeated&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();repeated&=CMTimeCompare(host->_time,timeAt(first+1))==0;}run.record(@"repeated-forward-single-step-continues-source-frames-at-offset-clip",repeated&&host->_seekCount==3&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(4)))==0);
|
||||
@@ -112,6 +133,14 @@
|
||||
DYStampMotion motion=DYStampMotionAtTime(saved,timeAt(5));
|
||||
DYMaskParameters covered=DYMaskAtTime(saved,timeAt(5));
|
||||
NSArray *sampled=DYStampSourceAtTime(saved,timeAt(5));
|
||||
lastPreview=updates.count>=2?updates[updates.count-2]:nil;
|
||||
DYMaskParameters shownSource{},shownTarget{};
|
||||
[lastPreview[@"sourceShape"] getBytes:&shownSource length:sizeof(shownSource)];
|
||||
[lastPreview[@"shape"] getBytes:&shownTarget length:sizeof(shownTarget)];
|
||||
run.record(@"clone-analysis-preview-displays-both-regions-on-the-same-frame",
|
||||
[lastPreview[@"completed"]intValue]==6&&fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
|
||||
fabs(shownSource.centerX-[sampled[0]doubleValue])<1e-6&&shownTarget.centerX==covered.centerX&&
|
||||
fabs(shownTarget.width-covered.width)<1e-6&&[lastPreview[@"rgba"]length]==tw*th*4);
|
||||
run.record(@"host-clone-stamp-follows-two-independent-centers-and-scales",
|
||||
paired&&[saved[@"keys"] count]==6&&motion.active&&
|
||||
fabs(covered.centerX-(.75+10./tw))<.006&&fabs(covered.centerY-(.5-3.75/th))<.008&&
|
||||
@@ -140,5 +169,6 @@
|
||||
paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&&
|
||||
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
|
||||
}
|
||||
[NSNotificationCenter.defaultCenter removeObserver:observer];
|
||||
[plugin release];
|
||||
}
|
||||
@@ -58,3 +58,16 @@ kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* p
|
||||
if(pos.x>=info.x||pos.y>=info.y)return;uint2 point=uint2(pos.x,info.z?info.y-1-pos.y:pos.y);uint3 rgb=uint3(rint(source.read(point).rgb*255.f));
|
||||
pixels[pos.y*info.x+pos.x]=float((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15)/255.f;
|
||||
}
|
||||
|
||||
// Reuse the analysis source texture for the lightweight color preview.
|
||||
kernel void dyToolTrackingPreview(texture2d<float> source [[texture(0)]],
|
||||
device uchar4 *pixels [[buffer(0)]],
|
||||
constant uint3 &info [[buffer(1)]],
|
||||
uint2 pos [[thread_position_in_grid]]){
|
||||
if(any(pos>=info.xy))return;
|
||||
constexpr sampler filter(coord::normalized,address::clamp_to_edge,filter::linear);
|
||||
float2 uv=(float2(pos)+.5f)/float2(info.xy);
|
||||
if(info.z)uv.y=1-uv.y;
|
||||
float3 rgb=source.sample(filter,uv).rgb;
|
||||
pixels[pos.y*info.x+pos.x]=uchar4(uchar3(rint(saturate(rgb)*255)),255);
|
||||
}
|
||||
@@ -0,0 +1,167 @@
|
||||
@interface DYTrackingPreviewImage : NSView
|
||||
- (void)showFrame:(NSDictionary *)frame;
|
||||
@end
|
||||
|
||||
@implementation DYTrackingPreviewImage {
|
||||
NSDictionary *_frame;
|
||||
NSImage *_image;
|
||||
}
|
||||
- (instancetype)initWithFrame:(NSRect)frame {
|
||||
if((self=[super initWithFrame:frame]))self.clipsToBounds=YES;
|
||||
return self;
|
||||
}
|
||||
- (BOOL)isFlipped {return YES;}
|
||||
- (BOOL)isAccessibilityElement {return YES;}
|
||||
- (NSString *)accessibilityRole {return NSAccessibilityImageRole;}
|
||||
- (void)dealloc {[_frame release];[_image release];[super dealloc];}
|
||||
- (void)showFrame:(NSDictionary *)frame {
|
||||
[_frame release];_frame=[frame copy];[_image release];_image=nil;
|
||||
NSData *pixels=frame[@"rgba"];
|
||||
NSUInteger w=[frame[@"width"] unsignedIntegerValue],h=[frame[@"height"] unsignedIntegerValue];
|
||||
if(w&&h&&pixels.length==w*h*4){
|
||||
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)pixels);
|
||||
CGColorSpaceRef space=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
|
||||
CGImageRef cg=CGImageCreate(w,h,8,32,w*4,space,kCGImageAlphaNoneSkipLast,provider,nil,true,kCGRenderingIntentDefault);
|
||||
if(cg){_image=[[NSImage alloc]initWithCGImage:cg size:NSMakeSize(w,h)];CGImageRelease(cg);}
|
||||
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
|
||||
}
|
||||
self.accessibilityLabel=_image?[NSString stringWithFormat:@"同步预览 · 源帧 %.3f 秒 · %@",[frame[@"time"] doubleValue],
|
||||
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
|
||||
if(shape.length!=sizeof(DYMaskParameters))return;
|
||||
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
|
||||
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
|
||||
auto point=[&](double x,double y){
|
||||
double px=x*p.width*aspect,py=y*p.height;
|
||||
return NSMakePoint(rect.origin.x+(p.centerX+(px*c-py*s)/aspect)*rect.size.width,
|
||||
rect.origin.y+(p.centerY+px*s+py*c)*rect.size.height);
|
||||
};
|
||||
NSBezierPath *path=[NSBezierPath bezierPath];
|
||||
auto add=[&](NSPoint position,int i){if(i)[path lineToPoint:position];else [path moveToPoint:position];};
|
||||
if(p.kind==DYMaskBezier){
|
||||
auto contour=dyFlattenMask((const DYBezierNode *)nodes.bytes,nodes.length/sizeof(DYBezierNode));
|
||||
for(int i=0;i<contour.count;i++)add(point(contour.x[i],contour.y[i]),i);
|
||||
}else if(p.kind==DYMaskRectangle){
|
||||
const double corners[][2]={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
|
||||
for(int i=0;i<4;i++)add(point(corners[i][0],corners[i][1]),i);
|
||||
}else{
|
||||
for(int i=0;i<80;i++){double a=i*2*M_PI/80;add(point(.5*cos(a),.5*sin(a)),i);}
|
||||
}
|
||||
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
|
||||
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
|
||||
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
|
||||
if(!_image||NSIsEmptyRect(self.bounds))return;
|
||||
double aspect=[_frame[@"aspect"] doubleValue];
|
||||
if(!std::isfinite(aspect)||aspect<=0)aspect=_image.size.width/_image.size.height;
|
||||
CGFloat w=MIN(NSWidth(self.bounds),NSHeight(self.bounds)*aspect),h=w/aspect;
|
||||
NSRect picture=NSMakeRect(NSMidX(self.bounds)-w/2,NSMidY(self.bounds)-h/2,w,h);
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
NSRectClip(picture);
|
||||
if([_frame[@"flip"] boolValue]){
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
NSAffineTransform *flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:2*NSMidY(picture)];[flip scaleXBy:1 yBy:-1];[flip concat];
|
||||
}
|
||||
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
|
||||
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
|
||||
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@end
|
||||
|
||||
@interface DYTrackingProgressBar : NSView
|
||||
@property(nonatomic) double doubleValue;
|
||||
@end
|
||||
|
||||
@implementation DYTrackingProgressBar
|
||||
- (BOOL)isAccessibilityElement {return YES;}
|
||||
- (NSString *)accessibilityRole {return NSAccessibilityProgressIndicatorRole;}
|
||||
- (id)accessibilityValue {return @(_doubleValue);}
|
||||
- (id)accessibilityMinValue {return @0;}
|
||||
- (id)accessibilityMaxValue {return @1;}
|
||||
- (void)setDoubleValue:(double)value {
|
||||
_doubleValue=std::clamp(value,0.,1.);
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
NSRect rail=NSInsetRect(self.bounds,0,2);
|
||||
CGFloat radius=NSHeight(rail)/2;
|
||||
NSBezierPath *track=[NSBezierPath bezierPathWithRoundedRect:rail xRadius:radius yRadius:radius];
|
||||
[[[NSColor labelColor] colorWithAlphaComponent:.18] setFill];
|
||||
[track fill];
|
||||
if(_doubleValue<=0)return;
|
||||
[NSGraphicsContext saveGraphicsState];[track addClip];
|
||||
NSRect fill=rail;fill.size.width*=_doubleValue;
|
||||
[NSColor.controlAccentColor setFill];NSRectFill(fill);
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@end
|
||||
|
||||
@interface DYTrackingPreview : NSView
|
||||
- (instancetype)initWithTarget:(id)target action:(SEL)action;
|
||||
- (void)applyUpdate:(NSDictionary *)info;
|
||||
- (void)reset;
|
||||
@property(nonatomic,readonly) BOOL running;
|
||||
@property(nonatomic,readonly) NSString *maskID;
|
||||
@end
|
||||
|
||||
@implementation DYTrackingPreview {
|
||||
DYTrackingPreviewImage *_preview;
|
||||
NSTextField *_title,*_detail,*_status;
|
||||
NSButton *_action;
|
||||
DYTrackingProgressBar *_progress;
|
||||
NSString *_maskID;
|
||||
BOOL _running;
|
||||
}
|
||||
- (BOOL)isFlipped {return YES;}
|
||||
- (BOOL)running {return _running;}
|
||||
- (NSString *)maskID {return _maskID;}
|
||||
- (void)dealloc {[_maskID release];[super dealloc];}
|
||||
- (instancetype)initWithTarget:(id)target action:(SEL)action {
|
||||
if((self=[super initWithFrame:NSZeroRect])){
|
||||
self.identifier=@"DYTrackingPreview";
|
||||
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
|
||||
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
|
||||
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
_action=DYWorkspaceButton(@"停止跟踪",target,action);
|
||||
_progress=[[[DYTrackingProgressBar alloc]init]autorelease];_progress.accessibilityLabel=@"跟踪进度";
|
||||
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
|
||||
for(NSView *view in @[_title,_detail,_status,_action,_progress,_preview])[self addSubview:view];
|
||||
self.hidden=YES;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
- (void)layout {
|
||||
[super layout];
|
||||
CGFloat w=NSWidth(self.bounds),h=NSHeight(self.bounds),body=MAX(1,w-16);
|
||||
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
|
||||
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
|
||||
_progress.frame=NSMakeRect(8,28,body,10);
|
||||
_status.frame=NSMakeRect(8,43,body,32);
|
||||
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
|
||||
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
|
||||
}
|
||||
- (void)applyUpdate:(NSDictionary *)info {
|
||||
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
|
||||
BOOL active=[info[@"tracking"] boolValue];
|
||||
if(active&&!info[@"shape"]){[_preview showFrame:nil];_detail.stringValue=@"";_title.stringValue=@"跟踪预览";}
|
||||
if(info[@"shape"]){
|
||||
BOOL stamp=info[@"sourceShape"]!=nil;
|
||||
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
|
||||
[_preview showFrame:info];
|
||||
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
|
||||
}
|
||||
NSUInteger total=[info[@"total"] unsignedIntegerValue];
|
||||
if(active)_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
|
||||
_running=active;_action.title=active?@"停止跟踪":@"返回示波器";_action.accessibilityLabel=_action.title;
|
||||
_status.stringValue=info[@"message"]?:@"";_status.toolTip=_status.stringValue;
|
||||
}
|
||||
- (void)reset {
|
||||
_progress.doubleValue=0;[_preview showFrame:nil];[_maskID release];_maskID=nil;_running=NO;self.hidden=YES;
|
||||
}
|
||||
@end
|
||||
@@ -29,6 +29,30 @@
|
||||
[host->_parent setFrameSize:NSMakeSize(840,300)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds));
|
||||
headerBitmap=DYWorkspaceHeaderBitmap(root);toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
|
||||
run.record(@"workspace-topbar-survives-minimum-resize-and-large-dirty-redraw",toolbarInk>80&&closeInk>10&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"toolbarPixels":@(toolbarInk),@"closePixels":@(closeInk)});
|
||||
NSNotificationCenter *trackingCenter=NSNotificationCenter.defaultCenter;
|
||||
DYMaskParameters trackedShape=dyDefaultMaskParameters();
|
||||
NSData *shapeBytes=[NSData dataWithBytes:&trackedShape length:sizeof(trackedShape)];
|
||||
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host
|
||||
userInfo:@{@"tracking":@YES,@"message":@"正向 · 3 / 6 帧 · 50%",@"shape":shapeBytes,
|
||||
@"rgba":[NSData dataWithBytes:"\xff\x00\x00\xff" length:4],@"width":@1,@"height":@1,
|
||||
@"time":@.08,@"aspect":@1,@"total":@6,@"completed":@3}];
|
||||
NSView *trackingPreview=[workspace valueForKey:@"trackingPreview"];
|
||||
NSView *progress=[trackingPreview valueForKey:@"progress"];
|
||||
NSView *image=[trackingPreview valueForKey:@"preview"];
|
||||
NSButton *previewAction=[trackingPreview valueForKey:@"action"];
|
||||
[trackingPreview layoutSubtreeIfNeeded];
|
||||
run.record(@"workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
|
||||
!trackingPreview.hidden&&[(NSView *)plots.firstObject isHidden]&&[progress.accessibilityValue doubleValue]==.5&&
|
||||
[image.accessibilityLabel containsString:@"0.080"]&&image.clipsToBounds&&NSWidth(image.frame)>200&&NSHeight(image.frame)>120);
|
||||
__block BOOL cancelRouted=NO;
|
||||
id stopObserver=[trackingCenter addObserverForName:@"DYToolTrack" object:host queue:nil usingBlock:^(NSNotification *n){cancelRouted=[n.userInfo[@"direction"]intValue]==9;}];
|
||||
[previewAction performClick:nil];
|
||||
[trackingCenter removeObserver:stopObserver];
|
||||
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"tracking":@NO,@"message":@"已取消;保留最后连续可信轨迹"}];
|
||||
BOOL resultRetained=!trackingPreview.hidden&&[image.accessibilityLabel containsString:@"0.080"]&&[previewAction.title isEqual:@"返回示波器"];
|
||||
[previewAction performClick:nil];
|
||||
run.record(@"workspace-preview-stop-routes-to-analysis-and-dismiss-restores-scopes",
|
||||
cancelRouted&&resultRetained&&trackingPreview.hidden&&![(NSView *)plots.firstObject isHidden]);
|
||||
|
||||
[workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent);
|
||||
[workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0);
|
||||
|
||||
@@ -142,7 +142,11 @@
|
||||
if(written)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];else [self reportError:@"宿主未保存蒙版关联,原设置已保留"];
|
||||
}
|
||||
- (void)workspaceCanvasSelection:(NSNotification*)note {
|
||||
if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor];
|
||||
if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];
|
||||
if(!_trackingPreview.hidden&&!_trackingPreview.running&&![_trackingPreview.maskID isEqual:mask]){
|
||||
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
|
||||
}
|
||||
if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor];
|
||||
}
|
||||
- (void)externalWorkspaceToolSelection:(NSNotification*)note {
|
||||
if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_editorMode=0;[self refreshToolWorkspace:nil];}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.14.0</string>
|
||||
<string>1.14.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>90</string>
|
||||
<string>94</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.14.0</string>
|
||||
<string>1.14.3</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.14.0</string>
|
||||
<string>1.14.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>90</string>
|
||||
<string>94</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
| --- | --- |
|
||||
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`大鱼调色.xcodeproj`,`Wrapper Application` / Release。远程为 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。1.14.0(90)实际编译节点为 `810bbf4dfb0a05bc2fa66da546ca75b9610985a3`。 |
|
||||
| 本机正式安装 | **1.14.0(90)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。签名、公证、票据及 881 项原生检查通过,FCP 12.4 实拍双向跟踪生成 257 个连续双点键。[交付](verification/Delivery.json) · [宿主验收](verification/HostCloneTracking1.14.0.json) |
|
||||
| Git Release | **1.13.2(86)**,标签 `v1.13.2-integrity-20261105` 指向 `5252296b7b628c8df7e68dfb48df0db38cd12a75`。公测 Release 393/附件 37。草稿和发布后附件完整下载均匹配签名公证包。本地包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.13.2.pkg`。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.2-integrity-20261105) · [发布核验](verification/Release.json) |
|
||||
| Git Release | **1.14.0(90)**,标签 `v1.14.0-clone-tracking-20261106` 指向 `c86925d967d5d13a5ea1ffba31a8221608bc8345`。公测 Release 394/附件 38。草稿及发布后均完整下载核对。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.14.0.pkg`。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.14.0-clone-tracking-20261106) · [核验](verification/Release.json) |
|
||||
| 站点及自动更新 | 文章 15792 已更新为 **1.13.2(86)**,站内主下载包完整下载校验通过。主 APP 公测通道回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.13.2.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
|
||||
| 本机开发与验收 | AppKit / Objective-C++ / FxPlug 4 / Metal,Apple Silicon,macOS 14.6+。交付记录使用 Xcode 27.1、FxPlug SDK 4.3.5 和 FCP 12.4。构建缓存为 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`,验收素材库位于其中的 `fcp-qa/大鱼调色_验收.fcpbundle`。产品交付锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`,接手时重新检查。 |
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户