新增御4Pro与Pocket4/4P标准CST曲线入口,准备1.22.3验证
这个提交包含在:
1 父节点
883f680ade
当前提交
4fd7829a7f
8 个文件已更改
+96
-10
没有与搜索条件相匹配的文件
@@ -0,0 +1,20 @@
|
||||
# DJI 相机曲线预设(2026-11-16)
|
||||
|
||||
仅修改大鱼调色产品,独立大鱼CST工程未变。输入、工作与输出曲线共用 `DYCMSceneSpaces()`,因此一级调色及独立 CST 同时获得命名条目。新增 ID,既有参数编号、默认值、色域和已存工程保持原义。
|
||||
|
||||
| ID | 菜单 | 原有数学曲线 | 手动搭配色域 |
|
||||
|---|---|---|---|
|
||||
|31|DJI Mavic 4 Pro / 御 4 Pro (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|
||||
|32|DJI Pocket 4 (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|
||||
|33|DJI Pocket 4P (D-Log)|11 DJI D-Log|10 DJI D-Gamut|
|
||||
|34|DJI Pocket 4P (D-Log 2)|12 DJI D-Log 2|28 DJI D-Gamut 2|
|
||||
|
||||
这是标准 Log 编码的机型命名入口,非 DJI 官方 Rec.709 风格 LUT。曲线与色域维持独立,不自动改写已手选色域。御4Pro的D-Log M素材仍须使用对应D-Log M处理,不选D-Log;本轮不借用其他机型的D-Log M标定。Pocket4P的D-Log2按实际支持拍摄模式选择。
|
||||
|
||||
官方依据:
|
||||
|
||||
- [御4Pro规格(三摄均列出D-Log、D-Log M、HLG)](https://www.dji.com/uk/mavic-4-pro/specs?set_region=GB&site=brandsite)
|
||||
- [大疆模式与还原LUT表(Pocket4为D-Log,4P为D-Log和D-Log2)](https://support.dji.com/help/content?customId=01700007105&documentType=&lang=zh-CN&paperDocType=ARTICLE&re=CN&spaceId=17)
|
||||
- [Pocket4P官方说明(D-Log2限1×)](https://www.dji.com/uk/osmo-pocket-4p)
|
||||
|
||||
验证:正式安装版原生自检覆盖四个机型条目,并在输入/工作/输出各阶段与原有通用D-Log/D-Log2比较实际Metal像素,包括非零一级曝光;宿主验收另记录,不以自动检查代替宿主实测。
|
||||
@@ -94,6 +94,10 @@
|
||||
"DJI D-Log",
|
||||
"DJI D-Log 2",
|
||||
"DJI D-Log M",
|
||||
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
|
||||
"DJI Pocket 4 (D-Log)",
|
||||
"DJI Pocket 4P (D-Log)",
|
||||
"DJI Pocket 4P (D-Log 2)",
|
||||
"Fujifilm F-Log",
|
||||
"Fujifilm F-Log2",
|
||||
"Fujifilm F-Log2 C",
|
||||
@@ -133,6 +137,10 @@
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
31,
|
||||
32,
|
||||
33,
|
||||
34,
|
||||
14,
|
||||
15,
|
||||
16,
|
||||
@@ -254,6 +262,10 @@
|
||||
"DJI D-Log",
|
||||
"DJI D-Log 2",
|
||||
"DJI D-Log M",
|
||||
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
|
||||
"DJI Pocket 4 (D-Log)",
|
||||
"DJI Pocket 4P (D-Log)",
|
||||
"DJI Pocket 4P (D-Log 2)",
|
||||
"Fujifilm F-Log",
|
||||
"Fujifilm F-Log2",
|
||||
"Fujifilm F-Log2 C",
|
||||
@@ -293,6 +305,10 @@
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
31,
|
||||
32,
|
||||
33,
|
||||
34,
|
||||
14,
|
||||
15,
|
||||
16,
|
||||
@@ -714,6 +730,10 @@
|
||||
"DJI D-Log",
|
||||
"DJI D-Log 2",
|
||||
"DJI D-Log M",
|
||||
"DJI Mavic 4 Pro / 御 4 Pro (D-Log)",
|
||||
"DJI Pocket 4 (D-Log)",
|
||||
"DJI Pocket 4P (D-Log)",
|
||||
"DJI Pocket 4P (D-Log 2)",
|
||||
"Fujifilm F-Log",
|
||||
"Fujifilm F-Log2",
|
||||
"Fujifilm F-Log2 C",
|
||||
@@ -753,6 +773,10 @@
|
||||
11,
|
||||
12,
|
||||
13,
|
||||
31,
|
||||
32,
|
||||
33,
|
||||
34,
|
||||
14,
|
||||
15,
|
||||
16,
|
||||
@@ -3716,13 +3740,13 @@
|
||||
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
|
||||
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
|
||||
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "1f435e32ee8b6f74fbc6c588f3564cc794ce100d1aae821075c115b33bb24412",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "0d2527b18589f63d63d16fd64c47a70c5973994fb3841a3246631c7e836ea8e8",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "36ae3c92cb0ce6ada6535e096154daeee221c6d73a8a8ee6117dc285939b22a8",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "3fbafab029c5568a8b235f615615e1278ab8c2419a6604c87278d4a6be0e61f0",
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "327eb427759eaac8d04de39c09c416c0c68e7cac636978c864bdd103d297aec7",
|
||||
"大鱼调色/Plugin/DYModel.mm": "544937dcab852bf2dd524377c3dd7577535b4af835638596a68ca9c6db2e888c",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "da71b283a5a0cc05ad8b1e554a105d0196f3283c4e31f0c5521204d74100b882",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "c36d2e91353f2b179be5a9df8c248ce34dbfb7e73cba913754f9d1675f2a3375",
|
||||
"大鱼调色/Plugin/DYToolState.h": "0dac1087c4c5e18b43b674ff50b7be5a9b47a151401d87ca7adc1b72908bdec0",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "5ea14fa293a881cccd9a7f56f7126ea5d0c4f81217a788a06d94ea2825404688",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
; Restored CST AIR instruction graph; texture sampling owned by host wrapper.
|
||||
; Dayu extension ID 30: official GoPro Log600, 0 EV; legacy IDs unchanged.
|
||||
; Dayu camera curve aliases 31..34: Mavic 4 Pro/Pocket 4/Pocket 4P D-Log,
|
||||
; Pocket 4P D-Log 2. Gamut remains an independent user-selected parameter.
|
||||
; ModuleID = '/Users/mac/Library/Caches/CodexBuilds/com.dayu.CST/analysis/cst-shader/module1.bc'
|
||||
source_filename = "fragmentShader"
|
||||
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-n8:16:32"
|
||||
@@ -37,7 +39,11 @@ v4:
|
||||
i32 9, label %v164
|
||||
i32 10, label %v166
|
||||
i32 11, label %v206
|
||||
i32 31, label %v206
|
||||
i32 32, label %v206
|
||||
i32 33, label %v206
|
||||
i32 12, label %v252
|
||||
i32 34, label %v252
|
||||
i32 13, label %v254
|
||||
i32 14, label %v269
|
||||
i32 15, label %v315
|
||||
@@ -1670,7 +1676,11 @@ v1012: ; preds = %v990, %v987
|
||||
i32 9, label %v1360
|
||||
i32 10, label %v1362
|
||||
i32 11, label %v1399
|
||||
i32 31, label %v1399
|
||||
i32 32, label %v1399
|
||||
i32 33, label %v1399
|
||||
i32 12, label %v1442
|
||||
i32 34, label %v1442
|
||||
i32 13, label %v1444
|
||||
i32 14, label %v1481
|
||||
i32 15, label %v1524
|
||||
|
||||
@@ -393,6 +393,29 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
defaults.cm.inputTransfer=1002;defaults.cm.inputGamut=22;defaults.cm.toneMapping=0;
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];Pixels neutral=render(run,renderer,source,destination,gpu,defaults,@{},@"renderer-default-pass");Difference neutralDifference=difference(input,neutral);
|
||||
run.record(@"transparent-premultiplied-neutral",neutralDifference.nonfinite==0&&neutralDifference.maximum<=.001,measure(neutralDifference));
|
||||
// Exercise actual GPU routes, rather than only checking menu labels.
|
||||
const int djiCameraCurves[][3]={{31,11,10},{32,11,10},{33,11,10},{34,12,28}};
|
||||
for(const auto &camera:djiCameraCurves){
|
||||
NSDictionary *choice=nil;for(NSDictionary *item in DYCMSceneSpaces())if([item[@"id"]intValue]==camera[0])choice=item;
|
||||
run.record([NSString stringWithFormat:@"dji-camera-%d-menu",camera[0]],choice!=nil&&[choice[@"name"]containsString:@"DJI"]);
|
||||
for(int stage=0;stage<3;stage++){
|
||||
DYUniforms named=defaults;named.cm.configured=1;named.cm.toneMapping=0;
|
||||
named.cm.inputTransfer=stage==0?camera[0]:11;named.cm.inputGamut=10;
|
||||
named.cm.workingTransfer=stage==1?camera[0]:10;named.cm.workingGamut=stage==1?camera[2]:16;
|
||||
named.cm.outputTransfer=stage==2?camera[0]:1002;named.cm.outputGamut=stage==2?camera[2]:22;
|
||||
if(stage==0)named.cm.inputGamut=camera[2];
|
||||
DYUniforms generic=named;
|
||||
if(stage==0)generic.cm.inputTransfer=camera[1];
|
||||
if(stage==1)generic.cm.workingTransfer=camera[1];
|
||||
if(stage==2)generic.cm.outputTransfer=camera[1];
|
||||
// Unsupported BASIS encodings use the existing float CST adapter.
|
||||
named.cm.exposure=generic.cm.exposure=.25;
|
||||
Pixels a=render(run,renderer,source,destination,gpu,named,@{},[NSString stringWithFormat:@"dji-camera-%d-stage-%d-render",camera[0],stage]);
|
||||
Pixels b=render(run,renderer,source,destination,gpu,generic,@{},[NSString stringWithFormat:@"dji-camera-%d-stage-%d-reference",camera[0],stage]);
|
||||
Difference delta=difference(a,b);
|
||||
run.record([NSString stringWithFormat:@"dji-camera-%d-stage-%d-pixels",camera[0],stage],delta.nonfinite==0&&delta.maximum<=.002,measure(delta));
|
||||
}
|
||||
}
|
||||
#include "DYIdlePreviewDiagnostics.inc.h"
|
||||
NSString *cstReference=NSProcessInfo.processInfo.environment[@"DY_DIAGNOSTIC_CST_REFERENCE"];
|
||||
if(cstReference.length){
|
||||
|
||||
@@ -31,6 +31,10 @@ NSArray<NSDictionary *> *DYCMSceneSpaces(void) { return @[
|
||||
@{ @"id":@11, @"name":@"DJI D-Log" },
|
||||
@{ @"id":@12, @"name":@"DJI D-Log 2" },
|
||||
@{ @"id":@13, @"name":@"DJI D-Log M" },
|
||||
@{ @"id":@31, @"name":@"DJI Mavic 4 Pro / 御 4 Pro (D-Log)" },
|
||||
@{ @"id":@32, @"name":@"DJI Pocket 4 (D-Log)" },
|
||||
@{ @"id":@33, @"name":@"DJI Pocket 4P (D-Log)" },
|
||||
@{ @"id":@34, @"name":@"DJI Pocket 4P (D-Log 2)" },
|
||||
@{ @"id":@14, @"name":@"Fujifilm F-Log" },
|
||||
@{ @"id":@15, @"name":@"Fujifilm F-Log2" },
|
||||
@{ @"id":@16, @"name":@"Fujifilm F-Log2 C" },
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.2</string>
|
||||
<string>1.22.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>137</string>
|
||||
<string>138</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.22.2</string>
|
||||
<string>1.22.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>137</string>
|
||||
<string>138</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
更新于2026-11-15(Asia/Shanghai)。
|
||||
更新于2026-11-16(Asia/Shanghai)。
|
||||
|
||||
## 本轮进行中:DJI 相机曲线预设
|
||||
|
||||
目标仅为大鱼调色的一级调色与独立 CST。基线 `883f680ade8706b8b89580ddc77c062a9a14dd39` 已回读远端一致;既有 Xcode 引用排序差异保留,不纳入本轮。新增稳定曲线 ID 31–34:御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log/D-Log 2,分别复用既有 11/12 的 GPU 解码与编码。色域仍独立选择:D-Log 配 DJI D-Gamut,D-Log 2 配 DJI D-Gamut 2。未将 D-Log M 冒充为 D-Log;本轮不新增无公开数学依据的御 4 Pro 专用 D-Log M 标定。版本准备为 1.22.3(138)。已加入输入/工作/输出 GPU 对比检查,待 Release 自检、正式签名公证、安装宿主验收、PKG 与 Release 附件校验。此前 1.22.2 仍为当前正式安装。
|
||||
|
||||
|
||||
## 当前结果
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户