diff --git a/大鱼调色/Plugin/DYToolTrackingProbe.inc.h b/大鱼调色/Plugin/DYToolTrackingProbe.inc.h index 68d272a..0c338f1 100644 --- a/大鱼调色/Plugin/DYToolTrackingProbe.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingProbe.inc.h @@ -3,16 +3,16 @@ @interface DYToolTrackingProbe : NSObject { @public id _base;CMTime _time,_timelineOffset,_seekTime;int _seekCount;FxAnalysisState _state;int _forwardStarts,_backwardStarts; - int _actionDepth;BOOL _rejectSeekDuringAction; + int _trackingActionDepth;BOOL _rejectSeekDuringAction; } @end @implementation DYToolTrackingProbe - (id)apiForProtocol:(Protocol*)protocol{NSString *name=NSStringFromProtocol(protocol);if([@[@"FxAnalysisAPI",@"FxTimingAPI_v4",@"FxCustomParameterActionAPI_v4",@"FxCommandAPI_v2"]containsObject:name])return self;return [_base apiForProtocol:protocol];} -- (void)startAction:(id)sender{++_actionDepth;[(id)_base startAction:sender];} -- (void)endAction:(id)sender{[(id)_base endAction:sender];--_actionDepth;} +- (void)startAction:(id)sender{++_trackingActionDepth;[(id)_base startAction:sender];} +- (void)endAction:(id)sender{[(id)_base endAction:sender];--_trackingActionDepth;} - (CMTime)currentTime{return _time;} - (void)timelineTime:(CMTime*)timeline fromInputTime:(CMTime)input{*timeline=CMTimeAdd(input,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);} -- (BOOL)movePlayheadToTime:(CMTime)time error:(NSError**)error{if(_rejectSeekDuringAction&&_actionDepth)return NO;_seekTime=time;_seekCount++;_time=CMTimeSubtract(time,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);return YES;} +- (BOOL)movePlayheadToTime:(CMTime)time error:(NSError**)error{if(_rejectSeekDuringAction&&_trackingActionDepth)return NO;_seekTime=time;_seekCount++;_time=CMTimeSubtract(time,CMTIME_IS_NUMERIC(_timelineOffset)?_timelineOffset:kCMTimeZero);return YES;} - (FxAnalysisState)analysisStateForEffect{return _state;} - (BOOL)startForwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_forwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;} - (BOOL)startBackwardAnalysis:(FxAnalysisLocation)location error:(NSError**)error{_backwardStarts++;_state=kFxAnalysisState_AnalysisStarted;return YES;} diff --git a/开发交接.md b/开发交接.md index 671feb5..9ede447 100644 --- a/开发交接.md +++ b/开发交接.md @@ -12,7 +12,7 @@ ## 135宿主验收与定位兼容修复 -135正式版的1037项自检、四卡片布局及三类说明弹窗通过。FCP12.4合成100帧纯色取样/独立参考跟踪通过,首帧双向失败显示原因,冷重开保留两个图章和停止原因;手工关键帧、当前帧取样、撤销与重做实测通过。最后可信帧按钮在真实FCP未跳转,已补充基础Command API兼容和具体时间/错误诊断,136实测时间换算正确、接口存在,但参数动作内跳转返回NO且无错误。已将跳转排到参数读取动作结束后,并让现有回归模拟该拒绝条件,准备137重测。135未发布安装包/Release/文章,保留候选交付记录。 +135正式版的1037项自检、四卡片布局及三类说明弹窗通过。FCP12.4合成100帧纯色取样/独立参考跟踪通过,首帧双向失败显示原因,冷重开保留两个图章和停止原因;手工关键帧、当前帧取样、撤销与重做实测通过。最后可信帧按钮在真实FCP未跳转,已补充基础Command API兼容和具体时间/错误诊断,136实测时间换算正确、接口存在,但参数动作内跳转返回NO且无错误。已将跳转排到参数读取动作结束后,并让现有回归模拟该拒绝条件,准备137重测。探针计数器已使用跟踪专用名称,避免与已有派生探针的成员重名。135未发布安装包/Release/文章,保留候选交付记录。 ## 当前进展