fix: align tracker preprocessing and shared object lifecycle with native evidence
这个提交包含在:
1 父节点
9ba6eeb00a
当前提交
a0a97dfd88
14 个文件已更改
+312
-47
没有与搜索条件相匹配的文件
@@ -7,9 +7,9 @@
|
||||
auto timeAt=[](int frame){return CMTimeMake(frame*1001,24000);};auto capture=[&](int step){setFrame(step);host->_time=timeAt(step);NSData *state=nil;[plugin pluginState:&state atTime:host->_time quality:(FxQuality)0 error:&error];return [plugin renderDestinationImage:out sourceImages:@[frame] pluginState:state atTime:host->_time error:&error];};
|
||||
auto request=[&](int direction){if(direction!=9)host->_state=kFxAnalysisState_NotAnalyzing;[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@(direction)}]];};
|
||||
auto drain=[&](){double end=NSProcessInfo.processInfo.systemUptime+.15;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];};CMTimeRange inputRange=CMTimeRangeMake(kCMTimeZero,CMTimeMake(6*1001,24000)),desired;
|
||||
run.need(@"tracking-captures-real-full-input-texture",capture(0));int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-metal-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
run.need(@"tracking-renders-valid-source-before-analysis",capture(0));run.record(@"inactive-tracking-avoids-full-frame-motion-readback",[[plugin valueForKey:@"toolCaptureDevices"]count]==0);int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-opencv-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
// Mid-analysis author edits must reject the result rather than clobber them.
|
||||
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];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes);
|
||||
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];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled);
|
||||
@@ -40,8 +40,31 @@
|
||||
{
|
||||
const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){float encoded=x%3==1?.8f:.2f,linear=powf((encoded+.055f)/1.055f,2.4f);auto i=(y*w+x)*4;pixels[i]=pixels[i+1]=pixels[i+2]=linear;pixels[i+3]=1;}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){float expected=x%3==1?.8f:.2f;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){double code=x%3==1?.8:.2;double expected=std::round(std::pow(std::pow((code+.055)/1.055,2.4),1/2.2)*255)/255.;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-opencv",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
}
|
||||
// UI aliases of a shared object are one tracking target. Switching from the
|
||||
// global editor to either linked module must not cancel a valid analysis.
|
||||
{
|
||||
NSMutableDictionary *sharedDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document),*sharedMask=(id)DYAddSharedMask(sharedDoc,DYMaskRectangle);NSString *sharedID=sharedMask[@"id"];DYMaskParameters shape=DYMaskAtTime(sharedMask,kCMTimeZero);shape.width=shape.height=.65;shape.feather=0;sharedMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:hsl",YES);DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:spider",YES);
|
||||
DYWriteTools(base,sharedDoc,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":sharedID,@"direction":@1}]];int beforeShared=base->_undoStarts;
|
||||
BOOL sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
|
||||
for(NSString *alias in @[@"shared",@"base:spider",@"base:hsl"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":alias,@"mask":sharedID,@"document":DYReadTools(base,kCMTimeZero).document,@"draw":@NO}];
|
||||
for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *saved=DYReadTools(base,kCMTimeZero).document;
|
||||
run.record(@"shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",sharedCallbacks&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&DYMasksForTool(saved,@"base:hsl").firstObject==DYMasksForTool(saved,@"base:spider").firstObject&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds);
|
||||
// Removing the original UUID binding cannot delete or invalidate the shared
|
||||
// object while another module still references it.
|
||||
NSMutableDictionary *deletable=DYMutablePlist(sharedDoc);NSDictionary *extra=DYInsertTool(deletable,@"hsl",@"base:hsl");NSString *extraID=extra[@"id"];DYSetSharedMaskAssigned(deletable,sharedID,@"base:hsl",NO);DYSetSharedMaskAssigned(deletable,sharedID,extraID,YES);DYWriteTools(base,deletable,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":extraID,@"mask":sharedID,@"direction":@1}]];beforeShared=base->_undoStarts;sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
|
||||
NSMutableDictionary *removed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);BOOL removedAlias=DYRemoveTool(removed,extraID);DYWriteTools(base,removed,kCMTimeZero);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"base:spider",@"mask":sharedID,@"document":removed,@"draw":@NO}];
|
||||
for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();saved=DYReadTools(base,kCMTimeZero).document;
|
||||
run.record(@"shared-tracking-survives-removing-original-module-and-commits-one-object",removedAlias&&sharedCallbacks&&!DYToolWithID(saved,extraID)&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&[DYMasksForTool(saved,@"base:spider").firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(saved,sharedID).count==1&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds);
|
||||
id panel=[[[NSClassFromString(@"DYToolMaskPanel")alloc]initWithManager:host nodeID:@"base:spider"]autorelease];[panel refreshWithDocument:saved time:kCMTimeZero];[panel performSelector:@selector(canvas:)withObject:nil];BOOL aliasActive=[[panel valueForKey:@"_canvasActive"]boolValue];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"message":@"共享跟踪状态"}];BOOL statusVisible=[[[panel valueForKey:@"_status"]stringValue]isEqual:@"共享跟踪状态"];
|
||||
run.record(@"shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",aliasActive&&statusVisible&&[[(NSObject*)plugin valueForKey:@"_selectedToolNode"]isEqual:@"shared"]);
|
||||
}
|
||||
[plugin release];
|
||||
}
|
||||
在新工单中引用
屏蔽一个用户