Encode canvas pick timing with macOS CoreMedia dictionaries
这个提交包含在:
1 父节点
c9bd52fff5
当前提交
e241f2a3e5
4 个文件已更改
+6
-6
没有与搜索条件相匹配的文件
+3
-3
@@ -50,12 +50,12 @@
|
||||
- (void)applyValues:(NSDictionary*)values{if(!values){[self alert:@"尚未拿到当前片段画面,请移动播放头后重试。"];return;}id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{id<FxParameterSettingAPI_v6>s=[_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];for(NSDictionary*r in DYDescriptors()){NSNumber*v=values[r[@"key"]];if(v)[s setFloatValue:v.doubleValue toParameter:[r[@"pid"]unsignedIntValue] atTime:a.currentTime];}}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_apiManager];}
|
||||
- (void)autoRequested:(NSNotification*)n{NSData*frame=[_renderer preview];[self applyValues:[n.name isEqual:@"DYAutoGrade"]?DYAutoGrade(frame):DYAutoWhiteBalance(frame)];}
|
||||
- (void)canvasWhiteBalanceRequested:(NSNotification*)note {
|
||||
CMTime time=[(NSValue*)note.userInfo[@"time"] CMTimeValue];
|
||||
CMTime time=CMTimeMakeFromDictionary((CFDictionaryRef)note.userInfo[@"time"]);
|
||||
if(_canvasSampler||!CMTIME_IS_NUMERIC(time))return;
|
||||
_canvasSampler=[NSColorSampler new];
|
||||
[_canvasSampler showSamplerWithSelectionHandler:^(NSColor *color){
|
||||
[self->_canvasSampler release];self->_canvasSampler=nil;
|
||||
if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[NSValue valueWithCMTime:time]}];
|
||||
if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
|
||||
}];
|
||||
}
|
||||
- (void)applyCanvasWhiteBalance:(NSDictionary*)values atTime:(CMTime)time {
|
||||
@@ -96,7 +96,7 @@
|
||||
[self alert:@"所选颜色过暗,请选择白色或中性灰区域。"];return;
|
||||
}
|
||||
NSDictionary *values=@{@"temperature":@(temperature),@"tint":@(tint)};
|
||||
if(n.userInfo[@"time"])[self applyCanvasWhiteBalance:values atTime:[(NSValue*)n.userInfo[@"time"] CMTimeValue]];
|
||||
if(n.userInfo[@"time"])[self applyCanvasWhiteBalance:values atTime:CMTimeMakeFromDictionary((CFDictionaryRef)n.userInfo[@"time"])];
|
||||
else [self applyValues:values];
|
||||
}
|
||||
@end
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
for(NSInteger i=9;i<=10;i++)penActionsBounded&=NSContainsRect(visible,[(id)osc toolbarRectForItem:i]);}
|
||||
run.record(@"native-osc-keeps-only-two-pen-actions-bounded-at-bottom",penActionsBounded);
|
||||
NSColor *white=[NSColor colorWithSRGBRed:.82 green:.64 blue:.52 alpha:1];
|
||||
auto whiteBalance=[&](CMTime time){[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:host userInfo:@{@"time":[NSValue valueWithCMTime:time],@"color":white}];drain();};
|
||||
auto whiteBalance=[&](CMTime time){[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:host userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease],@"color":white}];drain();};
|
||||
NSDictionary *beforeWhite=[[base->_values copy]autorelease];undo=base->_undoStarts;whiteBalance(CMTimeMake(1,24));
|
||||
run.record(@"canvas-white-balance-cannot-write-after-the-playhead-moves",[beforeWhite isEqual:base->_values]&&base->_undoStarts==undo);
|
||||
whiteBalance(kCMTimeZero);DYUniforms balanced;DYReadUniforms(host,kCMTimeZero,&balanced);
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
run.record(@"viewer-persistent-mask-entries-route-shapes-to-shared-workspace",maskRoutes&&base->_undoStarts==undo);
|
||||
[NSNotificationCenter.defaultCenter removeObserver:observer];[requestedPage release];
|
||||
__block NSInteger eyedropperRequests=0;__block CMTime eyedropperTime=kCMTimeInvalid;
|
||||
id sampleObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYViewerWhiteBalanceRequested" object:host queue:nil usingBlock:^(NSNotification *note){eyedropperRequests++;eyedropperTime=[(NSValue*)note.userInfo[@"time"] CMTimeValue];}];
|
||||
id sampleObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYViewerWhiteBalanceRequested" object:host queue:nil usingBlock:^(NSNotification *note){eyedropperRequests++;eyedropperTime=CMTimeMakeFromDictionary((CFDictionaryRef)note.userInfo[@"time"]);}];
|
||||
click(areaFor(controls,@"tool",@"whiteBalance"));drain();
|
||||
run.record(@"viewer-white-balance-icon-routes-a-single-time-bound-pick",eyedropperRequests==1&&CMTimeCompare(eyedropperTime,host->_time)==0&&!panelFor(@"whiteBalance")&&[initial isEqual:base->_values]);
|
||||
[NSNotificationCenter.defaultCenter removeObserver:sampleObserver];
|
||||
|
||||
@@ -97,7 +97,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!CMTIME_IS_NUMERIC(time))return;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}
|
||||
if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[NSValue valueWithCMTime:time]}];
|
||||
if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
|
||||
});
|
||||
}
|
||||
- (void)requestTool:(NSString*)type {
|
||||
|
||||
在新工单中引用
屏蔽一个用户