diff --git a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h index e45f3fa..dd3d569 100644 --- a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h @@ -100,6 +100,36 @@ if(faceFixture.length){ stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)]; Pixels expanded=frame(kCMTimeZero,@"clone-stamp-resized-production-render"); run.record(@"clone-stamp-resize-extends-coverage-with-pixel-exact-translation",pixel(expanded,51,25,baseline,19,13)==0&&pixel(expanded,58,24,baseline,26,12)==0&&pixel(first,58,24,baseline,58,24)==0); + p.width=.25f;p.height=.25f; + stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)]; + DYStampMotion startMotion;startMotion.active=true; + DYStampMotion endMotion=startMotion; + endMotion.sourceOffsetX=4.f/w;endMotion.sourceOffsetY=2.f/h; + endMotion.targetScaleX=2.f;endMotion.targetScaleY=2.f; + stamp[@"keys"]=@[DYStampKey(kCMTimeZero,p,NO,1,startMotion),DYStampKey(next,moved,NO,1,endMotion)]; + CMTime half=CMTimeMake(1,50); + DYMaskParameters halfway=DYMaskAtTime(stamp,half); + NSArray *halfSource=DYStampSourceAtTime(stamp,half); + run.record(@"clone-stamp-interpolates-both-centers-and-coverage-scale", + fabs(halfway.centerY-29.5f/h)<1e-6&&fabs(halfway.width-.375)<1e-6&& + fabs([halfSource[0] doubleValue]-18.5f/w)<1e-6&&fabs([halfSource[1] doubleValue]-13.5f/h)<1e-6); + Pixels zoomed=frame(next,@"clone-stamp-paired-scale-production-render"); + run.record(@"clone-stamp-relative-scale-remaps-source-and-expands-target-coverage", + pixel(zoomed,48,34,baseline,20,14)<.001&&pixel(zoomed,52,38,baseline,22,16)<.001&& + pixel(zoomed,60,34,baseline,26,14)<.001&&pixel(zoomed,0,0,baseline,0,0)==0); + float halfPixel=(baseline[(14*w+22)*4]+baseline[(14*w+23)*4])*.5f; + run.record(@"clone-stamp-fractional-zoom-interpolates-adjacent-source-pixels", + fabs(zoomed[(34*w+53)*4]-halfPixel)<.001); + endMotion.sourceScaleX=2.f;endMotion.sourceScaleY=2.f; + stamp[@"keys"]=@[DYStampKey(next,moved,YES,1,endMotion)]; + Pixels equalZoom=frame(next,@"clone-stamp-equal-scale-production-render"); + run.record(@"clone-stamp-equal-zoom-preserves-pixel-exact-copy",pixel(equalZoom,52,38,baseline,24,18)==0); + DYMaskParameters differentTarget=moved;differentTarget.centerY=.45f; + endMotion.sourceScaleX=1.25f; + run.record(@"clone-stamp-retracking-updates-paired-data-without-overwriting-manual-target", + DYMergeTracking(stamp,@[DYStampKey(CMTimeMake(2,50),differentTarget,NO,.9,endMotion)])&& + [stamp[@"keys"] count]==1&&DYMaskAtTime(stamp,next).centerY==moved.centerY&& + DYStampMotionAtTime(stamp,next).sourceScaleX==1.25f); stamp[@"enabled"]=@NO;Pixels disabled=frame(next,@"clone-stamp-disabled-render"); run.record(@"clone-stamp-disabled-is-identical",difference(disabled,baseline).maximum==0); stamp[@"enabled"]=@YES;NSError *failure=nil; diff --git a/大鱼调色/Plugin/DYGrade.metal b/大鱼调色/Plugin/DYGrade.metal index 9c2efa1..a720a31 100644 --- a/大鱼调色/Plugin/DYGrade.metal +++ b/大鱼调色/Plugin/DYGrade.metal @@ -364,15 +364,31 @@ kernel void dyCloneStamps(texture2d input [[texture(0)]], float2 local=(uv-center)*float2(stamp.inverseRadiusX,stamp.inverseRadiusY); float radiusSquared=dot(local,local); if(radiusSquared>1)continue; - // A single integer-pixel offset preserves scale, orientation and sample values. - float2 offset=(float2(stamp.sourceX,stamp.sourceY)-center)*float2(size); - if(flip)offset.y=-offset.y; - int2 source=int2(gid)+int2(round(offset)); - if(any(source<0)||any(source>=int2(size)))continue; + float2 sampleCenter(stamp.sourceX,stamp.sourceY); + float2 sampleScale(stamp.samplingScaleX,stamp.samplingScaleY); + float4 sampled; + if(all(abs(sampleScale-1.f)<.0001f)){ + // Preserve pixel values for stamps with translation alone. + float2 offset=(sampleCenter-center)*float2(size); + if(flip)offset.y=-offset.y; + int2 source=int2(gid)+int2(round(offset)); + if(any(source<0)||any(source>=int2(size)))continue; + sampled=input.read(uint2(source)); + }else{ + float2 source=sampleCenter+(uv-center)*sampleScale; + if(flip)source.y=1-source.y; + if(any(source<0)||any(source>=1))continue; + float2 pixel=clamp(source*float2(size)-.5f,0.f,float2(size-1)); + uint2 lo=uint2(floor(pixel)),hi=min(lo+1,size-1); + float2 blend=fract(pixel); + float4 top=mix(input.read(lo),input.read(uint2(hi.x,lo.y)),blend.x); + float4 bottom=mix(input.read(uint2(lo.x,hi.y)),input.read(hi),blend.x); + sampled=mix(top,bottom,blend.y); + } float coverage=stamp.feather>0?1-smoothstep(1-stamp.feather,1.f,sqrt(radiusSquared)):1; coverage=saturate((coverage-stamp.inputBlack)/(stamp.inputWhite-stamp.inputBlack)); if(stamp.inputGamma!=1)coverage=pow(coverage,1/stamp.inputGamma); - color=mix(color,input.read(uint2(source)),coverage*stamp.strength); + color=mix(color,sampled,coverage*stamp.strength); } output.write(color,gid); } diff --git a/大鱼调色/Plugin/DYManagedRender.inc.h b/大鱼调色/Plugin/DYManagedRender.inc.h index 17040ab..5708dd9 100644 --- a/大鱼调色/Plugin/DYManagedRender.inc.h +++ b/大鱼调色/Plugin/DYManagedRender.inc.h @@ -35,7 +35,9 @@ if(!patch||![mask[@"enabled"]boolValue])continue; DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid); if(p.strength<=0)continue; + NSArray *scale=mask[@"stampSamplingScale"]; stamps.push_back({p.centerX,p.centerY,[patch[0]floatValue],[patch[1]floatValue], + scale?[scale[0]floatValue]:1.f,scale?[scale[1]floatValue]:1.f, 2/p.width,2/p.height,p.feather,p.strength,p.inputBlack,p.inputWhite,p.inputGamma}); } if(stamps.empty())return source; diff --git a/大鱼调色/Plugin/DYMaskPanel.inc.h b/大鱼调色/Plugin/DYMaskPanel.inc.h index 6f07cec..3ad98fa 100644 --- a/大鱼调色/Plugin/DYMaskPanel.inc.h +++ b/大鱼调色/Plugin/DYMaskPanel.inc.h @@ -66,7 +66,7 @@ [self updateDrawingControls]; _status.stringValue=m[@"status"]?:([m[@"keys"]count]?[NSString stringWithFormat:@"%lu 个轨迹键 · 修改几何会在当前帧建立手工键",(unsigned long)[m[@"keys"]count]]:pen?@"重画钢笔后,点击起点或“完成绘制”闭合;取消或 Esc 保留原路径。":@"各蒙版只影响当前工具层"); if([_nodeID isEqual:@"shared"]){_list.accessibilityLabel=@"共享蒙版";_add.toolTip=@"添加共享蒙版";_remove.toolTip=@"删除此共享蒙版及其模块关联,可撤销";if(!m[@"status"]&&!pen&&![m[@"keys"]count])_status.stringValue=[NSString stringWithFormat:@"共享给 %lu 个模块 · 编辑与跟踪同步更新所有关联模块",(unsigned long)DYToolIDsForSharedMask(doc,_maskID).count];} - if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"取样中心固定,跟踪覆盖区域。";} + if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"分别跟踪取样与覆盖区域的位置和缩放。";} // Keep every scalar readable at the narrowest native inspector width. A // label/value line and a separate full-width slider avoid compressed controls. _contentHeight=136+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO; @@ -101,7 +101,7 @@ - (void)enabled:(NSButton*)sender{[self edit:@"启停蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"enabled"]=@(sender.state==NSControlStateValueOn);}];} - (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];} - (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} -- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){BOOL stamp=m[@"stampSource"]!=nil,position=i==2||i==3;DYMaskParameters p=DYMaskAtTime(m,stamp&&!position?kCMTimeInvalid:self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&(stamp?position:i<8)){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} +- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){BOOL stamp=m[@"stampSource"]!=nil,position=i==2||i==3;DYMaskParameters p=DYMaskAtTime(m,stamp&&!position?kCMTimeInvalid:self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(stamp&&(i==4||i==5)){DYStampMotion motion=DYStampMotionAtTime(m,self->_time);*fields[i]/=i==4?motion.targetScaleX:motion.targetScaleY;}if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&(stamp?position:i<8)){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYStampKey(self->_time,p,YES,1,DYStampMotionAtTime(m,self->_time))];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} - (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;} - (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;} - (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;} @@ -111,7 +111,23 @@ - (void)canvas:(id)sender{[self sendCanvasDrawing:NO];} - (void)redrawPen:(id)sender{[self sendCanvasDrawing:YES];} - (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];} -- (void)clear:(id)sender{if(_drawing)return;[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];m[@"keys"]=@[];[m removeObjectForKey:@"status"];}];} +- (void)clear:(id)sender{ + if(_drawing)return; + [self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){ + DYMaskParameters p=DYMaskAtTime(m,self->_time); + if(m[@"stampSource"]){ + NSArray *source=DYStampSourceAtTime(m,self->_time); + DYStampMotion motion=DYStampMotionAtTime(m,self->_time); + m[@"stampSource"]=@[source[0],source[1], + @(std::clamp([source[2] doubleValue]*motion.sourceScaleX,.001,1.)), + @(std::clamp([source[3] doubleValue]*motion.sourceScaleY,.001,1.))]; + m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(m,self->_time); + } + m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)]; + m[@"keys"]=@[]; + [m removeObjectForKey:@"status"]; + }]; +} - (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"direction":@(sender.tag)}];} - (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";} @end diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index 0b95a9e..c3543d8 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -29,10 +29,11 @@ NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft); if(resizeStamp){ DYMaskParameters p=DYMaskAtTime(result,kCMTimeInvalid),authored=DYMaskAtTime(current,kCMTimeInvalid); - authored.width=p.width;authored.height=p.height; + DYStampMotion motion=DYStampMotionAtTime(current,time); + authored.width=p.width/motion.targetScaleX;authored.height=p.height/motion.targetScaleY; result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)]; result[@"keys"]=current[@"keys"]; - }else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYMaskKey(time,p,YES,1)];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;} + }else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;} if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else if(stampEdit)[self postToolCanvasStatus:@"宿主未保存图章修改,已保留上一次位置。"];} }@finally{[a endAction:self];} os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft)); diff --git a/大鱼调色/Plugin/DYToolGPU.h b/大鱼调色/Plugin/DYToolGPU.h index f475be1..455c1bf 100644 --- a/大鱼调色/Plugin/DYToolGPU.h +++ b/大鱼调色/Plugin/DYToolGPU.h @@ -4,8 +4,8 @@ struct DYToolMaskEntry {DYResolvedMask mask;int section,combine;}; struct DYToolMaskHeader {unsigned count;float offsetX,offsetY,scaleX,scaleY;int section,premultiplied,faceOnly,skinPreview;}; struct DYToolStageRange {int first,last,suppressBlackWhite;}; -// Destination coverage and source offset are independent. +// Destination coverage and the source sampling transform are independent. struct DYCloneStamp { - float centerX,centerY,sourceX,sourceY; + float centerX,centerY,sourceX,sourceY,samplingScaleX,samplingScaleY; float inverseRadiusX,inverseRadiusY,feather,strength,inputBlack,inputWhite,inputGamma; }; diff --git a/大鱼调色/Plugin/DYToolHostIvars.inc.h b/大鱼调色/Plugin/DYToolHostIvars.inc.h index 1a6748b..217e5f7 100644 --- a/大鱼调色/Plugin/DYToolHostIvars.inc.h +++ b/大鱼调色/Plugin/DYToolHostIvars.inc.h @@ -16,5 +16,7 @@ NSDictionary *_trackingFrozenMask;NSMutableDictionary *_trackingCandidate; NSMutableArray *_trackingSamples; DYMaskParameters _trackingSeed; - dy::OpenCVTracker _toolTracker; + DYStampMotion _trackingStampMotion; + dy::TrackerROI _trackingStampSourceSeed; + dy::OpenCVTracker _toolTracker,_stampSourceTracker; NSMutableDictionary *_toolCaptureDevices; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 062a5a5..620b3f9 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -76,7 +76,7 @@ - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;} - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time { - @synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;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":m[@"stampSource"]?:@[],@"tracking":@(_trackingActive.load())};} + @synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;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())};} } - (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;} @@ -89,6 +89,14 @@ @synchronized(self){_trackingReferenceFrame={};if(_toolSourceFrame.valid()&&CMTIME_IS_NUMERIC(_toolSourceTime)&&CMTimeCompare(_toolSourceTime,time)==0)_trackingReferenceFrame=_toolSourceFrame;} idtiming=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self];_trackingFrameDuration=numerator&&denominator&&numerator<=INT32_MAX?CMTimeMake(denominator,(int32_t)numerator):kCMTimeInvalid;if(!CMTIME_IS_NUMERIC(_trackingFrameDuration)||_trackingFrameDuration.value<=0){[self toolStatus:@"宿主未提供精确帧长,跟踪未启动"];return;} [_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); + 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; 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;} @@ -112,7 +120,23 @@ } - (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]; - std::vectorpolygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;ipolygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i16.f) + return [self finishToolAnalysis:@"图章缩放超出跟踪范围,已保留连续可信轨迹" error:error]; + confidence=std::min(confidence,source.confidence); + }else{ + p.width=_trackingSeed.width*target.scaleX;p.height=_trackingSeed.height*target.scaleY; + p.angle=_trackingSeed.angle+target.rotation; + } + if(!dyValidMaskParameters(p))return [self stopToolAnalysis:@"跟踪变换无效,未写入错误结果" error:error]; + [_trackingSamples addObject:DYStampKey(time,p,NO,confidence,motion)];_trackingPreviousTime=time; + 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);} } - (BOOL)cleanupAnalysis:(NSError**)error { if(!_trackingActive.load()||_trackingFinishing.exchange(true))return YES;BOOL changed=_trackingSamples.count>1;if(changed&&!DYMergeTracking(_trackingCandidate,_trackingSamples)){[_trackingMessage release];_trackingMessage=[@"轨迹合并失败,原蒙版已保留" copy];_trackingDiscard=YES;} + _toolTracker.stop(); + 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(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;ida=[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);} diff --git a/大鱼调色/Plugin/DYToolState.h b/大鱼调色/Plugin/DYToolState.h index 68e585b..c232838 100644 --- a/大鱼调色/Plugin/DYToolState.h +++ b/大鱼调色/Plugin/DYToolState.h @@ -45,6 +45,15 @@ NSDictionary *DYShareToolMask(NSMutableDictionary *document,NSString *nodeID,NSS NSDictionary *DYResolvedToolDocument(NSDictionary *document); DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time); NSDictionary *DYMaskKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence); +struct DYStampMotion { + float sourceOffsetX=0,sourceOffsetY=0; + float sourceScaleX=1,sourceScaleY=1,targetScaleX=1,targetScaleY=1; + bool active=false; +}; +DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time); +NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time); +NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time); +NSDictionary *DYStampKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence,DYStampMotion motion); BOOL DYMergeTracking(NSMutableDictionary *mask,NSArray *samples); NSDictionary *DYToolRenderSnapshot(NSDictionary *document,CMTime time); DYUniforms DYToolUniforms(NSDictionary *node); diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index 4a52038..84df0b2 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -1,3 +1,4 @@ +#include #import "DYToolState.h" #include "DYSpiderState.h" #include "DYFilmMath.h" @@ -62,6 +63,15 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){ } static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};} static BOOL finiteNumber(id v){return [v isKindOfClass:NSNumber.class]&&std::isfinite([v doubleValue]);} +static BOOL validStampValues(id values,NSUInteger count,NSUInteger offsets,double minScale,double maxScale){ + if(![values isKindOfClass:NSArray.class]||[values count]!=count)return NO; + for(NSUInteger i=0;i1:valuemaxScale)return NO; + } + return YES; +} static BOOL validID(id v){return [v isKindOfClass:NSString.class]&&[[[NSUUID alloc]initWithUUIDString:v]autorelease]!=nil;} static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p length:sizeof(p)];} static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);} @@ -76,9 +86,14 @@ BOOL DYValidToolMask(NSDictionary *mask){ if(p.kind!=DYMaskEllipse||![source isKindOfClass:NSArray.class]||[source count]!=4)return NO; for(NSUInteger i=0;i<4;i++)if(!finiteNumber(source[i])||[source[i] doubleValue]<(i<2?0:.001)||[source[i] doubleValue]>1)return NO; } + id samplingScale=mask[@"stampSamplingScale"]; + if(samplingScale&&(!source||!validStampValues(samplingScale,2,0,1./256,256)))return NO; const float *n=(const float*)nodes.bytes;for(NSUInteger i=0;i1000)return NO; NSArray *keys=mask[@"keys"];if(![keys isKindOfClass:NSArray.class]||keys.count>DYToolKeyLimit)return NO;CMTime last=kCMTimeInvalid; - for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;last=t;}return YES; + for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO; + if(k[@"stampMotion"]&&(!source||!validStampValues(k[@"stampMotion"],6,2,1./16,16)))return NO; + last=t; + }return YES; } static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL references){ if(![masks isKindOfClass:NSArray.class]||[masks count]>DYToolMaskLimit)return NO;NSMutableSet *links=[NSMutableSet set]; @@ -158,11 +173,117 @@ static NSDictionary *DYExpandSharedMasks(NSDictionary *doc,BOOL keepKeys){ for(NSString *type in doc[@"baseMasks"])base[type]=resolve([@"base:" stringByAppendingString:type]);out[@"baseMasks"]=base;NSMutableArray *layers=[NSMutableArray array];for(NSDictionary *node in doc[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];copy[@"masks"]=resolve(node[@"id"]);[layers addObject:copy];}out[@"layers"]=layers;out[@"schema"]=@2;[out removeObjectForKey:@"sharedMasks"];return out; } NSDictionary *DYResolvedToolDocument(NSDictionary *doc){return DYExpandSharedMasks(doc,NO);} -DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time){DYMaskParameters p=dyDefaultMaskParameters();readParameters(mask[@"parameters"],&p);BOOL stamp=mask[@"stampSource"]!=nil;if(stamp)p.angle=0;NSArray *keys=mask[@"keys"];if(!keys.count||!CMTIME_IS_NUMERIC(time))return p;if(keyTime(keys[0]).epoch!=time.epoch)return p;NSUInteger low=0,high=keys.count;while(low0?fmax(0,fmin(1,CMTimeGetSeconds(CMTimeSubtract(time,keyTime(left)))/duration)):0; - // Clone stamps follow the center only. The authored extent is a coverage control. - float *v=&p.centerX,*av=&a.centerX,*bv=&b.centerX;for(int i=0;i<(stamp?2:8);i++)v[i]=av[i]+(bv[i]-av[i])*w;return p;} +struct DYMaskKeySpan { + NSDictionary *left=nil,*right=nil; + float fraction=0; +}; +static DYMaskKeySpan maskKeySpan(NSDictionary *mask,CMTime time){ + NSArray *keys=mask[@"keys"]; + if(!keys.count||!CMTIME_IS_NUMERIC(time)||keyTime(keys[0]).epoch!=time.epoch)return {}; + NSUInteger low=0,high=keys.count; + while(low0?std::clamp(CMTimeGetSeconds(CMTimeSubtract(time,keyTime(left)))/duration,0.,1.):0; + return {left,right,fraction}; +} +static DYStampMotion stampMotionFromKey(NSDictionary *key){ + NSArray *v=key[@"stampMotion"]; + if(!v)return {}; + return {[v[0] floatValue],[v[1] floatValue],[v[2] floatValue], + [v[3] floatValue],[v[4] floatValue],[v[5] floatValue],true}; +} +static DYStampMotion stampMotionInSpan(DYMaskKeySpan span){ + auto a=stampMotionFromKey(span.left),b=stampMotionFromKey(span.right); + if(span.fraction<=0)return a; + if(span.fraction>=1)return b; + auto blend=[&](float x,float y){return x+(y-x)*span.fraction;}; + return {blend(a.sourceOffsetX,b.sourceOffsetX),blend(a.sourceOffsetY,b.sourceOffsetY), + blend(a.sourceScaleX,b.sourceScaleX),blend(a.sourceScaleY,b.sourceScaleY), + blend(a.targetScaleX,b.targetScaleX),blend(a.targetScaleY,b.targetScaleY),a.active||b.active}; +} +DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time){return stampMotionInSpan(maskKeySpan(stamp,time));} +NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time){ + NSArray *source=stamp[@"stampSource"]; + DYStampMotion motion=DYStampMotionAtTime(stamp,time); + if(!source||!motion.active)return source; + return @[@(std::clamp([source[0] doubleValue]+motion.sourceOffsetX,0.,1.)), + @(std::clamp([source[1] doubleValue]+motion.sourceOffsetY,0.,1.)),source[2],source[3]]; +} +NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time){ + NSArray *base=stamp[@"stampSamplingScale"]; + DYStampMotion motion=DYStampMotionAtTime(stamp,time); + if(!motion.active)return base; + double x=(base?[base[0] doubleValue]:1)*motion.sourceScaleX/motion.targetScaleX; + double y=(base?[base[1] doubleValue]:1)*motion.sourceScaleY/motion.targetScaleY; + return @[@(std::clamp(x,1./256,256.)),@(std::clamp(y,1./256,256.))]; +} +DYMaskParameters DYMaskAtTime(NSDictionary *mask,CMTime time){ + DYMaskParameters p=dyDefaultMaskParameters(); + readParameters(mask[@"parameters"],&p); + BOOL stamp=mask[@"stampSource"]!=nil; + if(stamp)p.angle=0; + DYMaskKeySpan span=maskKeySpan(mask,time); + if(!span.left)return p; + DYMaskParameters a,b; + readParameters(span.left[@"parameters"],&a);readParameters(span.right[@"parameters"],&b); + float *v=&p.centerX,*av=&a.centerX,*bv=&b.centerX; + for(int i=0;i<(stamp?2:8);i++)v[i]=av[i]+(bv[i]-av[i])*span.fraction; + if(stamp){ + DYStampMotion motion=stampMotionInSpan(span); + if(motion.active){ + p.width=std::clamp(p.width*motion.targetScaleX,.001f,4000.f); + p.height=std::clamp(p.height*motion.targetScaleY,.001f,4000.f); + } + } + return p; +} NSDictionary *DYMaskKey(CMTime t,DYMaskParameters p,BOOL manual,float confidence){return @{@"value":@(t.value),@"scale":@(t.timescale),@"epoch":@(t.epoch),@"parameters":parameterData(p),@"manual":@(manual),@"confidence":@(confidence)};} -BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples){if(!samples.count)return YES;NSMutableArray *all=[NSMutableArray array];CMTime lo=keyTime(samples.firstObject),hi=keyTime(samples.lastObject);if(CMTimeCompare(lo,hi)>0)std::swap(lo,hi);for(NSDictionary *key in m[@"keys"])if([key[@"manual"]boolValue]||CMTimeCompare(keyTime(key),lo)<0||CMTimeCompare(keyTime(key),hi)>0)[all addObject:key];for(NSDictionary *key in samples){BOOL manual=NO;for(NSDictionary *old in all)if(CMTimeCompare(keyTime(old),keyTime(key))==0){manual=YES;break;}if(!manual)[all addObject:key];}[all sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){return (NSComparisonResult)CMTimeCompare(keyTime(a),keyTime(b));}];NSMutableDictionary *candidate=DYMutablePlist(m);candidate[@"keys"]=all;if(!DYValidToolMask(candidate))return NO;m[@"keys"]=all;return YES;} +NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confidence,DYStampMotion motion){ + NSDictionary *key=DYMaskKey(time,p,manual,confidence); + if(!motion.active)return key; + NSMutableDictionary *paired=[[key mutableCopy]autorelease]; + paired[@"stampMotion"]=@[@(motion.sourceOffsetX),@(motion.sourceOffsetY),@(motion.sourceScaleX), + @(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)]; + return paired; +} +BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples){ + if(!samples.count)return YES; + NSMutableArray *all=[NSMutableArray array]; + NSMutableDictionary *manualByTime=[NSMutableDictionary dictionary]; + CMTime lo=keyTime(samples.firstObject),hi=keyTime(samples.lastObject); + if(CMTimeCompare(lo,hi)>0)std::swap(lo,hi); + // Normalize equivalent time fractions when preserving authored keys. + auto timeID=[](NSDictionary *key){ + CMTime time=keyTime(key); + int64_t divisor=time.timescale>0?std::gcd(time.value%time.timescale,int64_t(time.timescale)):1; + return [NSString stringWithFormat:@"%lld/%lld/%lld",time.value/divisor,time.timescale/divisor,time.epoch]; + }; + for(NSDictionary *key in m[@"keys"]){ + if([key[@"manual"] boolValue]){manualByTime[timeID(key)]=@(all.count);[all addObject:key];} + else if(CMTimeCompare(keyTime(key),lo)<0||CMTimeCompare(keyTime(key),hi)>0)[all addObject:key]; + } + for(NSDictionary *key in samples){ + NSNumber *index=manualByTime[timeID(key)]; + if(!index){[all addObject:key];continue;} + if(key[@"stampMotion"]){ + NSUInteger slot=index.unsignedIntegerValue; + NSMutableDictionary *authored=[[all[slot] mutableCopy]autorelease]; + authored[@"stampMotion"]=key[@"stampMotion"]; + all[slot]=authored; + } + } + [all sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){return (NSComparisonResult)CMTimeCompare(keyTime(a),keyTime(b));}]; + NSMutableDictionary *candidate=[[m mutableCopy]autorelease]; + candidate[@"keys"]=all; + if(!DYValidToolMask(candidate))return NO; + m[@"keys"]=all; + return YES; +} NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){ NSArray *shared=DYSharedMasks(doc); doc=DYExpandSharedMasks(doc,YES); @@ -170,7 +291,12 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){ NSMutableArray *result=[NSMutableArray arrayWithCapacity:masks.count]; for(NSDictionary *mask in masks){ if(![mask[@"keys"]count]){[result addObject:mask];continue;} - NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"parameters"]=parameterData(DYMaskAtTime(mask,t));m[@"keys"]=@[];[result addObject:m]; + NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"parameters"]=parameterData(DYMaskAtTime(mask,t));m[@"keys"]=@[]; + if(mask[@"stampSource"]){ + m[@"stampSource"]=DYStampSourceAtTime(mask,t); + m[@"stampSamplingScale"]=DYStampSamplingScaleAtTime(mask,t); + } + [result addObject:m]; } return result; }; diff --git a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h index 14c99e0..9ed8adc 100644 --- a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h @@ -66,5 +66,79 @@ [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"message":@"共享跟踪状态"}];BOOL statusVisible=[[[panel valueForKey:@"_status"]stringValue]isEqual:@"共享跟踪状态"]; run.record(@"shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",aliasActive&&statusVisible&&[[(NSObject*)plugin valueForKey:@"_selectedToolNode"]isEqual:@"shared"]); } + { + NSMutableDictionary *stampDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document); + NSMutableDictionary *stamp=(id)DYAddSharedMask(stampDoc,DYMaskEllipse); + NSString *stampID=stamp[@"id"]; + DYMaskParameters target=DYMaskAtTime(stamp,kCMTimeZero); + target.centerX=.75f;target.centerY=.5f;target.width=.32f;target.height=.54f; + stamp[@"parameters"]=[NSData dataWithBytes:&target length:sizeof(target)]; + stamp[@"stampSource"]=@[@.25,@.5,@.32,@.54]; + auto noise=[](int x,int y){ + uint32_t n=uint32_t(x)*73856093u^uint32_t(y)*19349663u; + n^=n>>13;n*=1274126177u; + return .15f+.7f*((n>>8)&255)/255.f; + }; + auto pairedFrame=[&](int step,bool flatSource){ + Pixels pixels(tw*th*4); + for(NSUInteger y=0;y_time=timeAt(start);host->_state=kFxAnalysisState_NotAnalyzing; + [plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@1}]]; + return [plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&& + [plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil]; + }; + auto finish=[&](){host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();}; + DYWriteTools(base,stampDoc,kCMTimeZero); + int beforeStamp=base->_undoStarts; + BOOL paired=requestStamp(0); + NSError *pairError=nil; + for(int i=0;i<6&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&pairError];} + finish(); + NSDictionary *saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID); + DYStampMotion motion=DYStampMotionAtTime(saved,timeAt(5)); + DYMaskParameters covered=DYMaskAtTime(saved,timeAt(5)); + NSArray *sampled=DYStampSourceAtTime(saved,timeAt(5)); + 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&& + fabs([sampled[0] doubleValue]-(.25-7.5/tw))<.006&&fabs([sampled[1] doubleValue]-(.5+5./th))<.008&& + fabs(motion.targetScaleX-1.175)<.045&&fabs(motion.targetScaleY-1.175)<.045&& + fabs(motion.sourceScaleX-.875)<.04&&fabs(motion.sourceScaleY-.875)<.04&&base->_undoStarts==beforeStamp+1, + @{@"keys":@([saved[@"keys"] count]),@"source":sampled?:@[],@"target":@[@(covered.centerX),@(covered.centerY)], + @"sourceScale":@[@(motion.sourceScaleX),@(motion.sourceScaleY)], + @"targetScale":@[@(motion.targetScaleX),@(motion.targetScaleY)],@"error":reason(pairError)}); + DYStampMotion restart=DYStampMotionAtTime(saved,timeAt(2)); + paired=requestStamp(2); + for(int i=2;i<6&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];} + finish(); + saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID); + DYStampMotion resumed=DYStampMotionAtTime(saved,timeAt(2)); + run.record(@"host-clone-stamp-restarts-from-current-paired-scale", + paired&&[saved[@"keys"] count]==6&&resumed.active&&restart.sourceScaleX==resumed.sourceScaleX&&restart.targetScaleX==resumed.targetScaleX); + DYWriteTools(base,stampDoc,kCMTimeZero); + paired=requestStamp(0); + for(int i=0;i<3&&paired;i++){pairedFrame(i,false);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];} + pairedFrame(3,true);NSError *sourceLoss=nil; + BOOL ended=![plugin analyzeFrame:frame atTime:timeAt(3) error:&sourceLoss]; + finish(); + saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID); + run.record(@"host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame", + paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&& + sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]); + } [plugin release]; } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 2c75107..7cfad3d 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.13.4 + 1.14.0 CFBundleVersion - 88 + 89 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.13.4 + 1.14.0 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index d621d8d..c83c02c 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.13.4 + 1.14.0 CFBundleVersion - 88 + 89 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 91c3f9e..0f0059e 100644 --- a/开发交接.md +++ b/开发交接.md @@ -12,6 +12,13 @@ | 站点及自动更新 | 文章 15792 已更新为 **1.13.2(86)**,站内主下载包完整下载校验通过。主 APP 公测通道回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.13.2.json) · [更新通道核验](verification/BetaPublication1.12.0.json) | | 本机开发与验收 | AppKit / Objective-C++ / FxPlug 4 / Metal,Apple Silicon,macOS 14.6+。交付记录使用 Xcode 27.1、FxPlug SDK 4.3.5 和 FCP 12.4。构建缓存为 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`,验收素材库位于其中的 `fcp-qa/大鱼调色_验收.fcpbundle`。产品交付锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`,接手时重新检查。 | +## 1.14.0 图章取样与覆盖跟踪 + +- 用户在 1.13.4 的实拍工程中确认图章可落位、拖动,随后要求取样点和覆盖目标都参与跟踪并识别缩放。 +- 两个区域各自使用同一宿主源帧运行 OpenCV 分析。写入的每个轨迹键同时记录两点的位置与缩放。任一侧跟丢时,提交本次最后一段两侧均可信的连续轨迹。普通蒙版沿用原分析。旧图章单点轨迹仍按位移求值,可重新跟踪以获得双点数据。 +- 覆盖圈随覆盖区域缩放。渲染按取样区域和覆盖区域的相对缩放映射当前帧的源像素,两侧缩放相同时保留整数像素平移。调大或调小覆盖范围仍可独立操作。清除轨迹时将当前帧的图章外观保留为静态值。 +- 实现已接入轨迹序列化、画布和 Metal。编译、宿主及安装包核验待完成。 + ## 1.13.1 等像素复制与取样十字拖动 - 选中图章后可拖动青色取样十字。拖动时更新标记,松手后换取样位置并形成一次撤销。Esc 取消,旧图章可直接编辑。源点调整适用于图章的全部帧,目标位置轨迹保持原样。