Track both clone stamp regions and render their relative zoom
这个提交包含在:
1 父节点
78b4c5f962
当前提交
52a7422004
14 个文件已更改
+379
-30
没有与搜索条件相匹配的文件
+132
-6
@@ -1,3 +1,4 @@
|
||||
#include <numeric>
|
||||
#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;i<count;i++){
|
||||
if(!finiteNumber(values[i]))return NO;
|
||||
double value=[values[i] doubleValue];
|
||||
if(i<offsets?fabs(value)>1:value<minScale||value>maxScale)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;i<nodes.length/4;i++)if(!std::isfinite(n[i])||fabs(n[i])>1000)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(low<high){NSUInteger mid=low+(high-low)/2;if(CMTimeCompare(keyTime(keys[mid]),time)<0)low=mid+1;else high=mid;}NSDictionary *left=keys[low?low-1:0],*right=keys[MIN(low,keys.count-1)];DYMaskParameters a,b;readParameters(left[@"parameters"],&a);readParameters(right[@"parameters"],&b);double duration=CMTimeGetSeconds(CMTimeSubtract(keyTime(right),keyTime(left)));float w=duration>0?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(low<high){
|
||||
NSUInteger mid=low+(high-low)/2;
|
||||
if(CMTimeCompare(keyTime(keys[mid]),time)<0)low=mid+1;
|
||||
else high=mid;
|
||||
}
|
||||
NSDictionary *left=keys[low?low-1:0],*right=keys[MIN(low,keys.count-1)];
|
||||
double duration=CMTimeGetSeconds(CMTimeSubtract(keyTime(right),keyTime(left)));
|
||||
float fraction=duration>0?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;
|
||||
};
|
||||
|
||||
在新工单中引用
屏蔽一个用户