diff --git a/README.md b/README.md index f472c86..e857c72 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,18 @@ # 大鱼调色 -原生 FxPlug 4 调色器,当前正式安装版本 **1.4.2(31)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 +原生 FxPlug 4 调色器,当前正式安装版本 **1.4.3(33)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 + +## 蒙版折叠与标题标记 + +蒙版面板随所属模块一起折叠,展开后恢复已有控件。标题栏蒙版按钮旁显示已添加的蒙版数量,无蒙版时隐藏标记;原模块与独立叠层分别计数,已停用的蒙版也计入数量。标记在折叠后仍可见,不改变蒙版和轨迹。 + +1.4.3正式路径293项既有原生检查通过;FCP12.4验证原模块、独立层、删除到零/撤销、折叠后数量标记及冷重开,完整预设逐字节一致。当前用户设置中的286个轨迹键保留。见[本轮宿主验收](verification/HostMaskFolding1.4.3.json)。 ## 1.4.2 跟踪修复 中间帧启动直接使用宿主分析首帧,预览缓存缺失或陈旧不会阻止开始。真实素材的细纹运动采样和拟合容差已调整,仍保留可信度与错误变换保护。失跟说明原因与保留帧数;正常取消标记结束宿主后台任务。单帧跟踪会把源时间转换到时间线位置,支持片段前有其它内容时连续操作。 -正式路径293项原生检查和19项独立CPU/Metal跟踪检查通过。FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。 +1.4.2的293项原生检查和19项独立CPU/Metal跟踪检查通过。该版FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。 ## 色彩管理与一级调色 diff --git a/RECOVERY.md b/RECOVERY.md index 473ef16..5929d19 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -1,6 +1,18 @@ # 大鱼调色恢复说明 -## 当前 1.4.2(31):真实素材与中间起点跟踪 +## 当前 1.4.3(33):蒙版折叠与数量标记 + +当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。 + +修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。 + +FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。 + +入口:[本轮说明](research/MaskFolding1.4.3.md)、[正式宿主验收](verification/HostMaskFolding1.4.3.json)、[远端源码恢复](verification/MaskFoldingRecovery.json)、[副本清理](verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。 + + + +## 历史 1.4.2(31):真实素材与中间起点跟踪 当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。 diff --git a/research/MaskFolding1.4.3.md b/research/MaskFolding1.4.3.md index 8f536b8..a46a320 100644 --- a/research/MaskFolding1.4.3.md +++ b/research/MaskFolding1.4.3.md @@ -9,3 +9,5 @@ 本次只改布局、标题栏状态显示和版本元数据,不改变启用、调色、蒙版几何、轨迹、合成方式或渲染代码。沿用现有原生检查,在正式签名公证安装后验证原模块及新增层的折叠、展开和状态保留;不为这次布局修复另写重复单元测试。 正式宿主和交付结果见 verification/HostMaskFolding1.4.3.json、Delivery.json、Package.json、Release.json 对应版本记录。用户预设和项目快照保留在本机,不进入Git。 + +最终33版正式路径293项检查通过。FCP验证蒙版面板随原模块和独立HSL层分别折叠,折叠后保留2/1数量标记;删除到零隐藏、撤销恢复,包含停用蒙版。用户77276字节预设和286个轨迹键不变,合成片段8471字节预设在操作前后及冷重开逐字节一致。蓝色主题实屏标记清楚可读;未单独遍历其它主题、Motion或Intel。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 64f17dd..1ca11db 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -2,15 +2,15 @@ "status": "verified", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", - "version": "1.4.2", - "build": "31", + "version": "1.4.3", + "build": "33", "team": "B3W25FX5H5", - "notaryID": "0bb9a94e-c54a-4d87-95ec-51338579c04f", + "notaryID": "e755670d-8fb3-46d2-95c3-1206f014d16d", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "123a6c85078e8aa41fe55577b6dab5622ed7d128", + "sourceCommit": "26a888f4534792481c6a9933091cb0b23307cd24", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738", "shaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e", - "hostVerification": "verification/HostTrackingMidpoint1.4.2.json" + "hostVerification": "verification/HostMaskFolding1.4.3.json" } diff --git a/verification/HostMaskFolding1.4.3.json b/verification/HostMaskFolding1.4.3.json new file mode 100644 index 0000000..00c3ca3 --- /dev/null +++ b/verification/HostMaskFolding1.4.3.json @@ -0,0 +1,59 @@ +{ + "passResult": true, + "version": "1.4.3", + "build": "33", + "sourceCommit": "26a888f4534792481c6a9933091cb0b23307cd24", + "host": "Final Cut Pro 12.4", + "formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "nativeChecks": 293, + "baseline": { + "version": "1.4.2", + "build": "31", + "spiderCollapsed": true, + "maskControlsStillVisible": true, + "userTrustedKeys": 286 + }, + "userState": { + "fullPresetBytes": 77276, + "fullPresetSHA256": "1563d53e6e7b9d45ee3e959a008713401e5c8a7cf82c960443dcc35d7a04d330", + "foldUnfoldByteIdentical": true, + "trustedKeysPreserved": 286 + }, + "hostChecks": { + "originalModuleFoldHidesMaskPanel": true, + "originalModuleUnfoldRestoresControls": true, + "foldedHeaderBadgeVisible": true, + "fixtureOriginalHSLMaskCount": 2, + "fixtureOriginalHSLDisabledMasks": 1, + "fixtureRepeatedHSLMaskCount": 1, + "repeatedLayerFoldUnfoldIndependent": true, + "bothFoldedVisibleMaskPanels": 0, + "deleteCounts": [ + 2, + 1, + 0 + ], + "noMasksBadgeHidden": true, + "undoCounts": [ + 0, + 1, + 2 + ], + "noMaskModuleNoBadge": true, + "normalQuitAndColdReopen": true, + "coldReopenBothHSLFolded": true, + "coldReopenBadgeCounts": [ + 2, + 1 + ], + "fixturePresetBytes": 8471, + "fixtureFullPresetSHA256": "ee8f0e2d165b41478ca9bae5176b9bcd2bf95d07a60baae7ddfda0c26f79f05a", + "fixtureBeforeAfterAndColdReopenByteIdentical": true, + "visualBlueThemeBadgeReadable": true + }, + "scope": "Only fold layout and header status UI changed; no renderer/tracking/data-schema change. Existing native checks reused; no new redundant unit tests.", + "privacy": "Synthetic fixture is local only. User media, project and full presets remain local; only aggregate checks/hashes are committed.", + "limits": [ + "Live host QA on Apple Silicon Final Cut Pro12.4; Motion, Intel and all alternate themes were not separately live verified." + ] +} diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 6f3862d..ce0e5c1 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/1625CF86-D762-4A0B-9515-6DE9981F8A19" }, { "descriptors": 234, @@ -816,7 +816,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/1625CF86-D762-4A0B-9515-6DE9981F8A19/diagnostic-export.cube" }, { "bytes": 1186074, @@ -836,7 +836,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 90.35904170013964, + "maximumGapMS": 84.72579158842564, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1537,6 +1537,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7191D161-7671-47DE-9A9C-0A65316B5574", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/1625CF86-D762-4A0B-9515-6DE9981F8A19", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/verification/MaskFoldingCleanup.json b/verification/MaskFoldingCleanup.json new file mode 100644 index 0000000..128ff60 --- /dev/null +++ b/verification/MaskFoldingCleanup.json @@ -0,0 +1,14 @@ +{ + "passResult": true, + "version": "1.4.3", + "build": "33", + "removedKnownPriorBackups": [ + { + "path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-f88addf10c2a4cfc983ef8cf3361852c.app", + "build": "31" + } + ], + "immediate32BackupRemovedByDelivery": true, + "originalUserPresetsAndMediaPreserved": true, + "otherProductsUntouched": true +} diff --git a/verification/MaskFoldingRecovery.json b/verification/MaskFoldingRecovery.json new file mode 100644 index 0000000..d200132 --- /dev/null +++ b/verification/MaskFoldingRecovery.json @@ -0,0 +1,14 @@ +{ + "passResult": true, + "repository": "https://dayu.media/git/dayu/dayu-color.git", + "sourceCommit": "26a888f4534792481c6a9933091cb0b23307cd24", + "restoredFiles": 240, + "fsck": "full strict passed", + "rebuiltShaderSHA256": "b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e", + "formalShaderMatches": true, + "templateRebuiltFromNativeModel": true, + "templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738", + "LFS": false, + "submodules": false, + "cloneCleaned": true +} diff --git a/大鱼调色FxPlug4交接.md b/大鱼调色FxPlug4交接.md index 9fd49b9..e108426 100644 --- a/大鱼调色FxPlug4交接.md +++ b/大鱼调色FxPlug4交接.md @@ -1,3 +1,15 @@ +# 大鱼调色:1.4.3(33)蒙版折叠与数量标记交接 + +当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。 + +修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。 + +FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。 + +入口:[本轮说明](research/MaskFolding1.4.3.md)、[正式宿主验收](verification/HostMaskFolding1.4.3.json)、[远端源码恢复](verification/MaskFoldingRecovery.json)、[副本清理](verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。 + +## 以下为1.4.2(31)的历史交接 + # 大鱼调色:1.4.2(31)中间帧与真实素材跟踪修复交接 当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。