Replace every production tracking path with Apple Vision; remove OpenCV linkage
这个提交包含在:
1 父节点
dbab2ab0cc
当前提交
8af7013ad4
22 个文件已更改
+600
-43
没有与搜索条件相匹配的文件
@@ -10,7 +10,7 @@
|
||||
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)});
|
||||
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-vision-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)});
|
||||
NSDictionary *lastPreview=updates.count>=2?updates[updates.count-2]:nil;
|
||||
DYMaskParameters shown{};
|
||||
[lastPreview[@"shape"] getBytes:&shown length:sizeof(shown)];
|
||||
@@ -62,7 +62,7 @@
|
||||
const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){float encoded=x%3==1?.8f:.2f,linear=powf((encoded+.055f)/1.055f,2.4f);auto i=(y*w+x)*4;pixels[i]=pixels[i+1]=pixels[i+2]=linear;pixels[i+3]=1;}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){double code=x%3==1?.8:.2;double expected=std::round(std::pow(std::pow((code+.055)/1.055,2.4),1/2.2)*255)/255.;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-opencv",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-vision-crops",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
auto compact=[plugin toolGrayFrame:fine preview:nullptr error:nil];BOOL identical=compact.valid()&&compact.pixels.empty()&&compact.bytes.size()==w*h;
|
||||
for(size_t i=0;i<compact.bytes.size()&&identical;++i)identical=compact.at(i)==gray.pixels[i];
|
||||
run.record(@"tracking-metal-gray8-compact-readback-matches-float-reference",identical,@{@"readbackBytes":@(compact.bytes.size()),@"previousReadbackBytes":@(gray.pixels.size()*sizeof(float))});
|
||||
@@ -178,9 +178,9 @@
|
||||
objectDoc[@"mosaic"]=[NSMutableDictionary dictionaryWithDictionary:@{@"enabled":@YES,@"source":@"mask",@"maskIDs":@[ID],@"size":@16}];
|
||||
run.record(@"mosaic-selected-mask-uses-object-tracking",DYMosaicTracksMask(objectDoc,ID)&&!DYMosaicTracksMask(objectDoc,@"missing"));
|
||||
shape.kind=DYMaskBezier;objectMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];
|
||||
run.record(@"bezier-mosaic-preserves-polygon-flow-tracking",!DYMosaicTracksMask(objectDoc,ID));
|
||||
run.record(@"bezier-mosaic-uses-vision-object-tracking",DYMosaicTracksMask(objectDoc,ID));
|
||||
shape.kind=DYMaskRectangle;objectMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];
|
||||
objectDoc[@"mosaic"][@"enabled"]=@NO;run.record(@"disabled-mosaic-keeps-precise-flow-path",!DYMosaicTracksMask(objectDoc,ID));objectDoc[@"mosaic"][@"enabled"]=@YES;
|
||||
objectDoc[@"mosaic"][@"enabled"]=@NO;run.record(@"disabled-mosaic-uses-precise-vision-registration",!DYMosaicTracksMask(objectDoc,ID));objectDoc[@"mosaic"][@"enabled"]=@YES;
|
||||
DYWriteTools(base,objectDoc,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"direction":@1}]];
|
||||
BOOL ok=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
|
||||
在新工单中引用
屏蔽一个用户