保存仿制图章修复与前轮发布诊断,待正式验收
这个提交包含在:
1 父节点
5a10408557
当前提交
ca9936ee3c
25 个文件已更改
+1354
-58
没有与搜索条件相匹配的文件
@@ -1,15 +1,17 @@
|
||||
- (void)initializeToolHost {
|
||||
_viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];_viewerParameterBridge.renderer=_renderer;
|
||||
_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
|
||||
_toolTrackingMessages=[NSMutableDictionary new];_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
|
||||
NSNotificationCenter *n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(toolCanvasSelection:) name:@"DYToolCanvasSelection" object:_apiManager];[n addObserver:self selector:@selector(toolCanvasCommand:) name:@"DYToolCanvasCommand" object:_apiManager];[n addObserver:self selector:@selector(toolTrackRequested:) name:@"DYToolTrack" object:_apiManager];
|
||||
}
|
||||
- (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];[_trackingPreviewFrame 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];[_toolTrackingMessages 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];}
|
||||
if(!document)return;@synchronized(self){
|
||||
for(NSString *ID in [[_toolTrackingMessages.allKeys copy]autorelease])if(![DYSharedMaskWithID(document,ID)isEqual:DYSharedMaskWithID(_toolCanvasDocument,ID)])[_toolTrackingMessages removeObjectForKey:ID];
|
||||
[_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];}
|
||||
}
|
||||
- (void)scheduleToolCanvasRegistration {
|
||||
_toolCaptureEnabled=YES;dispatch_async(dispatch_get_main_queue(),^{id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{if(!self->_toolSession){NSString *session=NSUUID.UUID.UUIDString;id<FxParameterSettingAPI_v6>s=[self->_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];BOOL accepted=[s setStringParameterValue:session toParameter:DYCanvasSessionParameterID];os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_registered accepted=%{public}d",(int)accepted);{self->_toolSession=[session copy];@synchronized(DYToolCanvasSessions()){[DYToolCanvasSessions()setObject:self forKey:session];}}}}@finally{[a endAction:self];}});
|
||||
@@ -17,9 +19,12 @@
|
||||
#include "DYToolGrayCapture.inc.h"
|
||||
- (NSMutableDictionary*)toolMask:(NSString*)maskID node:(NSString*)nodeID document:(NSDictionary*)doc {for(NSMutableDictionary *m in DYMasksForTool(doc,nodeID))if([m[@"id"]isEqual:maskID])return m;return nil;}
|
||||
- (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?:@""}];});
|
||||
NSString *node=nil,*mask=nil;
|
||||
@synchronized(self){node=[(_trackingActive.load()?_trackingNode:_selectedToolNode)copy];mask=[(_trackingActive.load()?_trackingMaskID:_selectedToolMask)copy];if(mask)_toolTrackingMessages[mask]=message?:@"";}
|
||||
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});[node release];[mask release];
|
||||
}
|
||||
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
|
||||
@synchronized(self){if(_trackingMaskID)_toolTrackingMessages[_trackingMaskID]=message?:@"";}
|
||||
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
|
||||
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
|
||||
info[@"tracking"]=@(active);info[@"message"]=message;
|
||||
@@ -52,7 +57,7 @@
|
||||
});
|
||||
}
|
||||
- (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");
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;@synchronized(self){if(![mask isEqual:_selectedToolMask])_toolDrawingStampReference=NO;}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 取消。":@"已选中本层蒙版"];
|
||||
}
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion {
|
||||
@@ -80,6 +85,7 @@
|
||||
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
|
||||
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
|
||||
stamp[@"stampTrackMode"]=@"linked";
|
||||
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
|
||||
@try{
|
||||
@@ -149,11 +155,25 @@
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
@synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;NSDictionary *m=draftTime?_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),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
|
||||
@synchronized(self){
|
||||
if(_toolCanvasHidden||!_selectedToolMask)return nil;
|
||||
BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;
|
||||
NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;
|
||||
DYMaskParameters p=DYMaskAtTime(m,time);
|
||||
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:@{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())}];
|
||||
if(m[@"stampSource"]){
|
||||
info[@"referenceDrawing"]=@(_toolDrawingStampReference);
|
||||
info[@"status"]=_toolDrawingStampReference?@"拖框选择同一表面上有纹理的参考区 · 不改变修复范围 · Esc 取消":(_toolTrackingMessages[m[@"id"]]?:m[@"status"]?:@"拖动青色十字调整取样;黄色椭圆覆盖瑕疵。纯色区域可先选择跟踪参考;固定污点无需跟踪。");
|
||||
info[@"trackingStopped"]=m[@"trackingStopped"]?:@NO;
|
||||
info[@"canReturn"]=@(CMTIME_IS_NUMERIC(DYTrackingRecordedTime(m,@"trackingLastTime")));
|
||||
if(m[@"stampReference"]){DYMaskParameters ref=DYStampReferenceAtTime(m,time);info[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
|
||||
}
|
||||
return info;
|
||||
}
|
||||
}
|
||||
- (void)toolTrackRequested:(NSNotification*)notification {
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_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{
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolDrawingStampReference||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法开始分析,请重新选择片段后重试。"];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;
|
||||
if(!CMTIME_IS_NUMERIC(time)){[self toolStatus:@"请在时间线定位到有效画面后再开始跟踪"];return;}
|
||||
@@ -173,7 +193,11 @@
|
||||
std::min(8.f,[source[2] floatValue]*_trackingStampMotion.sourceScaleX),
|
||||
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;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;
|
||||
_trackingStampLinked=source&&DYStampUsesLinkedTracking(mask);
|
||||
if(source){DYMaskParameters ref=DYStampReferenceAtTime(mask,time);_trackingStampTargetSeed={ref.centerX,ref.centerY,ref.width,ref.height,0};}
|
||||
_trackingStopped=NO;_trackingCurrentTime=_trackingPreviousTime=kCMTimeInvalid;
|
||||
@synchronized(self){[_toolTrackingMessages removeObjectForKey:mask[@"id"]];}
|
||||
_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;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;_trackingHeartbeat.store(_trackingStarted);
|
||||
_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());
|
||||
@@ -191,10 +215,13 @@
|
||||
}@finally{[a endAction:self];}
|
||||
}
|
||||
- (void)pollToolAnalysis:(NSTimer*)timer {
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;
|
||||
if(_trackingCancelled.load()){[self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:nil];return;}
|
||||
if(NSProcessInfo.processInfo.systemUptime-_trackingHeartbeat.load()>30){[self finishToolAnalysis:@"宿主超过 30 秒未返回新画面,跟踪已停止;请重新选择片段或使用手工关键帧。" error:nil];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
|
||||
}
|
||||
- (BOOL)stopToolAnalysis:(NSString*)message error:(NSError**)error {
|
||||
if(message){[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
|
||||
if(message){_trackingStopped=YES;[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
|
||||
}
|
||||
- (BOOL)finishToolAnalysis:(NSString*)message error:(NSError**)error {
|
||||
// FxAnalyzer's quiet cancellation is an explicit SDK error sentinel. A bare
|
||||
@@ -220,11 +247,14 @@
|
||||
}
|
||||
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);
|
||||
_trackingShapePolygon=polygon;_toolTracker.setMask(std::move(polygon));return YES;
|
||||
_trackingShapePolygon=polygon;
|
||||
if(_trackingStampMotion.active&&_trackingFrozenMask[@"stampReference"])polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};
|
||||
_toolTracker.setMask(std::move(polygon));return YES;
|
||||
}
|
||||
- (BOOL)finishToolTrackingLoss:(const dy::TrackResult&)lost region:(NSString*)region atTime:(CMTime)time error:(NSError**)error {
|
||||
NSString *reason=@"区域内运动不一致";
|
||||
switch(lost.failure){
|
||||
case dy::TrackFailure::InsufficientTexture:reason=@"区域纹理不足";break;
|
||||
case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;
|
||||
case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;
|
||||
case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;
|
||||
@@ -233,14 +263,16 @@
|
||||
default:break;
|
||||
}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss region=%{public}@ time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",region?:@"蒙版",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);
|
||||
NSString *detail=region?[NSString stringWithFormat:@"%@失去跟踪(%@)",region,reason]:reason;
|
||||
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整区域后从此处继续",detail,(unsigned long)_trackingSamples.count] error:error];
|
||||
NSString *detail=region?[NSString stringWithFormat:@"%@%@(%@)",region,_trackingSamples.count?@"失去跟踪":@"无法开始跟踪",reason]:reason;
|
||||
NSString *next=_trackingStampMotion.active?@"选择同一表面上有纹理的跟踪参考,或设置手工关键帧。":@"调整蒙版后从最后可信帧继续。";
|
||||
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@。%@",detail,next] error:error];
|
||||
}
|
||||
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);uint64_t trackingSpan=DYBetaSpanBegin(@"tracking_frame",nil);@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];
|
||||
NSDictionary *preview=nil;
|
||||
_trackingCurrentTime=time;_trackingHeartbeat.store(NSProcessInfo.processInfo.systemUptime);
|
||||
dy::GrayFrame frame;
|
||||
const bool stamp=_trackingStampMotion.active;
|
||||
const bool objectMode=_trackingObjectMode&&!stamp;
|
||||
@@ -278,21 +310,28 @@
|
||||
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
|
||||
}else if(!_trackingSamples.count){
|
||||
os_log(OS_LOG_DEFAULT,"dayu_vision_region_worker main=%{public}d stamp=%{public}d",(int)NSThread.isMainThread,(int)stamp);
|
||||
dy::TrackerROI targetROI={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
dy::TrackerROI targetROI=stamp?_trackingStampTargetSeed:dy::TrackerROI{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
if(!_toolTracker.reset(frame,targetROI))
|
||||
return [self finishToolAnalysis:stamp?@"覆盖区域内纹理不足,原图章已保留":@"蒙版内纹理不足,原蒙版已保留" error:error];
|
||||
if(stamp&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
|
||||
return [self finishToolAnalysis:@"取样区域内纹理不足,原图章已保留" error:error];
|
||||
return [self finishToolTrackingLoss:_toolTracker.result() region:stamp?@"跟踪参考区域":@"蒙版区域" atTime:time error:error];
|
||||
if(stamp&&!_trackingStampLinked&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
|
||||
return [self finishToolTrackingLoss:_stampSourceTracker.result() region:@"独立取样区域(可切换为随修复区移动)" atTime:time error:error];
|
||||
target=_toolTracker.result();
|
||||
if(stamp)source=_stampSourceTracker.result();
|
||||
if(stamp&&!_trackingStampLinked)source=_stampSourceTracker.result();
|
||||
}else{
|
||||
target=_toolTracker.track(frame);
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"覆盖区域":nil atTime:time error:error];
|
||||
if(stamp){
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"跟踪参考区域":nil atTime:time error:error];
|
||||
if(stamp&&!_trackingStampLinked){
|
||||
source=_stampSourceTracker.track(frame);
|
||||
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
|
||||
}
|
||||
}
|
||||
if(stamp){
|
||||
dy::TrackResult reference=target;float aspect=float(frame.width)/frame.height;
|
||||
target=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingSeed.centerX,_trackingSeed.centerY,aspect);
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:@"修复区域" atTime:time error:error];
|
||||
if(_trackingStampLinked)source=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingStampSourceSeed.cx,_trackingStampSourceSeed.cy,aspect);
|
||||
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
|
||||
}
|
||||
DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,stamp?kCMTimeInvalid:time);
|
||||
p.centerX=target.cx;p.centerY=target.cy;
|
||||
float confidence=target.confidence;
|
||||
@@ -331,6 +370,7 @@
|
||||
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
|
||||
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
|
||||
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
|
||||
if(_trackingFrozenMask[@"stampReference"]){auto tracked=_toolTracker.result();DYMaskParameters ref=covered;ref.kind=DYMaskRectangle;ref.centerX=tracked.cx;ref.centerY=tracked.cy;ref.width=_trackingStampTargetSeed.width*tracked.scaleX;ref.height=_trackingStampTargetSeed.height*tracked.scaleY;ref.angle=tracked.rotation;packet[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
|
||||
}
|
||||
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];packet[@"predicted"]=@(objectStep.predicted);
|
||||
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
|
||||
@@ -356,13 +396,27 @@
|
||||
_objectTracker.stop();
|
||||
_toolTracker.stop();
|
||||
if(_trackingStampMotion.active)_stampSourceTracker.stop();
|
||||
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
|
||||
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard&&!_trackingStopped;
|
||||
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);}
|
||||
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;self->_trackingHeartbeat.store(self->_trackingStarted);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(self->_trackingObjectRepaired)message=[message stringByAppendingFormat:@" · 补齐 %lu 帧短暂遮挡,请复核",(unsigned long)self->_trackingObjectRepaired];
|
||||
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];}}}
|
||||
BOOL failedStamp=self->_trackingStopped&&self->_trackingFrozenMask[@"stampSource"];
|
||||
if(failedStamp){
|
||||
double stopped=CMTIME_IS_NUMERIC(self->_trackingCurrentTime)?CMTimeGetSeconds(self->_trackingCurrentTime):CMTimeGetSeconds(self->_trackingReferenceTime);
|
||||
NSString *position=CMTIME_IS_NUMERIC(self->_trackingPreviousTime)?[NSString stringWithFormat:@"最后可信帧 %.3fs",CMTimeGetSeconds(self->_trackingPreviousTime)]:@"未生成新轨迹,原图章已保留";
|
||||
message=[NSString stringWithFormat:@"已停止 · %.3fs · %@。%@",stopped,position,message];
|
||||
}
|
||||
if((hasResults||failedStamp)&&!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;
|
||||
if(mask[@"stampSource"]){
|
||||
self->_trackingCandidate[@"trackingStopped"]=@(self->_trackingStopped);
|
||||
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"])[self->_trackingCandidate removeObjectForKey:field];
|
||||
CMTime last=self->_trackingPreviousTime,stop=self->_trackingCurrentTime;
|
||||
if(CMTIME_IS_NUMERIC(last))self->_trackingCandidate[@"trackingLastTime"]=@[@(last.value),@(last.timescale),@(last.epoch)];
|
||||
if(CMTIME_IS_NUMERIC(stop))self->_trackingCandidate[@"trackingStopTime"]=@[@(stop.value),@(stop.timescale),@(stop.epoch)];
|
||||
}
|
||||
[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 [self adoptToolCanvasDocument:doc];}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",@"previewBuffer",@"visionPool",@"visionWidth",@"visionHeight"]];}
|
||||
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];
|
||||
@@ -372,7 +426,10 @@
|
||||
(unsigned long)self->_trackingDirectFrames,(unsigned long)self->_trackingCopiedFrames,
|
||||
(unsigned long)[self->_trackingCandidate[@"keys"]count]);
|
||||
if(self->_trackingSingle)[self toolStatus:message];
|
||||
else [self postTrackingPreview:nil active:NO message:message];
|
||||
else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
|
||||
[self postTrackingPreview:nil active:NO message:message];
|
||||
}
|
||||
});return YES;
|
||||
}
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户