fix: make pen drafts immediate and serializable, reject stale edits, and align tracked path ROI and optical flow with local reference evidence
这个提交包含在:
1 父节点
38adc259e0
当前提交
0b53fdcdfd
9 个文件已更改
+522
-55
没有与搜索条件相匹配的文件
@@ -2,7 +2,7 @@
|
||||
// deferred until the gesture has finished and the callback has returned.
|
||||
- (void)postToolCanvasStatus:(NSString*)message {
|
||||
NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;}
|
||||
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
|
||||
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
|
||||
}
|
||||
- (void)discardToolCanvasDraft {
|
||||
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
|
||||
@@ -22,7 +22,7 @@
|
||||
}@finally{[a endAction:self];}
|
||||
if(changed)[self postToolCanvasStatus:@"蒙版已保存 · 可一次撤销"];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
}@finally{@synchronized(self){self->_toolCanvasCommitPending=NO;}}});[draft release];[original release];[node release];[maskID release];
|
||||
}@finally{@synchronized(self){self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release];
|
||||
}
|
||||
- (void)toolCanvasCommand:(NSNotification*)notification {
|
||||
NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;}
|
||||
@@ -53,6 +53,11 @@
|
||||
if(type==NSEventTypeKeyDown&&key==27){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"已取消绘制,保留原蒙版。"];return;}
|
||||
if(type==NSEventTypeKeyDown&&(key==13||key==10||key==3)&&_toolDrawingPen){if([_toolCanvasDraft[@"nodes"]length]<3*sizeof(DYBezierNode)){[self postToolCanvasStatus:@"至少放置三个点,再点首节点或完成绘制。"];return;}[self commitToolCanvasDraftAtTime:time];return;}
|
||||
if(type==NSEventTypeKeyDown&&(key==8||key==127)&&_toolDrawingPen){NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];if(nodes.length)[nodes setLength:nodes.length-sizeof(DYBezierNode)];if(nodes)_toolCanvasDraft[@"nodes"]=nodes;[self postToolCanvasStatus:@"已移除最后一个钢笔点,继续点击放置。"];return;}
|
||||
if(type==NSEventTypeKeyDown&&(key==8||key==127)&&!_toolDrawingPen&&_toolDragPart>=1000){
|
||||
NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];DYMaskParameters parameters=DYMaskAtTime(mask,time);NSUInteger count=[mask[@"nodes"]length]/sizeof(DYBezierNode),index=(_toolDragPart-1000)/3;if(parameters.kind!=DYMaskBezier||index>=count)return;
|
||||
if(count<=3){[self postToolCanvasStatus:@"闭合路径至少保留三个点;可使用重画钢笔重新绘制。"];return;}
|
||||
[self toolCanvasEvent:NSEventTypeLeftMouseDown point:point part:_toolDragPart modifiers:modifiers key:0 time:time];NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];[nodes replaceBytesInRange:NSMakeRange(index*sizeof(DYBezierNode),sizeof(DYBezierNode)) withBytes:NULL length:0];_toolCanvasDraft[@"nodes"]=nodes;[self commitToolCanvasDraftAtTime:time];return;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown){
|
||||
if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;}
|
||||
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
|
||||
|
||||
@@ -34,20 +34,20 @@ public:
|
||||
if(!ready()||!f.valid())return false;
|
||||
info_={};info_.levels=1;info_.width[0]=f.width;info_.height[0]=f.height;
|
||||
int total=f.width*f.height;
|
||||
while(info_.levels<5&&info_.width[info_.levels-1]>=80&&info_.height[info_.levels-1]>=80) {
|
||||
while(info_.levels<dy::TrackerPyramidLevels&&info_.width[info_.levels-1]>=80&&info_.height[info_.levels-1]>=80) {
|
||||
int i=info_.levels++;info_.width[i]=info_.width[i-1]/2;info_.height[i]=info_.height[i-1]/2;
|
||||
info_.offset[i]=total;total+=info_.width[i]*info_.height[i];
|
||||
}
|
||||
for(int i=0;i<2;i++){[frames_[i] release];frames_[i]=nil;}[points_ release];points_=nil;[results_ release];results_=nil;
|
||||
for(int i=0;i<2;i++)frames_[i]=[device_ newBufferWithLength:total*sizeof(float) options:MTLResourceStorageModeShared];
|
||||
points_=[device_ newBufferWithLength:180*sizeof(dy::FlowPoint) options:MTLResourceStorageModeShared];
|
||||
results_=[device_ newBufferWithLength:180*sizeof(FlowOutput) options:MTLResourceStorageModeShared];
|
||||
points_=[device_ newBufferWithLength:dy::TrackerFeatureLimit*sizeof(dy::FlowPoint) options:MTLResourceStorageModeShared];
|
||||
results_=[device_ newBufferWithLength:dy::TrackerFeatureLimit*sizeof(FlowOutput) options:MTLResourceStorageModeShared];
|
||||
if(!frames_[0]||!frames_[1]||!points_||!results_)return false;
|
||||
previous_=0;memcpy(frames_[0].contents,f.pixels.data(),f.pixels.size()*sizeof(float));
|
||||
id<MTLCommandBuffer>b=[queue_ commandBuffer];pyramid(b,frames_[0]);return finish(b);
|
||||
}
|
||||
bool advance(const dy::GrayFrame& f,const std::vector<dy::FlowPoint>& points,std::vector<dy::FlowMatch>& matches) override {
|
||||
if(!f.valid()||f.width!=info_.width[0]||f.height!=info_.height[0]||points.empty()||points.size()>180)return false;
|
||||
if(!f.valid()||f.width!=info_.width[0]||f.height!=info_.height[0]||points.empty()||points.size()>dy::TrackerFeatureLimit)return false;
|
||||
int next=1-previous_;memcpy(frames_[next].contents,f.pixels.data(),f.pixels.size()*sizeof(float));
|
||||
memcpy(points_.contents,points.data(),points.size()*sizeof(dy::FlowPoint));
|
||||
id<MTLCommandBuffer>b=[queue_ commandBuffer];pyramid(b,frames_[next]);
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
|
||||
@synchronized(_toolCaptureDevices){FxRect b=tile.tilePixelBounds,image=tile.imagePixelBounds;if(b.left!=image.left||b.right!=image.right||b.bottom!=image.bottom||b.top!=image.top)return {};
|
||||
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>d=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)d=candidate;if(d){id<MTLLibrary>library=[d newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>function=[library newFunctionWithName:@"dyToolCapture"];id<MTLComputePipelineState>pipeline=function?[d newComputePipelineStateWithFunction:function error:error]:nil;id<MTLCommandQueue>queue=[d newCommandQueue];if(pipeline&&queue){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"pipeline":pipeline,@"queue":queue}];_toolCaptureDevices[key]=entry;}[pipeline release];[queue release];[function release];[library release];}[devices release];if(!entry)return {};}
|
||||
id<MTLTexture>texture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=MAX(.01,tile.pixelAspect),displayHeight=texture.height/aspect,scale=MIN(1.,MIN(3840./texture.width,2160./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>2160||width>3840)return {};
|
||||
id<MTLTexture>texture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=tile.pixelAspect;if(!std::isfinite(aspect)||aspect<=0)return {};aspect=MAX(.01,aspect);double displayHeight=texture.height/aspect,scale=MIN(1.,MIN(3840./texture.width,2160./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>2160||width>3840)return {};
|
||||
id<MTLBuffer>buffer=[entry[@"device"]newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared];if(!buffer)return {};vector_uint3 info={width,height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"pipeline"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info) atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted];dy::GrayFrame frame;if(commands.status==MTLCommandBufferStatusCompleted){frame={int(width),int(height),std::vector<float>(width*height)};memcpy(frame.pixels.data(),buffer.contents,width*height*sizeof(float));}[buffer release];return frame;
|
||||
}
|
||||
}
|
||||
@@ -25,14 +25,14 @@
|
||||
}
|
||||
- (void)toolCanvasSelection:(NSNotification*)notification {
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
|
||||
@synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"];
|
||||
@synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"];
|
||||
}
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
@synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;NSDictionary *m=_toolCanvasDraft?:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"coverage":@(_toolShowCoverage)};}
|
||||
}
|
||||
- (void)toolTrackRequested:(NSNotification*)notification {
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消钢笔绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{
|
||||
id<FxAnalysisAPI>analysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;}
|
||||
CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:notification.userInfo[@"node"] document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;}
|
||||
|
||||
@@ -23,5 +23,8 @@
|
||||
redraw();click(180,280);click(450,260);click(330,145);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:host userInfo:@{@"node":@"base:hsl",@"mask":maskID,@"command":@"finish",@"timeValue":@0,@"timeScale":@1,@"timeEpoch":@0}];drain();NSDictionary *buttonSaved=DYReadTools(base,kCMTimeZero).document;run.record(@"pen-inspector-finish-commits-without-viewer-keyboard-focus",![buttonSaved isEqual:author]&&base->_undoStarts==undo+2&&[[buttonSaved[@"baseMasks"][@"hsl"]lastObject][@"nodes"]length]==3*sizeof(DYBezierNode));
|
||||
redraw();click(160,270);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:host userInfo:@{@"node":@"base:hsl",@"mask":maskID,@"command":@"cancel",@"timeValue":@0,@"timeScale":@1,@"timeEpoch":@0}];drain();run.record(@"pen-inspector-cancel-preserves-saved-curve-and-undo-count",[DYReadTools(base,kCMTimeZero).document isEqual:buttonSaved]&&base->_undoStarts==undo+2);
|
||||
redraw();click(190,280);click(460,280);click(300,150);[osc keyDownAtPositionX:300 positionY:150 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain();run.record(@"pen-return-closes-and-saves-native-path",handled&&base->_undoStarts==undo+3&&![[plugin toolCanvasMaskAtTime:kCMTimeZero][@"drawing"]boolValue]);
|
||||
// Finish and the next drag can arrive before the main queue gets a turn.
|
||||
redraw();click(170,275);click(445,275);click(300,140);int queuedUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];[osc mouseDownAtPositionX:320 positionY:212.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();NSDictionary *queuedDoc=DYReadTools(base,kCMTimeZero).document;DYMaskParameters moved=DYMaskAtTime([queuedDoc[@"baseMasks"][@"hsl"]lastObject],kCMTimeZero);run.record(@"pen-finish-and-next-gesture-serialize-without-dropping-either",base->_undoStarts==queuedUndo+2&&fabs(moved.centerX-.55)<1e-5&&fabs(moved.centerY-.55)<1e-5);
|
||||
redraw();click(170,275);click(445,275);click(300,140);[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:CMTimeMake(1,25)];drain();run.record(@"pen-refuses-to-finish-stale-draft-after-playhead-moves",[DYReadTools(base,kCMTimeZero).document isEqual:queuedDoc]&&base->_undoStarts==queuedUndo+2&&![[plugin toolCanvasMaskAtTime:CMTimeMake(1,25)][@"drawing"]boolValue]);
|
||||
[osc release];[plugin release];
|
||||
}
|
||||
+13
-13
@@ -7,12 +7,12 @@ kernel void dyTrackPyramid(device float*f[[buffer(0)]],constant PyramidInfo&i[[b
|
||||
for(int y=-1;y<=1;y++)for(int x=-1;x<=1;x++)sum+=f[i.offset[level-1]+clamp(int(p.y)*2+y,0,sh-1)*sw+clamp(int(p.x)*2+x,0,sw-1)]*(x==0?2.f:1.f)*(y==0?2.f:1.f);
|
||||
f[i.offset[level]+p.y*w+p.x]=sum/16.f;
|
||||
}
|
||||
inline bool inside(float2 p,int w,int h){return all(p>=6.f)&&p.x<w-7&&p.y<h-7;}
|
||||
inline bool inside(float2 p,int w,int h){return all(p>=12.f)&&p.x<w-13&&p.y<h-13;}
|
||||
inline float pixel(device const float*f,int w,float2 p) {
|
||||
int2 a=int2(p);float2 d=p-float2(a);int idx=a.y*w+a.x;
|
||||
return mix(mix(f[idx],f[idx+1],d.x),mix(f[idx+w],f[idx+w+1],d.x),d.y);
|
||||
}
|
||||
// One SIMD group per feature: lanes cooperatively reduce the 9x9 patch.
|
||||
// One SIMD group per feature: lanes cooperatively reduce the 21x21 patch.
|
||||
// Forward and backward checks stay in the same dispatch and reuse the resident pyramids.
|
||||
bool trackFlow(device const float*prev,device const float*next,constant PyramidInfo&i,float2 p,float2 guess,thread float2&q,thread float&error,uint lane) {
|
||||
int level=i.levels-1;for(;level>0;level--){float s=float(1<<level);if(inside(p/s,i.width[level],i.height[level])&&inside(guess/s,i.width[level],i.height[level]))break;}
|
||||
@@ -20,24 +20,24 @@ bool trackFlow(device const float*prev,device const float*next,constant PyramidI
|
||||
for(;level>=0;level--) {
|
||||
float2 pp=p/float(1<<level);int w=i.width[level],h=i.height[level];if(!inside(pp,w,h))return false;
|
||||
device const float*a=prev+i.offset[level];device const float*b=next+i.offset[level];
|
||||
float ref[3],gx[3],gy[3],mean=0,hxx=0,hxy=0,hyy=0;
|
||||
for(uint j=0;j<3;j++) {
|
||||
uint k=lane+j*32;ref[j]=gx[j]=gy[j]=0;if(k>=81)continue;
|
||||
float2 pos=pp+float2(int(k%9)-4,int(k/9)-4);ref[j]=pixel(a,w,pos);mean+=ref[j];
|
||||
float ref[14],gx[14],gy[14],mean=0,hxx=0,hxy=0,hyy=0;
|
||||
for(uint j=0;j<14;j++) {
|
||||
uint k=lane+j*32;ref[j]=gx[j]=gy[j]=0;if(k>=441)continue;
|
||||
float2 pos=pp+float2(int(k%21)-10,int(k/21)-10);ref[j]=pixel(a,w,pos);mean+=ref[j];
|
||||
gx[j]=.5f*(pixel(a,w,pos+float2(1,0))-pixel(a,w,pos-float2(1,0)));
|
||||
gy[j]=.5f*(pixel(a,w,pos+float2(0,1))-pixel(a,w,pos-float2(0,1)));
|
||||
hxx+=gx[j]*gx[j];hxy+=gx[j]*gy[j];hyy+=gy[j]*gy[j];
|
||||
}
|
||||
mean=simd_sum(mean)/81;hxx=simd_sum(hxx);hxy=simd_sum(hxy);hyy=simd_sum(hyy);
|
||||
mean=simd_sum(mean)/441;hxx=simd_sum(hxx);hxy=simd_sum(hxy);hyy=simd_sum(hyy);
|
||||
float det=hxx*hyy-hxy*hxy;if(det<1e-8f||hxx+hyy<1e-5f)return false;
|
||||
for(int iteration=0;iteration<20;iteration++) {
|
||||
if(!inside(q,w,h))return false;float target[3],tm=0;
|
||||
for(uint j=0;j<3;j++){uint k=lane+j*32;target[j]=k<81?pixel(b,w,q+float2(int(k%9)-4,int(k/9)-4)):0;tm+=target[j];}
|
||||
tm=simd_sum(tm)/81;float bx=0,by=0,sse=0;
|
||||
for(uint j=0;j<3;j++)if(lane+j*32<81){float e=ref[j]-mean-target[j]+tm;bx+=gx[j]*e;by+=gy[j]*e;sse+=e*e;}
|
||||
for(int iteration=0;iteration<30;iteration++) {
|
||||
if(!inside(q,w,h))return false;float target[14],tm=0;
|
||||
for(uint j=0;j<14;j++){uint k=lane+j*32;target[j]=k<441?pixel(b,w,q+float2(int(k%21)-10,int(k/21)-10)):0;tm+=target[j];}
|
||||
tm=simd_sum(tm)/441;float bx=0,by=0,sse=0;
|
||||
for(uint j=0;j<14;j++)if(lane+j*32<441){float e=ref[j]-mean-target[j]+tm;bx+=gx[j]*e;by+=gy[j]*e;sse+=e*e;}
|
||||
bx=simd_sum(bx);by=simd_sum(by);sse=simd_sum(sse);
|
||||
float2 delta=float2(hyy*bx-hxy*by,hxx*by-hxy*bx)/det;if(!all(isfinite(delta))||length(delta)>8)return false;
|
||||
q+=delta;error=sqrt(sse/81);if(dot(delta,delta)<.0001f)break;
|
||||
q+=delta;error=sqrt(sse/441);if(dot(delta,delta)<.0001f)break;
|
||||
}
|
||||
if(level>0)q*=2;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,12 @@
|
||||
|
||||
namespace dy {
|
||||
|
||||
// Capacity is shared by the independent detector and its Metal transport.
|
||||
constexpr size_t TrackerFeatureLimit = 300;
|
||||
constexpr int TrackerPyramidLevels = 4;
|
||||
constexpr int TrackerPatchRadius = 10;
|
||||
constexpr int TrackerIterations = 30;
|
||||
|
||||
struct GrayFrame {
|
||||
int width = 0, height = 0;
|
||||
std::vector<float> pixels;
|
||||
@@ -107,7 +113,7 @@ class Tracker {
|
||||
}
|
||||
static Pyramid makePyramid(const GrayFrame& f) {
|
||||
Pyramid p{f};
|
||||
while (p.size() < 5 && p.back().width >= 80 && p.back().height >= 80) {
|
||||
while (p.size() < TrackerPyramidLevels && p.back().width >= 80 && p.back().height >= 80) {
|
||||
const auto& src = p.back();
|
||||
GrayFrame dst{src.width/2, src.height/2, {}};
|
||||
dst.pixels.resize(static_cast<size_t>(dst.width)*dst.height);
|
||||
@@ -126,7 +132,7 @@ class Tracker {
|
||||
}
|
||||
|
||||
static bool flow(const Pyramid& prev, const Pyramid& next, P p, P guess, P& q, float& rmse) {
|
||||
constexpr int radius=4, side=radius*2+1, count=side*side;
|
||||
constexpr int radius=TrackerPatchRadius, side=radius*2+1, count=side*side;
|
||||
int level=static_cast<int>(std::min(prev.size(),next.size()))-1;
|
||||
for (;level>0;--level) {
|
||||
float s=static_cast<float>(1<<level);
|
||||
@@ -152,7 +158,7 @@ class Tracker {
|
||||
mean/=count;
|
||||
double det=hxx*hyy-hxy*hxy;
|
||||
if (det < 1e-8 || (hxx+hyy) < 1e-5) return false;
|
||||
for (int iteration=0;iteration<20;++iteration) {
|
||||
for (int iteration=0;iteration<TrackerIterations;++iteration) {
|
||||
if (!inside(next[level],q,radius+2)) return false;
|
||||
float target[count],targetMean=0;
|
||||
k=0;
|
||||
@@ -177,39 +183,73 @@ class Tracker {
|
||||
return inside(next[0],q,radius+2) && rmse<.12f;
|
||||
}
|
||||
|
||||
std::vector<P> detect(const GrayFrame& frame, const std::vector<P>& existing) const {
|
||||
static P refineCorner(const GrayFrame& frame, P initial) {
|
||||
constexpr int radius=10;
|
||||
P point=initial;
|
||||
for(int iteration=0;iteration<20;++iteration) {
|
||||
if(!inside(frame,point,radius+2))return initial;
|
||||
double xx=0,xy=0,yy=0,bx=0,by=0;
|
||||
for(int y=-radius;y<=radius;++y)for(int x=-radius;x<=radius;++x) {
|
||||
float px=point.x+x,py=point.y+y;
|
||||
double gx=.5*(sample(frame,px+1,py)-sample(frame,px-1,py));
|
||||
double gy=.5*(sample(frame,px,py+1)-sample(frame,px,py-1));
|
||||
double weight=std::exp(-double(x*x+y*y)/(radius*radius));
|
||||
double a=weight*gx*gx,b=weight*gx*gy,c=weight*gy*gy;
|
||||
xx+=a;xy+=b;yy+=c;bx+=a*x+b*y;by+=b*x+c*y;
|
||||
}
|
||||
double det=xx*yy-xy*xy;
|
||||
if(!std::isfinite(det)||det<1e-10)break;
|
||||
float dx=float((yy*bx-xy*by)/det),dy=float((xx*by-xy*bx)/det);
|
||||
if(!std::isfinite(dx)||!std::isfinite(dy))return initial;
|
||||
point.x+=dx;point.y+=dy;
|
||||
if(distance(point,initial)>radius)return initial;
|
||||
if(dx*dx+dy*dy<=.03f*.03f)break;
|
||||
}
|
||||
return inside(frame,point,radius+2)?point:initial;
|
||||
}
|
||||
|
||||
std::vector<P> detect(const GrayFrame& frame) const {
|
||||
struct Candidate {P p;float score;};
|
||||
std::vector<Candidate> candidates;
|
||||
float halfW=initialROI_.width*width_*.5f;
|
||||
float halfH=initialROI_.height*height_*.5f;
|
||||
float c=std::cos(initialROI_.angle),s=std::sin(initialROI_.angle);
|
||||
double det=cumulative_.determinant();
|
||||
float bound=0;
|
||||
for(float x:{-halfW,halfW})for(float y:{-halfH,halfH}){
|
||||
if(!std::isfinite(det)||det<=0)return {};
|
||||
float left=float(width_),right=0,top=float(height_),bottom=0;
|
||||
auto boundPoint=[&](P local){
|
||||
float x=local.x*2*halfW,y=local.y*2*halfH;
|
||||
auto p=cumulative_.map({initialROI_.cx*width_+c*x-s*y,initialROI_.cy*height_+s*x+c*y});
|
||||
bound=std::max(bound,distance(p,center_));
|
||||
}
|
||||
int minX=std::max(8,static_cast<int>(center_.x-bound));
|
||||
int maxX=std::min(width_-9,static_cast<int>(center_.x+bound));
|
||||
int minY=std::max(8,static_cast<int>(center_.y-bound));
|
||||
int maxY=std::min(height_-9,static_cast<int>(center_.y+bound));
|
||||
left=std::min(left,p.x);right=std::max(right,p.x);top=std::min(top,p.y);bottom=std::max(bottom,p.y);
|
||||
};
|
||||
// A free pen path is not constrained to its creation-time width/height.
|
||||
// Bound the actual path, including points beyond local +/-0.5.
|
||||
if(mask_.size()>=3)for(P p:mask_)boundPoint(p);
|
||||
else for(float x:{-.5f,.5f})for(float y:{-.5f,.5f})boundPoint({x,y});
|
||||
constexpr int border=TrackerPatchRadius+3;
|
||||
if(width_<=border*2||height_<=border*2)return {};
|
||||
int minX=int(std::clamp(std::floor(left),float(border),float(width_-border)));
|
||||
int maxX=int(std::clamp(std::ceil(right),float(border),float(width_-border)));
|
||||
int minY=int(std::clamp(std::floor(top),float(border),float(height_-border)));
|
||||
int maxY=int(std::clamp(std::ceil(bottom),float(border),float(height_-border)));
|
||||
auto inRegion=[&](P point){
|
||||
float dx=point.x-center_.x,dy=point.y-center_.y;
|
||||
float oldX=float((cumulative_.d*dx-cumulative_.b*dy)/det);
|
||||
float oldY=float((-cumulative_.c*dx+cumulative_.a*dy)/det);
|
||||
float u=(c*oldX+s*oldY)/(2*halfW),v=(-s*oldX+c*oldY)/(2*halfH);
|
||||
if(mask_.size()<3)return std::abs(u)<=.5f&&std::abs(v)<=.5f;
|
||||
bool inside=false;
|
||||
for(size_t i=0,j=mask_.size()-1;i<mask_.size();j=i++) {
|
||||
P a=mask_[j],b=mask_[i];
|
||||
if((a.y>v)!=(b.y>v))if(u<(b.x-a.x)*(v-a.y)/(b.y-a.y)+a.x)inside=!inside;
|
||||
}
|
||||
return inside;
|
||||
};
|
||||
float best=0;
|
||||
for (int y=minY;y<maxY;y+=2) for (int x=minX;x<maxX;x+=2) {
|
||||
float dx=x-center_.x,dy=y-center_.y;
|
||||
float oldX=float((cumulative_.d*dx-cumulative_.b*dy)/det);
|
||||
float oldY=float((-cumulative_.c*dx+cumulative_.a*dy)/det);dx=oldX;dy=oldY;
|
||||
float u=(c*dx+s*dy)/(2*halfW),v=(-s*dx+c*dy)/(2*halfH);
|
||||
if (std::abs(u)>.5f || std::abs(v)>.5f) continue;
|
||||
if(mask_.size()>=3) {
|
||||
bool inside=false;
|
||||
for(size_t i=0,j=mask_.size()-1;i<mask_.size();j=i++) {
|
||||
P a=mask_[j],b=mask_[i];
|
||||
if((a.y>v)!=(b.y>v))if(u<(b.x-a.x)*(v-a.y)/(b.y-a.y)+a.x)inside=!inside;
|
||||
}
|
||||
if(!inside)continue;
|
||||
}
|
||||
if(!inRegion({float(x),float(y)}))continue;
|
||||
double xx=0,xy=0,yy=0;
|
||||
for (int j=-2;j<=2;++j) for (int i=-2;i<=2;++i) {
|
||||
for (int j=-1;j<=1;++j) for (int i=-1;i<=1;++i) {
|
||||
int idx=(y+j)*width_+x+i;
|
||||
float gx=(frame.pixels[idx+1]-frame.pixels[idx-1])*.5f;
|
||||
float gy=(frame.pixels[idx+width_]-frame.pixels[idx-width_])*.5f;
|
||||
@@ -217,16 +257,20 @@ class Tracker {
|
||||
}
|
||||
float score=static_cast<float>((xx+yy-std::sqrt((xx-yy)*(xx-yy)+4*xy*xy))*.5);
|
||||
best=std::max(best,score);
|
||||
if (score>.0003f) candidates.push_back({{static_cast<float>(x),static_cast<float>(y)},score});
|
||||
if (score>1e-7f) candidates.push_back({{static_cast<float>(x),static_cast<float>(y)},score});
|
||||
}
|
||||
std::sort(candidates.begin(),candidates.end(),[](const auto& a,const auto& b){return a.score>b.score;});
|
||||
std::vector<P> selected=existing;
|
||||
float minSpacing=std::max(6.f,std::min(width_,height_)*.014f);
|
||||
std::vector<P> selected;selected.reserve(TrackerFeatureLimit);
|
||||
constexpr float minSpacing=10.f;
|
||||
for (const auto& candidate:candidates) {
|
||||
if (candidate.score < best*.012f || selected.size()>=180) break;
|
||||
if (candidate.score < best*.03f || selected.size()>=TrackerFeatureLimit) break;
|
||||
bool near=false;
|
||||
for (const auto& p:selected) if (distance(p,candidate.p)<minSpacing) {near=true;break;}
|
||||
if (!near) selected.push_back(candidate.p);
|
||||
if(near)continue;
|
||||
P refined=refineCorner(frame,candidate.p);
|
||||
if(!inRegion(refined))continue;
|
||||
for(const auto& p:selected)if(distance(p,refined)<minSpacing){near=true;break;}
|
||||
if(!near)selected.push_back(refined);
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
@@ -300,7 +344,7 @@ public:
|
||||
roi.width<=0 || roi.height<=0 || roi.width>8 || roi.height>8 || roi.cx<0 || roi.cx>1 || roi.cy<0 || roi.cy>1) return false;
|
||||
width_=frame.width;height_=frame.height;initialROI_=roi;
|
||||
center_={roi.cx*width_,roi.cy*height_};
|
||||
points_=detect(frame,{});
|
||||
points_=detect(frame);
|
||||
result_.features=static_cast<int>(points_.size());result_.inliers=result_.features;
|
||||
if (points_.size()<12) return false;
|
||||
if(backend_){if(!backend_->reset(frame))return false;}else previous_=makePyramid(frame);active_=true;result_.valid=true;result_.confidence=1;
|
||||
@@ -352,7 +396,12 @@ public:
|
||||
result_.confidence=confidence;result_.inliers=static_cast<int>(inliers.size());result_.valid=true;
|
||||
points_.clear();
|
||||
for (int i:inliers) points_.push_back(matches[i].q);
|
||||
if (++frameIndex_%5==0 || points_.size()<60) points_=detect(frame,points_);
|
||||
if (++frameIndex_%2==0 || points_.size()<60) {
|
||||
auto refreshed=detect(frame);
|
||||
// Keep a still-trusted set when a refresh finds insufficient new
|
||||
// corners; the next fit must continue to satisfy all loss guards.
|
||||
if(refreshed.size()>=12)points_=std::move(refreshed);
|
||||
}
|
||||
previous_=std::move(next);
|
||||
return result_;
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户