Show synchronized frame previews and progress for stamp and mask tracking

这个提交包含在:
mac 于 2026-11-06 01:45:18 +08:00 提交
1 父节点 7b6a3106ca
当前提交 687a366e1c
11 个文件已更改
+363 -17

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

+26 -1
查看文件
@@ -12,6 +12,7 @@
#include <cmath>
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
#include "DYTrackingPreview.inc.h"
static NSString *DYWorkspaceSymbol(NSString *type){return @{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"}[type]?:@"square";}
static NSDictionary *DYWorkspacePalette(void){NSMutableDictionary *palette=[[DYThemePalette()mutableCopy]autorelease];BOOL light=DYThemeIsLight();palette[@"background"]=[NSColor colorWithWhite:light?.88:.145 alpha:1];palette[@"card"]=[NSColor colorWithWhite:light?.84:.17 alpha:1];palette[@"field"]=[NSColor colorWithWhite:light?.78:.23 alpha:1];palette[@"border"]=[NSColor colorWithWhite:light?.6:.31 alpha:1];return palette;}
static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;}
@@ -93,6 +94,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
DYRenderer *_renderer;DYLUTLibrary *_library;DYLUTBrowser *_browser;
DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane;
DYScopePlot *_plot;NSArray *_scopePlots;NSInteger _editorMode;
DYTrackingPreview *_trackingPreview;
NSTextField *_heading,*_description,*_status,*_lutExplanation;
NSButton *_close,*_hostScopes,*_sizeMode;
DYWorkspaceLifetime *_lifetime;
@@ -122,6 +124,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
_hostScopes=[DYWorkspaceButton(@"FCP",self,@selector(toggleHostScopes:))retain];_hostScopes.toolTip=@"切换宿主示波器";[_scopePane addSubview:_hostScopes];
_description=[[DYThemeLabel labelWithString:@"示波器 · 显示参考"]retain];_description.font=[NSFont systemFontOfSize:10];[_scopePane addSubview:_description];
NSMutableArray *plots=[NSMutableArray array];for(NSInteger i=0;i<4;i++){DYScopePlot *plot=[[[DYScopePlot alloc]init]autorelease];plot.mode=i;plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:plot];[plots addObject:plot];}_scopePlots=[plots copy];_plot=[_scopePlots[0]retain];
_trackingPreview=[[DYTrackingPreview alloc]initWithTarget:self action:@selector(trackingPreviewAction:)];
[_scopePane addSubview:_trackingPreview];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(trackingPreviewChanged:) name:@"DYToolTrackingStatus" object:[self rootHost]];
_status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status];
_lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES;
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer];
@@ -133,7 +138,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
- (void)dealloc{
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_trackingPreview release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
}
- (BOOL)visible{return _visible||_opening;}
@@ -183,8 +188,27 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
_sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace];
_lutPane.frame=_editorHost.bounds;_lutExplanation.hidden=YES;
CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES;
_trackingPreview.frame=_scopePane.bounds;
CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)];
}
- (void)setTrackingPreviewVisible:(BOOL)visible {
_trackingPreview.hidden=!visible;_description.hidden=visible;_hostScopes.hidden=visible;
for(DYScopePlot *plot in _scopePlots)plot.hidden=visible;
}
- (void)trackingPreviewChanged:(NSNotification *)note {
NSDictionary *info=note.userInfo;
if(!info[@"tracking"]||(!_visible&&!_opening))return;
BOOL active=[info[@"tracking"] boolValue];
if(active&&_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
if(!_trackingPreview.hidden)[_trackingPreview applyUpdate:info];
}
- (void)trackingPreviewAction:(id)sender {
if(_trackingPreview.running){
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:[self rootHost] userInfo:@{@"direction":@9}];
}else{
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
}
}
- (void)pageChanged:(id)sender{
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2;
CMTime displayTime=_toolTime;id<FxCustomParameterActionAPI_v4>action=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{
@@ -265,6 +289,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;}
- (void)close{
if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO];
[_trackingPreview reset];[self setTrackingPreviewVisible:NO];
BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;
[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=nil;_maskScroll.documentView=nil;[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=nil;
if(_remoteParent)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter removeObserver:self name:name object:_remoteParent];_remoteParent=nil;
+4 -2
查看文件
@@ -610,11 +610,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
- (void)openWorkspace:(id)sender {
if(_embedded||_workspaceEditor||!self.window||!_renderer)return;
BOOL tracking=[sender isKindOfClass:NSNotification.class]&&[[sender userInfo][@"page"]isEqual:@"tracking"];
if(tracking&&_workspace.visible)return;
[_browser close];
if(!_workspace)_workspace=[[DYColorWorkspace alloc]initWithManager:_manager renderer:_renderer library:_library title:@"大鱼调色 · 当前片段"];
if(_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
if(!tracking&&_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}];
[_workspace showRelativeToView:self];
if([sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
if(!tracking&&[sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]];
}
- (void)rememberWorkspaceSelection:(NSNotification*)note {NSString*node=note.userInfo[@"node"];if(!node.length)return;NSString*saved=[node copy];[_workspaceSelectedNode release];_workspaceSelectedNode=saved;}
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
+37 -2
查看文件
@@ -2,13 +2,22 @@
// CF asks the host for video gamma 2.2, then Lanczos-scales to RGBA8 before
// OpenCV gray conversion. Adapt our linear host contract in a separate texture.
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
return [self toolGrayFrame:tile preview:nil error:error];
}
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error {
@synchronized(_toolCaptureDevices){
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;
if(bounds.left!=image.left||bounds.right!=image.right||bounds.bottom!=image.bottom||bounds.top!=image.top)return {};
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];
if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>device=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)device=candidate;
if(device){id<MTLLibrary>library=[device newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>gray=[library newFunctionWithName:@"dyToolCapture"],gamma=[library newFunctionWithName:@"dyToolEncodeGamma22"];id<MTLComputePipelineState>grayPipeline=gray?[device newComputePipelineStateWithFunction:gray error:error]:nil,gammaPipeline=gamma?[device newComputePipelineStateWithFunction:gamma error:error]:nil;id<MTLCommandQueue>queue=[device newCommandQueue];MPSImageLanczosScale *scale=[[MPSImageLanczosScale alloc]initWithDevice:device];
if(grayPipeline&&gammaPipeline&&queue&&scale){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;}
if(grayPipeline&&gammaPipeline&&queue&&scale){
entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;
id<MTLFunction>function=[library newFunctionWithName:@"dyToolTrackingPreview"];
id<MTLComputePipelineState>pipeline=function?[device newComputePipelineStateWithFunction:function error:nil]:nil;
entry[@"previewPipeline"]=pipeline;
[pipeline release];[function release];
}
[scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release];
}[devices release];if(!entry)return {};
}
@@ -21,8 +30,34 @@
id<MTLBuffer>buffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height*sizeof(float)){buffer=[[device newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;}
id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gamma"]];[encoder setTexture:source atIndex:0];[encoder setTexture:encoded atIndex:1];[encoder dispatchThreads:MTLSizeMake(source.width,source.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
[entry[@"scale"]encodeToCommandBuffer:commands sourceTexture:encoded destinationTexture:bytes];
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes 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];
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes 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];
id<MTLBuffer>previewBuffer=nil;
vector_uint3 previewInfo={0,0,info.z};
if(preview&&entry[@"previewPipeline"]){
double scale=std::min({1.,640./width,360./height});
previewInfo.x=std::max(1u,(unsigned)(width*scale));previewInfo.y=std::max(1u,(unsigned)(height*scale));
NSUInteger size=previewInfo.x*previewInfo.y*4;
previewBuffer=entry[@"previewBuffer"];
if(previewBuffer.length!=size){
previewBuffer=[[device newBufferWithLength:size options:MTLResourceStorageModeShared]autorelease];
entry[@"previewBuffer"]=previewBuffer;
}
if(previewBuffer){
encoder=[commands computeCommandEncoder];
[encoder setComputePipelineState:entry[@"previewPipeline"]];[encoder setTexture:bytes atIndex:0];
[encoder setBuffer:previewBuffer offset:0 atIndex:0];[encoder setBytes:&previewInfo length:sizeof(previewInfo) atIndex:1];
[encoder dispatchThreads:MTLSizeMake(previewInfo.x,previewInfo.y,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];
[encoder endEncoding];
}
}
[commands commit];[commands waitUntilCompleted];
if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return {};}
if(previewBuffer){
double pixelAspect=tile.pixelAspect;
double aspect=double(width)/height*(std::isfinite(pixelAspect)&&pixelAspect>0?pixelAspect:1);
*preview=@{@"rgba":[NSData dataWithBytes:previewBuffer.contents length:previewBuffer.length],
@"width":@(previewInfo.x),@"height":@(previewInfo.y),@"aspect":@(aspect)};
}
dy::GrayFrame result{int(width),int(height),std::vector<float>(width*height)};memcpy(result.pixels.data(),buffer.contents,width*height*sizeof(float));return result;
}
}
@@ -15,6 +15,10 @@
NSString *_trackingNode,*_trackingMaskID,*_trackingMessage;
NSDictionary *_trackingFrozenMask;NSMutableDictionary *_trackingCandidate;
NSMutableArray *_trackingSamples;
CMTimeRange _trackingPreviewInputRange;
NSUInteger _trackingPreviewTotal,_trackingPreviewCompleted;
NSDictionary *_trackingPreviewFrame;
BOOL _trackingPreviewQueued;
DYMaskParameters _trackingSeed;
DYStampMotion _trackingStampMotion;
dy::TrackerROI _trackingStampSourceSeed;
+82 -6
查看文件
@@ -6,7 +6,7 @@
- (void)tearDownToolHost {
[_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil;
[_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];}
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_toolCaptureDevices release];
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];
}
- (void)adoptToolCanvasDocument:(NSDictionary*)document {
if(!document)return;@synchronized(self){[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
@@ -19,6 +19,37 @@
- (void)toolStatus:(NSString*)message {
NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});
}
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
info[@"tracking"]=@(active);info[@"message"]=message;
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:_apiManager userInfo:info];
}
- (void)publishTrackingPreview {
NSDictionary *frame=nil;
@synchronized(self){
frame=[_trackingPreviewFrame autorelease];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;
}
if(!frame||!_trackingActive.load())return;
NSUInteger done=[frame[@"completed"]unsignedIntegerValue],total=[frame[@"total"]unsignedIntegerValue];
NSString *direction=[frame[@"backward"]boolValue]?@"反向":@"正向";
NSString *message=total?[NSString stringWithFormat:@"%@ · %lu / %lu 帧 · %.0f%%",direction,(unsigned long)done,(unsigned long)total,100.*done/total]
:[NSString stringWithFormat:@"%@ · 已分析 %lu 帧",direction,(unsigned long)done];
[self postTrackingPreview:frame active:YES message:message];
}
- (void)queueTrackingPreview:(NSDictionary*)frame {
uint64_t generation=_trackingGeneration;
@synchronized(self){
[_trackingPreviewFrame release];_trackingPreviewFrame=[frame copy];
if(_trackingPreviewQueued)return;
_trackingPreviewQueued=YES;
}
// Keep one coherent packet pending. A slow UI may skip intermediate updates
// without ever pairing geometry from one frame with pixels from another.
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
if(self->_trackingGeneration==generation)[self publishTrackingPreview];
});
}
- (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(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";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];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
@@ -98,9 +129,20 @@
std::min(8.f,[source[3] floatValue]*_trackingStampMotion.sourceScaleY),0};
}
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
_trackingPreviewInputRange=kCMTimeRangeInvalid;_trackingPreviewTotal=_trackingPreviewCompleted=0;
@synchronized(self){[_trackingPreviewFrame release];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;}
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;}
[self toolStatus:@"正在读取宿主源帧并跟踪…"];if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
if(_trackingSingle)[self toolStatus:@"正在读取下一张源帧…"];
else{
uint64_t generation=_trackingGeneration;
dispatch_async(dispatch_get_main_queue(),^{
if(self->_trackingGeneration!=generation||!self->_trackingActive.load())return;
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
[self postTrackingPreview:nil active:YES message:@"正在读取宿主源帧…"];
});
}
if(!_toolAnalysisTimer)_toolAnalysisTimer=[[NSTimer scheduledTimerWithTimeInterval:.3 target:self selector:@selector(pollToolAnalysis:) userInfo:nil repeats:YES]retain];
}@finally{[a endAction:self];}
}
- (void)pollToolAnalysis:(NSTimer*)timer {
@@ -116,10 +158,20 @@
}
- (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];
_trackingPreviewInputRange=input;
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];
if(!_trackingSingle&&CMTIMERANGE_IS_VALID(_trackingPreviewInputRange)){
double step=CMTimeGetSeconds(duration);
double forward=CMTimeGetSeconds(CMTimeSubtract(CMTimeRangeGetEnd(_trackingPreviewInputRange),_trackingReferenceTime))/step;
double backward=CMTimeGetSeconds(CMTimeSubtract(_trackingReferenceTime,_trackingPreviewInputRange.start))/step;
// Backward includes the reference frame. A bidirectional run counts it once.
forward=std::max(1.,std::ceil(forward-1e-7));backward=std::floor(backward+1e-7);
double total=_trackingBoth?forward+backward:_trackingBackward?backward+1:forward;
_trackingPreviewTotal=NSUInteger(std::clamp(total,1.,double(INT_MAX)));
}
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}
if(_trackingStampMotion.active)_stampSourceTracker.setMask(polygon);
_toolTracker.setMask(std::move(polygon));return YES;
@@ -142,7 +194,9 @@
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);@try{
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
dy::GrayFrame frame=[self toolGrayFrame:tile error:error];if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
NSDictionary *preview=nil;
dy::GrayFrame frame=[self toolGrayFrame:tile preview:_trackingSingle?nullptr:&preview error:error];
if(!frame.valid())return [self stopToolAnalysis:@"宿主未返回完整源画面" error:error];
if(!_trackingSamples.count){if(_trackingReferenceFrame.valid()&&frame.width==_trackingReferenceFrame.width&&frame.height==_trackingReferenceFrame.height){double same=0,flip=0;size_t count=0;for(int y=0;y<frame.height;y+=8)for(int x=0;x<frame.width;x+=8){float p=frame.pixels[y*frame.width+x];same+=fabs(p-_trackingReferenceFrame.pixels[y*frame.width+x]);flip+=fabs(p-_trackingReferenceFrame.pixels[(frame.height-1-y)*frame.width+x]);count++;}same/=MAX(size_t(1),count);flip/=MAX(size_t(1),count);_trackingFlip=flip<.035&&flip+.008<same&&flip<same*.8;}os_log(OS_LOG_DEFAULT,"dayu_tool_track_seed width=%{public}d height=%{public}d flip=%{public}d time=%{public}.6f",frame.width,frame.height,(int)_trackingFlip,CMTimeGetSeconds(time));}
if(_trackingFlip)for(int y=0;y<frame.height/2;y++)for(int x=0;x<frame.width;x++)std::swap(frame.pixels[y*frame.width+x],frame.pixels[(frame.height-1-y)*frame.width+x]);
BOOL stamp=_trackingStampMotion.active;
@@ -183,9 +237,28 @@
}
if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error];
[_trackingSamples addObject:DYStampKey(time,p,NO,confidence,motion)];_trackingPreviousTime=time;
if(!_trackingSingle){
if(!(_trackingBoth&&_trackingBackward&&_trackingSamples.count==1&&_trackingPreviewCompleted))++_trackingPreviewCompleted;
DYMaskParameters covered=p;
NSMutableDictionary *packet=[NSMutableDictionary dictionaryWithDictionary:preview?:@{}];
if(stamp){
covered.width*=motion.targetScaleX;covered.height*=motion.targetScaleY;
DYMaskParameters sampled=covered;
sampled.centerX=source.cx;sampled.centerY=source.cy;
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
}
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
packet[@"flip"]=@(_trackingFlip);packet[@"time"]=@(CMTimeGetSeconds(time));
packet[@"completed"]=@(_trackingPreviewCompleted);
packet[@"total"]=@(MAX(_trackingPreviewTotal,_trackingPreviewCompleted));
packet[@"backward"]=@(_trackingBackward);
[self queueTrackingPreview:packet];
}
if(_trackingSamples.count==1||_trackingSamples.count%15==0){
if(stamp)os_log(OS_LOG_DEFAULT,"dayu_stamp_track_pair time=%{public}.6f target=%{public}.5f,%{public}.5f source=%{public}.5f,%{public}.5f target_scale=%{public}.4f,%{public}.4f source_scale=%{public}.4f,%{public}.4f",CMTimeGetSeconds(time),target.cx,target.cy,source.cx,source.cy,motion.targetScaleX,motion.targetScaleY,motion.sourceScaleX,motion.sourceScaleY);
[self toolStatus:[NSString stringWithFormat:stamp?@"已跟踪取样与覆盖 %lu 帧 · 置信度 %.0f%%":@"已分析 %lu 帧 · 置信度 %.0f%%",(unsigned long)_trackingSamples.count,confidence*100]];
}
return YES;
}@finally{_trackingInFrame.store(false);}
@@ -196,12 +269,15 @@
if(_trackingStampMotion.active)_stampSourceTracker.stop();
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
if(!self->_trackingSingle)[self publishTrackingPreview];
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[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){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];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&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer"]];}
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[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];
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer",@"previewBuffer"]];}
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[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;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
if(self->_trackingSingle)[self toolStatus:message];
else [self postTrackingPreview:nil active:NO message:message];
});return YES;
}
@@ -7,13 +7,34 @@
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;
NSMutableArray *updates=[NSMutableArray array];
id observer=[NSNotificationCenter.defaultCenter addObserverForName:@"DYToolTrackingStatus" object:host queue:nil usingBlock:^(NSNotification *note){if(note.userInfo[@"tracking"])[updates addObject:note.userInfo];}];
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);
NSDictionary *lastPreview=updates.count>=2?updates[updates.count-2]:nil;
DYMaskParameters shown{};
[lastPreview[@"shape"] getBytes:&shown length:sizeof(shown)];
NSData *previewPixels=lastPreview[@"rgba"];
run.record(@"mask-analysis-emits-matching-frame-geometry-and-completed-progress",
[lastPreview[@"completed"]intValue]==6&&[lastPreview[@"total"]intValue]==6&&
fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
previewPixels.length==tw*th*4&&shown.centerX==end.centerX&&shown.centerY==end.centerY&&
!lastPreview[@"sourceShape"]&&![updates.lastObject[@"tracking"]boolValue]&&host->_seekCount==0);
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"]&&!entry[@"previewBuffer"];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);
[updates removeAllObjects];
DYWriteTools(base,doc,kCMTimeZero);capture(2);host->_state=kFxAnalysisState_NotAnalyzing;request(0);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();BOOL backward=host->_backwardStarts==1;callbacks&=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=2;i>=0&&callbacks;i--){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}[plugin cleanupAnalysis:nil];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"bidirectional-passes-share-reference-and-merge-once",callbacks&&backward&&[tracked[@"keys"]count]==6&&base->_undoStarts==writes+2);
NSUInteger previous=0;BOOL progress=YES,sawForward=NO,sawBackward=NO;
for(NSDictionary *update in updates){
if(!update[@"shape"])continue;
NSUInteger current=[update[@"completed"]unsignedIntegerValue];
progress&=current>=previous&&[update[@"total"]intValue]==6;
if([update[@"backward"]boolValue])sawBackward=YES;else sawForward=YES;
previous=current;
}
run.record(@"bidirectional-progress-counts-reference-once-and-never-regresses",progress&&sawForward&&sawBackward&&previous==6);
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);
@@ -112,6 +133,14 @@
DYStampMotion motion=DYStampMotionAtTime(saved,timeAt(5));
DYMaskParameters covered=DYMaskAtTime(saved,timeAt(5));
NSArray *sampled=DYStampSourceAtTime(saved,timeAt(5));
lastPreview=updates.count>=2?updates[updates.count-2]:nil;
DYMaskParameters shownSource{},shownTarget{};
[lastPreview[@"sourceShape"] getBytes:&shownSource length:sizeof(shownSource)];
[lastPreview[@"shape"] getBytes:&shownTarget length:sizeof(shownTarget)];
run.record(@"clone-analysis-preview-displays-both-regions-on-the-same-frame",
[lastPreview[@"completed"]intValue]==6&&fabs([lastPreview[@"time"]doubleValue]-CMTimeGetSeconds(timeAt(5)))<1e-9&&
fabs(shownSource.centerX-[sampled[0]doubleValue])<1e-6&&shownTarget.centerX==covered.centerX&&
fabs(shownTarget.width-covered.width)<1e-6&&[lastPreview[@"rgba"]length]==tw*th*4);
run.record(@"host-clone-stamp-follows-two-independent-centers-and-scales",
paired&&[saved[@"keys"] count]==6&&motion.active&&
fabs(covered.centerX-(.75+10./tw))<.006&&fabs(covered.centerY-(.5-3.75/th))<.008&&
@@ -140,5 +169,6 @@
paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&&
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
}
[NSNotificationCenter.defaultCenter removeObserver:observer];
[plugin release];
}
+13
查看文件
@@ -58,3 +58,16 @@ kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* p
if(pos.x>=info.x||pos.y>=info.y)return;uint2 point=uint2(pos.x,info.z?info.y-1-pos.y:pos.y);uint3 rgb=uint3(rint(source.read(point).rgb*255.f));
pixels[pos.y*info.x+pos.x]=float((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15)/255.f;
}
// Reuse the analysis source texture for the lightweight color preview.
kernel void dyToolTrackingPreview(texture2d<float> source [[texture(0)]],
device uchar4 *pixels [[buffer(0)]],
constant uint3 &info [[buffer(1)]],
uint2 pos [[thread_position_in_grid]]){
if(any(pos>=info.xy))return;
constexpr sampler filter(coord::normalized,address::clamp_to_edge,filter::linear);
float2 uv=(float2(pos)+.5f)/float2(info.xy);
if(info.z)uv.y=1-uv.y;
float3 rgb=source.sample(filter,uv).rgb;
pixels[pos.y*info.x+pos.x]=uchar4(uchar3(rint(saturate(rgb)*255)),255);
}
+137
查看文件
@@ -0,0 +1,137 @@
@interface DYTrackingPreviewImage : NSView
- (void)showFrame:(NSDictionary *)frame;
@end
@implementation DYTrackingPreviewImage {
NSDictionary *_frame;
NSImage *_image;
}
- (BOOL)isFlipped {return YES;}
- (BOOL)isAccessibilityElement {return YES;}
- (NSString *)accessibilityRole {return NSAccessibilityImageRole;}
- (void)dealloc {[_frame release];[_image release];[super dealloc];}
- (void)showFrame:(NSDictionary *)frame {
[_frame release];_frame=[frame copy];[_image release];_image=nil;
NSData *pixels=frame[@"rgba"];
NSUInteger w=[frame[@"width"] unsignedIntegerValue],h=[frame[@"height"] unsignedIntegerValue];
if(w&&h&&pixels.length==w*h*4){
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)pixels);
CGColorSpaceRef space=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
CGImageRef cg=CGImageCreate(w,h,8,32,w*4,space,kCGImageAlphaNoneSkipLast,provider,nil,true,kCGRenderingIntentDefault);
if(cg){_image=[[NSImage alloc]initWithCGImage:cg size:NSMakeSize(w,h)];CGImageRelease(cg);}
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
}
self.accessibilityLabel=_image?[NSString stringWithFormat:@"同步预览 · 源帧 %.3f 秒 · %@",[frame[@"time"] doubleValue],
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
[self setNeedsDisplay:YES];
}
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
if(shape.length!=sizeof(DYMaskParameters))return;
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
auto point=[&](double x,double y){
double px=x*p.width*aspect,py=y*p.height;
return NSMakePoint(rect.origin.x+(p.centerX+(px*c-py*s)/aspect)*rect.size.width,
rect.origin.y+(p.centerY+px*s+py*c)*rect.size.height);
};
NSBezierPath *path=[NSBezierPath bezierPath];
auto add=[&](NSPoint position,int i){if(i)[path lineToPoint:position];else [path moveToPoint:position];};
if(p.kind==DYMaskBezier){
auto contour=dyFlattenMask((const DYBezierNode *)nodes.bytes,nodes.length/sizeof(DYBezierNode));
for(int i=0;i<contour.count;i++)add(point(contour.x[i],contour.y[i]),i);
}else if(p.kind==DYMaskRectangle){
const double corners[][2]={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
for(int i=0;i<4;i++)add(point(corners[i][0],corners[i][1]),i);
}else{
for(int i=0;i<80;i++){double a=i*2*M_PI/80;add(point(.5*cos(a),.5*sin(a)),i);}
}
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
}
- (void)drawRect:(NSRect)dirty {
[NSColor.blackColor setFill];NSRectFill(dirty);
if(!_image||NSIsEmptyRect(self.bounds))return;
double aspect=[_frame[@"aspect"] doubleValue];
if(!std::isfinite(aspect)||aspect<=0)aspect=_image.size.width/_image.size.height;
CGFloat w=MIN(NSWidth(self.bounds),NSHeight(self.bounds)*aspect),h=w/aspect;
NSRect picture=NSMakeRect(NSMidX(self.bounds)-w/2,NSMidY(self.bounds)-h/2,w,h);
[NSGraphicsContext saveGraphicsState];
NSRectClip(picture);
if([_frame[@"flip"] boolValue]){
[NSGraphicsContext saveGraphicsState];
NSAffineTransform *flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:2*NSMidY(picture)];[flip scaleXBy:1 yBy:-1];[flip concat];
}
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
[NSGraphicsContext restoreGraphicsState];
}
@end
@interface DYTrackingPreview : NSView
- (instancetype)initWithTarget:(id)target action:(SEL)action;
- (void)applyUpdate:(NSDictionary *)info;
- (void)reset;
@property(nonatomic,readonly) BOOL running;
@end
@implementation DYTrackingPreview {
DYTrackingPreviewImage *_preview;
NSTextField *_title,*_detail,*_status;
NSButton *_action;
NSProgressIndicator *_progress;
BOOL _running;
}
- (BOOL)isFlipped {return YES;}
- (BOOL)running {return _running;}
- (instancetype)initWithTarget:(id)target action:(SEL)action {
if((self=[super initWithFrame:NSZeroRect])){
self.identifier=@"DYTrackingPreview";
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
_action=DYWorkspaceButton(@"停止跟踪",target,action);
_progress=[[[NSProgressIndicator alloc]init]autorelease];_progress.style=NSProgressIndicatorStyleBar;
_progress.controlSize=NSControlSizeSmall;_progress.indeterminate=NO;_progress.minValue=0;_progress.maxValue=1;_progress.accessibilityLabel=@"跟踪进度";
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
for(NSView *view in @[_title,_detail,_status,_action,_progress,_preview])[self addSubview:view];
self.hidden=YES;
}
return self;
}
- (void)layout {
[super layout];
CGFloat w=NSWidth(self.bounds),h=NSHeight(self.bounds),body=MAX(1,w-16);
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
_progress.frame=NSMakeRect(8,28,body,10);
_status.frame=NSMakeRect(8,43,body,32);
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
}
- (void)applyUpdate:(NSDictionary *)info {
BOOL active=[info[@"tracking"] boolValue];
if(active&&!info[@"shape"]){[_preview showFrame:nil];_detail.stringValue=@"";_title.stringValue=@"跟踪预览";}
if(info[@"shape"]){
BOOL stamp=info[@"sourceShape"]!=nil;
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
[_preview showFrame:info];
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
}
NSUInteger total=[info[@"total"] unsignedIntegerValue];
if(active){
if(_progress.indeterminate!=(total==0)){
_progress.indeterminate=total==0;
if(total)[_progress stopAnimation:nil];else [_progress startAnimation:nil];
}
_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
}else [_progress stopAnimation:nil];
_running=active;_action.title=active?@"停止跟踪":@"返回示波器";_action.accessibilityLabel=_action.title;
_status.stringValue=info[@"message"]?:@"";_status.toolTip=_status.stringValue;
}
- (void)reset {
[_progress stopAnimation:nil];_progress.indeterminate=NO;[_preview showFrame:nil];_running=NO;self.hidden=YES;
}
@end
@@ -29,6 +29,30 @@
[host->_parent setFrameSize:NSMakeSize(840,300)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds));
headerBitmap=DYWorkspaceHeaderBitmap(root);toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
run.record(@"workspace-topbar-survives-minimum-resize-and-large-dirty-redraw",toolbarInk>80&&closeInk>10&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"toolbarPixels":@(toolbarInk),@"closePixels":@(closeInk)});
NSNotificationCenter *trackingCenter=NSNotificationCenter.defaultCenter;
DYMaskParameters trackedShape=dyDefaultMaskParameters();
NSData *shapeBytes=[NSData dataWithBytes:&trackedShape length:sizeof(trackedShape)];
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host
userInfo:@{@"tracking":@YES,@"message":@"正向 · 3 / 6 帧 · 50%",@"shape":shapeBytes,
@"rgba":[NSData dataWithBytes:"\xff\x00\x00\xff" length:4],@"width":@1,@"height":@1,
@"time":@.08,@"aspect":@1,@"total":@6,@"completed":@3}];
NSView *trackingPreview=[workspace valueForKey:@"trackingPreview"];
NSProgressIndicator *progress=[trackingPreview valueForKey:@"progress"];
NSView *image=[trackingPreview valueForKey:@"preview"];
NSButton *previewAction=[trackingPreview valueForKey:@"action"];
[trackingPreview layoutSubtreeIfNeeded];
run.record(@"workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
!trackingPreview.hidden&&[(NSView *)plots.firstObject isHidden]&&progress.doubleValue==.5&&
[image.accessibilityLabel containsString:@"0.080"]&&NSWidth(image.frame)>200&&NSHeight(image.frame)>120);
__block BOOL cancelRouted=NO;
id stopObserver=[trackingCenter addObserverForName:@"DYToolTrack" object:host queue:nil usingBlock:^(NSNotification *n){cancelRouted=[n.userInfo[@"direction"]intValue]==9;}];
[previewAction performClick:nil];
[trackingCenter removeObserver:stopObserver];
[trackingCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"tracking":@NO,@"message":@"已取消;保留最后连续可信轨迹"}];
BOOL resultRetained=!trackingPreview.hidden&&[image.accessibilityLabel containsString:@"0.080"]&&[previewAction.title isEqual:@"返回示波器"];
[previewAction performClick:nil];
run.record(@"workspace-preview-stop-routes-to-analysis-and-dismiss-restores-scopes",
cancelRouted&&resultRetained&&trackingPreview.hidden&&![(NSView *)plots.firstObject isHidden]);
[workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent);
[workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0);
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.14.1</string>
<string>1.14.2</string>
<key>CFBundleVersion</key>
<string>91</string>
<string>92</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
@@ -71,7 +71,7 @@
<key>uuid</key>
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
<key>version</key>
<string>1.14.1</string>
<string>1.14.2</string>
</dict>
<dict>
<key>className</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.14.1</string>
<string>1.14.2</string>
<key>CFBundleVersion</key>
<string>91</string>
<string>92</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>