比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
a1595caf30 | ||
|
|
f1ce687bcf | ||
|
|
4336454932 | ||
|
|
63c49b0135 | ||
|
|
ef0e62419a |
没有与搜索条件相匹配的文件
@@ -0,0 +1,16 @@
|
||||
# 大鱼调色 1.21.3(120)
|
||||
|
||||
- LUT 浏览器右侧加入同帧划像。左侧显示加载当前 LUT 前的画面,右侧预览 100% LUT。拖动图上的竖线或下方滑杆即可对比。
|
||||
- “高清预览”从 640×360 源帧生成双倍像素缩略图,设置在重开浏览器后保留。
|
||||
- 目标蒙版追踪由 Metal 直接写入 Vision 可读的共享像素缓冲。M4 上用 FCP 12.4 的同一段 4K 片段实测,三次热态完整正向追踪中位数由 3.682 降到 3.217 秒,缩短 12.6%。285 个轨迹键和 285 帧 4K 马赛克成片逐一核对一致。
|
||||
|
||||
Apple Silicon,macOS 14.6 或更高版本。安装前保存并退出 Final Cut Pro 和 Motion。1012 项正式安装原生检查、17 套模板与 20 项安装包展开检查通过。
|
||||
|
||||
| 项目 | 内容 |
|
||||
| --- | --- |
|
||||
| 实际编译提交 | `43364549327470291abd82ca1d0eded2becd1579` |
|
||||
| 安装包 | `大鱼调色-1.21.3.pkg` |
|
||||
| 字节数 | 44527074 |
|
||||
| SHA-256 | `99872aee9e3e0a25ed17f3fb173b20b8549dd9473c6fccd3954dd09836213ff9` |
|
||||
| APP 公证 | `6f1e34d4-7d24-4a73-9a8b-af41e132d4ba` |
|
||||
| PKG 公证 | `ba16473c-fcf2-4700-a7aa-df768d603724` |
|
||||
+10
@@ -1,3 +1,13 @@
|
||||
# 2026-11-08 局部马赛克与蒙版追踪性能 1.21.2(119)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。编译提交 `6a979f16a828e17284c8f04647c79ac65811d3dc`,发行标签 `v1.21.2-mosaic-tracking-20261108` 指向 `b6f73ebb666e4f72567f54515d0efd138220f7f6`。从远端独立检出并逐字节核对编译节点 822 个和发行节点 826 个文件,构建输入一致,Git 完整性通过,无 LFS 指针或子模块。[恢复核验](verification/Recovery1.21.2.json)
|
||||
|
||||
恢复 Git 登录后克隆并检出编译提交。使用 Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+ 与锁定的 ColorManagement 依赖。通过 `tools/deliver.py` 构建、签名、公证和安装,完成 FCP 实片验收后输入 complete。唯一正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 B3W25FX5H5。签名证书、私钥与公证登录独立恢复。[安装](verification/Delivery1.21.2.json) · [FCP 验收](verification/HostMosaicTracking1.21.2.json)
|
||||
|
||||
通过 `Packaging/build_pkg.py` 从已验收正式 APP 打包。APP 公证 `7344dd1a-62ba-4e82-8dc1-36cb220c4942`,PKG 公证 `add05c02-616e-471f-a53a-8aa7c230ef52`,均 Accepted。公测 Release **416** 的附件 **62** 发布前后完整下载核对 44509704 字节和 SHA-256 `01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df`。保留正式 PKG,已清理公证 ZIP、生成 APP、旧版替换备份、验收副本、恢复检出和草稿下载副本。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.21.2-mosaic-tracking-20261108) · [验包](verification/Package1.21.2.json) · [附件](verification/Release1.21.2.json) · [开发交接](开发交接.md)
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-08 首次示波器和人脸肤色保护 1.21.1(117)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译提交 `98d80970e83e30e4883a76d8f740f2fca5d05e7c`,发行标签 `v1.21.1-scope-face-20261108` 指向 `ad4e5e7a823bb451f45755d0ab331f08f6211239`。独立 HTTPS 检出核对编译节点 812 个及发行节点 817 个文件的内容,构建输入一致,Git 完整性通过,无 LFS 指针或子模块。[恢复记录](verification/Recovery1.21.1.json)
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.21.2",
|
||||
"build": "119",
|
||||
"version": "1.21.3",
|
||||
"build": "120",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "7344dd1a-62ba-4e82-8dc1-36cb220c4942",
|
||||
"notaryID": "6f1e34d4-7d24-4a73-9a8b-af41e132d4ba",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "6a979f16a828e17284c8f04647c79ac65811d3dc",
|
||||
"sourceCommit": "43364549327470291abd82ca1d0eded2becd1579",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
@@ -64,5 +64,5 @@
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "65a75993de08f7be4fce3d76f24a80b7e677bd51f877f7d11333f360813b8ffd"
|
||||
"shaderSHA256": "44de67399ae211aed79663dc19b0503881d9de1c0268580c81ec0d7582dab764"
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.21.3",
|
||||
"build": "120",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "6f1e34d4-7d24-4a73-9a8b-af41e132d4ba",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "43364549327470291abd82ca1d0eded2becd1579",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "44de67399ae211aed79663dc19b0503881d9de1c0268580c81ec0d7582dab764"
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
{
|
||||
"version": "1.21.3",
|
||||
"build": 120,
|
||||
"compiledSource": "43364549327470291abd82ca1d0eded2becd1579",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"appNotaryID": "6f1e34d4-7d24-4a73-9a8b-af41e132d4ba",
|
||||
"formalNativeChecks": 1012,
|
||||
"installedTemplateCount": 51,
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"hostPID": 24263,
|
||||
"pluginPID": 24279,
|
||||
"hardware": "Mac mini Apple M4",
|
||||
"macOS": "27.0.1",
|
||||
"fixture": {
|
||||
"sameSource": true,
|
||||
"sourceFormat": "3840x2160 60p",
|
||||
"timeline": "3840x2160 Rec.709 25p",
|
||||
"durationSeconds": 11.4,
|
||||
"frames": 285,
|
||||
"startTimecode": "00:00:00:00",
|
||||
"direction": "forward",
|
||||
"mosaicMode": "single shared rectangular mask",
|
||||
"fixtureDTD": "both FCPXML 1.14 fixtures pass",
|
||||
"isolation": "disposable QA library, original timeline and footage preserved"
|
||||
},
|
||||
"timings": {
|
||||
"metric": "elapsed wall clock from the forward-tracking click to first sampled host UI confirmation of 285 saved keys",
|
||||
"procedure": "Same Mac, FCP, media, timeline length, initial mask and UI polling method. First run included as cold context. Remaining three runs cleared the keys before repeating from the same start.",
|
||||
"baseline119Milliseconds": [
|
||||
4151,
|
||||
3651,
|
||||
3717,
|
||||
3682
|
||||
],
|
||||
"candidate120Milliseconds": [
|
||||
3532,
|
||||
3217,
|
||||
3200,
|
||||
3223
|
||||
],
|
||||
"baseline119PreviousPollMilliseconds": [
|
||||
3850,
|
||||
3398,
|
||||
3654,
|
||||
3391
|
||||
],
|
||||
"candidate120PreviousPollMilliseconds": [
|
||||
3468,
|
||||
3002,
|
||||
2986,
|
||||
3003
|
||||
],
|
||||
"baselineHotMedianMilliseconds": 3682,
|
||||
"candidateHotMedianMilliseconds": 3217,
|
||||
"hotMedianReductionPercent": 12.6,
|
||||
"candidateHostInternalMilliseconds": [
|
||||
3301.42,
|
||||
3013.88,
|
||||
3013.18,
|
||||
3030.21
|
||||
],
|
||||
"candidateDirectFramesPerRun": [
|
||||
285,
|
||||
285,
|
||||
285,
|
||||
285
|
||||
],
|
||||
"candidateCPUFallbackFramesPerRun": [
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0
|
||||
]
|
||||
},
|
||||
"visionInput": {
|
||||
"comparisons": 4,
|
||||
"height": 181,
|
||||
"name": "tracking-vision-iosurface-matches-cpu-bgra-byte-for-byte",
|
||||
"pass": true,
|
||||
"width": 323
|
||||
},
|
||||
"trackComparison": {
|
||||
"baseline": {
|
||||
"keys": 285,
|
||||
"firstSeconds": "0",
|
||||
"lastSeconds": "284/25",
|
||||
"parameterBytesSHA256": "a8335a070c22a1bd57e181d7cc4651689761c4b6be1180a6ea3043348091eded",
|
||||
"distinctMaskShapes": 285,
|
||||
"mosaicBlockSize": 48
|
||||
},
|
||||
"candidate": {
|
||||
"keys": 285,
|
||||
"firstSeconds": "0",
|
||||
"lastSeconds": "284/25",
|
||||
"parameterBytesSHA256": "a8335a070c22a1bd57e181d7cc4651689761c4b6be1180a6ea3043348091eded",
|
||||
"distinctMaskShapes": 285,
|
||||
"mosaicBlockSize": 48
|
||||
},
|
||||
"keysDiffering": [],
|
||||
"sameToolDocument": true,
|
||||
"sameMosaicSettings": true
|
||||
},
|
||||
"renderComparison": {
|
||||
"exportFormat": {
|
||||
"codec_name": "prores",
|
||||
"profile": "LT",
|
||||
"width": 3840,
|
||||
"height": 2160,
|
||||
"pix_fmt": "yuv422p10le",
|
||||
"color_space": "bt709",
|
||||
"r_frame_rate": "25/1",
|
||||
"nb_frames": "285"
|
||||
},
|
||||
"decodedFramesCompared": 285,
|
||||
"differingFrames": 0,
|
||||
"frameManifestSHA256": "053ddc44be5791ed880154d6013deef0de26dc6f599b29b083b5ae83f4885cee",
|
||||
"mosaicVisuallyConfirmed": true
|
||||
},
|
||||
"lutBrowser": {
|
||||
"fullBrowserOpenedFromFCPInspector": true,
|
||||
"hdDefaultRestoredAfterTest": true,
|
||||
"hdToggleRegeneratedThumbnailsAndPersistedAcrossReopen": true,
|
||||
"sourceSample": {
|
||||
"bytes": 3686400,
|
||||
"name": "look-preview-hd-640x360-top-first",
|
||||
"pass": true
|
||||
},
|
||||
"comparisonPreview": "Side-by-side wipe of the same frame, before the selected LUT and after the LUT at 100% preview strength.",
|
||||
"testedSliderPositions": [
|
||||
0,
|
||||
0.15,
|
||||
0.5,
|
||||
1
|
||||
],
|
||||
"visibleWipeMovementConfirmed": true,
|
||||
"directImageDrag": "The computer-control coordinate event went to the underlying FCP window. The on-screen wipe was verified with the comparison slider.",
|
||||
"hostQuitNormally": true
|
||||
},
|
||||
"scope": "One full forward object track in FCP, measured on one 4K clip. Other trackers and Motion did not enter this timing comparison."
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 1010,
|
||||
"checks": 1012,
|
||||
"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/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -562,6 +562,11 @@
|
||||
"name": "look-preview-bottom-left-flips-only-browser-rows",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"bytes": 3686400,
|
||||
"name": "look-preview-hd-640x360-top-first",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "preview-invalidation-clears-analysis-and-browser",
|
||||
"pass": true
|
||||
@@ -993,7 +998,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -1013,7 +1018,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 72.45583333133254,
|
||||
"maximumGapMS": 75.66529166069813,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1504,7 +1509,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/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1575,7 +1580,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "9A4844BD-028E-44FD-87C7-CE5F2B93AA52",
|
||||
"node": "F5D999EE-EA67-4528-8601-DC3ABF1CD6BD",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1584,10 +1589,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -2909,6 +2914,13 @@
|
||||
"name": "mosaic-tracking-4k-color-input-matches-without-gray-buffer",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"comparisons": 4,
|
||||
"height": 181,
|
||||
"name": "tracking-vision-iosurface-matches-cpu-bgra-byte-for-byte",
|
||||
"pass": true,
|
||||
"width": 323
|
||||
},
|
||||
{
|
||||
"name": "shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",
|
||||
"pass": true
|
||||
@@ -4629,7 +4641,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -5028,6 +5040,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/D01710AF-B75E-4ED0-A7B3-2D90239BBFD4",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/87DDB993-55B5-4DA7-9C35-3E9E065DA2D4",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
+16
-16
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.2.pkg",
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df",
|
||||
"bytes": 44509704,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.3.pkg",
|
||||
"sha256": "99872aee9e3e0a25ed17f3fb173b20b8549dd9473c6fccd3954dd09836213ff9",
|
||||
"bytes": 44527074,
|
||||
"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.21.2",
|
||||
"build": "119"
|
||||
"version": "1.21.3",
|
||||
"build": "120"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-988l65xa/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.f5e49fc9-9c01-44d4-8547-0b4c7af269c3/632156F3-A2F8-403B-94F1-E4AE03F4193C/大鱼调色"
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-p5s0fmdb/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.0179a430-2aac-4583-abb3-b9d08d71f59e/9E36932A-35B9-414D-82C1-77081A25269E/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.21.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-08 10:23:58 +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.21.2.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.21.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-08 11:25:43 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.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": {
|
||||
"status": "Accepted",
|
||||
"id": "add05c02-616e-471f-a53a-8aa7c230ef52",
|
||||
"createdDate": "2026-11-08T10:24:00.961Z",
|
||||
"name": "大鱼调色-1.21.2.pkg",
|
||||
"message": "Successfully received submission info"
|
||||
"id": "ba16473c-fcf2-4700-a7aa-df768d603724",
|
||||
"createdDate": "2026-11-08T11:25:45.549Z",
|
||||
"message": "Successfully received submission info",
|
||||
"name": "大鱼调色-1.21.3.pkg",
|
||||
"status": "Accepted"
|
||||
},
|
||||
"appCompiledSource": "6a979f16a828e17284c8f04647c79ac65811d3dc",
|
||||
"appBuild": "119",
|
||||
"appCompiledSource": "43364549327470291abd82ca1d0eded2becd1579",
|
||||
"appBuild": "120",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.3.pkg",
|
||||
"sha256": "99872aee9e3e0a25ed17f3fb173b20b8549dd9473c6fccd3954dd09836213ff9",
|
||||
"bytes": 44527074,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
"PKG Developer ID Installer signature",
|
||||
"PKG stapled ticket and Gatekeeper install assessment",
|
||||
"must-close attached to root-authorized payload",
|
||||
"all four FCP/Motion host identifiers",
|
||||
"bundle relocation disabled",
|
||||
"desktop and Bundle ID preinstall guards",
|
||||
"postinstall contains actual FxPlug verification invocations",
|
||||
"GUI worker, registration repair and Finder reveal present",
|
||||
"successful completion and consecutive registration checks",
|
||||
"exact payload contents: 大鱼调色.app",
|
||||
"fixed FxPlug outer APP install path",
|
||||
"outer APP has one real verification action",
|
||||
"service path/identifier/registration version: com.dayu.color.XPC",
|
||||
"nonempty FxPlug service manifest",
|
||||
"payload APP signature, independent ticket and Gatekeeper",
|
||||
"exact payload contents: 大鱼调色",
|
||||
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
|
||||
"complete outer APP payload present",
|
||||
"welcome warns to save work and close hosts",
|
||||
"conclusion gives manual APP and host restart instructions"
|
||||
],
|
||||
"resources": [
|
||||
{
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.21.3",
|
||||
"build": "120"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-p5s0fmdb/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.0179a430-2aac-4583-abb3-b9d08d71f59e/9E36932A-35B9-414D-82C1-77081A25269E/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.21.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-08 11:25:43 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
|
||||
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.21.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": {
|
||||
"id": "ba16473c-fcf2-4700-a7aa-df768d603724",
|
||||
"createdDate": "2026-11-08T11:25:45.549Z",
|
||||
"message": "Successfully received submission info",
|
||||
"name": "大鱼调色-1.21.3.pkg",
|
||||
"status": "Accepted"
|
||||
},
|
||||
"appCompiledSource": "43364549327470291abd82ca1d0eded2becd1579",
|
||||
"appBuild": "120",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"residentAppClosing": {
|
||||
"identifiers": [
|
||||
"com.apple.FinalCut",
|
||||
"com.apple.FinalCutApp",
|
||||
"com.apple.motionapp",
|
||||
"com.apple.motionappApp",
|
||||
"com.dayu.color"
|
||||
],
|
||||
"preinstallGuardCount": 1,
|
||||
"normalQuit": true
|
||||
},
|
||||
"packageEntryAdaptation": {
|
||||
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
|
||||
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
|
||||
"requiredApplication": "com.dayu.color"
|
||||
},
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"payloadBundleAccess": {
|
||||
"entries": 192,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostLUTLoading.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"branch": "main",
|
||||
"tag": "v1.21.2-mosaic-tracking-20261108",
|
||||
"method": "Independent HTTPS clone and tag fetch. Both detached nodes checked against every Git blob using the raw bytes and git fsck --full --no-dangling.",
|
||||
"nodes": {
|
||||
"compiled": {
|
||||
"commit": "6a979f16a828e17284c8f04647c79ac65811d3dc",
|
||||
"files": 822
|
||||
},
|
||||
"release": {
|
||||
"commit": "b6f73ebb666e4f72567f54515d0efd138220f7f6",
|
||||
"files": 826
|
||||
}
|
||||
},
|
||||
"gitIntegrityPassed": true,
|
||||
"submodules": 0,
|
||||
"lfsPointers": 0,
|
||||
"buildInputsIdentical": true,
|
||||
"releaseID": 416,
|
||||
"assetID": 62,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.21.2-mosaic-tracking-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.21.2.pkg",
|
||||
"bytes": 44509704,
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df"
|
||||
}
|
||||
+21
-16
@@ -1,23 +1,28 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.21.1-scope-face-20261108",
|
||||
"releaseCommit": "ad4e5e7a823bb451f45755d0ab331f08f6211239",
|
||||
"appCompiledSource": "98d80970e83e30e4883a76d8f740f2fca5d05e7c",
|
||||
"version": "1.21.1",
|
||||
"build": 117,
|
||||
"releaseID": 415,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.21.1-scope-face-20261108",
|
||||
"tag": "v1.21.2-mosaic-tracking-20261108",
|
||||
"releaseCommit": "b6f73ebb666e4f72567f54515d0efd138220f7f6",
|
||||
"releaseID": 416,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.21.2-mosaic-tracking-20261108",
|
||||
"prerelease": true,
|
||||
"assetID": 61,
|
||||
"assetName": "大鱼调色-1.21.1.pkg",
|
||||
"bytes": 44509639,
|
||||
"sha256": "bdc63a1b1030ccad6960031cb9f2ec8297aa90f8d4acce2057eb5ba7750a289b",
|
||||
"assetID": 62,
|
||||
"assetName": "大鱼调色-1.21.2.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.21.2-mosaic-tracking-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.21.2.pkg",
|
||||
"bytes": 44509704,
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df",
|
||||
"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",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.21.1-scope-face-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.21.1.pkg",
|
||||
"draftDownloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.21.1-scope-face-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.21.1.pkg",
|
||||
"draftVerification": "Authenticated browser download matched full byte count and SHA-256 before publication.",
|
||||
"verification": "Published release and attachment read-back matched. Complete HTTPS download matched byte count and SHA-256.",
|
||||
"passResult": true
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.21.2.pkg",
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df",
|
||||
"bytes": 44509704,
|
||||
"sourceURL": "https://dayu.media/git/attachments/2c16a5d6-14f2-483d-883c-59787eeec7f3"
|
||||
},
|
||||
"appCompiledSource": "6a979f16a828e17284c8f04647c79ac65811d3dc",
|
||||
"version": "1.21.2",
|
||||
"build": 119
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.21.2-mosaic-tracking-20261108",
|
||||
"releaseCommit": "b6f73ebb666e4f72567f54515d0efd138220f7f6",
|
||||
"releaseID": 416,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.21.2-mosaic-tracking-20261108",
|
||||
"prerelease": true,
|
||||
"assetID": 62,
|
||||
"assetName": "大鱼调色-1.21.2.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.21.2-mosaic-tracking-20261108/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.21.2.pkg",
|
||||
"bytes": 44509704,
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df",
|
||||
"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.21.2.pkg",
|
||||
"sha256": "01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df",
|
||||
"bytes": 44509704,
|
||||
"sourceURL": "https://dayu.media/git/attachments/2c16a5d6-14f2-483d-883c-59787eeec7f3"
|
||||
},
|
||||
"appCompiledSource": "6a979f16a828e17284c8f04647c79ac65811d3dc",
|
||||
"version": "1.21.2",
|
||||
"build": 119
|
||||
}
|
||||
@@ -235,7 +235,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
_status.stringValue=[NSString stringWithFormat:@"%@\n%@ · 有效 %@ · 透明 %@ · 非有限 %@ · 超出 −10%%/110%% %@/%@",([data[@"converted"]boolValue]?@"最终画面 · sRGB 显示参考;非 HDR / IRE 精密测量":@"空间未知:显示宿主 RGB 数值参考;不用于 HDR / IRE 测量"),frame,data[@"valid"],data[@"transparent"],data[@"nonfinite"],data[@"below"],data[@"above"]];
|
||||
}else _status.stringValue=@"示波器采集当前效果的最终输出。播放、移动时间线或调整颜色后更新;透明像素不计入。";
|
||||
}
|
||||
- (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2)[_browser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2){NSDictionary *frames=[_renderer lookLUTPreviewFrames];[_browser updatePreview:frames[@"standard"] highResolution:frames[@"high"]];}}
|
||||
- (void)themeChanged:(NSNotification *)notification{[self updatePalette];}
|
||||
- (void)updatePalette{
|
||||
[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()];
|
||||
@@ -245,6 +245,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
NSString *selected=nil;[action startAction:self];@try{selected=[DYReadAssets([self lutManager],action.currentTime).paths[@"look0"]copy];}@finally{[action endAction:self];}
|
||||
DYWorkspaceLifetime *token=_lifetime;
|
||||
_browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYWorkspacePalette() selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closed)return [owner selectLUT:path completion:completion];if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return nil;}];[selected release];
|
||||
NSDictionary *frames=[_renderer lookLUTPreviewFrames];[_browser updatePreview:frames[@"standard"] highResolution:frames[@"high"]];
|
||||
[_browser embedInView:_lutPane close:^{DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closing&&!owner->_closed){owner->_editorMode=0;[owner pageChanged:nil];}}];
|
||||
}
|
||||
- (NSDictionary *)selectionContextAtTime:(CMTime)time{
|
||||
|
||||
+13
-2
@@ -14,6 +14,7 @@
|
||||
#import "DYColorTables.h"
|
||||
#import "DYLUTLibrary.h"
|
||||
#import "DYLUTBrowser.h"
|
||||
#include "DYLookPreview.h"
|
||||
#import "DYInspector.h"
|
||||
#import "DYTheme.h"
|
||||
#include "DYSpiderState.h"
|
||||
@@ -119,8 +120,9 @@
|
||||
@implementation DYDiagnosticTile
|
||||
- (instancetype)initWithDevice:(id<MTLDevice>)device width:(NSUInteger)width height:(NSUInteger)height {
|
||||
if((self=[super init])) {
|
||||
size_t bytesPerRow=IOSurfaceAlignProperty(kIOSurfaceBytesPerRow,width*8);
|
||||
NSDictionary *properties=@{(id)kIOSurfaceWidth:@(width),(id)kIOSurfaceHeight:@(height),
|
||||
(id)kIOSurfaceBytesPerElement:@8,(id)kIOSurfaceBytesPerRow:@(width*8),
|
||||
(id)kIOSurfaceBytesPerElement:@8,(id)kIOSurfaceBytesPerRow:@(bytesPerRow),
|
||||
(id)kIOSurfacePixelFormat:@(kCVPixelFormatType_64RGBAHalf)};
|
||||
_surface=IOSurfaceCreate((CFDictionaryRef)properties);
|
||||
MTLTextureDescriptor *d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:width height:height mipmapped:NO];
|
||||
@@ -424,7 +426,16 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
for(NSUInteger y=0;y<180&&bottomOrientation;y++)bottomOrientation=memcmp((const uint8_t*)bottomLook.bytes+y*320*16,(const uint8_t*)bottomAnalysis.bytes+(179-y)*320*16,320*16)==0;
|
||||
}
|
||||
run.record(@"look-preview-bottom-left-flips-only-browser-rows",bottomOrientation,@{@"error":bottomRendered?@"":reason(error),@"analysisKeepsPhysicalRowOrder":@(bottomOrientation),@"all180RowsCompared":@(bottomOrientation)});
|
||||
[orientationRenderer invalidatePreview];run.record(@"preview-invalidation-clears-analysis-and-browser",![orientationRenderer preview]&&![orientationRenderer lookLUTPreview]);
|
||||
NSData *high=[orientationRenderer lookLUTPreviewFrames][@"high"];
|
||||
bool highOrientation=high.length==DYLookPreviewHDWidth*DYLookPreviewHDHeight*16;
|
||||
if(highOrientation){
|
||||
const float *p=static_cast<const float*>(high.bytes);
|
||||
const size_t bottom=(DYLookPreviewHDHeight-1)*DYLookPreviewHDWidth*4;
|
||||
highOrientation=p[0]>p[2]&&p[bottom+2]>p[bottom];
|
||||
}
|
||||
run.record(@"look-preview-hd-640x360-top-first",highOrientation,@{@"bytes":@(high.length)});
|
||||
[orientationRenderer invalidatePreview];
|
||||
run.record(@"preview-invalidation-clears-analysis-and-browser",![orientationRenderer preview]&&![orientationRenderer lookLUTPreview]&&![[orientationRenderer lookLUTPreviewFrames] count]);
|
||||
[source setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];
|
||||
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
|
||||
DYUniforms cstExport=defaults;cstExport.cm.configured=1;cstExport.cm.exposure=.7f;
|
||||
|
||||
+26
-9
@@ -312,21 +312,38 @@ kernel void dyScopeSample(texture2d<float,access::read> source [[texture(0)]],
|
||||
|
||||
// Native auto-grade statistics consume the input-converted RGB8 preview.
|
||||
// Quantization before and after the LUT mirrors the reference NSImage path.
|
||||
inline float4 dyInputPreviewPixel(texture2d<half> source, texture3d<float> inputLUT,
|
||||
float inputStrength, float2 uv, bool quantize) {
|
||||
constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);
|
||||
half4 sample=source.sample(f,uv);
|
||||
float3 linear=float3(sample.rgb);
|
||||
float3 power=1.055f*pow(max(linear,float3(0)),float3(1.0f/2.4f))-.055f;
|
||||
float3 encoded=clamp(select(power,linear*12.92f,linear<=.0031308f),0.0f,1.0f);
|
||||
if(quantize)encoded=round(encoded*255.0f)/255.0f;
|
||||
float strength=clamp(inputStrength,0.0f,1.0f);
|
||||
if(strength>0.0f){float n=float(inputLUT.get_width());float3 coord=encoded*((n-1.0f)/n)+.5f/n;encoded=mix(encoded,inputLUT.sample(f,coord).rgb,strength);}
|
||||
encoded=clamp(encoded,0.0f,1.0f);
|
||||
if(quantize)encoded=round(encoded*255.0f)/255.0f;
|
||||
return float4(encoded,float(sample.a));
|
||||
}
|
||||
kernel void dyInputAnalysis(texture2d<half> source [[texture(0)]],
|
||||
texture3d<float> inputLUT [[texture(1)]],
|
||||
device float4* outRGBA [[buffer(0)]],
|
||||
constant float& inputStrength [[buffer(1)]],
|
||||
uint2 pixel [[thread_position_in_grid]]) {
|
||||
if (pixel.x >= 320 || pixel.y >= 180) return;
|
||||
constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);
|
||||
half4 sample=source.sample(f,(float2(pixel)+.5f)/float2(320,180));
|
||||
float3 linear=float3(sample.rgb);
|
||||
float3 power=1.055f*pow(max(linear,float3(0)),float3(1.0f/2.4f))-.055f;
|
||||
float3 encoded=round(clamp(select(power,linear*12.92f,linear<=.0031308f),0.0f,1.0f)*255.0f)/255.0f;
|
||||
float strength=clamp(inputStrength,0.0f,1.0f);
|
||||
if(strength>0.0f){float n=float(inputLUT.get_width());float3 coord=encoded*((n-1.0f)/n)+.5f/n;encoded=mix(encoded,inputLUT.sample(f,coord).rgb,strength);}
|
||||
encoded=round(clamp(encoded,0.0f,1.0f)*255.0f)/255.0f;
|
||||
outRGBA[pixel.y*320+pixel.x]=float4(encoded,float(sample.a));
|
||||
outRGBA[pixel.y*320+pixel.x]=dyInputPreviewPixel(source,inputLUT,inputStrength,(float2(pixel)+.5f)/float2(320,180),true);
|
||||
}
|
||||
|
||||
#include "DYLookPreview.h"
|
||||
kernel void dyInputHighPreview(texture2d<half> source [[texture(0)]],
|
||||
texture3d<float> inputLUT [[texture(1)]], device float4* outRGBA [[buffer(0)]],
|
||||
constant float& inputStrength [[buffer(1)]],constant uint& flip [[buffer(2)]],
|
||||
uint2 pixel [[thread_position_in_grid]]) {
|
||||
constexpr uint2 size(DYLookPreviewHDWidth,DYLookPreviewHDHeight);
|
||||
if(any(pixel>=size))return;
|
||||
uint2 sample=uint2(pixel.x,flip?size.y-1-pixel.y:pixel.y);
|
||||
outRGBA[pixel.y*size.x+pixel.x]=dyInputPreviewPixel(source,inputLUT,inputStrength,(float2(sample)+.5f)/float2(size),false);
|
||||
}
|
||||
|
||||
// CST/BASIS arithmetic is reused verbatim from the versioned dayu-cst source.
|
||||
|
||||
@@ -675,7 +675,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[(DYCurvePanel *)graphic setHistogram:histogram];
|
||||
}
|
||||
}
|
||||
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible){NSDictionary *frames=[_renderer lookLUTPreviewFrames];[_browser updatePreview:frames[@"standard"] highResolution:frames[@"high"]];}if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)buildCards {
|
||||
NSInteger index=0;
|
||||
for(NSDictionary *section in _sections) {
|
||||
@@ -1258,6 +1258,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
id<FxCustomParameterActionAPI_v4> a=[self actionAPI];if(!a)return;[a startAction:self];NSString *selected=nil;@try{selected=[DYReadAssets(_manager,a.currentTime).paths[sender.identifier]copy];}@finally{[a endAction:self];}
|
||||
__block DYInspector *owner=self;NSString *key=[[sender.identifier copy]autorelease];
|
||||
_browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYThemePalette() selection:^NSProgress *(NSString *path,void (^completion)(NSError *)){return [owner setAssetPath:path forKey:key completion:completion];}];[selected release];
|
||||
NSDictionary *frames=[_renderer lookLUTPreviewFrames];[_browser updatePreview:frames[@"standard"] highResolution:frames[@"high"]];
|
||||
// Remote-window APIs must be acquired and invoked inside the custom
|
||||
// parameter action, while the SDK's API permissions are still installed.
|
||||
[a startAction:self];
|
||||
|
||||
@@ -30,4 +30,5 @@ typedef NSProgress * (^DYLUTSelectionHandler)(NSString *path,void (^completion)(
|
||||
/// Replace the source frame after the renderer captures a new playhead image.
|
||||
/// Passing identical bytes keeps the current thumbnail jobs and cache intact.
|
||||
- (void)updatePreview:(NSData *)rgba;
|
||||
- (void)updatePreview:(NSData *)rgba highResolution:(NSData *)high;
|
||||
@end
|
||||
+166
-26
@@ -1,6 +1,8 @@
|
||||
#import "DYLUTBrowser.h"
|
||||
#import "DYLookPreview.h"
|
||||
#import "DYLUTLibrary.h"
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
|
||||
static NSColor *DYBrowserColor(NSDictionary *palette, NSString *key) {
|
||||
@@ -13,6 +15,7 @@ static NSColor *DYBrowserColor(NSDictionary *palette, NSString *key) {
|
||||
return [NSColor colorWithWhite:.12 alpha:1];
|
||||
}
|
||||
|
||||
static NSString *const DYBrowserHDPreference=@"com.dayu.color.lookLUTPreview.highResolution";
|
||||
static NSString *const DYBrowserSizePreference=@"com.dayu.color.lookLUTPreview.thumbnailSize";
|
||||
static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview.selectedFolder";
|
||||
static NSString *const DYBrowserFramePreference=@"com.dayu.color.lookLUTPreview.windowFrame";
|
||||
@@ -134,6 +137,60 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){
|
||||
}
|
||||
@end
|
||||
|
||||
@interface DYBrowserCompareView : NSView
|
||||
@property(nonatomic) CGFloat position;
|
||||
@property(nonatomic,assign) NSSlider *slider;
|
||||
- (void)setOriginal:(NSImage *)original styled:(NSImage *)styled;
|
||||
@end
|
||||
|
||||
@implementation DYBrowserCompareView {
|
||||
NSImage *_original,*_styled;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (void)dealloc{[_original release];[_styled release];[super dealloc];}
|
||||
- (void)setOriginal:(NSImage *)original styled:(NSImage *)styled{
|
||||
if(_original!=original){[_original release];_original=[original retain];}
|
||||
if(_styled!=styled){[_styled release];_styled=[styled retain];}
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)setPosition:(CGFloat)position{
|
||||
_position=std::clamp(position,(CGFloat)0,(CGFloat)1);
|
||||
self.slider.doubleValue=_position;
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (NSRect)pictureRect{
|
||||
if(!_original)return self.bounds;
|
||||
CGFloat scale=MIN(NSWidth(self.bounds)/_original.size.width,NSHeight(self.bounds)/_original.size.height);
|
||||
NSSize size=NSMakeSize(_original.size.width*scale,_original.size.height*scale);
|
||||
return NSMakeRect(NSMidX(self.bounds)-size.width*.5,NSMidY(self.bounds)-size.height*.5,size.width,size.height);
|
||||
}
|
||||
- (void)moveDivider:(NSEvent *)event{
|
||||
if(!_styled||!self.slider.enabled)return;
|
||||
NSRect picture=[self pictureRect];
|
||||
if(NSWidth(picture)>0)self.position=([self convertPoint:event.locationInWindow fromView:nil].x-NSMinX(picture))/NSWidth(picture);
|
||||
}
|
||||
- (void)mouseDown:(NSEvent *)event{[self moveDivider:event];}
|
||||
- (void)mouseDragged:(NSEvent *)event{[self moveDivider:event];}
|
||||
- (void)drawRect:(NSRect)dirty{
|
||||
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
|
||||
if(!_original)return;
|
||||
NSRect picture=[self pictureRect];
|
||||
[_original drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
if(!_styled||!self.slider.enabled)return;
|
||||
CGFloat divider=NSMinX(picture)+NSWidth(picture)*_position;
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
NSRect styledArea=NSMakeRect(divider,NSMinY(picture),NSMaxX(picture)-divider,NSHeight(picture));
|
||||
NSRectClip(styledArea);
|
||||
[NSColor.blackColor setFill];NSRectFill(styledArea);
|
||||
[_styled drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
if(_position>0&&_position<1){
|
||||
[[NSColor blackColor] setFill];NSRectFill(NSMakeRect(divider-1.5,NSMinY(picture),3,NSHeight(picture)));
|
||||
[[NSColor whiteColor] setFill];NSRectFill(NSMakeRect(divider-.5,NSMinY(picture),1,NSHeight(picture)));
|
||||
}
|
||||
}
|
||||
@end
|
||||
|
||||
@class DYLUTBrowser;
|
||||
/// The jobs own this token, never the browser or its host selection block.
|
||||
@interface DYBrowserWork : NSObject
|
||||
@@ -144,7 +201,7 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){
|
||||
|
||||
@interface DYLUTBrowser () <NSWindowDelegate,NSPopoverDelegate,NSSearchFieldDelegate,NSSplitViewDelegate> {
|
||||
DYLUTLibrary *_library;
|
||||
NSData *_preview;
|
||||
NSData *_preview,*_previewHD;
|
||||
NSString *_selectedPath,*_folder;
|
||||
NSDictionary *_palette;
|
||||
DYLUTSelectionHandler _selection;
|
||||
@@ -155,15 +212,18 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){
|
||||
NSScrollView *_folderScroll,*_gridScroll;
|
||||
NSTextField *_titleLabel,*_countLabel,*_statusLabel,*_sizeLabel,*_emptyLabel;
|
||||
NSSearchField *_search;
|
||||
NSButton *_importFiles,*_importFolder,*_reveal,*_refresh,*_none,*_done;
|
||||
NSSlider *_sizeSlider;
|
||||
NSButton *_importFiles,*_importFolder,*_reveal,*_refresh,*_none,*_done,*_hd;
|
||||
NSSlider *_sizeSlider,*_compareSlider;
|
||||
DYBrowserCanvas *_comparePanel;
|
||||
DYBrowserCompareView *_compareView;
|
||||
NSTextField *_compareTitle,*_compareStatus,*_originalLabel,*_styledLabel;
|
||||
NSMutableArray *_folderButtons;
|
||||
NSMutableDictionary *_tiles;
|
||||
NSArray *_visibleEntries,*_folderPaths;
|
||||
NSMutableSet *_queuedPaths;
|
||||
NSCache *_thumbnailCache;
|
||||
dispatch_queue_t _previewQueue;
|
||||
DYBrowserWork *_work;
|
||||
dispatch_queue_t _previewQueue,_compareQueue;
|
||||
DYBrowserWork *_work,*_compareWork;
|
||||
BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached,_embedded,_compactRecent;
|
||||
NSArray *_recentSnapshot;
|
||||
NSProgress *_libraryTask,*_selectionTask;
|
||||
@@ -209,6 +269,21 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_none=[BrowserButton(@"无 LUT",self,@selector(clearSelection:))retain];
|
||||
_done=[BrowserButton(@"完成",self,@selector(done:))retain];_done.keyEquivalent=@"\r";
|
||||
NSUserDefaults *preferences=NSUserDefaults.standardUserDefaults;
|
||||
_hd=[[NSButton checkboxWithTitle:@"高清预览" target:self action:@selector(qualityChanged:)]retain];
|
||||
_hd.font=[NSFont systemFontOfSize:11];_hd.state=[preferences boolForKey:DYBrowserPreference(DYBrowserHDPreference,library)]?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_hd.toolTip=@"从源帧取样并以双倍像素生成缩略图";
|
||||
_comparePanel=[[DYBrowserCanvas alloc]initWithFrame:NSZeroRect];_comparePanel.fillKey=@"card";
|
||||
_compareTitle=[BrowserLabel(@"原图与 LUT 对比",13)retain];_compareTitle.font=[NSFont systemFontOfSize:13 weight:NSFontWeightSemibold];
|
||||
_compareStatus=[BrowserLabel(@"等待播放头画面",11)retain];
|
||||
_originalLabel=[BrowserLabel(@"原图",11)retain];_originalLabel.toolTip=@"同一帧加载此 LUT 之前的画面";
|
||||
_styledLabel=[BrowserLabel(@"LUT 效果 · 100%",11)retain];_styledLabel.alignment=NSTextAlignmentRight;
|
||||
_compareView=[[DYBrowserCompareView alloc]initWithFrame:NSZeroRect];_compareView.accessibilityLabel=@"原图与 LUT 滑动对比图";
|
||||
_compareSlider=[[NSSlider alloc]initWithFrame:NSZeroRect];_compareSlider.minValue=0;_compareSlider.maxValue=1;_compareSlider.continuous=YES;_compareSlider.enabled=NO;
|
||||
_compareSlider.target=self;_compareSlider.action=@selector(comparePositionChanged:);_compareSlider.accessibilityLabel=@"原图与 LUT 对比分界线";
|
||||
_compareView.slider=_compareSlider;_compareView.position=.5;
|
||||
for(NSView *view in @[_compareTitle,_compareStatus,_compareView,_compareSlider,_originalLabel,_styledLabel])[_comparePanel addSubview:view];
|
||||
_compareQueue=dispatch_queue_create("com.dayu.color.lut-comparison",DISPATCH_QUEUE_SERIAL);
|
||||
dispatch_set_target_queue(_compareQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));
|
||||
NSNumber *storedSize=[preferences objectForKey:DYBrowserPreference(DYBrowserSizePreference,library)]?:[preferences objectForKey:DYBrowserSizePreference];double size=storedSize?storedSize.doubleValue:120;
|
||||
_layoutMenu=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_layoutMenu addItemsWithTitles:@[@"网格",@"列表"]];_layoutMenu.font=[NSFont systemFontOfSize:11];_layoutMenu.target=self;_layoutMenu.action=@selector(layoutChanged:);_layoutMenu.accessibilityLabel=@"LUT 浏览布局";
|
||||
[_layoutMenu selectItemAtIndex:[preferences integerForKey:DYBrowserPreference(DYBrowserLayoutPreference,library)]==1?1:0];
|
||||
@@ -225,7 +300,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(gridScrolled:) name:NSViewBoundsDidChangeNotification object:_gridScroll.contentView];
|
||||
_splitView=[[NSSplitView alloc]initWithFrame:NSMakeRect(12,80,736,425)];_splitView.vertical=YES;_splitView.dividerStyle=NSSplitViewDividerStyleThin;_splitView.accessibilityLabel=@"调整 LUT 文件夹与预览宽度";
|
||||
_folderScroll.frame=NSMakeRect(0,0,162,425);_gridScroll.frame=NSMakeRect(163,0,573,425);[_splitView addSubview:_folderScroll];[_splitView addSubview:_gridScroll];
|
||||
for(NSView *view in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_sizeSlider,_layoutMenu,_splitView])[_root addSubview:view];
|
||||
for(NSView *view in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_sizeSlider,_layoutMenu,_splitView,_comparePanel])[_root addSubview:view];
|
||||
[_gridDocument addSubview:_emptyLabel];
|
||||
_root.postsFrameChangedNotifications=YES;_root.postsBoundsChangedNotifications=YES;
|
||||
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(browserRootResized:) name:NSViewFrameDidChangeNotification object:_root];
|
||||
@@ -240,12 +315,15 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
[_libraryTask cancel];[_libraryTask release];[_selectionTask cancel];[_selectionTask release];[_progressTimer invalidate];[_progressTimer release];
|
||||
_work.cancelled=YES;_work.owner=nil;[_work release];self.window.delegate=nil;
|
||||
_popover.delegate=nil;[_popover close];[_popover release];[_root removeFromSuperview];
|
||||
[_library release];[_preview release];[_selectedPath release];[_folder release];[_palette release];[_selection release];[_closeAction release];
|
||||
_compareWork.cancelled=YES;_compareWork.owner=nil;[_compareWork release];
|
||||
[_library release];[_preview release];[_previewHD release];[_selectedPath release];[_folder release];[_palette release];[_selection release];[_closeAction release];
|
||||
[_root release];[_folderDocument release];[_gridDocument release];[_folderScroll release];[_gridScroll release];
|
||||
[_titleLabel release];[_countLabel release];[_statusLabel release];[_sizeLabel release];[_emptyLabel release];[_search release];
|
||||
[_importFiles release];[_importFolder release];[_reveal release];[_refresh release];[_none release];[_done release];[_sizeSlider release];[_layoutMenu release];_splitView.delegate=nil;[_splitView release];[_presentationWindow release];
|
||||
[_folderButtons release];[_folderPaths release];[_tiles release];[_visibleEntries release];[_queuedPaths release];[_thumbnailCache release];
|
||||
dispatch_release(_previewQueue);[super dealloc];
|
||||
_compareView.slider=nil;[_compareView release];[_compareSlider release];[_comparePanel release];[_hd release];
|
||||
[_compareTitle release];[_compareStatus release];[_originalLabel release];[_styledLabel release];
|
||||
dispatch_release(_compareQueue);dispatch_release(_previewQueue);[super dealloc];
|
||||
}
|
||||
- (void)showRelativeToView:(NSView *)view{
|
||||
if(_closed||_remoteMode||!view.window||_popover.shown)return;
|
||||
@@ -254,7 +332,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_popover=[[NSPopover alloc]init];_popover.behavior=NSPopoverBehaviorSemitransient;_popover.animates=YES;_popover.delegate=self;_popover.contentSize=size;
|
||||
NSViewController *controller=[[[NSViewController alloc]init]autorelease];controller.title=@"风格 LUT";controller.view=_root;_popover.contentViewController=controller;
|
||||
[self layoutBrowser];
|
||||
@try {[_popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxX];_visible=_popover.shown;}
|
||||
@try {[_popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxX];_visible=_popover.shown;[self refreshComparison];}
|
||||
@catch(NSException *exception){[self finishClosing];}
|
||||
}
|
||||
- (BOOL)visible{return !_closed&&((_remoteMode||_detached)?_visible:_popover.shown);}
|
||||
@@ -270,7 +348,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
[parent addSubview:_root];DYBrowserGeometrySample(_root,@"before-content-origin-alignment");[self fitRemoteParent];
|
||||
DYBrowserGeometrySample(_root,@"attached-before-sdk-reply");
|
||||
// Attach synchronously: the SDK reads the first child before reply returns.
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(!_closed){[self configurePresentationWindow];DYBrowserGeometrySample(_root,@"after-sdk-reply");}});
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(!_closed){[self configurePresentationWindow];[self refreshComparison];DYBrowserGeometrySample(_root,@"after-sdk-reply");}});
|
||||
if([NSUserDefaults.standardUserDefaults boolForKey:@"DYBrowserGeometryDiagnostics"])dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC),dispatch_get_main_queue(),^{if(!_closed)DYBrowserGeometrySample(_root,@"settled");});
|
||||
NSAccessibilityPostNotification(parent,NSAccessibilityLayoutChangedNotification);
|
||||
}
|
||||
@@ -283,7 +361,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_root.accessibilityLabel=@"最近使用 LUT 快捷入口";
|
||||
_titleLabel.stringValue=@"最近使用";_titleLabel.font=[NSFont systemFontOfSize:11 weight:NSFontWeightSemibold];
|
||||
[_layoutMenu selectItemAtIndex:0];_sizeSlider.doubleValue=120;
|
||||
for(NSView *view in @[_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_sizeLabel,_sizeSlider,_layoutMenu,_splitView])view.hidden=YES;
|
||||
for(NSView *view in @[_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_hd,_comparePanel,_sizeLabel,_sizeSlider,_layoutMenu,_splitView])view.hidden=YES;
|
||||
[_root addSubview:_gridScroll];_gridScroll.hasHorizontalScroller=NO;_gridScroll.scrollerStyle=NSScrollerStyleOverlay;
|
||||
[self showInRemoteParent:parent close:nil];[self refreshRecentSelection:_selectedPath];
|
||||
}
|
||||
@@ -366,7 +444,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
// The API owner's completion may release this controller synchronously.
|
||||
[self retain];
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self];
|
||||
_closed=YES;_visible=NO;_work.cancelled=YES;_work.owner=nil;[_libraryTask cancel];[_selectionTask cancel];[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil;
|
||||
_closed=YES;_visible=NO;_work.cancelled=YES;_work.owner=nil;_compareWork.cancelled=YES;_compareWork.owner=nil;[_libraryTask cancel];[_selectionTask cancel];[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil;
|
||||
_popover.delegate=nil;if(_popover.shown)[_popover close];
|
||||
if(_remoteMode&&_root.superview)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[[NSNotificationCenter defaultCenter]removeObserver:self name:name object:_root.superview];
|
||||
[_root removeFromSuperview];[_queuedPaths removeAllObjects];[_thumbnailCache removeAllObjects];
|
||||
@@ -387,7 +465,8 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_reveal.frame=NSMakeRect(w-153,9,139,27);_none.frame=NSMakeRect(14,h-44,75,27);_layoutMenu.frame=NSMakeRect(100,h-44,97,27);
|
||||
_sizeLabel.frame=NSMakeRect(211,h-39,74,18);_sizeSlider.frame=NSMakeRect(288,h-41,MIN(150,MAX(80,w-550)),20);
|
||||
_done.frame=NSMakeRect(w-98,h-44,78,27);
|
||||
CGFloat statusX=NSMaxX(_sizeSlider.frame)+14;_statusLabel.frame=NSMakeRect(statusX,h-39,MAX(0,w-statusX-112),18);
|
||||
CGFloat hdX=NSMaxX(_sizeSlider.frame)+12;_hd.frame=NSMakeRect(hdX,h-43,86,24);
|
||||
CGFloat statusX=NSMaxX(_hd.frame)+6;_statusLabel.frame=NSMakeRect(statusX,h-39,MAX(0,w-statusX-112),18);
|
||||
if(_embedded&&!_compactRecent){
|
||||
_search.frame=NSMakeRect(12,36,MAX(125,w-310),24);
|
||||
_importFiles.frame=NSMakeRect(w-284,34,88,28);_importFolder.frame=NSMakeRect(w-192,34,100,28);_refresh.frame=NSMakeRect(w-88,34,76,28);
|
||||
@@ -395,8 +474,28 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_reveal.hidden=w<620;_titleLabel.frame=NSMakeRect(12,8,152,20);_countLabel.frame=NSMakeRect(166,10,100,18);
|
||||
_none.frame=NSMakeRect(10,h-34,70,27);_layoutMenu.frame=NSMakeRect(86,h-34,80,27);_done.frame=NSMakeRect(w-88,h-34,78,27);
|
||||
BOOL small=w<650;_sizeLabel.hidden=small;_sizeSlider.hidden=small;_statusLabel.hidden=small;
|
||||
if(!small){_sizeLabel.frame=NSMakeRect(174,h-29,68,18);_sizeSlider.frame=NSMakeRect(246,h-31,100,20);_statusLabel.frame=NSMakeRect(354,h-29,MAX(0,w-454),18);}
|
||||
_hd.frame=NSMakeRect(small?174:352,h-33,86,24);
|
||||
if(!small){_sizeLabel.frame=NSMakeRect(174,h-29,68,18);_sizeSlider.frame=NSMakeRect(246,h-31,100,20);_statusLabel.frame=NSMakeRect(444,h-29,MAX(0,w-540),18);}
|
||||
}
|
||||
NSRect browser=_splitView.frame,comparison=browser;
|
||||
if(w>=620){
|
||||
CGFloat width=MIN(560,w*.42);
|
||||
browser.size.width=MAX(1,NSWidth(browser)-width-10);
|
||||
comparison.origin.x=NSMaxX(browser)+10;comparison.size.width=width;
|
||||
}else{
|
||||
CGFloat height=MIN(NSHeight(browser)*.52,235);
|
||||
browser.size.height=MAX(1,NSHeight(browser)-height-8);
|
||||
comparison.origin.y=NSMaxY(browser)+8;comparison.size.height=height;
|
||||
}
|
||||
_splitView.frame=browser;[_splitView adjustSubviews];
|
||||
CGFloat left=MAX(100,MIN(_sidebarWidth,NSWidth(browser)*.41));[_splitView setPosition:left ofDividerAtIndex:0];
|
||||
_comparePanel.frame=comparison;
|
||||
CGFloat cw=NSWidth(comparison),ch=NSHeight(comparison),margin=10,body=MAX(1,cw-2*margin);
|
||||
_compareTitle.frame=NSMakeRect(margin,6,body,20);_compareStatus.frame=NSMakeRect(margin,25,body,16);
|
||||
_compareView.frame=NSMakeRect(margin,46,body,MAX(1,ch-88));
|
||||
_compareSlider.frame=NSMakeRect(margin,MAX(47,ch-40),body,18);
|
||||
_originalLabel.frame=NSMakeRect(margin,MAX(66,ch-20),body*.44,15);
|
||||
_styledLabel.frame=NSMakeRect(margin+body*.44,MAX(66,ch-20),body*.56,15);
|
||||
}
|
||||
if(_compactRecent){
|
||||
_titleLabel.frame=NSMakeRect(0,2,92,18);_countLabel.frame=NSMakeRect(94,2,100,18);
|
||||
@@ -443,23 +542,60 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
NSColor *background=[palette[@"background"]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];
|
||||
BOOL light=background&&background.redComponent>.7&&background.greenComponent>.7;
|
||||
// Keep the supplied neutral surface in both relief themes.
|
||||
[_palette release];_palette=[browserPalette copy];_root.palette=_palette;_folderDocument.palette=_palette;_gridDocument.palette=_palette;
|
||||
[_palette release];_palette=[browserPalette copy];_root.palette=_palette;_folderDocument.palette=_palette;_gridDocument.palette=_palette;_comparePanel.palette=_palette;
|
||||
self.window.backgroundColor=DYBrowserColor(_palette,@"background");self.window.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
|
||||
_root.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
|
||||
for(NSTextField *label in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_emptyLabel])label.textColor=DYBrowserColor(_palette,label==_titleLabel?@"text":@"secondary");
|
||||
for(NSTextField *label in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_emptyLabel,_compareTitle,_compareStatus,_originalLabel,_styledLabel])label.textColor=DYBrowserColor(_palette,label==_titleLabel?@"text":@"secondary");
|
||||
for(NSButton *button in @[_importFiles,_importFolder,_reveal,_refresh,_none,_done,_layoutMenu])button.contentTintColor=DYBrowserColor(_palette,@"accent");
|
||||
_search.textColor=DYBrowserColor(_palette,@"text");_search.backgroundColor=DYBrowserColor(_palette,@"field");
|
||||
for(DYBrowserFolderButton *button in _folderButtons){button.palette=_palette;[button setNeedsDisplay:YES];}
|
||||
for(DYBrowserTile *tile in _tiles.allValues){tile.palette=_palette;[tile setNeedsDisplay:YES];}
|
||||
[_root setNeedsDisplay:YES];[_folderDocument setNeedsDisplay:YES];[_gridDocument setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)updatePreview:(NSData *)rgba{
|
||||
if(_closed||_preview==rgba||[_preview isEqualToData:rgba])return;
|
||||
if(rgba&&rgba.length!=320*180*16)return;
|
||||
[_preview release];_preview=[rgba copy];[_thumbnailCache removeAllObjects];
|
||||
- (void)updatePreview:(NSData *)rgba{[self updatePreview:rgba highResolution:nil];}
|
||||
- (void)updatePreview:(NSData *)rgba highResolution:(NSData *)high{
|
||||
if(_closed||(rgba&&rgba.length!=320*180*16)||(high&&high.length!=DYLookPreviewHDWidth*DYLookPreviewHDHeight*16))return;
|
||||
BOOL standardChanged=_preview!=rgba&&![_preview isEqualToData:rgba];
|
||||
BOOL highChanged=_previewHD!=high&&![_previewHD isEqualToData:high];
|
||||
if(!standardChanged&&!highChanged)return;
|
||||
[_preview release];_preview=[rgba retain];
|
||||
[_previewHD release];_previewHD=[high retain];
|
||||
if(standardChanged||(highChanged&&_hd.state==NSControlStateValueOn)){
|
||||
[_thumbnailCache removeAllObjects];
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(refreshThumbnailSize) object:nil];
|
||||
[self refreshThumbnailSize];
|
||||
}
|
||||
[self refreshComparison];
|
||||
}
|
||||
- (void)qualityChanged:(id)sender{
|
||||
[NSUserDefaults.standardUserDefaults setBool:_hd.state==NSControlStateValueOn forKey:DYBrowserPreference(DYBrowserHDPreference,_library)];
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(refreshThumbnailSize) object:nil];
|
||||
[self refreshThumbnailSize];
|
||||
}
|
||||
- (void)comparePositionChanged:(id)sender{_compareView.position=_compareSlider.doubleValue;}
|
||||
- (void)refreshComparison{
|
||||
if(_closed||_compactRecent||!self.visible)return;
|
||||
_compareWork.cancelled=YES;_compareWork.owner=nil;[_compareWork release];_compareWork=nil;
|
||||
NSData *frame=_previewHD?:_preview;
|
||||
if(!frame){[_compareView setOriginal:nil styled:nil];_compareSlider.enabled=NO;_compareStatus.stringValue=@"等待播放头画面";return;}
|
||||
NSUInteger w=_previewHD?DYLookPreviewHDWidth:320,h=_previewHD?DYLookPreviewHDHeight:180;
|
||||
NSString *path=_selectedPath;
|
||||
NSString *name=path.lastPathComponent.stringByDeletingPathExtension;
|
||||
_compareWork=[DYBrowserWork new];_compareWork.owner=self;DYBrowserWork *work=_compareWork;
|
||||
dispatch_async(_compareQueue,^{@autoreleasepool{
|
||||
if(work.cancelled)return;
|
||||
NSImage *original=DYLUTThumbnail(nil,frame,w,h,NSMakeSize(w,h),nil);
|
||||
if(work.cancelled)return;
|
||||
NSImage *styled=path.length?DYLUTThumbnail(path,frame,w,h,NSMakeSize(w,h),nil):nil;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
DYLUTBrowser *owner=work.owner;if(work.cancelled||!owner)return;
|
||||
owner->_compareSlider.enabled=styled!=nil&&original!=nil;
|
||||
[owner->_compareView setOriginal:original styled:styled];
|
||||
owner->_compareStatus.stringValue=path.length?(styled?name:@"无法预览当前 LUT"):@"选择一个 LUT 查看对比";
|
||||
owner->_compareStatus.toolTip=owner->_compareStatus.stringValue;
|
||||
});
|
||||
}});
|
||||
}
|
||||
- (void)setStatus:(NSString *)status{_statusLabel.stringValue=status?:@"";_statusLabel.toolTip=status;}
|
||||
- (void)rebuildFolders{
|
||||
NSMutableArray *paths=[NSMutableArray arrayWithObjects:DYBrowserRecentFolder,@"*",nil];NSMutableSet *seen=[NSMutableSet setWithArray:paths];
|
||||
@@ -499,7 +635,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
[_thumbnailCache removeAllObjects];NSUInteger generation=++_libraryGeneration;
|
||||
NSProgress *task=[_library reloadAsync:^(NSError *error){
|
||||
if(_closed||generation!=_libraryGeneration)return;[self endLibraryTask];
|
||||
[self rebuildFolders];[self rebuildGrid];[self setStatus:error?error.localizedDescription:@"单击缩略图应用 LUT"];
|
||||
[self rebuildFolders];[self rebuildGrid];[self refreshComparison];[self setStatus:error?error.localizedDescription:@"单击缩略图应用 LUT"];
|
||||
}];[self beginLibraryTask:task];
|
||||
}
|
||||
- (void)folderClicked:(NSButton *)sender{
|
||||
@@ -526,19 +662,23 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
- (void)generateVisibleThumbnails{
|
||||
if(_closed||!_work)return;
|
||||
NSRect visible=NSInsetRect(_gridScroll.contentView.bounds,-30,-180);
|
||||
BOOL hd=!_compactRecent&&_hd.state==NSControlStateValueOn;
|
||||
NSUInteger width=MAX((NSUInteger)64,(NSUInteger)llround(_sizeSlider.doubleValue)),height=MAX((NSUInteger)40,(NSUInteger)llround(width*9./16));
|
||||
if(hd){width*=2;height*=2;}
|
||||
NSData *frame=hd&&_previewHD?_previewHD:_preview;
|
||||
NSUInteger sourceWidth=hd&&_previewHD?DYLookPreviewHDWidth:320,sourceHeight=hd&&_previewHD?DYLookPreviewHDHeight:180;
|
||||
for(NSString *path in _tiles.allKeys){
|
||||
DYBrowserTile *tile=_tiles[path];
|
||||
if(!NSIntersectsRect(tile.frame,visible)){if(tile.thumbnail){tile.thumbnail=nil;tile.enabled=NO;}continue;}
|
||||
if(tile.thumbnail||tile.failure.length)continue;
|
||||
NSString *cacheKey=[NSString stringWithFormat:@"%lu|%@",(unsigned long)width,path];
|
||||
NSString *cacheKey=[NSString stringWithFormat:@"%d|%lu|%@",hd,(unsigned long)width,path];
|
||||
NSDictionary *cached=[_thumbnailCache objectForKey:cacheKey];
|
||||
if(cached){tile.thumbnail=cached[@"image"];tile.failure=cached[@"error"];tile.enabled=tile.thumbnail!=nil;if(tile.failure.length)tile.toolTip=tile.failure;[tile setNeedsDisplay:YES];continue;}
|
||||
if([_queuedPaths containsObject:cacheKey])continue;[_queuedPaths addObject:cacheKey];
|
||||
DYBrowserWork *work=_work;NSData *preview=_preview;
|
||||
DYBrowserWork *work=_work;
|
||||
dispatch_async(_previewQueue,^{@autoreleasepool{
|
||||
if(work.cancelled)return;
|
||||
NSError *error=nil;NSImage *image=DYLUTThumbnail(path,preview,320,180,NSMakeSize(width,height),&error);NSString *failure=error.localizedDescription;
|
||||
NSError *error=nil;NSImage *image=DYLUTThumbnail(path,frame,sourceWidth,sourceHeight,NSMakeSize(width,height),&error);NSString *failure=error.localizedDescription;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
DYLUTBrowser *owner=work.owner;if(work.cancelled||!owner)return;
|
||||
[owner->_queuedPaths removeObject:cacheKey];
|
||||
@@ -573,7 +713,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
void (^applied)(NSError *)=^(NSError *error){
|
||||
if(_closed||generation!=_selectionGeneration)return;[_selectionTask release];_selectionTask=nil;
|
||||
if(error){[self setStatus:error.localizedDescription];return;}
|
||||
[_selectedPath release];_selectedPath=[path copy];[_library recordUsedPath:path];[self rebuildGrid];
|
||||
[_selectedPath release];_selectedPath=[path copy];[_library recordUsedPath:path];[self rebuildGrid];[self refreshComparison];
|
||||
for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=[tile.identifier isEqualToString:path];[tile setNeedsDisplay:YES];}
|
||||
[self setStatus:[@"已选择 " stringByAppendingString:name]];if(closeAfter)[self close];
|
||||
};
|
||||
@@ -585,7 +725,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
void (^cleared)(NSError *)=^(NSError *error){
|
||||
if(_closed||generation!=_selectionGeneration)return;[_selectionTask release];_selectionTask=nil;
|
||||
if(error){[self setStatus:error.localizedDescription];return;}
|
||||
[_selectedPath release];_selectedPath=nil;
|
||||
[_selectedPath release];_selectedPath=nil;[self refreshComparison];
|
||||
for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=NO;[tile setNeedsDisplay:YES];}
|
||||
[self setStatus:@"已移除 LUT"];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#pragma once
|
||||
// Full browser source sampling. The 320×180 auto-grade buffer stays separate.
|
||||
enum { DYLookPreviewHDWidth=640, DYLookPreviewHDHeight=360 };
|
||||
@@ -26,3 +26,12 @@ kernel void dyManagedCarrier(texture2d<float,access::read> a [[texture(0)]],text
|
||||
fragment float4 dyManagedCopyFragment(DYRaster in [[stage_in]],texture2d<float> source [[texture(0)]]){constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);return source.sample(f,in.uv);}
|
||||
|
||||
kernel void dyManagedPreview(texture2d<float> a [[texture(0)]],device float4* out [[buffer(0)]],uint2 p [[thread_position_in_grid]]){if(any(p>=uint2(320,180)))return;constexpr sampler s(coord::normalized,address::clamp_to_edge,filter::linear);float4 c=a.sample(s,(float2(p)+.5f)/float2(320,180));out[p.y*320+p.x]=float4(c.a>0?dyEncode(c.rgb/c.a):float3(0),c.a);}
|
||||
kernel void dyManagedHighPreview(texture2d<float> a [[texture(0)]],device float4* out [[buffer(0)]],
|
||||
constant uint& flip [[buffer(2)]],uint2 p [[thread_position_in_grid]]){
|
||||
constexpr uint2 size(DYLookPreviewHDWidth,DYLookPreviewHDHeight);
|
||||
if(any(p>=size))return;
|
||||
uint2 sample=uint2(p.x,flip?size.y-1-p.y:p.y);
|
||||
constexpr sampler s(coord::normalized,address::clamp_to_edge,filter::linear);
|
||||
float4 c=a.sample(s,(float2(sample)+.5f)/float2(size));
|
||||
out[p.y*size.x+p.x]=float4(c.a>0?dyEncode(c.rgb/c.a):float3(0),c.a);
|
||||
}
|
||||
@@ -2,8 +2,10 @@
|
||||
@synchronized(_previewLock){if(_exporting||CACurrentMediaTime()-_lastPreview<=.5)return;}
|
||||
id<MTLComputePipelineState>p=[self computePipeline:@"dyManagedPreview" entry:entry error:nil];if(!p)return;
|
||||
id<MTLBuffer>b=[entry[@"device"]newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];if(!b)return;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:texture atIndex:0];[ce setBuffer:b offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:texture atIndex:0];[ce setBuffer:b offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];
|
||||
id<MTLBuffer>lookHD=[self encodeLookHD:texture inputLUT:nil strength:0 origin:origin entry:entry commands:cb];
|
||||
[cb commit];[cb waitUntilCompleted];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];[self replaceLookHDBuffer:lookHD];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
|
||||
}
|
||||
// Included in DYRenderer. V1 callers and their ABI remain on renderSource:...tools:error:.
|
||||
- (NSDictionary*)colorContext {@synchronized(_previewLock){return [[_colorContext copy]autorelease];}}
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
/// Display-encoded float RGBA, 320×180, with the visually top row first.
|
||||
/// Analysis preview retains the host texture's original row order separately.
|
||||
- (NSData*)lookLUTPreview;
|
||||
/// Standard and HD samples from the same capture, under one lock.
|
||||
- (NSDictionary*)lookLUTPreviewFrames;
|
||||
- (void)invalidatePreview;
|
||||
/// Conversion/statistics run while visible; retain one small final-output
|
||||
/// sample per instance so opening a paused workspace needs no parameter edit.
|
||||
|
||||
+41
-4
@@ -1,3 +1,4 @@
|
||||
#import "DYLookPreview.h"
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#import <os/log.h>
|
||||
#import "DYManagedColor.h"
|
||||
@@ -139,7 +140,7 @@ struct DYScopeReadback {
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview;
|
||||
NSData *_preview,*_lookLUTPreview,*_lookLUTPreviewHD;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
@@ -183,11 +184,39 @@ struct DYScopeReadback {
|
||||
#include "DYPrimaryRender.inc.h"
|
||||
#include "DYUnifiedRender.inc.h"
|
||||
#include "DYMosaicRender.inc.h"
|
||||
// HD is rendered alongside the existing throttled source sample. Its
|
||||
// immutable shared buffer stays available when the playhead is paused.
|
||||
- (id<MTLBuffer>)encodeLookHD:(id<MTLTexture>)texture inputLUT:(id<MTLTexture>)lut strength:(float)strength
|
||||
origin:(FxImageOrigin)origin entry:(NSMutableDictionary*)entry commands:(id<MTLCommandBuffer>)commands {
|
||||
NSString *name=lut?@"dyInputHighPreview":@"dyManagedHighPreview";
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:name entry:entry error:nil];
|
||||
if(!pipeline)return nil;
|
||||
id<MTLBuffer> buffer=[[entry[@"device"] newBufferWithLength:DYLookPreviewHDWidth*DYLookPreviewHDHeight*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
id<MTLComputeCommandEncoder> encoder=buffer?[commands computeCommandEncoder]:nil;
|
||||
if(!encoder)return nil;
|
||||
[encoder setComputePipelineState:pipeline];[encoder setTexture:texture atIndex:0];
|
||||
[encoder setBuffer:buffer offset:0 atIndex:0];
|
||||
if(lut){[encoder setTexture:lut atIndex:1];[encoder setBytes:&strength length:sizeof(strength) atIndex:1];}
|
||||
uint32_t flip=origin==kFxImageOrigin_BOTTOM_LEFT;
|
||||
[encoder setBytes:&flip length:sizeof(flip) atIndex:2];
|
||||
[encoder dispatchThreads:MTLSizeMake(DYLookPreviewHDWidth,DYLookPreviewHDHeight,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];
|
||||
[encoder endEncoding];
|
||||
return buffer;
|
||||
}
|
||||
- (void)replaceLookHDBuffer:(id<MTLBuffer>)buffer {
|
||||
[_lookLUTPreviewHD release];_lookLUTPreviewHD=nil;
|
||||
if(!buffer)return;
|
||||
// Each capture owns a different buffer. NSData retains this one until the
|
||||
// browser's asynchronous image work has finished reading it.
|
||||
[buffer retain];
|
||||
_lookLUTPreviewHD=[[NSData alloc]initWithBytesNoCopy:buffer.contents length:buffer.length
|
||||
deallocator:^(void *bytes,NSUInteger length){[buffer release];}];
|
||||
}
|
||||
#include "DYManagedRender.inc.h"
|
||||
#include "DYFaceRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeProfileLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];[_scopeProfileLock release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];[_scopeProfileLock release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_lookLUTPreviewHD release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)trimPreparedLUTsKeeping:(NSString *)path {
|
||||
if(_preparedLUTs.count<=12)return;
|
||||
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
|
||||
@@ -211,9 +240,14 @@ struct DYScopeReadback {
|
||||
}});return progress;
|
||||
}
|
||||
- (void)notifyPreviewChanged{dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_lookLUTPreviewHD release];_lookLUTPreviewHD=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSDictionary*)lookLUTPreviewFrames {@synchronized(_previewLock){
|
||||
NSMutableDictionary *frames=[NSMutableDictionary dictionary];
|
||||
frames[@"standard"]=_lookLUTPreview;frames[@"high"]=_lookLUTPreviewHD;
|
||||
return frames;
|
||||
}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
NSNumber*k=@(registry);NSMutableDictionary*entry=_devices[k];if(entry)return entry;
|
||||
uint64_t beta=DYBetaSpanBegin(@"device_prepare",nil);@try{
|
||||
@@ -357,7 +391,7 @@ struct DYScopeReadback {
|
||||
[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];
|
||||
}
|
||||
}
|
||||
id<MTLBuffer> pb=nil;
|
||||
id<MTLBuffer> pb=nil,lookHD=nil;
|
||||
if(preview){
|
||||
id<MTLComputePipelineState> analysis=[self computePipeline:@"dyInputAnalysis" entry:e error:err];if(!analysis)return NO;
|
||||
pb=[[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
@@ -367,6 +401,8 @@ struct DYScopeReadback {
|
||||
float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;
|
||||
[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];
|
||||
[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];
|
||||
lookHD=[self encodeLookHD:straight inputLUT:neutral?e[@"identity"]:ts[0] strength:inputStrength
|
||||
origin:src.imageOrigin entry:e commands:cb];
|
||||
}
|
||||
MTLRenderPassDescriptor*rp=[MTLRenderPassDescriptor renderPassDescriptor];rp.colorAttachments[0].texture=output;rp.colorAttachments[0].loadAction=MTLLoadActionDontCare;rp.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>re=[cb renderCommandEncoderWithDescriptor:rp];[re setRenderPipelineState:pipeline];
|
||||
float w=output.width,h=output.height;float sw=s.right-s.left,sh=s.top-s.bottom;float l=(t.left-s.left)/sw,r=(t.right-s.left)/sw,top=(s.top-t.top)/sh,bottom=(s.top-t.bottom)/sh;
|
||||
@@ -384,6 +420,7 @@ struct DYScopeReadback {
|
||||
for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)topFirst.mutableBytes+y*rowBytes,(const uint8_t*)_preview.bytes+(179-y)*rowBytes,rowBytes);
|
||||
_lookLUTPreview=[topFirst copy];
|
||||
}else _lookLUTPreview=[_preview retain];
|
||||
[self replaceLookHDBuffer:lookHD];
|
||||
_lastPreview=CACurrentMediaTime();[self notifyPreviewChanged];
|
||||
}}
|
||||
if(!ok)fail(err,cb.error.localizedDescription);return ok;
|
||||
|
||||
@@ -13,7 +13,41 @@
|
||||
[self captureTrackingTile:tile gray:&result preview:preview error:error];
|
||||
return result;
|
||||
}
|
||||
- (CVMetalTextureRef)newTrackingVisionTexture:(NSMutableDictionary*)entry size:(vector_uint3)size
|
||||
image:(CVPixelBufferRef*)image {
|
||||
CVMetalTextureCacheRef cache=(CVMetalTextureCacheRef)entry[@"visionTextureCache"];
|
||||
if(!cache){
|
||||
if(CVMetalTextureCacheCreate(kCFAllocatorDefault,nullptr,entry[@"device"],nullptr,&cache)!=kCVReturnSuccess)return nullptr;
|
||||
entry[@"visionTextureCache"]=(id)cache;
|
||||
CFRelease(cache);
|
||||
}
|
||||
CVPixelBufferPoolRef pool=(CVPixelBufferPoolRef)entry[@"visionPool"];
|
||||
if(!pool||[entry[@"visionWidth"]unsignedIntValue]!=size.x||[entry[@"visionHeight"]unsignedIntValue]!=size.y){
|
||||
NSDictionary *attributes=@{(id)kCVPixelBufferPixelFormatTypeKey:@(kCVPixelFormatType_32BGRA),
|
||||
(id)kCVPixelBufferWidthKey:@(size.x),(id)kCVPixelBufferHeightKey:@(size.y),
|
||||
(id)kCVPixelBufferIOSurfacePropertiesKey:@{},(id)kCVPixelBufferMetalCompatibilityKey:@YES};
|
||||
if(CVPixelBufferPoolCreate(kCFAllocatorDefault,nullptr,(CFDictionaryRef)attributes,&pool)!=kCVReturnSuccess)return nullptr;
|
||||
entry[@"visionPool"]=(id)pool;CFRelease(pool);
|
||||
entry[@"visionWidth"]=@(size.x);entry[@"visionHeight"]=@(size.y);
|
||||
}
|
||||
NSDictionary *limit=@{(id)kCVPixelBufferPoolAllocationThresholdKey:@6};
|
||||
if(CVPixelBufferPoolCreatePixelBufferWithAuxAttributes(kCFAllocatorDefault,pool,(CFDictionaryRef)limit,image)!=kCVReturnSuccess)return nullptr;
|
||||
CVMetalTextureRef view=nullptr;
|
||||
NSDictionary *usage=@{(id)kCVMetalTextureUsage:@(MTLTextureUsageShaderWrite)};
|
||||
CVReturn status=CVMetalTextureCacheCreateTextureFromImage(kCFAllocatorDefault,cache,*image,(CFDictionaryRef)usage,
|
||||
MTLPixelFormatBGRA8Unorm,size.x,size.y,0,&view);
|
||||
if(status!=kCVReturnSuccess||!view||!CVMetalTextureGetTexture(view)){
|
||||
if(view)CFRelease(view);
|
||||
CVPixelBufferRelease(*image);*image=nullptr;
|
||||
return nullptr;
|
||||
}
|
||||
return view;
|
||||
}
|
||||
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview error:(NSError**)error {
|
||||
return [self captureTrackingTile:tile gray:gray preview:preview visionFlip:nil error:error];
|
||||
}
|
||||
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview
|
||||
visionFlip:(NSNumber*)visionFlip 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 NO;
|
||||
@@ -26,6 +60,10 @@
|
||||
id<MTLComputePipelineState>pipeline=function?[device newComputePipelineStateWithFunction:function error:nil]:nil;
|
||||
entry[@"previewPipeline"]=pipeline;
|
||||
[pipeline release];[function release];
|
||||
function=[library newFunctionWithName:@"dyToolVisionPreview"];
|
||||
pipeline=function?[device newComputePipelineStateWithFunction:function error:nil]:nil;
|
||||
entry[@"visionPipeline"]=pipeline;
|
||||
[pipeline release];[function release];
|
||||
}
|
||||
[scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release];
|
||||
}[devices release];if(!entry)return NO;
|
||||
@@ -57,10 +95,28 @@
|
||||
[encoder endEncoding];
|
||||
}
|
||||
id<MTLBuffer>previewBuffer=nil;
|
||||
CVPixelBufferRef visionImage=nullptr;
|
||||
CVMetalTextureRef visionTexture=nullptr;
|
||||
vector_uint3 previewInfo={0,0,flip};
|
||||
if(preview&&entry[@"previewPipeline"]){
|
||||
if(preview){
|
||||
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));
|
||||
}
|
||||
if(preview&&visionFlip&&entry[@"visionPipeline"]){
|
||||
visionTexture=[self newTrackingVisionTexture:entry size:previewInfo image:&visionImage];
|
||||
if(visionTexture){
|
||||
uint32_t reverseRows=visionFlip.boolValue;
|
||||
encoder=[commands computeCommandEncoder];
|
||||
[encoder setComputePipelineState:entry[@"visionPipeline"]];
|
||||
[encoder setTexture:bytes atIndex:0];
|
||||
[encoder setTexture:CVMetalTextureGetTexture(visionTexture) atIndex:1];
|
||||
[encoder setBytes:&previewInfo length:sizeof(previewInfo) atIndex:0];
|
||||
[encoder setBytes:&reverseRows length:sizeof(reverseRows) atIndex:1];
|
||||
[encoder dispatchThreads:MTLSizeMake(previewInfo.x,previewInfo.y,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];
|
||||
[encoder endEncoding];
|
||||
}
|
||||
}
|
||||
if(preview&&!visionTexture&&entry[@"previewPipeline"]){
|
||||
NSUInteger size=previewInfo.x*previewInfo.y*4;
|
||||
previewBuffer=entry[@"previewBuffer"];
|
||||
if(previewBuffer.length!=size){
|
||||
@@ -75,14 +131,21 @@
|
||||
[encoder endEncoding];
|
||||
}
|
||||
}
|
||||
if(!gray&&!previewBuffer)return NO;
|
||||
if(!gray&&!previewBuffer&&!visionTexture)return NO;
|
||||
[commands commit];[commands waitUntilCompleted];
|
||||
if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return NO;}
|
||||
if(previewBuffer){
|
||||
if(visionTexture)CFRelease(visionTexture);
|
||||
if(commands.status!=MTLCommandBufferStatusCompleted){
|
||||
if(visionImage)CVPixelBufferRelease(visionImage);
|
||||
if(error)*error=commands.error;
|
||||
return NO;
|
||||
}
|
||||
if(previewBuffer||visionImage){
|
||||
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)};
|
||||
NSString *key=visionImage?@"visionImage":@"rgba";
|
||||
id pixels=visionImage?(id)visionImage:[NSData dataWithBytes:previewBuffer.contents length:previewBuffer.length];
|
||||
*preview=@{key:pixels,@"width":@(previewInfo.x),@"height":@(previewInfo.y),@"aspect":@(aspect)};
|
||||
if(visionImage)CVPixelBufferRelease(visionImage);
|
||||
}
|
||||
if(gray){
|
||||
gray->width=int(width);gray->height=int(height);
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
CMTime _toolSourceTime,_trackingReferenceTime,_trackingFrameDuration,_trackingPreviousTime;
|
||||
std::atomic_bool _trackingActive,_trackingFinishing,_trackingInFrame,_trackingCancelled;
|
||||
BOOL _trackingBackward,_trackingBoth,_trackingSingle,_trackingFlip,_trackingDiscard;
|
||||
uint64_t _trackingGeneration;double _trackingStarted;
|
||||
uint64_t _trackingGeneration;double _trackingStarted,_trackingRunStart;NSUInteger _trackingDirectFrames,_trackingCopiedFrames;
|
||||
NSString *_trackingNode,*_trackingMaskID,*_trackingMessage;
|
||||
NSDictionary *_trackingFrozenMask;NSMutableDictionary *_trackingCandidate;
|
||||
NSMutableArray *_trackingSamples;
|
||||
|
||||
@@ -166,14 +166,14 @@
|
||||
[_trackingNode release];_trackingNode=[node copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
|
||||
NSArray *source=DYStampSourceAtTime(mask,time);
|
||||
_trackingStampMotion=DYStampMotionAtTime(mask,time);
|
||||
_trackingObjectMode=DYMosaicTracksMask(doc,mask[@"id"]);_trackingObjectPending=_trackingObjectRepaired=0;
|
||||
_trackingObjectMode=DYMosaicTracksMask(doc,mask[@"id"]);_trackingObjectPending=_trackingObjectRepaired=0;_trackingDirectFrames=_trackingCopiedFrames=0;
|
||||
if(source){
|
||||
_trackingStampMotion.active=true;
|
||||
_trackingStampSourceSeed={[source[0] floatValue],[source[1] floatValue],
|
||||
std::min(8.f,[source[2] floatValue]*_trackingStampMotion.sourceScaleX),
|
||||
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;
|
||||
_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;_trackingRunStart=_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());
|
||||
@@ -247,22 +247,32 @@
|
||||
// The object tracker consumes only the small color image. The gray frame
|
||||
// is useful at the seed only when checking orientation against a cached frame.
|
||||
const bool needsGray=!objectMode||(!_trackingSamples.count&&_trackingReferenceFrame.valid());
|
||||
if(![self captureTrackingTile:tile gray:needsGray?&frame:nullptr preview:(!_trackingSingle||objectMode)?&preview:nullptr error:error])
|
||||
// The seed may still need the legacy orientation comparison before the
|
||||
// tracking flip is known. All subsequent object frames can go straight to Vision.
|
||||
NSNumber *visionFlip=objectMode&&!needsGray?@(_trackingFlip):nil;
|
||||
if(![self captureTrackingTile:tile gray:needsGray?&frame:nullptr
|
||||
preview:(!_trackingSingle||objectMode)?&preview:nullptr visionFlip:visionFlip error:error])
|
||||
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.at(y*frame.width+x);same+=fabs(p-_trackingReferenceFrame.at(y*frame.width+x));flip+=fabs(p-_trackingReferenceFrame.at((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(!objectMode&&_trackingFlip)frame.flipVertically();
|
||||
dy::TrackResult target,source;
|
||||
dy::ObjectStep objectStep;
|
||||
if(objectMode){
|
||||
CVPixelBufferRef visionImage=(CVPixelBufferRef)preview[@"visionImage"];
|
||||
NSData *rgba=preview[@"rgba"];int width=[preview[@"width"]intValue],height=[preview[@"height"]intValue];
|
||||
if(width<16||height<16||width>640||height>640||rgba.length!=size_t(width)*height*4)return [self finishToolAnalysis:@"目标跟踪未取得完整分析画面,原轨迹已保留" error:error];
|
||||
if(width<16||height<16||width>640||height>640||(!visionImage&&rgba.length!=size_t(width)*height*4))
|
||||
return [self finishToolAnalysis:@"目标跟踪未取得完整分析画面,原轨迹已保留" error:error];
|
||||
if(visionImage)++_trackingDirectFrames;else ++_trackingCopiedFrames;
|
||||
if(!_trackingSamples.count){
|
||||
dy::TrackerROI seed={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
dy::TrackerROI roi=dy::visionMaskBounds(seed,_trackingShapePolygon,float(width)/height);_trackingObjectROI=roi;
|
||||
os_log(OS_LOG_DEFAULT,"dayu_object_track_worker main=%{public}d",(int)NSThread.isMainThread);
|
||||
if(!_objectTracker.reset((const uint8_t*)rgba.bytes,width,height,_trackingFlip,roi,1./CMTimeGetSeconds(_trackingFrameDuration)))return [self finishToolAnalysis:@"无法建立目标外观,请调整蒙版后重试" error:error];
|
||||
double fps=1./CMTimeGetSeconds(_trackingFrameDuration);
|
||||
bool seeded=visionImage?_objectTracker.reset(visionImage,roi,fps):
|
||||
_objectTracker.reset((const uint8_t*)rgba.bytes,width,height,_trackingFlip,roi,fps);
|
||||
if(!seeded)return [self finishToolAnalysis:@"无法建立目标外观,请调整蒙版后重试" error:error];
|
||||
objectStep={{roi.cx,roi.cy,roi.width,roi.height,1},true,false,false,0};
|
||||
}else objectStep=_objectTracker.track((const uint8_t*)rgba.bytes,width,height,_trackingFlip);
|
||||
}else objectStep=visionImage?_objectTracker.track(visionImage):_objectTracker.track((const uint8_t*)rgba.bytes,width,height,_trackingFlip);
|
||||
target=_objectTracker.result(objectStep);
|
||||
target.cx+=(_trackingSeed.centerX-_trackingObjectROI.cx)*target.scale;target.cy+=(_trackingSeed.centerY-_trackingObjectROI.cy)*target.scale;
|
||||
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
|
||||
@@ -324,7 +334,7 @@
|
||||
}
|
||||
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];packet[@"predicted"]=@(objectStep.predicted);
|
||||
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
|
||||
packet[@"flip"]=@(_trackingFlip);packet[@"time"]=@(CMTimeGetSeconds(time));
|
||||
packet[@"flip"]=@(_trackingFlip&&!preview[@"visionImage"]);packet[@"time"]=@(CMTimeGetSeconds(time));
|
||||
packet[@"completed"]=@(_trackingPreviewCompleted);
|
||||
packet[@"total"]=@(MAX(_trackingPreviewTotal,_trackingPreviewCompleted));
|
||||
packet[@"backward"]=@(_trackingBackward);
|
||||
@@ -354,8 +364,13 @@
|
||||
if(self->_trackingObjectRepaired)message=[message stringByAppendingFormat:@" · 补齐 %lu 帧短暂遮挡,请复核",(unsigned long)self->_trackingObjectRepaired];
|
||||
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",@"previewBuffer"]];}
|
||||
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer",@"previewBuffer",@"visionPool",@"visionWidth",@"visionHeight"]];}
|
||||
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->_trackingObjectMode)
|
||||
os_log(OS_LOG_DEFAULT,"dayu_object_track_finished elapsed_ms=%{public}.2f direct=%{public}lu copied=%{public}lu keys=%{public}lu",
|
||||
1000*(NSProcessInfo.processInfo.systemUptime-self->_trackingRunStart),
|
||||
(unsigned long)self->_trackingDirectFrames,(unsigned long)self->_trackingCopiedFrames,
|
||||
(unsigned long)[self->_trackingCandidate[@"keys"]count]);
|
||||
if(self->_trackingSingle)[self toolStatus:message];
|
||||
else [self postTrackingPreview:nil active:NO message:message];
|
||||
});return YES;
|
||||
|
||||
@@ -75,6 +75,43 @@
|
||||
BOOL noGrayBuffer=YES;for(NSDictionary *entry in [[previewOnly valueForKey:@"toolCaptureDevices"] allValues])noGrayBuffer&=entry[@"buffer"]==nil;
|
||||
run.record(@"mosaic-tracking-4k-color-input-matches-without-gray-buffer",colorOK&&full.valid()&&color[@"rgba"]&&[color isEqual:referenceColor]&&noGrayBuffer);
|
||||
}
|
||||
{
|
||||
const NSUInteger w=323,h=181;
|
||||
DYDiagnosticTile *tile=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
|
||||
Pixels color(w*h*4);
|
||||
for(NSUInteger y=0;y<h;++y)for(NSUInteger x=0;x<w;++x){
|
||||
const auto i=(y*w+x)*4;
|
||||
color[i]=(x%23)/22.f;color[i+1]=(y%29)/28.f;color[i+2]=((x+y)%37)/36.f;color[i+3]=(x%7)/6.f;
|
||||
}
|
||||
[[tile metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:color.data() bytesPerRow:w*8];
|
||||
id<DYToolHostProbe> legacy=[(id)[[NSClassFromString(@"DYPlugIn") alloc] initWithAPIManager:host] autorelease];
|
||||
id<DYToolHostProbe> direct=[(id)[[NSClassFromString(@"DYPlugIn") alloc] initWithAPIManager:host] autorelease];
|
||||
BOOL exact=tile!=nil;NSUInteger compared=0;
|
||||
for(FxImageOrigin origin : {kFxImageOrigin_TOP_LEFT,kFxImageOrigin_BOTTOM_LEFT}){
|
||||
[tile setDiagnosticImageOrigin:origin];
|
||||
for(BOOL flip : {NO,YES}){@autoreleasepool{
|
||||
NSDictionary *rgba=nil,*packet=nil;
|
||||
[legacy captureTrackingTile:tile gray:nullptr preview:&rgba error:nil];
|
||||
[direct captureTrackingTile:tile gray:nullptr preview:&packet visionFlip:@(flip) error:nil];
|
||||
CVPixelBufferRef image=(CVPixelBufferRef)packet[@"visionImage"];
|
||||
NSData *reference=rgba[@"rgba"];
|
||||
if(!image||!CVPixelBufferGetIOSurface(image)||packet[@"rgba"]||reference.length!=w*h*4||
|
||||
CVPixelBufferGetPixelFormatType(image)!=kCVPixelFormatType_32BGRA||
|
||||
CVPixelBufferLockBaseAddress(image,kCVPixelBufferLock_ReadOnly)!=kCVReturnSuccess){exact=NO;continue;}
|
||||
const auto *actual=static_cast<const uint8_t*>(CVPixelBufferGetBaseAddress(image));
|
||||
const auto *expected=static_cast<const uint8_t*>(reference.bytes);
|
||||
const size_t stride=CVPixelBufferGetBytesPerRow(image);
|
||||
for(NSUInteger y=0;y<h;++y)for(NSUInteger x=0;x<w;++x){
|
||||
const auto *a=actual+y*stride+x*4,*e=expected+((flip?h-1-y:y)*w+x)*4;
|
||||
exact&=a[0]==e[2]&&a[1]==e[1]&&a[2]==e[0]&&a[3]==255;
|
||||
}
|
||||
CVPixelBufferUnlockBaseAddress(image,kCVPixelBufferLock_ReadOnly);
|
||||
++compared;
|
||||
}}
|
||||
}
|
||||
for(NSDictionary *entry in [[direct valueForKey:@"toolCaptureDevices"] allValues])exact&=!entry[@"previewBuffer"]&&!entry[@"buffer"];
|
||||
run.record(@"tracking-vision-iosurface-matches-cpu-bgra-byte-for-byte",exact&&compared==4,@{@"comparisons":@(compared),@"width":@(w),@"height":@(h)});
|
||||
}
|
||||
// UI aliases of a shared object are one tracking target. Switching from the
|
||||
// global editor to either linked module must not cancel a valid analysis.
|
||||
{
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error;
|
||||
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview error:(NSError**)error;
|
||||
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview visionFlip:(NSNumber*)visionFlip error:(NSError**)error;
|
||||
@end
|
||||
|
||||
@interface DYToolCanvasProbe : DYToolTrackingProbe
|
||||
|
||||
+19
-5
@@ -60,14 +60,28 @@ kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device uchar* p
|
||||
}
|
||||
|
||||
// Reuse the analysis source texture for the lightweight color preview.
|
||||
inline uchar4 dyTrackingPreviewPixel(texture2d<float> source,uint2 pos,uint3 info){
|
||||
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;
|
||||
return uchar4(uchar3(rint(saturate(source.sample(filter,uv).rgb)*255)),255);
|
||||
}
|
||||
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);
|
||||
pixels[pos.y*info.x+pos.x]=dyTrackingPreviewPixel(source,pos,info);
|
||||
}
|
||||
|
||||
kernel void dyToolVisionPreview(texture2d<float> source [[texture(0)]],
|
||||
texture2d<float,access::write> image [[texture(1)]],
|
||||
constant uint3 &info [[buffer(0)]],
|
||||
constant uint &reverseRows [[buffer(1)]],
|
||||
uint2 pos [[thread_position_in_grid]]){
|
||||
if(any(pos>=info.xy))return;
|
||||
// Reverse the same discrete row as the CPU packer, keeping sampling and
|
||||
// quantization identical for both image origins and odd sizes.
|
||||
uint2 sample=uint2(pos.x,reverseRows?info.y-1-pos.y:pos.y);
|
||||
image.write(float4(dyTrackingPreviewPixel(source,sample,info))/255.f,pos);
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
#import <CoreVideo/CoreVideo.h>
|
||||
|
||||
@interface DYTrackingPreviewImage : NSView
|
||||
- (void)showFrame:(NSDictionary *)frame;
|
||||
@end
|
||||
@@ -18,10 +20,21 @@
|
||||
[_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){
|
||||
CVPixelBufferRef visionImage=(CVPixelBufferRef)frame[@"visionImage"];
|
||||
size_t stride=w*4;
|
||||
CGBitmapInfo bitmapInfo=kCGImageAlphaNoneSkipLast;
|
||||
// Only frames actually presented in the coalesced UI are copied to a
|
||||
// display bitmap. The analysis worker passes the shared buffer directly.
|
||||
if(visionImage&&CVPixelBufferLockBaseAddress(visionImage,kCVPixelBufferLock_ReadOnly)==kCVReturnSuccess){
|
||||
stride=CVPixelBufferGetBytesPerRow(visionImage);
|
||||
pixels=[NSData dataWithBytes:CVPixelBufferGetBaseAddress(visionImage) length:stride*h];
|
||||
CVPixelBufferUnlockBaseAddress(visionImage,kCVPixelBufferLock_ReadOnly);
|
||||
bitmapInfo=kCGBitmapByteOrder32Little|kCGImageAlphaNoneSkipFirst;
|
||||
}
|
||||
if(w&&h&&pixels.length==stride*h){
|
||||
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)pixels);
|
||||
CGColorSpaceRef space=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
|
||||
CGImageRef cg=CGImageCreate(w,h,8,32,w*4,space,kCGImageAlphaNoneSkipLast,provider,nil,true,kCGRenderingIntentDefault);
|
||||
CGImageRef cg=CGImageCreate(w,h,8,32,stride,space,bitmapInfo,provider,nil,true,kCGRenderingIntentDefault);
|
||||
if(cg){_image=[[NSImage alloc]initWithCGImage:cg size:NSMakeSize(w,h)];CGImageRelease(cg);}
|
||||
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
|
||||
}
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.21.2</string>
|
||||
<string>1.21.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>119</string>
|
||||
<string>120</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace dy {
|
||||
class ObjectTracker {
|
||||
VNSequenceRequestHandler *sequence_=nil;
|
||||
VNTrackObjectRequest *request_=nil;
|
||||
CVPixelBufferRef current_=nullptr,trusted_=nullptr;
|
||||
CVPixelBufferRef fallback_[2]{},trusted_=nullptr;
|
||||
ObjectBox trustedBox_{};
|
||||
ObjectMotion motion_;
|
||||
TrackerROI seed_{};
|
||||
@@ -30,35 +30,73 @@ class ObjectTracker {
|
||||
CGRect b=observation.boundingBox;box={float(CGRectGetMidX(b)),float(1-CGRectGetMidY(b)),float(b.size.width),float(b.size.height),observation.confidence};
|
||||
request_.inputObservation=observation;return true;
|
||||
}
|
||||
bool copyInput(const uint8_t *rgba,int w,int h,bool flip){
|
||||
if(!rgba||w<16||h<16||w>640||h>640)return false;
|
||||
if(w!=width_||h!=height_)return false;
|
||||
CVPixelBufferLockBaseAddress(current_,0);auto *out=(uint8_t*)CVPixelBufferGetBaseAddress(current_);size_t stride=CVPixelBufferGetBytesPerRow(current_);
|
||||
CVPixelBufferRef copyInput(const uint8_t *rgba,int w,int h,bool flip){
|
||||
if(!rgba||!validSize(w,h)||w!=width_||h!=height_)return nullptr;
|
||||
// A CPU fallback frame may become the trusted frame. Never write into
|
||||
// that slot or into a Metal buffer still held by the preview.
|
||||
auto &buffer=fallback_[0]&&fallback_[0]==trusted_?fallback_[1]:fallback_[0];
|
||||
if(!buffer&&CVPixelBufferCreate(kCFAllocatorDefault,w,h,kCVPixelFormatType_32BGRA,
|
||||
(CFDictionaryRef)@{(id)kCVPixelBufferIOSurfacePropertiesKey:@{}},&buffer)!=kCVReturnSuccess)return nullptr;
|
||||
if(CVPixelBufferLockBaseAddress(buffer,0)!=kCVReturnSuccess)return nullptr;
|
||||
auto *out=(uint8_t*)CVPixelBufferGetBaseAddress(buffer);size_t stride=CVPixelBufferGetBytesPerRow(buffer);
|
||||
for(int y=0;y<h;++y){const auto *row=rgba+size_t(flip?h-1-y:y)*w*4;auto *dst=out+y*stride;for(int x=0;x<w;++x){dst[x*4]=row[x*4+2];dst[x*4+1]=row[x*4+1];dst[x*4+2]=row[x*4];dst[x*4+3]=255;}}
|
||||
CVPixelBufferUnlockBaseAddress(current_,0);return true;
|
||||
CVPixelBufferUnlockBaseAddress(buffer,0);
|
||||
return buffer;
|
||||
}
|
||||
static bool validSize(int w,int h){return w>=16&&h>=16&&w<=640&&h<=640;}
|
||||
bool accepts(CVPixelBufferRef image)const{
|
||||
return image&&CVPixelBufferGetPixelFormatType(image)==kCVPixelFormatType_32BGRA&&
|
||||
CVPixelBufferGetWidth(image)==size_t(width_)&&CVPixelBufferGetHeight(image)==size_t(height_);
|
||||
}
|
||||
void trust(CVPixelBufferRef image,ObjectBox box){
|
||||
CVPixelBufferRetain(image);
|
||||
if(trusted_)CVPixelBufferRelease(trusted_);
|
||||
trusted_=image;trustedBox_=box;
|
||||
}
|
||||
bool begin(CVPixelBufferRef image,TrackerROI roi,double fps){
|
||||
seed_=roi;
|
||||
ObjectBox box{roi.cx,roi.cy,roi.width,roi.height,1};
|
||||
motion_.reset(box,fps);
|
||||
if(!accepts(image)||!motion_.active()){stop();return false;}
|
||||
newSequence(box);ObjectBox first;
|
||||
if(!perform(image,first)){stop();return false;}
|
||||
trust(image,box);started_=true;return true;
|
||||
}
|
||||
public:
|
||||
ObjectTracker()=default;
|
||||
ObjectTracker(const ObjectTracker&)=delete;
|
||||
ObjectTracker& operator=(const ObjectTracker&)=delete;
|
||||
~ObjectTracker(){stop();}
|
||||
void stop(){[request_ release];request_=nil;[sequence_ release];sequence_=nil;if(current_)CVPixelBufferRelease(current_);if(trusted_)CVPixelBufferRelease(trusted_);current_=trusted_=nullptr;width_=height_=0;started_=false;}
|
||||
void stop(){
|
||||
[request_ release];request_=nil;[sequence_ release];sequence_=nil;
|
||||
if(trusted_)CVPixelBufferRelease(trusted_);
|
||||
trusted_=nullptr;
|
||||
for(auto &image:fallback_){if(image)CVPixelBufferRelease(image);image=nullptr;}
|
||||
width_=height_=0;started_=false;
|
||||
}
|
||||
bool reset(const uint8_t *rgba,int w,int h,bool flip,TrackerROI roi,double fps){
|
||||
stop();seed_=roi;width_=w;height_=h;
|
||||
if(w<16||h<16||w>640||h>640)return false;
|
||||
for(auto p:{¤t_,&trusted_})if(CVPixelBufferCreate(kCFAllocatorDefault,w,h,kCVPixelFormatType_32BGRA,(CFDictionaryRef)@{(id)kCVPixelBufferIOSurfacePropertiesKey:@{}},p)!=kCVReturnSuccess){stop();return false;}
|
||||
trustedBox_={roi.cx,roi.cy,roi.width,roi.height,1};motion_.reset(trustedBox_,fps);if(!motion_.active()||!copyInput(rgba,w,h,flip)){stop();return false;}
|
||||
newSequence(trustedBox_);ObjectBox first;if(!perform(current_,first)){stop();return false;}
|
||||
std::swap(current_,trusted_);started_=true;return true;
|
||||
stop();width_=w;height_=h;
|
||||
return begin(copyInput(rgba,w,h,flip),roi,fps);
|
||||
}
|
||||
bool reset(CVPixelBufferRef image,TrackerROI roi,double fps){
|
||||
stop();
|
||||
if(!image)return false;
|
||||
size_t w=CVPixelBufferGetWidth(image),h=CVPixelBufferGetHeight(image);
|
||||
if(w>640||h>640||!validSize(int(w),int(h)))return false;
|
||||
width_=int(w);height_=int(h);
|
||||
return begin(image,roi,fps);
|
||||
}
|
||||
ObjectStep track(const uint8_t *rgba,int w,int h,bool flip){
|
||||
if(!started_||!copyInput(rgba,w,h,flip))return {};
|
||||
return started_?track(copyInput(rgba,w,h,flip)):ObjectStep{};
|
||||
}
|
||||
ObjectStep track(CVPixelBufferRef image){
|
||||
if(!started_||!accepts(image))return {};
|
||||
if(motion_.missing()){
|
||||
newSequence(trustedBox_);ObjectBox ignored;if(!perform(trusted_,ignored))return {};
|
||||
}
|
||||
ObjectBox observed{};bool found=perform(current_,observed);
|
||||
ObjectBox observed{};bool found=perform(image,observed);
|
||||
auto step=motion_.advance(observed,found);
|
||||
if(step.valid&&!step.predicted){trustedBox_=observed;std::swap(current_,trusted_);}
|
||||
if(step.valid&&!step.predicted)trust(image,observed);
|
||||
return step;
|
||||
}
|
||||
int pendingFrames()const{return motion_.missing();}
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.21.2</string>
|
||||
<string>1.21.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>119</string>
|
||||
<string>120</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -2,6 +2,16 @@
|
||||
|
||||
更新于 2026-11-08(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
|
||||
|
||||
## 1.21.3(120)共享缓冲追踪与 LUT 对比预览
|
||||
|
||||
正式版从唯一插件路径启动,编译提交 `43364549327470291abd82ca1d0eded2becd1579`,APP 公证 `6f1e34d4-7d24-4a73-9a8b-af41e132d4ba` Accepted。1012 项原生自检、17 套模板、票据、Gatekeeper 与 PluginKit 唯一路径通过。Metal 直写 IOSurface 上的 BGRA 缓冲后交给 Vision。四组奇数宽高、不同图像原点与翻转的像素回归逐字节一致。其他普通蒙版和图章追踪仍使用各自现有输入。[安装](verification/Delivery1.21.3.json)
|
||||
|
||||
FCP 12.4 在 M4 的同一 4K 素材上,从点击正向追踪到界面确认完整写入,三次热态中位数由 3.682 降至 3.217 秒,缩短 12.6%。候选四轮各 285 帧均走共享缓冲。两版导出的 285 个轨迹键和全部马赛克参数一致。4K ProRes 422 LT 成片解码后 285 帧逐帧一致。[宿主验收](verification/HostVisionLUT1.21.3.json)
|
||||
|
||||
风格 LUT 浏览器右侧显示同帧划像,左侧为加载当前 LUT 前的画面,右侧预览 100% LUT。可从图上移动分界线或用底部滑杆。高清缩略图从 640×360 源帧生成双倍像素位图。FCP 已核对选中 LUT、画质切换与重开记忆、滑杆两端及画面分区变化。坐标自动化未能验证直接拖动图片,本次划像验收使用滑杆。原项目与素材不参与修改。
|
||||
|
||||
正式 PKG 已签名、公证并粘附票据。公证 `ba16473c-fcf2-4700-a7aa-df768d603724` Accepted,20 项展开验包通过,44527074 字节,SHA-256 `99872aee9e3e0a25ed17f3fb173b20b8549dd9473c6fccd3954dd09836213ff9`。待上传公测 Release 和校验下载。[验包](verification/Package1.21.3.json)
|
||||
|
||||
## 1.21.2(119)局部马赛克与蒙版分析性能
|
||||
|
||||
2026-11-08。已核对正式 1.21.1(117)与大鱼远端基线。马赛克渲染只在色键使用颜色编码,钢笔路径在局部包围范围外跳过轮廓计算,反相与色阶仍照常应用。无人脸命中时跳过全帧马赛克通道。指定目标追踪沿用原 Vision 彩色输入,仅在有可对照的起始画面时需要整帧灰度;普通蒙版与图章保留灰度输入。
|
||||
@@ -12,6 +22,10 @@ M4 的 4K 双钢笔马赛克中位数从 42.75 降到 13.84 ms,4K 目标追踪
|
||||
|
||||
正式 PKG 公证 `add05c02-616e-471f-a53a-8aa7c230ef52` Accepted,20 项展开验包、票据与 Gatekeeper 通过。包 44509704 字节,SHA-256 `01ee76d2302d0d1fc54b1ff5a3397c386467324db5f391d0b5dfd48c1e93b9df`。本机通过独立正式 APP 验收。[验包](verification/Package1.21.2.json)
|
||||
|
||||
公测 Release **416** 的附件 **62** 已发布,草稿与发布后完整下载的大小和 SHA-256 一致。标签 `v1.21.2-mosaic-tracking-20261108` 指向 `b6f73ebb666e4f72567f54515d0efd138220f7f6`,独立检出验证 822 个编译节点文件和 826 个发行节点文件。生成 APP、旧版替换备份、公证 ZIP、验收副本、恢复检出和下载副本已清理。站点文章 15792 仍记载 1.21.1,主 APP 更新通道沿用既有记录。工程文件原有 Security 引用排序差异留在工作区。[发行](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.21.2-mosaic-tracking-20261108) · [附件](verification/Release1.21.2.json) · [恢复](verification/Recovery1.21.2.json)
|
||||
|
||||
接手若继续降低普通蒙版和图章追踪延迟,先分开计量宿主供图、Metal 预处理、CPU 灰度裁切和 Vision 透视配准。目标路径可对比由 Metal 写入 Vision 可读的共享像素缓冲区,验证每帧输入、关键帧、遮挡恢复和取消。当前 4K 数字分别覆盖渲染与预处理,未计量 FCP 端到端耗时或导出。
|
||||
|
||||
## 1.21.1(117)首次示波器与人脸肤色保护
|
||||
|
||||
正式安装在 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,编译提交 `98d80970e83e30e4883a76d8f740f2fca5d05e7c`,APP 公证 `eeda9002-5e87-4a33-83d3-9163a14283ba` Accepted。票据、Gatekeeper、PluginKit 唯一路径及 1008 项正式安装原生检查通过。FCP 12.4 已从正式路径启动插件服务。17 套模板检查通过。[安装](verification/Delivery1.21.1.json)
|
||||
|
||||
在新工单中引用
屏蔽一个用户