比较提交

...
共修改 32 个文件,包含 11546 行新增和 56 行删除

没有与搜索条件相匹配的文件

+12
查看文件
@@ -0,0 +1,12 @@
大鱼调色 1.22.3(139)新增 HSL 吸管:直接点击 FCP 画面取色后,自动切换到颜色对应的 HSL 调整项,暖肤色优先进入橙色。中性色与 Esc 取消保留当前项,取色只选择颜色,不改动调色数值。主模块、独立 HSL 层及控制面板共用。
在一级调色与独立 CST 的曲线菜单中新增:
- DJI Mavic 4 Pro / 御 4 Pro(D-Log)
- DJI Pocket 4(D-Log)
- DJI Pocket 4P(D-Log)
- DJI Pocket 4P(D-Log 2)
D-Log 搭配 DJI D-Gamut,D-Log 2 搭配 DJI D-Gamut 2;曲线与色域仍独立选择。新增机型名称复用既有标准 Log 编码与解码,输入、工作和输出位置均可选,保留既有参数编号和工程默认行为。御 4 Pro 的 D-Log M 素材须使用对应的 D-Log M 处理,不能选 D-Log。
适用于 Apple Silicon Mac,macOS 14.6 或更高版本。唯一正式安装路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。本版本不修改站点文章或主 APP 更新通道。
+6
查看文件
@@ -1,5 +1,11 @@
# 大鱼调色
## 1.22.3 DJI 相机曲线与 HSL 吸管
HSL 新增“吸管”:点取画面颜色后自动进入对应八色调整项,暖肤色优先进入橙色;中性色/取消保留当前选择,调色值不变。主模块、独立层与控制面板均可用。
一级调色与独立 CST 的输入/工作/输出曲线菜单新增御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log 和 D-Log 2。D-Log 手选搭配 DJI D-Gamut,D-Log 2 搭配 DJI D-Gamut 2;仍保持曲线与色域独立。御4Pro的D-Log M素材使用相应D-Log M处理。[模式依据及ID映射](research/DJICameraCurves.md)。
## 独立效果与水平校正
在 Final Cut Pro 的「效果 → 大鱼调色」可选「大鱼调色」「一级调色」或「HSL」。独立效果打开对应模块,保留画面工具栏和控制面板,可继续添加其他调色模块。
+16
查看文件
@@ -1,3 +1,19 @@
# 2026-11-15 仿制图章与简洁主界面 1.22.2(137)
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支main。实际编译源码 `aa60572b517ba7dd8fbd9d2f0d46bd810cc3e1a6`;发行标签 `v1.22.2-clone-ui-20261115` 指向 `90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef`。已推送并读回标签,独立HTTPS检出逐字节核对986个跟踪文件、343个构建输入与实际编译节点一致,Git完整性通过,无LFS或子模块,临时检出清理。[恢复核验](verification/Recovery1.22.2.json)。
新机器恢复Git认证后克隆,以 `git switch --detach aa60572b517ba7dd8fbd9d2f0d46bd810cc3e1a6` 恢复编译源码,或检出发行标签获取对应验包记录。使用Xcode27.2、FxPlug SDK4.3.5、已安装Metal组件、Apple Silicon、macOS14.6+及锁定ColorManagement依赖。运行 `tools/deliver.py` 完成正式签名公证安装和宿主验证,再用 `Packaging/build_pkg.py` 制包。固定安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队B3W25FX5H5。证书私钥、公证profile、账号凭据独立恢复,用户LUT和宿主工程不由源码仓库恢复。
APP公证 `3179c5f6-282e-45bd-b617-929f5230a9fa`、PKG公证 `7a8baaee-a092-4c53-bd44-f5c2afe3e988` 均Accepted。正式安装签名、票据、Gatekeeper、PluginKit与启动通过,原生1037项检查通过。FCP12.4合成素材100帧跟踪、独立参考、首帧失败说明、冷重开、手工取样、撤销/重做已验证,用户手动验收图章;精简主App最终137视觉核对通过。**“最后可信帧”自动跳转在FCP12.4仍返回失败,需按显示时间手动定位**,发行说明已披露。Motion、变速及用户原始素材未复测。[交付](verification/Delivery1.22.2.json) · [宿主范围](verification/HostClone1.22.2.json) · [界面](verification/CompactUI1.22.2.json)。
正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.2.pkg`,44,570,793字节,SHA-256 `237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843`。Installer签名、公证、粘附、Gatekeeper和20项验包通过;本轮未再次运行系统安装器。[验包](verification/Package1.22.2.json)。[Release437](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.2-clone-ui-20261115) 附件72在草稿及发布后均完整下载匹配字节数与SHA-256,[下载核验](verification/Release1.22.2.json)。标签保持既有节点,不因后续验证记录提交而移动。
[文章15792](https://dayu.media/15792/)同步标题、正文、SEO及主包,WordPress附件15986;完整下载校验、认证回读、普通与新请求前台核验通过。原价格50、会员折扣0、封面分类、历史图片与安装命令保留。[文章](verification/Article1.22.2.json) · [文章包核验](verification/ArticleLink1.22.2.json)。主App更新通道未改,仍此前1.21.8(126),无服务器源码部署。
本轮临时Apple上传路由原配置已逐字节恢复,重新加载后实测回到原香港代理,私密备份删除。[上传恢复](verification/NotaryUpload1.22.2.json)。已核对范围仅固定安装匹配主ID;生成APP、旧候选备份、公证ZIP、验证下载和恢复克隆已清理,历史发行包、用户LUT及合成验收库保留。[清理](verification/Cleanup1.22.2.json)。既有工程引用排序差异仍未提交,未混入编译节点。[最新交接](开发交接.md)。
---
# 2026-11-13 微信首次扫码后端修复
仅恢复 `Backend/wp-content/themes/ripro5/inc/oauth/weixin/callback.php` 和 `Backend/wp-content/mu-plugins/dayu-color-online-luts.php`。实际生产源码节点 `0f3f14522c8e8f79893652977b8b4e0a3bae8275`,标签 `backend-wechat-login-20261113`;远程沿用 `https://dayu.media/git/dayu/dayu-color.git`。新机器恢复 Git 登录后克隆并以该完整 SHA 检出两文件,部署工具使用 main 的后续修订;无需重编或重装 APP。
+20
查看文件
@@ -0,0 +1,20 @@
# DJI 相机曲线预设(2026-11-16)
仅修改大鱼调色产品,独立大鱼CST工程未变。输入、工作与输出曲线共用 `DYCMSceneSpaces()`,因此一级调色及独立 CST 同时获得命名条目。新增 ID,既有参数编号、默认值、色域和已存工程保持原义。
| ID | 菜单 | 原有数学曲线 | 手动搭配色域 |
|---|---|---|---|
|31|DJI Mavic 4 Pro / 御 4 Pro (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|32|DJI Pocket 4 (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|33|DJI Pocket 4P (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|34|DJI Pocket 4P (D-Log 2)|12 DJI D-Log 2|28 DJI D-Gamut 2|
这是标准 Log 编码的机型命名入口,非 DJI 官方 Rec.709 风格 LUT。曲线与色域维持独立,不自动改写已手选色域。御4Pro的D-Log M素材仍须使用对应D-Log M处理,不选D-Log;本轮不借用其他机型的D-Log M标定。Pocket4P的D-Log2按实际支持拍摄模式选择。
官方依据:
- [御4Pro规格(三摄均列出D-Log、D-Log M、HLG)](https://www.dji.com/uk/mavic-4-pro/specs?set_region=GB&site=brandsite)
- [大疆模式与还原LUT表(Pocket4为D-Log,4P为D-Log和D-Log2)](https://support.dji.com/help/content?customId=01700007105&documentType=&lang=zh-CN&paperDocType=ARTICLE&re=CN&spaceId=17)
- [Pocket4P官方说明(D-Log2限1×)](https://www.dji.com/uk/osmo-pocket-4p)
验证:正式安装版原生自检覆盖四个机型条目,并在输入/工作/输出各阶段与原有通用D-Log/D-Log2比较实际Metal像素,包括非零一级曝光;宿主验收另记录,不以自动检查代替宿主实测。
+11
查看文件
@@ -0,0 +1,11 @@
# HSL 点取色(1.22.3)
入口是各 HSL 面板的“HSL 吸管”:主模块、独立 HSL 层、控制面板均复用 `DYInspector`。139使用原生 `DYToolOSC` 在 FCP 画面内点取色,由该实例当前帧的最终输出缓存经 ColorSync 转为显示 sRGB;不依赖系统取色浮层。取样复用既有320×180缓存,坐标随真实画布缩放,拒绝过时、分块及透明帧,不抓取屏幕。点击后只改变当前编辑器的八色标签与选中状态,不写参数、不创建撤销记录、不改自定义色、不改变其他层。Esc 取消保持原样。
`DYHSLPicker.h` 按圆周色相到红、橙、黄、绿、青、蓝、紫、洋红的中心距离归类。暖肤色的颜色启发式优先橙色,包含偏粉、桃色和棕色样本;这是基于颜色的选择,不做人物/人脸识别。高饱和正红仍归红色。低亮度、低色度和近灰色无可靠色相,保留当前项,并在按钮上显示中性色。
自定义 HSL 原有吸管仍仅在自定义标签下显示。新入口始终显示在 HSL 中,不再需要先切到自定义。普通面板、窄面板和横向工作区沿用动作行的自适应布局及现有色条/三轴布局。
自动验证覆盖八个颜色项、四类肤色和偏粉跨红色边界、黑白灰与无效输入,以及三个原生编辑器中的标签状态、色条互斥和参数不变。正式宿主实点与画面检查另记 `verification/HostDJIHSL1.22.3.json`,不能把自动检查替代为真人肤色识别或真实拍摄素材的色彩准确度承诺。
139以唯一请求令牌回送到发起的主模块/独立层/工作区;别的面板不改变选项。Esc 或再次按吸管取消,当前帧未就绪时保留取色状态供重试。138系统取色候选只完成加载与原生自检,实点未通过,不据此发布。
+30 -6
查看文件
@@ -94,6 +94,10 @@
"DJI D-Log",
"DJI D-Log 2",
"DJI D-Log M",
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
"DJI Pocket 4 (D-Log)",
"DJI Pocket 4P (D-Log)",
"DJI Pocket 4P (D-Log 2)",
"Fujifilm F-Log",
"Fujifilm F-Log2",
"Fujifilm F-Log2 C",
@@ -133,6 +137,10 @@
11,
12,
13,
31,
32,
33,
34,
14,
15,
16,
@@ -254,6 +262,10 @@
"DJI D-Log",
"DJI D-Log 2",
"DJI D-Log M",
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
"DJI Pocket 4 (D-Log)",
"DJI Pocket 4P (D-Log)",
"DJI Pocket 4P (D-Log 2)",
"Fujifilm F-Log",
"Fujifilm F-Log2",
"Fujifilm F-Log2 C",
@@ -293,6 +305,10 @@
11,
12,
13,
31,
32,
33,
34,
14,
15,
16,
@@ -714,6 +730,10 @@
"DJI D-Log",
"DJI D-Log 2",
"DJI D-Log M",
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
"DJI Pocket 4 (D-Log)",
"DJI Pocket 4P (D-Log)",
"DJI Pocket 4P (D-Log 2)",
"Fujifilm F-Log",
"Fujifilm F-Log2",
"Fujifilm F-Log2 C",
@@ -753,6 +773,10 @@
11,
12,
13,
31,
32,
33,
34,
14,
15,
16,
@@ -3713,16 +3737,16 @@
"sourceSHA256": {
"template/tools/dump_model.mm": "ae9c5d23b7d44f92b0358be3fc8a1e383a85f7945c6150c42e818526f185661c",
"大鱼调色/Plugin/DYCSTTypes.h": "ed5ba7e7ae35d1bba10e80a81184fa26b1f7eb582e47b2e45c3edd294889c76a",
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
"大鱼调色/Plugin/DYColorManagement.h": "22b30f18bfa609f17d12709434bb376f481154f66d3242fc52b8cec355428fad",
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
"大鱼调色/Plugin/DYManagedColor.h": "1f435e32ee8b6f74fbc6c588f3564cc794ce100d1aae821075c115b33bb24412",
"大鱼调色/Plugin/DYManagedColor.mm": "0d2527b18589f63d63d16fd64c47a70c5973994fb3841a3246631c7e836ea8e8",
"大鱼调色/Plugin/DYManagedColor.h": "36ae3c92cb0ce6ada6535e096154daeee221c6d73a8a8ee6117dc285939b22a8",
"大鱼调色/Plugin/DYManagedColor.mm": "3fbafab029c5568a8b235f615615e1278ab8c2419a6604c87278d4a6be0e61f0",
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
"大鱼调色/Plugin/DYModel.mm": "327eb427759eaac8d04de39c09c416c0c68e7cac636978c864bdd103d297aec7",
"大鱼调色/Plugin/DYModel.mm": "544937dcab852bf2dd524377c3dd7577535b4af835638596a68ca9c6db2e888c",
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
"大鱼调色/Plugin/DYToolState.h": "da71b283a5a0cc05ad8b1e554a105d0196f3283c4e31f0c5521204d74100b882",
"大鱼调色/Plugin/DYToolState.mm": "c36d2e91353f2b179be5a9df8c248ce34dbfb7e73cba913754f9d1675f2a3375",
"大鱼调色/Plugin/DYToolState.h": "0dac1087c4c5e18b43b674ff50b7be5a9b47a151401d87ca7adc1b72908bdec0",
"大鱼调色/Plugin/DYToolState.mm": "5ea14fa293a881cccd9a7f56f7126ea5d0c4f81217a788a06d94ea2825404688",
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
+10
查看文件
@@ -1,5 +1,7 @@
; Restored CST AIR instruction graph; texture sampling owned by host wrapper.
; Dayu extension ID 30: official GoPro Log600, 0 EV; legacy IDs unchanged.
; Dayu camera curve aliases 31..34: Mavic 4 Pro/Pocket 4/Pocket 4P D-Log,
; Pocket 4P D-Log 2. Gamut remains an independent user-selected parameter.
; ModuleID = '/Users/mac/Library/Caches/CodexBuilds/com.dayu.CST/analysis/cst-shader/module1.bc'
source_filename = "fragmentShader"
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-n8:16:32"
@@ -37,7 +39,11 @@ v4:
i32 9, label %v164
i32 10, label %v166
i32 11, label %v206
i32 31, label %v206
i32 32, label %v206
i32 33, label %v206
i32 12, label %v252
i32 34, label %v252
i32 13, label %v254
i32 14, label %v269
i32 15, label %v315
@@ -1670,7 +1676,11 @@ v1012: ; preds = %v990, %v987
i32 9, label %v1360
i32 10, label %v1362
i32 11, label %v1399
i32 31, label %v1399
i32 32, label %v1399
i32 33, label %v1399
i32 12, label %v1442
i32 34, label %v1442
i32 13, label %v1444
i32 14, label %v1481
i32 15, label %v1524
+53
查看文件
@@ -0,0 +1,53 @@
{
"articleID": 15792,
"url": "https://dayu.media/15792/",
"version": "1.22.2",
"build": 137,
"state": "verified",
"requestID": "dayu-color-1.22.2-b137-20261115",
"status": "publish",
"title": "大鱼调色 1.22.2 公测版|仿制图章修复与简洁主界面",
"beforeContentSHA256": "8933fef311bbb1f33f3164f60ee950d214b526b21b06f795e443801fd479b539",
"savedContentSHA256": "71f22f1bcd46cb6438ad12e04e2f857411834ae17da1e6fbe11be910d96cf4fa",
"payloadSHA256": "633e9b3bc7dabc2f1e969ac36b4641f8c92bb2c781970f2a97cac00341bb1169",
"authenticatedReadbackMatchesPayload": true,
"frontend": [
{
"request": "normal",
"status": 200,
"titleSingleAndExact": true,
"descriptionSingleAndExact": true,
"keywordsSingleAndExact": true,
"newCloneAndCompactUIRecordsPresent": true,
"historicalImagesPresent": true,
"installedAppOpenCommandPresent": true,
"paidPackageURLNotExposed": true,
"priceAndMemberDisplayPresent": true
},
{
"request": "fresh",
"status": 200,
"titleSingleAndExact": true,
"descriptionSingleAndExact": true,
"keywordsSingleAndExact": true,
"newCloneAndCompactUIRecordsPresent": true,
"historicalImagesPresent": true,
"installedAppOpenCommandPresent": true,
"paidPackageURLNotExposed": true,
"priceAndMemberDisplayPresent": true
}
],
"preserved": [
"commercial rules and member access",
"author, categories, tags, cover",
"FCPX product settings",
"SEO switches",
"six historical images",
"historical version records and installation code command"
],
"downloadVerificationReference": "verification/ArticleLink1.22.2.json",
"mainAPPUpdateChannelNotModified": true,
"knownSeekLimitationDisclosed": true,
"baselineStoredPrivately": true,
"passResult": true
}
+27
查看文件
@@ -0,0 +1,27 @@
{
"passResult": true,
"postID": 15792,
"articleURL": "https://dayu.media/15792/",
"version": "1.22.2",
"build": "137",
"originalFilename": "大鱼调色-1.22.2.pkg",
"bytes": 44570793,
"sha256": "237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843",
"fullPackageDownloadVerified": true,
"signatureVerified": true,
"stapledTicketVerified": true,
"gatekeeperVerified": true,
"resourceChanges": [
"cao_downurl",
"cao_original_filename"
],
"priceAndMemberAccessPreserved": true,
"authorCategoriesTagsAndCoverPreserved": true,
"paidPackageURLKeptOutOfPublicBody": true,
"verificationCopy": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-package-1.22.2-verified.pkg",
"attachmentID": 15986,
"downloadURL": "https://dayu.media/wp-content/uploads/2026/11/1794674439-0efe30ed79a880e.pkg",
"attachmentReadback": "Authenticated WordPress media REST limited to parent 15792",
"mainAPPUpdateChannelNotModified": true,
"downloadTemporaryCopyRemoved": true
}
+40 -1
查看文件
@@ -17,5 +17,44 @@
"generatedAppAndLoosePluginRemovedByDelivery": true,
"notarySubmissionZipRemoved": true,
"scope": "Current task generated copies identified by delivery records and bundle metadata",
"verifiedAt": "2026-11-14T16:18:27.115277+00:00"
"verifiedAt": "2026-11-14T16:44:45.617449+00:00",
"finalScopedScan": {
"roots": [
"/Library/Plug-Ins/FxPlug",
"/Applications",
"/Users/mac/Applications",
"/Users/mac/Library/Plug-Ins/FxPlug",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
"/Volumes/备份/大鱼调色",
"/Users/mac/Downloads",
"/Users/mac/Desktop"
],
"matchingOuterApps": [
{
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"version": "1.22.2",
"build": "137"
}
]
},
"verificationDownloadsAndHelperRemoved": [
"/Volumes/备份/大鱼调色-1.22.2.pkg",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-package-1.22.2-verified.pkg",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/simplify-wrapper.py"
],
"temporaryPackageInputAndRecoveryDirectoriesAbsent": true,
"originalHistoricalPackagesAndQALibraryPreserved": true,
"privateProxyBackupRemoved": true,
"finalInstalledIdentity": {
"bundleID": "com.dayu.color",
"version": "1.22.2",
"build": "137"
},
"currentProductProcesses": [
"88161 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
"88271 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
],
"uniquePluginKitRegistration": [
"com.dayu.color.XPC(1.1)\t325C3B9B-4CDA-4C3B-B517-12102A33BB05\t2026-11-14 16:14:17 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit"
]
}
+7 -1
查看文件
@@ -19,5 +19,11 @@
"finalVersion": "1.22.2",
"finalBuild": 137,
"wrapperSHA256": "ea7c4e08d1f477b13b5c50f9f2bbdb8448777a50a906f6e74b94a5b677c8d87e",
"finalWrapperMatchesVisuallyTestedBuild135": true
"finalWrapperMatchesVisuallyTestedBuild135": true,
"finalInstalled137VisualRecheck": {
"versionLabel": "1.22.2 · 137",
"fourCardsVisibleWithoutScrolling": true,
"longExplanationsMovedToHelpAndInfoSheets": true,
"scope": "Observed final installed AppKit window after package and publication checks"
}
}
文件差异过大,未显示。 加载差异
+17
查看文件
@@ -0,0 +1,17 @@
{
"sourceCommit": "f5ae4ca5eadb65a54d01dd08e717afb97133de1f",
"version": "1.22.3",
"build": "138",
"id": "a49a614a-3128-4326-b4bf-9d80c979597f",
"archive": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notarization-submission.zip",
"archiveBytes": 43362663,
"archiveSHA256": "dc5b8505f67753f73617773422f318cae6f4dd3ce5e8a161238ea5cb07e3cd56",
"observedStatus": "Accepted",
"submissionCreatedUTC": "2026-11-16T07:22:44.963Z",
"nativePreflightChecks": 1099,
"notaryResult": {
"status": "Accepted",
"message": "Processing complete",
"id": "a49a614a-3128-4326-b4bf-9d80c979597f"
}
}
文件差异过大,未显示。 加载差异
+15
查看文件
@@ -0,0 +1,15 @@
{
"passResult": true,
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"tag": "v1.22.2-clone-ui-20261115",
"releaseCommit": "90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef",
"appCompiledSource": "aa60572b517ba7dd8fbd9d2f0d46bd810cc3e1a6",
"independentHTTPSClone": true,
"trackedFilesByteMatched": 986,
"appBuildInputsByteMatched": 343,
"gitFsck": true,
"LFSObjectsRequired": false,
"submodules": false,
"tools": "Xcode 27.2, FxPlug SDK 4.3.5, installed Metal component, Apple Silicon, macOS 14.6+, locked ColorManagement dependencies",
"temporaryCloneRemovedAfterCheck": true
}
+10 -14
查看文件
@@ -3,20 +3,16 @@
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.22.1-unified-luts-20261111",
"releaseCommit": "cdf23fb4fd1863867945e528ae060522d566b457",
"releaseID": 431,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.1-unified-luts-20261111",
"assetID": 70,
"assetName": "大鱼调色-1.22.1.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.1-unified-luts-20261111/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.1.pkg",
"bytes": 44557648,
"sha256": "a5f5a335f7f1d3d8c42f829da941da75dcfd974febcc75d16cab26499c757663",
"tag": "v1.22.2-clone-ui-20261115",
"releaseCommit": "90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef",
"releaseID": 437,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.2-clone-ui-20261115",
"assetID": 72,
"assetName": "大鱼调色-1.22.2.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.2-clone-ui-20261115/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.2.pkg",
"bytes": 44570793,
"sha256": "237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843",
"existingAssetReused": true,
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
"credentialSource": "macOS Keychain: dayu-git-api",
"draftDownloadVerification": "verification/ReleaseDraftDownload1.22.1.json",
"installedAPP": "verification/Delivery1.22.1.json",
"hostAcceptance": "verification/HostUnifiedLUT1.22.1.json",
"sourceRecovery": "verification/Recovery1.22.1.json"
"credentialSource": "macOS Keychain: dayu-git-api"
}
+18
查看文件
@@ -0,0 +1,18 @@
{
"passResult": true,
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.22.2-clone-ui-20261115",
"releaseCommit": "90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef",
"releaseID": 437,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.2-clone-ui-20261115",
"assetID": 72,
"assetName": "大鱼调色-1.22.2.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.2-clone-ui-20261115/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.2.pkg",
"bytes": 44570793,
"sha256": "237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843",
"existingAssetReused": true,
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
"credentialSource": "macOS Keychain: dayu-git-api"
}
@@ -0,0 +1,13 @@
{
"releaseID": 437,
"assetID": 72,
"tag": "v1.22.2-clone-ui-20261115",
"draft": true,
"downloadedVia": "Existing authenticated Microsoft Edge session",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.2-clone-ui-20261115/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.2.pkg",
"bytes": 44570793,
"sha256": "237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843",
"pass": true,
"verificationFile": "/Volumes/备份/大鱼调色-1.22.2.pkg",
"downloadTemporaryCopyRemoved": true
}
+2
查看文件
@@ -41,6 +41,8 @@ typedef struct DYCMSettings {
#ifndef __METAL_VERSION__
#include <math.h>
static inline int DYBasisMode(int c) {
// Named D-Log camera entries share the native D-Log primary math.
if(c>=31&&c<=33)c=11;
if(c==99)return 0;if(c>=1&&c<=11)return c;
switch(c){case 14:return 12;case 15:return 13;case 16:return 14;case 19:return 15;case 20:return 16;case 21:return 17;case 22:return 18;case 25:return 19;case 27:return 20;case 28:return 21;default:return -1;}
}
+29
查看文件
@@ -15,6 +15,7 @@
#import "DYLUTLibrary.h"
#import "DYLUTBrowser.h"
#import "DYInspector.h"
#include "DYHSLPicker.h"
#import "DYTheme.h"
#include "DYSpiderState.h"
#include "DYToolGPU.h"
@@ -393,6 +394,33 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
defaults.cm.inputTransfer=1002;defaults.cm.inputGamut=22;defaults.cm.toneMapping=0;
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];Pixels neutral=render(run,renderer,source,destination,gpu,defaults,@{},@"renderer-default-pass");Difference neutralDifference=difference(input,neutral);
run.record(@"transparent-premultiplied-neutral",neutralDifference.nonfinite==0&&neutralDifference.maximum<=.001,measure(neutralDifference));
// Exercise actual GPU routes, rather than only checking menu labels.
const int djiCameraCurves[][3]={{31,11,10},{32,11,10},{33,11,10},{34,12,28}};
for(const auto &camera:djiCameraCurves){
BOOL menu=YES;for(NSString *key in @[@"cminputTransfer",@"cmworkingTransfer",@"cmoutputTransfer"]){
NSDictionary *choice=nil;for(NSDictionary *item in DYDescriptors())if([item[@"key"]isEqual:key])choice=item;
NSUInteger index=[choice[@"values"]indexOfObject:@(camera[0])];
menu&=choice&&index!=NSNotFound&&[choice[@"options"][index]containsString:@"DJI"];
}
run.record([NSString stringWithFormat:@"dji-camera-%d-menu",camera[0]],menu);
for(int stage=0;stage<3;stage++){
DYUniforms named=defaults;named.cm.configured=1;named.cm.toneMapping=0;
named.cm.inputTransfer=stage==0?camera[0]:11;named.cm.inputGamut=10;
named.cm.workingTransfer=stage==1?camera[0]:10;named.cm.workingGamut=stage==1?camera[2]:16;
named.cm.outputTransfer=stage==2?camera[0]:1002;named.cm.outputGamut=stage==2?camera[2]:22;
if(stage==0)named.cm.inputGamut=camera[2];
DYUniforms generic=named;
if(stage==0)generic.cm.inputTransfer=camera[1];
if(stage==1)generic.cm.workingTransfer=camera[1];
if(stage==2)generic.cm.outputTransfer=camera[1];
// Unsupported BASIS encodings use the existing float CST adapter.
named.cm.exposure=generic.cm.exposure=.25;
Pixels a=render(run,renderer,source,destination,gpu,named,@{},[NSString stringWithFormat:@"dji-camera-%d-stage-%d-render",camera[0],stage]);
Pixels b=render(run,renderer,source,destination,gpu,generic,@{},[NSString stringWithFormat:@"dji-camera-%d-stage-%d-reference",camera[0],stage]);
Difference delta=difference(a,b);
run.record([NSString stringWithFormat:@"dji-camera-%d-stage-%d-pixels",camera[0],stage],delta.nonfinite==0&&delta.maximum<=.002,measure(delta));
}
}
#include "DYIdlePreviewDiagnostics.inc.h"
NSString *cstReference=NSProcessInfo.processInfo.environment[@"DY_DIAGNOSTIC_CST_REFERENCE"];
if(cstReference.length){
@@ -614,6 +642,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
#include "DYPrimaryDiagnostics.inc.h"
#include "DYUnifiedDiagnostics.inc.h"
#include "DYCompactUIDiagnostics.inc.h"
#include "DYHSLPickerDiagnostics.inc.h"
#include "DYViewerParameterDiagnostics.inc.h"
#include "DYViewerControlsDiagnostics.inc.h"
#include "DYCanvasToolsDiagnostics.inc.h"
+22
查看文件
@@ -0,0 +1,22 @@
#pragma once
#include <algorithm>
#include <cmath>
// Display sRGB point -> the existing eight HSL lanes. No grading values change.
// Near-neutrals have no useful hue and keep the current selection (-1).
static inline int DYHSLPickedLane(float r,float g,float b) {
if(!std::isfinite(r)||!std::isfinite(g)||!std::isfinite(b))return -1;
r=std::clamp(r,0.f,1.f);g=std::clamp(g,0.f,1.f);b=std::clamp(b,0.f,1.f);
float high=std::max({r,g,b}),low=std::min({r,g,b}),chroma=high-low;
if(high<.025f||chroma<.015f||chroma/high<.06f)return -1;
float hue=high==r?(g-b)/chroma:high==g?(b-r)/chroma+2:(r-g)/chroma+4;
hue*=60;if(hue<0)hue+=360;
float saturation=chroma/high;
// Warm, less saturated pink/peach/brown points take precedence over red/yellow.
// This is a colour heuristic, not face/person detection; saturated red stays red.
if((hue<=52||hue>=345)&&r>g&&r>b&&g>=b-.08f&&saturation>=.08f&&saturation<=.72f)return 1;
const float centers[]={0,30,60,120,180,240,270,315};
int best=0;float closest=360;
for(int lane=0;lane<8;lane++){float distance=std::fabs(hue-centers[lane]);distance=std::min(distance,360-distance);if(distance<closest){closest=distance;best=lane;}}
return best;
}
@@ -0,0 +1,36 @@
// Classifier boundaries and real native inspector selection, without opening a sampler.
{
const float points[][4]={{1,.04,.02,0},{1,.5,.02,1},{.95,.9,.02,2},{.03,.8,.05,3},{.02,.8,.8,4},{.02,.12,.9,5},{.55,.08,.95,6},{.95,.04,.6,7},
{.95,.8,.79,1},{.91,.7,.73,1},{.74,.46,.44,1},{.65,.42,.28,1},{.27,.16,.12,1},{.5,.5,.5,-1},{1,1,1,-1},{0,0,0,-1},{.5,.49,.48,-1},{NAN,.3,.2,-1}};
for(unsigned i=0;i<sizeof(points)/sizeof(points[0]);i++)run.record([NSString stringWithFormat:@"hsl-picker-colour-%02u",i],DYHSLPickedLane(points[i][0],points[i][1],points[i][2])==(int)points[i][3]);
DYDiagnosticManager *pickHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(pickHost,nil);
NSMutableDictionary *pickDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSDictionary *pickLayer=DYInsertTool(pickDoc,@"hsl",@"base:hsl");DYWriteTools(pickHost,pickDoc,kCMTimeZero);
DYToolManager *pickProxy=[[[DYToolManager alloc]initWithHost:pickHost node:pickLayer]autorelease];
NSArray *pickEditors=@[[[[DYInspector alloc]initWithAPIManager:pickHost]autorelease],[[[DYInspector alloc]initWithAPIManager:pickProxy]autorelease],[[[DYInspector alloc]initWithAPIManager:pickHost renderer:nil workspaceType:@"hsl"]autorelease]];
// Selection delivery is token-bound; a result for another editor is ignored.
NSDictionary *pickBefore=[[pickHost->_values copy]autorelease];NSData *pickTools=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(pickHost,kCMTimeZero) requiringSecureCoding:YES error:nil];
for(NSUInteger editorIndex=0;editorIndex<pickEditors.count;editorIndex++){
DYInspector *editor=pickEditors[editorIndex];editor.frame=NSMakeRect(0,0,424,780);[editor refresh];[editor layoutSubtreeIfNeeded];
[(id)editor performSelector:@selector(selectHSLColor:) withObject:[NSColor colorWithSRGBRed:.02 green:.12 blue:.9 alpha:1]];
BOOL blue=[[(NSDictionary*)[editor valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==5;
[(id)editor performSelector:@selector(selectHSLColor:) withObject:[NSColor colorWithSRGBRed:.95 green:.8 blue:.79 alpha:1]];
BOOL skin=[[(NSDictionary*)[editor valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==1;
[(id)editor performSelector:@selector(selectHSLColor:) withObject:[NSColor colorWithSRGBRed:.5 green:.5 blue:.5 alpha:1]];
[(id)editor performSelector:@selector(selectHSLColor:) withObject:nil];
BOOL retained=[[(NSDictionary*)[editor valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==1,button=NO,swatch=NO;
for(NSDictionary *card in [editor valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){
for(NSView *row in card[@"body"]){if([row.identifier isEqual:@"hslPickerControls"])button=[(NSButton*)row.subviews.firstObject action]==@selector(sampleHSLLane:);
if([row.identifier isEqual:@"hslTabs"]){swatch=YES;for(NSButton *b in row.subviews)swatch&=(b.state==(b.tag==1?NSControlStateValueOn:NSControlStateValueOff));}}
}
run.record([NSString stringWithFormat:@"hsl-picker-native-editor-%lu",(unsigned long)editorIndex],blue&&skin&&retained&&button&&swatch);
}
DYInspector *firstPicker=pickEditors[0],*otherPicker=pickEditors[1];
[firstPicker performSelector:@selector(sampleHSLLane:) withObject:nil];
NSString *pickToken=[[[firstPicker valueForKey:@"hslPickerToken"]copy]autorelease];
[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerResult" object:pickHost userInfo:@{@"token":@"unrelated",@"color":NSColor.blueColor}];
BOOL unrelated=[[(NSDictionary*)[firstPicker valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==1&&[[firstPicker valueForKey:@"hslPickerToken"]isEqual:pickToken];
[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerResult" object:pickHost userInfo:@{@"token":pickToken,@"color":NSColor.blueColor}];
run.record(@"hsl-picker-result-only-routes-to-requesting-editor",unrelated&&[[(NSDictionary*)[firstPicker valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==5&&[[(NSDictionary*)[otherPicker valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==1&&![firstPicker valueForKey:@"hslPickerToken"]);
NSData *pickAfter=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(pickHost,kCMTimeZero) requiringSecureCoding:YES error:nil];
run.record(@"hsl-picker-only-selects-no-grading-or-undo-write",[pickBefore isEqual:pickHost->_values]&&[pickTools isEqual:pickAfter]&&pickHost->_undoStarts==0);
}
+34 -2
查看文件
@@ -2,6 +2,7 @@
#import "DYManagedColorPanel.h"
#import "DYManagedColor.h"
#import "DYInspector.h"
#include "DYHSLPicker.h"
#import "../Shared/DYBetaDiagnostics.h"
#import "DYModel.h"
#import "DYToolState.h"
@@ -495,6 +496,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
NSMutableDictionary *_assetButtons;
NSMutableArray *_graphics;
NSColorSampler *_sampler;
NSString *_hslPickerToken;
DYRenderer *_renderer;
DYLUTLibrary *_library;
DYLUTBrowser *_browser;
@@ -580,6 +582,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
else [self addSubview:_document];
if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];}
[self buildCards];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(hslPickerResult:) name:@"DYHSLPickerResult" object:_embedded?[(DYToolManager*)_manager host]:_manager];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil];
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
@@ -610,7 +613,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
DYBetaSpanEnd(beta,nil);return self;
}
- (void)dealloc {
_tearingDown=YES;[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[self spiderGesture:NO];[_workspace close];[_workspace release];[_workspaceButton release];[_workspaceSelectedNode release];
_tearingDown=YES;
if(_hslPickerToken)[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:_embedded?[(DYToolManager*)_manager host]:_manager userInfo:@{@"token":_hslPickerToken,@"cancel":@YES}];[_hslPickerToken release];[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[self spiderGesture:NO];[_workspace close];[_workspace release];[_workspaceButton release];[_workspaceSelectedNode release];
for(id graphic in _graphics)[graphic setDelegate:nil];
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
[[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
@@ -747,6 +751,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[card addSubview:actions];[body addObject:actions];
}
if([key isEqual:@"hsl"]) {
DYFlippedView *pickActions=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];pickActions.identifier=@"hslPickerControls";
NSButton *autoPicker=DYButton(@"HSL 吸管",self,@selector(sampleHSLLane:));autoPicker.identifier=@"hslLanePicker";autoPicker.toolTip=@"点击画面取色,自动切换到对应颜色;肤色优先进入橙色。Esc 取消。";autoPicker.accessibilityLabel=@"HSL 吸管";
[pickActions addSubview:autoPicker];[card addSubview:pickActions];[body addObject:pickActions];
DYFlippedView *tabs=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];tabs.identifier=@"hslTabs";
for(NSInteger i=0;i<9;i++){DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=i<8?[NSColor colorWithSRGBRed:((double[]){1,1,1,.15,0,0,.75,1})[i] green:((double[]){.2,.55,.84,.76,.76,.47,.15,.15})[i] blue:((double[]){.25,.12,0,.25,.8,1,.9,.65})[i] alpha:1]:DYAccent();b.title=@"";if(i==8)b.identifier=@"customColorSwatch";b.tag=i;b.target=self;b.action=@selector(tabChanged:);b.state=i==0?NSControlStateValueOn:NSControlStateValueOff;b.accessibilityLabel=[@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红",@"自定义"][i] stringByAppendingString:@" HSL"];[tabs addSubview:b];}
[card addSubview:tabs];[body addObject:tabs];
@@ -907,7 +914,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
CGFloat rh=[self heightForRow:row];row.frame=NSMakeRect(12,rowY,cw-24,rh-1);rowY+=rh;
if([row.identifier isEqual:@"primaryBalance"])for(NSView *v in row.subviews)v.frame=row.bounds;
if([row.identifier hasPrefix:@"heading:"])for(NSView *v in row.subviews)v.frame=NSMakeRect(3,7,row.bounds.size.width-6,18);
if([row.identifier isEqual:@"autoControls"]||[row.identifier isEqual:@"sampleControls"]) {
if([row.identifier isEqual:@"autoControls"]||[row.identifier isEqual:@"sampleControls"]||[row.identifier isEqual:@"hslPickerControls"]) {
CGFloat buttonWidth=(row.bounds.size.width-4*(row.subviews.count-1))/MAX((NSUInteger)1,row.subviews.count);NSInteger i=0;
for(NSView *button in row.subviews)[button setFrame:NSMakeRect((buttonWidth+4)*i++,3,buttonWidth,25)];
}
@@ -1528,6 +1535,31 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
- (void)autoWhiteBalance:(id)sender { if(_embedded){[self writeGraphicValues:DYAutoWhiteBalance([_renderer preview])];return;}[[NSNotificationCenter defaultCenter]postNotificationName:@"DYAutoWhiteBalance" object:_manager]; }
- (void)sampleWhiteBalance:(id)sender { [self sampleColorForWhiteBalance:YES]; }
- (void)sampleCustomColor:(id)sender { [self sampleColorForWhiteBalance:NO]; }
- (void)selectHSLColor:(NSColor *)sample {
NSColor *color=[sample colorUsingColorSpace:NSColorSpace.sRGBColorSpace];if(!color)return;
NSInteger lane=DYHSLPickedLane(color.redComponent,color.greenComponent,color.blueComponent);
if(lane>=0)_tabs[@"hsl"]=@(lane);
for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"hsl"]){
for(NSView *row in card[@"body"]){
if([row.identifier isEqual:@"hslTabs"])for(NSButton *swatch in row.subviews)swatch.state=swatch.tag==[_tabs[@"hsl"]integerValue]?NSControlStateValueOn:NSControlStateValueOff;
if([row.identifier isEqual:@"hslPickerControls"]){NSButton *button=row.subviews.firstObject;button.title=lane<0?@"HSL 吸管 · 中性色":[@"HSL 吸管 · " stringByAppendingString:@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红"][lane]];button.accessibilityValue=lane<0?@"中性色,保留当前颜色":@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红"][lane];}
}
}
[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
}
- (void)hslPickerResult:(NSNotification *)note {
if(![_hslPickerToken isEqual:note.userInfo[@"token"]])return;
[_hslPickerToken release];_hslPickerToken=nil;
for(NSDictionary *card in _cards)for(NSView *row in card[@"body"])if([row.identifier isEqual:@"hslPickerControls"])[(NSButton*)row.subviews.firstObject setTitle:@"HSL 吸管"];
[self selectHSLColor:note.userInfo[@"color"]];
}
- (void)sampleHSLLane:(id)sender {
id host=_embedded?[(DYToolManager*)_manager host]:_manager;
if(_hslPickerToken){[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken,@"cancel":@YES}];return;}
_hslPickerToken=[NSUUID.UUID.UUIDString copy];
for(NSDictionary *card in _cards)for(NSView *row in card[@"body"])if([row.identifier isEqual:@"hslPickerControls"])[(NSButton*)row.subviews.firstObject setTitle:@"点击画面取色 · Esc 取消"];
[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken}];
}
- (void)sampleColorForWhiteBalance:(BOOL)whiteBalance {
if(_sampler)return;
_sampler=[[NSColorSampler alloc]init];
+4
查看文件
@@ -31,6 +31,10 @@ NSArray<NSDictionary *> *DYCMSceneSpaces(void) { return @[
@{ @"id":@11, @"name":@"DJI D-Log" },
@{ @"id":@12, @"name":@"DJI D-Log 2" },
@{ @"id":@13, @"name":@"DJI D-Log M" },
@{ @"id":@31, @"name":@"DJI Mavic 4 Pro / 御 4 Pro (D-Log)" },
@{ @"id":@32, @"name":@"DJI Pocket 4 (D-Log)" },
@{ @"id":@33, @"name":@"DJI Pocket 4P (D-Log)" },
@{ @"id":@34, @"name":@"DJI Pocket 4P (D-Log 2)" },
@{ @"id":@14, @"name":@"Fujifilm F-Log" },
@{ @"id":@15, @"name":@"Fujifilm F-Log2" },
@{ @"id":@16, @"name":@"Fujifilm F-Log2 C" },
+20 -2
查看文件
@@ -24,13 +24,14 @@
@implementation DYPlugIn {
DYRenderer *_renderer;
NSColorSampler *_canvasSampler;
NSString *_hslPickerToken;
BOOL _copyAnalyzed;
std::atomic_bool _betaFirstRenderStarted,_modelRefreshPending;
#include "DYToolHostIvars.inc.h"
}
#include "DYToolHostMethods.inc.h"
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;}
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_renderer release];[super dealloc];}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];[n addObserver:self selector:@selector(canvasHSLRequested:) name:@"DYHSLPickerRequest" object:manager];}DYBetaSpanEnd(beta,nil);return self;}
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_hslPickerToken release];[_canvasSampler release];[_renderer release];[super dealloc];}
- (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;}
- (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);}
- (NSSet<Class>*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];}
@@ -106,6 +107,23 @@
if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
}];
}
- (BOOL)canvasHSLSampling {@synchronized(self){return _hslPickerToken.length>0;}}
- (void)finishCanvasHSLWithColor:(NSColor *)color {
NSString *token=nil;@synchronized(self){token=[_hslPickerToken autorelease];_hslPickerToken=nil;}
if(!token)return;
NSDictionary *payload=color?@{@"token":token,@"color":color}:@{@"token":token};
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerResult" object:self->_apiManager userInfo:payload];});
}
- (void)canvasHSLRequested:(NSNotification *)note {
NSString *token=note.userInfo[@"token"];if(![token isKindOfClass:NSString.class]||!token.length)return;
if([note.userInfo[@"cancel"]boolValue]){@synchronized(self){if(![_hslPickerToken isEqual:token])return;}[self finishCanvasHSLWithColor:nil];return;}
[self finishCanvasHSLWithColor:nil];@synchronized(self){_hslPickerToken=[token copy];}
}
- (void)selectCanvasHSLAtPoint:(NSPoint)point atTime:(CMTime)time {
NSColor *color=[_renderer canvasColorAtPoint:point atTime:time];
if(color)[self finishCanvasHSLWithColor:color];
// A stale/partial/transparent frame keeps the request armed for a fresh click.
}
- (void)applyCanvasWhiteBalance:(NSDictionary*)values atTime:(CMTime)time {
id<FxCustomParameterActionAPI_v4> action=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
if(!action)return;
+3
查看文件
@@ -3,7 +3,10 @@
#import <FxPlug/FxPlugSDK.h>
#import "DYUniforms.h"
#import "DYToolState.h"
@class NSColor;
@interface DYRenderer : NSObject
/// Current final-output sample in display sRGB; nil for stale/transparent frames.
- (NSColor *)canvasColorAtPoint:(NSPoint)point atTime:(CMTime)time;
/// Decode and upload before committing a host parameter. The renderer retains
/// the immutable selected contents independently of the thumbnail cache.
- (NSProgress *)prepareLUTPath:(NSString *)path completion:(void (^)(NSError *error))completion;
+10
查看文件
@@ -41,6 +41,16 @@
- (NSData *)canvasHistogramAtTime:(CMTime)time {
return [self finalSampleAtTime:time].canvasHistogram;
}
- (NSColor *)canvasColorAtPoint:(NSPoint)point atTime:(CMTime)time {
if(!std::isfinite(point.x)||!std::isfinite(point.y)||point.x<0||point.x>1||point.y<0||point.y>1)return nil;
DYScopeSample *sample=[self finalSampleAtTime:time];if(!sample||![sample.metadata[@"wholeImage"]boolValue])return nil;
auto reference=[sample displayReferenceWithProfile:[self scopeProfileForSpace:sample.space]];
if(!reference->converted||reference->pixels.size()!=dyscope::Width*dyscope::Height)return nil;
size_t x=MIN(dyscope::Width-1,(size_t)(point.x*dyscope::Width)),y=MIN(dyscope::Height-1,(size_t)(point.y*dyscope::Height));
const auto &p=reference->pixels[y*dyscope::Width+x];
if(!std::isfinite(p.r)||!std::isfinite(p.g)||!std::isfinite(p.b)||p.a<=1e-6f)return nil;
return [NSColor colorWithSRGBRed:std::clamp(p.r,0.f,1.f) green:std::clamp(p.g,0.f,1.f) blue:std::clamp(p.b,0.f,1.f) alpha:1];
}
- (DYColorProfile *)scopeProfileForSpace:(CGColorSpaceRef)space {
if(!space)return nil;
@synchronized(_scopeProfileLock){
@@ -3,6 +3,9 @@ static const NSInteger DYCloneReferencePart=8;
@class DYPlugIn;
static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static dispatch_once_t once;dispatch_once(&once,^{map=[[NSMapTable strongToWeakObjectsMapTable]retain];});return map;}
@interface DYPlugIn (ToolCanvas)
- (BOOL)canvasHSLSampling;
- (void)selectCanvasHSLAtPoint:(NSPoint)point atTime:(CMTime)time;
- (void)finishCanvasHSLWithColor:(NSColor *)color;
- (DYViewerParameterBridge*)viewerParameterBridge;
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
+17 -7
查看文件
@@ -5,6 +5,7 @@
@implementation DYToolOSC {
id<MTLDevice> _device;id<MTLCommandQueue> _queue;CIContext *_context;
DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;BOOL _maskCapturing;DYPlugIn *_maskCaptureOwner;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics;
BOOL _hslSampling;
BOOL _stampHasSource,_stampDragging,_stampSaving,_stampNeedsRedraw;
NSPoint _stampSource,_stampStart,_stampEnd;
NSString *_stampFailure,*_levelFailure;
@@ -58,7 +59,7 @@
@synchronized(self){
self->_levelSaving=NO;
if(self->_viewerControls.bridge!=bridge)return;
[self updateLevelFrom:plugin];[self restoreLevelReference];
[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];[self restoreLevelReference];
self->_levelFailure=[failure copy];
}
}];
@@ -213,10 +214,11 @@
id<FxOnScreenControlAPI_v4>api=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;
DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil;
[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time];
[self updateLevelFrom:plugin];
[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];
if(_levelMode)mask=nil;
if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){
NSRect region=mask||_viewerControls.stampArmed||_levelMode?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
if(_hslSampling)region=NSIntegralRect(NSUnionRect(region,[self hslPickerRect]));
if(NSIsEmptyRect(region)){[commands commit];[commands waitUntilCompleted];return;}
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)NSWidth(region) pixelsHigh:(NSInteger)NSHeight(region) bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)NSWidth(region)*4 bitsPerPixel:32]autorelease];
if(!bitmap){[commands commit];[commands waitUntilCompleted];return;}
@@ -241,13 +243,16 @@
for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];}
}
}if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw];
if(_hslSampling){NSRect prompt=[self hslPickerRect];DYDrawSoftControl(prompt,4,NO,NO,NO);[@"HSL 吸管:点击画面取色 · Esc 取消" drawInRect:NSInsetRect(prompt,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale]}];}
[NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil];
}[commands commit];[commands waitUntilCompleted];
}}}
- (NSRect)hslPickerRect {return NSMakeRect(NSMinX(_imageRect)+12*_uiScale,MAX(NSMinY(_imageRect)+4*_uiScale,NSMaxY(_imageRect)-100*_uiScale),MIN(370*_uiScale,MAX(1.,NSWidth(_imageRect)-24*_uiScale)),28*_uiScale);}
- (NSInteger)partAtPoint:(NSPoint)point {
BOOL drawing=[_mask[@"drawing"]boolValue];
if(drawing&&!_levelMode)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit;
if(_hslSampling)return NSPointInRect(point,_imageRect)?10030:0;
if(_levelMode){
if(_levelPlaced)for(NSInteger i=0;i<2;i++){NSPoint endpoint=[self canvasDisplayPoint:_level.toOutput(i?_levelLast:_levelFirst)];if(hypot(point.x-endpoint.x,point.y-endpoint.y)<=12*_uiScale)return 10016+i;}
return NSPointInRect(point,_imageRect)?10015:0;
@@ -269,11 +274,16 @@
for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];}
if(p.kind==DYMaskBezier||p.kind==DYMaskLinearGradient||[_outline containsPoint:point])return 1;return 0;
}
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
- (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){
DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);
if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;}
[self updateLevelFrom:plugin];
[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];
if(_hslSampling){
if(type==NSEventTypeKeyDown&&key==27){[plugin finishCanvasHSLWithColor:nil];_hslSampling=NO;return YES;}
if(type==NSEventTypeLeftMouseDown&&part==10030){[plugin selectCanvasHSLAtPoint:[self clampedDisplayUV:canvasPoint] atTime:time];_hslSampling=[plugin canvasHSLSampling];return YES;}
if(type==NSEventTypeLeftMouseUp&&part==10030)return YES;
}
if(_stampSaving)return YES;
if([self handleLevelEvent:type point:canvasPoint part:part key:key time:time plugin:plugin])return YES;
if(!_viewerControls.stampArmed)[self clearStampCreation];
@@ -325,7 +335,7 @@
if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){
[self updateLevelFrom:plugin];
[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevelState:@{} plugin:plugin];}
else if(_viewerControls.levelMeasureRequested){_viewerControls.levelMeasureRequested=NO;NSMutableDictionary *state=[NSMutableDictionary dictionaryWithDictionary:_levelState?:@{}];state[@"levelMeasureOnly"]=@(![state[@"levelMeasureOnly"]boolValue]);[self commitLevelState:state plugin:plugin];}
else if(_viewerControls.levelDirectionRequested){_viewerControls.levelDirectionRequested=NO;if(_levelPlaced)[self commitLevelReference:plugin];}
@@ -342,10 +352,10 @@
- (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;}
- (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;}
- (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015||part==10030)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){
_levelLast=_level.toSource([self clampedDisplayUV:point]);redraw=YES;
}else if(!_levelMode&&[mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];
if(update)*update=redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO;
if(update)*update=_hslSampling||redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO;
}}
- (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];}
- (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}}
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.22.2</string>
<string>1.22.3</string>
<key>CFBundleVersion</key>
<string>137</string>
<string>139</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.22.2</string>
<string>1.22.3</string>
<key>CFBundleVersion</key>
<string>137</string>
<string>139</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+27 -19
查看文件
@@ -1,36 +1,44 @@
# 大鱼调色开发交接
更新于2026-11-15(Asia/Shanghai)。
更新于2026-11-16(Asia/Shanghai)。
## 当前任务与正式安装
## 本轮进行中:DJI 相机曲线预设与 HSL 吸管
继续完成仿制图章修复的发行,并按用户截图精简主App。正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,版本 **1.22.2(137)**,主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 `B3W25FX5H5`。
用户新增目标:HSL增加点取色吸管,按颜色切换八色调整项,暖肤色优先进入橙色;138的系统取色浮层未通过自动化实点,改为139原生OSC画面点取色,复用当前帧的显示sRGB缓存,拒绝过时/分块/透明帧,Esc或再次点击取消,令牌只回送发起面板;覆盖偏粉/桃色/棕色的肤色点,主模块/独立层/工作区共用,灰色或取消保留选择,不写调色值。
实际编译源码 `aa60572b517ba7dd8fbd9d2f0d46bd810cc3e1a6` 已推送核验。Release构建、签名、Apple公证Accepted、票据、Gatekeeper、正式安装与启动完成,安装版1037项原生自检通过。[交付](verification/Delivery1.22.2.json) · [原生自检](verification/InstalledSelfTest1.22.2.json)。
相机预设目标仅为大鱼调色的一级调色与独立 CST。基线 `883f680ade8706b8b89580ddc77c062a9a14dd39` 已回读远端一致;既有 Xcode 引用排序差异保留,不纳入本轮。新增稳定曲线 ID 31–34:御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log/D-Log 2,分别复用既有 11/12 的 GPU 解码与编码。色域仍独立选择:D-Log 配 DJI D-Gamut,D-Log 2 配 DJI D-Gamut 2。未将 D-Log M 冒充为 D-Log;本轮不新增无公开数学依据的御 4 Pro 专用 D-Log M 标定。版本准备为 1.22.3(139),138只作已公证候选,不发布安装包。已加入输入/工作/输出 GPU 对比检查;模板重建与静态检查通过。首次构建发现诊断引用了未导出的私有函数,已改为经正式参数描述表检查菜单;继承的失效 SDKROOT 已用当前 Xcode SDK 环境修正。首轮像素自检发现 ID31–33 在工作曲线位置需映射到原生 D-Log BASIS,已修复,输入与输出阶段此前通过;失败诊断保留在固定缓存 `dji-alias-working-first-failure.json`。修复后 Release 自检1099项全过,新增62项全过,相机12组像素对比误差为0。实际编译 `f5ae4ca5eadb65a54d01dd08e717afb97133de1f`;Apple公证原提交 `a49a614a-3128-4326-b4bf-9d80c979597f` 已 Accepted,138 正式安装版1099项自检全过;FCP12.4已加载138且三项目导入无警告,HSL按钮/色条可见,自动化无法操作系统取色浮层,正在请求实际鼠标核验。原提交,ZIP摘要见 `verification/NotarySubmission1.22.3.json`,不重复上传。待完成宿主菜单/实点验收、PKG 与 Release 附件校验。此前 1.22.2 仍为当前正式安装。
## 本轮功能与验收
- 仿制图章新增纯色取样随动、独立参考框、手工关键帧和失败原因保存。FCP12.4合成素材完成100帧跟踪,绿色参考框保持黄色修复范围;双向首帧失败、冷重开、手工取样、撤销/重做已实测。用户确认“我已手动验收,你给的素材目前测试印章可用”。[FCP验收范围](verification/HostClone1.22.2.json) · [135详细观察](verification/HostClone135.json)。
- 主App改为在线LUT、插件连接、版本更新和诊断四张紧凑卡片。移除功能宣传与重复说明,帮助/权限与预览/隐私改为按需弹窗,登录后收起重复登录入口,空闲时收起进度条及不可用安装按钮。[界面验证](verification/CompactUI1.22.2.json)。
- 修复Metal重复自动编译,并从Xcode已安装组件定位编译工具。当前Xcode27.2,完整构建经 `tools/deliver.py` 正常入口通过。
- 已修正手工取样与旋转随动的检查断言,以及验收程序旧快照生命周期问题。保留首次失败证据与后续检查点。
## 当前结果
## 发行进度
本轮完成仿制图章修复发行,并按用户截图精简主App。唯一正式安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,**1.22.2(137)**;主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队 `B3W25FX5H5`。Release构建、签名、Apple公证Accepted、票据、Gatekeeper、正式安装与启动完成。正式安装版1037项原生自检通过。[交付](verification/Delivery1.22.2.json) · [自检](verification/InstalledSelfTest1.22.2.json)。
APP137已正式安装并获用户验收。PKG已签名、公证Accepted、粘附及Gatekeeper通过,20项验包完成,44,570,793字节,SHA-256 `237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843`(完整值以验包记录为准)。[验包](verification/Package1.22.2.json)。对应Git标签/Release附件完整下载、文章15792及线上安装包更新仍待完成。文章草稿 [Packaging/article-1.22.2.json](Packaging/article-1.22.2.json) 已纳入简洁界面及实际定位限制,发布前回读现网基线。
实际编译源码 `aa60572b517ba7dd8fbd9d2f0d46bd810cc3e1a6`。发行标签 `v1.22.2-clone-ui-20261115` → `90ca0f4a08ecd8481a2e736f50ede2fa0fd2f1ef`。源码/标签已推送回读;独立HTTPS克隆核对986个跟踪文件及343个构建输入,Git完整性通过,无LFS/子模块。[远端恢复](verification/Recovery1.22.2.json)。
134、135、136为本轮候选,均有独立候选记录。137验收后已清理可确认的旧APP备份与构建APP,正式位置核验记录见 [清理](verification/Cleanup1.22.2.json)。
## 功能与验收
Apple公证临时直连仅限两条官方S3域名。APP/PKG完成后已逐字节恢复原配置,重新加载并实测新连接使用原香港代理出口,Rule模式及系统HTTP代理保持,私密备份已清理。[公证与恢复](verification/NotaryUpload1.22.2.json)。
- 仿制图章支持纯色取样随动、独立参考框、手工关键帧与失败原因保存。FCP12.4合成素材完成100帧跟踪;双向首帧失败、冷重开、手工取样、撤销/重做已实测。用户确认“我已手动验收,你给的素材目前测试印章可用”。[FCP验收范围](verification/HostClone1.22.2.json) · [135详细观察](verification/HostClone135.json)。
- 主App收拢为在线LUT、插件连接、版本更新和诊断四张卡片;删除宣传与重复长说明。帮助/权限与预览/隐私按需弹窗,登录后收起重复登录入口,空闲时隐藏进度条和不可用安装按钮。最终137界面四卡完整可见。[界面验证](verification/CompactUI1.22.2.json)。
- 修复Metal重复自动编译,并从Xcode已安装组件定位编译工具;当前Xcode27.2,完整构建经 `tools/deliver.py` 正常入口通过。修正手工取样/旋转随动的检查断言及旧快照生命周期,首次失败与候选记录保留。
## 已知限制与跟进
## 发行与上线
FCP12.4中“最后可信帧”自动跳转未通过。136和137日志均显示输入/时间线3.960秒,接口存在而返回NO,未给错误。137已将跳转排到参数读取结束后,真实宿主仍返回失败。界面显示精确片段时间供手动定位,文章据此说明。用户已验收图章修复本身,按此范围继续发行。Motion、变速片段及原始用户素材本轮未复测。
正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.2.pkg`,44,570,793字节,SHA-256 `237baadbdfdfdf77de8529e9e05602f1ddecf5943f44d0fe80ae0a4c3eef5843`。Developer ID Installer签名、公证Accepted、票据与Gatekeeper通过,20项结构/载荷验包通过。本轮未再次运行系统安装器;APP已有独立正式安装与宿主验收。[验包](verification/Package1.22.2.json)。
既有Xcode工程引用排序差异保留在工作区,未混入本轮提交。构建版本与发布标签分别记录。
[Release437](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.2-clone-ui-20261115) 附件72已发布,草稿和发布后均完整下载核对字节数与SHA-256。[草稿下载](verification/ReleaseDraftDownload1.22.2.json) · [Release核验](verification/Release1.22.2.json)。
## 工程与恢复入口
[文章15792](https://dayu.media/15792/)已更新1.22.2(137)标题、正文、SEO与主下载,WordPress附件15986。安装包完整下载并核验签名、票据、Gatekeeper及摘要;认证回读、普通与新请求前台均通过。原价格50、会员折扣0、封面/分类/历史六张图片与安装命令保留。[文章](verification/Article1.22.2.json) · [包链接](verification/ArticleLink1.22.2.json)。**主App更新通道本轮未改,仍为此前1.21.8(126)**;没有后端源码部署。
工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支 `main`,远程 `https://dayu.media/git/dayu/dayu-color.git`。交付 `tools/deliver.py`,制包 `Packaging/build_pkg.py`,Release `Packaging/publish_release.py`。普通源码与记录按共享仓库锁提交推送,安装包作为Release附件。
临时Apple上传路由已逐字节恢复并重新加载,新连接实测回到原香港代理;Rule模式与HTTP代理保持,私密备份清理。[公证与恢复](verification/NotaryUpload1.22.2.json)。本轮生成APP、旧候选备份、公证ZIP、恢复检出和下载校验副本已清理;已检查范围内仅正式安装匹配主ID。历史发行包、用户LUT及合成验收库保留。[清理范围](verification/Cleanup1.22.2.json)。
[恢复说明](RECOVERY.md) · [此前完整交接](research/HandoffHistory-20261114-before-clone-release.md)。本轮阶段历史保留于Git检查点和对应候选验证记录。凭据、私密代理配置和签名私钥保留在各自安全位置。
## 已知限制与下一步
FCP12.4的“最后可信帧”自动跳转未通过。136/137均在输入与时间线3.960秒、接口存在时返回NO且无错误;137虽延后至参数动作结束仍失败。界面给出精确片段时间供手动定位,发布说明已披露。用户验收图章修复本身,按此范围完成发行。后续若继续修复,应从真实宿主的时间转换及命令调用行为排查,不能以原生模拟检查代替宿主成功。Motion、变速片段及原始用户素材本轮未复测。
既有Xcode工程引用排序差异仍留工作区,未混入本轮提交。图章合成验收资料在固定构建缓存 `fcp-qa/clone-1.22.2/` 及 `fcp-qa/大鱼调色_验收.fcpbundle`,保留供后续检查。
## 工程入口
工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支 `main`,远程 `https://dayu.media/git/dayu/dayu-color.git`。交付 `tools/deliver.py`,制包 `Packaging/build_pkg.py`,Release `Packaging/publish_release.py`。源码与记录使用共享仓库锁提交推送;安装包仅存Release附件。[恢复说明](RECOVERY.md) · [此前交接归档](research/HandoffHistory-20261114-before-clone-release.md)。凭据、代理配置、签名私钥保留原安全位置。
139的宿主桥实际文件名为 `大鱼调色/Plugin/DYPlugIn.mm`,按 Git 大小写核对后单独纳入检查点;后续实际编译来源以包含该实现的完整节点为准。