From a5b41e638ba8dc44e0c060cd3a1738af84900677 Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 16 Nov 2026 15:42:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98139=E7=94=BB=E5=B8=83?= =?UTF-8?q?=E5=8F=96=E8=89=B2=E8=AF=B7=E6=B1=82=E4=B8=8E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=A1=A5=E7=9A=84=E5=AE=8C=E6=95=B4=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 大鱼调色/Plugin/DYPlugIn.mm | 22 ++++++++++++++++++++-- 开发交接.md | 2 ++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index 548f8d9..07b94c2 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -24,13 +24,14 @@ @implementation DYPlugIn { DYRenderer *_renderer; NSColorSampler *_canvasSampler; + NSString *_hslPickerToken; BOOL _copyAnalyzed; std::atomic_bool _betaFirstRenderStarted,_modelRefreshPending; #include "DYToolHostIvars.inc.h" } #include "DYToolHostMethods.inc.h" -- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;} -- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_renderer release];[super dealloc];} +- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];[n addObserver:self selector:@selector(canvasHSLRequested:) name:@"DYHSLPickerRequest" object:manager];}DYBetaSpanEnd(beta,nil);return self;} +- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_hslPickerToken release];[_canvasSampler release];[_renderer release];[super dealloc];} - (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;} - (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);} - (NSSet*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];} @@ -106,6 +107,23 @@ if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}]; }]; } +- (BOOL)canvasHSLSampling {@synchronized(self){return _hslPickerToken.length>0;}} +- (void)finishCanvasHSLWithColor:(NSColor *)color { + NSString *token=nil;@synchronized(self){token=[_hslPickerToken autorelease];_hslPickerToken=nil;} + if(!token)return; + NSDictionary *payload=color?@{@"token":token,@"color":color}:@{@"token":token}; + dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerResult" object:self->_apiManager userInfo:payload];}); +} +- (void)canvasHSLRequested:(NSNotification *)note { + NSString *token=note.userInfo[@"token"];if(![token isKindOfClass:NSString.class]||!token.length)return; + if([note.userInfo[@"cancel"]boolValue]){@synchronized(self){if(![_hslPickerToken isEqual:token])return;}[self finishCanvasHSLWithColor:nil];return;} + [self finishCanvasHSLWithColor:nil];@synchronized(self){_hslPickerToken=[token copy];} +} +- (void)selectCanvasHSLAtPoint:(NSPoint)point atTime:(CMTime)time { + NSColor *color=[_renderer canvasColorAtPoint:point atTime:time]; + if(color)[self finishCanvasHSLWithColor:color]; + // A stale/partial/transparent frame keeps the request armed for a fresh click. +} - (void)applyCanvasWhiteBalance:(NSDictionary*)values atTime:(CMTime)time { id action=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; if(!action)return; diff --git a/开发交接.md b/开发交接.md index a718937..1cd6cd7 100644 --- a/开发交接.md +++ b/开发交接.md @@ -40,3 +40,5 @@ FCP12.4的“最后可信帧”自动跳转未通过。136/137均在输入与 ## 工程入口 工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支 `main`,远程 `https://dayu.media/git/dayu/dayu-color.git`。交付 `tools/deliver.py`,制包 `Packaging/build_pkg.py`,Release `Packaging/publish_release.py`。源码与记录使用共享仓库锁提交推送;安装包仅存Release附件。[恢复说明](RECOVERY.md) · [此前交接归档](research/HandoffHistory-20261114-before-clone-release.md)。凭据、代理配置、签名私钥保留原安全位置。 + +139的宿主桥实际文件名为 `大鱼调色/Plugin/DYPlugIn.mm`,按 Git 大小写核对后单独纳入检查点;后续实际编译来源以包含该实现的完整节点为准。