让 Metal 直写 Vision 追踪输入并加入 LUT 高清分屏预览
这个提交包含在:
1 父节点
ef0e62419a
当前提交
63c49b0135
22 个文件已更改
+496
-86
没有与搜索条件相匹配的文件
+41
-4
@@ -1,3 +1,4 @@
|
||||
#import "DYLookPreview.h"
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#import <os/log.h>
|
||||
#import "DYManagedColor.h"
|
||||
@@ -139,7 +140,7 @@ struct DYScopeReadback {
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview;
|
||||
NSData *_preview,*_lookLUTPreview,*_lookLUTPreviewHD;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
@@ -183,11 +184,39 @@ 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";
|
||||
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];
|
||||
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)];
|
||||
[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.
|
||||
[buffer retain];
|
||||
_lookLUTPreviewHD=[[NSData alloc]initWithBytesNoCopy:buffer.contents length:buffer.length
|
||||
deallocator:^(void *bytes,NSUInteger length){[buffer release];}];
|
||||
}
|
||||
#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];[_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];[_lookLUTPreview release];[_lookLUTPreviewHD 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];
|
||||
@@ -211,9 +240,14 @@ 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;_lastPreview=0;}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];});}
|
||||
- (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;
|
||||
}}
|
||||
- (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{
|
||||
@@ -357,7 +391,7 @@ struct DYScopeReadback {
|
||||
[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];
|
||||
}
|
||||
}
|
||||
id<MTLBuffer> pb=nil;
|
||||
id<MTLBuffer> pb=nil,lookHD=nil;
|
||||
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];
|
||||
@@ -367,6 +401,8 @@ 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];
|
||||
}
|
||||
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;
|
||||
@@ -384,6 +420,7 @@ struct DYScopeReadback {
|
||||
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)fail(err,cb.error.localizedDescription);return ok;
|
||||
|
||||
在新工单中引用
屏蔽一个用户