diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index 2873ba2..fe47655 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -36,6 +36,12 @@ - (NSView*)createViewForParameterID:(UInt32)pid { [self scheduleToolCanvasRegistration]; if(pid!=DYInspectorParameterID)return [[NSView alloc]initWithFrame:NSZeroRect]; + id timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)]; + if([timing respondsToSelector:@selector(timelineFpsNumeratorForEffect:)]&&[timing respondsToSelector:@selector(timelineFpsDenominatorForEffect:)]){ + NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self]; + if(numerator>0&&numerator<=INT32_MAX&&denominator>0&&denominator<=INT64_MAX) + [_renderer setScopeProjectFrameDuration:CMTimeMake(denominator,(int32_t)numerator)]; + } return [[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]; } - (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];// Many parameter callbacks arrive in one host transaction. Refresh the native diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index 52dc18b..ce9b9f9 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -31,6 +31,7 @@ /// Conversion/statistics run while visible; retain one small final-output /// sample per instance so opening a paused workspace needs no parameter edit. - (BOOL)scopeEnabled; +- (void)setScopeProjectFrameDuration:(CMTime)duration; - (void)setScopeEnabled:(BOOL)enabled; - (void)setScopeEnabled:(BOOL)enabled atTime:(CMTime)time frameDuration:(CMTime)frameDuration; /// Call after the final destination render succeeds, while the tile is valid. diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index c219967..528de75 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -150,7 +150,7 @@ struct DYScopeReadback { uint64_t _spiderScopeSerial; NSUInteger _scopeGeneration; DYScopeSample *_scopePending,*_scopeLatest; - uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime,_scopeRequestedFrameDuration; + uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime,_scopeRequestedFrameDuration,_scopeProjectFrameDuration; FxImageTile *_scopeDestination; // borrowed for one locked host render CMTime _scopeRenderTime; BOOL _scopeCaptured; diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h index 3ca0731..78dcfe0 100644 --- a/大鱼调色/Plugin/DYScopeCapture.inc.h +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -1,10 +1,14 @@ // Included in DYRenderer's implementation; final destination sampling is kept // separate from the earlier input-analysis thumbnail used by auto-grade/LUTs. +- (void)setScopeProjectFrameDuration:(CMTime)duration{@synchronized(_previewLock){_scopeProjectFrameDuration=duration;}} - (BOOL)scopeEnabled{@synchronized(_previewLock){return _scopeEnabled;}} - (void)setScopeEnabled:(BOOL)enabled{[self setScopeEnabled:enabled atTime:kCMTimeInvalid frameDuration:kCMTimeInvalid];} - (void)setScopeEnabled:(BOOL)enabled atTime:(CMTime)time frameDuration:(CMTime)frameDuration{ BOOL start=NO;@synchronized(_previewLock){if(_scopeEnabled==enabled)return;_scopeEnabled=enabled;_scopeGeneration++;[_scopePending release];_scopePending=nil; - if(enabled){_scopeRequestedTime=time;_scopeRequestedFrameDuration=frameDuration;[_scopePreview release];_scopePreview=nil;[_scopeMetadata release];_scopeMetadata=nil; + if(enabled){ + // Viewer output advances at project cadence even when the source is 60p. + if(CMTIME_IS_NUMERIC(_scopeProjectFrameDuration)&&_scopeProjectFrameDuration.value>0)frameDuration=_scopeProjectFrameDuration; + _scopeRequestedTime=time;_scopeRequestedFrameDuration=frameDuration;[_scopePreview release];_scopePreview=nil;[_scopeMetadata release];_scopeMetadata=nil; CMTime cached=_scopeLatest?CMTimeMakeWithEpoch([_scopeLatest.metadata[@"timeValue"]longLongValue],[_scopeLatest.metadata[@"timeScale"]intValue],[_scopeLatest.metadata[@"timeEpoch"]longLongValue]):kCMTimeInvalid; BOOL replay=_scopeLatest&&(!CMTIME_IS_NUMERIC(time)||DYScopeFrameContainsTime(cached,time,frameDuration)); os_log(OS_LOG_DEFAULT,"dayu_scope_open requested=%{public}.9f cached=%{public}.9f frame=%{public}.9f replay=%{public}d",CMTimeGetSeconds(time),CMTimeGetSeconds(cached),CMTimeGetSeconds(frameDuration),replay); diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 3dfae9f..ee0d04c 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -111,8 +111,9 @@ run.record(@"workspace-final-output-worker-publishes-real-scope-rasters",[scopeData[@"waveform"]length]==320*256*4&&[scopeData[@"parade"]length]==3*320*256*4&&[scopeData[@"histogram"]length]==4*256*4&&[scopeData[@"vectorscope"]length]==256*256*4&&[scopeData[@"wholeImage"]boolValue]); [scopeRenderer setScopeEnabled:NO];[scopeRenderer captureScopeTile:finalTile atTime:CMTimeMake(8,24)];workspaceDrain();DYScopeSample *hiddenSample=[scopeRenderer valueForKey:@"scopeLatest"]; run.record(@"workspace-hidden-scope-retains-only-one-small-final-sample-without-processing",[scopeRenderer.scopeMetadata isEqual:scopeData]&&hiddenSample.pixels.length==320*180*16&&[hiddenSample.metadata[@"timeValue"]longLongValue]==8&&![scopeRenderer valueForKey:@"scopePending"]); - [scopeRenderer setScopeEnabled:YES atTime:CMTimeAdd(CMTimeMake(8,24),CMTimeMake(7,300)) frameDuration:CMTimeMake(1,24)];scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;while(!scopeRenderer.scopeMetadata&&NSProcessInfo.processInfo.systemUptimeCFBundleShortVersionString 1.21.1 CFBundleVersion - 115 + 116 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 1056d75..dc36d0e 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.1 CFBundleVersion - 115 + 116 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 8ca5655..d5b3203 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,13 +2,13 @@ 更新于 2026-11-08(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。 -## 1.21.1(115)首次示波器与人脸肤色保护 +## 1.21.1(116)首次示波器与人脸肤色保护 -用户反馈首次打开控制面板没有波形、人脸相关预览卡顿。控制面板从宿主动作读取当前时间,并按帧长验证本效果实例最后一次最终输出。缓存时间相同或播放头仍在该帧区间时立即送测量队列,下一帧边界等待对应渲染。参数写入与蜘蛛盘仍用原时间规则。 +用户反馈首次打开控制面板没有波形、人脸相关预览卡顿。控制面板从宿主动作读取当前时间,并优先按项目帧长验证本效果实例最后一次最终输出。缓存时间相同或播放头仍在该帧区间时立即送测量队列,下一帧边界等待对应渲染。参数写入与蜘蛛盘仍用原时间规则。 Skin 的 Vision 轮廓、眼眉嘴排除及强度沿用原算法。Metal 先检查实际轮廓外接范围,外部跳过多边形计算,无覆盖时跳过五官权重;按需读取设备端路径。人脸马赛克仍独立检测每个不同画面的矩形。4K 活跃人脸肤色保护旧版中位 1176.07 ms,其中取样及 Vision 平均 10.73 ms,主要耗时在逐像素轮廓。M4 同一公开人像的 12 帧中位数降至 21.78 ms,1080p 从 308.08 降至 10.07 ms;六组末帧 SHA-256 完全一致。以上是渲染器耗时。 -两个 Release 目标进入正式交付,等待已公证版本的原生自检及 FCP 暂停首开验收,再打包和发布。既有项目文件的 Security 引用排序未纳入本轮。 +候选 115 已公证并在 FCP 12.4 实测。片尾请求 11.383333333 秒,实际输出 11.360000000 秒。素材 60p 帧长 16.667 ms 导致仍拒绝缓存,因此候选未发布。116 改用 25p 项目帧长并等待同位置复测,再打包和发布。既有项目文件的 Security 引用排序未纳入本轮。 ## 1.21.0(114)流畅性优化