Fix primary CST working domains and delayed output; 581 checks pass; seed new effects explicitly

这个提交包含在:
mac 于 2026-11-04 08:01:39 +08:00 提交
1 父节点 d5aba63b4e
当前提交 072bf881b9
16 个文件已更改
+452 -22

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

+11
查看文件
@@ -0,0 +1,11 @@
大鱼调色 1.8.1(56)公测
修正 1.8.0 固定 ACEScct 接管一级 CST 的设计,恢复输入、工作曲线/色域与输出设置。主输出移至所有一级层及印片之后;新增一级层继承工作空间,默认关闭额外映射。局部 CST、线性混合、负值和超白保留经过回归;线性工作曲线增加明确的 DI 适配。
新建效果默认使用“一级 CST · 延后输出”;注册缺省与已保存的 nil/v2 状态保持旧流程。65³ Cube 按一级声明的输入、输出编码导出,所选 Gamma/Log 不再统一写成 sRGB。
旧工具仍作为输出后的 SDR 修饰;Log/线性码值输出不运行活跃的 SDR 修饰。上游 FCP 已还原或裁切的数据不能由插件恢复,请核对相机 LUT 与颜色符合。受控 Log 码值载体不等于所有相机文件的上游路由认证。
581 项原生检查通过,包括独立曝光/高光参考、负值/超白、局部 CST、线性混合、印片域和 Cube 输出曲线。
正式签名、公证、宿主验收与包校验以 verification/Delivery.json、HostPrimaryCST1.8.1.json、Package.json 和 Release.json 为准。安装包摘要与实际编译提交在验包后补入本说明。
+18 -5
查看文件
@@ -1,13 +1,26 @@
# 大鱼调色
原生 FxPlug 4 调色器,当前正式安装的公测版本 **1.8.0(55)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
原生 FxPlug 4 调色器,当前公测版本 **1.8.1(56)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
2026-11-03完成BASIS、Colour Space Transform和Color Finale的只读色彩管理调查,含原版GPU曝光/映射及当前一级颜色内核的有限检查。宿主边界、重复映射、工具工作域和旧工程迁移的改进方案见[研究报告与实施方案](research/cms-audit-20261103/report.md)。1.8.0(55)已按方案接入新版 CMS,530 项正式原生检查与 FCP 12.4 切换、错误恢复、保存重开及实际导出通过。详见 [宿主验收](verification/HostColorManagement1.8.0.json)。
1.8.1 修正 1.8.0 固定 ACEScct 接管并隐藏一级 CST 的设计问题,恢复原有输入、工作曲线/色域与输出选择,并将主输出放到一级层和印片之后。新建效果明确选择修正流程;插件注册缺省仍为旧版,以保持已有未声明 CMS 的工程。1.8.0 ACES 流程作为兼容方式保留,不自动修改已保存画面。
[1.8.1 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104);[修正约定与验证边界](research/cms-correction-20261104/design.md)。1.8.0 的研究来源与历史实施见[只读调查](research/cms-audit-20261103/report.md)。
[1.8.0 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.0-cms-20261103) 已发布,源码与安装包下载校验、独立恢复构建完成。
## 1.8.1 一级 CST · 延后输出
## 1.8.0 色彩管理
推荐方式的实际顺序:**声明的素材编码 → 一级输入 CST(不做显示映射)→ 所选工作域一级调色 → 独立一级层 → 印片 → 一级输出 CST/可选映射 → SDR 修饰 → 宿主显示**。主输入不先套 Rec.709 显示还原,工作空间由原一级的工作曲线与工作色域决定,可使用 DWG/DaVinci Intermediate、ACEScct/AP1 或其他已列出的独立组合。
新增独立一级默认继承主工作空间,输入/输出相同且映射关闭。切换主工作空间时跟随更新;手动修改某段曲线/色域后,该段保留独立选择。每层明确设置的 CST 实际执行,完成后按声明的输出空间返回主工作域。混合、蒙版在 AP1 线性中进行。主一级眼睛旁路整个主 CST 模块;其他工具保持既有宿主直通行为。
印片只在自身所需的 ACEScct/AP1 域处理,随后返回所选工作空间。主输出始终在这些步骤之后。其余旧工具仍是输出后的 SDR 修饰;Log/线性码值输出会拒绝活跃的 SDR 修饰。此修正没有把所有旧工具改写为场景域/HDR 算法。
新流程的 CST/BASIS 入口、出口和图像传输为 float32,原算术与旧入口保留;线性工作曲线明确经过 DI 适配。纯 Log/线性直通不产生重复编码量化。新流程 Cube 为 65³,输入、输出均依启用的一级 CST 阶段声明,保留所选输出 Gamma/Log 编码;宿主显示另按实际目标配置解释。
手动 CST 接收 FCP 已交给插件的像素,沿用明确的码值载体。使用相机 Log 时须核对上游相机 LUT、颜色符合和任何其它还原;本插件不能恢复上游已经压缩或裁切的信息。受控宿主样本使用带 sRGB 标签的 16-bit PNG Log 码值载体,不代表验证所有相机文件的上游路由。
完整预设仍为 v7,新增独立 CMS 状态 v3;旧 nil/v2 状态按原流程渲染,不静默升级。
## 1.8.0 兼容色彩管理
在调色参数顶部选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
@@ -17,7 +30,7 @@
引擎固定 OpenColorIO 2.5.2 / ACES 1.3 studio-config v2.2.0,源码、依赖源包、摘要与许可证保存在 ColorManagement/,不依赖兄弟 APP 的安装。宿主颜色配置用实际 CGColorSpace 描述及指纹分别缓存;只有已知 RGB Linear / Rec.709 或 Rec.2020 才允许缺失配置的回退。
新版处理顺序固定:所有一级层 → 所有印片(ACEScct)→ 一次输出变换 → SDR 修饰工具 → 实际宿主目标。一级混合、蒙版及印片强度在 AP1 线性域混合。核心图像传输、OCIO 与配置转换采用 float32;沿用的 BASIS 入口及活跃旧工具仍有 half 精度。SDR 修饰域明确为 Rec.709 线性/sRGB,物理色域转换后接入;新版减色用有界效果差量延伸保留超范围残差,旧版限幅保持。
1.8.0 兼容方式的处理顺序固定:所有一级层 → 所有印片(ACEScct)→ 一次输出变换 → SDR 修饰工具 → 实际宿主目标。一级混合、蒙版及印片强度在 AP1 线性域混合。核心图像传输、OCIO 与配置转换采用 float32;沿用的 BASIS 入口及活跃旧工具仍有 half 精度。SDR 修饰域明确为 Rec.709 线性/sRGB,物理色域转换后接入;新版减色用有界效果差量延伸保留超范围残差,旧版限幅保持。
PQ/HLG 输出或跟随 Rec.2020 宿主暂只接受一级与印片;存在活跃 SDR 修饰时返回明确错误,不静默进入有界 LUT。此版本没有把全部旧工具改写成场景/HDR 算法。
@@ -15,3 +15,11 @@
边界:FxPlug 收到的是上游 FCP 像素,手动模式不能绕开或恢复上游已经进行的相机 LUT、颜色符合或裁切。界面明确说明。其他旧工具继续作为输出后的 SDR 修饰,不声称全部已成为场景域/HDR 算法。旧工程不自动升级;通过明确选择启用新版。
验收:恢复输入/工作/输出选择;Sony Log→DWG/DI 与 ACEScct 工作;高光先降曝光后映射的独立参考;新层中性;局部 CST、蒙版与混合;印片域往返;显示/码值输出及错误路径;旧 v1/v2 回归;正式路径 FCP 保存重开、实际导出;签名、公证、PKG/Release 与远程恢复。
独立层输入/工作/输出默认随主工作空间更新;手动修改其中一段的曲线或色域后,该段停止跟随,另外两段继续更新。`primaryFollow` 仅是作者状态,实际渲染仍使用可见的明确参数,绝不在渲染阶段偷偷覆盖。主一级眼睛停用时旁路其完整 CST 模块,其余工具沿用原有宿主直通流程。
“线性”工作曲线采用明确的线性↔DI适配器进入已验证的 BASIS 模式,避免原内核编号对应错误。Log/线性纯直通不引入无意义的编码往返。Cube 使用声明的输入与输出码值;显示预览另按实际宿主颜色配置处理。
受控宿主样本是带 sRGB 标签的 16-bit PNG Log 码值载体,用于核对本插件链路,不代表验证任意相机文件的上游 FCP 路由。
新模板显式写入 v3 实例值,而 `defaultVal` 与 FxPlug 注册缺省保持原 nil 状态;需通过 FCP 分别验收新实例和旧 nil/v2 工程,防止依赖模板缺省的历史实例发生变化。
+4 -1
查看文件
@@ -4,6 +4,9 @@
"9001": "AAAAAAAAAlEqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBkWJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAaULDBcdI1UkbnVsbNUNDg8QERITFBUVVXBhdGhzViRjbGFzc1xzcGlkZXJMaW5rZWRfEA9jb2xvck1hbmFnZW1lbnRac3BpZGVyTWVzaIACgAQJgACAANMYGQ4aGxxXTlMua2V5c1pOUy5vYmplY3RzoKCAA9IeHyAhWiRjbGFzc25hbWVYJGNsYXNzZXNcTlNEaWN0aW9uYXJ5oiAiWE5TT2JqZWN00h4fJCVcRFlBc3NldFN0YXRloiYiXERZQXNzZXRTdGF0ZQAIABEAGgAkACkAMgA3AEkATABYAFoAYABmAHEAdwB+AIsAnQCoAKoArACtAK8AsQC4AMAAywDMAM0AzwDUAN8A6AD1APgBAQEGARMBFgAAAAAAAAIBAAAAAAAAACcAAAAAAAAAAAAAAAAAAAEjCAAIABEAGgAkACkAMgA3AEkATgBbAG0AbwBxAHUAewIQAAAAAAAAAgEAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAhEA",
"9002": "AAAAAAAAApUqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEB1WJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAawLDBEdHh8gJCotMDFVJG51bGzSDQ4PEFhkb2N1bWVudFYkY2xhc3OAAoAL0xITDhQYHFdOUy5rZXlzWk5TLm9iamVjdHOjFRYXgAOABIAFoxkaG4AGgAiACoAHWWJhc2VNYXNrc1ZsYXllcnNWc2NoZW1h0xITDiEiHKCggAfSJSYnKFokY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaInKVhOU09iamVjdNITDissoIAJ0iUmLi9XTlNBcnJheaIuKRAB0iUmMjNeRFlUb29sRG9jdW1lbnSiNCleRFlUb29sRG9jdW1lbnQACAARABoAJAApADIANwBJAEwAWABaAGcAbQByAHsAggCEAIYAjQCVAKAApACmAKgAqgCuALAAsgC0ALYAwADHAM4A1QDWANcA2QDeAOkA8gD/AQIBCwEQAREBEwEYASABIwElASoBOQE8AAAAAAAAAgEAAAAAAAAANQAAAAAAAAAAAAAAAAAAAUsIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7AlQAAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAACVQA="
},
"newEffectArchivesBase64": {
"9001": "AAAAAAAAAukqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxECKWJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAa4LDBclJicoKSorLC0zN1UkbnVsbNUNDg8QERITFBUWVXBhdGhzViRjbGFzc1xzcGlkZXJMaW5rZWRfEA9jb2xvck1hbmFnZW1lbnRac3BpZGVyTWVzaIAMgA0JgAKAANMYGQ4aHyRXTlMua2V5c1pOUy5vYmplY3RzpBscHR6AA4AEgAWABqQgISIjgAeACIAJgAqAC1Zjb25maWdWZW5naW5lVG1vZGVXdmVyc2lvbl8QFXByaW1hcnktcGFyYW1ldGVycy12MVxEYXl1LUNTVC1mMzIQBBAD0i4vMDFaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiMDJYTlNPYmplY3TTGBkONDUkoKCAC9IuLzg5XERZQXNzZXRTdGF0ZaI6MlxEWUFzc2V0U3RhdGUACAARABoAJAApADIANwBJAEwAWABaAGkAbwB6AIAAhwCUAKYAsQCzALUAtgC4ALoAwQDJANQA2QDbAN0A3wDhAOYA6ADqAOwA7gDwAPcA/gEDAQsBIwEwATIBNAE5AUQBTQFaAV0BZgFtAW4BbwFxAXYBgwGGAAAAAAAAAgEAAAAAAAAAOwAAAAAAAAAAAAAAAAAAAZMIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7AqgAAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAACqQA="
},
"parameters": [
{
"default": 0,
@@ -3633,7 +3636,7 @@
}
],
"sourceSHA256": {
"template/tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
"template/tools/dump_model.mm": "211ded630dbb7c44a149de6c9d5478cfb75f7bf2f1fe2efe4e284e49b3b5e46e",
"大鱼调色/Plugin/DYCSTTypes.h": "ed5ba7e7ae35d1bba10e80a81184fa26b1f7eb582e47b2e45c3edd294889c76a",
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
+3 -1
查看文件
@@ -1,6 +1,7 @@
#import <Foundation/Foundation.h>
#import "DYModel.h"
#import "DYToolState.h"
#import "DYManagedColor.h"
static NSString *archive(id object) {
NSKeyedArchiver *inner=[[[NSKeyedArchiver alloc]initRequiringSecureCoding:YES]autorelease];
@@ -18,7 +19,8 @@ static NSString *archive(id object) {
return [carrier base64EncodedStringWithOptions:0];
}
int main(void){@autoreleasepool{
NSDictionary *out=@{@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
DYAssetState *newEffect=[[[DYAssetState alloc]init]autorelease];newEffect.colorManagement=DYPrimaryColorDefaults();
NSDictionary *out=@{@"newEffectArchivesBase64":@{@"9001":archive(newEffect)},@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
NSError *error=nil;NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];
if(!json){fprintf(stderr,"Could not export our model metadata\n");return 2;}fwrite(json.bytes,1,json.length,stdout);return 0;
}}
+3 -3
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
"version": "5.11",
"displayversion": "5.4.5",
"nativeReference": {
@@ -18,7 +18,7 @@
},
"staticContract": {
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
@@ -55,7 +55,7 @@
},
"savedSelection": {
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
+1 -1
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
+1 -1
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "f9b3e2f009cfd4bc3a92d8af21b15f0e0e8715c3b3756b14750013bee2d4abfb",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
+1 -1
查看文件
@@ -228,7 +228,7 @@
<parameter name="LUT 文件" id="9001" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
<defaultVal>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</defaultVal>
<dataValue>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</dataValue>
<dataValue>*********iYeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl208K7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**Os91-QZ7WQc8Gcf90onBpIYPbJgPBIB1UwE2F6H3-IKJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*AU*o7U*8**BAM4EsO5mFLHZAiOqJtQpdCImtjMadZMrFnd-gQ5Fu**s*2U*K*-eEU6G6XU*S*06*7U*e*0pNXPqtaOKRKNKtbOKtZJ4pjN4JLRaJmQqZjPZwE3L-mOKpVQbYhQ43mMKpZR4JmQmpqAJl2MLZp9IBHJ0paAn6E--*1oWsjA13O74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaWA17MHZBDMadZMrHH4-YCB1IYc80*0x6i9nUtL2FNELBnNLFHR43oNO6uAZl2KI3nQqJoIrFVR4I*0**F*-c*7**d*16*Bk-7*2k*K*-O*4Y*Pk-u*6**Vk0I*8M*gE0n*9I*hU0s*9c*kE17*BE*qE1P*Bo*rk1V*CM*u*1e*Ck*vU1k*DQ*zU21*Eg-6k2k*H6-B*2t*IE-HE3O*Jo-NU3h*Ks-Pk3l*LM-Uk44*********U2*********Ck*******************NA6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*eU********0*E*********E*******************0eE*</dataValue>
</parameter>
<parameter name="工具与蒙版" id="9002" flags="12889161776">
<numberOfKeypoints>0</numberOfKeypoints>
+10 -1
查看文件
@@ -89,7 +89,10 @@ def build(model):
flags='12884901888' if pid=='9000' else '12889161776'
param=E.SubElement(filt,'parameter',name=name,id=pid,flags=flags)
E.SubElement(param,'numberOfKeypoints').text='0'
E.SubElement(param,'defaultVal').text=text;E.SubElement(param,'dataValue').text=text
E.SubElement(param,'defaultVal').text=text
# Explicit instance seed; registered defaults stay legacy for old projects.
seeded=model.get('newEffectArchivesBase64',{}).get(pid)
E.SubElement(param,'dataValue').text=custom_archive(seeded)[0] if seeded else text
for row in model['parameters']:
value=format(float(row['default']),'.17g')
host_default=format(float(row.get('hostDefault',row['default'])),'.17g')
@@ -130,6 +133,12 @@ def verify(data,model):
assert params["10005"].get("value")=="1" and params["10005"].get("flags")=="8589934592" and f.get("pluginVersion")=="0"
for row in model['parameters']:
p=params[str(row['pid'])];assert float(p.get('default'))==float(row.get('hostDefault',row['default'])) and float(p.get('value'))==float(row['default'])
for pid in ['9000','9001','9002']:
original=custom_archive(model['archivesBase64'][pid])[0]
seed=model.get('newEffectArchivesBase64',{}).get(pid)
assert params[pid].findtext('defaultVal')==original
assert params[pid].findtext('dataValue')==(custom_archive(seed)[0] if seed else original)
assert params['9001'].findtext('defaultVal')!=params['9001'].findtext('dataValue')
assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL'))
assert len(root.findall('.//behavior'))==0 and len(root.findall('.//keypoint'))==0
assert scene.find('.//scenenode[@name="效果源"]/parameter[@id="2"]/parameter[@id="321"]').get('value')=='3'
+59
查看文件
@@ -0,0 +1,59 @@
#!/usr/bin/env python3
"""Build a controlled Log-code carrier fixture; never edit an FCP library.
The 16-bit PNG explicitly carries sRGB metadata so RGB_LINEAR host pixels can be
unwrapped with the plugin's existing carrier. It is not raw-camera verification.
"""
import argparse, base64, json, plistlib, struct, uuid, zlib
from pathlib import Path
import xml.etree.ElementTree as E
root = Path(__file__).resolve().parent.parent
p = argparse.ArgumentParser(description=__doc__)
p.add_argument('--diagnostic', type=Path, required=True)
args = p.parse_args()
fixture = json.loads(args.diagnostic.read_text())
qa = Path.home() / 'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
qa.mkdir(parents=True, exist_ok=True)
width, height = 1920, 1080
def chunk(name, data):
return struct.pack('>I', len(data)) + name + data + struct.pack('>I', zlib.crc32(name + data) & 0xffffffff)
row = bytearray(b'\0')
for x in range(width):
code = fixture['patches'][x * 8 // width]['code']
row += struct.pack('>HHH', *(round(max(0, min(1, v)) * 65535) for v in code))
chart = qa / 'primary-slog3-code-carrier.png'
chart.write_bytes(b'\x89PNG\r\n\x1a\n'
+ chunk(b'IHDR', struct.pack('>IIBBBBB', width, height, 16, 2, 0, 0, 0))
+ chunk(b'sRGB', b'\0') + chunk(b'gAMA', struct.pack('>I', 45455))
+ chunk(b'IDAT', zlib.compress(bytes(row) * height)) + chunk(b'IEND', b''))
model = json.loads((root / 'template/sources/RegisteredParameters.json').read_text())
values = {r['key']: r['default'] for r in model['parameters']}
values.update(cmConfigured=1, cmexposure=-4, skinEnabled=0)
base = json.loads((qa / 'cms-authored-v2-before.json').read_text())
preset = dict(format='com.dayu.color.preset', version=7,
colorManagement=dict(version=3, mode=4, engine='Dayu-CST-f32', config='primary-parameters-v1'),
values=values, paths={}, spider=base['spider'],
tools=base64.b64encode(plistlib.dumps(dict(schema=2, layers=[], baseMasks={}), fmt=plistlib.FMT_BINARY)).decode())
(qa / 'primary-host-minus4.json').write_text(json.dumps(preset, ensure_ascii=False, indent=2) + '\n')
xml = E.Element('fcpxml', version='1.12')
r = E.SubElement(xml, 'resources')
E.SubElement(r, 'format', id='f1', width=str(width), height=str(height), frameDuration='1/25s', colorSpace='1-1-1 (Rec. 709)')
E.SubElement(r, 'format', id='f2', width=str(width), height=str(height), name='FFVideoFormatRateUndefined')
a = E.SubElement(r, 'asset', id='a1', name='SLog3 控制码值', start='0s', duration='0s', format='f2', hasVideo='1', videoSources='1')
E.SubElement(a, 'media-rep', kind='original-media', src=chart.as_uri())
template = Path.home() / 'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
E.SubElement(r, 'effect', id='fx', name='大鱼调色', uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef', src=template.as_uri())
event = E.SubElement(E.SubElement(xml, 'library'), 'event', name='大鱼调色_1.8.1_CST修正验收', uid=str(uuid.uuid4()).upper())
for title in ['1.8.1_Log高光恢复', '1.8.1_工作空间与独立层']:
project = E.SubElement(event, 'project', name=title, uid=str(uuid.uuid4()).upper())
sequence = E.SubElement(project, 'sequence', format='f1', duration='4s', tcStart='0s', tcFormat='NDF', audioLayout='stereo', audioRate='48k')
clip = E.SubElement(E.SubElement(sequence, 'spine'), 'video', ref='a1', name=title, offset='0s', start='0s', duration='4s')
E.SubElement(clip, 'filter-video', ref='fx', name='大鱼调色', enabled='1')
E.indent(xml)
output = qa / '大鱼调色_1.8.1_CST修正验收.fcpxml'
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n' + E.tostring(xml, encoding='unicode') + '\n')
(qa / 'primary-host-reference.json').write_text(json.dumps(fixture, ensure_ascii=False, indent=2) + '\n')
print(output)
+323
查看文件
@@ -0,0 +1,323 @@
{
"date": "2026-11-04",
"version": "1.8.1",
"build": "56",
"scope": "Release headless integration, not live FCP acceptance",
"passResult": true,
"totalChecks": 581,
"previousChecks": 530,
"newChecks": 51,
"results": [
{
"name": "primary-balance-wheel-restored-and-palette-loaded",
"pass": true
},
{
"error": "",
"name": "primary-master-active-render",
"pass": true
},
{
"error": "",
"name": "primary-master-inactive-render",
"pass": true
},
{
"name": "primary-master-controls-complete-cst-pipeline",
"pass": true
},
{
"error": "",
"name": "primary-mask-full-reference",
"pass": true
},
{
"error": "",
"name": "primary-mask-bypass-reference",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-cst-mask-render",
"pass": true
},
{
"name": "primary-mask-blends-cst-only-in-selected-region",
"pass": true
},
{
"name": "primary-v3-independent-state-valid",
"pass": true
},
{
"name": "primary-v3-rejects-conflicting-global-input",
"pass": true
},
{
"name": "primary-v3-secure-state-roundtrip",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-main-input-grade-output-render",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-DWG-intermediate-without-display-output",
"pass": true
},
{
"changedComponents": 2816,
"maxAbsoluteError": 0.00048828125,
"name": "primary-input-goes-directly-to-DWG-DI-not-709",
"nonfiniteComponents": 0,
"nonzeroComponents": 12288,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-ACEScct-without-display-output",
"pass": true
},
{
"changedComponents": 4276,
"maxAbsoluteError": 0.00048828125,
"name": "primary-ACEScct-is-selectable-not-forced",
"nonfiniteComponents": 0,
"nonzeroComponents": 12288,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-input-selection-ARRI",
"pass": true
},
{
"name": "primary-input-selection-is-effective",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-four-inherited-neutral-layers",
"pass": true
},
{
"name": "primary-new-layer-inherits-workspace-no-remap",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-four-stop-root-before-output",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-four-stop-extra-before-output",
"pass": true
},
{
"changedComponents": 0,
"maxAbsoluteError": 0,
"name": "primary-independent-grade-before-main-output",
"nonfiniteComponents": 0,
"nonzeroComponents": 12288,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-independent-OCIO-reduced-scene-input",
"pass": true
},
{
"independentReference": 0.424072265625,
"maxDifference": 0.00048828125,
"name": "primary-highlights-recovered-before-mapping-reference",
"pass": true,
"scene64afterMinus4": 0.424072265625
},
{
"error": "未提供错误信息",
"name": "primary-local-DI-contrast",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-local-ACES-contrast",
"pass": true
},
{
"name": "primary-local-working-selection-is-effective",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-local-input-CST-selection",
"pass": true
},
{
"name": "primary-local-input-CST-is-not-overridden",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-zero-mask",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-zero-grade-mix",
"pass": true
},
{
"name": "primary-zero-mask-and-mix-retain-CST-boundaries",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-linear-light-half-mix",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-linear-light-mix-reference",
"pass": true
},
{
"changedComponents": 0,
"maxAbsoluteError": 0,
"name": "primary-mix-in-linear-AP1",
"nonfiniteComponents": 0,
"nonzeroComponents": 12288,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-print-DWG-before-output",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-print-ACES-before-output",
"pass": true
},
{
"changedComponents": 0,
"maxAbsoluteError": 0,
"name": "primary-print-domain-adapts-to-selected-working-space",
"nonfiniteComponents": 0,
"nonzeroComponents": 12288,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-declared-Log-output",
"pass": true
},
{
"name": "primary-declared-output-controls-restored",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-no-output-tone-map",
"pass": true
},
{
"name": "primary-tone-mapping-switch-restored",
"pass": true
},
{
"name": "primary-Log-data-output-rejects-SDR-finishing",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-main-eye-keeps-other-tools",
"pass": true
},
{
"error": "",
"name": "primary-eye-unmanaged-reference",
"pass": true
},
{
"name": "primary-main-eye-bypasses-whole-CST-retains-tools",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-negative-superwhite-hidden-RGB",
"pass": true
},
{
"changedComponents": 0,
"maxAbsoluteError": 0,
"name": "primary-float-domain-identity-retains-extended-values",
"nonfiniteComponents": 0,
"nonzeroComponents": 11520,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-linear-exposure-extended-values",
"pass": true
},
{
"grey": 0.3599466383457184,
"name": "primary-one-stop-exposure-is-linear-light-with-negative-values",
"negative": -0.05998092517256737,
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-data-output-ignores-disabled-SDR-and-LUT-controls",
"pass": true
},
{
"name": "primary-inspector-no-v2-selector-override",
"pass": true
},
{
"name": "primary-inspector-add-layer-inherits-workspace",
"pass": true
},
{
"name": "primary-workspace-change-updates-inherited-domains",
"pass": true
},
{
"name": "primary-manual-local-space-retains-choice-and-follows-boundaries",
"pass": true
},
{
"name": "primary-complete-preset-stores-v3-state",
"pass": true
},
{
"error": "未提供错误信息",
"name": "primary-v3-Cube65-declared-encoding",
"pass": true
},
{
"Gamma22": 0.7297400236129761,
"Gamma26": 0.7659831047058105,
"name": "primary-Cube-restores-output-gamma-selection",
"pass": true
}
],
"sourceSHA256": {
"tools/float_air_boundary.py": "6775344aa79d4fe2d8c3b322f1276b4592904afa5cc50a62defb6211a7836833",
"tools/build_kernels.py": "006711689251a4bc49f88ec4685d3baac55c2e56f033f384994a571515622e51",
"大鱼调色/Plugin/DYPrimaryRender.inc.h": "adcac0ca85dcfba614060bc87549814507671b5688b3980ec416a9afdffcbfb3",
"大鱼调色/Plugin/DYPrimaryKernels.inc.h": "e96c027ffec5a0a454771c93032c8fbed83bf11ca2951b97e0a9b6ee81b93b61",
"大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h": "54a83300ed0fbc5588cdd5531271eacff7fca66bf7087336304bac16136e0f5f",
"大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08",
"大鱼调色/Plugin/DYRenderer.mm": "9b081acb6cd6e048cee4fe9bbfe4d72ae472ca6e3e2e4afff79f371a1755fad7"
},
"limitations": [
"Controlled code-carrier vectors, not a raw-camera source API certification",
"Old bounded tools remain post-output SDR finishing",
"Live FCP and unique formal install verified separately"
]
}
@@ -22,6 +22,7 @@
// must be the same as correcting the root before its one final display map.
NSMutableDictionary *one=DYMutablePlist(empty.document),*node=(id)DYInsertTool(one,@"primary",@"base:primary");DYSeedPrimaryWorkingSpace(node,10,16);node[@"values"][@"cmexposure"]=@(-4);DYUniforms reduced=u;reduced.cm.exposure=-4;Pixels beforeOutput=renderPrimary(reduced,empty.document,@"primary-four-stop-root-before-output"),extra=renderPrimary(u,one,@"primary-four-stop-extra-before-output");Difference order=difference(beforeOutput,extra);run.record(@"primary-independent-grade-before-main-output",order.maximum<.002&&order.nonfinite==0,measure(order));
auto reducedScene=scene;for(auto &p:reducedScene){p.r/=16;p.g/=16;p.b/=16;}Pixels reducedInput=sceneInput(reducedScene);upload(reducedInput);Pixels knownReduced=renderPrimary(u,empty.document,@"primary-independent-OCIO-reduced-scene-input");Difference high=difference(beforeOutput,knownReduced);run.record(@"primary-highlights-recovered-before-mapping-reference",high.maximum<.008&&high.nonfinite==0,@{@"maxDifference":@(high.maximum),@"scene64afterMinus4":@((float)beforeOutput[7*4]),@"independentReference":@((float)knownReduced[7*4])});upload(logInput);
NSMutableArray *patches=[NSMutableArray array];for(int k=0;k<8;k++){size_t i=k*5;float a=logInput[i*4+3];[patches addObject:@{@"index":@(i),@"code":@[@(encodeCarrier((float)logInput[i*4]/a)),@(encodeCarrier((float)logInput[i*4+1]/a)),@(encodeCarrier((float)logInput[i*4+2]/a))],@"expectedMinus4Linear709":@[@((float)beforeOutput[i*4]/a),@((float)beforeOutput[i*4+1]/a),@((float)beforeOutput[i*4+2]/a)]}];}NSData *fixture=[NSJSONSerialization dataWithJSONObject:@{@"patches":patches,@"input":@"Sony S-Log3 / S-Gamut3.Cine code carrier",@"exposure":@(-4)} options:NSJSONWritingPrettyPrinted error:nil];[fixture writeToFile:[runtime stringByAppendingPathComponent:@"primary-host-chart.json"] atomically:YES];
// Local working curves are read from the node, including BASIS adapters.
node[@"values"][@"cmexposure"]=@0;node[@"values"][@"cmcontrast"]=@.3;Pixels localDI=renderPrimary(u,one,@"primary-local-DI-contrast");node[@"values"][@"cmworkingTransfer"]=@1;node[@"values"][@"cmworkingGamut"]=@2;Pixels localACES=renderPrimary(u,one,@"primary-local-ACES-contrast");run.record(@"primary-local-working-selection-is-effective",difference(localDI,localACES).maximum>.001);
node[@"values"][@"cminputTransfer"]=@1;node[@"values"][@"cminputGamut"]=@2;Pixels reinterpret=renderPrimary(u,one,@"primary-local-input-CST-selection");run.record(@"primary-local-input-CST-is-not-overridden",difference(reinterpret,localACES).maximum>.01);
@@ -38,7 +39,8 @@
DYUniforms invalid=data;invalid.hslHueA.x=20;NSError *e=nil;BOOL bounded=[primaryRenderer renderSource:source destination:destination uniforms:invalid paths:@{} spider:nil tools:empty.document colorManagement:v3 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.record(@"primary-Log-data-output-rejects-SDR-finishing",!bounded&&e.localizedDescription.length>0);
DYUniforms bypass=u;bypass.primarySectionEnabled=0;bypass.hslHueA.x=20;Pixels bypassFrame=renderPrimary(bypass,empty.document,@"primary-main-eye-keeps-other-tools");Pixels oldBypass=render(run,primaryRenderer,source,destination,gpu,bypass,@{},@"primary-eye-unmanaged-reference");run.record(@"primary-main-eye-bypasses-whole-CST-retains-tools",difference(bypassFrame,oldBypass).maximum==0);
// Float domain crossings retain negative values, overrange and hidden RGB.
DYUniforms linear=u;linear.cm.inputTransfer=linear.cm.workingTransfer=linear.cm.outputTransfer=20;linear.cm.inputGamut=linear.cm.workingGamut=linear.cm.outputGamut=2;linear.cm.toneMapping=0;Pixels extended(width*height*4);for(size_t i=0;i<width*height;i++){float a=i%4?.25f:0;extended[i*4]=a?decodeCarrier(-.03f)*a:.07f;extended[i*4+1]=a?decodeCarrier(.18f)*a:-.02f;extended[i*4+2]=a?decodeCarrier(4.f)*a:.5f;extended[i*4+3]=a;}upload(extended);Pixels exact=renderPrimary(linear,empty.document,@"primary-negative-superwhite-hidden-RGB");run.record(@"primary-float-domain-identity-retains-extended-values",difference(extended,exact).maximum<.002&&difference(extended,exact).nonfinite==0,measure(difference(extended,exact)));linear.cm.exposure=1;Pixels doubled=renderPrimary(linear,empty.document,@"primary-linear-exposure-extended-values");BOOL photometric=YES;for(size_t i=1;i<width*height;i++)if(extended[i*4+3]>0){float a=extended[i*4+3];photometric&=fabs(encodeCarrier((float)doubled[i*4+1]/a)-.36f)<.002&&fabs(encodeCarrier((float)doubled[i*4]/a)+.06f)<.002;}run.record(@"primary-one-stop-exposure-is-linear-light-with-negative-values",photometric);upload(logInput);
DYUniforms linear=u;linear.cm.inputTransfer=linear.cm.workingTransfer=linear.cm.outputTransfer=20;linear.cm.inputGamut=linear.cm.workingGamut=linear.cm.outputGamut=2;linear.cm.toneMapping=0;Pixels extended(width*height*4);for(size_t i=0;i<width*height;i++){float a=i%4?.25f:0;extended[i*4]=a?decodeCarrier(-.03f)*a:.07f;extended[i*4+1]=a?decodeCarrier(.18f)*a:-.02f;extended[i*4+2]=a?decodeCarrier(4.f)*a:.5f;extended[i*4+3]=a;}upload(extended);Pixels exact=renderPrimary(linear,empty.document,@"primary-negative-superwhite-hidden-RGB");run.record(@"primary-float-domain-identity-retains-extended-values",difference(extended,exact).maximum<.002&&difference(extended,exact).nonfinite==0,measure(difference(extended,exact)));linear.cm.exposure=1;Pixels doubled=renderPrimary(linear,empty.document,@"primary-linear-exposure-extended-values");BOOL photometric=YES;for(size_t i=1;i<width*height;i++)if(extended[i*4+3]>0){float a=extended[i*4+3];photometric&=fabs(encodeCarrier((float)doubled[i*4+1]/a)-.36f)<.002&&fabs(encodeCarrier((float)doubled[i*4]/a)+.06f)<.002;}run.record(@"primary-one-stop-exposure-is-linear-light-with-negative-values",photometric,@{@"negative":@(encodeCarrier((float)doubled[4]/.25f)),@"grey":@(encodeCarrier((float)doubled[5]/.25f))});upload(logInput);
DYUniforms idle=logOut;idle.texture=25;idle.textureEnabled=0;idle.postLUTStrength=0;idle.extraPostLUTStrengths[0]=.8;idle.extraLookSectionEnableds[0]=0;e=nil;BOOL idleOK=[primaryRenderer renderSource:source destination:destination uniforms:idle paths:@{@"look0":@"/nonexistent/disabled.cube",@"look1":@"/nonexistent/disabled2.cube"} spider:nil tools:empty.document colorManagement:v3 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.record(@"primary-data-output-ignores-disabled-SDR-and-LUT-controls",idleOK&&difference(read(destination,gpu),selectedOutput).maximum==0,@{@"error":reason(e)});
// Actual inspector must expose all three sets of selectors in V3.
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=v3;DYWriteAssets(host,assets,kCMTimeZero);DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:primaryRenderer]autorelease];[view refresh];[view setFrame:NSMakeRect(0,0,400,780)];[view layoutSubtreeIfNeeded];NSDictionary *tabs=[view valueForKey:@"tabs"];run.record(@"primary-inspector-no-v2-selector-override",![tabs[@"managedColor"]boolValue]&&[tabs[@"primaryCMS"]boolValue]);NSMenuItem *add=[[[NSMenuItem alloc]init]autorelease];add.representedObject=@"primary";[view addModule:add];NSDictionary *added=[DYReadTools(host,kCMTimeZero).document[@"layers"]lastObject];run.record(@"primary-inspector-add-layer-inherits-workspace",[added[@"values"][@"cminputTransfer"]isEqual:@10]&&[added[@"values"][@"cmoutputGamut"]isEqual:@16]&&[added[@"values"][@"cmtoneMapping"]isEqual:@0]);NSMutableDictionary *followed=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYFollowPrimaryWorkingSpace(followed,1,2);NSDictionary *following=[followed[@"layers"]lastObject];run.record(@"primary-workspace-change-updates-inherited-domains",[following[@"values"][@"cminputTransfer"]isEqual:@1]&&[following[@"values"][@"cmworkingGamut"]isEqual:@2]&&[following[@"values"][@"cmoutputTransfer"]isEqual:@1]);DYWriteTools(host,followed,kCMTimeZero);DYToolManager *local=[[[DYToolManager alloc]initWithHost:host node:following]autorelease];UInt32 workingID=0;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"cmworkingTransfer"])workingID=[d[@"pid"]unsignedIntValue];id<FxCustomParameterActionAPI_v4>action=[local apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:nil];[(id<FxParameterSettingAPI_v6>)local setFloatValue:10 toParameter:workingID atTime:kCMTimeZero];[action endAction:nil];followed=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYFollowPrimaryWorkingSpace(followed,4,4);following=[followed[@"layers"]lastObject];run.record(@"primary-manual-local-space-retains-choice-and-follows-boundaries",[following[@"values"][@"cmworkingTransfer"]isEqual:@10]&&[following[@"values"][@"cminputTransfer"]isEqual:@4]&&[following[@"values"][@"cmoutputGamut"]isEqual:@4]&&[following[@"primaryFollow"]isEqual:@5]);NSDictionary *preset=[view presetSnapshot];run.record(@"primary-complete-preset-stores-v3-state",[preset[@"colorManagement"]isEqual:v3]&&[preset[@"version"]isEqual:@7]);
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"primary-v3.cube"]];e=nil;BOOL exported=[primaryRenderer exportLUT:cube uniforms:logOut paths:@{} spider:nil tools:empty.document colorManagement:v3 error:&e];std::vector<float>table;NSUInteger side=0;BOOL parsed=exported&&DYLUTReadCube(cube.path,table,side,&e);run.record(@"primary-v3-Cube65-declared-encoding",parsed&&side==65&&[[NSString stringWithContentsOfURL:cube encoding:NSUTF8StringEncoding error:nil]containsString:@"V3 input"],@{@"error":reason(e)});
+1 -1
查看文件
@@ -6,7 +6,7 @@ kernel void dyPrimaryCST(texture2d<float,access::read> a [[texture(0)]],texture2
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0)c.rgb=cst_float_air(float4(c.rgb/c.a,1),p).rgb*c.a;b.write(c,xy);
}
kernel void dyPrimaryGrade(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],constant DayuRenderParams& p [[buffer(0)]],constant CSTParams& back [[buffer(1)]],uint2 xy [[thread_position_in_grid]]){
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0){float4 v=float4(c.rgb/c.a,1);if(p.stages&1)v=cst_float_air(v,p.input);if(p.stages&2){if(p.reserved&8)v=cst_float_air(v,p.basisInput);v=basis_float_air(v,p.basis);if(p.reserved&8)v=cst_float_air(v,p.basisOutput);}if(p.stages&4)v=cst_float_air(v,p.output);v=cst_float_air(v,back);c.rgb=v.rgb*c.a;}b.write(c,xy);
if(any(xy>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(xy);if(c.a>0){float4 v=float4(c.rgb/c.a,1);if(p.stages&1)v=cst_float_air(v,p.input);if(p.stages&2){if(p.reserved&8)v=cst_float_air(v,p.basisInput);v=basis_float_air(v,p.basis);if(p.reserved&8)v=cst_float_air(v,p.basisOutput);}if(p.stages&4)v=cst_float_air(v,p.output);if(back.inputTransfer!=back.outputTransfer||back.inputGamut!=back.outputGamut||back.toneMapping)v=cst_float_air(v,back);c.rgb=v.rgb*c.a;}b.write(c,xy);
}
kernel void dyPrimaryBlend(texture2d<float,access::read> before [[texture(0)]],texture2d<float,access::read> after [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],constant DYCSTMixParams& p [[buffer(2)]],uint2 xy [[thread_position_in_grid]]){
if(any(xy>=uint2(output.get_width(),output.get_height())))return;float4 a=before.read(xy),b=after.read(xy);if(!(a.a>0)||!(b.a>0)){output.write(a,xy);return;}float3 ac=cst_float_air(float4(a.rgb/a.a,1),p.toLinear).rgb,bc=cst_float_air(float4(b.rgb/b.a,1),p.toLinear).rgb;
+5 -5
查看文件
@@ -5,7 +5,7 @@
if(u.primarySectionEnabled<.5||DYBaseToolRemoved(tools,@"primary"))return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"一级 CST 输入纹理不可用。");
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过一级 CST 内存预算。");
DYApplyRemovedBaseTools(&u,tools);BOOL root=u.primarySectionEnabled>.5;int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut);
DYApplyRemovedBaseTools(&u,tools);BOOL root=u.primarySectionEnabled>.5;BOOL transparent=identityCM(u)&&!DYFilmPrintActive(u);int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut);
NSMutableArray*pool=[NSMutableArray array];NSMutableSet*pinned=[NSMutableSet set];id<MTLTexture>current=nil;
auto next=[&]()->id<MTLTexture>{for(id<MTLTexture>t in pool)if(t!=current&&![pinned containsObject:t])return t;MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:source.width height:source.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[d newTextureWithDescriptor:td];if(t){[pool addObject:t];[t release];}return t;};
auto dispatch=[&](NSString*name,const void*params,NSUInteger length,const void*extra=nullptr,NSUInteger extraLength=0){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级 CST 缓冲区。");BOOL ok=[self managedDispatch:name textures:@[current,out] data:params length:length extra:extra extraLength:extraLength entry:entry error:error];if(ok)current=out;return ok;};
@@ -13,7 +13,7 @@
auto tile=[&](id<MTLTexture>t){DYExportTile*v=[[[DYExportTile alloc]initWithTexture:t registry:d.registryID]autorelease];[v setBounds:src.tilePixelBounds origin:src.imageOrigin];[v setPixelAspect:src.pixelAspect];return v;};
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];DYCSTMixParams p={{wg,wt,2,20,0},{2,20,wg,wt,0},amount};id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyPrimaryBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
auto grade=[&](DYUniforms values,NSArray*masks,BOOL local){if(values.primarySectionEnabled<.5||values.cm.mix<=0)return YES;DYUniforms neutral=values;neutral.inputSectionEnabled=neutral.cm.outputEnabled=0;BOOL gradeNeutral=identityCM(neutral);if(!local&&gradeNeutral)return YES;if(local&&identityCM(values))return YES;
DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;CSTParams back={wg,wt,wg,wt,0};
DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;if((int)lroundf(values.cm.workingTransfer)==20){p.reserved|=8;p.basis.colorspace=10;p.basisInput={(int)lroundf(values.cm.workingGamut),20,(int)lroundf(values.cm.workingGamut),10,0};p.basisOutput={(int)lroundf(values.cm.workingGamut),10,(int)lroundf(values.cm.workingGamut),20,0};}CSTParams back={wg,wt,wg,wt,0};
if(local){p.stages=(values.inputSectionEnabled>.5?1:0)|(gradeNeutral?0:2)|(values.cm.outputEnabled>.5?4:0);back={values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputGamut):(int)lroundf(values.cm.workingGamut),values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputTransfer):(int)lroundf(values.cm.workingTransfer),wg,wt,0};}
else{p.stages=2;}
id<MTLTexture>before=current;[pinned addObject:before];BOOL ok=dispatch(@"dyPrimaryGrade",&p,sizeof(p),&back,sizeof(back));if(ok)ok=blend(before,masks,values.cm.mix,@"primary");[pinned removeObject:before];return ok;
@@ -24,8 +24,8 @@
current=source;id<MTLTexture>carrier=next();uint32_t noLUT=0;if(!carrier||![self managedDispatch:@"dyManagedCarrier" textures:@[current,carrier,entry[@"identity"]] data:&noLUT length:4 extra:nullptr extraLength:0 entry:entry error:error])return NO;current=carrier;
if(root&&u.inputSectionEnabled>.5&&!transform({(int)lroundf(u.cm.inputGamut),(int)lroundf(u.cm.inputTransfer),wg,wt,0}))return NO;
if(!grade(u,tools[@"baseMasks"][@"primary"],NO))return NO;
NSMutableDictionary*finishing=DYMutablePlist(tools);NSMutableSet*scene=[NSMutableSet set];for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"primary"]){if(!grade(DYToolUniforms(node),node[@"masks"],YES))return NO;[scene addObject:ID];}}
if(!print(u,tools[@"baseMasks"][@"film"]))return NO;for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"film"]&&!print(DYToolUniforms(node),node[@"masks"]))return NO;}
NSMutableDictionary*finishing=DYMutablePlist(tools);NSMutableSet*scene=[NSMutableSet set];for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"primary"]){transparent&=identityCM(DYToolUniforms(node));if(!grade(DYToolUniforms(node),node[@"masks"],YES))return NO;[scene addObject:ID];}}
if(!print(u,tools[@"baseMasks"][@"film"]))return NO;for(NSString*ID in DYToolDisplayOrder(tools)){NSDictionary*node=DYToolWithID(tools,ID);if([node[@"type"]isEqual:@"film"]){transparent&=!DYFilmPrintActive(DYToolUniforms(node));if(!print(DYToolUniforms(node),node[@"masks"]))return NO;}}
for(NSString*ID in scene)DYRemoveTool(finishing,ID);for(NSMutableDictionary*node in finishing[@"layers"])if([node[@"type"]isEqual:@"film"])node[@"values"][@"filmPrintLook"]=@0;
BOOL outputEnabled=root&&u.cm.outputEnabled>.5;int ot=outputEnabled?lroundf(u.cm.outputTransfer):wt,og=outputEnabled?lroundf(u.cm.outputGamut):wg;
// Only this stage owns the main display rendering / tone mapping.
@@ -33,7 +33,7 @@
u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYPrimaryActiveFinishing(u,finishPaths,spider,finishing);
BOOL display=outputEnabled&&ot>=1001&&ot<=1003;
if(!display&&activeFinish.count)return fail(error,@"当前是 Log/线性码值输出。SDR 修饰工具需要显示输出,请选择 Gamma 输出,或关闭这些工具并保存完整预设。");
if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];
if(!display&&transparent&&!activeFinish.count){current=source;[self managedPreview:current origin:src.imageOrigin entry:entry];}else if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];
if(activeFinish.count){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配 SDR 修饰缓冲区。");_managedFinishing=YES;BOOL ok=NO;@try{ok=[self renderSource:tile(current) destination:tile(out) uniforms:u paths:finishPaths spider:spider tools:finishing error:error];}@finally{_managedFinishing=NO;}if(!ok)return NO;current=out;}
if(_exporting){if(!transform({22,20,og,ot,0})||!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else{CGColorSpaceRef from=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB),to=DYManagedTileSpace(dst,primaries);DYColorProfile*p=to?[[[DYColorProfile alloc]initWithSource:from target:to error:error]autorelease]:nil;CGColorSpaceRelease(from);if(to)CGColorSpaceRelease(to);if(!p)return fail(error,@"宿主未提供明确的目标颜色空间。");id<MTLTexture>out=next();if(!out||![self managedProfile:p input:current output:out entry:entry error:error])return NO;current=out;}
}else{if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];}
+1 -1
查看文件
@@ -255,7 +255,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
if(ok)[output getBytes:_exportManagedState?(void*)precise.data():(void*)values.data() bytesPerRow:width*(_exportManagedState?16:8) fromRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0];[input release];[output release];if(!ok)return NO;
NSMutableString *text=[NSMutableString stringWithString:@"TITLE \"大鱼调色\"\n# 包含 CST 与逐像素颜色;不包含纹理、清晰度和逐画面分析。\nLUT_3D_SIZE 33\nDOMAIN_MIN 0 0 0\nDOMAIN_MAX 1 1 1\n"];
for(NSUInteger i=0;i<count;i++){float rgb[3];for(int c=0;c<3;c++){float v=_exportManagedState?precise[i*4+c]:(float)values[i*4+c];rgb[c]=v<=.0031308f?v*12.92f:1.055f*powf(v,1/2.4f)-.055f;if(!std::isfinite(rgb[c]))return fail(err,@"LUT 输出含无效值");}[text appendFormat:@"%.8f %.8f %.8f\n",rgb[0],rgb[1],rgb[2]];}
if(_exportManagedState){NSData *metadata=[NSJSONSerialization dataWithJSONObject:_exportManagedState options:NSJSONWritingSortedKeys error:nil];if(metadata)[text insertString:[NSString stringWithFormat:@"# DAYU_CMS_STATE %@\n",[[[NSString alloc]initWithData:metadata encoding:NSUTF8StringEncoding]autorelease]] atIndex:0];[text replaceOccurrencesOfString:@"LUT_3D_SIZE 33" withString:@"LUT_3D_SIZE 65" options:0 range:NSMakeRange(0,text.length)];if(DYPrimaryColorState(_exportManagedState)){[text insertString:[NSString stringWithFormat:@"# V3 input: primary CST declared code values. Output: declared primary CST encoding.\n# PRIMARY_CST input=%d/%d working=%d/%d output=%d/%d mapping=%d\n",(int)u.cm.inputTransfer,(int)u.cm.inputGamut,(int)u.cm.workingTransfer,(int)u.cm.workingGamut,(int)u.cm.outputTransfer,(int)u.cm.outputGamut,(int)u.cm.toneMapping] atIndex:0];}else [text insertString:@"# V2 input: declared camera/LUT code values, or sRGB in host mode. Output: sRGB / Rec.709.\n" atIndex:0];}
if(_exportManagedState){NSData *metadata=[NSJSONSerialization dataWithJSONObject:_exportManagedState options:NSJSONWritingSortedKeys error:nil];if(metadata)[text insertString:[NSString stringWithFormat:@"# DAYU_CMS_STATE %@\n",[[[NSString alloc]initWithData:metadata encoding:NSUTF8StringEncoding]autorelease]] atIndex:0];[text replaceOccurrencesOfString:@"LUT_3D_SIZE 33" withString:@"LUT_3D_SIZE 65" options:0 range:NSMakeRange(0,text.length)];if(DYPrimaryColorState(_exportManagedState)){[text insertString:[NSString stringWithFormat:@"# V3 input/output: code values defined by enabled primary CST stages; a disabled primary passes unmanaged host code values.\n# PRIMARY_CST enabled=%d input=%d/%d working=%d/%d output=%d/%d mapping=%d\n",u.primarySectionEnabled>.5,(int)(u.inputSectionEnabled>.5?u.cm.inputTransfer:u.cm.workingTransfer),(int)(u.inputSectionEnabled>.5?u.cm.inputGamut:u.cm.workingGamut),(int)u.cm.workingTransfer,(int)u.cm.workingGamut,(int)(u.cm.outputEnabled>.5?u.cm.outputTransfer:u.cm.workingTransfer),(int)(u.cm.outputEnabled>.5?u.cm.outputGamut:u.cm.workingGamut),(int)u.cm.toneMapping] atIndex:0];}else [text insertString:@"# V2 input: declared camera/LUT code values, or sRGB in host mode. Output: sRGB / Rec.709.\n" atIndex:0];}
return [text writeToURL:url atomically:YES encoding:NSUTF8StringEncoding error:err];
}}
@end