diff --git a/research/ColorFinaleWorkspaceEvidence-20261105.md b/research/ColorFinaleWorkspaceEvidence-20261105.md index 86fa2fa..2e13c93 100644 --- a/research/ColorFinaleWorkspaceEvidence-20261105.md +++ b/research/ColorFinaleWorkspaceEvidence-20261105.md @@ -63,3 +63,41 @@ ## 本轮独立实现结果 `dy::OpenCVTracker`现使用独立编译的官方4.5.1库,12项已知运动检查通过(`verification/TrackingOpenCV-20261105.json`):300点、旋转及双轴缩放、框外路径12帧亚像素、周期重选静止、换景、平坦区、运动多数子集、实例隔离、坏帧几何保留、非有限输入及完整4K。中心误差约0.0033px(旋转/缩放)、0.0148px(12帧路径)、0.00011px(4K平移);这些是生成素材结果,不是实拍或原版轨迹对照。只依赖系统zlib/Accelerate/libc++/System,插件运行不需要研究目标或另一APP。宿主接入、共享mask作者同步、正式版本实际跟踪仍由主任务验收。 + +## 宿主分析预处理补查 + +2026-11-05追加只读复核,原版三个目标文件SHA保持不变;新增证据均在前述研究缓存的`preprocessing-*-evidence.json`和相应snapshot。GradeKit完整SHA为`e868a8c6df64bf03b7c24af5657c5ac7a2259a1943dfe06e01dbb7881df018a3`,RenderingEngine为`32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3`。 + +原版`ColorFinalePlugIn::properties:error:`(`0x1000becfc`,`ev_1fdabe00a34ba3c60c1cd544b314a75511f21bfb7e450d3980c7d6a0980e88ee`)返回常量字典。直接读取键和值表,`DesiredProcessingColorInfo`对应NSNumber的整数**2**(`ev_13298ab75f991c7f21dc02b00a61b6b2f7b62c6a5e8c7ffd47a02569c49f2dc1`、`ev_4f886e67dd650bc33b4132e6a46e22baecabcd931e35bb2283ac2f186dd02590`、`ev_46bdde28003eb68ebdb1bfbd992d6eec44a8b5bc3ade2b993aad26ed5401e422`)。本机FxTypes.h545–546核对:0是RGB_LINEAR,2是RGB_GAMMA_VIDEO,SDK注明视频gamma2.2。该请求是否被宿主实际满足仍须核对输入元数据与样本,不能把“请求”描述成所有宿主的无条件事实。 + +分析入口将`session.colorSpace`和`effectTime`传给`FTFrameTile::frameTileWithImageTile:colorSpace:time:`(GradeKit `0xf890`,`ev_3faba8c4ae9d636bf447ed8eddb17124b49426d25fec7f262c82c93c0c1ab95f`)。它从原宿主IOSurface建立MTLtexture,另建带colorspace标签的CIImage,并保留原texture。跟踪请求`createIOSurfaceWithPixelFormat:maxSize:`(GradeKit `0x12020`,`ev_f9b1157f3f16bec67e2570a8b1e9e8ca367a26fd831c8e924a7dbcb3d434ca08`)优先使用该texture,而非CIImage。 + +RenderingEngine的`createIOSurfaceFromTexture:pixelFormat:maxSize:`(`0x2a420`,`ev_f37cd808dbf1b11c30f25ae22f67d022dbde5e072e3326b1bc8abcf138c2add5`)按纹理width/height同比缩小,目标RGBA8Unorm(70)。同尺寸同格式可直接返回IOSurface;否则block(`0x2a5b0`,`ev_7466d368af6a009a4f28814ba01d601931d3b3cccb6a295e5bd55ca22ea6d1ee`)只执行**MPSImageLanczosScale**并同步目标纹理,没有显式gamma、ICC、除alpha或pixelAspect拉伸。CI fallback的`colorSpaceForImage:`(`0x29a78`,`ev_39b020d8dd4f7dfa909daf0d20302ddf15269d4573f922acf2626ef7368e0487`)明确返回nil,不能据此把fallback当成自动sRGB转换。 + +最后核对`+[MTLTextureDescriptor(FTAdditions) ftDescriptorWithIOSurface:usage:]`(RenderingEngine `0x327c4`,`ev_e16998f018851a67426e6422c9e1d12ad5c069274886e710916e639d900be02d`):BGRA→80/BGRA8Unorm,RGBA→70/RGBA8Unorm,RGhA→115/RGBA16Float,RGfA→125/RGBA32Float,均非`_sRGB`格式;没有隐藏在纹理格式中的sRGB采样解码。该事实与宿主请求gamma2.2一起解释其直接缩放和量化行为。 + +因此不能仅看“原版复制texture不加gamma”就移除大鱼的编码:两产品当前宿主颜色请求不同。最接近已观察合同的分析专用流程是:大鱼linear源→匹配视频gamma2.2的浮点编码纹理→Lanczos缩至最大3840×2160并写RGBA8Unorm→OpenCV整数灰度;普通sRGB分段编码与gamma2.2不等同。先灰度再量化、先量化linear再加gamma、盒式低通缩小都会产生可测差异。对于预乘alpha,原版MPS处理原通道并且gray不再除alpha;若大鱼输入为linear预乘,要模拟宿主gamma请求需先按透明度语义编码并重新预乘,再缩小和量化。真实宿主的颜色请求满足情况、alpha和非方形像素仍应分别验证,不把该生产接入建议作为已完成原版像素对照。 + +## 原版轨迹的只读导出与比较 + +保存预设动作明确把`adjustments`及`trackerScene`交给预设管理器(`0x10007870c`,`ev_4568bc43f27bc4fb953e837112e86117d24b300422b0e447920baa582e3e9c1c`)。旧式“导出预设”将每个版本的scene安全归档、zlib压缩为`versions[].masks`,并保存解压归档的base64 SHA-256为`masks_hash`(`0x10000a954`,`ev_1380fa47e7316a68abb78d03436a18b03ea01497592c5c648fc9ee163383e9f6`)。保存面板限定property-list,默认`.plist`(`0x1000401a8`,`ev_ab4b0981c4f5bcda698c320d99e85e2ea6d3a10611f0f7217803c6d19bdbb8bb`)。 + +可操作步骤:在独立QA工程按同一素材、同一时间范围、同一形状进行CF分析;完成后在工作区保存一个新的测试预设(底部菜单的保存预设入口);顶栏打开LUT/预设浏览器,进入Presets并选择该新预设;右键菜单若显示“导出预设 / Export Preset”,填写名称和唯一identifier后保存`.plist`。不要选“导出LUT”,Cube不含空间轨迹。 + +**本机版本的UI限制必须保留:**`menuNeedsUpdate:`(`0x1000406d8`,`ev_f60df616ccf1a15265170f8aa8c032e41921aae990a67e3805ebb87a24a957c3`)仅在`NSUserDefaults`布尔项`FTPresetsViewControllerEEDK`开启时添加该旧式plist导出菜单。公开“Export as Look (.cflook)… ”只把activeVersion.fxAdjustments传入FTLook,未把trackerScene传入(`0x10003dbb4`,`ev_92e9387d55a56a0ae47fd15746d213dcf1fe2c52707f4d63747afa27b397dfc4`),不能当作已证明的轨迹出口。不要声称普通右键始终能看到plist导出。若需要临时启用该原生菜单,先核对实际进程defaults域、记录原值,并在导出后恢复;这次只读研究没有更改该偏好或原版数据。 + +本机原生数据存在`~/Library/Application Support/ColorFinale/DataStorage.db`,只读SQLite schema可见`ft_objects`及`ft_objectversions.content`等;当前该库未取到可验证的内容记录。旧`PresetStore.xcdata`是另一代CoreData schema,不能擅自当成本版最新轨迹库。若走数据库对照,应只读连接并backup到一致快照、明确选择本轮唯一测试预设、保留WAL一致性;尚未验证blob封装,不给出猜测解码或直接编辑生产库的方案。 + +`tools/tracking/read_colorfinale_preset.py`使用Python标准库`plistlib/zlib/struct`解析导出的plist或raw masks archive,绝不加载或实例化CF类。输出按真实标识和有理时间排列的position/rotation/scale轨迹,验证`masks_hash`;坐标原点保持原作者值,不擅自翻转。原生编码字段已观察: + +| 对象 | coding keys / 数据 | +| --- | --- | +| FTTrackerScene | identifier、nodes、aspectRatio、duration | +| FTTrackerNode | identifier、name、enabled、inverted、blendMode | +| FTTrackerShape | position、rotation、scale,以及opacity、feather、borderColor | +| FTAnimatedParameter | type、value、keyFrames | +| FTKeyFrame新版 | data,72字节;0:uint32版本1,8:uint64类型,16:int64时间值,24:int32 timescale,32:int64 epoch,40:uint64向量维数,48/56/64:double X/Y/Z | + +字段证据:`ev_b91139dc6d6123d6b949555f5e25059f26a2b9b3deac92f49010b6d819219eef`(形状)、`ev_e3a6b0c53238e5a4ea8cdc1b3df70d3fd48c0ff7fbfbc0448ccdabb9cbf50b70`(scene)、`ev_f61f19c55bb089aa86668ace5ed0be32fb9ab34fb98e55d4d6d31bcf4b5208d9`(动画属性)、`ev_1b938e7df2989293beab1198e28439946d3e50178fc61447682ced4367c09862`及`ev_3ceed133be177301388c33727d65297a5e9ec0e0f403e2ff839acb87025eb1f3`(72字节写入和读取)。CIVector的CICount/CI_0/CI_1字段另以系统CoreImage自行归档作oracle,未执行原程序。 + +示例:`python3 tools/tracking/read_colorfinale_preset.py <本轮导出.plist> --output <缓存目录>/colorfinale-tracks.json`。`--self-test`的有理时间、CIVector及压缩UID图形样本通过;尚无真实CF导出fixture,不能把合成解析检查说成原版真实轨迹提取完成。旧式FTKeyFrame的未知time编码会明确拒绝,不伪造时间;真实fixture到位后再扩展解析。对照应逐CMTime比较中心/角度/双轴尺寸、报告首次失跟和最大/均方误差,并检查实际视频覆盖,不能只看“有效帧数量”就宣布一致。 diff --git a/research/UnifiedWorkspace-20261105.md b/research/UnifiedWorkspace-20261105.md index e70deb1..9ca271e 100644 --- a/research/UnifiedWorkspace-20261105.md +++ b/research/UnifiedWorkspace-20261105.md @@ -26,6 +26,10 @@ 已实现横排15种工具、真实UUID层表与右侧单工具编辑、四通道曲线并排、四页工作区、LUT目标切换与取消过期载入、共享蒙版schema3和6种蒙版编辑;左画布矩形/椭圆/钢笔常驻,透明曲线/畸变/肤色/LUT入口及底部控制面板;矩形和椭圆直接拖框,旧右侧蒙版按钮栏已移除。共享对象可先画后关联,或关联选中模块后再加其它模块,独立解除关联不会删除对象。 -OpenCV4.5.1由官方锁定源码静态构建并随包保留全部许可,宿主工具蒙版跟踪已接入;分析上限3840×2160,灰度使用.299/.587/.114并量化8bit。已有12项生成运动参考,尚无原版同视频完整轨迹对照。775项阶段原生回归通过,最终版追加曲线手势时间/外部冲突保护检查。 +OpenCV4.5.1由官方锁定源码静态构建并随包保留全部许可,宿主工具蒙版跟踪已接入。原版请求Gamma2.2、大鱼请求linear;分析专用路径按linear→Gamma2.2→MPS Lanczos→RGBA8→OpenCV整数Gray8执行,上限3840×2160且保持原像素网格。普通调色渲染不执行全帧跟踪读回,分析结束释放4K GPU工作纹理。已有12项生成运动参考和784项集成检查通过,尚无原版同视频完整轨迹对照,alpha/非方形像素/宿主颜色请求满足情况分别保留验收边界。 + +共享蒙版在画布、工作区、主检查器与跟踪内部统一为全局对象身份;切换同一对象的模块入口或删除某一关联模块,不丢弃进行中的轨迹。LUT目标重绑关闭旧浏览器时抑制“返回调整”回调,保持新目标浏览页。分栏初始化不会写入用户偏好;图标工具条、普通文字标题与约21%默认图层栏已完成原生离屏视觉检查。 + +中间候选9ba6eeb的公证8fa0d3d6-a7a9-4a6c-84f2-3b0490ef1eaf已Accepted,但未安装、未发布;最终候选在此之后修正视觉布局和分析预处理,必须重新构建、公证,不能复用该票据。 复核1.7.2/1.7.3远程窗口记录后,不在FCP远程窗口调用本机frame恢复/自动定位,避免ViewBridge坐标归属错误。窄条最小720×300,最大由宿主上限决定;分栏比例保存于产品偏好,实际摆放由宿主与用户拖移管理。此处不是原生嵌入FCP检视器。签名、公证及宿主验收尚待完成。 diff --git a/tools/tracking/read_colorfinale_preset.py b/tools/tracking/read_colorfinale_preset.py new file mode 100644 index 0000000..33558a7 --- /dev/null +++ b/tools/tracking/read_colorfinale_preset.py @@ -0,0 +1,171 @@ +#!/usr/bin/env python3 +"""Read a user-exported CF plist/NSKeyedArchive as data; never instantiate classes.""" +from pathlib import Path +from fractions import Fraction +import argparse, base64, hashlib, json, math, plistlib, struct, sys, uuid, zlib + +MAX_BYTES=128*1024*1024 +MAX_ARCHIVE=64*1024*1024 + +def inflate(data): + if data.startswith((b'bplist',b'MAX_ARCHIVE or d.unconsumed_tail:raise ValueError('Decoded archive exceeds size limit') + out+=d.flush() + if len(out)>MAX_ARCHIVE:raise ValueError('Decoded archive exceeds size limit') + if d.eof and out.startswith((b'bplist',b'200000:raise ValueError('Invalid object table') + expansions=0 + def resolve(x,seen=frozenset(),depth=0): + nonlocal expansions + expansions+=1 + if expansions>1000000:raise ValueError('Archive reference expansion exceeds limit') + if depth>100:raise ValueError('Archive nesting exceeds limit') + if isinstance(x,plistlib.UID): + i=x.data + if i==0:return None + if i<0 or i>=len(objects):raise ValueError('Archive UID out of range') + if i in seen:return {'$cycleUID':i} + return resolve(objects[i],seen|{i},depth+1) + if isinstance(x,list):return [resolve(y,seen,depth+1) for y in x] + if not isinstance(x,dict):return x + cls=x.get('$class');name=None + if isinstance(cls,plistlib.UID) and cls.data3:raise ValueError('Invalid keyframe time/vector count') + numbers=list(struct.unpack_from('<3d',data,48)[:count]) + if any(not math.isfinite(x) for x in numbers):raise ValueError('Nonfinite keyframe value') + return {'time':{'value':value,'timescale':scale,'epoch':epoch,'seconds':value/scale}, + 'type':kind,'value':numbers} + time=key.get('time') + if isinstance(time,dict): + value=time.get('value',time.get('timeValue'));scale=time.get('timescale',time.get('timeScale')) + if value is not None and scale: + return {'time':{'value':int(value),'timescale':int(scale),'epoch':int(time.get('epoch',0)), + 'seconds':int(value)/int(scale)},'type':key.get('type'),'value':vector(key.get('value'))} + raise ValueError('Legacy FTKeyFrame time encoding needs a verified fixture; preserved source required') + +def parameter(value): + if not isinstance(value,dict):return {'staticValue':vector(value),'keys':[]} + keys=[keyframe(x) for x in value.get('keyFrames',[])] + keys.sort(key=lambda x:(x['time']['epoch'],Fraction(x['time']['value'],x['time']['timescale']))) + return {'type':value.get('type'),'staticValue':vector(value.get('value')),'keys':keys} + +def geometry(scene): + result=[] + def walk(x): + if isinstance(x,list): + for v in x:walk(v) + elif isinstance(x,dict): + if all(k in x for k in ('position','rotation','scale')): + result.append({'id':identifier(x.get('identifier')),'name':x.get('name'), + 'class':x.get('$class'),'enabled':x.get('enabled'),'inverted':x.get('inverted'), + 'position':parameter(x['position']),'rotation':parameter(x['rotation']),'scale':parameter(x['scale'])}) + for v in x.values():walk(v) + walk(scene);return result + +def read_preset(path): + if path.stat().st_size>MAX_BYTES:raise ValueError('Input file exceeds size limit') + data=path.read_bytes() + outer=plistlib.loads(data if data.startswith((b'bplist',b' -static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[DYThemeButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;} +static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;} static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;} static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"base"])return u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;if([type isEqual:@"primary"])return u.primarySectionEnabled>.5;for(NSDictionary*d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(type)[@"enabled"]]&&[d[@"offset"]integerValue]>=0)return *(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;return YES;} @interface DYWorkspaceList:NSView @end @@ -101,16 +101,16 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b if((self=[super init])){ _manager=[manager retain];_renderer=[renderer retain];_library=[library retain];_title=[(title.length?title:@"大鱼调色")copy];_lifetime=[DYWorkspaceLifetime new];_lifetime.owner=self; _root=[[DYWorkspaceRoot alloc]initWithFrame:NSMakeRect(0,0,1120,360)];_root.identifier=@"DYColorWorkspace";_root.owner=self;_root.accessibilityLabel=@"大鱼调色控制面板"; - _heading=[[DYThemeLabel alloc]init];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading]; + _heading=[[DYThemeLabel labelWithString:@""]retain];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading]; _pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=4;for(NSInteger i=0;i<4;i++)[_pages setLabel:@[@"调整",@"蒙版",@"LUT",@"示波器"][i]forSegment:i];_pages.selectedSegment=0;_pages.target=self;_pages.action=@selector(pageChanged:);_pages.accessibilityLabel=@"控制面板页面";[_root addSubview:_pages]; _close=[[DYThemeButton alloc]init];_close.title=@"关闭";_close.target=self;_close.action=@selector(closePressed:);_close.bezelStyle=NSBezelStyleRounded;[_root addSubview:_close]; _scopePane=[[DYWorkspaceRoot alloc]init];_scopePane.clipsToBounds=YES;[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES; _scopeMode=[[DYThemePopUpButton alloc]init];[_scopeMode addItemsWithTitles:@[@"亮度波形",@"RGB 分列",@"直方图"]];_scopeMode.target=self;_scopeMode.action=@selector(scopeModeChanged:);_scopeMode.accessibilityLabel=@"示波器类型";[_scopePane addSubview:_scopeMode]; _hostScopes=[[DYThemeButton alloc]init];_hostScopes.title=@"FCP 示波器";_hostScopes.bezelStyle=NSBezelStyleRounded;_hostScopes.target=self;_hostScopes.action=@selector(toggleHostScopes:);_hostScopes.toolTip=@"打开或关闭 Final Cut Pro 自带的视频示波器;下方是大鱼的显示参考示波器";[_scopePane addSubview:_hostScopes]; - _description=[[DYThemeLabel alloc]init];_description.font=[NSFont systemFontOfSize:11];[_scopePane addSubview:_description]; + _description=[[DYThemeLabel labelWithString:@""]retain];_description.font=[NSFont systemFontOfSize:11];[_scopePane addSubview:_description]; _plot=[[DYScopePlot alloc]init];_plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:_plot]; - _status=[[DYThemeLabel alloc]init];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status]; - _lutExplanation=[[DYThemeLabel alloc]init];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES; + _status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status]; + _lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil]; @@ -165,7 +165,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; _heading.frame=NSMakeRect(12,9,MAX(100,w-430),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-398),7,306,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27); _toolbarScroll.frame=NSMakeRect(8,39,MAX(1,w-16),40); - _split.frame=NSMakeRect(0,80,w,MAX(1,h-80));[self layoutToolWorkspace]; + _sizingSplit=YES;_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));_sizingSplit=NO;[self layoutToolWorkspace]; _scopePane.frame=_editorHost.bounds;_lutPane.frame=NSMakeRect(0,25,_editorHost.bounds.size.width,MAX(1,_editorHost.bounds.size.height-25));_lutExplanation.frame=NSMakeRect(8,2,MAX(1,_editorHost.bounds.size.width-16),22); w=_scopePane.bounds.size.width; CGFloat ph=_scopePane.bounds.size.height;_scopeMode.frame=NSMakeRect(18,0,160,27);_hostScopes.frame=NSMakeRect(184,0,122,27);_description.frame=NSMakeRect(320,4,MAX(1,w-338),22);_plot.frame=NSMakeRect(18,39,MAX(1,w-36),MAX(1,ph-114));_status.frame=NSMakeRect(18,MAX(40,ph-64),MAX(1,w-36),58); diff --git a/大鱼调色/Plugin/DYMaskPanel.inc.h b/大鱼调色/Plugin/DYMaskPanel.inc.h index 11ccf2d..0e5e8d8 100644 --- a/大鱼调色/Plugin/DYMaskPanel.inc.h +++ b/大鱼调色/Plugin/DYMaskPanel.inc.h @@ -103,13 +103,15 @@ - (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} - (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} - (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;} -- (void)canvasSelected:(NSNotification*)n{_canvasActive=[n.userInfo[@"node"]isEqual:_nodeID]&&[n.userInfo[@"mask"]length];if(_canvasActive){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;_drawing=[n.userInfo[@"draw"]boolValue];}else _drawing=NO;[self updateDrawingControls];} -- (void)canvasState:(NSNotification*)n{if(!_canvasActive||![n.userInfo[@"node"]isEqual:_nodeID]||![n.userInfo[@"mask"]isEqual:_maskID])return;_drawing=[n.userInfo[@"drawing"]boolValue];[self updateDrawingControls];} -- (void)sendCanvasDrawing:(BOOL)drawing{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"document":_document?:@{},@"draw":@(drawing)}];} +- (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;} +- (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;} +- (void)canvasSelected:(NSNotification*)n{_canvasActive=[self representsCanvasMask:n.userInfo];if(_canvasActive){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;_drawing=[n.userInfo[@"draw"]boolValue];}else _drawing=NO;[self updateDrawingControls];} +- (void)canvasState:(NSNotification*)n{if(!_canvasActive||![self representsCanvasMask:n.userInfo]||![n.userInfo[@"mask"]isEqual:_maskID])return;_drawing=[n.userInfo[@"drawing"]boolValue];[self updateDrawingControls];} +- (void)sendCanvasDrawing:(BOOL)drawing{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"document":_document?:@{},@"draw":@(drawing)}];} - (void)canvas:(id)sender{[self sendCanvasDrawing:NO];} - (void)redrawPen:(id)sender{[self sendCanvasDrawing:YES];} -- (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];} +- (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];} - (void)clear:(id)sender{if(_drawing)return;[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];m[@"keys"]=@[];[m removeObjectForKey:@"status"];}];} -- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"direction":@(sender.tag)}];} -- (void)trackingStatus:(NSNotification*)n{if([n.userInfo[@"node"]isEqual:_nodeID]&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";} +- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"direction":@(sender.tag)}];} +- (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";} @end diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index 4e96f01..f9dacd6 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -9,6 +9,7 @@ #import "DYToolState.h" #include "DYFilmTime.h" #import +#import #import #include "MaskCore/DYTracker.hpp" #include "MaskCore/DYOpenCVTracker.hpp" @@ -36,7 +37,7 @@ - (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;} - (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;} - (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{ - if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;NSData *previousHistogram=[_renderer histogram];BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){NSData *histogram=[_renderer histogram];if(histogram&&histogram!=previousHistogram)[_viewerParameterBridge publishHistogram:histogram atTime:t];[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok; + if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;NSData *previousHistogram=[_renderer histogram];BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){NSData *histogram=[_renderer histogram];if(histogram&&histogram!=previousHistogram)[_viewerParameterBridge publishHistogram:histogram atTime:t];[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok; } - (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});} - (void)exportRequested:(NSNotification*)n{ diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index edaca4c..9ec5e22 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -68,7 +68,7 @@ if(type==NSEventTypeLeftMouseDown){ _toolCanvasHasHover=NO; if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;} - if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} + if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;} _toolDragStart=point;_toolDragPart=part;_toolDragParameters=DYMaskAtTime(_toolCanvasDraft,time); if(_toolDrawingShape){[self updateToolShapeDraftAtPoint:point];[self postToolCanvasStatus:@"拖出蒙版区域,松开保存;Esc 取消。"];return;} diff --git a/大鱼调色/Plugin/DYToolGrayCapture.inc.h b/大鱼调色/Plugin/DYToolGrayCapture.inc.h new file mode 100644 index 0000000..d85eae7 --- /dev/null +++ b/大鱼调色/Plugin/DYToolGrayCapture.inc.h @@ -0,0 +1,28 @@ +// Analysis only. The color renderer continues to use the original linear input. +// CF asks the host for video gamma 2.2, then Lanczos-scales to RGBA8 before +// OpenCV gray conversion. Adapt our linear host contract in a separate texture. +- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error { + @synchronized(_toolCaptureDevices){ + FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds; + if(bounds.left!=image.left||bounds.right!=image.right||bounds.bottom!=image.bottom||bounds.top!=image.top)return {}; + NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key]; + if(!entry){NSArray *devices=MTLCopyAllDevices();iddevice=nil;for(idcandidate in devices)if(candidate.registryID==tile.deviceRegistryID)device=candidate; + if(device){idlibrary=[device newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];idgray=[library newFunctionWithName:@"dyToolCapture"],gamma=[library newFunctionWithName:@"dyToolEncodeGamma22"];idgrayPipeline=gray?[device newComputePipelineStateWithFunction:gray error:error]:nil,gammaPipeline=gamma?[device newComputePipelineStateWithFunction:gamma error:error]:nil;idqueue=[device newCommandQueue];MPSImageLanczosScale *scale=[[MPSImageLanczosScale alloc]initWithDevice:device]; + if(grayPipeline&&gammaPipeline&&queue&&scale){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;} + [scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release]; + }[devices release];if(!entry)return {}; + } + iddevice=entry[@"device"];idsource=[tile metalTextureForDevice:device];if(!source||source.framebufferOnly||!source.width||!source.height)return {}; + double factor=MIN(1.,MIN(3840./source.width,2160./source.height));NSUInteger width=floor(source.width*factor),height=floor(source.height*factor);if(width<16||height<16||width>3840||height>2160)return {}; + MTLPixelFormat format=source.pixelFormat==MTLPixelFormatRGBA32Float?MTLPixelFormatRGBA32Float:MTLPixelFormatRGBA16Float; + idencoded=entry[@"encoded"],bytes=entry[@"bytes"]; + if(!encoded||encoded.width!=source.width||encoded.height!=source.height||encoded.pixelFormat!=format){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:format width:source.width height:source.height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;encoded=[[device newTextureWithDescriptor:d]autorelease];if(!encoded)return {};entry[@"encoded"]=encoded;} + if(!bytes||bytes.width!=width||bytes.height!=height){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA8Unorm width:width height:height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;bytes=[[device newTextureWithDescriptor:d]autorelease];if(!bytes)return {};entry[@"bytes"]=bytes;} + idbuffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height*sizeof(float)){buffer=[[device newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;} + idcommands=[entry[@"queue"]commandBuffer];idencoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gamma"]];[encoder setTexture:source atIndex:0];[encoder setTexture:encoded atIndex:1];[encoder dispatchThreads:MTLSizeMake(source.width,source.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding]; + [entry[@"scale"]encodeToCommandBuffer:commands sourceTexture:encoded destinationTexture:bytes]; + vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info)atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted]; + if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return {};} + dy::GrayFrame result{int(width),int(height),std::vector(width*height)};memcpy(result.pixels.data(),buffer.contents,width*height*sizeof(float));return result; + } +} diff --git a/大鱼调色/Plugin/DYToolHostIvars.inc.h b/大鱼调色/Plugin/DYToolHostIvars.inc.h index 63a3fed..1a6748b 100644 --- a/大鱼调色/Plugin/DYToolHostIvars.inc.h +++ b/大鱼调色/Plugin/DYToolHostIvars.inc.h @@ -7,6 +7,7 @@ NSPoint _toolDragStart;DYMaskParameters _toolDragParameters;NSInteger _toolDragPart; CMTime _toolCanvasEditTime;uint64_t _toolCanvasRevision; dy::GrayFrame _toolSourceFrame,_trackingReferenceFrame; + float _toolSourceAspect; CMTime _toolSourceTime,_trackingReferenceTime,_trackingFrameDuration,_trackingPreviousTime; std::atomic_bool _trackingActive,_trackingFinishing,_trackingInFrame,_trackingCancelled; BOOL _trackingBackward,_trackingBoth,_trackingSingle,_trackingFlip,_trackingDiscard; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index e3192ba..d502579 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -14,20 +14,14 @@ - (void)scheduleToolCanvasRegistration { _toolCaptureEnabled=YES;dispatch_async(dispatch_get_main_queue(),^{ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{if(!self->_toolSession){NSString *session=NSUUID.UUID.UUIDString;ids=[self->_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];BOOL accepted=[s setStringParameterValue:session toParameter:DYCanvasSessionParameterID];os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_registered accepted=%{public}d",(int)accepted);{self->_toolSession=[session copy];@synchronized(DYToolCanvasSessions()){[DYToolCanvasSessions()setObject:self forKey:session];}}}}@finally{[a endAction:self];}}); } -- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error { - @synchronized(_toolCaptureDevices){FxRect b=tile.tilePixelBounds,image=tile.imagePixelBounds;if(b.left!=image.left||b.right!=image.right||b.bottom!=image.bottom||b.top!=image.top)return {}; - NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];if(!entry){NSArray *devices=MTLCopyAllDevices();idd=nil;for(idcandidate in devices)if(candidate.registryID==tile.deviceRegistryID)d=candidate;if(d){idlibrary=[d newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];idfunction=[library newFunctionWithName:@"dyToolCapture"];idpipeline=function?[d newComputePipelineStateWithFunction:function error:error]:nil;idqueue=[d newCommandQueue];if(pipeline&&queue){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"pipeline":pipeline,@"queue":queue}];_toolCaptureDevices[key]=entry;}[pipeline release];[queue release];[function release];[library release];}[devices release];if(!entry)return {};} - idtexture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=tile.pixelAspect;if(!std::isfinite(aspect)||aspect<=0)return {};aspect=MAX(.01,aspect);double displayHeight=texture.height/aspect,scale=MIN(1.,MIN(3840./texture.width,2160./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>2160||width>3840)return {}; - idbuffer=[entry[@"device"]newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared];if(!buffer)return {};vector_uint3 info={width,height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};idcommands=[entry[@"queue"]commandBuffer];idencoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"pipeline"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info) atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted];dy::GrayFrame frame;if(commands.status==MTLCommandBufferStatusCompleted){frame={int(width),int(height),std::vector(width*height)};memcpy(frame.pixels.data(),buffer.contents,width*height*sizeof(float));}[buffer release];return frame; - } -} +#include "DYToolGrayCapture.inc.h" - (NSMutableDictionary*)toolMask:(NSString*)maskID node:(NSString*)nodeID document:(NSDictionary*)doc {for(NSMutableDictionary *m in DYMasksForTool(doc,nodeID))if([m[@"id"]isEqual:maskID])return m;return nil;} - (void)toolStatus:(NSString*)message { NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];}); } - (void)toolCanvasSelection:(NSNotification*)notification { NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected"); - @synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"]; + @synchronized(self){if(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"]; } - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;} @@ -38,13 +32,13 @@ NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{ idanalysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;} - CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:notification.userInfo[@"node"] document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;} + CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSString *node=DYSharedMaskWithID(doc,notification.userInfo[@"mask"])?@"shared":notification.userInfo[@"node"];NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:node document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;} // The host may reuse an already rendered frame without calling our renderer. // Analyzer input is authoritative; a matching preview is only an optional // orientation check, never a prerequisite for starting at the playhead. @synchronized(self){_trackingReferenceFrame={};if(_toolSourceFrame.valid()&&CMTIME_IS_NUMERIC(_toolSourceTime)&&CMTimeCompare(_toolSourceTime,time)==0)_trackingReferenceFrame=_toolSourceFrame;} idtiming=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self];_trackingFrameDuration=numerator&&denominator&&numerator<=INT32_MAX?CMTimeMake(denominator,(int32_t)numerator):kCMTimeInvalid;if(!CMTIME_IS_NUMERIC(_trackingFrameDuration)||_trackingFrameDuration.value<=0){[self toolStatus:@"宿主未提供精确帧长,跟踪未启动"];return;} - [_trackingNode release];_trackingNode=[notification.userInfo[@"node"]copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil; + [_trackingNode release];_trackingNode=[node copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil; _trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime; os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid()); NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;} @@ -88,8 +82,9 @@ dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return; if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);} BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]]; - if(hasResults&&!self->_trackingDiscard){ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:self->_trackingNode document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}} + if(hasResults&&!self->_trackingDiscard){ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}} CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime); + @synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer"]];} self->_trackingActive.store(false);if(advance){idseek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{idtiming=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];idcommand=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager]; });return YES; } diff --git a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h index a735b2c..14c99e0 100644 --- a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h @@ -7,9 +7,9 @@ auto timeAt=[](int frame){return CMTimeMake(frame*1001,24000);};auto capture=[&](int step){setFrame(step);host->_time=timeAt(step);NSData *state=nil;[plugin pluginState:&state atTime:host->_time quality:(FxQuality)0 error:&error];return [plugin renderDestinationImage:out sourceImages:@[frame] pluginState:state atTime:host->_time error:&error];}; auto request=[&](int direction){if(direction!=9)host->_state=kFxAnalysisState_NotAnalyzing;[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@(direction)}]];}; auto drain=[&](){double end=NSProcessInfo.processInfo.systemUptime+.15;while(NSProcessInfo.processInfo.systemUptime_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error]; - for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-metal-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)}); - run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes); + run.need(@"tracking-renders-valid-source-before-analysis",capture(0));run.record(@"inactive-tracking-avoids-full-frame-motion-readback",[[plugin valueForKey:@"toolCaptureDevices"]count]==0);int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error]; + for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-opencv-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)}); + run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes); // Mid-analysis author edits must reject the result rather than clobber them. capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes); DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled); @@ -40,8 +40,31 @@ { const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4); for(NSUInteger y=0;y_state=kFxAnalysisState_NotAnalyzing; + [plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":sharedID,@"direction":@1}]];int beforeShared=base->_undoStarts; + BOOL sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil]; + for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];} + for(NSString *alias in @[@"shared",@"base:spider",@"base:hsl"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":alias,@"mask":sharedID,@"document":DYReadTools(base,kCMTimeZero).document,@"draw":@NO}]; + for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *saved=DYReadTools(base,kCMTimeZero).document; + run.record(@"shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",sharedCallbacks&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&DYMasksForTool(saved,@"base:hsl").firstObject==DYMasksForTool(saved,@"base:spider").firstObject&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds); + // Removing the original UUID binding cannot delete or invalidate the shared + // object while another module still references it. + NSMutableDictionary *deletable=DYMutablePlist(sharedDoc);NSDictionary *extra=DYInsertTool(deletable,@"hsl",@"base:hsl");NSString *extraID=extra[@"id"];DYSetSharedMaskAssigned(deletable,sharedID,@"base:hsl",NO);DYSetSharedMaskAssigned(deletable,sharedID,extraID,YES);DYWriteTools(base,deletable,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing; + [plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":extraID,@"mask":sharedID,@"direction":@1}]];beforeShared=base->_undoStarts;sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil]; + for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];} + NSMutableDictionary *removed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);BOOL removedAlias=DYRemoveTool(removed,extraID);DYWriteTools(base,removed,kCMTimeZero);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"base:spider",@"mask":sharedID,@"document":removed,@"draw":@NO}]; + for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();saved=DYReadTools(base,kCMTimeZero).document; + run.record(@"shared-tracking-survives-removing-original-module-and-commits-one-object",removedAlias&&sharedCallbacks&&!DYToolWithID(saved,extraID)&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&[DYMasksForTool(saved,@"base:spider").firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(saved,sharedID).count==1&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds); + id panel=[[[NSClassFromString(@"DYToolMaskPanel")alloc]initWithManager:host nodeID:@"base:spider"]autorelease];[panel refreshWithDocument:saved time:kCMTimeZero];[panel performSelector:@selector(canvas:)withObject:nil];BOOL aliasActive=[[panel valueForKey:@"_canvasActive"]boolValue]; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"message":@"共享跟踪状态"}];BOOL statusVisible=[[[panel valueForKey:@"_status"]stringValue]isEqual:@"共享跟踪状态"]; + run.record(@"shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",aliasActive&&statusVisible&&[[(NSObject*)plugin valueForKey:@"_selectedToolNode"]isEqual:@"shared"]); + } [plugin release]; } diff --git a/大鱼调色/Plugin/DYTracking.metal b/大鱼调色/Plugin/DYTracking.metal index b097b34..3e80ccd 100644 --- a/大鱼调色/Plugin/DYTracking.metal +++ b/大鱼调色/Plugin/DYTracking.metal @@ -50,11 +50,11 @@ kernel void dyTrackFlow(device const float*prev[[buffer(0)]],device const float* if(lane==0)results[idx]=float4(q,error,ok?1.f:0.f); } -// Full host frame -> top-first display luma. Low-pass the source footprint -// before decimation so 4K fabric detail cannot alias into inconsistent motion. -// This analysis-only image never changes the full-resolution color render. +kernel void dyToolEncodeGamma22(texture2d source [[texture(0)]],texture2d output [[texture(1)]],uint2 pos [[thread_position_in_grid]]){ + if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 pixel=source.read(pos);float alpha=max(pixel.a,0.f);float3 straight=alpha>0?pixel.rgb/alpha:float3(0);output.write(float4(pow(max(straight,float3(0)),float3(1.f/2.2f))*alpha,alpha),pos); +} +// Lanczos RGBA8 -> top-first OpenCV Gray8. Analysis never changes color output. kernel void dyToolCapture(texture2d source [[texture(0)]],device float* pixels [[buffer(0)]],constant uint3& info [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){ - if(pos.x>=info.x||pos.y>=info.y)return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);uint2 taps=clamp(uint2(ceil(float2(source.get_width(),source.get_height())/float2(info.xy))),uint2(1),uint2(8));float sum=0; - for(uint y=0;y0?sample.rgb/sample.a:float3(0);float3 encoded=select(1.055f*pow(max(linear,float3(0)),float3(1.f/2.4f))-.055f,linear*12.92f,linear<=.0031308f);sum+=dot(clamp(encoded,0.f,1.f),float3(.299f,.587f,.114f));} - pixels[pos.y*info.x+pos.x]=sum/float(taps.x*taps.y); + if(pos.x>=info.x||pos.y>=info.y)return;uint2 point=uint2(pos.x,info.z?info.y-1-pos.y:pos.y);uint3 rgb=uint3(rint(source.read(point).rgb*255.f)); + pixels[pos.y*info.x+pos.x]=float((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15)/255.f; } diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 8cde6ef..3216767 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -92,6 +92,7 @@ BOOL selectedA=chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];BOOL wroteA=[stack commitLUT:pathA expected:[stack selectionContext]error:&failure]; BOOL selectedB=chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];BOOL wroteB=[stack commitLUT:pathB expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing",selectedA&&selectedB&&wroteA&&wroteB&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&[basePaths isEqual:DYReadAssets(stackHost,kCMTimeZero).paths]&&[[[stack valueForKey:@"lutTarget"]nodeID]isEqual:lookB]); + run.record(@"workspace-switching-lut-target-stays-on-visible-browser-page",pages.selectedSegment==2&&[[stack valueForKey:@"browser"]visible]); chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]); BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease]; diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index a7e7f10..4403df1 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -2,17 +2,17 @@ - (id)rootHost {return [_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager;} - (id)lutManager {return _lutTarget?:_manager;} - (void)buildToolWorkspace { - _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid; + _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v2"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid;_sizingSplit=YES; _toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO; _toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll]; - CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];CGFloat width=MAX(58,MIN(150,[title sizeWithAttributes:@{NSFontAttributeName:button.font}].width+22));button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30); + CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];NSDictionary *icons=@{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"};button.image=[NSImage imageWithSystemSymbolName:icons[type] accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=34;button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30); _split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split]; _toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost]; _layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=YES;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll]; _layerTable=[[NSTableView alloc]init];NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable; _addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask]; _deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer]; - _selectionTitle=[[DYThemeLabel alloc]init];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle]; + _selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle]; _maskPane=[[DYWorkspaceList alloc]init];_maskPane.clipsToBounds=YES;[_editorHost addSubview:_maskPane];_maskPane.hidden=YES; _maskScroll=[[NSScrollView alloc]init];_maskScroll.hasVerticalScroller=YES;_maskScroll.autohidesScrollers=YES;_maskScroll.drawsBackground=NO;[_maskPane addSubview:_maskScroll]; _assignmentScroll=[[NSScrollView alloc]init];_assignmentScroll.hasVerticalScroller=YES;_assignmentScroll.autohidesScrollers=YES;_assignmentScroll.drawsBackground=NO;_assignmentScroll.accessibilityLabel=@"共享蒙版生效模块";[_maskPane addSubview:_assignmentScroll]; @@ -20,19 +20,20 @@ [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]]; + _sizingSplit=NO; } - (void)layoutToolWorkspace { if(!_split||_sizingSplit)return;_sizingSplit=YES; CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,left=MAX(174,MIN(w-320,w*_splitFraction)); _toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+_split.dividerThickness,0,MAX(1,w-left-_split.dividerThickness),h); - _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); + _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));_layerTable.frame=NSMakeRect(0,0,_layerScroll.contentSize.width,MAX(_layerScroll.contentSize.height,_layerRows.count*30));[_layerTable.tableColumns.firstObject setWidth:_layerScroll.contentSize.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29)); _maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(230,MAX(160,ew*.25));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height); if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));} _sizingSplit=NO; } - (CGFloat)splitView:(NSSplitView*)split constrainSplitPosition:(CGFloat)position ofSubviewAt:(NSInteger)index {return MAX(174,MIN(split.bounds.size.width-320,position));} -- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction"];[self layoutWorkspace];} +- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;if(NSApp.currentEvent.type!=NSEventTypeLeftMouseDragged&&NSApp.currentEvent.type!=NSEventTypeLeftMouseUp)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction.v2"];[self layoutWorkspace];} - (BOOL)workspaceBaseVisible:(NSString*)type document:(NSDictionary*)document time:(CMTime)time { if(DYBaseToolRemoved(document,type))return NO; if([@[@"primary",@"spider",@"base",@"hsl"]containsObject:type])return YES; @@ -51,11 +52,11 @@ // Legacy base operators keep their real insertion-stage order. UUID children // use the same traversal as the renderer, including cross-type insertion. NSArray *bases=@[@"primary",@"primaries",@"curve",@"levels",@"balance",@"hsl",@"grading",@"base",@"blackwhite",@"look",@"skin",@"spider",@"mixer",@"film",@"lens"]; - NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array]; + NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*titles=[NSMutableDictionary dictionary];for(NSString*ID in display){NSDictionary*node=DYToolWithID(document,ID);if(!node)continue;NSString*type=node[@"type"];NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);titles[ID]=[NSString stringWithFormat:@"%@ %ld",DYToolSection(type)[@"title"],(long)number];} for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];} for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID]; for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue; - NSString*title=DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}]; + NSString*title=titles[ID]?:DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}]; for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} } for(NSDictionary*mask in DYSharedMasks(document))if(![assignedMasks containsObject:mask[@"id"]]){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];} @@ -70,15 +71,15 @@ } - (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;} - (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row { - NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]init]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label; - NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell; + NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label; + NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell; } - (void)tableViewSelectionDidChange:(NSNotification*)note { if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; } - (void)rebuildWorkspaceEditor { NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil; - _selectionTitle.stringValue=_selectedMask?@"共享蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块"; + _selectionTitle.stringValue=_selectedMask?@"蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;} if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){idtarget=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}} [_toolEditor refresh]; if(_selectedNode.length&&![_selectedNode isEqual:@"shared"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:[self rootHost]userInfo:@{@"node":_selectedNode}]; @@ -95,7 +96,7 @@ - (void)bindLUTTarget { NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);idtarget=[node[@"type"]isEqual:@"look"]?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost]; NSString*old=[_lutTarget isKindOfClass:DYToolManager.class]?[(DYToolManager*)_lutTarget nodeID]:@"base:look",*next=[target isKindOfClass:DYToolManager.class]?[(DYToolManager*)target nodeID]:@"base:look"; - if([old isEqual:next]&&_lutTarget)return;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_browser close];[_browser release];_browser=nil;[(id)_lutTarget release];_lutTarget=[(id)target retain]; + if([old isEqual:next]&&_lutTarget)return;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;_closing=wasClosing;[(id)_lutTarget release];_lutTarget=[(id)target retain]; } - (void)addWorkspaceTool:(NSButton*)sender { NSString*type=sender.identifier;if(![DYToolTypes()containsObject:type])return;idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil;