From d5aba63b4e1f870b5cbcf6cb36b172b7a242a35c Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 4 Nov 2026 07:53:14 +0800 Subject: [PATCH] Restore workspace inheritance and declared Cube output; extend CMS regressions (validation ongoing) --- template/sources/RegisteredParameters.json | 6 +-- 大鱼调色/Plugin/DYDiagnostics.mm | 1 + 大鱼调色/Plugin/DYInspector.mm | 5 ++- 大鱼调色/Plugin/DYManagedColor.h | 2 + 大鱼调色/Plugin/DYManagedColor.mm | 12 +++++- 大鱼调色/Plugin/DYManagedColorPanel.mm | 4 +- 大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h | 48 ++++++++++++++++++++++ 大鱼调色/Plugin/DYPrimaryRender.inc.h | 5 ++- 大鱼调色/Plugin/DYRenderer.mm | 16 ++++++++ 大鱼调色/Plugin/DYToolState.mm | 3 +- 10 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json index 29546b8..3ea2845 100644 --- a/template/sources/RegisteredParameters.json +++ b/template/sources/RegisteredParameters.json @@ -3638,13 +3638,13 @@ "大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157", "大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0", "大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d", - "大鱼调色/Plugin/DYManagedColor.h": "227b9149cdc743b6e8908eda9cff648e0b9e366805d60689066b714a10e075b1", - "大鱼调色/Plugin/DYManagedColor.mm": "dc045653448497cd3efa1ba0dced083db911d1a28f68d63eb332ceb37961ad53", + "大鱼调色/Plugin/DYManagedColor.h": "d5901d6ac11d93f3f4438dd8d48bb3a123d06d9b79ed39e8dca38db4261bc87a", + "大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08", "大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c", "大鱼调色/Plugin/DYModel.mm": "29fea6064d3131119933401f554cc04e48cadf07d0c62f25b8d66795201396f8", "大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9", "大鱼调色/Plugin/DYToolState.h": "0a83109d2c02626d6b9e7340b74be6e6a74f366f31f9d7622b4a88000d5ad7b9", - "大鱼调色/Plugin/DYToolState.mm": "3be23fd6e50f1137a2d5f2c087fd5724d0c41ca0aabb8e3b43dbb0ed7ec6b578", + "大鱼调色/Plugin/DYToolState.mm": "be984c73f5c4e563e3ac8de2b911e33071773f3d823b6b2d631444d3aa2baea2", "大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a", "大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16", "大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2", diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index e2b76fe..9a3c420 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -500,6 +500,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { #include "DYToolPenDiagnostics.inc.h" #include "DYMaskPanelDiagnostics.inc.h" #include "DYManagedDiagnostics.inc.h" + #include "DYPrimaryDiagnostics.inc.h" [gpu release]; } @catch(NSException *exception) { run.record(@"diagnostic-exception",false,@{@"exception":exception.name?:@"unknown",@"message":exception.reason?:@"unknown"}); diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index bf58ae9..882a671 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -857,7 +857,7 @@ static NSImage *DYWheelImage(void) { if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];} else if(old.schema<2){double cfg=0;[get getFloatValue:&cfg fromParameter:2236 atTime:action.currentTime];if(cfg<.5)[set setFloatValue:-1 toParameter:2236 atTime:action.currentTime];} if(old.schema<2){DYInspectorToken *token=[[old copy]autorelease];token.schema=2;[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime];} - } } + }DYPrimaryControlChanged(_manager,action.currentTime,d[@"key"]); } @finally { [action endAction:self]; } [self postChanged]; } @@ -865,7 +865,7 @@ static NSImage *DYWheelImage(void) { NSDictionary *r=_controls[@(sender.tag)],*d=r[@"descriptor"];if(!d)return; id action=[self actionAPI];if(!action)return; [action startAction:self]; - @try {id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:[d[@"default"] doubleValue] toParameter:(UInt32)sender.tag atTime:action.currentTime];if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];}} + @try {id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:[d[@"default"] doubleValue] toParameter:(UInt32)sender.tag atTime:action.currentTime];if([d[@"key"]hasPrefix:@"cm"]){[set setFloatValue:1 toParameter:2236 atTime:action.currentTime];[self clearPrimaryBypasses:set time:action.currentTime];}DYPrimaryControlChanged(_manager,action.currentTime,d[@"key"]);} @finally {[action endAction:self];} [self postChanged]; } @@ -948,6 +948,7 @@ static NSImage *DYWheelImage(void) { NSNumber *extra=section[@"extraEnabled"];if(extra)[set setFloatValue:defaultEnabled toParameter:extra.unsignedIntValue atTime:t]; NSString *key=section[@"key"]?:@""; if([key isEqual:@"primary"]){for(NSDictionary *d in DYDescriptors())if([d[@"key"]hasPrefix:@"cm"])[set setFloatValue:[d[@"default"]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];[set setFloatValue:1 toParameter:2236 atTime:t];for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:1 toParameter:linked.unsignedIntValue atTime:t];[set setFloatValue:0 toParameter:2013 atTime:t];DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];NSMutableDictionary *paths=[[state.paths mutableCopy]autorelease];[paths removeObjectForKey:@"input"];state.paths=paths;DYWriteAssets(_manager,state,t);} + if([key isEqual:@"primary"])DYPrimaryControlChanged(_manager,t,@"cmworkingTransfer"); if([key isEqual:@"spider"]){DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];auto m=DYSpiderMesh(state.spiderMesh);m=dy::neutralMesh(m.hues,m.rings+1);state.spiderMesh=[NSData dataWithBytes:&m length:sizeof(m)];DYWriteAssets(_manager,state,t);} if([key localizedCaseInsensitiveContainsString:@"input"]||[key localizedCaseInsensitiveContainsString:@"look"]) { DYAssetState *assets=[[DYReadAssets(_manager,t) copy] autorelease]; diff --git a/大鱼调色/Plugin/DYManagedColor.h b/大鱼调色/Plugin/DYManagedColor.h index 125095f..39f8d67 100644 --- a/大鱼调色/Plugin/DYManagedColor.h +++ b/大鱼调色/Plugin/DYManagedColor.h @@ -7,6 +7,8 @@ FOUNDATION_EXPORT NSDictionary *DYPrimaryColorDefaults(void); FOUNDATION_EXPORT BOOL DYPrimaryColorState(NSDictionary *state); FOUNDATION_EXPORT void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut); FOUNDATION_EXPORT BOOL DYManagedColorValid(id state,NSError **error); +FOUNDATION_EXPORT void DYFollowPrimaryWorkingSpace(NSMutableDictionary *document,float transfer,float gamut); +FOUNDATION_EXPORT void DYPrimaryControlChanged(id manager,CMTime time,NSString *key); FOUNDATION_EXPORT NSArray *DYManagedInputSpaces(void); FOUNDATION_EXPORT NSArray *DYManagedOutputSpaces(void); FOUNDATION_EXPORT NSDictionary *DYHostColorContext(FxImageTile *source,FxImageTile *destination,NSInteger primaries); diff --git a/大鱼调色/Plugin/DYManagedColor.mm b/大鱼调色/Plugin/DYManagedColor.mm index d017386..473a28a 100644 --- a/大鱼调色/Plugin/DYManagedColor.mm +++ b/大鱼调色/Plugin/DYManagedColor.mm @@ -1,11 +1,21 @@ #import "DYManagedColor.h" +#import "DYToolState.h" #include "../../ColorManagement/Core/DYColorManagement.hpp" #include #include NSDictionary *DYManagedColorDefaults(void){return @{@"version":@2,@"mode":@1,@"input":@109,@"output":@1,@"gamutCompression":@YES,@"engine":@"OpenColorIO-2.5.2",@"config":@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"};} NSDictionary *DYPrimaryColorDefaults(void){return @{@"version":@3,@"mode":@4,@"engine":@"Dayu-CST-f32",@"config":@"primary-parameters-v1"};} BOOL DYPrimaryColorState(NSDictionary *s){return [s isKindOfClass:NSDictionary.class]&&[s[@"version"]isEqual:@3]&&[s[@"mode"]isEqual:@4];} -void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut){if(![node[@"type"]isEqual:@"primary"])return;NSMutableDictionary*v=node[@"values"];for(NSString *part in @[@"input",@"working",@"output"]){NSString*t=[NSString stringWithFormat:@"cm%@Transfer",part],*g=[NSString stringWithFormat:@"cm%@Gamut",part];if(!v[t])v[t]=@(transfer);if(!v[g])v[g]=@(gamut);}} +void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut){ + if(![node[@"type"]isEqual:@"primary"])return;NSMutableDictionary*v=node[@"values"];NSUInteger follow=[node[@"primaryFollow"]unsignedIntegerValue],bit=1; + for(NSString *part in @[@"input",@"working",@"output"]){NSString*t=[NSString stringWithFormat:@"cm%@Transfer",part],*g=[NSString stringWithFormat:@"cm%@Gamut",part];if(!v[t]&&!v[g])follow|=bit;if(!v[t])v[t]=@(transfer);if(!v[g])v[g]=@(gamut);bit<<=1;}node[@"primaryFollow"]=@(follow); +} +void DYFollowPrimaryWorkingSpace(NSMutableDictionary *doc,float transfer,float gamut){for(NSMutableDictionary*node in doc[@"layers"]){NSUInteger follow=[node[@"primaryFollow"]unsignedIntegerValue],bit=1;if(![node[@"type"]isEqual:@"primary"])continue;for(NSString*part in @[@"input",@"working",@"output"]){if(follow&bit){node[@"values"][[NSString stringWithFormat:@"cm%@Transfer",part]]=@(transfer);node[@"values"][[NSString stringWithFormat:@"cm%@Gamut",part]]=@(gamut);}bit<<=1;}}} +void DYPrimaryControlChanged(id manager,CMTime time,NSString *key){ + if([manager isKindOfClass:DYToolManager.class]||![@[@"cmworkingTransfer",@"cmworkingGamut"]containsObject:key]||!DYPrimaryColorState(DYReadAssets(manager,time).colorManagement))return; + DYUniforms u;DYReadUniforms(manager,time,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(manager,time).document);DYFollowPrimaryWorkingSpace(doc,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(manager,doc,time); +} + NSArray *DYManagedInputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::spaces())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;} NSArray *DYManagedOutputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::outputs())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;} BOOL DYManagedColorValid(id state,NSError **error){ diff --git a/大鱼调色/Plugin/DYManagedColorPanel.mm b/大鱼调色/Plugin/DYManagedColorPanel.mm index d9a7690..e907dd3 100644 --- a/大鱼调色/Plugin/DYManagedColorPanel.mm +++ b/大鱼调色/Plugin/DYManagedColorPanel.mm @@ -34,12 +34,12 @@ static NSTextField *cmsLabel(NSString*s){NSTextField*l=[NSTextField wrappingLabe NSDictionary *values=s.count&&!DYPrimaryColorState(s)?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i]; _input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode==4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标"; _help.stringValue=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。"; - _context.stringValue=mode==4?@"码值载体 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_refreshing=NO;[self setNeedsLayout:YES]; + _context.stringValue=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_refreshing=NO;[self setNeedsLayout:YES]; } - (void)setInputLUTPath:(NSString*)path{NSString *saved=[path copy];[_inputLUTPath release];_inputLUTPath=saved;_lut.title=path.length?path.lastPathComponent:@"选择输入 LUT…";_lut.toolTip=path.length?path:@"选择 LUT,并准确指定其输出编码";_lut.accessibilityLabel=path.length?[@"输入 LUT:" stringByAppendingString:path.lastPathComponent]:@"选择输入 LUT";} - (void)refreshContext{[self refreshWithState:_state context:[_renderer colorContext]];} - (void)writeState:(NSDictionary*)state { - if(state&&!DYManagedColorValid(state,nil))return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{idundo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);if(DYPrimaryColorState(state)&&!DYPrimaryColorState(_state)){DYUniforms u;DYReadUniforms(_manager,a.currentTime,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);for(NSMutableDictionary*node in doc[@"layers"])DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(_manager,doc,a.currentTime);}[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager]; + if(state&&!DYManagedColorValid(state,nil))return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{idundo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);if(DYPrimaryColorState(state)&&!DYPrimaryColorState(_state)){DYUniforms u;DYReadUniforms(_manager,a.currentTime,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);for(NSMutableDictionary*node in doc[@"layers"])DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);DYFollowPrimaryWorkingSpace(doc,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(_manager,doc,a.currentTime);}[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager]; } - (void)modeChanged:(id)sender {if(_refreshing)return;NSInteger mode=_mode.indexOfSelectedItem;_selectionGeneration++;if(mode==3&&(!_inputLUTPath.length||![NSFileManager.defaultManager fileExistsAtPath:_inputLUTPath])){[self refreshWithState:_state context:[_renderer colorContext]];[self selectInputLUTAndEnable:YES];return;}if(!mode){[self writeState:nil];return;}if(mode==4){[self writeState:DYPrimaryColorDefaults()];return;}NSMutableDictionary *s=[[(_state&&!DYPrimaryColorState(_state)?_state:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@(mode);[self writeState:s];} - (void)settingsChanged:(id)sender {if(_refreshing||!_state)return;NSMutableDictionary*s=[[_state mutableCopy]autorelease];s[@"input"]=_input.selectedItem.representedObject;s[@"output"]=_output.selectedItem.representedObject;s[@"gamutCompression"]=@(_gamut.state==NSControlStateValueOn);[self writeState:s];} diff --git a/大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h b/大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h new file mode 100644 index 0000000..c5f8bb4 --- /dev/null +++ b/大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h @@ -0,0 +1,48 @@ +// Regression for the user's failure case: scene grading precedes the main ODT. +{ + DYRenderer *primaryRenderer=[[[DYRenderer alloc]init]autorelease];NSDictionary *v3=DYPrimaryColorDefaults();DYToolDocument *empty=[[[DYToolDocument alloc]init]autorelease]; + run.need(@"primary-v3-independent-state-valid",DYManagedColorValid(v3,nil)&&DYPrimaryColorState(v3));NSMutableDictionary *bad=DYMutablePlist(v3);bad[@"input"]=@109;run.record(@"primary-v3-rejects-conflicting-global-input",!DYManagedColorValid(bad,nil)); + DYAssetState *saved=[[[DYAssetState alloc]init]autorelease];saved.colorManagement=v3;NSData *encoded=[NSKeyedArchiver archivedDataWithRootObject:saved requiringSecureCoding:YES error:&error];DYAssetState *decoded=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:encoded error:&error];run.record(@"primary-v3-secure-state-roundtrip",[saved isEqual:decoded]); + DYUniforms u=defaults;u.skinProtection.x=0;u.cm.configured=1;u.cm.inputTransfer=28;u.cm.inputGamut=27;u.cm.workingTransfer=10;u.cm.workingGamut=16;u.cm.outputTransfer=1002;u.cm.outputGamut=22;u.cm.toneMapping=1; + auto decodeCarrier=[](float x){return x<=.04045f?x/12.92f:powf((x+.055f)/1.055f,2.4f);};auto encodeCarrier=[](float x){return x<=.0031308f?12.92f*x:1.055f*powf(x,1/2.4f)-.055f;}; + std::vectorscene(width*height);float levels[]={.002f,.018f,.18f,1,4,16,32,64};for(size_t i=0;i pixels){dycm::Transform::convert(dycm::Space::ACEScg,dycm::Space::SonySLog3Cine).apply(pixels,dycm::Alpha::Premultiplied);Pixels out(pixels.size()*4);for(size_t i=0;ir(scene.size());for(size_t i=0;i&r){Pixels p(r.size()*4);for(size_t i=0;i.05); + // Neutral additional layers are exact bypasses, with no second display map. + NSMutableDictionary *doc=DYMutablePlist(empty.document);for(int i=0;i<4;i++)DYSeedPrimaryWorkingSpace((id)DYInsertTool(doc,@"primary",@"base:primary"),10,16);Pixels neutral=renderPrimary(u,doc,@"primary-four-inherited-neutral-layers");run.record(@"primary-new-layer-inherits-workspace-no-remap",difference(baseline,neutral).maximum==0); + // Move the entire exposure correction into an independent layer. The result + // 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); + // 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); + // Zero masks and zero mix bypass grade while retaining global input/output. + NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle)),*masked=DYMutablePlist(empty.document);DYMaskParameters mp=DYMaskAtTime(mask,kCMTimeZero);mp.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&mp length:sizeof(mp)];masked[@"baseMasks"][@"primary"]=@[mask];Pixels zero=renderPrimary(reduced,masked,@"primary-zero-mask");reduced.cm.mix=0;Pixels zeroMix=renderPrimary(reduced,empty.document,@"primary-zero-grade-mix");run.record(@"primary-zero-mask-and-mix-retain-CST-boundaries",difference(zero,baseline).maximum==0&&difference(zeroMix,baseline).maximum==0); + // A half-strength one-stop grade is 1.5x light, before mapping. + DYUniforms half=u;half.cm.exposure=1;half.cm.mix=.5;Pixels halfFrame=renderPrimary(half,empty.document,@"primary-linear-light-half-mix");half.cm.exposure=log2f(1.5f);half.cm.mix=1;Pixels halfReference=renderPrimary(half,empty.document,@"primary-linear-light-mix-reference");run.record(@"primary-mix-in-linear-AP1",difference(halfFrame,halfReference).maximum<.003,measure(difference(halfFrame,halfReference))); + // Print looks cross into their real ACEScct domain, then return to the chosen + // working space. Neutral grade must not make the choice alter the print. + DYUniforms print=u;print.filmPrint.x=1;print.filmPrint.y=.6;Pixels printDI=renderPrimary(print,empty.document,@"primary-print-DWG-before-output");print.cm.workingTransfer=1;print.cm.workingGamut=2;Pixels printACES=renderPrimary(print,empty.document,@"primary-print-ACES-before-output");Difference printDelta=difference(printDI,printACES);run.record(@"primary-print-domain-adapts-to-selected-working-space",printDelta.maximum<.005&&difference(printDI,baseline).different>20,measure(printDelta)); + // The output controls change data output, and the optional display map is last. + DYUniforms logOut=u;logOut.cm.outputTransfer=10;logOut.cm.outputGamut=16;logOut.cm.toneMapping=0;Pixels selectedOutput=renderPrimary(logOut,empty.document,@"primary-declared-Log-output");run.record(@"primary-declared-output-controls-restored",difference(intermediate,selectedOutput).maximum==0&&difference(selectedOutput,baseline).maximum>.05); + DYUniforms unmapped=u;unmapped.cm.toneMapping=0;Pixels noMap=renderPrimary(unmapped,empty.document,@"primary-no-output-tone-map");run.record(@"primary-tone-mapping-switch-restored",difference(noMap,baseline).maximum>.05); + 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;i0){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); + // 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];idaction=[local apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:nil];[(id)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::vectortable;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)}); + // Cube output follows the selected encoding, independent of the monitor. + linear.cm.exposure=0;linear.cm.outputGamut=22;float gammaValues[2]={};BOOL gammaExports=YES;int gammaIDs[]={1001,1003};for(int j=0;j<2;j++){linear.cm.outputTransfer=gammaIDs[j];NSURL *target=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:[NSString stringWithFormat:@"primary-gamma-%d.cube",gammaIDs[j]]]];e=nil;BOOL ok=[primaryRenderer exportLUT:target uniforms:linear paths:@{} spider:nil tools:empty.document colorManagement:v3 error:&e];std::vectorvalues;NSUInteger n=0;ok=ok&&DYLUTReadCube(target.path,values,n,&e)&&n==65;gammaExports&=ok;if(ok)gammaValues[j]=values[((32*n+32)*n+32)*4];}run.record(@"primary-Cube-restores-output-gamma-selection",gammaExports&&fabs(gammaValues[0]-powf(.5f,1/2.2f))<.001&&fabs(gammaValues[1]-powf(.5f,1/2.6f))<.001,@{@"Gamma22":@(gammaValues[0]),@"Gamma26":@(gammaValues[1])}); + upload(input); +} diff --git a/大鱼调色/Plugin/DYPrimaryRender.inc.h b/大鱼调色/Plugin/DYPrimaryRender.inc.h index 3e50894..15a3cdb 100644 --- a/大鱼调色/Plugin/DYPrimaryRender.inc.h +++ b/大鱼调色/Plugin/DYPrimaryRender.inc.h @@ -1,5 +1,8 @@ // Opt-in V3. The root primary owns input/working/output; V1/V2 stay frozen. - (BOOL)renderPrimarySource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools hostPrimaries:(NSInteger)primaries error:(NSError**)error { + // The main eye bypasses the whole primary/CST module. Other tools retain + // their established unmanaged host workflow rather than inheriting a Log tag. + 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;idd=entry[@"device"];idsource=[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); @@ -27,7 +30,7 @@ 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. if(outputEnabled&&!transform(DYCMRender(u.cm).output))return NO; - u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYManagedActiveFinishing(u,finishPaths,spider,finishing); + 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]; diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index ba05c99..c45a1f2 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -83,6 +83,22 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData } for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node))[active addObject:node[@"type"]];return active; } +// V3 eligibility is based on active math, not differences in disabled switches. +// Keep the historical V2 predicate/render behavior unchanged. +static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData *spider,NSDictionary *tools){ + auto normalize=[](DYUniforms v){ + float *values=&v.exposure,*flags=&v.exposureEnabled; + for(int i=0;i<13;i++){BOOL group=i>=6&&i<=9?v.colorSectionEnabled>.5:v.baseSectionEnabled>.5;if(!group||flags[i]<.5)values[i]=0;flags[i]=1;} + for(NSDictionary *section in DYSections())for(NSDictionary *row in section[@"rows"])if(row[@"enabled"]){ + for(NSDictionary *flag in DYDescriptors())if([flag[@"pid"]isEqual:row[@"enabled"]]&&[flag[@"offset"]integerValue]>=0){float*f=(float*)((uint8_t*)&v+[flag[@"offset"]unsignedIntegerValue]);if(*f<.5&&[row[@"offset"]integerValue]>=0)*(float*)((uint8_t*)&v+[row[@"offset"]unsignedIntegerValue])=[row[@"default"]floatValue];*f=[flag[@"default"]floatValue];} + } + v.postLUTStrength=1;for(int i=0;i<4;i++){v.extraPostLUTStrengths[i]=1;v.extraLookSectionEnableds[i]=1;} + return v; + }; + auto visiblePaths=[](NSDictionary*p,DYUniforms v){NSMutableDictionary*out=[[p mutableCopy]autorelease]?:[NSMutableDictionary dictionary];for(int i=0;i<5;i++)if(v.lookSectionEnabled<.5||(i>0&&v.extraLookSectionEnableds[i-1]<.5)||(i==0?v.postLUTStrength:v.extraPostLUTStrengths[i-1])<=0)[out removeObjectForKey:[NSString stringWithFormat:@"look%d",i]];return out;}; + NSDictionary*rootPaths=visiblePaths(paths,u);u=normalize(u);NSMutableDictionary*doc=DYMutablePlist(tools);for(NSMutableDictionary*node in doc[@"layers"]){DYUniforms original=DYToolUniforms(node),v=normalize(original);NSMutableDictionary*values=[NSMutableDictionary dictionary];for(NSDictionary*d in DYBaseToolDescriptors(node[@"type"]))if([d[@"offset"]integerValue]>=0)values[d[@"key"]]=@(*(float*)((uint8_t*)&v+[d[@"offset"]unsignedIntegerValue]));node[@"values"]=values;node[@"paths"]=visiblePaths(node[@"paths"],original);} + return DYManagedActiveFinishing(u,rootPaths,spider,doc); +} @interface DYRenderer(){ NSMutableDictionary *_devices,*_luts,*_preparedLUTs; NSSet *_activeLUTPaths; diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index d767384..5ee5885 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -78,6 +78,7 @@ BOOL DYValidToolDocument(NSDictionary *doc){ NSMutableSet *ids=[NSMutableSet set];for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids))return NO;} NSMutableDictionary *descriptors=[NSMutableDictionary dictionary];for(NSDictionary *d in DYDescriptors())descriptors[d[@"key"]]=d; for(NSDictionary *node in doc[@"layers"]){if(![node isKindOfClass:NSDictionary.class]||!validID(node[@"id"])||[ids containsObject:node[@"id"]]||![DYToolTypes()containsObject:node[@"type"]]||![node[@"values"]isKindOfClass:NSDictionary.class]||[node[@"values"]count]>descriptors.count||![node[@"paths"]isKindOfClass:NSDictionary.class]||[node[@"paths"]count]>6||!validMasks(node[@"masks"],ids))return NO;[ids addObject:node[@"id"]]; + if(node[@"primaryFollow"]&&(![node[@"type"]isEqual:@"primary"]||!finiteNumber(node[@"primaryFollow"])||[node[@"primaryFollow"]doubleValue]!=floor([node[@"primaryFollow"]doubleValue])||[node[@"primaryFollow"]integerValue]<0||[node[@"primaryFollow"]integerValue]>7))return NO; for(NSString *key in node[@"values"]){NSDictionary *d=descriptors[key];id v=node[@"values"][key];if(!d||!finiteNumber(v)||[v doubleValue]<[d[@"min"]doubleValue]||[v doubleValue]>[d[@"max"]doubleValue]||(d[@"values"]&&![d[@"values"]containsObject:@((int)llround([v doubleValue]))]))return NO;} for(id key in node[@"paths"]){id p=node[@"paths"][key];if(![@[@"input",@"look0",@"look1",@"look2",@"look3",@"look4"]containsObject:key]||![p isKindOfClass:NSString.class]||[p length]>8192||![p isAbsolutePath]||![[p pathExtension].lowercaseString isEqual:@"cube"])return NO;}if(node[@"spider"]&&(![node[@"spider"]isKindOfClass:NSData.class]||!DYSpiderMeshIsValid(node[@"spider"])))return NO; } @@ -137,7 +138,7 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms - (CMTime)currentTime{return _time;} - (NSDictionary*)node{return DYToolWithID(_pending?:DYReadTools(_host,_time).document,_nodeID);} - (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{NSDictionary *n=[self node];DYUniforms u=DYToolUniforms(n?:@{@"type":_type});for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;} -- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){n[@"values"][d[@"key"]]=@(v);return YES;}return NO;} +- (BOOL)setFloatValue:(double)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth||!std::isfinite(v))return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){NSString *key=d[@"key"];if(n[@"primaryFollow"]&&([key hasSuffix:@"Transfer"]||[key hasSuffix:@"Gamut"])){NSUInteger bit=[key hasPrefix:@"cminput"]?1:[key hasPrefix:@"cmworking"]?2:[key hasPrefix:@"cmoutput"]?4:0;n[@"primaryFollow"]=@([n[@"primaryFollow"]unsignedIntegerValue]&~bit);}n[@"values"][key]=@(v);return YES;}return NO;} - (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;} - (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;} @end