修复 LUT 浏览器帧比例和会话内排序
这个提交包含在:
1 父节点
5c0f177bde
当前提交
b7c2e291ec
18 个文件已更改
+205
-139
没有与搜索条件相匹配的文件
+57
-42
@@ -140,7 +140,9 @@ struct DYScopeReadback {
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview,*_lookLUTPreviewHD;
|
||||
NSData *_preview;
|
||||
NSDictionary *_lookLUTPreviewFrames;
|
||||
NSSize _lastLookPreviewSize;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
@@ -184,39 +186,64 @@ struct DYScopeReadback {
|
||||
#include "DYPrimaryRender.inc.h"
|
||||
#include "DYUnifiedRender.inc.h"
|
||||
#include "DYMosaicRender.inc.h"
|
||||
// HD is rendered alongside the existing throttled source sample. Its
|
||||
// immutable shared buffer stays available when the playhead is paused.
|
||||
- (id<MTLBuffer>)encodeLookHD:(id<MTLTexture>)texture inputLUT:(id<MTLTexture>)lut strength:(float)strength
|
||||
origin:(FxImageOrigin)origin entry:(NSMutableDictionary*)entry commands:(id<MTLCommandBuffer>)commands {
|
||||
NSString *name=lut?@"dyInputHighPreview":@"dyManagedHighPreview";
|
||||
// Use the display shape of the full source texture supplied by FxPlug.
|
||||
static NSSize DYLookSampleSize(id<MTLTexture> texture, double pixelAspect, NSUInteger edge) {
|
||||
if(!std::isfinite(pixelAspect)||pixelAspect<=0)pixelAspect=1;
|
||||
double aspect=double(texture.width)/texture.height*pixelAspect;
|
||||
return NSMakeSize(MAX(1,round(edge*fmin(1,aspect))),MAX(1,round(edge*fmin(1,1/aspect))));
|
||||
}
|
||||
- (id<MTLBuffer>)encodeLookPreview:(id<MTLTexture>)texture inputLUT:(id<MTLTexture>)lut strength:(float)strength
|
||||
size:(NSSize)size standard:(BOOL)standard origin:(FxImageOrigin)origin
|
||||
entry:(NSMutableDictionary*)entry commands:(id<MTLCommandBuffer>)commands {
|
||||
NSString *name=lut?@"dyInputLookPreview":@"dyManagedLookPreview";
|
||||
id<MTLComputePipelineState> pipeline=[self computePipeline:name entry:entry error:nil];
|
||||
if(!pipeline)return nil;
|
||||
id<MTLBuffer> buffer=[[entry[@"device"] newBufferWithLength:DYLookPreviewHDWidth*DYLookPreviewHDHeight*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
NSUInteger width=size.width,height=size.height;
|
||||
id<MTLBuffer> buffer=[[entry[@"device"] newBufferWithLength:width*height*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
id<MTLComputeCommandEncoder> encoder=buffer?[commands computeCommandEncoder]:nil;
|
||||
if(!encoder)return nil;
|
||||
[encoder setComputePipelineState:pipeline];[encoder setTexture:texture atIndex:0];
|
||||
[encoder setBuffer:buffer offset:0 atIndex:0];
|
||||
if(lut){[encoder setTexture:lut atIndex:1];[encoder setBytes:&strength length:sizeof(strength) atIndex:1];}
|
||||
uint32_t flip=origin==kFxImageOrigin_BOTTOM_LEFT;
|
||||
[encoder setBytes:&flip length:sizeof(flip) atIndex:2];
|
||||
[encoder dispatchThreads:MTLSizeMake(DYLookPreviewHDWidth,DYLookPreviewHDHeight,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];
|
||||
vector_uint4 geometry={(uint32_t)width,(uint32_t)height,origin==kFxImageOrigin_BOTTOM_LEFT,(uint32_t)standard};
|
||||
[encoder setBytes:&geometry length:sizeof(geometry) atIndex:2];
|
||||
[encoder dispatchThreads:MTLSizeMake(width,height,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];
|
||||
[encoder endEncoding];
|
||||
return buffer;
|
||||
}
|
||||
- (void)replaceLookHDBuffer:(id<MTLBuffer>)buffer {
|
||||
[_lookLUTPreviewHD release];_lookLUTPreviewHD=nil;
|
||||
if(!buffer)return;
|
||||
// Each capture owns a different buffer. NSData retains this one until the
|
||||
// browser's asynchronous image work has finished reading it.
|
||||
static NSData *DYLookBufferData(id<MTLBuffer> buffer) {
|
||||
if(!buffer)return nil;
|
||||
// The asynchronous browser can keep a capture alive across later renders.
|
||||
[buffer retain];
|
||||
_lookLUTPreviewHD=[[NSData alloc]initWithBytesNoCopy:buffer.contents length:buffer.length
|
||||
deallocator:^(void *bytes,NSUInteger length){[buffer release];}];
|
||||
return [[[NSData alloc]initWithBytesNoCopy:buffer.contents length:buffer.length
|
||||
deallocator:^(void *bytes,NSUInteger length){[buffer release];}]autorelease];
|
||||
}
|
||||
- (void)publishPreview:(id<MTLBuffer>)analysis standard:(id<MTLBuffer>)standard size:(NSSize)size
|
||||
high:(id<MTLBuffer>)high highSize:(NSSize)highSize origin:(FxImageOrigin)origin {
|
||||
@synchronized(_previewLock){
|
||||
[_preview release];_preview=[[NSData alloc]initWithBytes:analysis.contents length:analysis.length];
|
||||
NSData *look=DYLookBufferData(standard);
|
||||
if(NSEqualSizes(size,NSMakeSize(320,180))){
|
||||
look=_preview;
|
||||
if(origin==kFxImageOrigin_BOTTOM_LEFT){
|
||||
NSUInteger rowBytes=320*16;NSMutableData *flipped=[NSMutableData dataWithLength:_preview.length];
|
||||
for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*rowBytes,(const uint8_t*)_preview.bytes+(179-y)*rowBytes,rowBytes);
|
||||
look=flipped;
|
||||
}
|
||||
}
|
||||
NSMutableDictionary *frames=[NSMutableDictionary dictionary];
|
||||
if(look){frames[@"standard"]=look;frames[@"standardSize"]=[NSValue valueWithSize:size];}
|
||||
if(high){frames[@"high"]=DYLookBufferData(high);frames[@"highSize"]=[NSValue valueWithSize:highSize];}
|
||||
[_lookLUTPreviewFrames release];_lookLUTPreviewFrames=[frames copy];
|
||||
_lastLookPreviewSize=size;_lastPreview=CACurrentMediaTime();
|
||||
}
|
||||
[self notifyPreviewChanged];
|
||||
}
|
||||
#include "DYManagedRender.inc.h"
|
||||
#include "DYFaceRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeProfileLock=[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{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];[_scopeProfileLock release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_lookLUTPreviewHD release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];[_scopeProfileLock release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreviewFrames 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];
|
||||
@@ -240,14 +267,9 @@ struct DYScopeReadback {
|
||||
}});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;[_lookLUTPreviewHD release];_lookLUTPreviewHD=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreviewFrames release];_lookLUTPreviewFrames=nil;_lastPreview=0;}[self notifyPreviewChanged];}
|
||||
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSDictionary*)lookLUTPreviewFrames {@synchronized(_previewLock){
|
||||
NSMutableDictionary *frames=[NSMutableDictionary dictionary];
|
||||
frames[@"standard"]=_lookLUTPreview;frames[@"high"]=_lookLUTPreviewHD;
|
||||
return frames;
|
||||
}}
|
||||
- (NSDictionary*)lookLUTPreviewFrames {@synchronized(_previewLock){return [[_lookLUTPreviewFrames retain]autorelease];}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
NSNumber*k=@(registry);NSMutableDictionary*entry=_devices[k];if(entry)return entry;
|
||||
uint64_t beta=DYBetaSpanBegin(@"device_prepare",nil);@try{
|
||||
@@ -318,8 +340,9 @@ struct DYScopeReadback {
|
||||
}
|
||||
BOOL faceOnly=u.skinProtection.x>.5&&(u.skinProtection.y>0||u.skinVisualize>.5)&&u.skinFaceOnly>.5;
|
||||
DYToolMaskHeader maskHeader{};id<MTLBuffer>maskBuffer=(masks.count||segmented||faceOnly||_faceEntries.length)?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;maskHeader.faceOnly=faceOnly;BOOL hasMasks=maskHeader.count>0||maskHeader.faceOnly;if((hasMasks||segmented)&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区");
|
||||
NSSize lookSize=DYLookSampleSize(input,src.pixelAspect,DYLookPreviewStandardEdge);
|
||||
BOOL preview=NO;
|
||||
@synchronized(_previewLock){preview=(!segmented||stageFirst==0)&&!_exporting&&CACurrentMediaTime()-_lastPreview>.5;}
|
||||
@synchronized(_previewLock){preview=(!segmented||stageFirst==0)&&!_exporting&&(!NSEqualSizes(lookSize,_lastLookPreviewSize)||CACurrentMediaTime()-_lastPreview>.5);}
|
||||
BOOL neutral=!segmented&&!hasMasks&&!spiderBuffer&&u.skinVisualize<.5&&!hasLegacyGrade(u);
|
||||
FxRect s=src.tilePixelBounds,t=dst.tilePixelBounds;
|
||||
BOOL sameGrid=input.width==output.width&&input.height==output.height&&s.left==t.left&&s.right==t.right&&s.top==t.top&&s.bottom==t.bottom;
|
||||
@@ -391,7 +414,8 @@ struct DYScopeReadback {
|
||||
[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];
|
||||
}
|
||||
}
|
||||
id<MTLBuffer> pb=nil,lookHD=nil;
|
||||
id<MTLBuffer> pb=nil,lookStandard=nil,lookHigh=nil;
|
||||
NSSize highSize=NSZeroSize;
|
||||
if(preview){
|
||||
id<MTLComputePipelineState> analysis=[self computePipeline:@"dyInputAnalysis" entry:e error:err];if(!analysis)return NO;
|
||||
pb=[[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared]autorelease];
|
||||
@@ -401,8 +425,11 @@ struct DYScopeReadback {
|
||||
float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;
|
||||
[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];
|
||||
[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];
|
||||
lookHD=[self encodeLookHD:straight inputLUT:neutral?e[@"identity"]:ts[0] strength:inputStrength
|
||||
origin:src.imageOrigin entry:e commands:cb];
|
||||
id<MTLTexture> inputLUT=neutral?e[@"identity"]:ts[0];
|
||||
if(!NSEqualSizes(lookSize,NSMakeSize(320,180)))
|
||||
lookStandard=[self encodeLookPreview:straight inputLUT:inputLUT strength:inputStrength size:lookSize standard:YES origin:src.imageOrigin entry:e commands:cb];
|
||||
highSize=DYLookSampleSize(input,src.pixelAspect,DYLookPreviewHighEdge);
|
||||
lookHigh=[self encodeLookPreview:straight inputLUT:inputLUT strength:inputStrength size:highSize standard:NO origin:src.imageOrigin entry:e commands:cb];
|
||||
}
|
||||
MTLRenderPassDescriptor*rp=[MTLRenderPassDescriptor renderPassDescriptor];rp.colorAttachments[0].texture=output;rp.colorAttachments[0].loadAction=MTLLoadActionDontCare;rp.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>re=[cb renderCommandEncoderWithDescriptor:rp];[re setRenderPipelineState:pipeline];
|
||||
float w=output.width,h=output.height;float sw=s.right-s.left,sh=s.top-s.bottom;float l=(t.left-s.left)/sw,r=(t.right-s.left)/sw,top=(s.top-t.top)/sh,bottom=(s.top-t.bottom)/sh;
|
||||
@@ -410,19 +437,7 @@ struct DYScopeReadback {
|
||||
DYVertex2D vs[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};
|
||||
if(dst.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(int i=0;i<4;i++)vs[i].position.y=-vs[i].position.y;
|
||||
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];if(!neutral){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];BOOL ok=[self completeCommands:cb destination:dst texture:output entry:e];
|
||||
if(ok&&pb){@synchronized(_previewLock){
|
||||
[_preview release];_preview=[[NSData alloc]initWithBytes:pb.contents length:320*180*16];
|
||||
// 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];
|
||||
if(src.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){
|
||||
const NSUInteger rowBytes=320*16;NSMutableData*topFirst=[NSMutableData dataWithLength:_preview.length];
|
||||
for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)topFirst.mutableBytes+y*rowBytes,(const uint8_t*)_preview.bytes+(179-y)*rowBytes,rowBytes);
|
||||
_lookLUTPreview=[topFirst copy];
|
||||
}else _lookLUTPreview=[_preview retain];
|
||||
[self replaceLookHDBuffer:lookHD];
|
||||
_lastPreview=CACurrentMediaTime();[self notifyPreviewChanged];
|
||||
}}
|
||||
if(ok&&pb)[self publishPreview:pb standard:lookStandard size:lookSize high:lookHigh highSize:highSize origin:src.imageOrigin];
|
||||
if(!ok)fail(err,cb.error.localizedDescription);return ok;
|
||||
});}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self exportLUT:url uniforms:u paths:paths spider:nil error:err];}
|
||||
|
||||
在新工单中引用
屏蔽一个用户