diff --git a/README.md b/README.md index dde6e52..eee445d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # 大鱼调色 -原生 FxPlug 4 调色器,当前正式安装版本 **1.4.1(26)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 +原生 FxPlug 4 调色器,当前修订版本 **1.4.2(30)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 + +## 1.4.2 跟踪修复 + +中间帧启动直接使用宿主分析首帧,预览缓存缺失或陈旧不会阻止开始。真实素材的细纹运动采样和拟合容差已调整,仍保留可信度与错误变换保护。失跟说明原因与保留帧数;正常取消标记结束宿主后台任务。单帧跟踪会把源时间转换到时间线位置,支持片段前有其它内容时连续操作。 + +293项原生检查和19项独立CPU/Metal跟踪检查通过。正式宿主、签名公证、安装包和Release的最终结果见当前版本验证记录;用户媒体、预设和项目快照只保存在本机。 ## 色彩管理与一级调色 @@ -28,9 +34,9 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移 蒙版包括椭圆、矩形、钢笔、线性渐变、HSL 和亮度选区,支持相加、减去、相交、反转、羽化和强度。矩形、椭圆和闭合钢笔区域可正向、反向、双向或单帧跟踪。算法从“大鱼调色盘”固定源码适配,随本产品独立构建;不依赖安装父插件。完整预设 v4 保存新增工具、蒙版和逐帧轨迹,兼容旧预设。空间蒙版不能导出到 Cube,导出时会提示。 -蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,分析采样上限3840×2160。 +蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,运动分析按显示比例限制到1280×720,4K细纹先低通再缩小,调色渲染和输出分辨率保持原设置。 -正式版281项原生检查、独立CPU/Metal跟踪18项通过。FCP实测相邻插入、初始化与独立参数、大号面板、绘制态切换、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。画面提示文字方向已修正。用户随后用实际鼠标确认“可以绘制并闭合”,钢笔放点和闭合实机验收通过;自动化输入未进入OSC回调,曲柄/删除等其它手势仍以原生模拟宿主检查为据。1.4.0的中心拖动已有用户确认。新增工具标量仍为静态值,蒙版轨迹按时间求值,跟踪不含透视/剪切。 +1.4.1的281项原生检查、独立CPU/Metal跟踪18项通过。FCP实测相邻插入、初始化与独立参数、大号面板、绘制态切换、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。画面提示文字方向已修正。用户随后用实际鼠标确认“可以绘制并闭合”,钢笔放点和闭合实机验收通过;自动化输入未进入OSC回调,曲柄/删除等其它手势仍以原生模拟宿主检查为据。1.4.0的中心拖动已有用户确认。新增工具标量仍为静态值,蒙版轨迹按时间求值,跟踪不含透视/剪切。 旧schema1末尾层保持原保存位置与渲染,避免改变旧工程外观;新添加的层使用schema2插入锚点。原生固定模块的既有处理顺序保留。当前实现参考本机Color Finale的行为和参数独立适配,并非全部功能完整移植;B样条、编组、人物/图像/外部蒙版及完整轨迹区段编辑等差异见专项清单。 旧模板实例可能保留关闭画面控件的状态;可先保存完整预设,再重新应用新版效果并载入预设。不会自动覆盖旧实例。实现与验收边界见 [实现说明](research/ToolMaskImplementation.md)、[宿主记录](verification/HostToolMasks.json) 和 [恢复核验](verification/ToolMaskRecovery.json)。 @@ -38,7 +44,10 @@ LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移 ## 验证与恢复 - [本轮交接](大鱼调色FxPlug4交接.md) -- [1.4.1 正式版 281 项原生检查](verification/InstalledSelfTest.json) +- [当前正式路径原生检查](verification/InstalledSelfTest.json) +- [中间帧与真实素材跟踪修复](research/TrackingMidpoint1.4.2.md) +- [跟踪宿主验收](verification/HostTrackingMidpoint1.4.2.json) +- [跟踪源码独立恢复](verification/TrackingMidpointRecovery.json) - [插入、钢笔和跟踪工作流](research/MaskWorkflow1.4.1.md) - [1.4.1 FCP验收及用户实际钢笔确认](verification/HostMaskWorkflow1.4.1.json) - [Color Finale对照和未迁移范围](research/ColorFinaleMasksFollowup.md) diff --git a/research/TrackingMidpoint1.4.2.md b/research/TrackingMidpoint1.4.2.md index 03a1a92..18c67f4 100644 --- a/research/TrackingMidpoint1.4.2.md +++ b/research/TrackingMidpoint1.4.2.md @@ -12,8 +12,12 @@ 第一帧开始立即显示进度。失跟按特征不足、运动不一致、置信度、出画或变换问题区分,说明保留的可信帧数。普通失跟、主动取消、单帧完成和边界停止使用SDK的 `FxPlugErrorDomain / kFxError_UserCancelled` 正常取消标记,既结束宿主后台任务又不弹错误;引擎、无效源图和时序错误仍明确失败。27版候选仅返回NO/nil时,FCP的诊断分析残留在50%并影响退出,已在28版修复;不能把本地trackingActive清理当作宿主任务已结束。SDK证据见本机FxTypes.h的UserCancelled说明。正式宿主须确认任务回到闲置、可再次启动和正常退出。 +单帧完成后先由FxTimingAPI把分析源时间转换为时间线时间,再移动播放头。28版候选在前有4秒片段时错误跳到源3.72秒,29版修正为时间线7.72秒。原生覆盖带4秒偏移的反向单帧和连续两次正向单帧,包含非整数帧率的精确CMTime。 + +已有相同轨迹的单帧操作也应前进播放头,以实际完成的连续两帧为依据,不以作者数据是否改变为依据;重复结果不增加一次无效作者写入或撤销。 + ## 验证与边界 -28版候选Release原生290项通过,包含真实Metal采样、三组新增中间启动回调和五组SDK正常终止检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后继续FCP验证同一素材和独立切换画面用例。 +30版候选Release原生293项通过,包含真实Metal采样、三组新增中间启动回调和五组SDK正常终止与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后继续FCP验证同一素材和独立切换画面用例。 原始媒体、FCPXML快照、作者状态和解码帧均仅在本机验收缓存,普通Git只保存聚合结果与通用诊断源码。未修改父“大鱼调色盘”或Color Finale。不是人物分割/非刚性逐点描边;转身、遮挡、变形和出画仍可能需要手工调整后从当前帧继续。新增工具标量和透视/剪切等既有边界保持。 diff --git a/verification/TrackingMidpoint1.4.2.json b/verification/TrackingMidpoint1.4.2.json index 6fbd4e7..21c3876 100644 --- a/verification/TrackingMidpoint1.4.2.json +++ b/verification/TrackingMidpoint1.4.2.json @@ -1,9 +1,9 @@ { "status": "native-validated-awaiting-formal-host", "version": "1.4.2", - "build": "28", + "build": "30", "baselineSource": "847a5ea99903c0b7427301c799e1c40f3fe6c5ad", - "nativeChecks": 290, + "nativeChecks": 293, "independentChecks": [ { "pass": true, @@ -216,5 +216,9 @@ "context": "Initial run overlapped diagnostic decoding; quiet complete repeat285/285 passed. No test threshold changed." }, "quietTermination": "FxPlugErrorDomain/kFxError_UserCancelled SDK sentinel for expected loss, cancel, single step, boundary and late frames; five native lifecycle checks pass; formal FCP task-idle verification pending", - "candidate27Rejected": "NO/nil suppressed the modal but left the diagnostic host background analysis at 50%; candidate not released. Own diagnostic task canceled normally before host quit." + "candidate27Rejected": "NO/nil suppressed the modal but left the diagnostic host background analysis at 50%; candidate not released. Own diagnostic task canceled normally before host quit.", + "singleStepTimeMapping": "FxTimingAPI_v4 timelineTime:fromInputTime: converts source analysis time before FxCommandAPI_v2 seek; exact rational offset-clip backward step and consecutive forward-step checks pass", + "candidate28Host": "Midpoint both285, midpoint forward193 new/258 total, loss50 keys task idle with immediate rerun, active cancel task idle and normal quit passed. Offset-clip single-step sought source3.72 as timeline3.72 instead of7.72; candidate not released; corrected in29.", + "existingSingleStep": "An already identical tracked pair must still advance the playhead without duplicating the author write; regression added in30.", + "nativeRegressionFixtureNote": "Initial unchanged-step fixture followed a different reference frame, legitimately changed the reference confidence. Correct fixture repeats the same two-frame operation twice; second pass advances without author write." } diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 2c1f515..07f5356 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -86,8 +86,8 @@ 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];}}} - CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&hasResults&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime); - 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)||![command movePlayheadToTime:timelineTime error:nil])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]; + CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime); + 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 aefc19a..86473ad 100644 --- a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h @@ -17,6 +17,8 @@ DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_timelineOffset=CMTimeMake(4,1);host->_state=kFxAnalysisState_NotAnalyzing;request(-2);BOOL range=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&CMTimeCompare(desired.start,timeAt(1))==0&&CMTimeCompare(desired.duration,timeAt(2))==0;[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=1;i--){setFrame(i);[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}setFrame(0);NSError *singleStopError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&singleStopError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"backward-single-step-includes-reference-and-one-neighbor",range&&stopped&&[tracked[@"keys"]count]==2);run.record(@"single-step-sends-sdk-quiet-analysis-termination",[singleStopError.domain isEqual:FxPlugErrorDomain]&&singleStopError.code==kFxError_UserCancelled); run.record(@"backward-single-step-seeks-timeline-with-clip-offset",host->_seekCount==1&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(1)))==0&&CMTimeCompare(host->_time,timeAt(1))==0); DYWriteTools(base,doc,kCMTimeZero);capture(2);BOOL repeated=YES;for(int first=2;first<4;first++){request(2);repeated&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=first;i<=first+1&&repeated;i++){setFrame(i);repeated&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();repeated&=CMTimeCompare(host->_time,timeAt(first+1))==0;}run.record(@"repeated-forward-single-step-continues-source-frames-at-offset-clip",repeated&&host->_seekCount==3&&CMTimeCompare(host->_seekTime,CMTimeAdd(CMTimeMake(4,1),timeAt(4)))==0); + int priorWrites=0;for(int repeat=0;repeat<2;repeat++){priorWrites=base->_undoStarts;capture(2);request(2);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<=3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();}run.record(@"unchanged-single-step-still-advances-without-duplicate-author-write",callbacks&&host->_seekCount==5&&CMTimeCompare(host->_time,timeAt(3))==0&&base->_undoStarts==priorWrites,@{@"seekCount":@(host->_seekCount),@"writesBefore":@(priorWrites),@"writesAfter":@(base->_undoStarts)}); + // An expected loss must end the host job, not only our local tracking state. 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];} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 362a48b..319b4ed 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.2 CFBundleVersion - 29 + 30 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 1493e7d..7d8524f 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.2 CFBundleVersion - 29 + 30 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright