From dad77aff77e58c554bd40740ef971e2f41719464 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 11:07:17 +0800 Subject: [PATCH] fix: align paused scope requests at the exclusive clip end to the final visible frame --- research/WorkspaceFeedback-20261105.md | 7 +++ verification/Delivery.json | 8 +-- verification/InstalledSelfTest.json | 56 ++++++++++++-------- 大鱼调色/Plugin/DYColorWorkspace.mm | 8 ++- 大鱼调色/Plugin/DYDiagnostics.mm | 1 + 大鱼调色/Plugin/DYInspector.mm | 2 +- 大鱼调色/Plugin/DYScopeDisplayTime.h | 9 ++++ 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 8 +++ 8 files changed, 71 insertions(+), 28 deletions(-) create mode 100644 大鱼调色/Plugin/DYScopeDisplayTime.h diff --git a/research/WorkspaceFeedback-20261105.md b/research/WorkspaceFeedback-20261105.md index b8bf475..ca7db64 100644 --- a/research/WorkspaceFeedback-20261105.md +++ b/research/WorkspaceFeedback-20261105.md @@ -21,3 +21,10 @@ LUT 属于有数量的浏览内容,恢复按视口宽度换行的多行网格 76 首次暂停打开示波器成功,播放到片尾再关闭/打开则复现等待。当前唯一末帧缓存不足还是时间域不一致尚未证实;77 增加打开请求/缓存时刻日志,不以旧帧充当当前画面。 正式交付状态仍为待宿主验收,不能发布完成声明。 + +## 77 正式宿主观察 + +- 正式位置 build77,源 b60ae3e45b6cad5d458a9bb09fba7d1001d2bf3a,Apple Accepted 4e388d95-12c5-461a-bbb8-e116772b0d29,安装后823项原生检查通过。 +- 11:00–11:02 FCP PID 对应服务7411,独立验收库的76切换与蒙版项目。HSL 2 色板上排、三轴同宽排列,矢量图细虚线及肤色标签实际可见,四路采样57600;畸变不在工具条/层表。 +- 11:04 播放第二片段到片尾,重新开工作区仍等待。日志明确 `requested=4.000000000 cached=3.960000000`,对应25fps排他末端与末帧。78候选只在宿主给出的精确输入末端减一个合法帧长,内点、越界、无帧长不偏移。暂不引入多帧缓存。 +- 自动坐标点击未见OSC hit/event,不能算已实际绘制。已请用户在77重试钢笔及曲线,以本地实际保存日志定位;此前 native mock 验证不代替此项。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 9b6074a..51cd406 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -3,14 +3,14 @@ "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", "version": "1.12.0", - "build": "76", + "build": "77", "team": "B3W25FX5H5", - "notaryID": "b7f06308-3213-4883-a331-3db3176dd9b5", + "notaryID": "4e388d95-12c5-461a-bbb8-e116772b0d29", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "b8a003970afea6f85473cf4e83cdd838ade423a7", + "sourceCommit": "b60ae3e45b6cad5d458a9bb09fba7d1001d2bf3a", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803", "shaderSHA256": "7d05797e5e68ec8c23886c74d37a32826843c541e13a3f35424c1903e28bff56", - "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-8147ad025755463e97ed0b794bdf80da.app" + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-4717c30742ce4299b4796e06a9097579.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 3cc1e1d..8ef72ef 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -1,6 +1,6 @@ { "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", - "checks": 820, + "checks": 823, "gpu": "Apple M4", "limitations": [ "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF" }, { "descriptors": 285, @@ -890,7 +890,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF/diagnostic-export.cube" }, { "bytes": 1186074, @@ -910,7 +910,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 59.00179166928865, + "maximumGapMS": 82.68750002025627, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1361,8 +1361,8 @@ "closePixels": 128, "name": "workspace-offscreen-compact-icons-and-close-render-pixels", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935/workspace-topbar.png", - "toolbarPixels": 3867 + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF/workspace-topbar.png", + "toolbarPixels": 3557 }, { "name": "workspace-content-and-scope-pane-explicitly-clip", @@ -1380,7 +1380,7 @@ "closePixels": 128, "name": "workspace-topbar-survives-minimum-resize-and-large-dirty-redraw", "pass": true, - "toolbarPixels": 3867 + "toolbarPixels": 3557 }, { "name": "workspace-reopens-existing-host-remote-window", @@ -1424,7 +1424,7 @@ }, { "name": "workspace-independent-style-fixture-inserted", - "node": "6254EA49-743E-4FAF-9B6C-9D4AC4AB6C97", + "node": "3292528A-965A-4742-8009-441C6BBA9628", "pass": true, "validDocument": true }, @@ -1433,10 +1433,10 @@ "error": "none", "name": "workspace-independent-style1-writes-target-node-inside-undo", "nodePaths": { - "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935/node.cube" + "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF/node.cube" }, "pass": true, - "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935/user-new.cube", + "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF/user-new.cube", "undoStartsAfter": 3, "undoStartsBefore": 2, "written": true @@ -1487,7 +1487,7 @@ "pass": true }, { - "name": "workspace-toolbar-lists-every-tool-in-one-horizontal-scroll-strip", + "name": "workspace-toolbar-lists-grading-tools-and-leaves-distortion-on-canvas", "pass": true }, { @@ -1609,14 +1609,14 @@ "pass": true }, { - "document": "{{0, 0}, {1813, 235}}", + "document": "{{0, 0}, {1727, 235}}", "name": "workspace-horizontal-minimum-height-primary", "outside": [], "pass": true, "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {693, 235}}", + "document": "{{0, 0}, {514, 235}}", "name": "workspace-horizontal-minimum-height-spider", "outside": [], "pass": true, @@ -1627,7 +1627,7 @@ "pass": true }, { - "document": "{{0, 0}, {790, 235}}", + "document": "{{0, 0}, {896, 235}}", "name": "workspace-horizontal-minimum-height-base", "outside": [], "pass": true, @@ -1648,21 +1648,33 @@ "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {686, 235}}", + "document": "{{0, 0}, {424, 235}}", "name": "workspace-horizontal-minimum-height-hsl", "outside": [], "pass": true, "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {550, 235}}", + "name": "workspace-hsl-swatch-and-axes-stay-together-424", + "pass": true + }, + { + "name": "workspace-hsl-swatch-and-axes-stay-together-760", + "pass": true + }, + { + "name": "workspace-hsl-swatch-and-axes-stay-together-1040", + "pass": true + }, + { + "document": "{{0, 0}, {560, 235}}", "name": "workspace-horizontal-minimum-height-curve", "outside": [], "pass": true, "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {1172, 235}}", + "document": "{{0, 0}, {960, 235}}", "name": "workspace-horizontal-minimum-height-grading", "outside": [], "pass": true, @@ -1683,7 +1695,7 @@ "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {528, 235}}", + "document": "{{0, 0}, {600, 235}}", "name": "workspace-horizontal-minimum-height-blackwhite", "outside": [], "pass": true, @@ -1697,14 +1709,14 @@ "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {528, 235}}", + "document": "{{0, 0}, {600, 235}}", "name": "workspace-horizontal-minimum-height-mixer", "outside": [], "pass": true, "viewport": "{424, 235}" }, { - "document": "{{0, 0}, {528, 235}}", + "document": "{{0, 0}, {600, 235}}", "name": "workspace-horizontal-minimum-height-film", "outside": [], "pass": true, @@ -4035,7 +4047,7 @@ { "name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935/viewer-workspace.png" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF/viewer-workspace.png" }, { "name": "canvas-hsl-plot-captures-outside-and-commits-one-undo", @@ -4176,6 +4188,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4DEF1449-08B5-4FF1-B9C4-7FBD70ECF935", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ADCC2267-43A8-45BD-8586-4211F41C2BCF", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index 1378883..775a834 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -7,6 +7,8 @@ #import "DYInspector.h" #import "DYManagedColor.h" #include "DYScopeMath.hpp" +#include "DYScopeDisplayTime.h" +#import #include 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;} @@ -185,7 +187,11 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)pageChanged:(id)sender{ if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2; - [_renderer setScopeEnabled:_visible atTime:_toolTime];if(_editorMode==2)[self ensureBrowser];[self scopeChanged:nil];[self layoutWorkspace]; + CMTime displayTime=_toolTime;idaction=[self actionAPI];if(_visible&&action){[action startAction:self];@try{ + idtiming=[[self rootHost]apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime start=kCMTimeInvalid,duration=kCMTimeInvalid,frame=kCMTimeInvalid; + if([timing respondsToSelector:@selector(startTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(durationTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(frameDuration:)]){[timing startTimeOfInputToFilter:&start];[timing durationTimeOfInputToFilter:&duration];[timing frameDuration:&frame];displayTime=DYScopeDisplayTime(_toolTime,start,duration,frame);if(CMTimeCompare(displayTime,_toolTime)!=0)os_log(OS_LOG_DEFAULT,"dayu_scope_end_boundary requested=%{public}.9f display=%{public}.9f",CMTimeGetSeconds(_toolTime),CMTimeGetSeconds(displayTime));} + }@finally{[action endAction:self];}} + [_renderer setScopeEnabled:_visible atTime:displayTime];if(_editorMode==2)[self ensureBrowser];[self scopeChanged:nil];[self layoutWorkspace]; } - (void)toggleHostScopes:(id)sender{ id action=[self actionAPI];NSError *error=nil;BOOL done=NO;if(action){[action startAction:self];@try{id commands=[_manager apiForProtocol:@protocol(FxCommandAPI)];done=[commands performCommand:kFxCommand_ToggleWaveforms error:&error];}@finally{[action endAction:self];}} diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 7103f54..9d2bf4d 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -1,4 +1,5 @@ #import "DYScopeSample.h" +#include "DYScopeDisplayTime.h" #import "DYHistogram.h" #include "DYFilmMath.h" #include "DYFilmTime.h" diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 9841e76..e321299 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -855,7 +855,7 @@ NSView *DYCreateWorkspaceMaskEditor(id if([row.identifier hasPrefix:@"heading:"])for(NSView *view in row.subviews)view.frame=NSMakeRect(2,5,rw-4,18); if([row.identifier hasSuffix:@"Controls"]){CGFloat bw=(rw-4*(row.subviews.count-1))/MAX((NSUInteger)1,row.subviews.count);NSInteger i=0;for(NSView *view in row.subviews)view.frame=NSMakeRect((bw+4)*i++,3,bw,25);} } - if(rows.count)x+=columns*columnWidth+(columns-1)*16;else if(tabs)x+=available; + if(rows.count)x+=columns*columnWidth+(columns-1)*16;else if(tabs)x+=available;else if(graphics.count)x-=16; } card.frame=NSMakeRect(0,6,MAX(_scroll.contentSize.width,x+12),height);y=_scroll.contentSize.height; } diff --git a/大鱼调色/Plugin/DYScopeDisplayTime.h b/大鱼调色/Plugin/DYScopeDisplayTime.h new file mode 100644 index 0000000..b3aa547 --- /dev/null +++ b/大鱼调色/Plugin/DYScopeDisplayTime.h @@ -0,0 +1,9 @@ +#pragma once +#import +// FCP can expose the exclusive input out point to custom views while its viewer +// holds the last visible frame. Only that exact boundary has a previous frame. +static inline CMTime DYScopeDisplayTime(CMTime requested,CMTime start,CMTime duration,CMTime frame){ + if(!CMTIME_IS_NUMERIC(requested)||!CMTIME_IS_NUMERIC(start)||!CMTIME_IS_NUMERIC(duration)||!CMTIME_IS_NUMERIC(frame)||duration.value<=0||frame.value<=0||duration.epoch||frame.epoch)return requested; + CMTime end=CMTimeAdd(start,duration);if(!CMTIME_IS_NUMERIC(end)||CMTimeCompare(requested,end)!=0)return requested; + CMTime last=CMTimeSubtract(end,frame);return CMTimeCompare(last,start)<0?start:last; +} diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 5fc0065..10ffd70 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -1,3 +1,11 @@ +{ + CMTime end=CMTimeMake(4,1),start=kCMTimeZero,duration=CMTimeMake(100,25),frame=CMTimeMake(1,25); + run.record(@"scope-exclusive-clip-end-aligns-to-last-visible-frame",CMTimeCompare(DYScopeDisplayTime(end,start,duration,frame),CMTimeMake(99,25))==0); + run.record(@"scope-interior-time-is-never-replaced-by-previous-frame",CMTimeCompare(DYScopeDisplayTime(CMTimeMake(50,25),start,duration,frame),CMTimeMake(50,25))==0); + run.record(@"scope-after-end-is-not-silently-clamped",CMTimeCompare(DYScopeDisplayTime(CMTimeMake(101,25),start,duration,frame),CMTimeMake(101,25))==0); + run.record(@"scope-end-alignment-requires-valid-positive-host-frame",CMTimeCompare(DYScopeDisplayTime(end,start,duration,kCMTimeInvalid),end)==0&&CMTimeCompare(DYScopeDisplayTime(end,start,duration,kCMTimeZero),end)==0); + run.record(@"scope-trimmed-input-end-preserves-native-time-origin",CMTimeCompare(DYScopeDisplayTime(CMTimeMake(6,1),CMTimeMake(2,1),duration,frame),CMTimeMake(149,25))==0); +} { auto workspaceDrain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptime