From e26a7c68e46bbd3f65f6052056d25a12f154123e Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 6 Nov 2026 16:50:38 +0800 Subject: [PATCH] Use FxPlug IOSurface object dimensions and verify deployed diagnostics contract --- Backend/verify_live.py | 5 +++-- verification/BetaBackendDeployment.json | 10 +++++----- verification/BetaBackendLive.json | 20 ++++++++++---------- 大鱼调色/Plugin/DYPlugIn.mm | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Backend/verify_live.py b/Backend/verify_live.py index 47b2f7d..62d1444 100644 --- a/Backend/verify_live.py +++ b/Backend/verify_live.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """Anonymous public-beta endpoint smoke test; no credentials or production settings.""" -import datetime,json,time,urllib.request,urllib.error,uuid +import datetime,json,time,urllib.request,urllib.error,uuid,plistlib from pathlib import Path ROOT=Path(__file__).resolve().parent.parent BASE='https://dayu.media/wp-json/dayu-color/v1/' @@ -14,7 +14,8 @@ def main(): assert call('update?bundle_id=other&channel=beta')[0]==400 assert call('diagnostics')[0] in (401,403) event_id=str(uuid.uuid4());installation=str(uuid.uuid4());session=str(uuid.uuid4()) - event=dict(event_id=event_id,session_id=session,source='app',version='1.7.0',build=45,event='diagnostic_summary',occurred_at=time.time(),fields={'status':'deployment_smoke_test','count':1}) + info=plistlib.loads((ROOT/'大鱼调色/Wrapper Application/Info.plist').read_bytes()) + event=dict(event_id=event_id,session_id=session,source='app',version=info['CFBundleShortVersionString'],build=int(info['CFBundleVersion']),event='hang_sample',occurred_at=time.time(),fields={'status':'deployment_smoke_test','phase':'verification','sample_status':'contract_only','count':1}) payload=dict(bundle_id='com.dayu.color',installation_id=installation,events=[event]) for attempt in range(2): status,reply=call('diagnostics',payload);assert status==200 and reply['accepted'] and reply['event_ids']==[event_id],(status,reply) diff --git a/verification/BetaBackendDeployment.json b/verification/BetaBackendDeployment.json index de9525d..2eea1bc 100644 --- a/verification/BetaBackendDeployment.json +++ b/verification/BetaBackendDeployment.json @@ -1,10 +1,10 @@ { "path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta.php", - "sha256": "d2b73816e871765bc2f7d1604a1beda98b99e2d9ac4f62039de7bf3a81107593", - "backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta-202611021738.phpbak", - "size": 14220, - "timestamp": "202611021738", + "sha256": "08c15754c07c09984f3ecc00cac802bcab2ef7dc1bf0bf6f4600af7e7294b8eb", + "backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/mu-plugins/dayu-color-beta-202611061649.phpbak", + "size": 15008, + "timestamp": "202611061649", "mount": "//dayu@192.168.31.21/dayumedia%20%28%E5%AD%98%E5%82%A8%E7%A9%BA%E9%97%B41%29 on /Volumes/dayumedia (存储空间1) (smbfs, nodev, nosuid, mounted by mac)", "localProject": "/Users/mac/Downloads/dayumedia/dayu-color-beta", - "sourceCommit": "e37330a4b5a1ad8c10a05fbc6cd3c37be87dc530" + "sourceCommit": "2b2a98d6658f7dc09f0b2c91a3c7bef9f7682a4f" } diff --git a/verification/BetaBackendLive.json b/verification/BetaBackendLive.json index 54e51f3..1e40681 100644 --- a/verification/BetaBackendLive.json +++ b/verification/BetaBackendLive.json @@ -1,6 +1,6 @@ { "passed": true, - "checked_at": "2026-11-02T09:40:25.115993+00:00", + "checked_at": "2026-11-06T08:49:49.654581+00:00", "checks": [ "update GET", "product isolation", @@ -9,21 +9,21 @@ "retry same UUID ACK", "foreign upload denied" ], - "test_event_id": "fe84a41b-84a4-41f8-ba22-afd62655506e", - "test_installation_id": "c1f91498-dda9-4219-bb86-decaba573e18", + "test_event_id": "58c48897-fb01-4ad5-923e-b118d13d561b", + "test_installation_id": "9f2ba0ca-abca-4a8d-b229-c01312f35aa0", "update": { "bundle_id": "com.dayu.color", "channel": "beta", - "version": "1.7.0", - "build": 45, + "version": "1.12.0", + "build": 79, "package_type": "pkg", "install_mode": "pkg_installer", - "size": 40898751, - "sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb", - "download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg", + "size": 45329742, + "sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe", + "download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg", "minimum_system_version": "14.6", - "notes": "公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。", + "notes": "1.12.0 公测版加入统一调色工作区、共享蒙版、最近使用 LUT 和四宫格示波器。画布工具移至左下角,改善检视器重开与片尾示波器加载。请保存项目并退出 Final Cut Pro 和 Motion 后安装。", "update_available": true, - "checked_at": "2026-11-02T09:40:23+00:00" + "checked_at": "2026-11-06T08:49:47+00:00" } } diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index cd40feb..2f7c5ef 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -48,7 +48,7 @@ - (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;} - (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;} - (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{ - if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t renderSpan=DYBetaSpanBegin(@"render",@{@"width":@(IOSurfaceGetWidth(src[0].ioSurface)),@"height":@(IOSurfaceGetHeight(src[0].ioSurface)),@"layer_count":@([p[@"tools"][@"layers"]count])});uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=NO;@try{ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];}@finally{DYBetaSpanEnd(renderSpan,@{@"status":ok?@"passed":@"failed"});}DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",DYBetaErrorFields((e&&*e)?*e:nil,@"render_source"));if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){ + if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t renderSpan=DYBetaSpanBegin(@"render",@{@"width":@(src[0].ioSurface.width),@"height":@(src[0].ioSurface.height),@"layer_count":@([p[@"tools"][@"layers"]count])});uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=NO;@try{ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];}@finally{DYBetaSpanEnd(renderSpan,@{@"status":ok?@"passed":@"failed"});}DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",DYBetaErrorFields((e&&*e)?*e:nil,@"render_source"));if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){ FxRect image=src[0].imagePixelBounds; double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left; _toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;