让 Metal 直写 Vision 追踪输入并加入 LUT 高清分屏预览
这个提交包含在:
1 父节点
ef0e62419a
当前提交
63c49b0135
22 个文件已更改
+496
-86
没有与搜索条件相匹配的文件
@@ -166,14 +166,14 @@
|
||||
[_trackingNode release];_trackingNode=[node copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
|
||||
NSArray *source=DYStampSourceAtTime(mask,time);
|
||||
_trackingStampMotion=DYStampMotionAtTime(mask,time);
|
||||
_trackingObjectMode=DYMosaicTracksMask(doc,mask[@"id"]);_trackingObjectPending=_trackingObjectRepaired=0;
|
||||
_trackingObjectMode=DYMosaicTracksMask(doc,mask[@"id"]);_trackingObjectPending=_trackingObjectRepaired=0;_trackingDirectFrames=_trackingCopiedFrames=0;
|
||||
if(source){
|
||||
_trackingStampMotion.active=true;
|
||||
_trackingStampSourceSeed={[source[0] floatValue],[source[1] floatValue],
|
||||
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;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
|
||||
_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;
|
||||
_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());
|
||||
@@ -247,22 +247,32 @@
|
||||
// The object tracker consumes only the small color image. The gray frame
|
||||
// is useful at the seed only when checking orientation against a cached frame.
|
||||
const bool needsGray=!objectMode||(!_trackingSamples.count&&_trackingReferenceFrame.valid());
|
||||
if(![self captureTrackingTile:tile gray:needsGray?&frame:nullptr preview:(!_trackingSingle||objectMode)?&preview:nullptr error:error])
|
||||
// The seed may still need the legacy orientation comparison before the
|
||||
// tracking flip is known. All subsequent object frames can go straight to Vision.
|
||||
NSNumber *visionFlip=objectMode&&!needsGray?@(_trackingFlip):nil;
|
||||
if(![self captureTrackingTile:tile gray:needsGray?&frame:nullptr
|
||||
preview:(!_trackingSingle||objectMode)?&preview:nullptr visionFlip:visionFlip error:error])
|
||||
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.at(y*frame.width+x);same+=fabs(p-_trackingReferenceFrame.at(y*frame.width+x));flip+=fabs(p-_trackingReferenceFrame.at((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(!objectMode&&_trackingFlip)frame.flipVertically();
|
||||
dy::TrackResult target,source;
|
||||
dy::ObjectStep objectStep;
|
||||
if(objectMode){
|
||||
CVPixelBufferRef visionImage=(CVPixelBufferRef)preview[@"visionImage"];
|
||||
NSData *rgba=preview[@"rgba"];int width=[preview[@"width"]intValue],height=[preview[@"height"]intValue];
|
||||
if(width<16||height<16||width>640||height>640||rgba.length!=size_t(width)*height*4)return [self finishToolAnalysis:@"目标跟踪未取得完整分析画面,原轨迹已保留" error:error];
|
||||
if(width<16||height<16||width>640||height>640||(!visionImage&&rgba.length!=size_t(width)*height*4))
|
||||
return [self finishToolAnalysis:@"目标跟踪未取得完整分析画面,原轨迹已保留" error:error];
|
||||
if(visionImage)++_trackingDirectFrames;else ++_trackingCopiedFrames;
|
||||
if(!_trackingSamples.count){
|
||||
dy::TrackerROI seed={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
dy::TrackerROI roi=dy::visionMaskBounds(seed,_trackingShapePolygon,float(width)/height);_trackingObjectROI=roi;
|
||||
os_log(OS_LOG_DEFAULT,"dayu_object_track_worker main=%{public}d",(int)NSThread.isMainThread);
|
||||
if(!_objectTracker.reset((const uint8_t*)rgba.bytes,width,height,_trackingFlip,roi,1./CMTimeGetSeconds(_trackingFrameDuration)))return [self finishToolAnalysis:@"无法建立目标外观,请调整蒙版后重试" error:error];
|
||||
double fps=1./CMTimeGetSeconds(_trackingFrameDuration);
|
||||
bool seeded=visionImage?_objectTracker.reset(visionImage,roi,fps):
|
||||
_objectTracker.reset((const uint8_t*)rgba.bytes,width,height,_trackingFlip,roi,fps);
|
||||
if(!seeded)return [self finishToolAnalysis:@"无法建立目标外观,请调整蒙版后重试" error:error];
|
||||
objectStep={{roi.cx,roi.cy,roi.width,roi.height,1},true,false,false,0};
|
||||
}else objectStep=_objectTracker.track((const uint8_t*)rgba.bytes,width,height,_trackingFlip);
|
||||
}else objectStep=visionImage?_objectTracker.track(visionImage):_objectTracker.track((const uint8_t*)rgba.bytes,width,height,_trackingFlip);
|
||||
target=_objectTracker.result(objectStep);
|
||||
target.cx+=(_trackingSeed.centerX-_trackingObjectROI.cx)*target.scale;target.cy+=(_trackingSeed.centerY-_trackingObjectROI.cy)*target.scale;
|
||||
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
|
||||
@@ -324,7 +334,7 @@
|
||||
}
|
||||
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];packet[@"predicted"]=@(objectStep.predicted);
|
||||
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
|
||||
packet[@"flip"]=@(_trackingFlip);packet[@"time"]=@(CMTimeGetSeconds(time));
|
||||
packet[@"flip"]=@(_trackingFlip&&!preview[@"visionImage"]);packet[@"time"]=@(CMTimeGetSeconds(time));
|
||||
packet[@"completed"]=@(_trackingPreviewCompleted);
|
||||
packet[@"total"]=@(MAX(_trackingPreviewTotal,_trackingPreviewCompleted));
|
||||
packet[@"backward"]=@(_trackingBackward);
|
||||
@@ -354,8 +364,13 @@
|
||||
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];}}}
|
||||
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"]];}
|
||||
@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];
|
||||
if(self->_trackingObjectMode)
|
||||
os_log(OS_LOG_DEFAULT,"dayu_object_track_finished elapsed_ms=%{public}.2f direct=%{public}lu copied=%{public}lu keys=%{public}lu",
|
||||
1000*(NSProcessInfo.processInfo.systemUptime-self->_trackingRunStart),
|
||||
(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];
|
||||
});return YES;
|
||||
|
||||
在新工单中引用
屏蔽一个用户