Use a valid seed-only analysis range at backward boundary; host deadlock fix awaiting formal validation

这个提交包含在:
mac 于 2026-11-02 01:43:59 +08:00 提交
1 父节点 b3176f854d
当前提交 123a6c8507
7 个文件已更改
+13 -10

没有与搜索条件相匹配的文件

+1 -1
查看文件
@@ -1,6 +1,6 @@
# 大鱼调色
原生 FxPlug 4 调色器,当前修订版本 **1.4.2(30)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
原生 FxPlug 4 调色器,当前修订版本 **1.4.2(31)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
## 1.4.2 跟踪修复
+4 -2
查看文件
@@ -10,14 +10,16 @@
仿射RANSAC细化容差改为3像素,并相应归一化残差置信度惩罚;只扩大容差而保留旧惩罚会在一致运动上过早低置信度停止。至少8内点、52%一致运动、最低0.3置信度、非线状分布、单步缩放/旋转和累计变换保护仍保留。未采用丢失后复制坐标伪造轨迹。新增确定平移、2.15像素非刚性残差和10%离群对应点的拟合检查;另有真实CPU/Metal图像光流、画面切换和平坦区域拒绝。
第一帧开始立即显示进度。失跟按特征不足、运动不一致、置信度、出画或变换问题区分,说明保留的可信帧数。普通失跟、主动取消、单帧完成和边界停止使用SDK的 `FxPlugErrorDomain / kFxError_UserCancelled` 正常取消标记,既结束宿主后台任务又不弹错误;引擎、无效源图和时序错误仍明确失败。27版候选仅返回NO/nil时,FCP的诊断分析残留在50%并影响退出,已在28版修复;不能把本地trackingActive清理当作宿主任务已结束。SDK证据见本机FxTypes.h的UserCancelled说明。正式宿主须确认任务回到闲置、可再次启动和正常退出。
第一帧开始立即显示进度。失跟按特征不足、运动不一致、置信度、出画或变换问题区分,说明保留的可信帧数。普通失跟、主动取消、单帧完成使用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。
已有相同轨迹的单帧操作也应前进播放头,以实际完成的连续两帧为依据,不以作者数据是否改变为依据;重复结果不增加一次无效作者写入或撤销。
首帧反向不拒绝desiredAnalysisTimeRange,而是返回只含种子的有效一帧范围,正常完成且不写入新轨迹。30版在范围发现回调返回NO/UserCancelled时,FCP主线程等范围回包、SDK工作线程同步调用宿主setAnalysisState而互等;本机进程采样确认。只停止无作者数据的本产品XPC服务后FCP恢复并正常退出,没有强制结束宿主,验收完整预设已提前保存。31版边界回调不再进入该错误路径。
## 验证与边界
30版候选Release原生293项通过,包含真实Metal采样、三组新增中间启动回调和五组SDK正常终止与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后继续FCP验证同一素材和独立切换画面用例。
31版边界范围修订等待正式构建的293项检查,包含真实Metal采样、三组新增中间启动回调和五组SDK正常终止与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后继续FCP验证同一素材和独立切换画面用例。
原始媒体、FCPXML快照、作者状态和解码帧均仅在本机验收缓存,普通Git只保存聚合结果与通用诊断源码。未修改父“大鱼调色盘”或Color Finale。不是人物分割/非刚性逐点描边;转身、遮挡、变形和出画仍可能需要手工调整后从当前帧继续。新增工具标量和透视/剪切等既有边界保持。
+4 -3
查看文件
@@ -1,7 +1,7 @@
{
"status": "native-validated-awaiting-formal-host",
"status": "boundary-range-revision-awaiting-native-and-formal-host",
"version": "1.4.2",
"build": "30",
"build": "31",
"baselineSource": "847a5ea99903c0b7427301c799e1c40f3fe6c5ad",
"nativeChecks": 293,
"independentChecks": [
@@ -220,5 +220,6 @@
"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."
"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.",
"boundaryPolicy": "At the first frame, backward analysis returns a valid one-seed-frame range and completes with no new author keys; never reject desiredAnalysisTimeRange for this normal boundary. Candidate30 NO/UserCancelled at range discovery deadlocked FCP main waiting for plugin range reply while SDK tried synchronous host setAnalysisState. Own stateless XPC service stopped after saved QA preset, restoring FCP; FCP quit normally, original user project untouched."
}
+1 -1
查看文件
@@ -61,7 +61,7 @@
}
- (BOOL)desiredAnalysisTimeRange:(CMTimeRange*)out forInputWithTimeRange:(CMTimeRange)input error:(NSError**)error {
CMTime end=CMTimeRangeGetEnd(input),ref=_trackingReferenceTime,step=_trackingFrameDuration;if(!CMTIME_IS_NUMERIC(input.start)||!CMTIME_IS_NUMERIC(end)||!CMTIME_IS_NUMERIC(ref)||ref.epoch!=input.start.epoch||ref.epoch!=end.epoch||CMTimeCompare(ref,input.start)<0||CMTimeCompare(ref,end)>=0||!CMTIME_IS_NUMERIC(step)||step.value<=0)return [self stopToolAnalysis:@"跟踪起点或帧长无效" error:error];
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0)return [self finishToolAnalysis:@"已到片段边界,未产生新轨迹" error:error];*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
CMTime lo=_trackingBackward?input.start:ref,hi=_trackingBackward?CMTimeAdd(ref,step):end;if(_trackingSingle){if(_trackingBackward){lo=CMTimeSubtract(ref,step);if(CMTimeCompare(lo,input.start)<0)lo=input.start;}else hi=CMTimeAdd(ref,CMTimeMultiply(step,2));}if(CMTimeCompare(hi,end)>0)hi=end;if(_trackingBackward&&CMTimeCompare(ref,input.start)==0&&!_trackingBoth){[_trackingMessage release];_trackingMessage=[@"已到片段边界,未产生新轨迹" copy];}*out=CMTimeRangeFromTimeToTime(lo,hi);return out->duration.value>0;
}
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error {
if(!CMTIME_IS_NUMERIC(duration)||duration.value<=0||duration.epoch!=0)return [self stopToolAnalysis:@"宿主分析帧长无效" error:error];_trackingFrameDuration=duration;_trackingPreviousTime=kCMTimeInvalid;_trackingFlip=NO;[_trackingSamples removeAllObjects];auto backend=DYToolCreateMetalFlow([[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"],error);if(!backend)return [self stopToolAnalysis:@"Metal 跟踪后端无法启动" error:error];_toolTracker.setBackend(backend);
@@ -23,7 +23,7 @@
// 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];}
Pixels flat(tw*th*4,.1f);for(size_t i=3;i<flat.size();i+=4)flat[i]=1;[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:flat.data() bytesPerRow:tw*8];NSError *lossError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&lossError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"texture-loss-keeps-prefix-and-sends-sdk-quiet-termination",callbacks&&stopped&&[tracked[@"keys"]count]==3&&[lossError.domain isEqual:FxPlugErrorDomain]&&lossError.code==kFxError_UserCancelled);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(-1);NSError *boundaryError=nil;stopped=![plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&boundaryError];drain();run.record(@"boundary-stop-sends-sdk-quiet-analysis-termination",stopped&&[boundaryError.domain isEqual:FxPlugErrorDomain]&&boundaryError.code==kFxError_UserCancelled);
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(-1);NSError *boundaryError=nil;callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&boundaryError]&&CMTimeCompare(desired.start,kCMTimeZero)==0&&CMTimeCompare(desired.duration,timeAt(1))==0&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&boundaryError];setFrame(0);callbacks&=[plugin analyzeFrame:frame atTime:kCMTimeZero error:&boundaryError];host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();run.record(@"boundary-seed-only-range-completes-without-author-write-or-rejected-range",callbacks&&!boundaryError&&[DYReadTools(base,kCMTimeZero).document isEqual:doc]);
NSError *lateError=nil;stopped=![plugin analyzeFrame:frame atTime:timeAt(0) error:&lateError];run.record(@"late-analysis-frame-also-terminates-host-job-quietly",stopped&&[lateError.domain isEqual:FxPlugErrorDomain]&&lateError.code==kFxError_UserCancelled);
// A host cache hit can move the playhead without re-entering renderDestinationImage.
// Starting at a middle frame must use analyzer input even on a fresh instance.
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>30</string>
<string>31</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>30</string>
<string>31</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>