Keep the attached inspector header visible and refresh its curve histogram from output
这个提交包含在:
1 父节点
54ca7150f8
当前提交
43320c7ccd
9 个文件已更改
+73
-26
没有与搜索条件相匹配的文件
@@ -5,9 +5,17 @@
|
||||
NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"];
|
||||
run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]);
|
||||
CGFloat foldedHeight=view.intrinsicContentSize.height;
|
||||
NSView *hostSlot=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,400,406)]autorelease];
|
||||
view.frame=hostSlot.bounds;[hostSlot addSubview:view];
|
||||
|
||||
NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds;
|
||||
[settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn);
|
||||
run.record(@"inspector-preferred-height-follows-content-with-a-scroll-cap",foldedHeight<780&&view.intrinsicContentSize.height>foldedHeight&&view.intrinsicContentSize.height<=780);
|
||||
double layoutDeadline=NSProcessInfo.processInfo.systemUptime+.02;
|
||||
while(NSProcessInfo.processInfo.systemUptime<layoutDeadline)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];
|
||||
NSView *brandLabel=[view valueForKey:@"brand"];NSScrollView *cardsScroll=[view valueForKey:@"scroll"];
|
||||
run.record(@"inspector-hosted-slot-keeps-header-visible-and-scrolls-only-overflow",NSEqualRects(view.frame,hostSlot.bounds)&&NSContainsRect(view.bounds,brandLabel.frame)&&cardsScroll.documentView.frame.size.height>cardsScroll.contentSize.height);
|
||||
|
||||
for(int i=0;i<9;i++){[settings performClick:nil];[view layoutSubtreeIfNeeded];}
|
||||
run.record(@"compact-color-settings-repeated-toggle-does-not-edit-grade",panel.hidden&&first.frame.origin.y==8&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds);
|
||||
for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){
|
||||
@@ -60,11 +68,14 @@
|
||||
BOOL totals=YES;for(int c=0;c<4;c++){uint32_t total=0;for(int b=0;b<256;b++)total+=h->bins[c][b];totals&=total==6;}
|
||||
run.record(@"histogram-each-channel-conserves-valid-samples",totals);
|
||||
run.record(@"histogram-malformed-and-empty-safe",!DYHistogramFromRGBA([NSData dataWithBytes:pixels length:3])&&((const DYHistogram*)DYHistogramFromRGBA([NSData data]).bytes)->samples==0);
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];[renderer setValue:data forKey:@"histogram"];
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];
|
||||
DYScopeSample *sample=[[[DYScopeSample alloc]init]autorelease];sample.pixels=input;[renderer setValue:sample forKey:@"scopeLatest"];
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:renderer]autorelease];[view refresh];NSDictionary *before=[view presetSnapshot];
|
||||
for(NSMutableDictionary *card in [view valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"curve"]){card[@"removed"]=@NO;card[@"collapsed"]=@NO;}
|
||||
[view setNeedsLayout:YES];[view layoutSubtreeIfNeeded];
|
||||
NSView *graph=nil;for(NSView *v in [view valueForKey:@"graphics"])if([v.identifier isEqual:@"curveGraph"])graph=v;
|
||||
NSButton *toggle=[graph valueForKey:@"histogramToggle"];NSSegmentedControl *channels=[graph valueForKey:@"channels"];
|
||||
run.record(@"histogram-new-inspector-uses-renderer-cached-snapshot",[[graph valueForKey:@"histogram"]isEqual:data]&&toggle.state==NSControlStateValueOn);
|
||||
run.record(@"histogram-open-inspector-uses-cached-effect-output",[[graph valueForKey:@"histogram"]isEqual:data]&&toggle.state==NSControlStateValueOn);
|
||||
NSMutableSet *images=[NSMutableSet set];
|
||||
for(NSInteger c=0;c<4;c++){
|
||||
channels.selectedSegment=c;[graph performSelector:@selector(channelChanged:) withObject:channels];[graph setFrameSize:NSMakeSize(320,240)];[graph layoutSubtreeIfNeeded];
|
||||
@@ -74,8 +85,16 @@
|
||||
[toggle performClick:nil];[toggle performClick:nil];
|
||||
run.record(@"histogram-four-channel-drawings-distinct",images.count==4);
|
||||
run.record(@"histogram-channel-and-overlay-presentation-does-not-edit-grade",[before isEqual:[view presetSnapshot]]&&host->_undoStarts==0&&host->_undoEnds==0);
|
||||
[renderer invalidatePreview];[view performSelector:@selector(previewChanged:) withObject:nil];
|
||||
run.record(@"histogram-invalidation-clears-view-and-renderer",![renderer histogram]&&![graph valueForKey:@"histogram"]);
|
||||
[renderer invalidatePreview];
|
||||
run.record(@"histogram-keeps-final-output-while-a-new-render-is-pending",[[graph valueForKey:@"histogram"]isEqual:data]);
|
||||
DYDiagnosticTile *updated=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:2 height:2]autorelease];
|
||||
const __fp16 colors[16]={.25f,.4f,.6f,1,.25f,.4f,.6f,1,.25f,.4f,.6f,1,.25f,.4f,.6f,1};
|
||||
[[updated metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,2,2)mipmapLevel:0 withBytes:colors bytesPerRow:16];
|
||||
[renderer captureScopeTile:updated atTime:kCMTimeZero];
|
||||
double until=NSProcessInfo.processInfo.systemUptime+1;
|
||||
while([[graph valueForKey:@"histogram"]isEqual:data]&&NSProcessInfo.processInfo.systemUptime<until)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
|
||||
NSData *latest=[graph valueForKey:@"histogram"];
|
||||
run.record(@"histogram-open-inspector-refreshes-after-a-new-output-at-the-same-time",latest.length==sizeof(DYHistogram)&&![latest isEqual:data]&&[latest isEqual:[renderer canvasHistogramAtTime:kCMTimeZero]]);
|
||||
NSInteger previous=DYThemeIndex();DYSetThemeIndex(8);
|
||||
run.record(@"relief-only-two-choices-and-no-text-glow",DYThemeNames().count==2&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
|
||||
DYSetThemeIndex(previous);
|
||||
|
||||
+21
-8
@@ -258,7 +258,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
_values=[@{} copy];
|
||||
_channels=[[NSSegmentedControl segmentedControlWithLabels:@[@"RGB",@"红",@"绿",@"蓝"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(channelChanged:)] retain];
|
||||
_channels.selectedSegment=0; _channels.controlSize=NSControlSizeSmall; [self addSubview:_channels];
|
||||
_histogramToggle=[[NSButton checkboxWithTitle:@"直方图" target:self action:@selector(histogramToggled:)]retain];_histogramToggle.state=NSControlStateValueOn;_histogramToggle.font=[NSFont systemFontOfSize:10];_histogramToggle.accessibilityLabel=@"显示曲线直方图叠层";_histogramToggle.toolTip=@"亮度与 RGB,256 档、320×180 采样;高度按共同峰值平方根缩放。源为分析画面:原流程在一级 CST/输入 LUT 后,新 CMS 在显示输出转换后、SDR 修饰前;不是最终输出示波器,也不是每个曲线层的即时输入。播放或移动播放头时刷新(最多每秒2次)。";[self addSubview:_histogramToggle];
|
||||
_histogramToggle=[[NSButton checkboxWithTitle:@"直方图" target:self action:@selector(histogramToggled:)]retain];_histogramToggle.state=NSControlStateValueOn;_histogramToggle.font=[NSFont systemFontOfSize:10];_histogramToggle.accessibilityLabel=@"显示曲线直方图叠层";_histogramToggle.toolTip=@"亮度与 RGB,256 档、320×180 采样。来自当前效果的输出,曲线调整后随画面刷新。";[self addSubview:_histogramToggle];
|
||||
self.accessibilityLabel=@"曲线点编辑器";self.toolTip=@"点击添加点;拖动调整;双击、右键或按住 Option 点击已有点可删除";
|
||||
}
|
||||
return self;
|
||||
@@ -268,7 +268,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
- (void)setValues:(NSDictionary *)values { [_values release];_values=[values copy];[self setNeedsDisplay:YES]; }
|
||||
- (void)layout { [super layout];_channels.frame=NSMakeRect(12,4,MAX(100,self.bounds.size.width-112),24);_histogramToggle.frame=NSMakeRect(self.bounds.size.width-88,5,80,22); }
|
||||
- (void)setFixedWorkspaceChannel:(NSInteger)channel {_fixedWorkspaceChannel=YES;_channel=channel;_channels.hidden=YES;_histogramToggle.hidden=YES;}
|
||||
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"分析画面,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
|
||||
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"效果输出,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
|
||||
- (void)histogramToggled:(id)sender {[self setNeedsDisplay:YES];}
|
||||
- (void)channelChanged:(NSSegmentedControl *)sender { _channel=sender.selectedSegment;[self setNeedsDisplay:YES]; }
|
||||
- (NSRect)plotRect {if(_fixedWorkspaceChannel){CGFloat side=MAX(50,MIN(self.bounds.size.width-16,self.bounds.size.height-42));return NSMakeRect((self.bounds.size.width-side)/2,MAX(8,(self.bounds.size.height-side-34)/2),side,side);}return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76));}
|
||||
@@ -559,7 +559,10 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(revealViewerTool:) name:@"DYViewerToolRequested" object:_manager];
|
||||
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(openWorkspace:) name:@"DYColorWorkspaceRequested" object:_manager];
|
||||
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(rememberWorkspaceSelection:) name:@"DYWorkspaceToolSelection" object:_manager];
|
||||
if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
|
||||
if(_renderer){
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYOutputHistogramDidChange" object:_renderer];
|
||||
}
|
||||
[self themeChanged:nil];
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
[self setNeedsLayout:YES];
|
||||
@@ -631,7 +634,14 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[self setNeedsLayout:YES];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
|
||||
}
|
||||
- (void)addLook:(id)sender {_visibleLooks=MIN(5,_visibleLooks+1);[self setNeedsLayout:YES];}
|
||||
- (void)previewChanged:(NSNotification *)note {for(id graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class])[graphic setHistogram:[_renderer histogram]];[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)curveOutputChanged:(NSNotification *)note {
|
||||
NSData *histogram=nil;BOOL loaded=NO;
|
||||
for(NSView *graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class]&&!graphic.hiddenOrHasHiddenAncestor){
|
||||
if(!loaded){histogram=[_renderer outputHistogram];loaded=YES;}
|
||||
[(DYCurvePanel *)graphic setHistogram:histogram];
|
||||
}
|
||||
}
|
||||
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (void)buildCards {
|
||||
NSInteger index=0;
|
||||
for(NSDictionary *section in _sections) {
|
||||
@@ -686,8 +696,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
NSSegmentedControl *tabs=[NSSegmentedControl segmentedControlWithLabels:[key isEqual:@"mixer"]?@[@"红输出",@"绿输出",@"蓝输出"]:@[@"减色",@"晕光",@"辉光",@"颗粒",@"暗角",@"印片"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(tabChanged:)];tabs.identifier=key;tabs.selectedSegment=0;tabs.controlSize=NSControlSizeSmall;tabs.accessibilityLabel=[section[@"title"]stringByAppendingString:@"分组"];[card addSubview:tabs];[body addObject:tabs];
|
||||
}
|
||||
if([key isEqual:@"curve"]) {
|
||||
if(_workspaceEditor){DYWorkspaceCurveStrip *strip=[[[DYWorkspaceCurveStrip alloc]init]autorelease];strip.identifier=@"curveGraph";for(NSInteger channel=0;channel<4;channel++){DYCurvePanel *graph=[[[DYCurvePanel alloc]init]autorelease];graph.delegate=self;[graph setFixedWorkspaceChannel:channel];[graph setHistogram:[_renderer histogram]];[strip addSubview:graph];[_graphics addObject:graph];}[card addSubview:strip];[body addObject:strip];}
|
||||
else {DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;[graph setHistogram:[_renderer histogram]];graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];}
|
||||
if(_workspaceEditor){DYWorkspaceCurveStrip *strip=[[[DYWorkspaceCurveStrip alloc]init]autorelease];strip.identifier=@"curveGraph";for(NSInteger channel=0;channel<4;channel++){DYCurvePanel *graph=[[[DYCurvePanel alloc]init]autorelease];graph.delegate=self;[graph setFixedWorkspaceChannel:channel];[strip addSubview:graph];[_graphics addObject:graph];}[card addSubview:strip];[body addObject:strip];}
|
||||
else {DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];}
|
||||
}
|
||||
if([key isEqual:@"grading"]) {
|
||||
DYWheelPanel *wheels=[[[DYWheelPanel alloc]initWithFrame:NSZeroRect]autorelease];wheels.delegate=self;wheels.identifier=@"gradingWheels";[card addSubview:wheels];[body addObject:wheels];[_graphics addObject:wheels];
|
||||
@@ -895,14 +905,17 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
CGFloat preferred=MIN(780,ceil(top+MAX(12,y)));
|
||||
if(preferred!=_preferredHeight){
|
||||
_preferredHeight=preferred;
|
||||
// Update the remote view after the host's current layout pass.
|
||||
// FCP owns the attached custom parameter's slot. Resizing the
|
||||
// remote child there bottom-aligns it and clips the fixed header.
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
if(preferred!=self->_preferredHeight)return;
|
||||
[self invalidateIntrinsicContentSize];
|
||||
if(self.frame.size.height!=preferred)[self setFrameSize:NSMakeSize(self.frame.size.width,preferred)];
|
||||
if(!self.superview&&!self.window&&self.frame.size.height!=preferred)
|
||||
[self setFrameSize:NSMakeSize(self.frame.size.width,preferred)];
|
||||
});
|
||||
}
|
||||
}
|
||||
[self curveOutputChanged:nil];
|
||||
}
|
||||
- (id<FxCustomParameterActionAPI_v4>)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; }
|
||||
- (void)refresh {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
id<MTLComputePipelineState>p=[self managedKernel:@"dyManagedPreview" entry:entry error:nil];if(!p)return;
|
||||
id<MTLBuffer>b=[entry[@"device"]newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];if(!b)return;
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:texture atIndex:0];[ce setBuffer:b offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
|
||||
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
|
||||
}
|
||||
// Included in DYRenderer. V1 callers and their ABI remain on renderSource:...tools:error:.
|
||||
- (NSDictionary*)colorContext {@synchronized(_previewLock){return [[_colorContext copy]autorelease];}}
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
- (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
- (NSData*)preview;
|
||||
/// 256-bin luma/R/G/B of the existing 320×180 analysis preview.
|
||||
- (NSData*)histogram;
|
||||
/// Latest final-output bins for the inspector's visible curve controls.
|
||||
- (NSData*)outputHistogram;
|
||||
/// Bins from this instance's most recent final output at the requested time.
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time;
|
||||
/// Display-encoded float RGBA, 320×180, with the visually top row first.
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#import <os/log.h>
|
||||
#import "DYHistogram.h"
|
||||
#import "DYManagedColor.h"
|
||||
#import "../../ColorManagement/Sources/DYColorManagementGPU.h"
|
||||
#import "../../ColorManagement/Sources/DYColorProfile.h"
|
||||
@@ -112,13 +111,13 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview,*_histogram;
|
||||
NSData *_preview,*_lookLUTPreview;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;
|
||||
dispatch_queue_t _scopeQueue;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending;
|
||||
NSUInteger _scopeGeneration;
|
||||
DYScopeSample *_scopePending,*_scopeLatest;
|
||||
uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime;
|
||||
@@ -135,7 +134,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
#include "DYFaceRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
|
||||
- (void)dealloc{[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)trimPreparedLUTsKeeping:(NSString *)path {
|
||||
if(_preparedLUTs.count<=12)return;
|
||||
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
|
||||
@@ -159,8 +158,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
}});return progress;
|
||||
}
|
||||
- (void)notifyPreviewChanged{dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_histogram release];_histogram=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (NSData*)histogram{@synchronized(_previewLock){return [[_histogram retain]autorelease];}}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
@@ -248,7 +246,6 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
vector_uint2 vp={(unsigned)output.width,(unsigned)output.height};[re setVertexBytes:vs length:sizeof(vs) atIndex:0];[re setVertexBytes:&vp length:sizeof(vp) atIndex:1];[re setViewport:(MTLViewport){0,0,w,h,0,1}];[re setFragmentTexture:straight atIndex:0];for(NSUInteger i=0;i<ts.count;i++)[re setFragmentTexture:ts[i] atIndex:i+1];[re setFragmentBytes:&u length:sizeof(u) atIndex:0];[re setFragmentBuffer:scene offset:0 atIndex:1];DYRenderOptions options={1,bwMix,0,0};[re setFragmentBytes:&options length:sizeof(options) atIndex:2];DYUniforms color=u;color.blackWhiteSectionEnabled=0;[re setFragmentBytes:&color length:sizeof(color) atIndex:3];if(spiderBuffer)[re setFragmentBuffer:spiderBuffer offset:0 atIndex:4];else{float empty[2]={0,0};[re setFragmentBytes:empty length:sizeof(empty) atIndex:4];}[re setFragmentBytes:&spiderSize length:sizeof(spiderSize) atIndex:5];if(hasMasks||segmented){[re setFragmentBuffer:maskBuffer offset:0 atIndex:6];[re setFragmentBytes:&maskHeader length:sizeof(maskHeader) atIndex:7];}if(segmented){DYToolStageRange range={(int)stageFirst,(int)stageLast,(int)suppressBlackWhite};[re setFragmentBytes:&range length:sizeof(range) atIndex:8];[re setFragmentTexture:skinReference?[skinReference metalTextureForDevice:d]:input atIndex:10];[re setFragmentTexture:nativeSource atIndex:11];}[re drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[re endEncoding];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
|
||||
if(ok&&pb){@synchronized(_previewLock){
|
||||
[_preview release];_preview=[[NSData alloc]initWithBytes:pb.contents length:320*180*16];
|
||||
[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];
|
||||
// The analysis kernel reads physical texture rows. Its result remains intact
|
||||
// for auto grade; only the browser copy is normalized to top-first bitmap rows.
|
||||
[_lookLUTPreview release];
|
||||
|
||||
@@ -16,6 +16,17 @@
|
||||
}
|
||||
- (NSData *)scopePreview{@synchronized(_previewLock){return [[_scopePreview retain]autorelease];}}
|
||||
- (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}}
|
||||
- (NSData*)outputHistogram{
|
||||
DYScopeSample *sample=nil;
|
||||
@synchronized(_previewLock){_outputHistogramObserved=YES;sample=[[_scopeLatest retain]autorelease];}
|
||||
return sample.canvasHistogram;
|
||||
}
|
||||
- (void)queueOutputHistogramNotification{
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
|
||||
@synchronized(_previewLock){_outputHistogramNotificationPending=NO;}
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYOutputHistogramDidChange" object:self];
|
||||
});
|
||||
}
|
||||
- (NSData *)canvasHistogramAtTime:(CMTime)time{
|
||||
if(!CMTIME_IS_NUMERIC(time))return nil;
|
||||
DYScopeSample *sample=nil;
|
||||
@@ -47,7 +58,14 @@
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom;
|
||||
sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch),@"source":context[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)};
|
||||
[buffer release];[entry release];[context release];
|
||||
BOOL start=NO;@synchronized(_previewLock){if(serial>=_scopeLatestSerial){[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;}if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}}[sample release];
|
||||
BOOL start=NO,notifyHistogram=NO;@synchronized(_previewLock){
|
||||
if(serial>=_scopeLatestSerial){
|
||||
[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;
|
||||
if(_outputHistogramObserved&&!_outputHistogramNotificationPending){_outputHistogramNotificationPending=YES;notifyHistogram=YES;}
|
||||
}
|
||||
if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}
|
||||
}[sample release];
|
||||
if(notifyHistogram)[self queueOutputHistogramNotification];
|
||||
if(start)dispatch_async(_scopeQueue,^{[self processPendingScopeSamples];});
|
||||
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSMutableDictionary *node=(id)DYInsertTool(doc,type,anchor);if(!node)return;if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}addedID=[node[@"id"]copy];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release];
|
||||
}
|
||||
- (void)revealViewerTool:(NSNotification*)note {
|
||||
if(_embedded||![DYToolTypes()containsObject:note.userInfo[@"type"]])return;NSString *type=note.userInfo[@"type"];id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];@try{DYInspectorToken *old=nil;[[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:a.currentTime];DYInspectorToken *token=old?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];folds[[@"visible:" stringByAppendingString:type]]=@YES;token.folds=folds;[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:a.currentTime];
|
||||
if(_embedded||![DYToolTypes()containsObject:note.userInfo[@"type"]])return;NSString *type=note.userInfo[@"type"];id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];@try{DYInspectorToken *old=nil;[[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:a.currentTime];DYInspectorToken *token=old?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];NSString *visible=[@"visible:" stringByAppendingString:type];if(![token.folds[visible]boolValue]){NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];folds[visible]=@YES;token.folds=folds;[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:a.currentTime];}
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYBaseToolRemoved(doc,type)){BOOL existing=NO;for(NSDictionary*n in doc[@"layers"])if([n[@"type"]isEqual:type])existing=YES;if(!existing){id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if([undo startUndoGroup:@"添加画布工具"]){DYInsertTool(doc,type,[@"base:" stringByAppendingString:type]);DYWriteTools(_manager,doc,a.currentTime);[undo endUndoGroup];}}}
|
||||
}@finally{[a endAction:self];}[self refresh];[self setNeedsLayout:YES];
|
||||
}
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.12.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>80</string>
|
||||
<string>81</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.12.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>80</string>
|
||||
<string>81</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户