补入御4Pro和Pocket4系列色域同名入口,准备141像素验证
这个提交包含在:
1 父节点
e09c3ecd5e
当前提交
f241a470ca
12 个文件已更改
+186
-55
没有与搜索条件相匹配的文件
+12
-7
@@ -395,24 +395,29 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];Pixels neutral=render(run,renderer,source,destination,gpu,defaults,@{},@"renderer-default-pass");Difference neutralDifference=difference(input,neutral);
|
||||
run.record(@"transparent-premultiplied-neutral",neutralDifference.nonfinite==0&&neutralDifference.maximum<=.001,measure(neutralDifference));
|
||||
// Exercise actual GPU routes, rather than only checking menu labels.
|
||||
const int djiCameraCurves[][3]={{31,11,10},{32,11,10},{33,11,10},{34,12,28}};
|
||||
const int djiCameraCurves[][4]={{31,11,10,29},{32,11,10,30},{33,11,10,31},{34,12,28,32}};
|
||||
for(const auto &camera:djiCameraCurves){
|
||||
BOOL menu=YES;for(NSString *key in @[@"cminputTransfer",@"cmworkingTransfer",@"cmoutputTransfer"]){
|
||||
NSDictionary *choice=nil;for(NSDictionary *item in DYDescriptors())if([item[@"key"]isEqual:key])choice=item;
|
||||
NSUInteger index=[choice[@"values"]indexOfObject:@(camera[0])];
|
||||
menu&=choice&&index!=NSNotFound&&[choice[@"options"][index]containsString:@"DJI"];
|
||||
}
|
||||
for(NSString *key in @[@"cminputGamut",@"cmworkingGamut",@"cmoutputGamut"]){
|
||||
NSDictionary *choice=nil;for(NSDictionary *item in DYDescriptors())if([item[@"key"]isEqual:key])choice=item;
|
||||
NSUInteger index=[choice[@"values"]indexOfObject:@(camera[3])];
|
||||
menu&=choice&&index!=NSNotFound&&[choice[@"options"][index]containsString:@"DJI"];
|
||||
}
|
||||
run.record([NSString stringWithFormat:@"dji-camera-%d-menu",camera[0]],menu);
|
||||
for(int stage=0;stage<3;stage++){
|
||||
DYUniforms named=defaults;named.cm.configured=1;named.cm.toneMapping=0;
|
||||
named.cm.inputTransfer=stage==0?camera[0]:11;named.cm.inputGamut=10;
|
||||
named.cm.workingTransfer=stage==1?camera[0]:10;named.cm.workingGamut=stage==1?camera[2]:16;
|
||||
named.cm.outputTransfer=stage==2?camera[0]:1002;named.cm.outputGamut=stage==2?camera[2]:22;
|
||||
if(stage==0)named.cm.inputGamut=camera[2];
|
||||
named.cm.workingTransfer=stage==1?camera[0]:10;named.cm.workingGamut=stage==1?camera[3]:16;
|
||||
named.cm.outputTransfer=stage==2?camera[0]:1002;named.cm.outputGamut=stage==2?camera[3]:22;
|
||||
if(stage==0)named.cm.inputGamut=camera[3];
|
||||
DYUniforms generic=named;
|
||||
if(stage==0)generic.cm.inputTransfer=camera[1];
|
||||
if(stage==1)generic.cm.workingTransfer=camera[1];
|
||||
if(stage==2)generic.cm.outputTransfer=camera[1];
|
||||
if(stage==0){generic.cm.inputTransfer=camera[1];generic.cm.inputGamut=camera[2];}
|
||||
if(stage==1){generic.cm.workingTransfer=camera[1];generic.cm.workingGamut=camera[2];}
|
||||
if(stage==2){generic.cm.outputTransfer=camera[1];generic.cm.outputGamut=camera[2];}
|
||||
// Unsupported BASIS encodings use the existing float CST adapter.
|
||||
named.cm.exposure=generic.cm.exposure=.25;
|
||||
Pixels a=render(run,renderer,source,destination,gpu,named,@{},[NSString stringWithFormat:@"dji-camera-%d-stage-%d-render",camera[0],stage]);
|
||||
|
||||
@@ -802,7 +802,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[popup addItemWithTitle:options[i]];NSMenuItem *item=popup.lastItem;if(values)item.tag=[values[i]integerValue];if(help)item.toolTip=help[i];
|
||||
}
|
||||
popup.font=[NSFont systemFontOfSize:11];
|
||||
if(groups)popup.toolTip=@"按素材的实际色域选择;D-Log 使用 D-Gamut,D-Log 2 使用 D-Gamut 2。下方机型矩阵供既有配置使用,机型共用标准色域时无需单列。";
|
||||
if(groups)popup.toolTip=@"按素材实际拍摄模式选择;D-Log 使用 D-Gamut,D-Log 2 使用 D-Gamut 2,也可选择对应机型的同名项。旧版机型转换保留原有结果。";
|
||||
popup.target=self; popup.action=@selector(scalarChanged:); popup.tag=[pid integerValue];
|
||||
popup.accessibilityLabel=d[@"title"]; [row addSubview:popup]; record[@"popup"]=popup;
|
||||
} else {
|
||||
|
||||
+13
-9
@@ -81,15 +81,19 @@ NSArray<NSDictionary *> *DYCMGamuts(void) { return @[
|
||||
@{ @"id":@25, @"name":@"Sony S-Gamut" },
|
||||
@{ @"id":@26, @"name":@"Sony S-Gamut3" },
|
||||
@{ @"id":@27, @"name":@"Sony S-Gamut3.Cine" },
|
||||
// Distinct historical matrices remain addressable by their original IDs.
|
||||
// They are not aliases of D-Gamut, or a complete DJI camera catalogue.
|
||||
@{ @"id":@8, @"name":@"DJI Action 5", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@9, @"name":@"DJI Air 2S", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@11, @"name":@"DJI Mavic2 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@13, @"name":@"DJI Mini 4 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@14, @"name":@"DJI Mini 5 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
|
||||
@{ @"id":@15, @"name":@"DJI Pocket 3", @"group":@"旧版 DJI 机型矩阵(兼容)" }
|
||||
// Existing device matrices retain their IDs; new named standard-gamut aliases
|
||||
// make the requested cameras selectable in the same device list.
|
||||
@{ @"id":@8, @"name":@"DJI Action 5", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@9, @"name":@"DJI Air 2S", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@11, @"name":@"DJI Mavic2 Pro", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@29, @"name":@"DJI Mavic 4 Pro / 御 4 Pro (D-Log)", @"group":@"DJI 机型色域(含旧版兼容)", @"help":@"御 4 Pro 的 D-Log 模式,等同 DJI D-Gamut;D-Log M 素材不要选此项。" },
|
||||
@{ @"id":@13, @"name":@"DJI Mini 4 Pro", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@14, @"name":@"DJI Mini 5 Pro", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@15, @"name":@"DJI Pocket 3", @"group":@"DJI 机型色域(含旧版兼容)" },
|
||||
@{ @"id":@30, @"name":@"DJI Pocket 4 (D-Log)", @"group":@"DJI 机型色域(含旧版兼容)", @"help":@"Pocket 4 的 D-Log 模式,等同 DJI D-Gamut。" },
|
||||
@{ @"id":@31, @"name":@"DJI Pocket 4P (D-Log)", @"group":@"DJI 机型色域(含旧版兼容)", @"help":@"Pocket 4P 的 D-Log 模式,等同 DJI D-Gamut;D-Log 2 使用对应的另一项。" },
|
||||
@{ @"id":@32, @"name":@"DJI Pocket 4P (D-Log 2)", @"group":@"DJI 机型色域(含旧版兼容)", @"help":@"Pocket 4P 的 D-Log 2 模式,等同 DJI D-Gamut 2;D-Log 使用对应的另一项。" }
|
||||
]; }
|
||||
|
||||
static NSDictionary *cmRow(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double def,int tab,NSArray *choices=nil){
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.3</string>
|
||||
<string>1.22.4</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>140</string>
|
||||
<string>141</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户