比较提交
89
次代码提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
b5d842835c | ||
|
|
c95559936a | ||
|
|
e37330a4b5 | ||
|
|
a0f37578f7 | ||
|
|
30c8904003 | ||
|
|
55acdaa4b1 | ||
|
|
15d644c7e7 | ||
|
|
f453508be6 | ||
|
|
29bb7cdae4 | ||
|
|
c587163354 | ||
|
|
5d9a4ad707 | ||
|
|
7113e49fbb | ||
|
|
90d6022520 | ||
|
|
c664991aa1 | ||
|
|
0743c75a45 | ||
|
|
7bb14ea8da | ||
|
|
4e77cebd5e | ||
|
|
fd25de68fe | ||
|
|
46fb091479 | ||
|
|
0cc51149a6 | ||
|
|
d635e09ff3 | ||
|
|
e5affd3f09 | ||
|
|
96fa0a49a5 | ||
|
|
378cd2b6ec | ||
|
|
378956e130 | ||
|
|
1e7b7682c1 | ||
|
|
1a33ab335b | ||
|
|
f97320bbee | ||
|
|
b243751f86 | ||
|
|
2b2d657de7 | ||
|
|
ab7cb759e5 | ||
|
|
7d895750cf | ||
|
|
e7fa8e6cf5 | ||
|
|
85b6590944 | ||
|
|
06d531c443 | ||
|
|
eeeee102cd | ||
|
|
f575c01893 | ||
|
|
a249436776 | ||
|
|
b640b5da06 | ||
|
|
7814a03f95 | ||
|
|
301b31438e | ||
|
|
100941fab3 | ||
|
|
26a888f453 | ||
|
|
b4dc7e3267 | ||
|
|
f664887de3 | ||
|
|
38bf12326e | ||
|
|
696580210b | ||
|
|
123a6c8507 | ||
|
|
b3176f854d | ||
|
|
020f064a28 | ||
|
|
6de86a8ec3 | ||
|
|
c771a9274a | ||
|
|
3b57e36eb1 | ||
|
|
847a5ea999 | ||
|
|
2f81cad3ed | ||
|
|
a5adf39a1d | ||
|
|
23d5af7dcf | ||
|
|
0eb56aed12 | ||
|
|
7bac613f4a | ||
|
|
0b53fdcdfd | ||
|
|
38adc259e0 | ||
|
|
745aa1626e | ||
|
|
fa7ef93714 | ||
|
|
1932565ecd | ||
|
|
dbf25fe671 | ||
|
|
375761619f | ||
|
|
34162025b6 | ||
|
|
3fc32f3e19 | ||
|
|
659a8c540d | ||
|
|
cec044f124 | ||
|
|
f72aa2609d | ||
|
|
edfb74b171 | ||
|
|
bbdd47d1d7 | ||
|
|
281721bda1 | ||
|
|
827ddb8a32 | ||
|
|
dbb7ca4a99 | ||
|
|
5e94042db9 | ||
|
|
f8cc898546 | ||
|
|
6528f888af | ||
|
|
132d98c584 | ||
|
|
eb2dc311cb | ||
|
|
c2818cbb11 | ||
|
|
ac164245aa | ||
|
|
cf5a97cac9 | ||
|
|
8074444259 | ||
|
|
c2c65aaaff | ||
|
|
48b00c8579 | ||
|
|
d2bf0696bd | ||
|
|
76537da0a6 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,37 @@
|
||||
# 大鱼调色公测后端
|
||||
|
||||
LOCAL_PROJECT=/Users/mac/Downloads/dayumedia/dayu-color-beta
|
||||
NAS_ROOT=/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media
|
||||
SOURCE_BACKUP=大鱼调色仓库 Backend/
|
||||
|
||||
映射:`wp-content/mu-plugins/dayu-color-beta.php` 和 `wp-content/uploads/dayu-color-beta/updates/beta.json` 均保持同相对路径。PKG 不进 Git,由产品 Release 与生产公测下载空间保存。专项工作副本只包含本产品文件,源码及脱敏记录保存到产品仓库。参考 `fcpx-qwen3-asr` 提交 `113069c74aff935db2082b5bcd8e1aa47fe1fbf2` 的更新校验、批次诊断和崩溃脱敏流程;共享会员鉴权代码未修改。
|
||||
|
||||
2026-11-02 初始盘点:目标 MU 插件不存在,本地专项工程新建。实际共享已确认来自 192.168.31.21、dayumedia (存储空间1)、smbfs 且可读写。单独建仓因令牌缺少 write:user 返回403,未扩大权限;改用现有产品仓库保存。
|
||||
|
||||
## 路由与查看
|
||||
|
||||
- 更新:`GET https://dayu.media/wp-json/dayu-color/v1/update?bundle_id=com.dayu.color&channel=beta¤t_build=45`。仅提供更高构建号的完整 PKG 更新,无强制安装。
|
||||
- 诊断:`POST https://dayu.media/wp-json/dayu-color/v1/diagnostics`,公测阶段不依赖账号。严格限定产品、字段、事件、UUID、批次大小及频率;匿名输入只作为排查证据,不作为授权凭据。
|
||||
- 日志后台:`https://dayu.media/wp-admin/tools.php?page=dayu-color-beta`,需要管理员。可按构建号、事件、完整报告标识筛选并翻页。GET 诊断接口同样要求 manage_options。
|
||||
- 数据保留30天,由 WordPress 每日计划清理;依赖站点 WP-Cron 正常运行。IP 仅用于短期频控哈希,不存入诊断表。
|
||||
|
||||
## 客户端
|
||||
|
||||
主 APP 检查更新与插件注册并行,检查结束且注册成功后显示3秒退出倒计时。发现更新则保留窗口;下载可取消,校验 SHA-256、字节数、Installer/App签名团队、Gatekeeper、包内 Bundle ID、版本、安装位置及模板。保存并退出 FCP/Motion 后打开系统安装器,不强杀宿主。下一次启动可记录已完成升级。
|
||||
|
||||
主 APP 与 XPC 共享随机安装标识及诊断开关。诊断默认开启,界面明确说明并可关闭;不上传素材、LUT、预设、用户路径、账号、硬件 UUID 或原始崩溃文件。后台私有队列最多256条/384KB,批次16条,网络超时并延迟重试,服务端按事件 UUID 去重。关闭后清除待发摘要并停止新请求;已经送达的数据按保留期清理。
|
||||
|
||||
采集进程启动、初始化、检查器创建/慢刷新、Metal 管线准备、首次渲染、渲染错误、超过6秒的疑似阻塞,以及本插件近7天系统崩溃报告的脱敏摘要。疑似阻塞不等于根因;整个进程被停止、网络不可用、主机强制断电时无法保证即时送达。不会拦截崩溃信号,也不采集整个 FCP 的报告。本轮保留调色与宿主回调逻辑,尚未修复偶发卡死。
|
||||
|
||||
## 验证与发布
|
||||
|
||||
```sh
|
||||
php Backend/tests/contract.php
|
||||
python3 Backend/verify_live.py
|
||||
python3 Backend/deploy.py --backend
|
||||
python3 Backend/deploy.py --package '/Volumes/备份/大鱼调色/发行包/大鱼调色-1.7.0.pkg'
|
||||
```
|
||||
|
||||
先从仓库审查、提交并推送,再由部署脚本同步到专项工程;脚本验证实际 SMB 挂载及基线。覆盖原文件前同目录旁路备份并核对字节,新增文件无需不存在的备份。只写明确列出的路径,不加载或输出生产配置。更新包签名、公证、票据与正式 APP 验收通过后才发布;同名包不同字节立即停止。发布后完整下载核对大小与 SHA-256,并核验较低/相同构建号的更新结果。
|
||||
|
||||
回滚:先备份当前文件,再恢复部署记录中对应旁路备份;禁止降低已有清单构建号来自动降级。撤下更新时备份并移走 beta.json,更新路由回到没有更新;历史安装包和诊断表保留。源代码可从产品远程仓库恢复,签名私钥及服务端数据库不属于 Git 备份。
|
||||
@@ -0,0 +1,87 @@
|
||||
#!/usr/bin/env python3
|
||||
# coding: utf-8
|
||||
"""Deploy only the Dayu Color beta namespace from the scoped local workspace."""
|
||||
from pathlib import Path
|
||||
import argparse,datetime,hashlib,json,os,re,shutil,subprocess,uuid
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
LOCAL=Path('/Users/mac/Downloads/dayumedia/dayu-color-beta')
|
||||
MOUNT=Path('/Volumes/dayumedia (存储空间1)')
|
||||
NAS=MOUNT/'wwwroot/dayu_media'
|
||||
REL=Path('wp-content/mu-plugins/dayu-color-beta.php')
|
||||
UPLOAD=Path('wp-content/uploads/dayu-color-beta/updates')
|
||||
STAMP=datetime.datetime.now().strftime('%Y%m%d%H%M')
|
||||
def sha(path):
|
||||
h=hashlib.sha256()
|
||||
with path.open('rb') as f:
|
||||
for part in iter(lambda:f.read(1024*1024),b''):h.update(part)
|
||||
return h.hexdigest()
|
||||
def write_json(path,data):
|
||||
path.parent.mkdir(parents=True,exist_ok=True);path.write_text(json.dumps(data,ensure_ascii=False,indent=2)+'\n')
|
||||
def check_mount():
|
||||
lines=subprocess.check_output(['/sbin/mount'],text=True).splitlines()
|
||||
match=[s for s in lines if f' on {MOUNT} (smbfs,' in s]
|
||||
assert len(match)==1 and '@192.168.31.21/dayumedia%' in match[0], '目标不是已确认的 NAS SMB 共享'
|
||||
assert NAS.is_dir() and os.access(NAS/'wp-content/mu-plugins',os.W_OK), '目标共享不可写'
|
||||
return match[0]
|
||||
def backup(path):
|
||||
target=path.with_name(f'{path.stem}-{STAMP}.{path.suffix[1:]}bak' if path.suffix else f'{path.name}-{STAMP}.bak')
|
||||
assert not target.exists(), '旁路备份重名,请换时间戳'
|
||||
shutil.copyfile(path,target);assert sha(target)==sha(path)
|
||||
return str(target)
|
||||
def deploy_file(source,target,allow_new=False,expected=None):
|
||||
target.parent.mkdir(parents=True,exist_ok=True);old=None
|
||||
if target.exists():
|
||||
if sha(target)==sha(source):return dict(path=str(target),sha256=sha(target),reused=True)
|
||||
assert expected and sha(target)==expected,'生产基线已变化,停止覆盖'
|
||||
old=backup(target)
|
||||
else:assert allow_new,'预期生产基线不存在'
|
||||
temp=target.with_name('.dayu-color-stage-'+uuid.uuid4().hex)
|
||||
try:
|
||||
shutil.copyfile(source,temp);temp.chmod(0o644);assert sha(temp)==sha(source);os.replace(temp,target)
|
||||
finally:
|
||||
if temp.exists():temp.unlink()
|
||||
assert sha(source)==sha(target) and os.access(target,os.R_OK)
|
||||
return dict(path=str(target),sha256=sha(target),backup=old,size=target.stat().st_size)
|
||||
def main():
|
||||
p=argparse.ArgumentParser(description=__doc__);p.add_argument('--backend',action='store_true');p.add_argument('--package',type=Path);args=p.parse_args()
|
||||
assert args.backend or args.package
|
||||
mount=check_mount();LOCAL.mkdir(parents=True,exist_ok=True)
|
||||
lock=LOCAL/'.deployment.lock';lock.mkdir();write_json(lock/'owner.json',dict(PID=os.getpid(),cwd=str(ROOT),started=STAMP))
|
||||
try:
|
||||
if args.backend:
|
||||
subprocess.run(['php','-l',str(ROOT/'Backend'/REL)],check=True)
|
||||
local=LOCAL/REL;local.parent.mkdir(parents=True,exist_ok=True)
|
||||
record=ROOT/'verification/BetaBackendDeployment.json'
|
||||
previous=json.loads(record.read_text()) if record.exists() else {}
|
||||
if local.exists() and sha(local)!=sha(ROOT/'Backend'/REL):
|
||||
assert previous.get('sha256')==sha(local),'本地专项工程有未部署改动,停止覆盖'
|
||||
shutil.copyfile(ROOT/'Backend'/REL,local)
|
||||
result=deploy_file(local,NAS/REL,allow_new=not previous,expected=previous.get('sha256'))
|
||||
result.update(timestamp=STAMP,mount=mount,localProject=str(LOCAL),sourceCommit=subprocess.check_output(['git','rev-parse','HEAD'],cwd=ROOT,text=True).strip())
|
||||
write_json(record,result);print(json.dumps(result,ensure_ascii=False))
|
||||
if args.package:
|
||||
package=args.package.resolve();report=json.loads((ROOT/'verification/Package.json').read_text());delivery=json.loads((ROOT/'verification/Delivery.json').read_text())
|
||||
assert report['notarization']['status']=='Accepted' and delivery['status']=='verified'
|
||||
# Independent final-container checks before uploading any bytes.
|
||||
subprocess.run(['pkgutil','--check-signature',str(package)],check=True,stdout=subprocess.DEVNULL)
|
||||
subprocess.run(['xcrun','stapler','validate',str(package)],check=True,stdout=subprocess.DEVNULL)
|
||||
subprocess.run(['spctl','--assess','--type','install',str(package)],check=True)
|
||||
version=delivery['version'];build=int(delivery['build']);digest=sha(package)
|
||||
assert report["sha256"]==digest, "发行包与验包记录不一致"
|
||||
filename=f'dayu-color-{version.replace(".","-")}-{build}.pkg';relative=UPLOAD/filename
|
||||
local=LOCAL/relative;local.parent.mkdir(parents=True,exist_ok=True)
|
||||
if not local.exists():shutil.copyfile(package,local)
|
||||
assert sha(local)==digest
|
||||
result=deploy_file(local,NAS/relative,allow_new=True)
|
||||
manifest=dict(bundle_id='com.dayu.color',channel='beta',version=version,build=build,package_type='pkg',install_mode='pkg_installer',
|
||||
size=package.stat().st_size,sha256=digest,download_url='https://dayu.media/'+str(relative),minimum_system_version='14.6',
|
||||
notes='公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。')
|
||||
dest=NAS/UPLOAD/'beta.json';old=json.loads(dest.read_text()) if dest.exists() else None
|
||||
if old:assert int(old['build'])<=build, '禁止更新通道倒退'
|
||||
localManifest=LOCAL/UPLOAD/'beta.json';write_json(localManifest,manifest)
|
||||
published=deploy_file(localManifest,dest,allow_new=True,expected=sha(dest) if old else None)
|
||||
result.update(manifest=published,version=version,build=build,downloadURL=manifest['download_url'],timestamp=STAMP)
|
||||
write_json(ROOT/'verification/BetaPublication.json',result);print(json.dumps(result,ensure_ascii=False))
|
||||
finally:
|
||||
(lock/'owner.json').unlink();lock.rmdir()
|
||||
if __name__=='__main__':main()
|
||||
@@ -0,0 +1,53 @@
|
||||
<?php
|
||||
// Product endpoint contracts; WordPress and DB are stubbed, never load production settings.
|
||||
error_reporting(E_ALL);
|
||||
set_error_handler(function($severity,$message,$file,$line){ throw new ErrorException($message,0,$severity,$file,$line); });
|
||||
define('ABSPATH',__DIR__.'/');define('MINUTE_IN_SECONDS',60);define('DAY_IN_SECONDS',86400);define('ARRAY_A','ARRAY_A');
|
||||
$testRoot=sys_get_temp_dir().'/dayu-color-contract-'.bin2hex(random_bytes(6));mkdir($testRoot,0700,true);
|
||||
function add_action(...$args){}
|
||||
function get_option($key){return '1';}
|
||||
function register_rest_route($namespace,$route,$args){$GLOBALS['routes'][$route]=$args;}
|
||||
function current_user_can($permission){return false;}
|
||||
function wp_upload_dir(...$args){return array('basedir'=>$GLOBALS['testRoot']);}
|
||||
function sanitize_textarea_field($value){return strip_tags($value);}
|
||||
function sanitize_text_field($value){return strip_tags($value);}
|
||||
function wp_salt($scheme){return 'test-only-not-production';}
|
||||
function get_transient($key){return 0;}
|
||||
function set_transient(...$args){}
|
||||
function wp_json_encode($value,$options=0){return json_encode($value,$options);}
|
||||
class WP_Error {public $code,$data;function __construct($code,$message,$data){$this->code=$code;$this->data=$data;}}
|
||||
class WP_REST_Response {public $data,$status;function __construct($data,$status,$headers){$this->data=$data;$this->status=$status;}}
|
||||
class WP_REST_Request {public $params,$body;function __construct($params=array(),$body=null){$this->params=$params;$this->body=$body;}function get_param($name){return $this->params[$name]??null;}function get_body(){return json_encode($this->body);}function get_json_params(){return $this->body;}}
|
||||
class FakeDB {public $prefix='wp_',$rows=array();function prepare($sql,...$args){return $args[0]??$sql;}function get_var($sql){return isset($this->rows[$sql])?$sql:null;}function insert($table,$row){$this->rows[$row['event_id']]=$row;return 1;}}
|
||||
$wpdb=new FakeDB;
|
||||
require dirname(__DIR__).'/wp-content/mu-plugins/dayu-color-beta.php';
|
||||
$checks=0;
|
||||
function check($value,$label){global $checks;if(!$value)throw new RuntimeException($label);$checks++;}
|
||||
function request($body){return new WP_REST_Request(array(),$body);}
|
||||
try {
|
||||
Dayu_Color_Beta::routes();
|
||||
check(($routes['/diagnostics'][1]['permission_callback'])()===false,'anonymous log reads denied');
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'other')))->data['status']===400,'product separation');
|
||||
$response=Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>44)));
|
||||
check($response->status===200 && !$response->data['update_available'],'empty feed is usable');
|
||||
$fields=Dayu_Color_Beta::clean_fields(array('frames'=>'/Users/test/secret.mov','error_domain'=>'token=not-a-token','arbitrary'=>'private','duration_ms'=>INF,'gpu'=>'M4'));
|
||||
check($fields['frames']==='[REDACTED]' && $fields['error_domain']==='[REDACTED]' && !isset($fields['arbitrary']) && !isset($fields['duration_ms']) && $fields['gpu']==='M4','allowlist and redaction');
|
||||
$id='12345678-1234-4234-8234-123456789012';
|
||||
$event=array('event_id'=>$id,'session_id'=>$id,'source'=>'plugin','version'=>'1.7.0','build'=>45,'event'=>'first_render','occurred_at'=>time(),'fields'=>array('duration_ms'=>1200));
|
||||
$body=array('bundle_id'=>'com.dayu.color','installation_id'=>$id,'events'=>array($event));
|
||||
$reply=Dayu_Color_Beta::ingest(request($body));
|
||||
check($reply->status===200 && $reply->data['accepted'] && count($wpdb->rows)===1,'valid event accepted');
|
||||
Dayu_Color_Beta::ingest(request($body));check(count($wpdb->rows)===1,'retry idempotency');
|
||||
foreach(array('version'=>array(),'build'=>array(),'event'=>'material_path','session_id'=>'bad','occurred_at'=>null) as $key=>$bad){$b=$body;$b['events'][0][$key]=$bad;check(Dayu_Color_Beta::ingest(request($b))->data['status']===400,'malformed '.$key);}
|
||||
$b=$body;$b['events']=array_fill(0,33,$event);check(Dayu_Color_Beta::ingest(request($b))->data['status']===400,'batch limit');
|
||||
$b=$body;$b['padding']=str_repeat('a',100000);check(Dayu_Color_Beta::ingest(request($b))->data['status']===413,'byte limit');
|
||||
$manifest=array('bundle_id'=>'com.dayu.color','channel'=>'beta','version'=>'1.7.0','build'=>45,'package_type'=>'pkg','install_mode'=>'pkg_installer','size'=>123,'sha256'=>str_repeat('a',64),'download_url'=>'https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg');
|
||||
mkdir(dirname(Dayu_Color_Beta::manifest_path()),0700,true);file_put_contents(Dayu_Color_Beta::manifest_path(),json_encode($manifest));
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>44)))->data['update_available']===true,'older build sees update');
|
||||
check(Dayu_Color_Beta::update(new WP_REST_Request(array('bundle_id'=>'com.dayu.color','current_build'=>45)))->data['update_available']===false,'current build no downgrade');
|
||||
foreach(array('download_url'=>'https://other.example/evil.pkg','sha256'=>'bad','build'=>array(),'size'=>1073741825,'install_mode'=>'zip_replace') as $key=>$bad){$m=$manifest;$m[$key]=$bad;file_put_contents(Dayu_Color_Beta::manifest_path(),json_encode($m));check(Dayu_Color_Beta::manifest()===array(),'bad manifest '.$key);}
|
||||
echo json_encode(array('passed'=>true,'checks'=>$checks),JSON_PRETTY_PRINT)."\n";
|
||||
} finally {
|
||||
if(is_file(Dayu_Color_Beta::manifest_path()))unlink(Dayu_Color_Beta::manifest_path());
|
||||
@rmdir($testRoot.'/dayu-color-beta/updates');@rmdir($testRoot.'/dayu-color-beta');@rmdir($testRoot);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Anonymous public-beta endpoint smoke test; no credentials or production settings."""
|
||||
import datetime,json,time,urllib.request,urllib.error,uuid
|
||||
from pathlib import Path
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
BASE='https://dayu.media/wp-json/dayu-color/v1/'
|
||||
def call(route,body=None):
|
||||
request=urllib.request.Request(BASE+route,data=json.dumps(body).encode() if body else None,headers={'Content-Type':'application/json'})
|
||||
try:
|
||||
with urllib.request.urlopen(request,timeout=15) as r:return r.status,json.load(r)
|
||||
except urllib.error.HTTPError as e:return e.code,json.load(e)
|
||||
def main():
|
||||
status,feed=call('update?bundle_id=com.dayu.color&channel=beta¤t_build=44');assert status==200 and feed['bundle_id']=='com.dayu.color'
|
||||
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})
|
||||
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)
|
||||
bad=dict(payload,bundle_id='other');assert call('diagnostics',bad)[0]==400
|
||||
record=dict(passed=True,checked_at=datetime.datetime.now(datetime.timezone.utc).isoformat(),checks=['update GET','product isolation','admin read denied anonymously','diagnostic stored ACK','retry same UUID ACK','foreign upload denied'],test_event_id=event_id,test_installation_id=installation,update=feed)
|
||||
(ROOT/'verification/BetaBackendLive.json').write_text(json.dumps(record,ensure_ascii=False,indent=2)+'\n');print(json.dumps(record,ensure_ascii=False))
|
||||
if __name__=='__main__':main()
|
||||
@@ -0,0 +1,179 @@
|
||||
<?php
|
||||
/** Plugin Name: 大鱼调色公测更新与诊断
|
||||
* Product-scoped beta endpoints. No changes to shared account/authentication code.
|
||||
*/
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
final class Dayu_Color_Beta {
|
||||
const SCHEMA = '1';
|
||||
const BUNDLE = 'com.dayu.color';
|
||||
const MAX_BODY = 98304;
|
||||
const MAX_BATCH = 32;
|
||||
const EVENTS = array('process_start','process_exit','plugin_init','inspector_create','inspector_refresh',
|
||||
'device_prepare','gpu_pipeline','first_render','render_error','main_thread_stall',
|
||||
'operation_stall','previous_session_pending','crash_summary','registration','host_confirmed',
|
||||
'update_check','update_download','update_validation','update_installer','diagnostic_summary');
|
||||
const FIELDS = array('phase','stage','pipeline','duration_ms','status','error_domain','error_code',
|
||||
'exception','signal','frames','report_time','count','pending','model','os_version','fcp_version',
|
||||
'cpu_cores','memory_gb','gpu','main_delay_ms','active_stages','source_version');
|
||||
|
||||
public static function boot() {
|
||||
add_action('rest_api_init', array(__CLASS__, 'routes'));
|
||||
add_action('admin_menu', function () {
|
||||
add_management_page('大鱼调色公测', '大鱼调色公测', 'manage_options', 'dayu-color-beta', array(__CLASS__, 'admin'));
|
||||
});
|
||||
add_action('dayu_color_beta_cleanup', array(__CLASS__, 'cleanup'));
|
||||
}
|
||||
private static function table() { global $wpdb; return $wpdb->prefix . 'dayu_color_beta_events'; }
|
||||
public static function ensure_schema() {
|
||||
if (get_option('dayu_color_beta_schema') === self::SCHEMA) return;
|
||||
global $wpdb;
|
||||
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
|
||||
$table = self::table(); $collation = $wpdb->get_charset_collate();
|
||||
dbDelta("CREATE TABLE {$table} (
|
||||
event_id varchar(36) NOT NULL,
|
||||
installation_id varchar(36) NOT NULL,
|
||||
session_id varchar(36) NOT NULL,
|
||||
client_version varchar(32) NOT NULL,
|
||||
client_build bigint unsigned NOT NULL,
|
||||
source varchar(12) NOT NULL,
|
||||
event varchar(64) NOT NULL,
|
||||
fields_json text NOT NULL,
|
||||
occurred_at datetime NOT NULL,
|
||||
received_at datetime NOT NULL,
|
||||
PRIMARY KEY (event_id),
|
||||
KEY received_at (received_at),
|
||||
KEY client_event (client_build,event),
|
||||
KEY installation (installation_id)
|
||||
) {$collation};");
|
||||
if ($wpdb->get_var($wpdb->prepare('SHOW TABLES LIKE %s', $table)) === $table) {
|
||||
update_option('dayu_color_beta_schema', self::SCHEMA, false);
|
||||
if (!wp_next_scheduled('dayu_color_beta_cleanup')) wp_schedule_event(time()+3600, 'daily', 'dayu_color_beta_cleanup');
|
||||
}
|
||||
}
|
||||
public static function routes() {
|
||||
self::ensure_schema();
|
||||
register_rest_route('dayu-color/v1', '/update', array('methods'=>'GET', 'permission_callback'=>'__return_true', 'callback'=>array(__CLASS__,'update')));
|
||||
register_rest_route('dayu-color/v1', '/diagnostics', array(
|
||||
array('methods'=>'POST', 'permission_callback'=>'__return_true', 'callback'=>array(__CLASS__,'ingest')),
|
||||
array('methods'=>'GET', 'permission_callback'=>function(){ return current_user_can('manage_options'); }, 'callback'=>array(__CLASS__,'events'))
|
||||
));
|
||||
}
|
||||
public static function manifest_path() {
|
||||
$upload = wp_upload_dir(null, false);
|
||||
return rtrim($upload['basedir'], '/\\') . '/dayu-color-beta/updates/beta.json';
|
||||
}
|
||||
public static function manifest() {
|
||||
$path = self::manifest_path();
|
||||
if (!is_file($path) || filesize($path)>32768) return array();
|
||||
$value = json_decode((string)file_get_contents($path), true);
|
||||
if (!is_array($value) || ($value['bundle_id']??'')!==self::BUNDLE || ($value['channel']??'')!=='beta') return array();
|
||||
if (!is_string($value['download_url']??null) || !is_string($value['sha256']??null) || !is_string($value['version']??null) || !is_int($value['build']??null) || !is_int($value['size']??null) || ($value['package_type']??'')!=='pkg' || ($value['install_mode']??'')!=='pkg_installer') return array();
|
||||
$url = $value['download_url'];
|
||||
if (!preg_match('~^https://dayu\.media/wp-content/uploads/dayu-color-beta/updates/[A-Za-z0-9_-]+\.pkg$~D', $url)) return array();
|
||||
if (!preg_match('/^[a-f0-9]{64}$/D', (string)($value['sha256']??'')) || intval($value['size']??0)<=0 || intval($value['build']??0)<=0 || intval($value['size'])>1073741824) return array();
|
||||
return $value;
|
||||
}
|
||||
public static function update($request) {
|
||||
if (($request->get_param('bundle_id')??'')!==self::BUNDLE || ($request->get_param('channel')??'beta')!=='beta') {
|
||||
return new WP_Error('product_mismatch','此通道仅用于大鱼调色公测。',array('status'=>400));
|
||||
}
|
||||
$manifest = self::manifest();
|
||||
if (!$manifest) return new WP_REST_Response(array('bundle_id'=>self::BUNDLE,'channel'=>'beta','update_available'=>false,'message'=>'当前没有公测更新。'),200,array('Cache-Control'=>'no-store'));
|
||||
$current = max(0, intval($request->get_param('current_build')));
|
||||
$manifest['update_available'] = intval($manifest['build']) > $current;
|
||||
$manifest['checked_at'] = gmdate('c');
|
||||
return new WP_REST_Response($manifest,200,array('Cache-Control'=>'no-store'));
|
||||
}
|
||||
public static function clean_fields($input) {
|
||||
if (!is_array($input)) return array();
|
||||
$out = array();
|
||||
foreach (self::FIELDS as $key) {
|
||||
if (!array_key_exists($key,$input) || !is_scalar($input[$key])) continue;
|
||||
if (in_array($key,array('duration_ms','main_delay_ms','memory_gb','cpu_cores','count','pending','error_code'),true)) {
|
||||
if (is_numeric($input[$key]) && is_finite((float)$input[$key])) $out[$key]=max(-1000000,min(86400000,(float)$input[$key]));
|
||||
continue;
|
||||
}
|
||||
$value = sanitize_textarea_field((string)$input[$key]);
|
||||
$value = preg_replace('~(?:https?://\S+|(?:/Users/|/Volumes/|/private/|/var/)[^\r\n]*)~i','[REDACTED]',$value);
|
||||
$value = preg_replace('/(?:bearer\s+\S+|(?:token|api[_-]?key|secret|password)\s*[=:]\s*\S+)/i','[REDACTED]',$value);
|
||||
$limit = $key==='frames' ? 6000 : ($key==='active_stages' ? 1000 : 200);
|
||||
$out[$key] = function_exists('mb_substr') ? mb_substr($value,0,$limit,'UTF-8') : substr($value,0,$limit);
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
private static function uuid($value) { return is_string($value) && preg_match('/^[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$/iD',$value); }
|
||||
public static function ingest($request) {
|
||||
if (strlen($request->get_body())>self::MAX_BODY) return new WP_Error('body_too_large','诊断批次过大。',array('status'=>413));
|
||||
$body = $request->get_json_params();
|
||||
if (!is_array($body) || ($body['bundle_id']??'')!==self::BUNDLE || !self::uuid($body['installation_id']??null)
|
||||
|| !isset($body['events']) || !is_array($body['events']) || count($body['events'])<1 || count($body['events'])>self::MAX_BATCH) {
|
||||
return new WP_Error('invalid_batch','诊断批次无效。',array('status'=>400));
|
||||
}
|
||||
// Anonymous beta diagnostics are untrusted input, never an authorization proof.
|
||||
$ip = (string)($_SERVER['REMOTE_ADDR']??'unknown');
|
||||
$bucket = 'dayu_color_rate_' . substr(hash_hmac('sha256',$ip,wp_salt('nonce')),0,32);
|
||||
$count = intval(get_transient($bucket));
|
||||
if ($count>=300) return new WP_Error('rate_limit','请稍后重试。',array('status'=>429));
|
||||
set_transient($bucket,$count+1,10*MINUTE_IN_SECONDS);
|
||||
$normalized = array();
|
||||
foreach ($body['events'] as $event) {
|
||||
if (!is_array($event) || !self::uuid($event['event_id']??null) || !self::uuid($event['session_id']??null)
|
||||
|| !in_array($event['event']??'',self::EVENTS,true) || !in_array($event['source']??'',array('app','plugin'),true)
|
||||
|| !is_string($event['version']??null) || strlen($event['version'])>32 || !preg_match('/^[0-9]+(?:\.[0-9A-Za-z_-]+){1,3}$/D',$event['version'])
|
||||
|| !is_int($event['build']??null) || $event['build']<1 || $event['build']>999999999
|
||||
|| !is_numeric($event['occurred_at']??null) || !is_finite((float)$event['occurred_at']) || abs((float)$event['occurred_at']-time())>366*DAY_IN_SECONDS) return new WP_Error('invalid_event','诊断事件无效。',array('status'=>400));
|
||||
$normalized[] = array('event_id'=>strtolower($event['event_id']),'installation_id'=>strtolower($body['installation_id']),
|
||||
'session_id'=>strtolower($event['session_id']),'client_version'=>substr($event['version'],0,32),
|
||||
'client_build'=>intval($event['build']),'source'=>$event['source'],'event'=>$event['event'],
|
||||
'fields_json'=>wp_json_encode(self::clean_fields($event['fields']??array()),JSON_UNESCAPED_UNICODE),
|
||||
'occurred_at'=>gmdate('Y-m-d H:i:s',(int)$event['occurred_at']), 'received_at'=>gmdate('Y-m-d H:i:s'));
|
||||
}
|
||||
global $wpdb; $table=self::table(); $accepted=array();
|
||||
foreach ($normalized as $row) {
|
||||
// Idempotent event IDs permit bounded retry after an ambiguous connection loss.
|
||||
if ($wpdb->get_var($wpdb->prepare("SELECT event_id FROM {$table} WHERE event_id=%s",$row['event_id']))) { $accepted[]=$row['event_id']; continue; }
|
||||
if ($wpdb->insert($table,$row)===false && !$wpdb->get_var($wpdb->prepare("SELECT event_id FROM {$table} WHERE event_id=%s",$row['event_id']))) return new WP_Error('storage_failed','诊断存储失败,请稍后重试。',array('status'=>503));
|
||||
$accepted[]=$row['event_id'];
|
||||
}
|
||||
return new WP_REST_Response(array('accepted'=>true,'event_ids'=>$accepted,'received_at'=>gmdate('c')),200,array('Cache-Control'=>'no-store'));
|
||||
}
|
||||
public static function cleanup() {
|
||||
global $wpdb; $table=self::table();
|
||||
$wpdb->query($wpdb->prepare("DELETE FROM {$table} WHERE received_at < %s",gmdate('Y-m-d H:i:s',time()-30*DAY_IN_SECONDS)));
|
||||
}
|
||||
public static function events($request) {
|
||||
global $wpdb; $table=self::table(); $where='1=1'; $values=array();
|
||||
foreach (array('build'=>'client_build','event'=>'event','installation'=>'installation_id') as $param=>$column) {
|
||||
$raw=$request->get_param($param);$value = is_scalar($raw)?sanitize_text_field((string)$raw):'';
|
||||
if ($value!=='') { $where.=" AND {$column}=%s"; $values[]=$value; }
|
||||
}
|
||||
$page=max(1,min(1000,intval($request->get_param('page'))));
|
||||
$sql="SELECT event_id,installation_id,session_id,client_version,client_build,source,event,fields_json,occurred_at,received_at FROM {$table} WHERE {$where} ORDER BY received_at DESC LIMIT 50 OFFSET " . (($page-1)*50);
|
||||
$rows=$wpdb->get_results($values?$wpdb->prepare($sql,$values):$sql,ARRAY_A);
|
||||
return array('events'=>$rows?:array(),'page'=>$page,'retention_days'=>30);
|
||||
}
|
||||
public static function admin() {
|
||||
if (!current_user_can('manage_options')) return;
|
||||
self::ensure_schema(); global $wpdb; $table=self::table();
|
||||
$request = new WP_REST_Request('GET');
|
||||
foreach (array('build','event','installation') as $key) $request->set_param($key,is_string($_GET[$key]??null)?sanitize_text_field(wp_unslash($_GET[$key])):'');
|
||||
$request->set_param('page',max(1,intval($_GET['paged']??1)));
|
||||
$result=self::events($request);$manifest=self::manifest();
|
||||
$devices=intval($wpdb->get_var($wpdb->prepare("SELECT COUNT(DISTINCT installation_id) FROM {$table} WHERE received_at >= %s",gmdate('Y-m-d H:i:s',time()-7*DAY_IN_SECONDS))));
|
||||
echo '<div class="wrap"><h1>大鱼调色公测</h1><p>近7天报告设备:<strong>'.esc_html($devices).'</strong> · 诊断保留30天。匿名公测标识用于关联问题,不代表账号或设备授权。</p>';
|
||||
echo '<h2>公测更新</h2><p>'.($manifest?'当前版本:'.esc_html($manifest['version']).'('.esc_html($manifest['build']).')':'尚未发布更新包').'</p>';
|
||||
echo '<h2>诊断事件</h2><form method="get"><input type="hidden" name="page" value="dayu-color-beta">';
|
||||
foreach (array('build'=>'构建号','event'=>'事件','installation'=>'完整报告标识') as $key=>$label) echo '<label>'.esc_html($label).' <input name="'.esc_attr($key).'" value="'.esc_attr($request->get_param($key)).'"></label> ';
|
||||
echo '<button class="button">筛选</button></form><table class="widefat striped"><thead><tr><th>时间(UTC)</th><th>版本</th><th>报告标识</th><th>来源/事件</th><th>内容</th></tr></thead><tbody>';
|
||||
foreach ($result['events'] as $row) {
|
||||
echo '<tr><td>'.esc_html($row['occurred_at']).'<br>送达 '.esc_html($row['received_at']).'</td><td>'.esc_html($row['client_version'].' ('.$row['client_build'].')').'</td><td><code>'.esc_html($row['installation_id']).'</code><br>会话 '.esc_html(substr($row['session_id'],0,8)).'</td><td>'.esc_html($row['source'].' / '.$row['event']).'</td><td><pre style="white-space:pre-wrap;max-width:760px">'.esc_html(wp_json_encode(json_decode($row['fields_json'],true),JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE)).'</pre></td></tr>';
|
||||
}
|
||||
echo '</tbody></table><p>';
|
||||
$base=array('page'=>'dayu-color-beta','build'=>$request->get_param('build'),'event'=>$request->get_param('event'),'installation'=>$request->get_param('installation'));
|
||||
if ($result['page']>1) echo '<a class="button" href="'.esc_url(add_query_arg(array_merge($base,array('paged'=>$result['page']-1)),admin_url('tools.php'))).'">上一页</a> ';
|
||||
if (count($result['events'])===50) echo '<a class="button" href="'.esc_url(add_query_arg(array_merge($base,array('paged'=>$result['page']+1)),admin_url('tools.php'))).'">下一页</a>';
|
||||
echo '</p><p>仅包含产品版本、环境、阶段耗时、错误代码及本插件崩溃摘要,不接收素材、预设、硬件UUID或账户凭据。</p></div>';
|
||||
}
|
||||
}
|
||||
Dayu_Color_Beta::boot();
|
||||
@@ -0,0 +1,18 @@
|
||||
大鱼调色 1.2.0(17),适用于 Apple Silicon Mac,最低 macOS 14.6。
|
||||
|
||||
- 输入还原改为大鱼 CST 的输入转换、工作空间一级调色和输出转换,曲线与色域独立选择。
|
||||
- 标题只展开/折叠,小眼睛只启用/旁路,独立保存。默认一级调色与基础调整展开,其余折叠,所有眼睛开启。
|
||||
- 保留旧工程输入 LUT/相机档位兼容;风格 LUT、编码兼容、后台加载及自动分析继续可用。
|
||||
- Cube 导出包含 CST 与一级调色;黑白新增默认 0% 混合,默认画面中性。
|
||||
- 153 项原生检查及 21 组独立 CST 像素对照通过;FCP 12.4 默认、独立开关、参数保留、Sony/ACES 选择、保存重开及风格库应用验收通过。
|
||||
|
||||
安装包包含原生 FxPlug APP 和 FCP 模板,不含用户 LUT、预设或媒体。安装前保存工作并正常退出 Final Cut Pro/Motion。APP 和 PKG 均完成正式签名、公证、票据与 Gatekeeper 核验,20 项展开验包通过;本轮未重复执行 PKG 安装。
|
||||
|
||||
版本标签:`v1.2.0-cst-fold-20261101`
|
||||
APP 实际编译源码:`48b00c85799b0226ba32aba3f2e5397aa0e509ed`
|
||||
APP 公证:`f25ae46e-92da-4470-842e-128bdb232aa8`,Accepted
|
||||
PKG 公证:`c7b97b0f-57c8-45d3-a4d7-7db8e8694487`,Accepted
|
||||
|
||||
附件:`大鱼调色-1.2.0.pkg`
|
||||
大小:13,818,397 字节
|
||||
SHA-256:`9fba4f0c1a313a6da8374b683f7e6b41af70388d7a7a180e26b9e236a9ba64a1`
|
||||
@@ -0,0 +1,20 @@
|
||||
大鱼调色 1.3.0(18),适用于 Apple Silicon Mac,最低 macOS 14.6。
|
||||
|
||||
- 输入转换、工作空间、一级调色与输出转换合并到一级调色卡片,移除四个旁路选项;眼睛统一启停。
|
||||
- 一级白平衡迁入原 CST 色轮,保留精细拖动和双击复位,并支持方向键微调。
|
||||
- 从“大鱼调色盘”移植可变蜘蛛盘,支持联动/独立 6、8、12、16、24 点数、固定点、多选、整环/整列和复位,随工程与预设保存,Cube 导出也包含蜘蛛盘。
|
||||
- 默认展开一级调色、蜘蛛盘校色仪、基础调整,其余折叠,所有眼睛打开。折叠与停用分别保存。
|
||||
- 保留旧工程、旧 LUT 和旧预设兼容。198 项正式版原生检查、25 种网格的 204,683 项数学检查通过;FCP 12.4 的键盘调整、菜单撤销/重做、网格密度、默认及保存重开验证通过。
|
||||
|
||||
FCP 自动化坐标鼠标注入未激活远程视图,因此宿主内拖动和双击未确认;原生 AppKit 事件检查已覆盖精细拖动、复位和一次拖动的撤销配对。Motion、Intel 和旧系统未验收。
|
||||
|
||||
安装包包含原生 FxPlug APP 和 FCP 模板,不含用户 LUT、预设或媒体。安装前保存工作并正常退出 Final Cut Pro/Motion。APP 与 PKG 均完成 Developer ID 签名、公证、票据与 Gatekeeper 核验,20 项真实展开验包通过。本轮正式 APP 已完成唯一安装,未重复执行 PKG 安装脚本。
|
||||
|
||||
版本标签:`v1.3.0-spider-balance-20261101`
|
||||
APP 实际编译源码:`c2818cbb1157093f80efd2a85cea0cf1509f565e`
|
||||
APP 公证:`5de714ac-dd28-4d2b-926f-6c0f424d0e5d`,Accepted
|
||||
PKG 公证:`f6b25757-1e6b-4260-9667-5baecce8b3d4`,Accepted
|
||||
|
||||
附件:`大鱼调色-1.3.0.pkg`
|
||||
大小:14,066,399 字节
|
||||
SHA-256:`36c251722d3c9e4aaed8d5a09bf5afd3bf84039e9d1161c63635ab9d8224f506`
|
||||
@@ -0,0 +1,20 @@
|
||||
大鱼调色 1.3.1(19),适用于 Apple Silicon Mac,最低 macOS 14.6。
|
||||
|
||||
- 一级白平衡色轮增加可见的“复位”按钮,只重置本色轮方向和强度;双击复位继续保留。
|
||||
- LUT 缩略图浏览器改用宿主独立浮动窗口,支持系统移动/缩放;增加网格/列表布局和可调整侧栏,保存窗口及布局偏好。宿主会限制最大窗口尺寸。
|
||||
- “最近使用”固定在分类最前,只记录成功应用的 LUT,去重并按最新优先显示,最多保留 40 个;全部和文件夹列表也优先显示最近使用。
|
||||
- 新实例和全部还原的输入默认为 Sony S-Log3 / S-Gamut3.Cine,输出仍为 Gamma 2.4 / Rec.709。
|
||||
- 201 项正式版原生检查、23 项浏览器专项检查和 3,025 项大目录回归通过。FCP 12.4 的默认、可见复位、浮动窗口/系统缩放、布局、最近排序及浏览器关闭重开检查通过。
|
||||
|
||||
自动化未独立确认自由标题栏/边缘拖动;原生隐藏窗口的几何、缩放和持久化检查通过。用户开始使用后保留当前选择与布局,未再次重启宿主。Motion、Intel、旧系统未验收。
|
||||
|
||||
安装包包含原生 FxPlug APP 和 FCP 模板,不含用户 LUT、预设、最近使用记录或媒体。安装前保存工作并正常退出 Final Cut Pro/Motion。APP 与 PKG 均完成 Developer ID 签名、公证、票据和 Gatekeeper 核验,20 项展开验包通过。本轮 APP 已唯一安装,未重复执行 PKG 安装器。
|
||||
|
||||
版本标签:`v1.3.1-browser-recents-20261101`
|
||||
APP 实际编译源码:`dbb7ca4a995ef832178a32f35939aed7d3a85012`
|
||||
APP 公证:`9e93dc7f-04a3-44f9-a1e4-792bd7b31533`,Accepted
|
||||
PKG 公证:`85cad776-c3d7-4037-9643-24041b269002`,Accepted
|
||||
|
||||
附件:`大鱼调色-1.3.1.pkg`
|
||||
大小:14,073,683 字节
|
||||
SHA-256:`954b10c581f31d23a8c417a6f37b24fae19939786dce8733b4d6f09c7ed3adae`
|
||||
@@ -0,0 +1,27 @@
|
||||
大鱼调色 1.4.0(24),适用于 Apple Silicon Mac,最低 macOS 14.6。
|
||||
|
||||
- 十二个模块标题增加“添加蒙版”和“再加一层”。新增工具从初始化参数开始,独立保存参数、开关、折叠、复位、删除、LUT和蒙版;同类HSL可以连续叠加。
|
||||
- 蒙版包括椭圆、矩形、钢笔、线性渐变、HSL和亮度选区,可相加、减去、相交、反转、羽化和调节强度。画面提供轮廓和左侧工具栏,面板可编辑各类型参数。
|
||||
- 从“大鱼调色盘”源码适配Metal光流与仿射跟踪,支持几何蒙版的正向、反向、双向和单帧跟踪,取消保留可信段,一次撤销恢复;单帧完成后移动播放头。
|
||||
- 完整预设v4保留每层工具、蒙版和逐帧轨迹,兼容旧预设。旧float参数和原调色链保留。
|
||||
|
||||
正式版本222项原生检查通过。FCP12.4实测第二HSL初始化为零、红色色相32且原层仍为零,原层椭圆与新增层矩形独立;正向99帧轨迹、双向100帧轨迹、新增层单帧2键及播放头移动通过。一次撤销/重做、正常退出重开后的完整预设均逐字节一致。远端独立恢复210文件,模型/模板和Metal着色器重建一致。
|
||||
|
||||
画面中心拖动已经由用户用实际鼠标确认,原生点击/拖动回调及原层蒙版坐标变化已核对,新增层蒙版坐标保持不变。旋转、缩放和钢笔手势尚未实机确认;原生模拟宿主的真实Metal叠加、命中、拖动提交、一次撤销及Esc检查通过。Motion、Intel、旧系统、变速/裁剪/非方像素工程未实测。
|
||||
|
||||
新增工具标量目前是静态作者值,蒙版轨迹按时间求值。跟踪不含透视、剪切。空间蒙版不能导出为Cube,需保存完整预设。旧模板实例若不显示画面控件,可先保存完整预设,再应用新版效果并载入;不自动覆盖旧效果。
|
||||
|
||||
安装包包含原生FxPlug APP和FCP模板,不含用户LUT、预设、最近使用记录或媒体。安装前保存工作并正常退出Final Cut Pro/Motion。唯一APP位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。APP已正式安装;PKG另做签名、公证、票据、Gatekeeper及展开验包,不重复执行安装器。
|
||||
|
||||
版本标签:`v1.4.0-tool-masks-20261101`
|
||||
APP实际编译源码:`dbf25fe6719f17075362538dad0404951102524d`
|
||||
APP公证:`40fdaaaa-1821-4cc8-bec3-c5dc6d8b9f77`,Accepted
|
||||
|
||||
PKG公证:`da6edea3-11f4-451b-aece-91916cca329a`,Accepted
|
||||
APP和PKG均通过Developer ID签名、票据与Gatekeeper;20项展开验包通过。
|
||||
|
||||
附件:`大鱼调色-1.4.0.pkg`
|
||||
大小:14,250,425字节
|
||||
SHA-256:`16a4958e28bc2a43c40e6131067eb03a49aecba5bbe3c0424bc7024fa532af38`
|
||||
|
||||
安装包明细见本标签的 `verification/Package.json`;实际发布及完整下载校验见后续主分支的 `verification/Release.json`。
|
||||
@@ -0,0 +1,7 @@
|
||||
新增工具现在紧接点击的模块插入,初始化参数独立;旧工程已有的末尾层保留原位置与画面。蒙版检视器扩大文字、数值框和按钮,滑杆分行显示。修复钢笔进入绘制态、实时预览、曲柄、闭合/取消/重画及提示文字方向。
|
||||
|
||||
跟踪参考Color Finale行为独立适配:实际钢笔路径范围、300特征、亚像素精炼、21×21光流,最高3840×2160分析采样。281项原生检查及18项独立CPU/Metal跟踪检查通过。FCP12.4实测相邻插入、独立参数、绘制态与面板、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。
|
||||
|
||||
用户已用实际鼠标确认钢笔“可以绘制并闭合”,放点与闭合验收通过。自动化输入没有进入FCP画面回调,曲柄/删除等其它手势仍以原生OSC模拟检查为据。当前不含Color Finale全部能力,B样条、编组、人物/图像/外部蒙版和完整轨迹区段编辑等尚有差异;未做同一真实视频的完整轨迹等价对照。跟踪不含透视/剪切。详细证据见仓库交接文档和verification/HostMaskWorkflow1.4.1.json。
|
||||
|
||||
版本1.4.1(26),Apple Silicon,macOS14.6起;APP实际编译源码 `0eb56aed126c825ca89712ce90f8cc1c05b03d89`。APP公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326`、PKG公证 `9a5ff448-2ac1-444e-b993-2928cf8c333f` 均Accepted,票据/Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.1.pkg`,14,337,616字节,SHA-256 `0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6`。发行标签保留完整源码和交付记录,APP编译节点与发行记录节点分别列明。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;不含用户LUT、预设或媒体。
|
||||
@@ -0,0 +1,9 @@
|
||||
修复真实素材从中间帧启动跟踪依赖预览缓存的问题,分析首帧直接作为种子。4K细纹低通后按比例缩小至最高1280×720运动分析,调色输出分辨率不变;重新校准运动拟合容差与置信度,保留可信度和错误变换保护。
|
||||
|
||||
失跟显示原因和保留帧数,正常结束宿主后台分析,可立即重新跟踪。修复首帧反向边界互等、带前置片段时单帧定位错误,以及已有相同轨迹的单帧操作不前进问题。
|
||||
|
||||
FCP12.4正式31版实测同一4K60素材在25p时间线中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界与连续前后单帧通过。正常退出冷重开完整预设逐字节一致。正式路径293项原生检查与19项独立CPU/Metal检查通过,源码已从远端独立恢复重建核验。
|
||||
|
||||
区域仿射跟踪不等同人物分割或非刚性描边;遮挡/变形可能需要手工调整后继续。未宣称完整Color Finale能力等价。原工程与用户媒体保留,包内不含用户媒体、预设或LUT。
|
||||
|
||||
版本1.4.2(31),Apple Silicon,macOS14.6起;APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f`、PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` 均Accepted,票据/Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.2.pkg`,14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`。固定正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。发行标签 `v1.4.2-tracking-midpoint-20261102` 另含最终验收和恢复记录,保留全部历史标签及安装包。
|
||||
@@ -0,0 +1,7 @@
|
||||
修复模块折叠时蒙版控件没有一起收起的问题,展开后恢复已有蒙版面板。原模块和独立叠层都遵循自身折叠状态。
|
||||
|
||||
标题栏的蒙版按钮旁新增数量标记;无蒙版时隐藏,已停用的蒙版也计入已添加数量。折叠后数量仍可见,删除和撤销会即时更新,便于辨认哪一层有蒙版。
|
||||
|
||||
正式路径293项既有原生检查通过。FCP12.4验证原模块/独立层分别折叠和展开、2/1数量、删除至0及撤销、保存冷重开;完整预设逐字节一致,用户现有286个轨迹键保留。仅改变布局及标题状态,不修改调色渲染、跟踪算法或数据结构;未另做Motion/Intel实机验收。
|
||||
|
||||
版本1.4.3(33),Apple Silicon,macOS14.6起。APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`;APP公证 `e755670d-8fb3-46d2-95c3-1206f014d16d`、PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` 均Accepted,签名、票据、Gatekeeper和20项展开验包通过。包 `大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,包内不含用户预设、媒体或LUT。历史标签和发行包保留。
|
||||
@@ -0,0 +1,7 @@
|
||||
新增通道混合器:RGB三输出矩阵、保持亮度、保持饱和度和混合强度。新增胶片模拟:减色、晕光、辉光、颗粒、暗角五组,独立启停;颗粒支持固定种子与1–5帧保持。新模块均支持蒙版、区域跟踪、相邻初始化叠层和完整预设保存,既有调色链与旧工程数据保留。
|
||||
|
||||
参考本机Color Finale 2.16.2组件独立实现,产品运行和构建不加载原厂二进制。减色/颗粒接入既有sRGB边界,其余在线性纹理上;本版不含八种ACES印片外观,不承诺原版任意ACES链完全等价。纯矩阵及减色可导出Cube,活跃空间/时间效果或蒙版会提示无法保存为静态Cube。
|
||||
|
||||
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证用户旧234参数、资产路径、蜘蛛盘和287键蒙版载荷保持,新增层/蒙版/折叠及删除撤销重做通过。正式ProRes导出确认颗粒两帧保持,组合与颗粒完整预设冷重开前后逐字节一致,三项目FCPXML回导通过。Motion、Intel未实机验收。
|
||||
|
||||
版本1.5.0(34),Apple Silicon,macOS14.6起。APP实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`;APP公证 `164abf2b-4e67-4504-b72a-04122da9e381`、PKG公证 `05f849da-5567-4351-9556-742d17b95723` 均Accepted,签名、票据、Gatekeeper和20项展开验包通过。包 `大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`。唯一正式APP位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,包内不含用户预设、媒体或LUT。APP已独立安装并在FCP验收;PKG仅展开验包,未再次运行系统安装器。历史标签和发行包保留。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 大鱼调色 1.6.0(39)
|
||||
|
||||
胶片模拟新增“印片”页,包含Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30八种外观与独立强度,默认无。保留现有减色、晕光、辉光、暗角、颗粒、通道混合器、调色、蒙版、跟踪和相邻独立层。完整预设v6兼容v1–v5。
|
||||
|
||||
按用户要求删除MOEF作者/网站两行;输出ozml5.11 / Motion5.4.5格式。FCP新效果、全部还原和新加一级层的自动映射默认开启,主标题新增可点击的“更多插件访问 https://dayu.media”。FCP沿用模板默认的旧主效果也会跟随开启,手动关闭可保存并冷重开保持。
|
||||
|
||||
Apple Silicon,macOS14.6或更新。FCP12.4已验证;旧版FCP尚未实机覆盖,降低模板格式不等于保证所有旧版宿主兼容。
|
||||
|
||||
395项正式原生检查及独立恢复构建通过;四尺寸136项原版印片颜色函数对照通过,最大线性RGB绝对差0.000004828。完成八外观、独立印片层、100键蒙版跟踪、折叠/撤销重做、四段共400帧ProRes导出及冷重开检查。39版三组旧印片预设仅自动映射0→1,其余277值及完整自定义载荷保持;手动关闭/独立层开启的8668字节预设冷重开逐字节一致。
|
||||
|
||||
正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,团队B3W25FX5H5。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`;APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。当前包含正式APP及模板,不含用户媒体、LUT库或预设。安装包20项展开验包通过,本轮未再次运行系统安装器,APP已有独立正式安装及宿主验收。
|
||||
|
||||
安装包 `大鱼调色-1.6.0.pkg`,40,833,847字节;SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`。PKG由Developer ID Installer签名、公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,票据和Gatekeeper通过。
|
||||
@@ -0,0 +1,15 @@
|
||||
# 大鱼调色 1.6.1(44)
|
||||
|
||||
主 APP 改为深色产品介绍界面,发布地址 https://dayu.media 位于顶部。展示完整调色、LUT、胶片和局部蒙版/叠层特色。
|
||||
|
||||
启动自动检查并提交 PluginKit 注册,核对实际内嵌组件路径。成功后在状态卡显示清晰的3→2→1秒倒计时再退出;查看功能介绍可保留窗口。打开 FCP 检查会保留窗口,由用户确认画面和调节后点击“已确认正常,退出”。注册状态与宿主功能确认分开。
|
||||
|
||||
按用户要求关闭外层 APP 沙盒。保留 Developer ID、Hardened Runtime、可信时间戳、公证及票据。本轮未加入登录、授权、加密、自动更新或后端模块,调色/渲染/Metal/模板未改。
|
||||
|
||||
Apple Silicon,macOS14.6或更新。正式安装位置 /Library/Plug-Ins/FxPlug/大鱼调色.app,主/服务ID为com.dayu.color、com.dayu.color.XPC,团队B3W25FX5H5。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。
|
||||
|
||||
正式路径395项原生检查通过;已有登记、缺失登记重建、精确唯一路径回读、3秒退出、保留介绍和重复检查通过。FCP实际使用按主APP指引由用户确认,本说明不将登记成功等同渲染验收。安装包已展开核验,本轮未再次运行系统安装器。
|
||||
|
||||
APP公证23d7b69c-5585-435d-ad07-faee061e0ccb Accepted;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted。最终PKG由Developer ID Installer签署,签名、票据及Gatekeeper通过。
|
||||
|
||||
安装包 大鱼调色-1.6.1.pkg,40,854,422字节;SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`。包含正式APP和既有FCP模板,不含用户媒体、LUT库或预设。
|
||||
@@ -0,0 +1,19 @@
|
||||
# 大鱼调色 1.7.0(45)公测
|
||||
|
||||
加入主 APP 自动更新检查与云端公测诊断。启动时并行检查插件注册和新版本;注册成功且检查结束后显示3秒退出倒计时,发现更新则保留窗口。完整 PKG 更新由用户确认下载,验证 SHA-256、大小、签名团队、公证评估、产品/版本/安装位置及 FCP 模板;保存并退出 FCP/Motion 后打开系统安装器。
|
||||
|
||||
公测诊断默认开启,可在主 APP 随时关闭。主 APP 与插件共用随机报告标识,后台限量排队、离线重试、事件去重。采集版本和系统环境、插件/检查器/Metal 管线/首次渲染耗时、错误代码、疑似阻塞及本插件崩溃摘要;不上传素材、LUT、预设、账号、硬件 UUID、用户路径或原始崩溃文件。云端保留30天,管理页面需管理员登录。
|
||||
|
||||
本轮用于收集偶发 FCP 加载卡死证据,保留既有调色及宿主回调逻辑,未宣称修复卡死。暂未加入登录、授权或业务加密模块。共享会员后台不变,公测使用独立产品路由与日志表。主 APP 启动时检查更新,插件使用期间不会自动替换正在运行的组件。
|
||||
|
||||
要求 Apple Silicon、macOS 14.6 或更新。固定安装位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;主/插件 ID 为 `com.dayu.color`、`com.dayu.color.XPC`。APP 实际编译源码 `a0f37578f73d7f8faa872d9a81009e2d6586a858`。Metal 与模板 SHA 与1.6.1一致。
|
||||
|
||||
395项原生检查通过;正式路径 UI、诊断关闭/恢复/手动发送、3秒退出、FCP 12.4 界面与曝光调整/还原通过,云端已实际收到插件首次渲染记录。另有66项更新/隐私/完整签名安装包检查、20项后端契约检查,以及线上接收与去重验证。单次本机加载正常不能证明偶发卡死已经解决。
|
||||
|
||||
APP 公证 `777a5c05-4936-4b14-b8e8-0c789c1df05c` Accepted;PKG 公证 `04082e26-663d-4408-85da-63736d079aa2` Accepted;签名、票据、Gatekeeper 和展开验包通过。本轮正式 APP 已直接安装及宿主验收,PKG 已验包,未重复执行系统安装脚本。
|
||||
|
||||
发行包 `大鱼调色-1.7.0.pkg`,40,898,751字节;SHA-256 `a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb`。
|
||||
|
||||
公测下载:https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg
|
||||
|
||||
日志后台:https://dayu.media/wp-admin/tools.php?page=dayu-color-beta (管理员)。反馈用户可附主 APP 显示的报告标识和发生时间,便于关联同一次加载过程。
|
||||
+2
-2
@@ -76,8 +76,8 @@ def main():
|
||||
appearance=dict(title="大鱼调色", subtitle="适用于 Final Cut Pro 与 Motion 的原生调色效果",
|
||||
badgeImage=str(ROOT / "design/dayu-color-app-icon-v1.png"), authorContact="https://dayu.media"),
|
||||
pages=dict(welcome="安装大鱼调色 " + version + ",包含原生 FxPlug 调色插件和 Final Cut Pro 效果入口。",
|
||||
readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。",
|
||||
license="", conclusion="大鱼调色已安装。请完成插件 APP 的系统提示,随后退出并重新打开 Final Cut Pro / Motion。\n如果效果未出现,可在访达打开 /Library/Plug-Ins/FxPlug/大鱼调色.app 后再次启动宿主。"))
|
||||
readme="系统要求:macOS 14.6 或更高版本。本发行构建适用于 Apple Silicon Mac。\n\n安装内容:\n/Library/Plug-Ins/FxPlug/大鱼调色.app\n登录用户“影片/Motion Templates/Effects/大鱼调色”中的效果模板与预览图。\n\n重新打开 Final Cut Pro 后,在“效果 → 大鱼调色”中应用;Motion 中可选择原生滤镜。\n本安装包不包含用户自选 LUT、预设或媒体文件。\n\n公测诊断默认开启,可在主 APP 关闭。仅发送版本、系统环境、加载耗时与本插件错误摘要到 dayu.media;不发送素材、预设或账号,保留30天。主 APP 启动时检查更新,新版由用户确认安装。",
|
||||
license="", conclusion="大鱼调色已安装。主 APP 自动注册插件,成功后显示3秒倒计时退出。可点击“打开 FCP 检查”保留窗口,并在宿主中实际检查效果。"))
|
||||
manifest_path = CACHE / "dayu-color-package-manifest.json"
|
||||
manifest_path.write_text(json.dumps(manifest, ensure_ascii=False, indent=2) + "\n")
|
||||
command = ["/usr/bin/python3", str(skill / "package_fxplug.py"), "--repo", str(forge), "--manifest", str(manifest_path)]
|
||||
|
||||
@@ -1,51 +1,108 @@
|
||||
# 大鱼调色
|
||||
|
||||
原生 FxPlug 4 调色器。主方案为 **Wrapper Application**,包含独立 XPC 插件,正式安装在 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。
|
||||
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.1(44)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
|
||||
支持 17 种相机输入转换、自选输入 LUT、基础光影、白平衡、局部增强、肤色保护、五层风格 LUT、RGB 曲线、8 色与自定义 HSL、四个色轮、三原色、色阶、黑白和色彩平衡。包含自动调色、复制时自动分析、系统吸管、JSON 预设和 Cube 导出。
|
||||
交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
- [分析与范围](research/ANALYSIS.md)
|
||||
- [Color Finale 移植研究与算法来源](research/ALGORITHM_SOURCES.md)
|
||||
- [恢复、依赖与正式交付](RECOVERY.md)
|
||||
- [GPU 数学来源与验证](tools/kernels/README.md)
|
||||
- [正式安装记录](verification/Delivery.json)
|
||||
- [LUT 后台加载的 FCP 验收](verification/HostLUTLoading.json)
|
||||
- [N12 外部 LUT 导入与应用验收](verification/HostExternalLUT.json)
|
||||
- [外部 LUT 问题定位及回归](verification/ExternalLUTActivation.json)
|
||||
- [LUT 编码兼容与回归](verification/LUTEncoding.json)
|
||||
- [混合编码 LUT 的 FCP 验收](verification/HostLUTEncoding.json)
|
||||
- [LUT 加载响应压力测试](verification/LUTResponsiveness.json)
|
||||
- [程序图标与插件缩略图验收](verification/BrandAssets.json)
|
||||
- [分组展开与启用验收](verification/HostGroupFolding.json)
|
||||
- [主题与 LUT 库的 FCP 验收](verification/HostThemeLUT.json)
|
||||
- [早期调色链的 FCP 验收](verification/Host.json)
|
||||
主 APP 已改为深色产品介绍界面,发布地址置顶;启动自动注册并回读系统登记,成功后在状态卡显示3秒倒计时退出。查看介绍或打开FCP检查可保留窗口;FCP中的实际效果由用户确认。外层沙盒按用户要求关闭,登录、授权、加密、自动更新及后端暂未接入。见[本轮说明](research/MainApp1.6.1.md)与[主APP验证](verification/MainApp1.6.1.json);后续账号工作仍参考[原交接](大鱼调色主APP开发交接.md)。
|
||||
|
||||
当前正式版本为 1.1.5(16),交付标签 `v1.1.5-lut-encoding-20261101`。所有调色分组统一为展开即启用、折叠即停用;新建实例与全部还原只展开基础调节。折叠保留参数和 LUT 路径,重新展开继续使用;打开已保存的调色时按各组实际启用状态展开。基础调节同时控制其光影、白平衡与颜色子组。
|
||||
## 胶片模拟与通道混合器
|
||||
|
||||
程序图标与 FCP 缩略图采用统一的光谱鱼。两张原始生成图及提示词保存在 `design/`;运行 `python3 tools/build_brand_assets.py` 使用 macOS 工具导出 ICNS、640×360 与 240×135 的效果预览。
|
||||
新增可重复的胶片模拟和通道混合器,现有调色、蒙版、区域跟踪和相邻叠层保留。每个新工具都有独立眼睛、折叠、复位、蒙版、数量标记和“再加一层”;新增层从默认值开始。
|
||||
|
||||
主题与 LUT 浏览库自 1.1.0(6)提供,源码标签 `v1.1.0-theme-lut-20261031`。灰、蓝、紫、绿、橙五套主题切换后跨实例记忆。风格 LUT 左侧网格按钮打开缩略图浏览器,右侧文件夹按钮打开 `~/Movies/大鱼调色LUT/look LUTs`。可导入文件或目录,按目录与名称过滤,单击应用,缩略图大小与目录会保存。
|
||||
通道混合器按红、绿、蓝输出分组,每个输出有三个输入系数,并提供保持亮度、保持饱和度和混合强度。胶片包含减色、晕光、辉光、颗粒、暗角五组,各自启停;颗粒支持精确帧时间、1–5帧保持和固定种子。默认保持中性,旧工程缺省不改变画面。
|
||||
|
||||
缩略图使用当前素材先经过输入 LUT 的画面;没有源帧时显示本产品生成的色卡。显示方向与宿主图像原点一致,自动分析保留自己的原始数据。浏览器优先采用 FxPlug 宿主窗口,不能使用时回退为锚定弹出面板。品牌保留大鱼,吸管仍为系统取色器。
|
||||
本机Color Finale 2.16.2的相关数学已单独取证并对照,产品独立构建,不加载原版APP或原版二进制。新阶段位于既有显示域链之后;减色/颗粒沿用本工程sRGB边界,其余在线性域。活跃减色沿用原核的0–1限幅;不宣称与原版全部ACES管理路径完全等价。1.6.0追加第六页“印片”:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,支持独立强度,默认“无”。以明确的Rec.709线性↔AP1/ACEScct边界接入原版LMT颜色函数;不代表原版完整CMS/ODT链。
|
||||
|
||||
算法背景资料补充了同系列工程的 **Color Finale 移植研究**,涵盖调色工具、LUT 预览、图层与蒙版工作流;归档记录、适用范围及当前实现的来源区分见 [算法说明](research/ALGORITHM_SOURCES.md)。Camera Raw 查表数据与组合行为采用 Compositor 的 MIT 许可实现,许可证随资源保留。
|
||||
完整预设升级为v6,兼容v1–v5。纯通道矩阵、减色和印片可导出Cube;活跃晕光、辉光、颗粒、暗角和蒙版不能保存为静态Cube,导出时说明原因。
|
||||
|
||||
`大鱼调色/Plugin` 保存模型、AppKit 检查器、IOSurface/Metal 渲染与 CPU 查表;`tools/kernels` 保存可重建的 GPU 数学文本;`template` 是 FCP 效果入口。正式构建使用仓库中的源码和资源。
|
||||
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证旧234参数、LUT路径、蜘蛛盘和全部287键蒙版载荷不变;新增层默认值、蒙版数量、折叠、删除撤销/重做、冷重开通过。1920×1080正式导出验证“两帧保持”,组合预设8987字节及颗粒预设8420字节重开前后逐字节一致。见[研究与边界](research/ColorFinaleFilmMixer.md)、[组件对照](verification/FilmMixerReference.json)、[宿主验收](verification/HostFilmMixer1.5.0.json)。
|
||||
|
||||
选择自有 LUT 后,预设记录其绝对路径;跨机器搬移时同时保留 LUT 文件并重新选择。LUT 导出只保存逐像素颜色,不包含纹理、清晰度或逐画面分析。
|
||||
FCP新实例、全部还原及新加一级层的自动色调映射默认开启;旧独立一级层的缺省关闭保持;FCP沿用模板默认值的旧主效果会跟随为开启,新版中手动关闭后可独立保存并在冷重开后保留。在主标题区增加可点击的“更多插件访问 https://dayu.media”。
|
||||
|
||||
`tools/create_lut_host_fixture.py` 可重建独立 FCP 验收 XML 和四个合成测试 LUT;它只写产品缓存,不会向用户库自动导入。LUT 核心检查见 `verification/LUTLibrary.json`,主题与浏览库实现说明见 `research/ThemeLUT-analysis.md`。
|
||||
## 1.6.0 八种印片与简洁模板
|
||||
|
||||
`tools/create_group_fold_host_fixture.py` 可创建独立的合成验收时间线,用于检查新实例仅基础调节默认启用、分组展开/折叠与数值保留。风格 LUT 总组停用会旁路全部五层;停用的输入或风格 LUT 不加载其文件。
|
||||
正式安装395项原生检查和四尺寸136项原版印片颜色函数对照通过,最大线性RGB绝对差0.000004828。FCP12.4逐个选择八种外观、独立印片层、100帧椭圆蒙版跟踪、折叠计数、删除/撤销/重做通过;彩色、黑白、蒙版叠层三段ProRes共300帧完整解码,黑白RGB通道完全一致。八外观候选36冷重开后8474、8456、32554字节三份预设分别逐字节一致;八外观候选36升级时276个用户参数及既有路径/蜘蛛盘/蒙版载荷保持;最终39版三组预设仅自动映射默认0→1,其余277项值及全部载荷保持。
|
||||
|
||||
LUT 文件夹扫描、逐项校验/复制和选择文件后的解析均在后台执行;导入期间可继续搜索、滚动和选择,刷新按钮临时变为“取消”。失败或取消会移除本次新复制的文件并保留既有库。目录与缩略图只为可见范围创建控件,预览逐项出现;快速切换时仅应用最后一次选择。24个65级合成LUT与3,025项库的响应测试见 [LUTResponsiveness.json](verification/LUTResponsiveness.json)。
|
||||
按用户要求移除MOEF作者和网站两行,已有实例与新实例均已确认。模板采用真实原生样本支持的ozml5.11 / Motion5.4.5格式,保留自定义检查器和混合。FCP12.4加载和渲染通过;低版本FCP未实机测试,程序仍要求Apple Silicon / macOS14.6或更新。全局技能检查器不支持5.11,原始guard报告保留;项目原生字段验证与宿主验收分别记录。
|
||||
|
||||
1.1.4 修复外部 Cube 的旧编码标题导致整批导入失败:标题、注释兼容旧编码,尺寸和数值仍严格校验,报错包含文件名。点击缩略图时先在后台解析并准备 GPU 纹理,宿主接受后才确认选择;已选表独立保留,不受缩略图缓存淘汰影响。用户提供的 N12 目录 26 个 LUT 已全部导入、生成缩略图并完成 Metal 渲染,FCP 中两份“青橙色”、64 级 LUT、快速切换和保存重开通过。用户 LUT 不进入源码或安装包。
|
||||
见[印片来源与适配](research/PrintLooks1.6.0.md)、[原版对照](verification/PrintLooksReference.json)、[正式宿主验收](verification/HostPrintLooks1.6.0.json)、[模板兼容验证](template/verification/Compatibility.json)。
|
||||
|
||||
1.1.5 增加整份 Cube 的 UTF-16/UTF-32 大小端、有无 BOM 识别,在后台转换工作副本,保留导入文件的原始字节。支持常见换行及 Unicode 空白,标题、注释继续兼容 ASCII 指令下的旧编码。16 份 UTF-8/16/32 与 GB18030、Big5、Shift JIS、Windows-1252、MacRoman、ISO-8859-1 样本已在 FCP 中全部导入、预览和逐项应用,无 BOM UTF-32 保存重开通过。损坏的编码、非法数字仍会报错,不使用有损转码猜测颜色值。
|
||||
## 蒙版折叠与标题标记
|
||||
|
||||
正式 PKG 打包使用 PKG 工坊源码中的 `pkg-forge` 技能。运行 `python3 Packaging/build_pkg.py --pkg-forge-repo /实际/PKG工坊源码目录`,默认输出到上级“发行包”目录;先使用 `--prepare-only` 可只检查清单。打包使用已验证的正式 APP,并从相同 APP 资源中核对、整理 FCP 模板与缩略图,不重签或重建调色 APP。生成包将要求正常退出四种 FCP/Motion 宿主并在登录用户会话验证注册;签名公证和真实展开验包由该技能的原打包器与校验器完成。已有同名版本包不会覆盖。
|
||||
蒙版面板随所属模块一起折叠,展开后恢复已有控件。标题栏蒙版按钮旁显示已添加的蒙版数量,无蒙版时隐藏标记;原模块与独立叠层分别计数,已停用的蒙版也计入数量。标记在折叠后仍可见,不改变蒙版和轨迹。
|
||||
|
||||
当前正式安装包:[大鱼调色-1.1.5.pkg](../发行包/大鱼调色-1.1.5.pkg),包含1.1.5(16)正式APP及相同版本的FCP模板/预览图;本机Apple Silicon,最低macOS14.6。签名、公证与20项真实展开验包记录见 [Package.json](verification/Package.json)。本轮没有重复执行系统安装;包内APP与已验收的正式安装逐字节一致。
|
||||
1.4.3正式路径293项既有原生检查通过;FCP12.4验证原模块、独立层、删除到零/撤销、折叠后数量标记及冷重开,完整预设逐字节一致。当前用户设置中的286个轨迹键保留。见[本轮宿主验收](verification/HostMaskFolding1.4.3.json)。
|
||||
|
||||
正式包已保存到[1.1.5 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.1.5-lut-encoding-20261101),完整下载核对大小与 SHA-256 通过。运行 `python3 Packaging/publish_release.py --tag v1.1.5-lut-encoding-20261101 --notes Packaging/Release-1.1.5.md` 可复用 PKG 技能核对同一附件;不会重复上传。安装包不进入普通 Git,发布记录见 [Release.json](verification/Release.json)。
|
||||
## 1.4.2 跟踪修复
|
||||
|
||||
中间帧启动直接使用宿主分析首帧,预览缓存缺失或陈旧不会阻止开始。真实素材的细纹运动采样和拟合容差已调整,仍保留可信度与错误变换保护。失跟说明原因与保留帧数;正常取消标记结束宿主后台任务。单帧跟踪会把源时间转换到时间线位置,支持片段前有其它内容时连续操作。
|
||||
|
||||
1.4.2的293项原生检查和19项独立CPU/Metal跟踪检查通过。该版FCP12.4实测同一4K素材中间双向285键、首帧正向285键;取消后重启、失跟后连续重试、边界停止与连续单帧通过,后台任务正常闲置。正常退出冷重开后完整预设逐字节一致。APP已公证、粘附票据并安装;安装包与Release结果见对应版本验证记录。用户媒体、预设和项目快照只保存在本机。
|
||||
|
||||
## 色彩管理与一级调色
|
||||
|
||||
前段已改为 **输入转换 → 工作空间一级调色 → 输出转换**,复用大鱼 CST 仓库的固定源码与原生 GPU 数学。曲线和色域独立选择,工作空间统一供一级调色及输出使用,不经相机还原 LUT 近似。
|
||||
|
||||
新实例输入为 Sony S-Log3 / S-Gamut3.Cine,输出为 Gamma 2.4 / Rec.709,工作空间为 DaVinci Intermediate / DaVinci Wide Gamut,自动色调映射默认开启。请按素材实际编码选择相机输入;不会根据片段或曲线名称猜测、覆盖手选色域。一级调色包含曝光、色彩平衡、饱和度、对比度与轴心、分区影调、黑白点、趾部/肩部压缩。输入、工作空间和输出已合并到一级调色卡片,四个旁路选项移除,由一级眼睛统一启停。一级白平衡改用原 CST 色轮,支持精细拖动、方向键微调、双击复位,以及可见的“复位”按钮;按钮只重置一级白平衡。
|
||||
|
||||
CST 后的基础调整、HSL、曲线、色轮、五层风格 LUT 等仍属于既有显示域调色链。保留肤色保护、三原色、色阶、黑白、自动调色、吸管、预设和 Cube 导出。Cube 导出包含 CST、一级调色(含白平衡色轮)、蜘蛛盘及其它已启用的逐像素颜色操作。折叠不影响导出,眼睛关闭的模块不计入;纹理、清晰度、去朦胧和逐画面统计不写入 LUT。导出为 33³ Cube,应应用于与导出时相同编码的输入,避免重复叠加 CST/一级处理。
|
||||
|
||||
旧工程的输入 LUT / 相机档位和原画面保持兼容;在一级调色中看到“旧版输入 → 改用 CST”时,可明确切换。编辑 CST 参数也会启用新链路。旧参数 ID、LUT 路径与预设读取保留。
|
||||
|
||||
## 模块界面
|
||||
|
||||
新实例和“全部还原”默认展开 **一级调色、蜘蛛盘校色仪、基础调整**,其余折叠,所有眼睛开启。标题只控制展开;眼睛只负责启用/停用,两者分别保存,正常重开仍保留。折叠保留参数、LUT 选择和效果。黑白混合默认 0%,避免全眼睛开启时直接变成黑白。
|
||||
|
||||
蜘蛛盘直接移植“大鱼调色盘”的可变网格与数学,默认联动 6×6;支持 6/8/12/16/24 点数、独立两轴、固定点、多选、整环/整列和复位,随工程与预设保存。中性盘精确直通。
|
||||
|
||||
LUT 缩略图浏览器使用宿主的独立可调整窗口:拖动标题栏移动,拖动窗口边缘调整大小;文件夹与预览之间的分隔条可调整侧栏宽度,底部可切换网格/列表和缩略图大小。位置、大小、布局与分类按库记忆,宿主可能限制最大窗口尺寸。“最近使用”固定在分类首位,仅在成功应用后记录、去重并按最新优先显示,保留最多 40 个;当前文件夹和全部列表也优先显示最近使用项。旧版已保存的当前 LUT 可在首次打开时作为历史起点,不虚构旧版未记录的其它历史。
|
||||
|
||||
五套主题跨实例记忆。风格 LUT 网格打开缩略图浏览库;用户库为 `~/Movies/大鱼调色LUT/look LUTs`。后台扫描、导入、解析、预览、取消和最后一次选择生效的机制保留;支持既有 UTF-8/16/32 与旧编码 Cube 兼容。用户文件不进入源码或安装包。
|
||||
|
||||
## 每工具蒙版与再次添加工具
|
||||
|
||||
十四个模块标题均有“添加蒙版”和“再加一层”。新增工具紧接点击的原工具或新增工具插入,从本工具的初始化参数开始,拥有独立启停、折叠、复位、删除、LUT 和蒙版;不会复制原层当前设置。新增一级采用 Rec.709/Gamma 2.4 同域输入输出,新增肤色保护强度为零。
|
||||
|
||||
蒙版包括椭圆、矩形、钢笔、线性渐变、HSL 和亮度选区,支持相加、减去、相交、反转、羽化和强度。矩形、椭圆和闭合钢笔区域可正向、反向、双向或单帧跟踪。算法从“大鱼调色盘”固定源码适配,随本产品独立构建;不依赖安装父插件。完整预设 v6 保存新增工具、蒙版和逐帧轨迹,兼容旧预设。空间蒙版不能导出到 Cube,导出时会提示。
|
||||
|
||||
蒙版检视器采用13pt参数文字和数值、32–36pt按钮、独立整行滑杆及两列跟踪操作。钢笔菜单直接进入绘制态,可点击放点、拖出曲柄、点首节点/Return/“完成绘制”闭合,Esc/取消保留原路径;支持重画、Delete回退和即时预览。跟踪改进实际路径搜索边界、300点特征、亚像素精炼和21×21光流,运动分析按显示比例限制到1280×720,4K细纹先低通再缩小,调色渲染和输出分辨率保持原设置。
|
||||
|
||||
1.4.1的281项原生检查、独立CPU/Metal跟踪18项通过。FCP实测相邻插入、初始化与独立参数、大号面板、绘制态切换、钢笔蒙版正向99键、一次撤销/重做及保存重开完整预设一致。画面提示文字方向已修正。用户随后用实际鼠标确认“可以绘制并闭合”,钢笔放点和闭合实机验收通过;自动化输入未进入OSC回调,曲柄/删除等其它手势仍以原生模拟宿主检查为据。1.4.0的中心拖动已有用户确认。新增工具标量仍为静态值,蒙版轨迹按时间求值,跟踪不含透视/剪切。
|
||||
|
||||
旧schema1末尾层保持原保存位置与渲染,避免改变旧工程外观;新添加的层使用schema2插入锚点。原生固定模块的既有处理顺序保留。当前实现参考本机Color Finale的行为和参数独立适配,并非全部功能完整移植;B样条、编组、人物/图像/外部蒙版及完整轨迹区段编辑等差异见专项清单。
|
||||
旧模板实例可能保留关闭画面控件的状态;可先保存完整预设,再重新应用新版效果并载入预设。不会自动覆盖旧实例。实现与验收边界见 [实现说明](research/ToolMaskImplementation.md)、[宿主记录](verification/HostToolMasks.json) 和 [恢复核验](verification/ToolMaskRecovery.json)。
|
||||
|
||||
## 验证与恢复
|
||||
|
||||
- [本轮交接](大鱼调色FxPlug4交接.md)
|
||||
- [当前正式路径原生检查](verification/InstalledSelfTest.json)
|
||||
- [中间帧与真实素材跟踪修复](research/TrackingMidpoint1.4.2.md)
|
||||
- [跟踪宿主验收](verification/HostTrackingMidpoint1.4.2.json)
|
||||
- [跟踪源码独立恢复](verification/TrackingMidpointRecovery.json)
|
||||
- [插入、钢笔和跟踪工作流](research/MaskWorkflow1.4.1.md)
|
||||
- [1.4.1 FCP验收及用户实际钢笔确认](verification/HostMaskWorkflow1.4.1.json)
|
||||
- [Color Finale对照和未迁移范围](research/ColorFinaleMasksFollowup.md)
|
||||
- [1.4.1远端源码独立恢复](verification/MaskWorkflowRecovery.json)
|
||||
- [每工具蒙版、跟踪、保存重开与用户实际拖动](verification/HostToolMasks.json)
|
||||
- [1.4.0 发行标签独立恢复](verification/ToolMaskReleaseRecovery.json)
|
||||
- [CST 来源与集成边界](research/CSTIntegration.md)
|
||||
- [CST 固定源码节点与摘要](research/CSTIntegration.json)
|
||||
- [蜘蛛盘与色轮来源和适配](research/SpiderAndBalanceIntegration.md)
|
||||
- [1.3.1 的 201 项原生与独立像素对照](verification/BrowserNative.json)
|
||||
- [浏览器布局与最近使用专项检查](verification/BrowserCustomization.json)
|
||||
- [大规模 LUT 加载与取消回归](verification/BrowserRegression.json)
|
||||
- [204,683 项网格数学检查](verification/SpiderMath.json)
|
||||
- [正式 FCP 界面与保存重开](verification/HostBrowserAndReset.json)
|
||||
- [正式安装与公证](verification/Delivery.json)
|
||||
- [远端独立恢复与着色器重建](verification/BrowserRecovery.json)
|
||||
- [完整恢复说明和历史](RECOVERY.md)
|
||||
- [原有算法来源](research/ALGORITHM_SOURCES.md)
|
||||
|
||||
构建使用 `Wrapper Application` 方案、Release。运行 `python3 tools/deliver.py` 完成签名、公证、唯一安装和正式宿主验收;更改模型后运行 `python3 tools/build_template.py --refresh-model --overwrite`。`tools/create_browser_host_fixture.py` 重建独立合成验收 XML,不写用户 LUT 库。
|
||||
|
||||
正式发行包由 PKG 工坊技能生成,包含 APP 与 FCP 模板,不含用户 LUT、预设或媒体。安装与发布证据分别保存在 [Package.json](verification/Package.json) 和 [Release.json](verification/Release.json);以其中记录的版本和成功状态为准。
|
||||
|
||||
当前发行包:[大鱼调色-1.6.1.pkg](../发行包/大鱼调色-1.6.1.pkg),主APP与注册验证见[1.6.1记录](verification/MainApp1.6.1.json)。 [1.6.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102)已发布(Release374 / 附件19),草稿和正式链接完整下载均核对40,854,422字节和SHA-256一致;发行标签304文件逐字节独立恢复、102个APP/工程文件与实际编译节点一致,已清理本轮生成副本。FCP实际使用已由用户于2026-11-02明确确认正常,见[用户验收记录](verification/HostUserConfirmation1.6.1.json)。历史发行包:[大鱼调色-1.6.0.pkg](../发行包/大鱼调色-1.6.0.pkg)。当前安装、公证、验包与Release下载结果分别以[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)为准。[1.6.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102)已发布(Release373 / 附件18),草稿正常浏览器下载和发布后完整下载均校验40,833,847字节及SHA-256一致。标签296个文件远端逐字节恢复核验通过,本轮恢复/下载及生成APP副本已清理,见[标签恢复](verification/PrintLooksReleaseRecovery.json)与[清理记录](verification/PrintLooksCleanup.json)。历史[1.5.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102)及更早标签和发行包保留。
|
||||
|
||||
1.3.1 的历史验收包含 Sony 默认、可见复位、浮动浏览器、系统窗口缩放、两种布局、最近排序与关闭重开。原生检查单独覆盖几何/布局持久化和鼠标事件;当时自动化没有独立确认自由标题栏/边缘拖动。1.4.0 另在独立合成工程中完成上文的宿主检查,用户确认中心拖动后保留其试调状态。
|
||||
+161
-2
@@ -1,10 +1,143 @@
|
||||
# 大鱼调色恢复说明
|
||||
|
||||
当前交接:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
|
||||
|
||||
## 当前1.6.1(44):主 APP 界面与自动注册
|
||||
|
||||
远程 https://dayu.media/git/dayu/dayu-color.git ,main。实际编译源码 `90d6022520c59ea34f42b511daee85ac2936cfd9`,签名团队B3W25FX5H5,唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。主/服务Bundle ID维持com.dayu.color、com.dayu.color.XPC,Apple Silicon / macOS14.6或更新。Xcode27.1、FxPlugSDK4.3.5;无LFS或子模块。
|
||||
|
||||
主界面、显式注册、精确路径回读和3秒倒计时通过;独立用户FCP确认单独记录,不把登记当作渲染验收。调色/Metal/模板未改,395项正式原生检查通过。证书、私钥和公证凭据需独立恢复,不在Git中;准备本机签名身份与profile后用tools/deliver.py进行Release构建和正式交付。
|
||||
|
||||
通过克隆仓库并 `git switch --detach 90d6022520c59ea34f42b511daee85ac2936cfd9` 可恢复实际编译节点;`verification/Delivery.json`、MainApp1.6.1.json、MainAppRecovery1.6.1.json分别记录安装、UI/登记及远端恢复。正式PKG `大鱼调色-1.6.1.pkg`,40,854,422字节,SHA-256 `d075373d672b8f0146b98f3151c9f74cd6b97e8a1081e0d0796f53af7f291da0`;PKG公证7315225d-a350-4c65-9e87-5784035ea018 Accepted,20项展开检查通过。未再次执行系统安装器。发行标签 `v1.6.1-main-app-20261102` 对应完整提交 `5d9a4ad7072c1d30f9f8d589719939e2efbcd53c`,[Release374](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.1-main-app-20261102) / 附件19已发布;正常浏览器草稿下载及发布后的完整下载均核对大小、SHA-256一致,附件URL见verification/Release.json。独立恢复304文件逐字节核对、full/strict fsck通过,102个APP/工程文件与实际编译节点90d6022520c59ea34f42b511daee85ac2936cfd9一致。临时回滚APP、下载和恢复副本已清理,历史发行包及用户QA资料保留,见MainAppCleanup1.6.1.json;FCP实际使用已由用户于2026-11-02明确回复“已确认正常”,详见verification/HostUserConfirmation1.6.1.json;APP、安装包及发行标签未改变。
|
||||
|
||||
## 历史1.6.0(39):八种印片、低版本模板与默认映射
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,main;发行标签 `v1.6.0-print-looks-20261102`。APP实际编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted。APP和内部XPC固定ID、唯一正式路径与签名团队不变。正式395项自检、独立原版136项印片对照、FCP12.4八外观/叠层/蒙版100键跟踪/三个完整导出与冷重开通过,见 `verification/HostPrintLooks1.6.0.json`。
|
||||
|
||||
完整八份65³印片数据、独立导入器、原生Metal/CPU采样和矩阵均在Git,无LFS/子模块;恢复不依赖ColorFinale安装或REA缓存。完整旧1296字节GPU前缀保留,预设v6读取v1–v5,新参数缺省中性。原版CI半透明链与产品预乘合同的适配边界保存在 `research/PrintLooks1.6.0.md` 和完整对照报告中。
|
||||
|
||||
FCP新效果、全部还原和新加一级层自动映射默认开启。宿主参数保留历史注册默认0,新MOEF显式value1/default0,保持原生参数存储合同;新一级层显式保存1,旧独立层缺省0。FCP沿用模板默认的旧主效果实测也采用开启,三份旧预设仅此默认0→1,其余277值及所有自定义载荷保持;不宣称模板默认改变后旧主效果完全逐字节不变。手动关闭后冷重开保持。主标题可点击“更多插件访问 https://dayu.media”。
|
||||
|
||||
MOEF去掉作者/网站Rig,输出5.11 / Motion5.4.5,有真实本机模板字段证据。全局技能检查器仅因不识别5.11停止,未伪造通过;项目级验证及当前FCP12.4加载/渲染通过。旧FCP未实机验证,APP最低Apple Silicon/macOS14.6。恢复执行 `python3 tools/build_template.py --overwrite` 和 `python3 tools/verify_template.py`;固定发布模板与正式安装资源逐字节一致。
|
||||
|
||||
远端编译节点已独立恢复294文件、全字节比较、full/strict fsck、Release构建和393检查;低版本模板重建摘要完全一致,见 `verification/PrintLooksRecovery.json`。最终标签恢复与安装包Release下载见 `verification/PrintLooksReleaseRecovery.json` / `Release.json`。用户完整预设、FCP资源库和导出仅在本机fcp-qa缓存,不在Git或PKG。PKG仅生成并展开验包,未再次执行系统安装器;正式APP已有独立安装和宿主验收。
|
||||
|
||||
恢复新机器时正常登录大鱼站取得相同权限凭据,克隆后 `git switch --detach <所需完整提交SHA>`,按Xcode/FxPlug SDK构建。签名证书和私钥须独立恢复,Git不能替代;当前证据以发布记录的标签SHA和编译SHA为准。
|
||||
|
||||
## 历史1.5.0(34):胶片与通道混合器
|
||||
|
||||
正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Bundle ID `com.dayu.color` / `com.dayu.color.XPC`。实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`;APP公证 `164abf2b-4e67-4504-b72a-04122da9e381` Accepted,签名、票据和Gatekeeper通过。安装与启动从唯一正式位置执行,FCP12.4已验收,记录见 `verification/Delivery.json` 与 `verification/HostFilmMixer1.5.0.json`。
|
||||
|
||||
主分支远程 `https://dayu.media/git/dayu/dayu-color.git`,无LFS或子模块。新增胶片与RGB混合的全部源码、Metal、参数/模板均在仓库,不依赖本机Color Finale、REA缓存或父工程。42个参数追加,944字节GPU前缀和1104字节旧版完整前缀保持。恢复时使用固定标签/提交,证书与私钥须单独恢复,不能由Git替代。
|
||||
|
||||
远端独立clone已完成Release构建及349项检查,四种尺寸原版组件对照184项通过。组件证据、域/顺序及限制见 `research/ColorFinaleFilmMixer.md`。当前用户媒体、完整预设、FCP资源库和验收导出只在本机,不进入仓库或安装包。安装包与Release元数据见本轮Package/Release记录。
|
||||
|
||||
正式PKG `../发行包/大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`;PKG公证 `05f849da-5567-4351-9556-742d17b95723` Accepted,签名、票据、Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装和宿主验收。发行标签 `v1.5.0-film-mixer-20261102` 对应 `85b6590944c4fb64825cf45f61c5280d4ffaa824`;[Release372](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102) / 附件17已经草稿正常网页下载及发布后完整下载,大小与SHA-256一致,仓库可见性不变。远端发行标签264文件逐字节核对及full/strict fsck通过,见 `verification/FilmMixerReleaseRecovery.json`;该标签与完成Release构建及349项检查的恢复节点之间,程序源码未改变,仅交付脚本的失败诊断记录改进及文档/验证记录更新。恢复clone、独立构建目录和下载副本已清理,唯一正式APP及历史安装包保留,见 `verification/FilmMixerCleanup.json`。
|
||||
|
||||
## 历史 1.4.3(33):蒙版折叠与数量标记
|
||||
|
||||
当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。
|
||||
|
||||
修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。
|
||||
|
||||
FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。
|
||||
|
||||
入口:[本轮说明](research/MaskFolding1.4.3.md)、[正式宿主验收](verification/HostMaskFolding1.4.3.json)、[远端源码恢复](verification/MaskFoldingRecovery.json)、[副本清理](verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。
|
||||
|
||||
|
||||
|
||||
本轮正式安装包 `../发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`;PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` Accepted,签名/票据/Gatekeeper与20项展开验包通过。APP已有独立正式安装及宿主验收,本轮未再次运行系统安装器。Release标签 `v1.4.3-mask-fold-20261102` 已发布,标签提交 `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`;[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16在草稿和发布后均完整下载校验14,340,650字节及SHA-256一致。发行标签已从远端独立恢复244文件,全部字节比较及full/strict fsck通过,见 `verification/MaskFoldingReleaseRecovery.json`。核验下载副本和恢复clone已清理,仓库可见性不变。
|
||||
|
||||
## 历史 1.4.2(31):真实素材与中间起点跟踪
|
||||
|
||||
当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。
|
||||
|
||||
中间起点以宿主分析首帧为准,不再依赖预览缓存。4K细纹先低通再按比例缩到最高1280×720运动分析,调色渲染输出分辨率不变;拟合容差与置信度一致归一化,保留失效与过期写入保护。失跟显示具体原因、保留可信帧数并正常结束宿主任务;首帧反向使用有效种子范围正常结束;单帧经源时间到时间线转换,已有相同轨迹也正常前进。
|
||||
|
||||
FCP12.4正式31版在同一4K60素材的25p时间线中:中间双向285键、首帧正向285键;取消保留159键后任务闲置,可重新跟完整段;切换画面在2秒失跟、保留50键,连续重试无弹窗且任务闲置。带4秒前置片段的连续单帧7:17→7:18→7:19→7:18;首帧反向保持响应。正常退出冷重开完整预设77087字节逐字节一致。原工程、原媒体与原65键设置保留,验收只在独立副本进行。候选27–30发现的生命周期、单帧和边界问题均有记录,未发布候选包。
|
||||
|
||||
新增层相邻插入、加大的蒙版面板、实际鼠标钢笔/中心拖动确认等1.4.1与1.4.0历史保留。仍不是完整Color Finale移植或人物分割,遮挡/变形可能需要手工修正再从当前帧继续。Motion、Intel、变速/裁剪/非方像素工程未实机验收。
|
||||
|
||||
入口:[实现与边界](research/TrackingMidpoint1.4.2.md)、[正式宿主验收](verification/HostTrackingMidpoint1.4.2.json)、[原生及离线聚合](verification/TrackingMidpoint1.4.2.json)、[编译源码远端恢复](verification/TrackingMidpointRecovery.json)、[本轮清理](verification/TrackingMidpointCleanup.json)、[恢复方法](RECOVERY.md)。
|
||||
|
||||
|
||||
从大鱼远程克隆 main 后检出上述实际编译SHA,构建方法沿用本文件下文。已独立恢复233个提交文件并核对每个字节,full/strict fsck、原生模型模板与Metal重建通过;着色器SHA `b3258b903ed485b4b738a823a7de929bca9380365ad2de9c2c7781660293df7e` 与正式库一致。无LFS/子模块,恢复clone已清理。用户媒体、预设、签名私钥不在Git中。
|
||||
|
||||
|
||||
本轮正式PKG `../发行包/大鱼调色-1.4.2.pkg`:14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`;PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` Accepted,签名/票据/Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装与宿主验收。Release标签 `v1.4.2-tracking-midpoint-20261102` 已发布,标签提交 `38bf12326e74f2f026bc4c7627729121b6aa261d`;[Release370](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.2-tracking-midpoint-20261102) / 附件15在草稿与发布后均完整下载核对14,339,640字节及SHA-256一致,仓库可见性保持原状。发行标签从远端独立恢复237个文件,见 `verification/TrackingMidpointReleaseRecovery.json`,全部字节比较和full/strict fsck通过;核验下载副本与恢复clone已清理。
|
||||
|
||||
## 历史 1.4.1(26):相邻插入、蒙版可读性与钢笔流程
|
||||
|
||||
APP实际编译 `0eb56aed126c825ca89712ce90f8cc1c05b03d89`,公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326` Accepted;票据、Gatekeeper、唯一正式安装和安装后281项原生检查通过。正式路径、Bundle ID和签名团队不变。PKG/Release以当前验证JSON的版本和成功状态为准。 本轮发行标签 `v1.4.1-mask-workflow-20261101`;包 `../发行包/大鱼调色-1.4.1.pkg`,14,337,616字节,SHA-256 `0c167aba339bbfdd9c4cbd96aea384e2d43f6d498629ebaf7b1c18cbc6dca5c6`。PKG公证 `9a5ff448-2ac1-444e-b993-2928cf8c333f` Accepted,票据/Gatekeeper与20项展开验包通过;本轮未再次执行系统安装器。
|
||||
|
||||
新层紧接点击源插入,schema2的after保存原模块或UUID锚点;旧schema1尾层不迁移,保留旧画面。渲染在原固定工具对应阶段执行新层,非只移动界面。保持无新增激活层时原融合路径、CST参考、肤色参考、黑白混合和原蜘蛛盘顺序。详见 `research/MaskWorkflow1.4.1.md`。
|
||||
|
||||
蒙版面板扩大文字/数值和按钮,钢笔有明确的绘制、完成、取消与重画状态;实时草稿不调用宿主API,完成后单次提交。跟踪采用实际路径范围、300特征、亚像素精炼、21×21光流,采样最高3840×2160。Color Finale只读研究与独立适配差异见 `research/ColorFinaleMasksFollowup.md`,并非完整移植所有原版蒙版能力。
|
||||
|
||||
FCP12.4相邻插入、独立初始化参数、面板/绘制态、钢笔蒙版正向99键、一次撤销/重做和冷重开完整预设一致;用户实际鼠标钢笔落点/闭合已确认通过,答复“可以绘制并闭合”;自动输入未进入OSC回调。原生281项和独立跟踪18项通过,不等同所有真实素材与手势均已验收。详见 `verification/HostMaskWorkflow1.4.1.json`。
|
||||
|
||||
从远端独立恢复224文件、full/strict fsck,并从恢复源码重建模型/模板及Metal,与正式版着色器一致,见 `verification/MaskWorkflowRecovery.json`。无LFS/子模块;临时clone已清理。中间25版及24版临时APP备份在26版验证后清理,历史正式PKG保留。 发行标签提交 `23d5af7dcfecc9042896a7fa3e8b8b150ed874b8` 已从远端独立恢复228文件并逐字节核对,见 `verification/MaskWorkflowReleaseRecovery.json`。Release369/附件14已经草稿网页和发布后完整下载校验,详见 `verification/Release.json`。
|
||||
|
||||
## 历史 1.4.0(24):每工具蒙版与初始化叠层
|
||||
|
||||
APP 实际编译 `dbf25fe6719f17075362538dad0404951102524d`,公证 `40fdaaaa-1821-4cc8-bec3-c5dc6d8b9f77`,Accepted;票据、Gatekeeper、唯一正式安装、222项原生检查及FCP保存重开通过。安装和实际宿主证据分别见 `verification/Delivery.json`、`verification/HostToolMasks.json`。正式包和Release以对应JSON记录的1.4.0状态为准,不套用历史1.3.1记录。
|
||||
|
||||
发行标签 `v1.4.0-tool-masks-20261101`,PKG公证 `da6edea3-11f4-451b-aece-91916cca329a` Accepted,20项展开验包通过。包 `../发行包/大鱼调色-1.4.0.pkg`,14,250,425字节,SHA-256 `16a4958e28bc2a43c40e6131067eb03a49aecba5bbe3c0424bc7024fa532af38`。本轮正式APP已安装和宿主验证,PKG未重复运行安装器。
|
||||
|
||||
新增9002静态作者文档保存UUID工具实例和每层蒙版,9003仅作不保存的OSC会话路由。旧float ID、9001资产和1104字节制服ABI保持。预设v4保存完整工具与轨迹,兼容v1–3;轨迹用精确CMTime求值,新增工具标量暂不支持宿主标量关键帧。空间蒙版不能表达为Cube,应保存完整预设。蒙版/Metal光流来源固定为父库 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7`,摘要见 `research/ToolMaskPort.json`;构建与运行不读取父库或Color Finale。
|
||||
|
||||
远端独立克隆该编译节点,210个提交文件逐字节核对、strict/full fsck通过;从恢复源码和本机SDK重建模型/模板及Metal,模板和正式着色器摘要完全一致,见 `verification/ToolMaskRecovery.json`。不含LFS或子模块。恢复临时目录已清理,签名证书私钥仍需独立恢复。
|
||||
|
||||
FCP实测独立HSL、每层椭圆/矩形、数值编辑、正向99键、双向100键、单帧2键、一次撤销/重做及冷重开完整预设一致。用户已实际确认中心拖动,原生hit/drag回调和原层坐标变化已核对,新增层蒙版坐标不变;旋转/缩放/钢笔尚未实机验证,模拟宿主的原生OSC检查通过。旧模板实例可能保留关闭OSC的状态,可保存完整预设后重新应用新版效果再载入,不自动覆盖旧工程。
|
||||
|
||||
## 历史 1.3.1(19):色轮复位、可调整浏览器与最近使用
|
||||
|
||||
实际编译 `dbb7ca4a995ef832178a32f35939aed7d3a85012`,APP 公证 `9e93dc7f-04a3-44f9-a1e4-792bd7b31533`,Accepted;票据、Gatekeeper、唯一正式安装与 FCP 12.4 加载通过。发行标签 `v1.3.1-browser-recents-20261101`,包目标 `../发行包/大鱼调色-1.3.1.pkg`。本版本发布结果见 verification/Package.json 和 verification/Release.json。
|
||||
|
||||
新实例及全部还原的输入默认为 Sony S-Log3(数学 ID 28)与 Sony S-Gamut3.Cine(27);输出 Gamma 2.4 / Rec.709、工作 DI/DWG 不变。一级白平衡的可见复位按钮只写方向和强度为零,保持双击复位与一次撤销。
|
||||
|
||||
浏览器在 CustomParameterAction scope 中取得并立即请求 FxRemoteWindowAPI_v2 的最小/最大尺寸窗口;首个子视图在 reply 返回前同步附着。当前 FCP 实测独立浮动窗口生效。支持网格/列表、缩略图大小、可拖动分隔条和按库保存的窗口/布局偏好;旧宿主保留可分离弹出框回退。窗口尺寸受宿主 80% 上限及屏幕约束。
|
||||
|
||||
最近使用保存在当前 XPC 的 NSUserDefaults,key 以库的规范路径隔离;只记录成功且最新的宿主应用确认,失败、取消、过时回调不写。最多 40 个,去重最新优先,最近分类第一位,全部/文件夹也最近优先。首次打开可从已有当前 LUT 初始化;不能补造旧版本未记录的所有历史。LUT 文件不改动,历史偏好不进 Git/PKG。
|
||||
|
||||
verification/BrowserNative.json 为正式路径 201 项;BrowserCustomization.json 为 23 项真实离屏 AppKit 窗口/布局/历史检查;BrowserRegression.json 含 3,025 项虚拟化、取消和应用确认回归。FCP 的 Sony 默认、可见复位、浮动窗口及系统缩放、两种布局、最近排序和关闭重开见 HostBrowserAndReset.json。自由标题栏/边缘拖动未由自动化独立确认;用户开始操作后保留当前状态,未再重启 FCP。Motion、Intel、旧系统未验收。
|
||||
|
||||
远端独立恢复编译提交 178 文件、full/strict fsck 及 Metal 重建与正式库一致,见 verification/BrowserRecovery.json。恢复历史版本时仍使用其各自标签和验证记录,不把当前 Sony 默认替代历史中明确保存的设置。
|
||||
|
||||
## 历史 1.3.0(18)交付
|
||||
|
||||
实际编译源码 `c2818cbb1157093f80efd2a85cea0cf1509f565e`;APP 公证 `5de714ac-dd28-4d2b-926f-6c0f424d0e5d`,Accepted,票据和 Gatekeeper 通过,唯一正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。版本标签 `v1.3.0-spider-balance-20261101`,最终发行记录见 verification/Package.json 和 verification/Release.json 的本版本条目。
|
||||
|
||||
输入、工作空间、一级和输出合并一个卡片,移除四个可见旁路;旧阶段/旁路参数继续注册,打开旧工程不重解释原值,明确编辑 CST 或复位才清理旧旁路。一级白平衡复用原 CST 图像及 +104°、/5 精细拖动和原 BASIS 强度换算,角度范围修正为 0–360°,旧数值不重解释。
|
||||
|
||||
蜘蛛盘原样数学和交互源来自 dayu-colorplate 的 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7`;资源与来源摘要均已入仓库,不依赖兄弟 APP 运行。默认联动 6×6,可变 6/8/12/16/24,两轴独立;完整网格与固定点保存至现有 DYAssetState,预设 schema 3 含 JSON 网格并继续读取旧预设。InspectorToken 仍 schema 2。默认一级调色、蜘蛛盘、基础调整展开,其余折叠,所有眼睛开启。
|
||||
|
||||
正式版常规 155 项自检、带独立 CST 参照的 198 项集成检查通过;25 个网格的 204,683 项数学检查通过。远端独立恢复实际编译提交的 168 个文件,strict/full fsck 及着色器重建与正式库摘要一致,见 verification/SpiderRecovery.json。兄弟仓库只读参考,未修改。
|
||||
|
||||
FCP 12.4 已验证合并面板、默认、色轮/蜘蛛盘键盘修改、宿主菜单撤销/重做、两轴密度、固定点操作、整环选择及正常保存重开,验收实例最后全部还原。自动化坐标鼠标注入未激活 FxPlug 远程视图,因此未确认实时宿主拖动/双击;原生 AppKit 鼠标事件和一次拖动撤销配对检查单独通过,不混为宿主操作。记录见 verification/HostSpiderAndBalance.json。Motion、Intel、旧系统仍未验收。
|
||||
|
||||
正式构建、安装与启动由 tools/deliver.py 执行;PKG 由 Packaging/build_pkg.py 调用 PKG 工坊并真实展开验包,不重复执行系统安装。发布器先草稿、完整下载校验后发布,不移动历史标签或覆盖历史附件。签名凭据和用户 LUT 不进仓库。
|
||||
|
||||
## 历史 1.2.0(17)交付
|
||||
|
||||
版本标签 `v1.2.0-cst-fold-20261101`;实际编译源码 `48b00c85799b0226ba32aba3f2e5397aa0e509ed`。正式 APP 公证 `f25ae46e-92da-4470-842e-128bdb232aa8`,Accepted,票据和 Gatekeeper 通过;唯一安装路径及服务进程已在 FCP 12.4 核对。签名团队 B3W25FX5H5,固定缓存和公证配置不变。
|
||||
|
||||
前段复用 `dayu/dayu-cst` 的 `973766b51dbcab3ab5092f1955d753575cd32d89` 源码:输入曲线/色域 → 工作空间一级 → 输出曲线/色域,源码副本与摘要均在本仓库,不依赖另一份 CST APP 才能生产运行。原始 944 字节调色 ABI 前缀保留,新增控制追加其后。来源见 research/CSTIntegration.json。
|
||||
|
||||
一级调色与基础调整默认展开,其他模块折叠,全部眼睛开启;折叠独立写入 InspectorToken,不修改渲染参数。新 InspectorToken schema 2,旧 schema 1 及旧输入 LUT/预设继续读取。旧工程默认旁路新 CST,直到明确迁移;黑白新增混合,旧工程保留原黑白效果。新默认 Rec.709/Gamma 2.4 往返保持中性。
|
||||
|
||||
153 项原生检查通过,21 组独立 CST 像素对照最大分量误差 0.0000152587890625,正式路径常规自检 110 项通过;FCP 新实例默认、折叠、眼睛、0.70 曝光、Sony/ACES 选择及保存重开通过。风格库 N12 的 26 项可见并可应用。宿主观察不冒充逐像素导出一致,Motion/Intel/旧系统未验收。
|
||||
|
||||
远端独立克隆实际编译节点,151 个提交文件校核、full/strict fsck,以及着色器重建均通过,重建 SHA 与正式库一致。详见 verification/CSTRecovery.json。无 LFS、无子模块。签名私钥和用户 LUT 仍须独立恢复。
|
||||
|
||||
安装包/Release 的版本、摘要、标签、附件下载校验分别见 verification/Package.json 和 verification/Release.json;尚未产生本版本成功记录时不能据历史记录宣称发布完成。本轮 APP 已完成唯一安装,PKG 只展开验包,不重复运行安装脚本。
|
||||
|
||||
|
||||
远程:https://dayu.media/git/dayu/dayu-color.git,分支main。
|
||||
初始化基线:10987dd6bcc6986ea321eff75b37d4e8b48e966d;后续节点见git log。
|
||||
产品主ID:com.dayu.color,XPC:com.dayu.color.XPC;唯一正式位置:/Library/Plug-Ins/FxPlug/大鱼调色.app。
|
||||
|
||||
当前交付标签:v1.1.5-lut-encoding-20261101。APP 1.1.5(16)编译源码:59b058a3c8b9e5387381574da6bbc05af437527c;标签另含最终宿主验收与恢复记录。Apple 公证 ID b47b6fe8-b7a9-4112-93b9-de85b03ca598,Accepted;正式签名、票据、Gatekeeper 与宿主重开均通过,见 verification/Delivery.json 和 verification/HostLUTEncoding.json。
|
||||
历史 1.1.5 交付标签:v1.1.5-lut-encoding-20261101。APP 1.1.5(16)编译源码:59b058a3c8b9e5387381574da6bbc05af437527c;标签另含最终宿主验收与恢复记录。Apple 公证 ID b47b6fe8-b7a9-4112-93b9-de85b03ca598,Accepted;正式签名、票据、Gatekeeper 与宿主重开均通过,见 verification/Delivery.json 和 verification/HostLUTEncoding.json。
|
||||
|
||||
外部LUT版本 v1.1.4-external-lut-20261101 保留,编译源码497eef29fe8eaa5fb7025aa045b6dfa46a9acc14,原公证ID d9d9b05a-58b5-4a7a-aac2-6433b87d901d。
|
||||
|
||||
@@ -12,7 +145,7 @@
|
||||
|
||||
分组折叠版本 v1.1.2-group-fold-20261031 保留,编译源码 cdcb30a6aa1519bfb2f183165fef11cbf278bc7c,原公证 ID 398b020c-9e1e-4c2b-b637-e8e3af2a8f59。
|
||||
|
||||
所有调色分组展开即启用、折叠即停用,关闭时参数不可见;仅基础调节在新实例和全部还原后默认展开。折叠保留数值和 LUT 路径;打开已保存实例时按其实际启用状态展开。基础调节同时控制原光影与颜色两个子组。风格 LUT 总组停用时全部五层均旁路,关闭的输入或风格 LUT 不加载文件。肤色保护的百分比字段按0–100范围显示和保存。
|
||||
历史 1.1.2–1.1.5 行为(已由 1.2.0 取代):所有调色分组展开即启用、折叠即停用,关闭时参数不可见;仅基础调节在新实例和全部还原后默认展开。折叠保留数值和 LUT 路径;打开已保存实例时按其实际启用状态展开。基础调节同时控制原光影与颜色两个子组。风格 LUT 总组停用时全部五层均旁路,关闭的输入或风格 LUT 不加载文件。肤色保护的百分比字段按0–100范围显示和保存。
|
||||
|
||||
FCP12.4正式安装版本的11组标题/眼睛联动、隐藏参数、黑白红45与肤色65%跨折叠及保存重开保留、全部还原后只展开基础调节的验收见 verification/HostGroupFolding.json。仅在独立合成验收项目中改值,最后恢复默认;用户媒体和其他产品未作改动。
|
||||
|
||||
@@ -139,3 +272,29 @@ python3 Packaging/build_pkg.py --pkg-forge-repo /实际/PKG工坊源码目录 --
|
||||
正式Release:https://dayu.media/git/dayu/dayu-color/releases/tag/v1.1.5-lut-encoding-20261101;Release ID355,附件ID8,关联原标签06968514fc5205a83fbf3c5a3dbb1be0f6f3e79b,标签未移动。仅上传一次大鱼调色-1.1.5.pkg,13,752,153字节,SHA256 bf2a4acc57a3c08176be0f317c90551120bfcfb21a7224a690191884c8a3d071。
|
||||
|
||||
草稿Web下载对令牌请求返回404,但正常登录会话可下载。通过Edge实际下载草稿附件、核对全部字节和SHA后才由API发布;发布后再次用上传器完整下载正式链接并回读Release/附件,复用同一个附件且校验通过。草稿下载的临时副本按来源、创建时间和摘要核实后清理,本地正式发行包保留。详见verification/Release.json;此过程没有重新构建或改动已验包安装包,也未再次安装PKG。
|
||||
|
||||
## 1.2.0 正式 PKG
|
||||
|
||||
正式包 `../发行包/大鱼调色-1.2.0.pkg`,13,818,397 字节,SHA-256 `9fba4f0c1a313a6da8374b683f7e6b41af70388d7a7a180e26b9e236a9ba64a1`。PKG 公证 `c7b97b0f-57c8-45d3-a4d7-7db8e8694487`,Accepted;Installer 团队 B3W25FX5H5、票据、Gatekeeper 及 20 项展开验包通过。包内 APP 与已验收正式安装一致,未重复运行安装器。
|
||||
|
||||
正式 Release 已发布并完整下载校验:[1.2.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.2.0-cst-fold-20261101),Release ID 363,附件 ID 10。关联标签完整提交 `8074444259fbacc758ec003aa91a6331b6224a85`,APP 实际编译 `48b00c85799b0226ba32aba3f2e5397aa0e509ed`;附件 13,818,397 字节,SHA-256 `9fba4f0c1a313a6da8374b683f7e6b41af70388d7a7a180e26b9e236a9ba64a1`。草稿下载验证后才发布,发布后再次用上传器完整下载并回读核对;仅一次附件上传,未覆盖历史附件或移动标签。浏览器临时下载副本已按大小、摘要和来源核实清理,本地正式发行包保留。
|
||||
|
||||
## 1.3.0 正式 PKG
|
||||
|
||||
正式包 `../发行包/大鱼调色-1.3.0.pkg`,14,066,399 字节,SHA-256 `36c251722d3c9e4aaed8d5a09bf5afd3bf84039e9d1161c63635ab9d8224f506`。PKG 公证 `f6b25757-1e6b-4260-9667-5baecce8b3d4`,Accepted;Installer 团队 B3W25FX5H5、可信时间戳、票据、Gatekeeper 和 20 项真实展开验包通过。包内 APP 与已验收正式安装一致,未重复运行安装器。APP 编译源码 `c2818cbb1157093f80efd2a85cea0cf1509f565e`。正式包保留,临时展开副本由打包入口清理。
|
||||
|
||||
正式 Release 已发布并完成草稿、正式链接两次完整下载校验:[1.3.0 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.3.0-spider-balance-20261101),Release ID 365,附件 ID 11,关联标签提交 `6528f888affe0acdd4292bc0c5ae0dac3a89b5a5`,实际 APP 编译 `c2818cbb1157093f80efd2a85cea0cf1509f565e`。附件 14,066,399 字节,SHA-256 `36c251722d3c9e4aaed8d5a09bf5afd3bf84039e9d1161c63635ab9d8224f506`;只上传一次,未覆盖历史附件或移动标签。草稿浏览器下载副本已按来源、创建时间、字节数和摘要确认后清理,正式发行包保留。标签远端恢复 172 文件、full/strict fsck 通过,见 verification/SpiderReleaseRecovery.json。
|
||||
|
||||
## 1.3.1 正式 PKG
|
||||
|
||||
正式包 `../发行包/大鱼调色-1.3.1.pkg`,14,073,683 字节,SHA-256 `954b10c581f31d23a8c417a6f37b24fae19939786dce8733b4d6f09c7ed3adae`。PKG 公证 `85cad776-c3d7-4037-9643-24041b269002`,Accepted;Installer 团队 B3W25FX5H5、可信时间戳、票据、Gatekeeper 和 20 项真实展开验包通过。包内 APP 与已验收的正式安装一致,APP 实际编译 `dbb7ca4a995ef832178a32f35939aed7d3a85012`;未重复执行系统安装。
|
||||
|
||||
正式 Release 已发布并完整下载校验:[1.3.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.3.1-browser-recents-20261101),Release ID 366、附件 ID 12;标签提交 `281721bda11484c23f294b4f0d9e0b30ef829288`,APP 编译 `dbb7ca4a995ef832178a32f35939aed7d3a85012`。附件 14,073,683 字节,SHA-256 `954b10c581f31d23a8c417a6f37b24fae19939786dce8733b4d6f09c7ed3adae`。草稿经已登录会话完整下载校验后发布,正式链接再次完整下载校验;只上传一次并复用同一附件。临时下载副本已核实清理,正式发行包保留。交付标签远端独立恢复 184 文件与 full/strict fsck 通过,见 verification/BrowserReleaseRecovery.json。
|
||||
|
||||
## 蒙版、跟踪与可重复工具的文档交接(2026-11-01)
|
||||
|
||||
文档整理前 main 为 `bbdd47d1d74e241f1f144bb2c245204e86973b3f`。交接标签 `handoff-mask-tracking-tools-20261101` 保存最新 `大鱼调色FxPlug4交接.md` 及 `research/MaskTrackingAndToolStack.md`,区分正式 1.3.1(19)与尚未实现的多个独立 HSL、每实例蒙版和跟踪。本文档提交未重新构建、安装或发布 APP/PKG,不移动原发行标签;父级“大鱼调色盘”只读参考。接续时保护用户当前窗口、布局、LUT 选择和工程。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-cst.git",
|
||||
"commit": "973766b51dbcab3ab5092f1955d753575cd32d89",
|
||||
"files": [
|
||||
{
|
||||
"source": "tools/kernels/CSTKernel.ll",
|
||||
"destination": "tools/kernels/CSTKernel.ll",
|
||||
"sha256": "78c2414d1c086dc7eaa043308f0febd32691b1ad49629febdcc1138b232cefc8"
|
||||
},
|
||||
{
|
||||
"source": "tools/kernels/BasisKernel.ll",
|
||||
"destination": "tools/kernels/BasisKernel.ll",
|
||||
"sha256": "221ca94c52a997aa8cb2b2155bb8c7ad57bf0829b0241857664a75e78329a4b3"
|
||||
},
|
||||
{
|
||||
"source": "大鱼CST/Plugin/DayuShaderTypes.h",
|
||||
"destination": "大鱼调色/Plugin/DYCSTTypes.h",
|
||||
"sha256": "3372e3cd77248eeb374e54675d2902befceea8e00a2afc4f9543116ef3027696"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
# CST 色彩管理集成
|
||||
|
||||
本轮以 dayu-cst 的固定源码节点复用 CSTKernel / BasisKernel;原路径和摘要见 CSTIntegration.json,参考仓库保持只读。新处理顺序为输入转换 → 工作空间一级调色 → 输出转换 → 原有基础调整与风格链。曲线和色域独立选择,工作曲线由同一个参数供一级与输出使用,不通过跨实例通知同步。
|
||||
|
||||
沿用大鱼调色的宿主线性 RGB 边界:CST 前恢复编码值,三个阶段内部不使用 3D LUT、不裁切至 0–1;返回宿主线性后再进入原有显示域调色链。此版本的后续 HSL、曲线与风格 LUT 仍是既有显示域工具,不宣称全链路改造成场景线性调色。CST 源内核使用 half 输入,保留其原生精度边界。
|
||||
|
||||
新实例默认输入/输出 Gamma 2.4、Rec.709,工作 DaVinci Intermediate / DaVinci Wide Gamut;自动色调映射默认关闭。按实际素材选择相机曲线/色域。选择自动映射时复用参考代码的场景/显示映射标志。一级默认参数直接沿用 CST 源码。
|
||||
|
||||
一级调色、基础调整默认展开;其余折叠;所有模块眼睛开启。黑白模块增加混合(默认 0),保证眼睛开启不强制把初始画面变成黑白。折叠写入独立的 InspectorToken,仅保存界面状态,不修改任何调色参数、启用位或 LUT 路径。眼睛只修改启用位。
|
||||
|
||||
旧 InspectorToken schema 1 仍可读取:默认跳过新 CST,并保留旧版黑白强度。旧输入 LUT / 相机输入也维持原路径,直到用户明确编辑 CST 参数或选择“旧版输入 → 改用 CST”。新旧模型的前 944 字节 ABI 与所有旧参数 ID 保留。
|
||||
|
||||
Cube 导出改用生产渲染路径生成 33³ 色格,包含新的 CST 与一级参数;关闭不可写入 Cube 的空间细节工具和逐画面统计。用户 LUT 和宿主资料不进入仓库。
|
||||
|
||||
原生模型、真实 AppKit 折叠动作、IOSurface/Metal 和 Cube 导出已通过 153 项检查,其中 21 组参数与正式大鱼 CST 着色器直接逐像素对照(包含 17 个相机输入组合、ACEScct/Linear/新增曲线/显示曲线工作空间)。本机 Apple M4 的最大线性预乘分量误差为 0.0000152587890625。具体输入、原库摘要与边界见 verification/CSTIntegration.json。正式宿主与发行由独立记录确认。
|
||||
|
||||
为避免全眼睛开启让中性查表裁切 HDR,未调整的曲线/HSL/色轮/三原色/色阶/色彩平衡在渲染副本旁路;无其他实际调整时肤色保护也无需执行。原参数、眼睛和界面数值不变。默认输入与输出相同、一级中性且映射关闭时跳过可证明为恒等的往返,避免累积 half 量化误差。
|
||||
@@ -0,0 +1,52 @@
|
||||
# Color Finale 胶片与通道混合:本机移植记录
|
||||
|
||||
2026-11-02,基线 `b640b5da06f4c4455bb79c9b6bc16daa3088fa92`,正式1.4.3(33)。当前为研究检查点,尚未替换正式程序。
|
||||
|
||||
## 目标身份与保存位置
|
||||
|
||||
参考为本机 ColorFinale 2.16.2(625)。插件 SHA-256 `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f`;RenderingEngine `32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3`;GradeKit `e868a8c6df64bf03b7c24af5657c5ac7a2259a1943dfe06e01dbb7881df018a3`。
|
||||
|
||||
REA/Ghidra12.1.4目标绑定;Hopper在本机不可用,未改环境或安装工具。原始反编译、AIR和原版运行探针数据仅在 `/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-film-mixer-20261102/` 及其父目录的本轮 evidence/snapshot 文件中。产品不得依赖这些缓存或 Color Finale 的安装。
|
||||
|
||||
在改动前通过现有正式插件保存当前用户完整预设到 `.../com.dayu.color/fcp-qa/film-mixer-before-user.json`,77437字节;界面显示286个轨迹键。该私有预设不入Git或发行包。接手源码工作区干净,main与远程完整SHA一致,无待补推分支。
|
||||
|
||||
## 已观察的原版合同
|
||||
|
||||
| 模块 | 观察 | 证据 |
|
||||
| --- | --- | --- |
|
||||
| 通道混合器 | RGB三个输出行各读取RGB三系数,独立保持亮度、保持饱和度;缺省恒等矩阵,两保持选项为关 | `ev_de17c8b567e4f5b5975b7f65df03a00b6b48ccbc1053283619c02b95a8543387`、`ev_05d57fdd47b4aeca7b6928f1e37f3dd1f7d8ea482cb53c62689f0ed01d0194a4`;原版AIR `ChannelMixer` |
|
||||
| 减色 | gammaAll/Cyan/Magenta/Yellow、density、densitySwitch、valueSwitch进入SubSat;通道归一化幂函数再以白归一化,不是简单RGB幂函数 | `ev_90babd33318d6df4735fc2b4fd8ff79a76e6a035939d53e9dff1abdd99c0fa0d`;AIR `SubSat`、`compute_norm` |
|
||||
| 晕光 | 原图clamp边缘→CIGaussianBlur(scatter)→HalationKernel;R/G使用boost/dyeTransmission,B保持 | `ev_a187b1b5479b8dcd3419136e4d6c7b4de8b1fd692e3469f8ce760277fc82e5b3`;AIR `HalationKernel` |
|
||||
| 辉光 | sensitivity、blurRadius、intensity送入独立通用kernel,后续Fx包装仍需追查 | `ev_91b77df09f4b079fb6dd3ec48048b920a1712de647717a18349585dab51035d2` |
|
||||
| 颗粒 | seed、intensity、grainSize、filmResponse、correlation及RGB标准差;PCG哈希+Box-Muller正态噪声;grainSize>1由MPS高斯扩散;逐通道响应与相关性混合 | `ev_ff3cd2863e3fcf6d834c2a9e80a550bb6c2c85fa28ccdd1f8c4ac941aba9f469`、`ev_591f74d294cd90958b4b5212f004171b38a49fc1799547b93b062c29f04b68ef`、`ev_6ddb156a25bce95378ef3b21653a84779d5a9a9f4924820f46a14d103359ff5e`;AIR `BoxMullerPCG`、`GrainFilter` |
|
||||
|
||||
RenderingEngine `default.metallib` SHA-256 `6fd43083a38e76c95c6256a331eabb85d97b48c32d3418e8fee4c1d28480c7ff`;`metal_kernels.metallib` `ee21f6115ef96937d7e2c41e5293bcdb8a0fbaeee9570c60e547f550399920a3`。用本机Apple Metal工具只读解析指令;静态观察不能替代实际输出对照。
|
||||
|
||||
原版最终根级顺序已由身份匹配的既有证据 `ev_c0a2873d5bcdbddba37830f470f8face16b6ffef6f4ca3da012a3abd863f3164` 建立:图层树→减色→晕光→辉光→颗粒→暗角→输出;ACES输出可选八种印片LMT。各Fx的数值映射、工作域、暗角和LMT仍在追查,不能宣称已经移植或等效。
|
||||
|
||||
## 本工程接入边界
|
||||
|
||||
保留原参数ID及944字节GPU前缀;新的参数仅追加。新增可重复通道混合器与胶片工具,沿用现有启停、折叠、蒙版、数量标记和相邻插入。旧工程缺省为严格中性,保留schema1尾层、schema2锚点及286键用户状态。
|
||||
|
||||
Cube只允许可静态表示的颜色数学;空间效果、颗粒和蒙版必须明确拒绝,完整预设保留其状态。待本机原版图像对照、原生回归和正式宿主验收完成后再记录结论。
|
||||
|
||||
## 开发检查点
|
||||
|
||||
已追加两种工具、42个宿主浮点参数及完整预设v5;旧ID与1104字节完整前缀保留。CST及原调色/蒙版/跟踪调度不重排;两个新根工具位于原显示域链/蜘蛛盘之后,schema1尾层之前。减色与颗粒用既有sRGB编码边界,晕光/辉光/暗角用宿主线性纹理;这属于本工程接入合同,并不声称与任意ACES管理的原版整条CMS完全等效。
|
||||
|
||||
原版Fx包装确认辉光使用固定2.5像素稀疏高斯预滤→向量Sobel阈值→用户diffusion高斯扩散→相加;晕光scatter缺省5,透射参数/500,boost缺省1;颗粒PCG与Box-Muller直接原版shader输出逐样本相符,相关性=1−2×colorVariation。暗角直接复用同一系统CIVignetteEffect及参数映射。证据:`ev_f0221c32adbaa1e108aa560f0f8fa60c067619ac9f5b06225df548e2671a448f`、`ev_932531fcd8aaebf06eabd6e22f1a56615ba2462f6efc3fb53cfdbdb9fd618816`、`ev_b500f2f762efd1dbbd8ae7efab9d48016482ff1463775039d25504cb4ccd9d3f`、`ev_850af09a4640201b65745c78a10a0e0a0ef67eee9614d129517f6bf13c54c11e`。
|
||||
|
||||
当前原生346项通过;独立原版CI/Metal对照仍在修正辉光边界采样。CI读取bitmap的上下行与Metal纹理相反,对照工具已有往返控制;产品CI→Metal往返验证无翻转。颗粒比对采用原版BoxMullerPCG/GrainFilter明确尺寸/种子,避免把Core Image内部切块的噪声坐标当作固定全帧坐标。此检查点尚未正式安装和宿主验收。
|
||||
|
||||
|
||||
独立原版对照38项现已全部通过:四组通道保持选项、12组减色、3种晕光半径、3种辉光阈值、4种PCG种子与12组颗粒。最大线性RGB绝对差0.0001328(通道双保持),低于预先记录的0.00015浮点容差;其余各项有各自阈值。辉光普通区域采用可分离预滤,最外一圈直接求原25点邻域,保留原版clamp边界,避免把裁切中间图的边界当作原图边界。见 `verification/FilmMixerReference.json`。这只覆盖声明的有限组件和参数,不代表原版整条CMS、全部素材或全部印片外观等价。
|
||||
|
||||
|
||||
正式构建准备:1.5.0(34),349项原生检查通过;独立原版对照在64×48、63×47、1×17、17×1四种尺寸共184项全部通过,含零矩阵/灰矩阵退化分支。上下纹理方向的颗粒固定全帧坐标验证通过;元数据旧前缀、原有跟踪/钢笔检查仍包含在原生回归中。静态3D Cube允许通道矩阵和纯减色,拒绝活跃的晕光/辉光/颗粒/暗角。FCP夹具只有三个独立合成项目,FCPXML1.12严格DTD与素材检查通过,不把内部FxPlug ID冒充模板发布参数路径;通过正式检视器设置验收参数。
|
||||
|
||||
兼容边界:新模块关闭/零混合以及旧工程缺省走原融合链;活跃减色沿用原SubSat对0…1的限幅。晕光/辉光保留邻域alpha权重,所有新处理保留入口alpha,非正alpha旁路;颗粒全帧种子不依赖Core Image内部切块顺序。原厂八种印片外观是ACES输出的另外一组资源,本轮五组胶片处理未使用这些资源,也不以相机F-Log名称冒充印片外观。
|
||||
## 正式1.5.0(34)验收完成
|
||||
|
||||
实际编译源码 `06d531c443b0bb2f179022a4e64148394f5d0690`。正式安装349项原生检查通过,FCP12.4对用户旧234参数、资产路径、蜘蛛盘及287键蒙版载荷核验保持。新工具、胶片椭圆蒙版、折叠数量、独立初始化叠层及删除撤销/重做通过。正式ProRes导出验证颗粒两帧保持,组合/颗粒完整预设冷重开前后逐字节相同。三项目原生FCPXML回导严格校验与字段比较通过。见 `verification/HostFilmMixer1.5.0.json`;四尺寸184项独立组件对照见 `verification/FilmMixerReference.json`。本轮交付五组胶片处理及矩阵,不含八种ACES印片外观。
|
||||
|
||||
APP和PKG均Developer ID签名、公证Accepted、票据/Gatekeeper通过;PKG有20项展开验包,未再次执行安装脚本。发行包、标签、全量下载和恢复结果分别见 `verification/Package.json`、`verification/Release.json` 与本版恢复记录。
|
||||
@@ -0,0 +1,261 @@
|
||||
{
|
||||
"date": "2026-11-01",
|
||||
"scope": "Read-only installed Color Finale 2.16.2(625) static analysis and independent Dayu tracking reconstruction; no target runtime/GUI",
|
||||
"target": {
|
||||
"path": "/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/MacOS/ColorFinale",
|
||||
"sha256": "49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f",
|
||||
"architecture": "arm64",
|
||||
"provider": "Ghidra 12.1.4"
|
||||
},
|
||||
"baselineCommit": "745aa1626e1df368290fbbd47a716ff3ce9ca630",
|
||||
"evidence": [
|
||||
{
|
||||
"evidence_id": "ev_6539e1080a6e0d9cf27d9cb3c26703110b8f50030981b18cc075356840849e08",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTShapeTrackerView::addShapeForEvent:",
|
||||
"address": "0x1000e2900",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_0f9372e98efac18d8f666dcf137addc2ecdaffdfdb153f0a31b3ecfc2ba8b9ca",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTShapeTrackerView::setShapeEditMode:",
|
||||
"address": "0x1000e1fcc",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_2dd4ac418346bd4d15d05f8145bb2a547ab531d742b4e8edfb3314fc49fdde0a",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTOnScreenBezierShape::mouseDown:",
|
||||
"address": "0x10009be0c",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_8aa635a486e91b5af36bc39d424964417e0b6b77706cb24218640ac253b426b6",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTOnScreenBezierShape::mouseUp:",
|
||||
"address": "0x10009c084",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_4c3864a55c7dc71ee02b67c4eed011dbe00a9d8072c275ff002607d22618c288",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTOnScreenPathShape::closePath",
|
||||
"address": "0x100033ec8",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_2fc54b9d31f2ac894aae0b560fee33284a155fe6505697c0a83be1af0bc0a8ea",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTOnScreenPathShape::controlPoint:mouseDown:",
|
||||
"address": "0x10003429c",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_d3bea253005ee2007c110f15d6658e542de8f2075d40585897b875f9b517ec2b",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTOnScreenPathShape::keyDown:",
|
||||
"address": "0x1000345c8",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_ba0c6d39ae45e26b8ade69f41f6fb8da934c526a686e64be89690b762a11e585",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTShapeBezierControlPoint::controlPoint:mouseDragged:",
|
||||
"address": "0x10009d178",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_ea178e24d10afea13fa74a0d70941648d1ca4c45005a1533df478c9212f6f9b7",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTShapeTrackerControl::addToolbarButtons",
|
||||
"address": "0x10001ef7c",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_dcd7aa770925f63c8c14c968ae6b417fda78685c7be7fa739a78209957d40e2d",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTAreaTracker::track:trackerState:",
|
||||
"address": "0x100035e40",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_e798c4e6e032e085812f81831ecc16196bd3c2278bf634961379669ee1308f7e",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTAreaTracker::trackFrame:inScene:",
|
||||
"address": "0x100036cbc",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_8bad5bbc4bd2890227567b9799cfc1e68c6d56631e67a73224d57971767664c4",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "-[FTTrackerShape(FTOnScreenShape)_addKeyFrameForShape:atTime:]",
|
||||
"address": "0x100047dc4",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_fe677a9c456fc8739e0c33edd513c3f6b94431c7fbb6f1194a78801f39f32072",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTShapeTrackerControl::shapeTrackerView:geometryDidChangeForShapes:",
|
||||
"address": "0x100025414",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
},
|
||||
{
|
||||
"evidence_id": "ev_533595e2ddf4c96d5c82f3ce25c7ff44a3549f37d8b80e5b5b5a82360e283c77",
|
||||
"operation": "analyze_function",
|
||||
"procedure": "FTMaskShapeViewController::viewDidLoad",
|
||||
"address": "0x10007f3b0",
|
||||
"authority": "shipped-artifact",
|
||||
"confidence": "observed"
|
||||
}
|
||||
],
|
||||
"localOnlyEvidenceDirectory": "/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101",
|
||||
"sourceApplicationRuntimeDependency": false,
|
||||
"proprietaryCodeOrResourcesCommitted": false,
|
||||
"originalArtifactModified": false,
|
||||
"completeMigrationClaim": false,
|
||||
"limitations": [
|
||||
"Static analysis is not live runtime acceptance.",
|
||||
"Independent detector/gray conversion/LK/RANSAC safeguards do not exactly reproduce OpenCV results.",
|
||||
"Interface Builder default 64-document coverage omitted mask nibs; exact full inspector pixel sizes are unknown.",
|
||||
"B-spline, grouping/parent masks, image/person/external inputs, published masks and full keyframe-region editing are outside this fault-fix implementation.",
|
||||
"No same-video, same-path, whole-trajectory comparison to the original product has been performed."
|
||||
],
|
||||
"independentVerification": {
|
||||
"passResult": true,
|
||||
"count": 18,
|
||||
"checks": [
|
||||
{
|
||||
"name": "cpu-pen-texture-outside-creation-box-starts",
|
||||
"pass": true,
|
||||
"features": 117
|
||||
},
|
||||
{
|
||||
"yErrorPixels": 0.03234100341796875,
|
||||
"xErrorPixels": 0.007296752929676131,
|
||||
"name": "cpu-extended-pen-region-subpixel-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "cpu-real-300-feature-capacity",
|
||||
"pass": true,
|
||||
"features": 300
|
||||
},
|
||||
{
|
||||
"pass": true,
|
||||
"rotation": 0.02499544620513916,
|
||||
"scaleX": 1.025027871131897,
|
||||
"scaleY": 0.9799908995628357,
|
||||
"xErrorPixels": 0.0009307861328267109,
|
||||
"yErrorPixels": 0.0005807876586860772,
|
||||
"name": "cpu-translation-rotation-independent-xy-scale"
|
||||
},
|
||||
{
|
||||
"name": "cpu-subpixel-refinement-and-redetection-remain-stationary",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "cpu-unrelated-cut-is-not-trusted-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "cpu-flat-region-still-refuses-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"generatedFramesAndAnalysisMilliseconds": 43.247542,
|
||||
"features": 300,
|
||||
"name": "cpu-1080p-complete-frame-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"generatedFramesAndAnalysisMilliseconds": 111.362708,
|
||||
"features": 300,
|
||||
"name": "cpu-3840x2160-complete-frame-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "metal-pen-texture-outside-creation-box-starts",
|
||||
"pass": true,
|
||||
"features": 117
|
||||
},
|
||||
{
|
||||
"yErrorPixels": 0.03234100341796875,
|
||||
"xErrorPixels": 0.007296752929676131,
|
||||
"name": "metal-extended-pen-region-subpixel-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "metal-real-300-feature-capacity",
|
||||
"pass": true,
|
||||
"features": 300
|
||||
},
|
||||
{
|
||||
"pass": true,
|
||||
"rotation": 0.02499544620513916,
|
||||
"scaleX": 1.025027871131897,
|
||||
"scaleY": 0.9799908995628357,
|
||||
"xErrorPixels": 0.0009307861328267109,
|
||||
"yErrorPixels": 0.0005807876586860772,
|
||||
"name": "metal-translation-rotation-independent-xy-scale"
|
||||
},
|
||||
{
|
||||
"name": "metal-subpixel-refinement-and-redetection-remain-stationary",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "metal-unrelated-cut-is-not-trusted-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "metal-flat-region-still-refuses-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"generatedFramesAndAnalysisMilliseconds": 31.447709,
|
||||
"features": 300,
|
||||
"name": "metal-1080p-complete-frame-motion",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"generatedFramesAndAnalysisMilliseconds": 88.904167,
|
||||
"features": 300,
|
||||
"name": "metal-3840x2160-complete-frame-motion",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"memoryRunPass": true,
|
||||
"peakResidentBytes": 299597824,
|
||||
"generatedImageOracles": true,
|
||||
"baselineExtendedRegion": {
|
||||
"started": false,
|
||||
"features": 0
|
||||
},
|
||||
"newExtendedRegion": {
|
||||
"started": true,
|
||||
"features": 117
|
||||
},
|
||||
"appLaunched": false,
|
||||
"scope": "Independent generated images, CPU tracker and optional real Metal optical flow. No app or GUI host launched."
|
||||
},
|
||||
"implementationSHA256": {
|
||||
"大鱼调色/Plugin/MaskCore/DYTracker.hpp": "68d32e8704e737587729397b0e8dd856f40c26aff479af7a65e5a32c48e95d6b",
|
||||
"大鱼调色/Plugin/DYToolFlow.inc.h": "f4426c1bc4a36a93561c9d43ea794b89c10767fb94cbc442b82563766b1856d8",
|
||||
"大鱼调色/Plugin/DYTracking.metal": "e0c13390a952b13eb92081840069f79632c05326aaf1a0cc927200a84d4e4ac0",
|
||||
"tools/verify_tool_tracking_followup.mm": "961c3ff4359bc06bf7b6d1f71b8fcfa40efee32d2f7722a0af9ba813971d7c64"
|
||||
},
|
||||
"independentShaderSHA256": "2899508dbcff3329531ec23f9fe13f30993ba5416bf7788697557f5d611783f8"
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
# Color Finale 蒙版与跟踪的本机复核(2026-11-01)
|
||||
|
||||
本轮针对用户报告的“层在最底部新增、蒙版控件太小、钢笔不可用”核对本机发行产物。目标为 ColorFinale 2.16.2(625)的 arm64 插件,完整文件 SHA-256 `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f`,与此前归档研究一致。原程序始终只读,未执行或操作其 FCP 界面。静态观察不是运行行为验收,也不能据此声称整个原版功能已完整迁移。
|
||||
|
||||
这里只保存行为、接口、参数和 Evidence 索引,不保存原版反编译源码、二进制、图标或其他资源。新功能仍是本产品自己的源码与 Metal 实现,不依赖 Color Finale 安装。
|
||||
|
||||
## 钢笔状态与可迁移交互
|
||||
|
||||
| 本机静态观察 | 入口与 Evidence |
|
||||
| --- | --- |
|
||||
| 选择 Bezier 新建模式后,首次点击建立可编辑/选中的零尺寸路径,交给新路径处理该点击,随后进入独立的路径编辑模式 | `FTShapeTrackerView::addShapeForEvent:` `0x1000e2900`,`ev_6539e1080a6e0d9cf27d9cb3c26703110b8f50030981b18cc075356840849e08` |
|
||||
| 新建与编辑路径是不同模式;离开路径编辑模式会尝试闭合当前路径 | `setShapeEditMode:` `0x1000e1fcc`,`ev_0f9372e98efac18d8f666dcf137addc2ecdaffdfdb153f0a31b3ecfc2ba8b9ca` |
|
||||
| 编辑态可向未闭合路径追加锚点,也有在曲线上插点的分支;放置后可拖出共线双柄 | `FTOnScreenBezierShape::mouseDown:` `0x10009be0c`,`ev_2dd4ac418346bd4d15d05f8145bb2a547ab531d742b4e8edfb3314fc49fdde0a`;`FTShapeBezierControlPoint::controlPoint:mouseDragged:` `0x10009d178`,`ev_ba0c6d39ae45e26b8ade69f41f6fb8da934c526a686e64be89690b762a11e585` |
|
||||
| 未闭合且至少三个点才允许闭合;点击首锚点会闭合 | `FTOnScreenPathShape::closePath` `0x100033ec8`,`ev_4c3864a55c7dc71ee02b67c4eed011dbe00a9d8072c275ff002607d22618c288`;`controlPoint:mouseDown:` `0x10003429c`,`ev_2fc54b9d31f2ac894aae0b560fee33284a155fe6505697c0a83be1af0bc0a8ea` |
|
||||
| 原版未闭合路径接收 Return 或 Esc 时均尝试闭合;Delete 删除选中锚点 | `FTOnScreenPathShape::keyDown:` `0x1000345c8`,`ev_d3bea253005ee2007c110f15d6658e542de8f2075d40585897b875f9b517ec2b` |
|
||||
| 画面工具栏有选择、路径编辑、矩形、椭圆、渐变边、B 样条、Bezier;预览按钮原生最小尺寸为30×22,另有8×8内边距 | `FTShapeTrackerControl::addToolbarButtons` `0x10001ef7c`,`ev_ea178e24d10afea13fa74a0d70941648d1ca4c45005a1533df478c9212f6f9b7` |
|
||||
|
||||
大鱼本轮保留明确的“Esc取消草稿”行为,与原版“Esc尝试结束闭合”不同。不能把新实现描述为所有快捷键均完全相同。当前产品旧钢笔入口未携带绘制态,且通知会清除绘制态;即使菜单项存在,也不能证明进入了放点模式。修复应同时覆盖绘制态、首点/Return结束、删除、草稿预览、提交和取消,以及再次选择已有路径的编辑。
|
||||
|
||||
形状属性控制器将 `feather`、`opacity`、`position`、`scale`、`rotation` 绑定到对应作者属性,见 `FTMaskShapeViewController::viewDidLoad` `0x10007f3b0`,Evidence `ev_533595e2ddf4c96d5c82f3ce25c7ff44a3549f37d8b80e5b5b5a82360e283c77`。完整检视器字号和运行时像素布局未取得充分静态证据;不能从符号名称推断其可读性。
|
||||
|
||||
## 跟踪差异与本轮改进
|
||||
|
||||
原版核心 `FTAreaTracker::track:trackerState:` `0x100035e40`,Evidence `ev_dcd7aa770925f63c8c14c968ae6b417fda78685c7be7fa739a78209957d40e2d`。逐帧作者状态 Evidence `ev_e798c4e6e032e085812f81831ecc16196bd3c2278bf634961379669ee1308f7e`(`0x100036cbc`)。原版每帧接收完整图像、最多3840×2160转换为8位灰度,将 position/rotation/scale 按 effectTime 写入作者键,不是渲染时临时估计。当前大鱼已经有精确时间键、相邻帧参考、丢失停止和这些变换输出;这些并非本轮才补齐。
|
||||
|
||||
| 项目 | 原版静态观察 | 大鱼1.4.0(24)与本轮选择 |
|
||||
| --- | --- | --- |
|
||||
| 区域 | 用形状点的凸包构造特征遮罩 | 原有实际多边形判断更贴合凹路径,但包围框和前置±0.5裁剪错误。本轮改为从实际路径顶点推导变换后搜索边界,保留实际多边形判断,修复默认框外钢笔纹理被裁掉的问题 |
|
||||
| 特征 | 300点,quality0.03,最小距离10,blockSize3 | 原有180点、0.012相对阈值、按帧大小变化的间距、5×5邻域。本轮调整为300点、0.03、10像素、3×3;仍采用独立中心差分与2像素候选扫描,并不等同OpenCV检测器 |
|
||||
| 角点精炼 | `cornerSubPix` 半窗10,20次/0.03 | 原有无亚像素精炼。本轮用独立加权梯度交点迭代,半窗10、20次/0.03,限制发散并保留初始点回退;不是复制OpenCV内部实现 |
|
||||
| 光流 | LK21×21,maxLevel3即最多4级,30次/0.01;前后误差严格小于1 | 原有9×9、最多5级、20次。本轮CPU和Metal统一21×21、最多4级、30次/0.01;保留原有均值去除、RMSE及≤1.1像素前后检查,不声称数值全等 |
|
||||
| 重检测 | 分析计数小于2或偶数时重检测并精炼 | 原有每5帧或少于60点补点。本轮每2帧或不足60时重选;新点少于12时保留仍可信旧点,后续仍须通过完整拟合/失效条件 |
|
||||
| 拟合 | `estimateAffine2D` RANSAC2000次、阈值3、confidence0.99、refine10 | 本轮保留确定性400次、1.6/1.5阈值、3次最小二乘、至少8点/52%内点与非线状分布检查。阈值不能无验证地照搬,否则可能把错误帧当作成功 |
|
||||
| 输出/失效 | 原版持久化位置、旋转和独立XY缩放,失败节点不再继续 | 大鱼保持QR分解位置/旋转/独立XY缩放,丢失停止、置信度和每步缩放/旋转保护。它比已观察到的原版分支更保守,不含透视或剪切输出 |
|
||||
|
||||
独立检查 `tools/verify_tool_tracking_followup.mm` 使用已知仿射变换生成图像,分别运行CPU和真实Metal后端。默认创建框外的钢笔区域在旧提交 `745aa1626e1df368290fbbd47a716ff3ce9ca630` 检出0点、无法启动;新版本检出117点,12帧亚像素移动末帧误差约X0.0073/Y0.0323像素。另覆盖300点实际传输、旋转与非等比缩放、静止重检测、换景拒绝、平坦区域拒绝,以及1920×1080/3840×2160完整帧。18项通过;4K生成两帧及分析本机记录约CPU111ms/Metal89ms,不是所有素材的性能承诺。
|
||||
|
||||
## “完整移植”的边界
|
||||
|
||||
本轮是可验证的独立重建与关键交互修复,不能宣称完整复制Color Finale蒙版系统。原版还观察到B样条、形状多选/编组、父蒙版、图像/人物/宿主外部蒙版、HSL取色增减与来源/模糊、发布蒙版/抠出、轨迹区域选择与按键区段编辑等体系;当前大鱼每工具六类蒙版不具备全部对应能力。`FTMaskDetailViewController` 的形状、HSL、图像、人物、FCP控制器方法库存见 Evidence `ev_0497fc6415b6b210fea8a052adf0f93483af228b44063dffd2c76d93a990cef1`。大鱼独立“亮度选区”不能据此称为已复刻原版某个独立Luma类;本次主插件范围没有取得该类的充分证据。
|
||||
|
||||
算法阈值及默认值对齐不是对真实视频的等价证明。本轮尚未取得原版与大鱼在同一真实视频、相同路径及分析范围下的完整轨迹对照,也未分析原版所有链接框架和动态形状UI。完整范围继续由差异清单追踪,不能把当前故障修复或合成检查通过替代这些开放项。
|
||||
|
||||
完整REA证据和恢复snapshot仅在本机研究缓存:`/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101/`。当前REA目标已关闭,原产物未修改。Interface Builder decoder默认64文档首先遍历Sparkle,未覆盖后续蒙版nib;不能把该局限解释为蒙版UI不存在。新摘要保留此未知,不复制原版资源作为新产品界面。
|
||||
@@ -0,0 +1,33 @@
|
||||
# 主 APP 1.6.1(44)
|
||||
|
||||
本轮只改现有主 APP 的产品介绍、系统插件注册及退出体验。按用户最新说明,发布地址位于最顶部,关闭外层 APP 沙盒;登录、授权、加密、自动更新及后端均未接入。调色、渲染、参数、Uniform、预设、Metal 和 FCP 模板保持原样。
|
||||
|
||||
## 最终界面与交互
|
||||
|
||||
沿用 Objective-C/AppKit、Nib 连线和手动内存管理。采用 standard 档原生交互,深色静态渐变、圆角彩色卡片和胶囊按钮呼应参考图。比较单列介绍、左右双栏、状态+使用指引+双列特色三种结构后,选择第三种:顶部可点击的发布地址 https://dayu.media,随后产品名称/版本、插件注册与宿主检查,最后四张完整调色、LUT、胶片、蒙版叠层特色卡。默认920×850,最小760×620,纵向滚动。
|
||||
|
||||
每次启动:检查内嵌组件 → 提交注册 → 系统回读确认。成功后在注册卡片内清晰显示3→2→1秒倒计时并退出,取消了旧版底部难以看到的提示。查看介绍/⌘I取消本次自动退出;⌘R可重新检查,工作期间防止重复提交;⌘W关闭窗口、⌘Q退出。失败时保留窗口和重试入口。
|
||||
|
||||
“打开FCP检查”会保留本窗口,并按Bundle ID打开Final Cut Pro。用户在FCP内将大鱼调色应用到片段,确认画面与调节正常后,可点击“已确认正常,退出”。系统注册成功与宿主功能确认分开记录;自动化不代替用户点击确认。Motion也有明确入口,覆盖正式及历史两种宿主Bundle ID。
|
||||
|
||||
## 系统登记与权限
|
||||
|
||||
外层AppDelegate拥有唯一注册状态:checking → registering → ready/failed。PluginKit操作在后台队列,UI在主线程。先验证精确内嵌组件的Bundle ID、当前构建号、FxPlug协议及登记版本1.1,再向/usr/bin/pluginkit提交独立路径参数;查询返回的标识/协议/完整路径必须匹配。1.1是登记协议版本,不是APP版本。不使用shell字符串、不需管理员提权、不改变其他插件的用户选择。
|
||||
|
||||
40/41候选发现沙盒允许注册却拒绝CLI的PKDiscoverAll查询,即使不带-A也会失败,不能把它解释为“插件未注册”。用户随后明确允许关闭沙盒。最终移除主APP的app-sandbox entitlement,查询可直接回读;不采用42候选的应答降级。内嵌服务原本未启用该沙盒,Developer ID、Hardened Runtime、可信时间戳、公证、票据及Gatekeeper要求保持。
|
||||
|
||||
本机诊断写入 ~/Library/Application Support/com.dayu.color/Registration.json,记录登记应答、实际路径、版本、进程、退出原因及用户确认,不联网、不含凭据。--show-introduction可保留介绍,仍执行真实注册流程。
|
||||
|
||||
## 视觉与无障碍
|
||||
|
||||
使用原生按钮、可访问文本、键盘快捷键、焦点环和状态播报。不使用透明采样、模糊、着色器或装饰性动画;增强对比度加粗边界,进度采用系统控件。实际测试、未覆盖的VoiceOver/系统显示选项及暂定评分以verification/MainApp1.6.1.json为准,不仅凭截图宣称90分质量。
|
||||
|
||||
## 来源、身份与交付
|
||||
|
||||
只读参考用户指定的 https://dayu.media/git/dayu/fcpx-qwen3-asr.git ,提交113069c74aff935db2082b5bcd8e1aa47fe1fbf2中的ContentView.swift、LicenseViewModel.swift;借鉴配色和层级,没有引入其会员、计费或识别业务代码。
|
||||
|
||||
唯一正式路径 /Library/Plug-Ins/FxPlug/大鱼调色.app;主/服务Bundle ID为com.dayu.color、com.dayu.color.XPC,版本同步1.6.1(44)。实际编译源码90d6022520c59ea34f42b511daee85ac2936cfd9。40/41/43是本轮定位或界面候选,42未安装,均不发布安装包;历史已发布版本及用户验收媒体/预设保留。
|
||||
|
||||
APP签名、公证、票据、正式安装、自检见verification/Delivery.json和InstalledSelfTest.json;主界面/注册验证见MainApp1.6.1.json;安装包、Release及独立恢复见Package.json、Release.json和MainAppRecovery1.6.1.json。以各记录的实际状态为准,不将系统登记等同于用户已确认宿主功能。
|
||||
|
||||
2026-11-02:用户针对正式1.6.1(44)在FCP中应用插件、检查画面和调节的验收问题明确回复“已确认正常”。本轮宿主用户验收已完成,证据见verification/HostUserConfirmation1.6.1.json。此后仅补录验收文档,不重编译、增加构建号或重发安装包。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 1.4.3(33)蒙版面板随模块折叠
|
||||
|
||||
用户报告模块收起后蒙版面板仍显示。正式1.4.2(31)中已复现:蜘蛛盘标题为折叠状态,蒙版类型、几何参数与跟踪控件仍出现在检视器。当前完整预设(含286个轨迹键)已先保存到本机验收缓存。
|
||||
|
||||
原因是DYInspector布局在内容高度累计和行显示两处,均把DYToolMaskPanel排除在collapsed条件之外。两处统一遵循模块折叠状态,折叠后隐藏整个蒙版面板并去掉占用高度;展开后恢复已有蒙版控件。原模块和新增独立层使用同一布局代码。
|
||||
|
||||
用户补充希望折叠后能辨认有蒙版的层:标题栏蒙版图标增加数量徽标(1–16),无蒙版时隐藏,启停蒙版都计入已添加数量。徽标不拦截鼠标,蒙版按钮的提示及辅助说明同步数量。五套主题从现有配色取色,展开和折叠时均保留标记。32版仅折叠修复候选完成公证安装,未发布;33版包含本次补充。
|
||||
|
||||
本次只改布局、标题栏状态显示和版本元数据,不改变启用、调色、蒙版几何、轨迹、合成方式或渲染代码。沿用现有原生检查,在正式签名公证安装后验证原模块及新增层的折叠、展开和状态保留;不为这次布局修复另写重复单元测试。
|
||||
|
||||
正式宿主和交付结果见 verification/HostMaskFolding1.4.3.json、Delivery.json、Package.json、Release.json 对应版本记录。用户预设和项目快照保留在本机,不进入Git。
|
||||
|
||||
最终33版正式路径293项检查通过。FCP验证蒙版面板随原模块和独立HSL层分别折叠,折叠后保留2/1数量标记;删除到零隐藏、撤销恢复,包含停用蒙版。用户77276字节预设和286个轨迹键不变,合成片段8471字节预设在操作前后及冷重开逐字节一致。蓝色主题实屏标记清楚可读;未单独遍历其它主题、Motion或Intel。
|
||||
@@ -0,0 +1,95 @@
|
||||
# 续作方案:工具实例、蒙版与跟踪
|
||||
|
||||
2026-11-01。**这是下一阶段方案,尚未实现。** 用户明确要增加蒙版、跟踪和可添加工具,并举例“一层 HSL 不够,再加一个 HSL”。本文的具体类型、按钮和实施顺序为建议,不把参考库现有全部功能自动扩为新产品的承诺。
|
||||
|
||||
## 一、先解决多个 HSL 的身份和执行问题
|
||||
|
||||
当前固定 HSL 在 `DYModel.mm` 注册,使用 `DYUniforms` 的一组 `hsl*` 字段,`DYColorTables.mm` 构造一份 24 参数 HSL 查表。`DYGrade.metal` 调用融合的 `dy_grade`,蜘蛛盘随后执行。CST 位于原有显示域调色链之前。
|
||||
|
||||
推荐为可添加工具建立统一实例模型;先开放 HSL,一旦成立再扩展支持的类型。一个实例至少保存稳定 UUID、工具类型及版本、名称、启用状态、混合强度、独立参数和其蒙版引用;作者文档保存有序实例列表。显示名称和列表位置都不能代替身份。
|
||||
|
||||
界面最小闭环:添加工具 → HSL → 出现第二张独立 HSL 卡片 → 调整各自参数 → 单独启停/折叠 → 保存重开仍互不覆盖。复制、删除、重命名、排序是适合此模型的后续操作建议;若本阶段提供,均须使用同一作者状态和单次宿主撤销。
|
||||
|
||||
折叠只写 `folds[nodeID]` 一类界面状态,眼睛写实例启用;不能共用现有 `folds["hsl"]`。所有控件回调、异步加载、选中目标和 Undo 都绑定 nodeID + 参数键,不能绑定可能因插入/删除变化的数组下标。
|
||||
|
||||
### 渲染与旧参数的适配
|
||||
|
||||
先写清工具顺序和每个阶段的颜色域。保持 CST 输入/一级/输出的现有全局前段;新增 HSL 不应再执行一次 CST 或其它全局调整。当前固定链有融合内核,**不能为每个工具直接重复调用整个 `renderSource`**,否则会重复曝光、LUT、统计或空间处理。
|
||||
|
||||
原固定 HSL 可用稳定的兼容实例映射到原参数 ID,以保留旧工程和已有宿主动画;新增 HSL 必须有自己的参数存储与缓存。若需要将原链拆成可重排阶段,先做旧路径与拆分路径数值回归,再让新文档使用新计划。若先采用附加工具段,也必须在界面和文档明确其实际执行位置,不能让 UI 顺序与渲染顺序不同。
|
||||
|
||||
无新增状态的旧工程必须沿用原路径;显式迁移后记录格式版本,避免同一 HSL 同时从旧融合链和新实例链执行两次。旧参数 ID、枚举值、944 字节 ABI 前缀不能重排。新工具使用中性参数时应直通;关闭工具、混合为零或空新增列表应恢复原结果。
|
||||
|
||||
每个实例的查表/中间纹理缓存至少按 device、类型、完整有效参数和相关域信息隔离。第一层调值不能污染第二层。建立完整帧/分块、半透明、负值/HDR、重排以及连续多实例的检查,不把“面板能多开”当成多工具渲染已完成。
|
||||
|
||||
## 二、作者状态、动画和预设先定合同
|
||||
|
||||
本项目现有 `DYAssetState` 在参数 9001,标志含 `NOT_ANIMATABLE`。可以保留它存 LUT/蜘蛛盘资源;若新增工具参数需要宿主关键帧,须另行选择可动画的参数方案或明确时间化作者状态,不能直接塞入 9001 后默认为支持关键帧。
|
||||
|
||||
需区分:宿主可动画参数、工具/蒙版作者数据、逐帧求值后的不可变渲染计划,以及可丢弃缓存。轨迹作者数据随工程保存,运行计划按给定 CMTime 求值,不能由 UI 当前播放头或可变全局选择决定渲染。
|
||||
|
||||
所有新增类型应覆盖 NSSecureCoding 白名单、copy、isEqual、hash、验证、资源路径、预设、宿主归档和渲染状态。当前 InspectorToken schema 2、预设 JSON v3、临时 render-state schema 1 分属不同格式。不要用一次任意“schema++”代替各格式的明确迁移。
|
||||
|
||||
对新数据设置数量/大小/嵌套上限,验证有限数值、合法工具类型、UUID 唯一和引用完整性。失败加载保持旧作者文档;不加载任意类。必要时为当前插件增加明确文档格式,而不是依赖不可版本化的 UI 对象。
|
||||
|
||||
## 三、把蒙版绑定到工具实例
|
||||
|
||||
建议先移植矩形、椭圆和闭合钢笔;羽化、反转、强度和组合规则应有明确数学定义。其它 HSL/亮度键、人物或外部蒙版只作为父库的后续候选,未获本轮逐项指定。
|
||||
|
||||
每个工具保存自己的蒙版列表和当前蒙版 ID。首阶段优先正常混合:`output = mix(toolInput, toolResult, clamp(maskCoverage * toolOpacity, 0, 1))`。多蒙版的加/减/交集顺序、无蒙版的覆盖语义、空路径和禁用蒙版的含义须先确定并测试。不要用一个全局蒙版同时影响所有 HSL。
|
||||
|
||||
CPU、Metal、预览和 OSC 共用坐标合同:源图/目的图范围、宿主 tile bounds、top/bottom origin、非方形像素、缩放/旋转及视图变换都要处理。计算蒙版不能依赖检查器或浏览器尺寸。保留 alpha,明确直通 RGB 与预乘 RGB 的转换和混合边界。
|
||||
|
||||
画面控件通过宿主的 OSC 机制绘制,使用当前效果实例和稳定工具/蒙版 ID 隔离。点击效果标题、开关显示控件、关闭工具窗口后是否保留轮廓等行为在正式 FCP 中验证。不要自建一张静帧预览来冒充宿主当前画面的编辑和跟踪。
|
||||
|
||||
## 四、跟踪移植的范围与易错点
|
||||
|
||||
父库正式68采用 Metal 图像金字塔/正反光流与确定性 RANSAC,输出位置、旋转和独立横纵缩放。其输出合同不包括透视/剪切。建议复用前向、后向、同参考帧双向和前后单帧;连续范围、单帧参考区间、取消行为均按精确帧长定义,不猜帧率。
|
||||
|
||||
从宿主分析接口取得实际源帧。当前 `lookLUTPreview` 只是 320×180 预览,不足以替代最终跟踪输入;也不能靠拖动播放头或缓存最后一帧伪造完整分析。需要检查、实现并验证 FxAnalyzer / FxAnalysisAPI 生命周期和真实帧调度。
|
||||
|
||||
分析开始时冻结效果实例、文档/工具/蒙版 ID、形状 revision、参考 CMTime、范围和帧长。每次结果发布验证目标仍匹配;切片段、切实例、删除工具、编辑蒙版或新一轮分析后,过时回调不得写回当前文档。
|
||||
|
||||
将手工键和自动轨迹分开保存;手工修正优先,合并只替换指定区间的可替换自动结果,保留区间外轨迹、羽化和强度动画。取消保留可信段;空结果不制造作者编辑。低置信度/丢失要有明确提示,不能静默填成功或持续外推。
|
||||
|
||||
**先读父库 `research/tracking-host-lifecycle.md`。** 它记录过提前返回后不收尾、跨 action 分组无效、预览刷新吃掉 Undo/Redo、旧实例在切片段后持续刷新等实际问题。当前可复用方案在准备好结果后,单个有效 action 内完成命名 Undo 起止和完整作者状态写入,然后 endAction;分析收尾保证一次,迟到/重复收尾不再编辑。别恢复早期58–67的已知问题流程。
|
||||
|
||||
## 五、参考库导航(只读)
|
||||
|
||||
本次核对:`/Volumes/备份/大鱼调色/大鱼调色盘`,HEAD `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7`;正式68源码 `d05994d5f4547687511bef524efe8c881e8a5c9c`。接手时先检查差异,若参考更新则固定并记录新节点。
|
||||
|
||||
| 参考入口 | 复用方向 |
|
||||
| --- | --- |
|
||||
| `HANDOFF.md`、`verification/release-2.0.0-build68.json` | 正式68的真实完成范围与宿主证据 |
|
||||
| `Sources/DYSettings.h/.mm` | 作者文档、图层、每层蒙版与归档 |
|
||||
| `Sources/DYPanelLayers.inc` | 图层/工具列表操作与编辑目标 |
|
||||
| `Sources/DYMaskState.h/.mm` | 精确 CMTime、手动/自动键、形状与变换求值 |
|
||||
| `Core/DYMask.h`、`DYMaskOperator.h`、`DYLayerPlan.h` | 蒙版数学、组合/源阶段、渲染计划 |
|
||||
| `Sources/DYPanelMasks.inc`、`DYInspectorMaskControls.inc` | 蒙版编辑器、宿主检查器入口 |
|
||||
| `Core/DYTracker.hpp`、`Sources/DYMetalTracker.h/.mm` | 光流后端、RANSAC、结果/区间合并 |
|
||||
| `Sources/DYPlugin.mm` | FxAnalyzer、目标冻结、取消/收尾、预览归属、Undo 提交 |
|
||||
| `Sources/DYRenderer.mm`、`Shaders/DYColor.metal` | 计划执行、纹理与蒙版合成,需适配本项目 |
|
||||
| `research/tracking-host-lifecycle.md` | 宿主生命周期、单 action 撤销和旧实例刷新防护 |
|
||||
| `Tools/test_tracking.py`、`Tools/test_mask_refinement.py` | 参考测试和合成运动素材思路,不能替代本产品验收 |
|
||||
|
||||
父库有独立 Bundle ID、参数表、1032 字节 DYGrade、作者格式和更大的产品范围。本项目为 1104 字节 DYUniforms。按功能适配源码,保留本产品颜色链和品牌/安装身份;不整仓覆盖、不盲抄 PID/结构体,不把父库已验收数量记成本项目通过。移入源码时记录来源节点、文件摘要与必要资源,构建不得依赖兄弟 APP 或另一目录运行时存在。
|
||||
|
||||
## 六、建议里程碑与验收
|
||||
|
||||
| 阶段 | 可交付行为 | 最低验收重点 |
|
||||
| --- | --- | --- |
|
||||
| A:两个 HSL | 独立添加、调值、眼睛和折叠;实例保存 | 不共用参数/缓存;旧工程画面不变;删除/插入不串目标;单次 Undo/Redo;重开与预设 |
|
||||
| B:每实例蒙版 | 两个 HSL 分别影响不同区域 | 蒙版/羽化/反转/透明度 CPU–GPU 对照;原点、tile、4K与非方形画面;关闭精确旁路 |
|
||||
| C:宿主控件 | 在 FCP 检视器画与改蒙版 | 当前实例隔离、真实拖动/绘制、工具窗口关闭后的行为、一次手势一次撤销 |
|
||||
| D:跟踪 | 实际运动帧驱动对应蒙版 | 前后/双向/单帧;取消可信段;低置信度;手工键优先;精确 CMTime;切片段/旧回调隔离 |
|
||||
| E:正式回归 | 保存、导出、性能与发行 | 冷重开轨迹完整一致;一次 Undo/Redo 的作者文档核对;旧预设/工程、CST/蜘蛛盘/LUT 回归;正式交付 |
|
||||
|
||||
用本产品独立合成源验证平移、旋转、独立轴缩放、边界/透明、局部遮挡或目标离画;量化中心和尺寸误差,并区分算法样本与实机结果。对任意遮挡不能作无证据保证。导出后检查完整运动序列,不能只看静态首帧轮廓。
|
||||
|
||||
新增无蒙版、无逐帧依赖的逐像素 HSL 可表达为 LUT;空间蒙版和跟踪不能完整写入普通 3D Cube。到实现时应明确选择阻止完整导出、或让用户明确导出全局部分,并在 UI 说明;不得静默丢掉局部调色后仍称完整一致。
|
||||
|
||||
## 七、工作与交付边界
|
||||
|
||||
本轮只交接,不实现这些功能、不改变正式 1.3.1(19)。下一轮遵循 `/Users/mac/.codex/AGENTS.md`:先保护当前工作,保存并推送阶段检查点;构建/CLI 测试在固定缓存,用户可见测试走已签名公证的唯一正式安装。新增功能后递增版本/构建号,刷新模型模板,完整签名、公证、安装、FCP 验收、清理、PKG、Release 完整下载与远端恢复。
|
||||
|
||||
用户正在使用浏览器时,不为额外测试重启或复位其工程。优先用新合成测试库,完整保留其 LUT、预设、最近使用和现有轨迹。此任务不需要 NAS 后端部署,不新增生产服务。
|
||||
@@ -0,0 +1,39 @@
|
||||
# 1.4.1:就地插层、蒙版可读性和钢笔修复
|
||||
|
||||
基线为1.4.0(24)后的主分支 `745aa1626e1df368290fbbd47a716ff3ce9ca630`。本轮原生Release构建281项检查通过,独立跟踪18项检查通过。正式签名、公证、宿主和安装包状态分别以 `verification/Delivery.json`、宿主记录、`Package.json`、`Release.json` 为准;此说明不代替实机验收。
|
||||
|
||||
## 插入位置与运算
|
||||
|
||||
新建工具文档schema2的节点保存 `after` 锚点,可引用原工具或另一个工具UUID。点击原HSL或新增HSL的“再加一层”,新层立即排在该层之后。再次点击原层时插在原层与此前第二层之间;删除层重接后续节点。参数仍从初始化值开始,独立保存身份、折叠、启停、蒙版和资源。
|
||||
|
||||
schema1及没有after的既有1.4.0尾部层保留原位置和原数学,不在打开旧工程时偷偷改变调色;新层和旧尾部层的子层可并存。序号按当前显示位置生成,作者身份始终为UUID。
|
||||
|
||||
原固定融合链的操作顺序早于当前界面分组,不重新排列旧模块。活跃插入通过独立分段内核执行在原工具的实际阶段之后;基础调整在第二阶段后、CST在前段、蜘蛛盘在原末端。原始内核保留,没有活跃新增层时使用原融合路径,初始化新层像素精确直通。
|
||||
|
||||
分段保留首次CST后的原图,供原邻域、白点统计、亮度权重和蒙版取样;保留原uniform及旧输入LUT,只禁止后段再次CST。肤色参考保留在原HSL之前。部分黑白混合若被黑白/LUT锚点切开,在共同前缀后保留黑白与彩色两支,原肤色之后混合,再执行新增肤色与一次蜘蛛盘。可证明全零覆盖的额外工具直接复制输入,避免空蒙版额外裁切HDR/负值。
|
||||
|
||||
HSL与后续颜色分级、红通道曲线与HSL的独立非交换参照,以及Cube同序检查通过。CST、原三原色+白点统计/纹理、旧输入LUT、亮度选区、肤色、基础第二阶段、部分黑白混合和蜘蛛盘的零覆盖插层参照通过,分段半浮点最大差异约0.001465。此差异不适用于所有素材和参数组合的精度保证。
|
||||
|
||||
## 蒙版控件与钢笔
|
||||
|
||||
面板参数与数字为13pt,状态12pt;数值框88×32pt,滑条单独占一行,操作按钮32–36pt高,跟踪按钮两列三行。六种类型在220/300/420pt宽度的边界、不重叠、字号和目标尺寸检查通过。画面工具栏依据宿主backingScaleFactor绘制,短画面换列。
|
||||
|
||||
修复检视器添加钢笔未携带绘制态的问题,提供“重画钢笔”“完成绘制”“取消绘制”。点击放点、按住拖出共线双柄,鼠标移动显示下一段预览;至少三个点时点首节点、Return或完成按钮闭合。Delete回退未提交点,选中已闭合路径节点可删除(至少保留三点)。Esc/取消恢复原作者路径。绘制中禁用跟踪,完成或取消后恢复。
|
||||
|
||||
OSC回调只在锁内更新内存草稿,立即供下一次绘制读取;宿主参数提交留到回调结束后的主队列,形成一次撤销。连续手势排队保留,跨帧草稿、过期目标和迟到模式通知拒绝覆盖。绘制、命中和坐标缓存也有自身互斥。画面位图上下坐标与AppKit上下文方向保持一致,修正钢笔提示条文字翻转。原生检查覆盖检视器入口、默认形状外放点、即时预览、曲柄、首节点/Return闭合、完成/取消按钮、归档、连续手势和跨帧拒绝。
|
||||
|
||||
## Color Finale 对照与跟踪
|
||||
|
||||
本机Color Finale 2.16.2(625)只读静态证据、精确产物摘要和迁移边界见 `ColorFinaleMasksFollowup.md/.json`。没有复制原版反编译源码、二进制、图标或运行库作为产品依赖。
|
||||
|
||||
修复原跟踪器将钢笔区域预先裁到创建框±0.5的问题。特征搜索边界由实际变换后的路径推导,保留真实多边形判断;300特征、相对质量0.03、10像素间隔、亚像素精炼、21×21 LK、最多4级、30次迭代、每两帧重检测。继续保留现有严格仿射拟合、置信度、丢失停止和手工键优先。宿主实际分析采样上限3840×2160,兼顾像素长宽比。
|
||||
|
||||
默认框外钢笔纹理在旧版检出0点、无法启动,新版117点;12帧亚像素运动末帧误差约X0.0073/Y0.0323像素。独立CPU与真实Metal18项覆盖300点容量、旋转、独立缩放、静止、换景/低纹理拒绝及4K;本产品281项原生集成同时覆盖实际插件FxAnalyzer回调的精确帧序、撤销、取消和过期写入。
|
||||
|
||||
这些是有证据的独立重建与适配,不代表Color Finale全部蒙版系统已经完整迁移。B样条、多选/编组、图像/人物/外部蒙版、来源和轨迹区段编辑等差异见专项清单;未进行同一真实视频的完整原版轨迹等价对照。旧系统、Intel、Motion和非方像素/变速工程仍需实机覆盖。
|
||||
|
||||
## 正式宿主验收
|
||||
|
||||
1.4.1(26)APP公证Accepted,唯一正式安装与281项原生检查通过。FCP12.4在独立合成工程中验证:相邻插入、连续原层点击插入顺序、零参数新层与32色相既有层独立、放大面板、绘制态/跟踪禁用、提示文字方向、钢笔蒙版正向99键和一次撤销/重做。冷重开后完整预设逐字节相同。
|
||||
|
||||
CUA坐标输入未进入原生OSC回调;用户随后实际鼠标确认“可以绘制并闭合”,钢笔放点与闭合通过。跟踪宿主验收使用现存默认闭合四点钢笔路径,不称为新手绘路径。真实鼠标中心拖动有1.4.0用户确认;本轮钢笔确认仅覆盖放点和闭合,不扩大为曲柄、删除、旋转/缩放等全部手势已实测。记录见 `verification/HostMaskWorkflow1.4.1.json`。
|
||||
@@ -0,0 +1,61 @@
|
||||
# 八种印片外观:1.6.0接续
|
||||
|
||||
2026-11-02。用户补充明确纳入八种印片外观,接续已交付1.5.0(34);基线main `e7fa8e6cf5690395272cbb76d7698dba77883b01`,正式版在开发期间保留。
|
||||
|
||||
## 参考取证
|
||||
|
||||
本机Color Finale 2.16.2(625),RenderingEngine SHA `32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3`,GradeKit SHA `e868a8c6df64bf03b7c24af5657c5ac7a2259a1943dfe06e01dbb7881df018a3`。REA/Ghidra12.1.4只读分析,两个会话均已关闭。快照在本机ColorResearch的 `dayu-print-rendering-snapshot-20261102.json` / `dayu-print-gradekit-snapshot-20261102.json`,原版运行探针和导出留在同目录的 `dayu-film-mixer-20261102/print-reference`。
|
||||
|
||||
- 资源装载与binary16转RGBA32:`ev_2963c6285fc85f3255d57d56657e98c3a81446bd0d0cafa5046d6298b84af7cb`;65³红轴最快。独立解码后八份RGBA32全部与原版 `cubeData` 逐字节一致,摘要见 `PrintLooksResources.json`。移入产品的只有重新封装的数值数据,没有原版可执行文件、framework或shader。
|
||||
- 原版LMT processor:`ev_64067f2914fc23f8e1e2a47a9a272076b4c7842907dfde08a6308de87d46904e`;Metal AIR `FTAcesLMT` 用0–1限幅、六分支四面体插值,保留预乘alpha。
|
||||
- 顺序:`ev_b38658366c168d4336e0998f030a8024b73f79119b764eff1df82fc822118462`,stack转换→LMT→ODT;stack曲线合同 `ev_9993ec73114bb2de791e5ddb43bc422ad4666b34e40dd0d2d9e2326ddb8ba27e`。
|
||||
- 默认工作空间明确为ACEScct:`ev_7f30f36b78c55e71b807e378fd6b53e6d0f75db2123160d35800b6b60dcf788b`。ACEScc仅是未指定时的旧回退,不替代当前默认。
|
||||
- `inspect_colorfinale_print --matrix` 通过原版FTColorSpaceFilter核对Rec.709线性↔ACEScg(AP1/D60)矩阵,白点往返为1;Core Image上下方向另由输出对照控制。
|
||||
|
||||
## 接入合同
|
||||
|
||||
在胶片五处理之后、全胶片mix和蒙版之前追加印片点阶段。沿用本工程显示链宿主线性Rec.709边界,转换AP1/D60→ACEScct→原LMT四面体采样→ACEScct解码→线性Rec.709;按印片强度混合,再沿用总强度与原蒙版。这是独立模块接入,不将原版任意ACES ODT或完整CMS偷偷移入旧链。
|
||||
|
||||
新增第六页“印片”,默认无,八项Kodak2383/2393/2302 BW、Fuji3510/3513/3519/3521、AgfaCP30;旧参数、1.5.0的1296字节前缀及颗粒时间位置保留。预设v6继续读旧版本,新参数缺省中性,独立层默认无。印片是逐像素变换,可写入静态Cube;空间、时间和蒙版限制继续保留。
|
||||
|
||||
1.6.0候选阶段渲染和模板已经编译。393项原生检查全部通过,含既有349项及八种印片资源/输出、强度/眼睛/总混合精确旁路、独立两层归档、蒙版和Cube格点对照。四尺寸64×48、63×47、1×17、17×1共136项原版颜色函数对照通过,固定容差0.0001,最大线性RGB绝对差0.000004827976;记录 `verification/PrintLooksNative.json`、`PrintLooksReference.json`。远端节点 `ab7cb759e57cc9c2a4725426bced67af55155654` 已独立恢复280文件、全字节比较/full-strict fsck、Release构建及393检查通过,见 `PrintLooksRecovery.json`。
|
||||
|
||||
透明度边界已单独取证:原版FTColorSpaceFilter将RGB当直色值转换,LMT processor则按预乘alpha读取。直接用fractional-alpha把两者串联不等于颜色函数,最大偏差3.975311214;八外观alpha=1颜色对照全部通过。32个保活转换filter身份互异,排除共享可变单例。对照工具完整保留原始链、每alpha分组及各中间图样本的诊断,不调整容差掩盖差异。正式算法采用原版alpha=1颜色函数并保持本产品的输入/输出预乘合同,透明像素保留、非透明像素显式解预乘/再预乘;这是有记录的适配,不声称原版Core Image直串在半透明时逐像素等效。
|
||||
|
||||
上述为开发检查点;最终正式交付与宿主结果见下节。
|
||||
|
||||
## 用户补充:去除模板版权与较低版本格式
|
||||
|
||||
用户截图要求去掉MOEF顶部作者和网站两行,并尽量兼容旧FCP。生成器已移除完整Rig、两个展示菜单、相关factory与发布项,仅保留自定义检查器和混合两个发布入口。按真实本机ColorFinale/Pro同结构模板,输出采用ozml5.11 / Motion5.4.5;移除本壳未使用的Object3DEnvironments、DRTSupport、onHDRDisplay和missingDynamicRangeType提示,内部factory/scenenode版本及色彩域不改。来源与schema边界见 `template/sources/Provenance.json`、`template/verification/Compatibility.json`。
|
||||
|
||||
全局技能检查器的5.11版本guard未知如实保留;项目级验证有真实5.11相同选择字段证据。只降低格式门槛,不据此承诺旧FCP实机通过,程序的Apple Silicon/macOS14.6依赖保持。
|
||||
|
||||
35候选已公证Accepted `3819fbc3-6b7d-4b89-b09a-3e5d9c0f0851` 并粘附,但宿主在替换前重开,交付安全门保留正式1.5.0未替换。用户截图显示1.6.0,随后发现PluginKit同时登记正式1.5和构建目录候选,说明宿主可能发现了构建副本;未将此计为正式验收。之后用户新增模板要求,候选35及提交ZIP已清理,不重新提交同一包。最终版本递增为1.6.0(36),包含新的模板和签名。`tools/deliver.py`现在会在Xcode构建后立刻移除构建副本的PluginKit登记,避免公证等待期间被宿主发现。该阶段的状态见 `verification/PrintLooksBuild35Superseded.json`。
|
||||
|
||||
## 八外观候选36的正式安装与FCP验收
|
||||
|
||||
八外观候选1.6.0(36)实际编译源码 `f97320bbee6d469596f2db72a48436b73a41b324`;APP公证 `91224ae2-68d3-4776-a9b7-2fdf8ffaea4f` Accepted。正式路径签名、票据、Gatekeeper通过;PluginKit仅正式路径,FCP12.4实际XPC也来自该路径。393项正式自检通过,八外观独立对照仍为136项,容差未放宽。
|
||||
|
||||
升级前用户v5完整预设276个旧值、LUT路径、蜘蛛盘和工具载荷保持;新v6增加look0/strength1两个中性参数。已存在效果和新效果均无作者/网站两行。正式FCP逐一选择八种印片;新增独立层从“无”初始化。组合项目base Kodak2383强度1、独立Fuji3513强度0.4、base椭圆蒙版100个跟踪键通过,折叠标记、删除/撤销/重做保留。
|
||||
|
||||
Agfa、Kodak黑白、叠层蒙版三个4秒/25p ProRes共300帧完整解码;黑白16位RGB通道最大差0。正常退出宿主并冷启动后,三份完整预设8474、8456、32554字节分别与重开前逐字节一致。完整私人文件不上传,仅记录摘要和数量于 `verification/HostPrintLooks1.6.0.json`。
|
||||
|
||||
APP模板ozml5.11 / Motion5.4.5的当前FCP12.4加载、渲染及清洁界面通过;旧FCP未实机测试。恢复节点已更新为最终编译SHA,287文件逐字节比较、Release构建、393项检查、低版本模板字节重建通过。PKG与Release最终证据见Package/Release记录。
|
||||
|
||||
## 默认映射与标题链接接续
|
||||
|
||||
用户随后要求一级自动映射默认开启,并在主标题放置可点击的“更多插件访问 https://dayu.media”。39版保留Native参数的历史存储默认0,以新MOEF的value1/default0明确初始化新FCP效果,模型还原默认1;新独立一级层显式保存1,旧层省略值保持0。新层自动映射开启时不能被中性层优化跳过。标题链接为原生可访问Link控件,有指针/下划线/主题色,位于主标题区;不恢复MOEF的作者/网站Rig。
|
||||
|
||||
候选37预检394项通过,但最终检查发现独立一级层的中性判断需更新,公证等待被中断并保留原submission ID查询,未重复上传该产物。38版已公证并正式安装验证,发现FCP会省略旧零默认,直接改注册默认会把旧项目改成开启,因此未验收发布;据此采用稳定注册默认与显式模板初值分离。候选36的已验PKG在用户新增需求后移除,未上传Release;历史说明及摘要保留在Build36/37/38记录中。
|
||||
|
||||
最终1.6.0(39)编译源码 `e5affd3f097fc96f87f41be8e1a3f131ed01daeb`。395项检查覆盖原有渲染、八印片及旧省略值/显式开关、新层处理等;原版136项印片对照及Metal摘要未改变。独立远端恢复294文件、全字节比较、Release构建、395检查及低版本模板字节重建通过。最终FCP默认与链接验收见 `verification/HostPrimaryDefaults1.6.0.json`,八外观完整历史验收见 `HostPrintLooksBuild36.json`;最终版保留验证见 `HostPrintLooks1.6.0.json`。
|
||||
|
||||
### 最终宿主边界与结果
|
||||
|
||||
39版APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted,唯一正式位置FCP12.4验收完成。新FCP效果自动映射1,新独立一级层1,全部还原1;实际点击标题Link后Edge打开 `https://dayu.media`。8668字节“主效果手动关闭/独立一级层开启”完整预设在冷重开前后逐字节一致。正式39版1080p25/4秒ProRes100帧完整解码通过。
|
||||
|
||||
稳定原生注册默认0保持原API合同,但实机证明它不能冻结FCP关联模板的旧默认:三组已保存印片主效果也从0跟随新模板到1。对比仅此用户要求的默认变化,其余277项值及paths/spider/tools完整载荷不变,主效果eye在这些印片夹具中原本关闭,印片渲染链不受该开关变化影响。不得把原生模拟宿主的旧默认0检查等同于旧FCP主效果逐字节不变。实际新手动关闭能保存,冷重开结果已证实。旧独立一级层省略值保留0的兼容逻辑仍有效。
|
||||
|
||||
最终Metal SHA `6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d` 与候选36及独立136项原版印片对照完全相同;最后两次补充只修改参数默认和原生界面/叠层跳过逻辑,没有修改八种印片数学。最终交付结合Build36完整八外观/100键跟踪/导出证据及Build39完整载荷对比、默认/链接/保存/当前导出证据,不将旧构建的界面操作冒充最终构建重复执行。
|
||||
|
||||
最终1.6.0(39)PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,20项展开验包通过。Release373/附件18发布,草稿与正式完整下载40,833,847字节和SHA `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca` 一致;标签0cc51149a6f21ebe09465b4fd7130451bedd57bb已独立恢复296文件,程序源码与编译节点e5affd3一致。当前APP和资源在固定位置;恢复构建、下载及生成APP副本已清理。
|
||||
@@ -0,0 +1,97 @@
|
||||
{
|
||||
"referenceVersion": "2.16.2 (625)",
|
||||
"referenceSHA256": "32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3",
|
||||
"tables": [
|
||||
{
|
||||
"index": 1,
|
||||
"name": "kodak_2383",
|
||||
"side": 65,
|
||||
"sourceSHA256": "9224997a8996a1c4d44ad489d66b3886e8137924f019e7001b3491b22020c269",
|
||||
"rgba32SHA256": "462407f0105a9588d78306f136dc1aacabadb8ac51771c540c9be2d7a85da06f",
|
||||
"bytes": 1256178,
|
||||
"sha256": "466a88c64ce7c96255acb081b5ff68bb02ba53cbfa54561fece5ef09397df666",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2383.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 2,
|
||||
"name": "kodak_2393",
|
||||
"side": 65,
|
||||
"sourceSHA256": "6bf05ba88600cf4597b8969e030179db2baef08b638ca05654df3c2472df06dd",
|
||||
"rgba32SHA256": "024e046ac2d4fad2493b1ba17de6b9269ea2ce2924ad0801700a57651fa2ff5b",
|
||||
"bytes": 1239890,
|
||||
"sha256": "fc49e73830eb12763cab29329de8485ba85476ec5823ce967e2d0d5e089984cc",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2393.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 3,
|
||||
"name": "kodak_2302_bw",
|
||||
"side": 65,
|
||||
"sourceSHA256": "00c4841c2f7fb1e40fe6452935b7c133a628fc8b41990aedfdc457907eeb1472",
|
||||
"rgba32SHA256": "6ef56e8e0ea4c16c1c333471db1ad3898335f2b336b7f1a76c8da4f7ac759ab0",
|
||||
"bytes": 466705,
|
||||
"sha256": "69e995a585b8386426b11f1839d817866194ceca34caab9dda4bf691b233ef33",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/kodak_2302_bw.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 4,
|
||||
"name": "fuji_3510",
|
||||
"side": 65,
|
||||
"sourceSHA256": "bd39cdd4e719a6fafdc7097e15d81ddb58a388f4a1c28bf147ce9a1cb7ecb28b",
|
||||
"rgba32SHA256": "b8658f5a0659f3a72bb98a3d171b90d20fe960a27d5220177ec8639fdd6b279e",
|
||||
"bytes": 1256103,
|
||||
"sha256": "2383db3a8e4c523af09d952709b3638459c9bef710080f787756d1c8cba26daf",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3510.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 5,
|
||||
"name": "fuji_3513",
|
||||
"side": 65,
|
||||
"sourceSHA256": "58eb01a447c21f4670765e435cdb7fddf3b3b4e042a76b30b91a906413723d6b",
|
||||
"rgba32SHA256": "946a1fbbbd9ddcbb98f9a3227e42d9e31cb15191051047134c7a69adc5c069d6",
|
||||
"bytes": 1233606,
|
||||
"sha256": "56c281c30f21c3344d21195ba16a5d8b850f5493cf487f4511929d036f6abdcf",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3513.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 6,
|
||||
"name": "fuji_3519",
|
||||
"side": 65,
|
||||
"sourceSHA256": "84ace607eefdac45c7f6b9c6ffe50271d70f7bbe56223dc47de19900ae9401c6",
|
||||
"rgba32SHA256": "01ea1984dc24998735ab42034f8d7bd19ef9f4c001f748e39a91c8923f1d6b1f",
|
||||
"bytes": 1231622,
|
||||
"sha256": "8c4891cc331634a36dbf40ead21c78f4a1dbd5283d29f351a43aadd6615040ee",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3519.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 7,
|
||||
"name": "fuji_3521",
|
||||
"side": 65,
|
||||
"sourceSHA256": "ac13b327ea6a2d5752b201f3cf0ecea1df375341935b6a3aa3c9494c0b6b866b",
|
||||
"rgba32SHA256": "592dd37648e2568e3747714bc87590126dac052e4b06f839d09590c462e86c00",
|
||||
"bytes": 1267728,
|
||||
"sha256": "8b508f5e2168657814f533c281d234a374299503f8abed5da769ac9989438e4e",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/fuji_3521.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
},
|
||||
{
|
||||
"index": 8,
|
||||
"name": "agfa_cp30",
|
||||
"side": 65,
|
||||
"sourceSHA256": "62b71c675e89ce161e4ad5cc37ffa28d882b1b724de4bb15a30da70fb3daa0d9",
|
||||
"rgba32SHA256": "744b01a229f4132aa5a95c468aad7d25d8d9407ddc28771d0398369bdcdba6e5",
|
||||
"bytes": 1276279,
|
||||
"sha256": "55f6c58df7959bbc2cf9c2d2893d6971674f13a257dbd4c2d2a285136279cd56",
|
||||
"resource": "\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks/agfa_cp30.dylut",
|
||||
"nativeCubeDataByteIdentical": true
|
||||
}
|
||||
],
|
||||
"cubeOrder": "red fastest; green; blue",
|
||||
"interpolation": "tetrahedral (six cases)",
|
||||
"sourceRole": "data only; no reference executable or shader shipped"
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# 蜘蛛盘和一级白平衡色轮的移植
|
||||
|
||||
参考仓库只读,来源节点及逐文件 SHA-256 在 `SpiderAndBalanceSources.json`;生产构建只使用当前仓库内的源码、图像与 Metal 资源。
|
||||
|
||||
## 蜘蛛盘
|
||||
|
||||
复用“大鱼调色盘”的可变网格、交互和 CPU/Metal 数学。新实例为 6×6(31 个节点),色相与饱和度点数可联动或独立选择 6、8、12、16、24。保留单点同列自由点联动、固定点仍可直接拖动、⌘ 多选、Shift 固定、框选、整环/整列选择、右键复位与键盘微调。
|
||||
|
||||
本项目的 AppKit 适配遵循原工程的手动内存管理,网格仍使用原始结构。中性网格在生产渲染中精确直通;变形网格在既有调色链后运行原始 `dyVariableSpider` 和 `dyLimit`,透明度按原预乘边界处理。眼睛和混合控制独立于折叠,Cube 导出复用相同路径。
|
||||
|
||||
网格、固定点、密度及联动状态保存在现有 DYAssetState 自定义参数中。预设 schema 3 增加 JSON 蜘蛛盘数据,旧预设恢复为中性新盘;旧模型和参数 ID 继续注册。主线程只写小型状态,渲染侧按 Metal device 缓存样本网格。
|
||||
|
||||
## 一级白平衡
|
||||
|
||||
复用“大鱼 CST”的色轮图像和交互换算:+104° 方位校正、拖动距离 /5、圆形强度约束、双击归零。一级色轮直接写原 BASIS 的方向与强度参数,取代可见的两根滑块;角度参数范围修正为 0–360°,旧存储数值保持原解释。原 BASIS 的强度平方后乘 4 换算不变。
|
||||
|
||||
色轮与蜘蛛盘每次拖动都由 FxUndoAPI 合并成一次宿主撤销;视图移除或释放时结束未完成动作。
|
||||
|
||||
## 面板与兼容
|
||||
|
||||
输入转换、工作空间、一级参数、输出转换合并为一个一级调色卡片。移除可见的四个旧旁路选项,一级眼睛统一启停;旧阶段开关和旁路参数仍保留注册,避免仅打开旧工程就改变画面。用户明确编辑 CST/色轮或复位时才清理旧旁路。
|
||||
|
||||
新实例与全部还原默认展开一级调色、蜘蛛盘校色仪、基础调整,其他模块折叠,所有眼睛开启。折叠状态仍由 InspectorToken schema 2 保存,与渲染状态分离。
|
||||
|
||||
验证分为原生数学/像素检查、AppKit 回调检查和正式 FCP 操作记录。数学覆盖见 `verification/SpiderMath.json`,原生集成见 `verification/SpiderAndBalance.json`;正式宿主记录单独保存,不以离屏回调代替用户界面验收。
|
||||
@@ -0,0 +1,41 @@
|
||||
[
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-colorplate.git",
|
||||
"commit": "f8950384e514685c8809fe8e8ee2dd5f16ad0bd7",
|
||||
"source": "Core/DYColorMath.h",
|
||||
"destination": "大鱼调色/Plugin/SpiderCore/DYColorMath.h",
|
||||
"sha256": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9"
|
||||
},
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-colorplate.git",
|
||||
"commit": "f8950384e514685c8809fe8e8ee2dd5f16ad0bd7",
|
||||
"source": "Core/DYSpiderMesh.hpp",
|
||||
"destination": "大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp",
|
||||
"sha256": "81ecf1f0bae4030615144c7cd7ca492f93f2d718ff9e45da8242f97848e3d754"
|
||||
},
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-cst.git",
|
||||
"commit": "973766b51dbcab3ab5092f1955d753575cd32d89",
|
||||
"source": "大鱼CST/Plugin/Resources/Basis_balanceWheel.png",
|
||||
"destination": "大鱼调色/Plugin/Resources/Basis_balanceWheel.png",
|
||||
"sha256": "56d6cc32611f90b53dfa2ae221d5d1c9633ae494b32bc3050ec85b8ad1220989"
|
||||
},
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-colorplate.git",
|
||||
"commit": "f8950384e514685c8809fe8e8ee2dd5f16ad0bd7",
|
||||
"source": "Sources/DYPanel.mm",
|
||||
"sourceSHA256": "80c6d07abab2d9a78a6c7070e2edf395289a952c731d05423681727aed97035e",
|
||||
"section": "DYSpider class and point-count controls",
|
||||
"adaptedDestination": "DYSpiderDisc.inc.h / DYNewPanels.inc.h",
|
||||
"adaptations": "Host parameter adapter, manual ownership and this product theme; original geometry and control math retained."
|
||||
},
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-cst.git",
|
||||
"commit": "973766b51dbcab3ab5092f1955d753575cd32d89",
|
||||
"source": "大鱼CST/Plugin/DayuCustomViews.mm",
|
||||
"sourceSHA256": "18e3bece1f627a24b875e9d02cbe938c183f6ed2ae9081e668ba460e5bf5d051",
|
||||
"section": "DayuBalanceWheelView: +104 degree orientation, /5 drag scale and radial clamp",
|
||||
"adaptedDestination": "DYNewPanels.inc.h",
|
||||
"adaptations": "Host parameter adapter, manual ownership and this product theme; original geometry and control math retained."
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,35 @@
|
||||
# 每工具蒙版与初始化叠层(1.4 开发记录)
|
||||
|
||||
基线:`edfb74b171f51d4beaa9926e27d2d80791fbf43c`,原正式版本 1.3.1(19)。当前正式安装 1.4.0(24),实际编译 `dbf25fe6719f17075362538dad0404951102524d`。以 verification/Delivery.json、HostToolMasks.json、Package.json 和 Release.json 分别核对安装、宿主、包和发布状态。
|
||||
|
||||
## 界面与顺序
|
||||
|
||||
十二个原模块标题栏均增加“添加蒙版”和“再加一层”。新增工具在原模块列表之后按添加顺序执行,使用稳定 UUID;不复制原层当前参数。每层保留原生 HSL、曲线、色轮、蜘蛛盘和 LUT 浏览器。独立启停、折叠、复位、删除;原层宿主 float ID 不动。新增一级使用 Rec.709/Gamma 2.4 同域输入输出,避免默认再次转换 Sony Log;新增肤色保护强度从零开始。
|
||||
|
||||
原有工具保留原融合内核顺序。单独增加 `dy_gradeMasked`,在原生运算各阶段按该模块覆盖率混合;基础调整原生分布的两个阶段共用它自己的蒙版。原 `dy_grade` 保留,不增加蒙版的旧工程调用它。蜘蛛盘在原末端、CST 在原前段,蒙版分别作用在自己的阶段。新增工具用只开启该工具的制服参数执行,不重放其它原模块。新增肤色保护以本次效果的源画面作为保护参考。
|
||||
|
||||
## 状态与数学
|
||||
|
||||
9002 为 `DYToolDocument` 静态作者参数,独立于旧9001资源参数;9003 为不随工程保存的 OSC 会话路由。新工具标量目前为静态作者值,不声称支持宿主标量关键帧。蒙版轨迹独立以精确 CMTime 存储,并在 pluginState 的给定时间求值。预设 v4 在 JSON 中用 base64 二进制 plist 保留完整工具/蒙版/轨迹,兼容载入 v1–3;无9002旧工程使用空文档。
|
||||
|
||||
最多32个新增工具;每工具16个蒙版;每蒙版16384个轨迹键,全文最多65536键和24MiB plist。验证工具类型、UUID、数值、路径/节点、时间顺序和合法参数。归档使用 NSSecureCoding 类白名单、独立 copy/equality/hash。缓存按设备/完整参数,非共享可变面板状态。循环纹理只保留当前与下一层,不将所有中间4K帧保留至函数结束。
|
||||
|
||||
六种蒙版:矩形、椭圆、闭合贝塞尔、线性渐变、HSL、亮度;复用父库128字节蒙版参数及原始覆盖数学。多蒙版有序相加 `1-(1-a)*(1-b)`、减去 `a*(1-b)`、相交 `a*b`;第一项减去从1开始;无启用蒙版为全覆盖。色彩选区取本段输入的显示编码色;几何使用源图完整范围、原点和像素长宽比。各运算在既有颜色域混合,保持alpha。空间蒙版/跟踪不能用Cube表达,导出时明确拒绝,完整预设可保留。
|
||||
|
||||
## 宿主画面与跟踪
|
||||
|
||||
原生 FxOnScreenControl_v4 注册到本产品 UUID。画面工具栏提供选择、钢笔、矩形、椭圆、渐变、HSL、亮度及显示开关;面板提供相同类型和数值编辑作为替代操作。中心、大小、旋转、钢笔节点和手柄在宿主真实画面编辑;钢笔 Enter 闭合、Escape 取消。画面手势先编辑内存草稿,结束时在单个 host action 中提交一次撤销。
|
||||
|
||||
跟踪从父库移植 Metal 金字塔/正反光流及确定性仿射 RANSAC(来源与摘要见 ToolMaskPort.json)。通过 FxAnalyzer 请求宿主实际完整源帧;960宽采样区别于320×180浏览器预览。参考帧和分析首帧比对方向;帧调度采用精确CMTime,遇到重复、跳帧、尺寸变化或低置信度停止。输出位置、旋转、独立宽高,不含透视和剪切。矩形/椭圆/闭合钢笔可前向、后向、双向、单帧跟踪。取消保留可信连续段,手工键优先,保留区间外键。冻结目标UUID和完整蒙版,过期目标不回写。一次收尾防重入、宿主状态轮询补缺失cleanup;结果准备好后单action写入、单次撤销。没有周期写入预览参数。
|
||||
|
||||
## 验证入口
|
||||
|
||||
`--self-test` 增加实际IOSurface/Metal多HSL独立顺序参照、六类型CPU/GPU覆盖对照、alpha、空/默认直通、归档/非法数据、原生面板复用和实际插件分析回调(模拟宿主调度,使用真实Metal运动帧)的检查。它不代替实机宿主验证。
|
||||
|
||||
`python3 tools/create_mask_host_fixture.py` 生成本产品专用合成运动和两个独立FCP项目;不修改旧项目或用户媒体。最终验收必须在唯一正式安装的已公证版本中进行,并另存结果。
|
||||
|
||||
24版正式路径222项原生检查通过;新增OSC检查使用真实Metal叠加,验证透明背景、坐标命中、异步拖动写回、单次撤销和Esc取消。作者文档以不可变快照供OSC读取,不在绘制回调中进入主插件宿主API;添加蒙版先发布选择快照,再结束参数提交。轨迹查找使用CMTime二分定位,渲染快照仅替换各蒙版的当前参数,不重复序列化全部轨迹。
|
||||
|
||||
24版FCP12.4实测:第二HSL从0到32独立保存,原HSL保持0;原层椭圆中心X数值改为0.6,新增层矩形保持0.5;正向99键,一次Undo到0键,一次Redo到99键且完整预设逐字节一致;双向100键;新增层独立单帧2键,播放头由1帧到2帧。正常退出重开后,完整预设逐字节一致,分别保留100/2键。初验自动化坐标点击未进入真实宿主hit/event回调;随后用户已确认实际鼠标中心拖动正常,原生hit/mouseDown/mouseDragged日志也已捕获,原层中心变为0.378/0.379而新增层仍0.5/0.5。用户试调结果保留。旋转、缩放、钢笔手势未实机确认,不能以模拟器通过代替。取消、过期目标和逆向精确节奏由原生模拟调度覆盖;Motion、Intel、变速/裁剪/非方像素未实测。发行标签保存首次验收快照,用户后续实际鼠标确认保存在主分支当前记录,标签不移动。
|
||||
|
||||
20–23版是本次中间验收节点,不作为最终发行。模板10005现采用父库原生Boolean flags8589934592/default0/value1,pluginVersion0解析当前插件。既有FCP保存的旧模板实例可能保留10005=0;画面控件需保存完整预设后重新应用新版效果,旧实例调色数学不自动迁移或覆盖。
|
||||
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"sourceRepository": "https://dayu.media/git/dayu/dayu-colorplate.git",
|
||||
"sourceCommit": "f8950384e514685c8809fe8e8ee2dd5f16ad0bd7",
|
||||
"files": {
|
||||
"Core/DYMask.h": "ede701e3636c7608f5f8be3be2d95acfdd8080e751d18f89c6660bd874997101",
|
||||
"Core/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
"Core/DYTracker.hpp": "0d67d4d7d919cf3f255fe39f949c3e3ae6cad1a2ae07ad429ee45f1e23bdeb3e",
|
||||
"Sources/DYMetalTracker.mm": "11b49215e9e024e5d1aa59a57dc7ab28048f569cfa3ef6943c014ad26040883d",
|
||||
"Shaders/DYTracking.metal": "4949ffcc32701c95c2385e1ebd6425fbb8fe66771c801b65aaf0a308d23e155c"
|
||||
},
|
||||
"status": "implementation-in-progress",
|
||||
"scope": "Adapt parent mask mathematics, Metal bidirectional optical flow and deterministic affine RANSAC. No reference app runtime dependency."
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# 1.4.2 中间帧启动与真实素材跟踪修复
|
||||
|
||||
本轮针对用户报告的“从中间没有反应、必须首帧正向、失去可靠跟踪”复现。FCP12.4使用当前正式1.4.1(26),把用户工程原生导出到本机验收缓存并导入独立副本,保留原项目、媒体与调色/蒙版设置。4K60源在25帧时间线:首帧正向保留65键;源时间3.68秒中间启动仅增加3键后失败,并弹出宿主分析错误。此前的合成视频检查不能替代这个真实素材问题。
|
||||
|
||||
## 修复
|
||||
|
||||
启动不再要求当前预览缓存存在且时间完全相等。FCP可以复用已渲染画面而不再进入插件渲染回调,因此缓存只作可选方向校对;实际FxAnalyzer首帧才是跟踪种子。仍检查分析起点范围、精确帧序、取消、冻结目标与迟到写入。新增原生检查覆盖无任何渲染缓存的中间启动、陈旧预览缓存和像素不同的预览缓存。
|
||||
|
||||
分析从完整宿主源图读取,按显示长宽比限制到1280×720,不放大小图;降采样前对源像素覆盖范围作低通,避免4K衣物细纹混叠为不一致运动。原调色渲染和输出分辨率不变。上一轮3840×2160是分析采样上限,本轮改用稳定的运动分析尺度;不再把“输入支持4K”写成仍逐像素4K分析。原生GPU检查使用3像素周期纹理,证明4K→720p先低通而非只抽中间像素。
|
||||
|
||||
仿射RANSAC细化容差改为3像素,并相应归一化残差置信度惩罚;只扩大容差而保留旧惩罚会在一致运动上过早低置信度停止。至少8内点、52%一致运动、最低0.3置信度、非线状分布、单步缩放/旋转和累计变换保护仍保留。未采用丢失后复制坐标伪造轨迹。新增确定平移、2.15像素非刚性残差和10%离群对应点的拟合检查;另有真实CPU/Metal图像光流、画面切换和平坦区域拒绝。
|
||||
|
||||
第一帧开始立即显示进度。失跟按特征不足、运动不一致、置信度、出画或变换问题区分,说明保留的可信帧数。普通失跟、主动取消、单帧完成使用SDK的 `FxPlugErrorDomain / kFxError_UserCancelled` 正常取消标记,既结束宿主后台任务又不弹错误;引擎、无效源图和时序错误仍明确失败。27版候选仅返回NO/nil时,FCP的诊断分析残留在50%并影响退出,已在28版修复;不能把本地trackingActive清理当作宿主任务已结束。SDK证据见本机FxTypes.h的UserCancelled说明。最终31版正式宿主已确认任务回到闲置、可再次启动和正常退出。
|
||||
|
||||
单帧完成后先由FxTimingAPI把分析源时间转换为时间线时间,再移动播放头。28版候选在前有4秒片段时错误跳到源3.72秒,29版修正为时间线7.72秒。原生覆盖带4秒偏移的反向单帧和连续两次正向单帧,包含非整数帧率的精确CMTime。
|
||||
|
||||
已有相同轨迹的单帧操作也应前进播放头,以实际完成的连续两帧为依据,不以作者数据是否改变为依据;重复结果不增加一次无效作者写入或撤销。
|
||||
|
||||
首帧反向不拒绝desiredAnalysisTimeRange,而是返回只含种子的有效一帧范围,正常完成且不写入新轨迹。30版在范围发现回调返回NO/UserCancelled时,FCP主线程等范围回包、SDK工作线程同步调用宿主setAnalysisState而互等;本机进程采样确认。SIGTERM未能结束阻塞的服务,随后仅终止无作者数据的本产品XPC服务后FCP恢复并正常退出,没有强制结束宿主,验收完整预设已提前保存。31版边界回调不再进入该错误路径。
|
||||
|
||||
## 验证与边界
|
||||
|
||||
31版正式Release原生293项通过,包含真实Metal采样、三组新增中间启动回调和五组宿主正常终止/边界与两组偏移片段单帧定位与已有相同轨迹仍前进检查;独立19项通过。用户同一素材的离线1280×720灰度分析覆盖首帧正向285帧、中间正向193帧、中间反向93帧。这里只承诺对应的分析范围完成,灰度解码与宿主半浮点源采样不完全相同,也不以“跟完”代替轮廓/漂移质量验证。正式安装后FCP12.4验证同一素材:中间双向285键、首帧正向285键;中途取消保留159键并回到闲置,随后可重启跟完整段;画面切换在2秒失跟,保留0–1.96秒50键,连续重试无弹窗且后台任务闲置。首帧反向正常提示边界,连续单帧在前有4秒片段时7:17→7:18→7:19→7:18,已有相同轨迹仍正常移动。正常退出、冷重开后完整77087字节预设逐字节一致。27/28候选中间正向193新键、反向93键与撤销重做记录单列在宿主报告;27–30均未发布。
|
||||
|
||||
原始媒体、FCPXML快照、作者状态和解码帧均仅在本机验收缓存,普通Git只保存聚合结果与通用诊断源码。未修改父“大鱼调色盘”或Color Finale。不是人物分割/非刚性逐点描边;转身、遮挡、变形和出画仍可能需要手工调整后从当前帧继续。新增工具标量和透视/剪切等既有边界保持。
|
||||
@@ -0,0 +1,122 @@
|
||||
# 大鱼调色交接:1.4.3 基线与 Color Finale 胶片模拟接续
|
||||
|
||||
更新日期:2026-11-02(Asia/Shanghai)。本轮只整理交接文档,未改程序、未重新安装或重启宿主,也未开始胶片模块的算法迁移。下一阶段目标是从本机 Color Finale 分析并移植胶片模拟模块。
|
||||
|
||||
## 1. 先认准项目与可恢复基线
|
||||
|
||||
| 项目 | 当前值 |
|
||||
| --- | --- |
|
||||
| 当前源码根目录 | `/Volumes/备份/大鱼调色/大鱼调色` |
|
||||
| 远程 / 分支 | `https://dayu.media/git/dayu/dayu-color.git` / `main` |
|
||||
| 交接文档编辑前 main | `7814a03f95f9f3c3461af2566e7412c1e5c561e1`;后续文档提交在此节点之上 |
|
||||
| 正式 APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app`,1.4.3(33) |
|
||||
| 主 / XPC Bundle ID | `com.dayu.color` / `com.dayu.color.XPC` |
|
||||
| APP 实际编译源码 | `26a888f4534792481c6a9933091cb0b23307cd24` |
|
||||
| 已发布标签 | `v1.4.3-mask-fold-20261102` |
|
||||
| 标签对应提交 | `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`,含最终交付记录,区别于 APP 编译节点 |
|
||||
| FCP 模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 父“大鱼调色盘”源码 | `/Volumes/备份/大鱼调色/大鱼调色盘`,只读参考固定提交 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` |
|
||||
|
||||
接手后先查看实际工作区、分支和远端;不要用本表覆盖其他任务的新改动。当前大鱼调色是独立 FxPlug 程序,不依赖父项目或 Color Finale APP 才能运行。历史各轮说明已归档到 [历史交接](research/handoffs/DayuColorThrough1.4.3-20261102.md)。
|
||||
|
||||
## 2. 已完成并应保留的行为
|
||||
|
||||
- 一级调色包含输入 CST → 工作空间一级处理 → 输出 CST;后续基础调整、HSL、曲线等仍按既有显示域链处理。胶片接入时要重新确定域和位置,不能把父项目的顺序直接套进来。
|
||||
- 各模块标题只控制展开/折叠,眼睛控制启用/旁路。再次添加工具在点击处相邻插入初始化层,旧 schema1 尾层保留位置;新增层参数独立。
|
||||
- 每工具蒙版含椭圆、矩形、钢笔、线性渐变、HSL、亮度选区;支持组合、反转、羽化和强度。矩形/椭圆/闭合钢笔有区域运动跟踪。
|
||||
- 1.4.1 已有用户实际鼠标确认钢笔可绘制并闭合;1.4.0 已有中心拖动确认。自动化鼠标未可靠进入 FCP 的画面回调,不能把其余手势扩大为实鼠验收。
|
||||
- 1.4.2 修复中间帧起跟、4K细纹误失跟、取消/失跟后的宿主任务结束、偏移片段单帧定位和边界互等。运动分析最高1280×720,先低通再降采样;调色渲染和输出分辨率不变。区域仿射跟踪不是人物分割或非刚性描边。
|
||||
- 1.4.3 蒙版面板随所属模块一起折叠;标题栏蒙版按钮旁显示数量标记,无蒙版时隐藏。计入已停用蒙版,原模块和独立层分别计数,删除/撤销即时更新。
|
||||
|
||||
正式1.4.3通过293项既有原生检查。FCP12.4验证折叠/展开、数量2/1、删除到零和撤销、正常退出冷重开;用户当时完整77276字节预设逐字节一致,286个轨迹键保留,独立合成片段8471字节预设操作前后及重开也一致。293项检查不是对尚未实现的胶片模块的验收。
|
||||
|
||||
最近用户试调位于独立验收项目“大鱼调色_28_中间帧双向”,不能当作随时可复位的空白实例。完整预设和 FCPXML 仅在本机 `.../com.dayu.color/fcp-qa/`:`fold31-before.json`、`fold33-user-after.json`、`fold33-fixture-reopen.json` 等;不要写进 Git、PKG 或覆盖原素材。
|
||||
|
||||
## 3. 源码接入入口
|
||||
|
||||
下表路径相对于当前源码根目录。
|
||||
|
||||
| 入口 | 用途 |
|
||||
| --- | --- |
|
||||
| `大鱼调色/Plugin/DYModel.mm`、`DYModel.h` | 参数描述、分组、默认值、宿主参数与预设 |
|
||||
| `大鱼调色/Plugin/DYUniforms.h` | CPU/Metal ABI;当前自检1104字节,`cm`偏移944的前缀有静态断言 |
|
||||
| `大鱼调色/Plugin/DYRenderer.mm` | Metal设备、渲染调度、LUT资源、输入输出与导出 |
|
||||
| `大鱼调色/Plugin/DYGrade.metal` | 现有 GPU 包装、色彩管理及逐像素处理入口 |
|
||||
| `大鱼调色/Plugin/DYToolRender.inc.h`、`DYToolGPU.h` | 独立工具计划、逐层处理与蒙版混合 |
|
||||
| `大鱼调色/Plugin/DYToolState.mm`、`DYToolState.h` | `DYToolTypes`、工具默认状态、schema1/2、after锚点、蒙版与安全归档 |
|
||||
| `大鱼调色/Plugin/DYInspector.mm` | 模块布局、`toggleSection:`、`DYMaskCountBadge`、蒙版数量刷新 |
|
||||
| `大鱼调色/Plugin/DYToolInspector.inc.h` | 相邻插入、独立层界面及其布局 |
|
||||
| `大鱼调色/Plugin/DYMaskPanel.inc.h` | 蒙版控件、状态和跟踪按钮 |
|
||||
| `大鱼调色/Plugin/DYToolHostMethods.inc.h` | FxAnalyzer 生命周期;胶片任务无需顺带改写 |
|
||||
| `tools/build_kernels.py`、`tools/kernels/` | 可版本恢复的 AIR/Metal 生成与链接,不能只替换某个本机 metallib |
|
||||
| `tools/build_template.py`、`template/sources/` | 原生模板与参数档案;模型改变后重建并核对 |
|
||||
|
||||
当前 `DYToolTypes` 有12类,未注册独立胶片模拟工具。相机输入项里的 Blackmagic Film / Fujifilm F-Log 是色彩管理输入名称,不能据此认定已有胶片模拟模块。完整预设当前为 v4,已有9000/9001/9002自定义载荷及9003画布会话;参数ID、归档兼容和既有 Uniform 前缀不能挪作新用途。
|
||||
|
||||
## 4. Color Finale 参考身份与已有证据
|
||||
|
||||
本次只复核了本机包元数据和可执行文件摘要,未新做胶片函数分析或原版输出对照。
|
||||
|
||||
| 项目 | 本机已核对值 |
|
||||
| --- | --- |
|
||||
| APP | `/Applications/ColorFinale.app`,2.16.2(625),`com.colorfinale.app` |
|
||||
| 主插件二进制 | `/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/MacOS/ColorFinale` |
|
||||
| 插件 Bundle ID | `com.colorfinale.ColorFinaleFxPlug` |
|
||||
| 二进制 SHA-256 | `49121a6f5487060d322a59e7658166ab772e8a56f7dc1bcfa9d433a89436b30f` |
|
||||
| 胶片界面定位线索 | `Contents/PlugIns/ColorFinale.pluginkit/Contents/Resources/zh-Hans.lproj/FTFilmEmulationViewController.strings`(相对APP) |
|
||||
| 既有只读研究 | [ColorFinaleMasksFollowup.md](research/ColorFinaleMasksFollowup.md) 与对应 JSON |
|
||||
| 既有本机 REA 缓存 | `/Users/mac/Library/Caches/CodexBuilds/ColorResearch/dayu-mask-followup-20261101/` |
|
||||
|
||||
现有 REA 证据主要对应蒙版/跟踪,不能当作胶片模块已分析。下一轮先核对目标摘要、可用会话及保留证据;仅复用身份匹配的资料。原版胶片的参数、默认值、阶段、数学、资源依赖和实际图像行为均需要单独取证。
|
||||
|
||||
REA 技能入口:`/Users/mac/.agents/skills/reverse-engineer-anything/SKILL.md`。分析原厂二进制时使用其目标绑定和证据流程;查看当前完整源码则直接读工程,不为普通源码阅读启动逆向工具。静态字符串/类名只是定位线索,不能代替执行行为或图像对照。
|
||||
|
||||
## 5. 父项目可以参考什么
|
||||
|
||||
`research/color-finale/` 内四份研究资料是父工程提交 `4458dc0c0ae7f51046b8cfa4b19626e80f7cf6ca` 的快照,见 [快照来源](research/color-finale/README.md)。其中“已接入”“正式版”等表述属于父工程,不能当作当前大鱼调色的完成项。快照里部分相对链接没有随包文件,应回到父工程查找。
|
||||
|
||||
父工程固定提交 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` 中可只读参考:
|
||||
|
||||
- `research/film-processing-contract.md`、`research/colorfinale-film-chart-findings.md`;
|
||||
- `Core/DYFilm.h`、`Core/DYFilmCPU.hpp`;
|
||||
- `Sources/DYFilmState.h`、`DYFilmState.inc`、`DYPanelFilm.inc`、`DYFilmEditor.inc`;
|
||||
- `Tools/film_test.mm`、`film_panel_test.inc`、`test_film.py` 与 `verification/film-development.json`。
|
||||
|
||||
父合同记录的是独立算法v1:减色→晕光→辉光→暗角→颗粒,父工程根级状态、线性域处理及保守拒绝活跃胶片的LUT导出。可复用其工程组织、时间一致性和边界测试思路;不代表当前工程已有相同链路,更不代表与 Color Finale 数学或同名胶片外观一致。不要把父工程“只在根级”的约束当作用户已经确定的本工程设计。
|
||||
|
||||
## 6. 下一阶段建议的工作顺序
|
||||
|
||||
1. **先建立原版功能与参数表。** 从本机胶片面板定位 Film Look、减色、Halation、Bloom、Vignette、Grain 等候选功能,逐项确认本机版本是否具备、名称、默认、范围、单位、开关、预设及资源依赖;候选清单不是已证实功能清单。
|
||||
2. **确认处理域和顺序。** 跟进面板状态→归档/参数→渲染调度→CPU/Metal/表格资源,明确与输入、工作空间、输出CST、HDR、alpha和混合的关系。先记录已观察、推断、未知,再决定当前大鱼的接入位置。
|
||||
3. **确定模块形态。** 尚未定为全局胶片阶段还是可重复工具。若进入现有工具模块体系,接好独立初始化、眼睛、折叠、蒙版及数量标记;若全局阶段有不同语义,先把具体设计说明写清。保留旧工程缺省时的旁路与原画面。
|
||||
4. **做可比较的图像验证。** 同一输入、同一色彩空间、同一参数分别取得原版与大鱼输出,覆盖灰阶/色块/高光、真实素材、不同分辨率及透明边缘。不能只靠“视觉像胶片”或加一个LUT宣称等价;确属独立重建的部分写明差异。
|
||||
5. **补齐空间与时间行为。** 晕光/辉光若涉及邻域需独立中间纹理和预算;颗粒若随时间变化需精确帧时间、固定种子/状态、随机访问/并发/重开的一致性。零强度与关闭保持中性,保留负值/HDR、alpha与非有限值处理。
|
||||
6. **完成持久化、导出和正式验收。** 新参数ID不复用,归档/预设兼容旧版本;纯色变换与空间/时间效果的Cube能力分别判定,不能把颗粒、晕光等错误写成静态3D LUT。随后做撤销/重做、保存重开、旧工程、蒙版/重复层、FCP实际渲染和正式交付。
|
||||
|
||||
## 7. 构建、交付与恢复入口
|
||||
|
||||
沿用本机全局规则与项目现有工具。本轮是文档更新,未生成新构建或移动已发布标签;下一轮真正改程序后再递增构建与版本。
|
||||
|
||||
```sh
|
||||
# 在源码根目录;模型改变时先更新原生参数档案和模板
|
||||
python3 tools/build_template.py --refresh-model --overwrite
|
||||
# Release构建、由内到外签名、公证Accepted、票据、唯一安装;等待宿主验收
|
||||
python3 tools/deliver.py
|
||||
# 宿主验收通过后才在交付进程输入complete,并补写本轮hostVerification记录
|
||||
python3 Packaging/build_pkg.py --pkg-forge-repo /Users/mac/Documents/dayu-git/repositories/pkg-forge
|
||||
```
|
||||
|
||||
- 正式宿主测试使用固定位置的已公证APP;不从DerivedData启动临时GUI,不强制结束宿主绕过保存。
|
||||
- 产品交付锁:`/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`。Git检查点用 `tools/checkpoint.py` 的仓库锁;只提交已审查的本任务文件。
|
||||
- 签名团队 `B3W25FX5H5`;Application / Installer身份和公证profile按本机规则重新验证。公证profile `codex-dayu-notary-B3W25FX5H5`,钥匙串 `/Users/mac/Library/Keychains/login.keychain-db`。文档中不存凭据。
|
||||
- 正式PKG生成后,标签先推送核验,再用 `Packaging/publish_release.py` 上传草稿;完整下载核对大小及SHA-256后发布,再核验已发布下载。保持现有仓库可见性,不覆盖旧附件或移动标签。
|
||||
- 无LFS/子模块。恢复任一已保存源码:克隆上述远程,检出明确提交或标签,再依 RECOVERY 构建;证书私钥、用户媒体与预设独立保存。
|
||||
|
||||
当前发行包:`/Volumes/备份/大鱼调色/发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`。APP公证 `e755670d-8fb3-46d2-95c3-1206f014d16d`,PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655`,均Accepted;签名/票据/Gatekeeper、20项展开验包通过。PKG未再次运行安装器,APP已有独立正式安装和宿主验收。
|
||||
|
||||
[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16已在草稿与发布后完整下载核验。对应证据:[Delivery](verification/Delivery.json)、[Package](verification/Package.json)、[Release](verification/Release.json)、[本轮宿主验收](verification/HostMaskFolding1.4.3.json)、[编译源码恢复](verification/MaskFoldingRecovery.json)、[发行标签恢复](verification/MaskFoldingReleaseRecovery.json)、[RECOVERY](RECOVERY.md)。
|
||||
|
||||
## 8. 新对话的接手提示
|
||||
|
||||
> 阅读 `/Volumes/备份/大鱼调色/大鱼调色/大鱼调色FxPlug4交接.md`。以当前正式1.4.3(33)和已推送源码为基线,接下来分析本机Color Finale 2.16.2(625)的胶片模拟模块,先产出功能/参数/处理域与顺序的证据表,再按现有大鱼调色架构移植并完成正式交付。父“大鱼调色盘”的胶片代码仅作有出处的参考;保留用户现有调色、蒙版、轨迹、相邻叠层、折叠和数量标记行为。
|
||||
@@ -0,0 +1,183 @@
|
||||
# 历史交接归档:截至 1.4.3(33)
|
||||
|
||||
本文归档自提交 `7814a03f95f9f3c3461af2566e7412c1e5c561e1` 的根目录交接文档。原文件 SHA-256:`2c750076d4c44e8f024298f3da23f093f79735bd8b0cb81e26e499b42702f6dd`。正文保留,调整了相对链接。下文“当前”等表述属于各轮历史记录;现行接手入口为 [大鱼调色FxPlug4交接.md](../../大鱼调色FxPlug4交接.md)。
|
||||
|
||||
# 大鱼调色:1.4.3(33)蒙版折叠与数量标记交接
|
||||
|
||||
当前正式版1.4.3(33),APP实际编译源码 `26a888f4534792481c6a9933091cb0b23307cd24`,公证 `e755670d-8fb3-46d2-95c3-1206f014d16d` Accepted。签名、票据、Gatekeeper、唯一正式安装及正式路径293项既有原生检查通过。正式位置和Bundle ID不变。
|
||||
|
||||
修复模块折叠时蒙版面板仍显示的问题;内容高度和行显示都遵循模块折叠状态。标题蒙版按钮旁新增已添加数量标记,无蒙版时隐藏;原模块和独立层各自计数,停用蒙版仍计入,折叠后保留标记。状态徽标不拦截鼠标,按钮提示和辅助说明同步数量。未改渲染、跟踪算法或数据结构。
|
||||
|
||||
FCP12.4验证用户现有蜘蛛盘蒙版的收起/展开,完整77276字节预设与修改前逐字节一致,286个轨迹键保留;独立合成片段验证原HSL2个蒙版(含1个停用)、独立HSL1个,分别折叠/展开,删除2→1→0与撤销0→1→2即时刷新。两层折叠后蒙版面板为0,数量2/1保留。正常退出冷重开,完整8471字节预设前后及重开均逐字节一致。未强制结束宿主。32版为折叠修复候选,33版纳入用户补充的数量标记;32未发布。
|
||||
|
||||
入口:[本轮说明](../../research/MaskFolding1.4.3.md)、[正式宿主验收](../../verification/HostMaskFolding1.4.3.json)、[远端源码恢复](../../verification/MaskFoldingRecovery.json)、[副本清理](../../verification/MaskFoldingCleanup.json)。远端独立恢复240个文件并比较全部字节、full/strict fsck、原生模型模板和Metal重建通过;着色器摘要沿用上一版且与正式库一致。用户媒体和预设留在本机,无LFS/子模块。PKG和Release最终结果以对应版本验证记录为准。
|
||||
|
||||
本轮正式安装包 `../发行包/大鱼调色-1.4.3.pkg`,14,340,650字节,SHA-256 `41bba698a70a7629438688a4be74947f424f3af04190090c44f248827b4c3bb2`;PKG公证 `f9218078-8fd0-4a0c-9240-4b1acf7d9655` Accepted,签名/票据/Gatekeeper与20项展开验包通过。APP已有独立正式安装及宿主验收,本轮未再次运行系统安装器。Release标签 `v1.4.3-mask-fold-20261102` 已发布,标签提交 `301b31438e8da95dc4e6e1c09498ad814a0ebcfc`;[Release371](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.3-mask-fold-20261102) / 附件16在草稿和发布后均完整下载校验14,340,650字节及SHA-256一致。发行标签已从远端独立恢复244文件,全部字节比较及full/strict fsck通过,见 `verification/MaskFoldingReleaseRecovery.json`。核验下载副本和恢复clone已清理,仓库可见性不变。
|
||||
|
||||
## 以下为1.4.2(31)的历史交接
|
||||
|
||||
# 大鱼调色:1.4.2(31)中间帧与真实素材跟踪修复交接
|
||||
|
||||
当前正式版1.4.2(31),APP实际编译源码 `123a6c85078e8aa41fe55577b6dab5622ed7d128`。APP公证 `0bb9a94e-c54a-4d87-95ec-51338579c04f` Accepted,签名、票据、Gatekeeper、唯一正式安装及正式路径293项原生检查通过。固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID和签名团队不变。PKG与Release最终结果见对应版本记录。
|
||||
|
||||
中间起点以宿主分析首帧为准,不再依赖预览缓存。4K细纹先低通再按比例缩到最高1280×720运动分析,调色渲染输出分辨率不变;拟合容差与置信度一致归一化,保留失效与过期写入保护。失跟显示具体原因、保留可信帧数并正常结束宿主任务;首帧反向使用有效种子范围正常结束;单帧经源时间到时间线转换,已有相同轨迹也正常前进。
|
||||
|
||||
FCP12.4正式31版在同一4K60素材的25p时间线中:中间双向285键、首帧正向285键;取消保留159键后任务闲置,可重新跟完整段;切换画面在2秒失跟、保留50键,连续重试无弹窗且任务闲置。带4秒前置片段的连续单帧7:17→7:18→7:19→7:18;首帧反向保持响应。正常退出冷重开完整预设77087字节逐字节一致。原工程、原媒体与原65键设置保留,验收只在独立副本进行。候选27–30发现的生命周期、单帧和边界问题均有记录,未发布候选包。
|
||||
|
||||
新增层相邻插入、加大的蒙版面板、实际鼠标钢笔/中心拖动确认等1.4.1与1.4.0历史保留。仍不是完整Color Finale移植或人物分割,遮挡/变形可能需要手工修正再从当前帧继续。Motion、Intel、变速/裁剪/非方像素工程未实机验收。
|
||||
|
||||
入口:[实现与边界](../../research/TrackingMidpoint1.4.2.md)、[正式宿主验收](../../verification/HostTrackingMidpoint1.4.2.json)、[原生及离线聚合](../../verification/TrackingMidpoint1.4.2.json)、[编译源码远端恢复](../../verification/TrackingMidpointRecovery.json)、[本轮清理](../../verification/TrackingMidpointCleanup.json)、[恢复方法](../../RECOVERY.md)。
|
||||
|
||||
|
||||
本轮正式PKG `../发行包/大鱼调色-1.4.2.pkg`:14,339,640字节,SHA-256 `d137e3516b9c4abc1e6959b83693f5ed09e040cf018b2e29508cc92246fe76f2`;PKG公证 `2de9f8bb-91b5-41dc-924c-1136ae7bf73f` Accepted,签名/票据/Gatekeeper与20项展开验包通过。本轮未再次运行系统安装器,正式APP已有独立安装与宿主验收。Release标签 `v1.4.2-tracking-midpoint-20261102` 已发布,标签提交 `38bf12326e74f2f026bc4c7627729121b6aa261d`;[Release370](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.4.2-tracking-midpoint-20261102) / 附件15在草稿与发布后均完整下载核对14,339,640字节及SHA-256一致,仓库可见性保持原状。发行标签从远端独立恢复237个文件,见 `verification/TrackingMidpointReleaseRecovery.json`,全部字节比较和full/strict fsck通过;核验下载副本与恢复clone已清理。
|
||||
|
||||
## 以下为1.4.1(26)的历史交接
|
||||
|
||||
# 大鱼调色:1.4.1(26)相邻插入、蒙版面板和钢笔修复交接
|
||||
|
||||
当前正式版为1.4.1(26)。APP编译源码 `0eb56aed126c825ca89712ce90f8cc1c05b03d89` 已推送;公证 `1ddc5499-2da3-4d98-8b2d-09272b0ee326` Accepted,正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。PKG和Release结果以本版本验证记录为准。
|
||||
|
||||
新添加工具紧接点击处插入,重复点击原层也插在原层与既有子层之间;参数初始化且相互独立。schema2保存after锚点,实际渲染也插入对应阶段;旧schema1末尾工具保持原位置与画面。蒙版参数和数值为13pt、按钮32–36pt、滑杆单独整行,跟踪按钮两列并保留完整中文。
|
||||
|
||||
钢笔入口现可进入空白草稿绘制态,放点/拖柄、首点或Return/面板完成闭合、Delete回退、取消/重画、即时预览、单次撤销及连续手势已实现。修正画面提示文字上下翻转。同步内存草稿与延后作者提交分离,避免宿主回调内读写、过期目标与跨帧草稿覆盖。
|
||||
|
||||
跟踪按Color Finale只读行为证据独立适配实际路径范围、300特征、亚像素精炼、21×21光流及最高4K灰度帧,保留严格失效与过期写入保护。独立CPU/Metal18项通过。不能称为完整Color Finale移植;B样条、编组、人物/图像/外部蒙版、完整轨迹区段编辑等仍有差异,未做同一真实视频的完整轨迹等价对照。
|
||||
|
||||
正式版281项原生检查通过。FCP12.4实测相邻插入/初始化独立参数、大号面板/绘制态、钢笔蒙版正向99键、一次撤销和重做、保存重开完整预设逐字节一致。**用户已用实际鼠标确认钢笔可以绘制并闭合**,原答复“可以绘制并闭合”;自动化鼠标未触发画面回调。其它曲柄/删除等手势的模拟宿主原生OSC回归通过,不扩大为全部实机手势验收。1.4.0用户确认的中心拖动历史保留。
|
||||
|
||||
入口:[本轮实现](../../research/MaskWorkflow1.4.1.md)、[Color Finale证据与差异](../../research/ColorFinaleMasksFollowup.md)、[实际宿主记录](../../verification/HostMaskWorkflow1.4.1.json)、[远端独立恢复](../../verification/MaskWorkflowRecovery.json)、[副本清理](../../verification/MaskWorkflowCleanup.json)、[恢复与构建](../../RECOVERY.md)。正式包和下载核验见Package.json/Release.json。
|
||||
|
||||
## 以下为1.4.0(24)的历史交接
|
||||
|
||||
更新日期:2026-11-01,Asia/Shanghai。当前 APP 已完成正式签名、公证、票据、唯一安装与宿主工作流检查;PKG/Release 状态以本仓库相应验证记录为准。
|
||||
|
||||
## 本轮结果与入口
|
||||
|
||||
十二个模块标题右侧已有“添加蒙版”和“再加一层”。第二个HSL等新增工具使用独立UUID、初始化参数、折叠/启停/复位/删除和自己的蒙版;新增工具依次排在原模块之后。原固定float ID、9001资产和1104字节ABI不变,无蒙版旧工程保留原融合内核。新增一级使用Rec.709/Gamma2.4同域默认,新增肤色保护强度零。
|
||||
|
||||
六种蒙版是椭圆、矩形、钢笔、线性渐变、HSL、亮度;支持相加/减去/相交、启停、反转、羽化、强度和几何数值。几何跟踪从父库固定节点 `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7` 移植Metal光流和仿射RANSAC,并适配本产品FxAnalyzer生命周期;支持正向、反向、双向、单帧、取消及单次撤销,过期目标不回写。当前没有新增对Color Finale二进制的依赖,父工程未修改。
|
||||
|
||||
作者状态:`DYToolState.h/.mm`,9002静态工具文档、9003不保存的OSC会话。渲染:`DYToolRender.inc.h`、`DYToolGPU.h`、`DYGrade.metal`、`tools/build_masked_kernel.py`。面板:`DYMaskPanel.inc.h`、`DYInspector.mm`。原生画面与跟踪:`DYToolOSC.inc.h`、`DYToolHost*.inc.h`、`DYToolFlow.inc.h`、`DYTracking.metal`、`MaskCore/`。归档使用安全类白名单,预设v4包含完整工具/蒙版/轨迹,兼容v1–3。
|
||||
|
||||
实际编译源码 `dbf25fe6719f17075362538dad0404951102524d` 已推送。APP公证 `40fdaaaa-1821-4cc8-bec3-c5dc6d8b9f77` Accepted;正式位置仍为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID仍为 `com.dayu.color`。Release前后均通过222项原生检查。FCP12.4独立合成工程实测HSL第二层0→32而原层0,独立椭圆/矩形、数值编辑、正向99键、双向100键、新增层单帧2键与播放头前进;一次撤销/重做及正常退出重开后完整预设逐字节一致。
|
||||
|
||||
**用户已确认实际鼠标可拖动蒙版中心。** 初次自动化坐标点击未进入宿主回调,随后用户实测“可以拖动,蒙版随鼠标移动”;真实hit/mouseDown/mouseDragged日志已捕获,原层中心由0.6/0.5变成0.378/0.379,新增层矩形仍为0.5/0.5。用户试调结果保留,不再自动复位或重启宿主。旋转、缩放和钢笔手势未实机确认,原生模拟宿主相关检查通过;不要扩大为所有手势都已实测。Motion、Intel、变速/裁剪/非方像素工程未实测;跟踪不含透视/剪切。新增工具标量为静态作者值,只有蒙版轨迹随时间求值;空间蒙版拒绝Cube导出,应保存完整预设。
|
||||
|
||||
旧模板实例可能保留关闭OSC的10005值,可先存完整预设,再应用新版效果并载入;不自动覆盖旧效果。当前模板使用父库Boolean发布契约,最新插件解析。中间20–23版均未发布最终包,旧生成APP备份在24版宿主确认后清理。远端独立恢复210文件、strict/full fsck、模型模板和着色器重建一致,临时clone已清理。
|
||||
|
||||
证据:[实现说明](../../research/ToolMaskImplementation.md)、[移植来源](../../research/ToolMaskPort.json)、[正式安装](../../verification/Delivery.json)、[222项原生检查](../../verification/InstalledSelfTest.json)、[宿主结果及缺口](../../verification/HostToolMasks.json)、[远端恢复](../../verification/ToolMaskRecovery.json)、[副本清理](../../verification/ToolMaskCleanup.json)。打包入口 `Packaging/build_pkg.py`,发布入口 `Packaging/publish_release.py`;版本标签、PKG公证和下载摘要见 `verification/Package.json`、`verification/Release.json`,不要将历史版本记录当作当前发行成功。
|
||||
|
||||
## 以下为1.3.1接手时的历史快照
|
||||
|
||||
下面各节中的“当前”“下一阶段”和“尚未实现”均指本轮开发前的1.3.1(19),保留作为兼容背景;最新实现以上文和实现说明为准。历史说明整理本身未编译、替换或操作当时的FCP窗口。
|
||||
|
||||
## 1. 下一阶段目标与当前边界
|
||||
|
||||
用户最新需求:继续增加**蒙版、跟踪,以及自行添加工具的能力**。明确例子是:一层 HSL 不够时,可以再添加一个 HSL,分别调整。
|
||||
|
||||
这里的核心是“同类工具可有多个独立实例”。新增 HSL 不能只是另一张面板共用原 HSL 的参数。蒙版应能绑定到具体工具实例,跟踪结果应驱动对应蒙版。
|
||||
|
||||
**上述功能尚未在“大鱼调色”实现。** 当前 1.3.1 是固定模块调色器;“大鱼调色盘”的图层、蒙版和跟踪代码只是下一阶段参考,不能把父库已完成的功能写成当前产品已完成。
|
||||
|
||||
建议开发次序:工具实例和第二个 HSL → 每实例蒙版 → 宿主画面控件 → 蒙版跟踪 → 持久化、撤销和正式交付。设计、源码入口、迁移风险及验收清单见 [蒙版跟踪与工具栈续作方案](../../research/MaskTrackingAndToolStack.md)。其中标为“建议”的内容是接手方案,不代表用户已经逐项指定所有类型和操作。
|
||||
|
||||
## 2. 实际项目与可恢复节点
|
||||
|
||||
| 项目 | 当前值 |
|
||||
| --- | --- |
|
||||
| 主源码目录 | `/Volumes/备份/大鱼调色/大鱼调色` |
|
||||
| 远程 / 分支 | `https://dayu.media/git/dayu/dayu-color.git` / `main` |
|
||||
| 文档整理前 main | `bbdd47d1d74e241f1f144bb2c245204e86973b3f` |
|
||||
| 本次交接标签 | `handoff-mask-tracking-tools-20261101`;最终提交可通过此标签解析 |
|
||||
| 当前正式版本 | **1.3.1(19)** |
|
||||
| APP 实际编译源码 | `dbb7ca4a995ef832178a32f35939aed7d3a85012` |
|
||||
| 正式版本标签 | `v1.3.1-browser-recents-20261101` |
|
||||
| 正式版本标签提交 | `281721bda11484c23f294b4f0d9e0b30ef829288` |
|
||||
| 主 ID / 插件 ID | `com.dayu.color` / `com.dayu.color.XPC` |
|
||||
| 唯一正式 APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app` |
|
||||
| 唯一 FCP 模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 工程 / Scheme | `大鱼调色.xcodeproj` / `Wrapper Application`,Release |
|
||||
|
||||
工作目录、APP 编译提交、发行标签提交与后续文档提交是不同概念。恢复正式程序源码取编译提交;恢复含包记录的发行节点取版本标签;继续下一阶段从最新 main 或本次交接标签开始。已有历史版本、标签和安装包保留。
|
||||
|
||||
## 3. 已交付行为,后续须保留
|
||||
|
||||
- 一级调色将输入转换、工作空间、一级参数和输出转换放在一张卡片中。使用大鱼 CST 的固定源码数学取代新实例的输入还原 LUT;四个可见旁路选项已移除,一级眼睛统一启停。旧输入 LUT、旧参数 ID 和兼容解释仍保留。
|
||||
- 新实例及全部还原:输入 **Sony S-Log3(28)/ S-Gamut3.Cine(27)**;工作 **DaVinci Intermediate(10)/ DaVinci Wide Gamut(16)**;输出 **Gamma 2.4(1002)/ Rec.709(22)**;自动色调映射关闭。不要根据曲线名称覆盖用户手选色域。
|
||||
- 一级白平衡采用原 CST 色轮,保留原图、+104° 方位、/5 精细拖动、双击复位和方向键微调。底部可见“复位”只将该色轮方向、强度置零。原 BASIS 强度平方×4 的数学不变。
|
||||
- 蜘蛛盘来自“大鱼调色盘”,默认联动 6×6、31 节点;两轴可分别选择 6/8/12/16/24。固定、多选、同列自由点联动、整环/整列、复位、归档和 Cube 导出已接入。中性盘精确直通。
|
||||
- 新实例默认展开**一级调色、蜘蛛盘校色仪、基础调整**,其他模块折叠,全部眼睛打开。标题仅折叠,眼睛仅启停;状态独立保存。黑白混合默认 0%。
|
||||
- 风格 LUT 最多五层。库路径 `/Users/mac/Movies/大鱼调色LUT/look LUTs`。后台导入、取消、最后一次选择生效和 UTF-8/16/32 等编码兼容均保留。
|
||||
- LUT 浏览器在 FCP 中使用独立宿主浮动窗口。网格/列表、缩略图大小、可调整侧栏、窗口/布局偏好按库保存。最近使用分类第一位,成功应用后去重、最新优先,最多 40 个;全部及文件夹也优先显示最近项。旧版未记录的所有历史不能凭空补造;首次打开可从已有当前 LUT 初始化。
|
||||
- 33³ Cube 导出包含开启的 CST、一级白平衡、蜘蛛盘及其它逐像素色彩操作,遵循眼睛开关,折叠不影响导出;不含纹理、清晰度、去朦胧和逐画面统计。将来出现空间蒙版/跟踪后必须重新定义并明确提示导出边界。
|
||||
|
||||
## 4. 当前实现结构与兼容约束
|
||||
|
||||
| 文件 / 位置 | 接手用途 |
|
||||
| --- | --- |
|
||||
| `大鱼调色/Plugin/DYModel.h/.mm` | 234 个固定 float 参数、参数 ID、默认值、资产与界面归档 |
|
||||
| `大鱼调色/Plugin/DYUniforms.h` | 当前 CPU/Metal 缓冲 1104 字节;原 944 字节前缀保持;CST 在偏移 944 追加 |
|
||||
| `大鱼调色/Plugin/DYInspector.mm` | 固定卡片、标题/眼睛、预设 v3、LUT 提交与浏览器宿主 API |
|
||||
| `大鱼调色/Plugin/DYNewPanels.inc.h` | 一级白平衡色轮、可见复位、蜘蛛盘面板 |
|
||||
| `大鱼调色/Plugin/DYColorTables.mm` | HSL、白平衡、颜色分级等 LUT 构建与缓存 |
|
||||
| `大鱼调色/Plugin/DYRenderer.mm` | CST 前段、固定调色链、蜘蛛盘、Metal 资源、预览、Cube 导出 |
|
||||
| `大鱼调色/Plugin/DYGrade.metal`、`tools/kernels/*.ll` | Metal 边界和已版本化运算内核;当前固定调色链有融合执行,尚非工具栈 |
|
||||
| `大鱼调色/Plugin/DYPlugIn.mm` | FxTileableEffect、按宿主时间生成渲染状态、归档白名单及导出 |
|
||||
| `大鱼调色/Plugin/DYLUTBrowser.mm`、`DYLUTLibrary.mm` | 窗口/布局、异步确认、最近使用;不要混入工具作者数据 |
|
||||
|
||||
当前两项 custom 参数:`9000 DYInspectorToken`(schema 2,folds 字典),`9001 DYAssetState`(LUT paths、spiderMesh、spiderLinked)。**9001 注册为 NOT_ANIMATABLE**,不能简单把动态工具塞进去就宣称支持宿主参数关键帧。预设 JSON 版本是 **3**;插件临时渲染状态的 schema 是 **1**;它们是不同格式的版本号。
|
||||
|
||||
当前 HSL 只有一组 `hsl*` 固定字段和一份 HSL 查表。重复工具需要独立身份、参数、缓存和撤销目标。父库 `DYGrade` 是 1032 字节,与本项目 `DYUniforms` 不同;不能直接复制其参数号、POD、Bundle ID 或整个插件入口覆盖当前产品。
|
||||
|
||||
归档、预设、复制、相等性、hash、允许解码类和渲染状态都必须一起演进。旧字段与数学 ID 不重排;旧工程无新增状态时保留原画面。UI 折叠键在多工具场景下应按实例 ID 隔离,不能全部共用 `hsl`。
|
||||
|
||||
## 5. 可复用参考:父级“大鱼调色盘”
|
||||
|
||||
只读目录 `/Volumes/备份/大鱼调色/大鱼调色盘`;远程 `https://dayu.media/git/dayu/dayu-colorplate.git`。本次核对干净 HEAD `f8950384e514685c8809fe8e8ee2dd5f16ad0bd7`。其正式 2.0.0(68)编译源码为 `d05994d5f4547687511bef524efe8c881e8a5c9c`,标签 `v2.0.0-build68`。
|
||||
|
||||
先读父库 `HANDOFF.md`、`research/tracking-host-lifecycle.md` 及 `verification/release-2.0.0-build68.json`。该库记录了矩形/椭圆/闭合钢笔区域、前后/双向/单帧、位置/旋转/独立横纵缩放、取消保留可信段和一次撤销等实现与宿主证据。它输出仿射分解后的这些变换,不能宣传为透视/剪切跟踪或任意遮挡均可靠。
|
||||
|
||||
下一阶段按具体功能复用其作者状态、蒙版数学、OSC 和 FxAnalyzer 生命周期适配,源文件导航见续作方案。父库现有交接另有胶片/CMS等任务,**不属于本次“大鱼调色”新增范围**。不改动兄弟仓库、不替换兄弟 APP、不恢复或覆盖其用户调色文件。
|
||||
|
||||
## 6. 验证现状与用户工作保护
|
||||
|
||||
| 证据 | 本版本实际覆盖 |
|
||||
| --- | --- |
|
||||
| `verification/InstalledSelfTest.json` | 正式路径常规 158 项原生检查 |
|
||||
| `verification/BrowserNative.json` | 正式路径 201 项,含独立 CST 像素参照、色轮/蜘蛛盘、归档与渲染 |
|
||||
| `verification/BrowserCustomization.json` | 23 项离屏浏览器、几何/布局/历史检查 |
|
||||
| `verification/BrowserRegression.json` | 67 项回归,含 3,025 项目录虚拟化、取消及应用确认 |
|
||||
| `verification/SpiderMath.json` | 25 种网格、204,683 项数学检查 |
|
||||
| `verification/HostBrowserAndReset.json` | FCP 12.4 的 Sony 默认、可见复位、独立窗口及系统缩放、两种布局、最近排序、浏览器关闭重开 |
|
||||
| `verification/BrowserRecovery.json` | 编译节点远端恢复 178 文件、fsck、Metal 重建与正式库一致 |
|
||||
| `verification/BrowserReleaseRecovery.json` | 发行节点远端恢复 184 文件、fsck |
|
||||
|
||||
自由标题栏/窗口边缘拖动未由自动化独立确认。用户开始操作浏览器后,保留其当时的网格布局、约 197.97 缩略图大小、窗口位置和 LUT 选择,**未再次重启 FCP 或全部还原**。这些是当时观察,不是要求下一轮强制恢复的偏好;接手以用户最新操作为准。浏览器关闭重开已测,不写成此次已重新冷启动宿主。Motion、Intel、旧系统未验收。
|
||||
|
||||
测试库位于 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/大鱼调色_验收.fcpbundle`;本轮独立项目 `大鱼调色_1.3.1_浏览器与复位`。只读/引用现有 LUT,未导入或删除用户 LUT。新功能用独立合成运动素材验收,不修改用户正在工作的调色、跟踪或媒体。
|
||||
|
||||
## 7. 正式交付与发布记录
|
||||
|
||||
- APP 公证:`9e93dc7f-04a3-44f9-a1e4-792bd7b31533`,Accepted。
|
||||
- PKG 公证:`85cad776-c3d7-4037-9643-24041b269002`,Accepted。
|
||||
- 正式包:`/Volumes/备份/大鱼调色/发行包/大鱼调色-1.3.1.pkg`;14,073,683 字节。
|
||||
- SHA-256:`954b10c581f31d23a8c417a6f37b24fae19939786dce8733b4d6f09c7ed3adae`。
|
||||
- [1.3.1 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.3.1-browser-recents-20261101),Release ID 366,附件 ID 12;附件下载链接见 `verification/Release.json`。
|
||||
- APP/PKG 的 Developer ID、票据、Gatekeeper、20 项展开验包通过。草稿与正式链接均完整下载校验,只上传一次。正式 APP 已安装,本轮未重复执行 PKG 安装器。
|
||||
|
||||
详细恢复与历史仍在 [RECOVERY.md](../../RECOVERY.md)。本次整理不修改上述正式发行标签、附件或程序版本。
|
||||
|
||||
## 8. 下一位接手的操作入口
|
||||
|
||||
1. 读取本文件、续作方案和本机 `/Users/mac/.codex/AGENTS.md`;核对 main、本地未提交改动、远端及同产品任务,保留用户正在操作的 FCP 状态。
|
||||
2. 先完成工具实例/参数/顺序/迁移合同,以“两个独立 HSL”形成可验收的第一阶段;避免先给所有模块套一个全局蒙版而日后重做。
|
||||
3. 再按续作方案接蒙版、OSC、精确时间分析、取消和单次 Undo/Redo。每阶段提交并立即推送;只暂存本任务文件。
|
||||
4. 模型修改后刷新模板:`python3 tools/build_template.py --refresh-model --overwrite`。
|
||||
5. 编译和 CLI 检查可在固定缓存执行;用户可见验收必须从正式安装的已公证版本进行。正式交付使用 `python3 tools/deliver.py`,它持有产品锁并等待宿主验收输入 `complete`。
|
||||
6. PKG 入口:`python3 Packaging/build_pkg.py --pkg-forge-repo /Users/mac/Documents/dayu-git/repositories/pkg-forge`。发布入口:`python3 Packaging/publish_release.py --tag <新标签> --notes <对应说明>`。不要复用本次版本号、覆盖旧包或移动旧标签。
|
||||
7. 产品身份、正式路径、逐层签名、公证、票据、PluginKit 唯一登记、生成副本清理、Release 完整下载及远端恢复都继续按全局约定执行。证书/profile/权限在下次发布时重新复核,凭据不进文档或源码。
|
||||
|
||||
可直接用于下一聊的任务描述:
|
||||
|
||||
> 先读“大鱼调色FxPlug4交接.md”和 research/MaskTrackingAndToolStack.md,从当前 1.3.1(19)继续。我要能添加多个独立工具,例如第二个 HSL,并给具体工具添加蒙版及蒙版跟踪。参考父级“大鱼调色盘”,保留当前 CST、折叠/眼睛、蜘蛛盘、LUT 浏览器和最近使用行为,保护已有工程和当前用户操作,分阶段验证并完成正式交付。
|
||||
@@ -0,0 +1,50 @@
|
||||
# 大鱼调色FxPlug4交接:1.5.0胶片与通道混合器
|
||||
|
||||
2026-11-02(Asia/Shanghai)。当前正式1.5.0(34),APP已经签名、公证、粘附并安装,FCP12.4宿主验收完成。安装包/Release最终结果读取 `verification/Package.json`、`verification/Release.json`,与APP编译节点分别记录。
|
||||
|
||||
## 身份与恢复
|
||||
|
||||
- 源码:`/Volumes/备份/大鱼调色/大鱼调色`;远程 `https://dayu.media/git/dayu/dayu-color.git`,main。
|
||||
- 正式:`/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、XPC `com.dayu.color.XPC`。
|
||||
- APP实际编译源码:`06d531c443b0bb2f179022a4e64148394f5d0690`。
|
||||
- APP公证:`164abf2b-4e67-4504-b72a-04122da9e381` Accepted;团队B3W25FX5H5。
|
||||
- 固定构建缓存:`/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。
|
||||
- 模板唯一位置:`/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。
|
||||
- 无LFS/子模块;程序不依赖Color Finale安装、REA缓存或父“大鱼调色盘”。
|
||||
|
||||
正式PKG `../发行包/大鱼调色-1.5.0.pkg`,14,380,104字节,SHA-256 `3ecabc7a8bfd675b228a5f00016aa17a35b65b544055e57793ec3bff3d7e0294`。PKG公证 `05f849da-5567-4351-9556-742d17b95723` Accepted,20项展开验包通过;本轮未再次运行系统安装器。[Release372](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.5.0-film-mixer-20261102) / 附件17已发布,草稿和正式链接均完整下载校验一致。发行标签 `v1.5.0-film-mixer-20261102` 对应 `85b6590944c4fb64825cf45f61c5280d4ffaa824`,远端独立恢复264文件、逐字节核对和full/strict fsck通过。详见 `verification/Release.json`、`FilmMixerReleaseRecovery.json`、`ReleaseDraftDownload1.5.0.json`。核验用下载副本、恢复clone及独立构建目录已清理;已知本产品根目录仅保留唯一正式APP,详见 `verification/FilmMixerCleanup.json`,不宣称全盘唯一。
|
||||
|
||||
## 本轮实现
|
||||
|
||||
通道混合器采用RGB三输出×三输入矩阵,含保持亮度、保持饱和度与混合。胶片含减色、晕光、辉光、颗粒、暗角,五页参数各自启停。两类工具沿用原启停、折叠、蒙版、数量标记、区域跟踪和相邻初始化层;工具类型由12追加到14,原索引不移动。
|
||||
|
||||
42个宿主参数只追加,旧参数ID、944字节GPU前缀及1104字节完整旧Uniform前缀保留。完整预设v5兼容v1–v4;读旧预设时新参数恢复中性。schema1尾层、schema2锚点、已有9000–9003载荷保留。新工具置于既有显示域/蜘蛛盘之后、历史尾层之前,不能因此推断UI中全部旧工具都按视觉顺序渲染。
|
||||
|
||||
减色与颗粒用既有sRGB编码边界,晕光/辉光/暗角在线性纹理上。减色是原SubSat归一化幂函数,活跃时限幅0–1。晕光为高斯散射后R/G通道加权归一化;辉光为稀疏预滤→向量Sobel→扩散→相加。颗粒使用PCG/Box-Muller、MPS扩散、精确有理帧和规范化全帧坐标;与原版CI内部切块的空间噪声排列不做全局逐像素等效承诺。暗角复用相同系统CIVignetteEffect。纯矩阵和减色支持Cube,活跃空间/时间效果及蒙版明确拒绝Cube。
|
||||
|
||||
原厂八种印片外观属于另外的ACES输出资源,本版五组处理未纳入这些外观。不能把F-Log输入菜单当作胶片外观,也不能将本工程接入域声称为原版任意ACES链等效。来源、证据ID与边界见[研究记录](research/ColorFinaleFilmMixer.md)。
|
||||
|
||||
## 验收与用户资料
|
||||
|
||||
- 349项原生检查;四种尺寸64×48、63×47、1×17、17×1共184项原版组件对照通过。
|
||||
- FCP12.4正式版加载;用户234个既有参数、资产路径、蜘蛛盘和蒙版载荷逐项/逐字节保持。界面显示286个可信跟踪键,载荷共287键(含作者键)。
|
||||
- 新模块、五页胶片控制、独立混合器初始化、胶片椭圆蒙版、折叠数量1、删除/撤销/重做通过。
|
||||
- 1080p/25fps/4秒ProRes正式导出验证grainHold2:0/1、2/3、4/5帧分别相同,组间不同。
|
||||
- 960×540/25fps/4秒组合导出全部帧解码通过;三个项目FCPXML1.14原生回导严格校验与比较通过。
|
||||
- 正常退出冷重开,组合预设8987字节、颗粒预设8420字节前后均逐字节相同。
|
||||
|
||||
记录:`verification/HostFilmMixer1.5.0.json`、`FilmMixerNative.json`、`FilmMixerReference.json`、`FilmMixerRecovery.json`。私有完整预设与FCPXML只在本机 `.../com.dayu.color/fcp-qa/`,文件名前缀 `film-mixer-`。不写入Git、PKG或覆盖用户原素材。
|
||||
|
||||
## 源码入口
|
||||
|
||||
- `DYFilmTypes.h`、`DYFilmMath.h`:状态/中性判断与共享数学。
|
||||
- `DYFilmKernels.inc.h`:原生Metal点处理、PCG、辉光预滤与Sobel;由DYGrade.metal包含,经tools/build_kernels.py构建。
|
||||
- `DYFilmRender.inc.h`:惰性缓冲、CI/MPS空间阶段、内存预算、混合及现有蒙版。
|
||||
- `DYFilmTime.h`、DYPlugIn.mm:冻结宿主帧长/起点,精确签名帧索引和1–5帧保持。
|
||||
- DYModel.mm / DYUniforms.h:只追加描述符、Uniform;DYInspector.mm五页分组和RGB三输出分组。
|
||||
- DYToolState.mm / DYToolRender.inc.h:新类型、独立初始化、相邻锚点、尾层和Cube限制。
|
||||
- tools/verify_film_reference.mm:本机原版只读CI/Metal对照,不参与产品运行。
|
||||
|
||||
按本机全局规则继续交付。`tools/deliver.py`持有产品锁,正式宿主完成后才输入complete;其自检输出现在会先保存诊断再判定,避免失败时丢失输出。首次预检曾在与恢复自检并行时退出1,旧工具未保留当次JSON;未替换旧版。随后串行349项、正式安装349项和独立恢复349项全部通过,不把未知原因写成已证实的程序缺陷。
|
||||
|
||||
上一阶段详细基线保留于[1.4.3胶片接续原文](research/handoffs/DayuColorFilmStart1.4.3-20261102.md),更早历史见[历史交接](research/handoffs/DayuColorThrough1.4.3-20261102.md)。
|
||||
+5
-3
@@ -4,9 +4,9 @@
|
||||
|
||||
正式安装目标:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`。插件依赖唯一正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,滤镜 UUID `1C17B73B-F229-4C09-A434-EAF6DFF5F22A`。
|
||||
|
||||
四个发布入口依次是用户技能要求的两个空绑定版权菜单、大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器与 LUT 文件状态分别保存为 `DYInspectorToken`、`DYAssetState`;两个双重 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部 196 个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
|
||||
两个发布入口为大鱼调色自定义检查器 `./9000`、宿主混合 `./10001`。检查器、LUT 文件与工具蒙版状态分别保存为 `DYInspectorToken`、`DYAssetState`、`DYToolDocument`;原生 NSKeyedArchive 由本工程的实际类和 Foundation 生成并回读验证。全部278个已注册原生浮点参数都在同一 filter 中保存,供自定义面板与宿主持久化访问。
|
||||
|
||||
版权结构保留完整原生 Rig 与两菜单:作者 ID `10081`、网站 ID `10082`,共同位于 Rig `10080`。菜单精确显示 `大鱼先森Media` 与 `dayu.media`,没有绑定任何画面通道。结构核验逐字段反向重编号对照原始 Rig。版本沿用技能原生效果器母版的 `5.13 / 5.6.7`,没有从较高版本参考传播顶层版本。
|
||||
按2026-11-02用户明确要求,删除作者和网址的两个展示菜单、Rig节点与相应发布项;生成器也停止添加这些内容,历史参考 `CopyrightRig.xml` 不再参与生成。模板顶层降为 `5.11 / 5.4.5`,有本机Color Finale同类EffectSource/FxPlug/custom参数真实样本作结构依据;移除较新且本壳未使用的3D/HDR编辑提示,保留原factory和场景节点内部版本、效果源及色彩设置。来源摘要见 `sources/Provenance.json`。这降低模板格式门槛,旧FCP仍受本程序Apple Silicon、macOS14.6及FxPlug/宿主API要求约束;未实机覆盖的版本不宣称兼容。
|
||||
|
||||
生成入口:
|
||||
|
||||
@@ -16,6 +16,8 @@ python3 tools/build_template.py --output /绝对路径/大鱼调色.moef
|
||||
|
||||
工程模型有变更时,先审查变更,再加 `--refresh-model` 重新导出实际注册表与自有归档。它只编译并执行短时命令行元数据工具,仅用于本工程的参数元数据导出。既有输出必须明确加 `--overwrite`;普通重建直接复用版本化原始归档并核对模型源码哈希,以保持模板字节稳定。
|
||||
|
||||
`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、四项发布、真实空绑定、无内容图层选中、源引用及无动画。实际 FCP 验收和导出记录见工程根目录 `verification/Host.json` 与 `HostThemeLUT.json`。
|
||||
`verification/StaticContract.json`、`SavedSelection.json`、`SkillAudit.json` 记录当前落盘文件的静态检查:唯一滤镜、参数覆盖、两项发布、无版权展示、无内容图层选中、源引用及无动画。实际 FCP 验收以工程根目录对应版本的宿主记录为准。
|
||||
|
||||
全局技能的选择状态检查器目前只接纳较新模板,对5.11返回版本guard未知;该原始结果保留在 `SkillAudit.json`,没有改写成技能工具通过。本项目以真实ColorFinalePro 5.11样本的相同字段和选择位建立 `tools/verify_template.py`,独立结果为 `verification/Compatibility.json`、`SavedSelection.json`;除版本guard外无其他结构错误。
|
||||
|
||||
`large.png`(640×360)与 `small.png`(240×135)使用本产品的光谱鱼和“大鱼调色”品牌图。原图和生成提示词在 `design/`,运行 `python3 tools/build_brand_assets.py` 可重建。`verification/Preview.json` 记录来源与导出哈希;正式安装时设置预览文件锁,防止宿主自动覆盖。
|
||||
@@ -17,13 +17,22 @@
|
||||
"feature": "two unbound copyright popup widgets",
|
||||
"path": "/Users/mac/.codex/skills/ae-to-motion/assets/publication/copyright-info/版权信息.moti",
|
||||
"sha256": "fd0e0414e957dbe1b5837250a38a4799defceedc0e09f7a6c7b9e1baf8b5e4c0",
|
||||
"retained": "CopyrightRig.xml"
|
||||
"retained": "CopyrightRig.xml (historical source only; no longer generated or shipped in the template)"
|
||||
}
|
||||
],
|
||||
"versionPolicy": {
|
||||
"ozml": "5.13",
|
||||
"displayversion": "5.6.7",
|
||||
"basis": "skill native effect source; no version value inferred from vendor or CST source"
|
||||
"ozml": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"basis": "Identity-verified local Color Finale EffectSource/FxPlug/custom-archive template; no vendor preset/archive copied",
|
||||
"referenceTemplate": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinale/ColorFinale.moef",
|
||||
"referenceSHA256": "61b07cab981566dd4fd80f08fdcb9be9f26f3f0389062420dafc3331aaa95749",
|
||||
"removedLaterOptionalHints": [
|
||||
"Object3DEnvironments",
|
||||
"DRTSupport",
|
||||
"onHDRDisplay",
|
||||
"missingDynamicRangeType"
|
||||
],
|
||||
"oldFCPActuallyTested": false
|
||||
},
|
||||
"runtimeDependency": {
|
||||
"app": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
@@ -31,5 +40,10 @@
|
||||
"pluginUUID": "1C17B73B-F229-4C09-A434-EAF6DFF5F22A",
|
||||
"noVendorRuntimeDependency": true
|
||||
},
|
||||
"scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate"
|
||||
"scope": "Build sources and static evidence only; host UI/render/save-reopen validation remains separate",
|
||||
"copyrightPolicy": {
|
||||
"userRequestedRemoval": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"rigGenerated": false
|
||||
}
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -1,5 +1,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "DYModel.h"
|
||||
#import "DYToolState.h"
|
||||
|
||||
static NSString *archive(id object) {
|
||||
NSKeyedArchiver *inner=[[[NSKeyedArchiver alloc]initRequiringSecureCoding:YES]autorelease];
|
||||
@@ -17,7 +18,7 @@ static NSString *archive(id object) {
|
||||
return [carrier base64EncodedStringWithOptions:0];
|
||||
}
|
||||
int main(void){@autoreleasepool{
|
||||
NSDictionary *out=@{@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease])}};
|
||||
NSDictionary *out=@{@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
|
||||
NSError *error=nil;NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];
|
||||
if(!json){fprintf(stderr,"Could not export our model metadata\n");return 2;}fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"nativeReference": {
|
||||
"path": "~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef",
|
||||
"sha256": "bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"projectBaseFlags": 268435473,
|
||||
"currentObject": "10000",
|
||||
"scenenodeVersion": "5",
|
||||
"widgetBaseFlags": 16,
|
||||
"layerAndSourceBaseFlags": 524304,
|
||||
"fxPlugBaseFlags": 8589934608,
|
||||
"allContentSelectionBits": 0
|
||||
},
|
||||
"staticContract": {
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
"nativeFloatParameters": 278,
|
||||
"customParameters": 3,
|
||||
"publications": [
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./9000",
|
||||
"name": "大鱼调色"
|
||||
},
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./10001",
|
||||
"name": "混合"
|
||||
}
|
||||
],
|
||||
"effectSourceType": 3,
|
||||
"externalMediaRequired": false,
|
||||
"placeholder": "native Drop Zone.tiff",
|
||||
"animationObjects": 0,
|
||||
"copyright": {
|
||||
"removedAtUserRequest": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"displayRigAbsent": true
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"selectedContentCount": 0,
|
||||
"currentObjectIsProject": true
|
||||
},
|
||||
"hostUIVerified": false,
|
||||
"hostRenderVerified": false
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 4,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"nativeUIVerified": false,
|
||||
"validator": "project-scoped native-5.11 field comparison",
|
||||
"scope": "Saved fields only; no rendering or old-FCP execution"
|
||||
},
|
||||
"skillCheckerStatus": "unsupported-version-guard; original SkillAudit.json retained unchanged",
|
||||
"otherSkillStructuralErrors": [],
|
||||
"copyrightDisplayRows": 0,
|
||||
"oldFCPActuallyTested": false,
|
||||
"scope": "Native-template structure and saved-state comparison only; FCP host acceptance is separate"
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
{
|
||||
"README.md": "db063c6b56acf80eec8c17613539ce99202c9771d108f392c13cf90ed962a038",
|
||||
"README.md": "6be40447052793855fba6f1a6756625d86da0363827ebb53e55c2980506ec987",
|
||||
"sources/CopyrightRig.xml": "842afc58ecda0fc8c22675a0191f53dccb9ea6aaba10acd0a272cecee9b72067",
|
||||
"sources/NativeEffectSource.moef": "4424b5ee3b5dc137bc8e8baa9091b24c2431adf32a3d79b2662cff079c35031c",
|
||||
"sources/NativeFactories.xml": "5db79ab22e948ca2bdf9162beb60d8380a95ceff6c74e86ff095804ae1d832b6",
|
||||
"sources/NativeFxPlugShell.xml": "5d2a1e807fb7148e5a682c83ba30d7022c8680d2ca8309c502d30f4b12efad64",
|
||||
"sources/Provenance.json": "32063c48ef02a47e42555537421bfc95f767e96fc88d3478e9116c85a0205baf",
|
||||
"sources/RegisteredParameters.json": "1d8c9c1a58c289d855e1f57add064dd4d96342961df6c2796f705a90b287e38c",
|
||||
"tools/dump_model.mm": "2ef22e010e0cae15b73107d39fb2c125f6049b1e5405e88078f936cf29e79350",
|
||||
"verification/SavedSelection.json": "ef90b0afa1df26f2a5d299f86f675422c8b433e3f833ff1a9a61bb1228e6c9ca",
|
||||
"verification/SkillAudit.json": "d6931eb103fb1fe3e30a331b47ff957ef9d69cf409276d13a3f1bb423df5ad80",
|
||||
"verification/StaticContract.json": "a03aa582320dff857f860a90c120b829604a8a3f2aa1997a5131b825b4fdbf1b",
|
||||
"大鱼调色.moef": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b"
|
||||
"sources/Provenance.json": "9cfa41fd1f02b35b99cad56a4a048bafa1c627da181006f5b9186a104664f421",
|
||||
"sources/RegisteredParameters.json": "9937a076df8b1f8dba7aea8701810bf84f9819337bbfe87ddcecb36d6f279289",
|
||||
"tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
|
||||
"verification/SavedSelection.json": "7408fb149fcb88db9335af7076d6e7afb07c3074a19e9935343b4d8c5c76bec5",
|
||||
"verification/SkillAudit.json": "eda67532a7ab8abaf24d8eff890235d2dd13bf4c70472684fcfbbd9b2b21e08b",
|
||||
"verification/StaticContract.json": "afc6ed629d21b6f535b767f180891566bc6700ea9a7d85e1e364a435efe2d063",
|
||||
"大鱼调色.moef": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"verification/Compatibility.json": "517cff6f5cb7229fdf725adf687e6039e91b20359c412e4bdbd71e4fcb1bed88"
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b",
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"nativeUIVerified": false,
|
||||
"scope": "Saved selection fields for observed schema; no rendering or GUI operation",
|
||||
"version": "5.13",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 7,
|
||||
"contentObjectsChecked": 4,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"errors": []
|
||||
"nativeUIVerified": false,
|
||||
"validator": "project-scoped native-5.11 field comparison",
|
||||
"scope": "Saved fields only; no rendering or old-FCP execution"
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
"checksPassed": true,
|
||||
"errors": [],
|
||||
"checksPassed": false,
|
||||
"errors": [
|
||||
"Saved selection: Unverified Motion XML version/schema; obtain native evidence first"
|
||||
],
|
||||
"warnings": [
|
||||
"Parent time conversion is supplied explicitly in contracts; not inferred for arbitrary nesting.",
|
||||
"No native rendering, font/glyph availability, full dynamic/private reference graph, or visual validation performed."
|
||||
@@ -13,19 +15,14 @@
|
||||
"NTSC": "1"
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "bb03fae187e45358180258bb6a43fdde397b317dbf191bba5de72f2ce5d83b2b",
|
||||
"passed": false,
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"selectionMask": "0x10000001",
|
||||
"nativeUIVerified": false,
|
||||
"scope": "Saved selection fields for observed schema; no rendering or GUI operation",
|
||||
"version": "5.13",
|
||||
"projectID": "10000",
|
||||
"contentObjectsChecked": 7,
|
||||
"selectedContent": [],
|
||||
"selectedContentCount": 0,
|
||||
"currentObject": "10000",
|
||||
"currentObjectIsProject": true,
|
||||
"errors": []
|
||||
"errors": [
|
||||
"Unverified Motion XML version/schema; obtain native evidence first"
|
||||
]
|
||||
},
|
||||
"savedSelectionRequired": true,
|
||||
"buildMarkers": false,
|
||||
@@ -48,10 +45,10 @@
|
||||
"nativeVisualValidation": false
|
||||
},
|
||||
"basic": {
|
||||
"entity_count": 10,
|
||||
"entity_count": 7,
|
||||
"entity_ids_unique": true,
|
||||
"duplicate_entities": {},
|
||||
"published_count": 4,
|
||||
"published_count": 2,
|
||||
"unresolved_media": []
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,12 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "ebf8b7aa7a6781b9ce611375a838d89997656b0fc01077b2a7e5b1b2a2c373e1",
|
||||
"version": "5.13",
|
||||
"displayversion": "5.6.7",
|
||||
"sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
"nativeFloatParameters": 196,
|
||||
"customParameters": 2,
|
||||
"nativeFloatParameters": 278,
|
||||
"customParameters": 3,
|
||||
"publications": [
|
||||
{
|
||||
"object": "10081",
|
||||
"channel": "./2/100",
|
||||
"name": "FCP 版本作者→"
|
||||
},
|
||||
{
|
||||
"object": "10082",
|
||||
"channel": "./2/100",
|
||||
"name": "更多模板浏览器访问→"
|
||||
},
|
||||
{
|
||||
"object": "10060",
|
||||
"channel": "./9000",
|
||||
@@ -33,11 +23,9 @@
|
||||
"placeholder": "native Drop Zone.tiff",
|
||||
"animationObjects": 0,
|
||||
"copyright": {
|
||||
"passed": true,
|
||||
"rig": "10080",
|
||||
"author": "10081",
|
||||
"site": "10082",
|
||||
"unbound": true
|
||||
"removedAtUserRequest": true,
|
||||
"publishedDisplayRows": 0,
|
||||
"displayRigAbsent": true
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
|
||||
+107
-92
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE ozxmlscene>
|
||||
<ozml version="5.13">
|
||||
<displayversion>5.6.7</displayversion>
|
||||
<ozml version="5.11">
|
||||
<displayversion>5.4.5</displayversion>
|
||||
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
|
||||
<description>Channel</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
@@ -27,16 +27,6 @@
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="6" uuid="402246385249454b90e08b2ee1b6bf06">
|
||||
<description>绑定</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="7" uuid="e35c74f01d5042f6b468eb530169bfb7">
|
||||
<description>小组件</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<build />
|
||||
<description />
|
||||
<canvas>
|
||||
@@ -145,14 +135,9 @@
|
||||
<animateFlag>0</animateFlag>
|
||||
<parameterColorSpaceID>3</parameterColorSpaceID>
|
||||
<savePreviewMovie>0</savePreviewMovie>
|
||||
<Object3DEnvironments>100</Object3DEnvironments>
|
||||
<DRTSupport>0</DRTSupport>
|
||||
<onHDRDisplay>0</onHDRDisplay>
|
||||
</sceneSettings>
|
||||
<publishSettings>
|
||||
<version>2</version>
|
||||
<target object="10081" channel="./2/100" name="FCP 版本作者→" />
|
||||
<target object="10082" channel="./2/100" name="更多模板浏览器访问→" />
|
||||
<target object="10060" channel="./9000" name="大鱼调色" />
|
||||
<target object="10060" channel="./10001" name="混合" />
|
||||
</publishSettings>
|
||||
@@ -186,62 +171,6 @@
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<scenenode name="绑定" id="10080" factoryID="6" version="5">
|
||||
<scenenode name="弹出式菜单 1" id="10082" factoryID="7" version="5">
|
||||
<affecting>2</affecting>
|
||||
<snapshot>3</snapshot>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688">
|
||||
<parameter name="初始值" id="106" flags="68736319504" default="0" value="0" />
|
||||
</parameter>
|
||||
<parameter name="Hidden" id="102" flags="8606711824" default="0" value="3" />
|
||||
<parameter name="快照" id="101" flags="8589938706">
|
||||
<parameter name="快照" id="3" flags="4112">
|
||||
<parameter name="值" id="1" flags="16" default="0" value="2" />
|
||||
<parameter name="插值" id="2" flags="65552" default="1" value="1" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="弹出式菜单" id="100" flags="16842769" default="2" value="2">
|
||||
<entry name="dayu.media" tag="2" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<scenenode name="弹出式菜单" id="10081" factoryID="7" version="5">
|
||||
<affecting>2</affecting>
|
||||
<snapshot>3</snapshot>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688">
|
||||
<parameter name="初始值" id="106" flags="68736319504" default="0" value="0" />
|
||||
</parameter>
|
||||
<parameter name="Hidden" id="102" flags="8606711824" default="0" value="3" />
|
||||
<parameter name="快照" id="101" flags="8589938706">
|
||||
<parameter name="快照" id="3" flags="4112">
|
||||
<parameter name="值" id="1" flags="16" default="0" value="2" />
|
||||
<parameter name="插值" id="2" flags="65552" default="1" value="1" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="弹出式菜单" id="100" flags="16842768" default="2" value="2">
|
||||
<entry name="大鱼先森Media" tag="2" />
|
||||
</parameter>
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2560 153600 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<layer name="群组 1" id="10047">
|
||||
<scenenode name="效果源" id="10050" factoryID="3" version="5">
|
||||
<validTracks>1</validTracks>
|
||||
@@ -288,22 +217,61 @@
|
||||
<parameter name="宽度" id="313" flags="8589934610" default="1" value="3840" />
|
||||
<parameter name="高度" id="314" flags="8589934610" default="1" value="2160" />
|
||||
</parameter>
|
||||
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="1" pluginName="大鱼调色" pluginDynamicParams="0">
|
||||
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="0" pluginName="大鱼调色" pluginDynamicParams="0">
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<baseFlags>8589934608</baseFlags>
|
||||
<parameter name="大鱼调色" id="9000" flags="12884901888">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********PoeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl1yMb-gOLBoA11I*E61-*I4-kdM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh260Jh1RLBoPqoUF43oMM*-ckgA2JIYPbJgPB6B1UwEJbBXO4JhMJMYMqlVQrAE*M*0oV6H3-JO74BgMLBnPa3hNJUYMqlVQrBZQpwE22FNGKtnQ4JXR4xmJ4xfNKuW3VRT2--2KIZiQr-ZMrFjQZFjOqJiK2tHHq7eNKBo0-2O70YmBoZAK3dSN4ZkRrZvU6iIduex*********E2*********4********************AM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*Lk********0*E*********E*******************-TE*</defaultVal>
|
||||
<dataValue>*********PoeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl1yMb-gOLBoA11I*E61-*I4-kdM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh260Jh1RLBoPqoUF43oMM*-ckgA2JIYPbJgPB6B1UwEJbBXO4JhMJMYMqlVQrAE*M*0oV6H3-JO74BgMLBnPa3hNJUYMqlVQrBZQpwE22FNGKtnQ4JXR4xmJ4xfNKuW3VRT2--2KIZiQr-ZMrFjQZFjOqJiK2tHHq7eNKBo0-2O70YmBoZAK3dSN4ZkRrZvU6iIduex*********E2*********4********************AM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*Lk********0*E*********E*******************-TE*</dataValue>
|
||||
<defaultVal>*********WgeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Oq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-AN5pIYPbJgPBAB1UwE2F7JNaxgN5BKQqBcNKpVJWFXP43nQs*02*8*-BAI3EwK3lVLHZAiOqJtQpdCImtjMadZMrFnc80**x6O4lkRKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcVkSK2tHHq7eNKBooVcP603T2--2KIZiQr-ZMrFjQZFjOqJicW6SLl*EF3Z7PbBkNKBoPr7IPqhZPU*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*4o*Qk-u*62*Uk03*6Q*XU0K*82*cU0X*8I*eU0p*9s*mk1C*BQ*r*1j*D6********0*E*********X*******************--EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-uU********6-*********-********************5f**</defaultVal>
|
||||
<dataValue>*********WgeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Oq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-AN5pIYPbJgPBAB1UwE2F7JNaxgN5BKQqBcNKpVJWFXP43nQs*02*8*-BAI3EwK3lVLHZAiOqJtQpdCImtjMadZMrFnc80**x6O4lkRKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcVkSK2tHHq7eNKBooVcP603T2--2KIZiQr-ZMrFjQZFjOqJicW6SLl*EF3Z7PbBkNKBoPr7IPqhZPU*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*4o*Qk-u*62*Uk03*6Q*XU0K*82*cU0X*8I*eU0p*9s*mk1C*BQ*r*1j*D6********0*E*********X*******************--EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-uU********6-*********-********************5f**</dataValue>
|
||||
</parameter>
|
||||
<parameter name="LUT 文件" id="9001" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********SweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-9q7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-2L5JIYPbJgPB6B1UwEJL-VR4VnJWFXP43nQs*0U*HH2VAC3-IKJotH9ahZSLBOHZAiPq7eNKBoQu0UU*DG4-YO4pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6O53VCIoxWOaJXRB6M4FsTL2FNELBnNLFHR43oNO6U53l2KI3nQqJoIrFVR4I62FcY8H6rGIlMKa-aOr3sSbm1WtOLa7eTefD*kwnFri2********-*E*********V********************vUU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-fU********6-*********-********************4j**</defaultVal>
|
||||
<dataValue>*********SweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-9q7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-2L5JIYPbJgPB6B1UwEJL-VR4VnJWFXP43nQs*0U*HH2VAC3-IKJotH9ahZSLBOHZAiPq7eNKBoQu0UU*DG4-YO4pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6O53VCIoxWOaJXRB6M4FsTL2FNELBnNLFHR43oNO6U53l2KI3nQqJoIrFVR4I62FcY8H6rGIlMKa-aOr3sSbm1WtOLa7eTefD*kwnFri2********-*E*********V********************vUU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-fU********6-*********-********************4j**</dataValue>
|
||||
<defaultVal>*********XQeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Rq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-IP6JIYPbJgPBEB1UwE2F6H33JkMLFcQpMYMqlVQrBQQr-dN4JmH4ZiOqJYKbBkOKFZQYpZQqW**c*20M**olML1VUN4ZRCImtfNLZnKYtH9axWOaJXR5CUc6*1oVkR5VxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW5W-MHZBDMadZMrHG5-oW6pl2KI3nQqJoIrFVR4KW70-QF3Z-QrBZR3BoMLFZ**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-U*4M*Pk-p*5k*WE0I*7M*a*0N*7g*cU0e*9I*hU0r*9Y*jU17*B6*rk1W*Cg*w*1x*E*********0*E*********Z*******************-1EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-xU********6-*********-********************5r**</defaultVal>
|
||||
<dataValue>*********XQeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Rq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-IP6JIYPbJgPBEB1UwE2F6H33JkMLFcQpMYMqlVQrBQQr-dN4JmH4ZiOqJYKbBkOKFZQYpZQqW**c*20M**olML1VUN4ZRCImtfNLZnKYtH9axWOaJXR5CUc6*1oVkR5VxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW5W-MHZBDMadZMrHG5-oW6pl2KI3nQqJoIrFVR4KW70-QF3Z-QrBZR3BoMLFZ**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-U*4M*Pk-p*5k*WE0I*7M*a*0N*7g*cU0e*9I*hU0r*9Y*jU17*B6*rk1W*Cg*w*1x*E*********0*E*********Z*******************-1EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-xU********6-*********-********************5r**</dataValue>
|
||||
</parameter>
|
||||
<parameter name="工具与蒙版" id="9002" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********dIeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-pK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**Ok91-2R5VwU70chA13J74tpP4nG1EsD23VYPqBpPKJiR3MYMqlVQrC**c*9ol6H1VEM53RCImtfNLZnKYtH9axWOaJXR5CX3FMLU*C*-6*3clYO4s*4U*W*0c*5KK7VQqJBMLBfQpNgMLZZQbBKQqBcNKpVol6H1W2W580UU*TG7GMb83cYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6b8JVCIoxWOaJXRB6H1Wggc6*7oWIa9WxLHZB-Qb7VSO6i8F*-oWIaAXBSF3ZIPqxgF4xXRKpZPbGWB0ZSF3ZIPqxgF4xXRKpZPbE*0**F*-c*7**d*16*Bk-7*2k*K*-O*4Q*PE-m*5g*UU02*6M*XE0J*8**d*0a*8U*eU0i*9**gU0o*9M*k*15*As*pE1K*BQ*qE1S*CY*wU1z*E6-0k2E*F2-2k2M*G*-6k2Z*Gc-CE2w*********U2*********BE*******************Ig6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*ZE********0*E*********E*******************0JE*</defaultVal>
|
||||
<dataValue>*********dIeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-pK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**Ok91-2R5VwU70chA13J74tpP4nG1EsD23VYPqBpPKJiR3MYMqlVQrC**c*9ol6H1VEM53RCImtfNLZnKYtH9axWOaJXR5CX3FMLU*C*-6*3clYO4s*4U*W*0c*5KK7VQqJBMLBfQpNgMLZZQbBKQqBcNKpVol6H1W2W580UU*TG7GMb83cYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6b8JVCIoxWOaJXRB6H1Wggc6*7oWIa9WxLHZB-Qb7VSO6i8F*-oWIaAXBSF3ZIPqxgF4xXRKpZPbGWB0ZSF3ZIPqxgF4xXRKpZPbE*0**F*-c*7**d*16*Bk-7*2k*K*-O*4Q*PE-m*5g*UU02*6M*XE0J*8**d*0a*8U*eU0i*9**gU0o*9M*k*15*As*pE1K*BQ*qE1S*CY*wU1z*E6-0k2E*F2-2k2M*G*-6k2Z*Gc-CE2w*********U2*********BE*******************Ig6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*ZE********0*E*********E*******************0JE*</dataValue>
|
||||
</parameter>
|
||||
<parameter name="相机输入" id="2013" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入强度" id="2014" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输入 / LUT" id="2033" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旧版输入强度" id="2014" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="CST 配置版本" id="2236" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入转换启用" id="2241" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输入曲线" id="2237" flags="12889161776" default="28" value="28" />
|
||||
<parameter name="输入色域" id="2238" flags="12889161776" default="27" value="27" />
|
||||
<parameter name="工作曲线" id="2239" flags="12889161776" default="10" value="10" />
|
||||
<parameter name="工作色域" id="2240" flags="12889161776" default="16" value="16" />
|
||||
<parameter name="CST 混合" id="2269" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级调色启用" id="2242" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级曝光" id="2247" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡方向" id="2248" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡强度" id="2249" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级饱和度" id="2250" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级对比度" id="2251" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="对比度轴心" id="2252" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光对比度" id="2253" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光轴心" id="2254" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影对比度" id="2255" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影轴心" id="2256" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="白点" id="2257" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肩部压缩" id="2258" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="一级高光" id="2259" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级中间调" id="2260" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级阴影" id="2261" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑点" id="2262" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="趾部压缩" id="2263" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="色度混合" id="2264" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="旁路一级曝光" id="2265" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级色彩" id="2266" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级对比" id="2267" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级影调" id="2268" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
|
||||
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
|
||||
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
|
||||
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="对比度" id="2001" flags="12889161760" default="0" value="0" />
|
||||
@@ -330,12 +298,15 @@
|
||||
<parameter name="清晰度 启用" id="2031" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="去朦胧" id="2012" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="去朦胧 启用" id="2032" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="复制时自动调色" id="8800" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="复制时自动调色" id="8800" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="一级调色总开关" id="2271" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘混合" id="2273" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘校色仪" id="2272" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="基础调色" id="2034" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
@@ -345,7 +316,7 @@
|
||||
<parameter name="风格 4 强度" id="2018" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 启用" id="2043" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 强度" id="2019" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 LUT" id="2036" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="风格 LUT" id="2036" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="主曲线 阴影" id="2046" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 暗部" id="2047" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 亮部" id="2048" flags="12889161760" default="0" value="0" />
|
||||
@@ -398,7 +369,7 @@
|
||||
<parameter name="蓝 扩展点3 X" id="2234" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点4 偏移" id="2231" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点4 X" id="2235" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="曲线" id="2044" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="曲线" id="2044" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红 色相" id="2068" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 色相" id="2069" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 色相" id="2070" flags="12889161760" default="0" value="0" />
|
||||
@@ -433,7 +404,7 @@
|
||||
<parameter name="自定义 明亮度" id="2098" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 明亮度范围" id="2142" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="显示自定义色选区" id="2144" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="HSL 混色" id="2045" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="HSL 混色" id="2045" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 色相" id="2106" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 饱和度" id="2107" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 明亮度" id="2113" flags="12889161760" default="0" value="0" />
|
||||
@@ -448,14 +419,14 @@
|
||||
<parameter name="全局 明亮度" id="2150" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="混合" id="2101" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="平衡" id="2102" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色分级" id="2100" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色分级" id="2100" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红原色 色相" id="2121" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红原色 饱和度" id="2122" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 色相" id="2123" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 饱和度" id="2124" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 色相" id="2125" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 饱和度" id="2126" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="三原色" id="2120" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="三原色" id="2120" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入黑" id="2156" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="RGB 伽马" id="2160" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入白" id="2164" flags="12889161760" default="255" value="255" />
|
||||
@@ -476,7 +447,7 @@
|
||||
<parameter name="蓝 输入白" id="2167" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="蓝 输出黑" id="2171" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 输出白" id="2175" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="色阶" id="2152" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色阶" id="2152" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黑白 红" id="2180" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="黑白 黄" id="2181" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="黑白 绿" id="2182" flags="12889161760" default="40" value="40" />
|
||||
@@ -485,7 +456,8 @@
|
||||
<parameter name="黑白 洋红" id="2185" flags="12889161760" default="80" value="80" />
|
||||
<parameter name="着色色相" id="2186" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="着色饱和度" id="2187" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混色" id="2176" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混合" id="2270" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混色" id="2176" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持明度" id="2189" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 青 ↔ 红" id="2192" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 洋红 ↔ 绿" id="2193" flags="12889161760" default="0" value="0" />
|
||||
@@ -496,11 +468,55 @@
|
||||
<parameter name="高光 青 ↔ 红" id="2200" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡" id="2188" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
|
||||
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
|
||||
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
|
||||
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="发布 OSC" id="10005" flags="4294967296" default="0" value="0" />
|
||||
<parameter name="发布 OSC" id="10005" flags="8589934592" default="0" value="1" />
|
||||
</filter>
|
||||
</scenenode>
|
||||
<aspectRatio>1</aspectRatio>
|
||||
@@ -542,7 +558,6 @@
|
||||
<missingWidth>1200</missingWidth>
|
||||
<missingHeight>1200</missingHeight>
|
||||
<missingDuration>0.033333333333333333</missingDuration>
|
||||
<missingDynamicRangeType>0</missingDynamicRangeType>
|
||||
<creationDuration>1</creationDuration>
|
||||
<mediaID />
|
||||
<flags>0</flags>
|
||||
|
||||
+11
-2
@@ -3,6 +3,7 @@
|
||||
from pathlib import Path
|
||||
import argparse
|
||||
import subprocess
|
||||
from build_masked_kernel import masked_kernel
|
||||
|
||||
|
||||
def main():
|
||||
@@ -15,15 +16,23 @@ def main():
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
args.output.parent.mkdir(parents=True, exist_ok=True)
|
||||
objects = []
|
||||
for name in ('DYGradeKernel', 'DYStatisticsKernel', 'DYLUTExportKernel'):
|
||||
for name in ('DYGradeKernel', 'DYStatisticsKernel', 'DYLUTExportKernel', 'CSTKernel', 'BasisKernel'):
|
||||
target = work / (name + '.air')
|
||||
subprocess.run(['xcrun', 'metal-opt', str(root / 'tools/kernels' / (name + '.ll')),
|
||||
source = root / 'tools/kernels' / (name + '.ll')
|
||||
if name == 'DYGradeKernel':
|
||||
generated = work / 'DYGradeMasked.ll'
|
||||
generated.write_text(masked_kernel(source.read_text()))
|
||||
source = generated
|
||||
subprocess.run(['xcrun', 'metal-opt', str(source),
|
||||
'-o', str(target)], check=True)
|
||||
objects.append(str(target))
|
||||
wrapper = work / 'DYGradeWrapper.air'
|
||||
subprocess.run(['xcrun', '-sdk', 'macosx', 'metal', '-std=metal3.1',
|
||||
'-mmacosx-version-min=14.6', '-c',
|
||||
str(root / '大鱼调色/Plugin/DYGrade.metal'), '-o', str(wrapper)], check=True)
|
||||
tracking=work / 'DYTracking.air'
|
||||
subprocess.run(['xcrun','-sdk','macosx','metal','-std=metal3.1','-mmacosx-version-min=14.6','-c',str(root/'大鱼调色/Plugin/DYTracking.metal'),'-o',str(tracking)],check=True)
|
||||
objects.append(str(tracking))
|
||||
subprocess.run(['xcrun', '-sdk', 'macosx', 'metallib', str(wrapper), *objects,
|
||||
'-o', str(args.output)], check=True)
|
||||
print(args.output)
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
"""Add per-stage coverage to a separate entry; preserve the legacy AIR function.
|
||||
|
||||
Anchors are exact SSA values of the versioned source, not guessed byte offsets.
|
||||
No target runtime or installed reference binary is a build dependency.
|
||||
"""
|
||||
import re
|
||||
|
||||
def masked_kernel(source):
|
||||
original = re.search(r'define <4 x half> @dy_grade\(.*?\n\}', source, re.S).group()
|
||||
body = original.replace('@dy_grade(', '@dy_gradeMasked(', 1)
|
||||
args = ', '.join(f'float %dyWeight{i}' for i in range(12))
|
||||
body = body.replace(') local_unnamed_addr #0 {', ', '+args+') local_unnamed_addr #0 {', 1)
|
||||
# Each stage mixes against its actual input. Split basic adjustment has
|
||||
# two native locations; both use the same per-module coverage.
|
||||
stages = [(82,53,0),(83,82,8),(408,83,2),(409,408,6),
|
||||
(410,409,9),(411,410,11),(498,411,5),(519,498,7),
|
||||
(520,519,2),(521,520,10),(668,521,4),(669,668,3)]
|
||||
for value, before, section in stages:
|
||||
target = f'%v{value}'
|
||||
lines = body.splitlines()
|
||||
index = next(i for i,l in enumerate(lines) if l.startswith(' '+target+' = '))
|
||||
# Keep all PHIs first in a block, then insert the coverage operation.
|
||||
end = index+1
|
||||
while end<len(lines) and re.match(r' %\w+ = phi ',lines[end]): end+=1
|
||||
lines[index] = lines[index].replace(target+' = ',f'%dyRaw{value} = ',1)
|
||||
lines[end:end] = [
|
||||
f' %dyScalar{value} = insertelement <3 x float> undef, float %dyWeight{section}, i64 0',
|
||||
f' %dyVector{value} = shufflevector <3 x float> %dyScalar{value}, <3 x float> undef, <3 x i32> zeroinitializer',
|
||||
f' {target} = tail call <3 x float> @air.mix.v3f32(<3 x float> %v{before}, <3 x float> %dyRaw{value}, <3 x float> %dyVector{value}) #1']
|
||||
body='\n'.join(lines)
|
||||
# A second, explicitly ranged entry lets anchored extra tools interrupt the
|
||||
# existing native instruction order. The historical entry above is unchanged.
|
||||
segment = body.replace('@dy_gradeMasked(', '@dy_gradeSegment(', 1)
|
||||
segment = segment.replace(') local_unnamed_addr #0 {', ', i32 %dyStageFirst, i32 %dyStageLast, <3 x float> %dyExternalSkinReference, <3 x float> %dyOriginalReference) local_unnamed_addr #0 {', 1)
|
||||
for stage, (value, before, section) in enumerate(stages):
|
||||
target = f' %dyScalar{value} = insertelement <3 x float> undef, float %dyWeight{section}, i64 0'
|
||||
replacement = '\n'.join([
|
||||
f' %dyAtOrAfter{value} = icmp ule i32 %dyStageFirst, {stage}',
|
||||
f' %dyAtOrBefore{value} = icmp uge i32 %dyStageLast, {stage}',
|
||||
f' %dyStageActive{value} = and i1 %dyAtOrAfter{value}, %dyAtOrBefore{value}',
|
||||
f' %dyEffective{value} = select i1 %dyStageActive{value}, float %dyWeight{section}, float 0.000000e+00',
|
||||
target.replace(f'%dyWeight{section}', f'%dyEffective{value}')])
|
||||
assert target in segment
|
||||
segment = segment.replace(target, replacement, 1)
|
||||
skin_call = ' %dyRaw669 = tail call fast fastcc <3 x float> @_ZL19applySkinProtection'
|
||||
assert skin_call in segment
|
||||
segment = segment.replace(skin_call, ' %dyHasLocalSkinReference = icmp ule i32 %dyStageFirst, 5\n %dySkinReference = select i1 %dyHasLocalSkinReference, <3 x float> %v411, <3 x float> %dyExternalSkinReference\n'+skin_call, 1)
|
||||
segment = segment.replace('(<3 x float> %v668, <3 x float> %v411,', '(<3 x float> %v668, <3 x float> %dySkinReference,', 1)
|
||||
# Highlight/shadow spatial weighting uses the same original post-CST
|
||||
# reference as the historical fused function, not a later segment's input.
|
||||
original_luma = next(line for line in segment.splitlines() if line.startswith(' %v213 = '))
|
||||
assert '@air.dot.v3f32(<3 x float> %v53,' in original_luma
|
||||
segment = segment.replace(original_luma, original_luma.replace('<3 x float> %v53,', '<3 x float> %dyOriginalReference,'), 1)
|
||||
clamp = next(line for line in segment.splitlines() if line.startswith(' %v672 = '))
|
||||
segment = segment.replace(clamp, '\n'.join([
|
||||
clamp.replace('%v672 = ', '%dyClamped672 = ', 1),
|
||||
' %dyIncludesFinalFirst = icmp ule i32 %dyStageFirst, 11',
|
||||
' %dyIncludesFinalLast = icmp uge i32 %dyStageLast, 11',
|
||||
' %dyIncludesFinal = and i1 %dyIncludesFinalFirst, %dyIncludesFinalLast',
|
||||
' %v672 = select i1 %dyIncludesFinal, <3 x float> %dyClamped672, <3 x float> %v669']), 1)
|
||||
skin='''
|
||||
define <3 x float> @dy_skinExtra(<3 x float> %color, <3 x float> %reference, %struct.DYUniforms addrspace(2)* %uniforms) {
|
||||
entry:
|
||||
%result = call fastcc <3 x float> @_ZL19applySkinProtectionDv3_fS_RU11MTLconstantK17DYUniforms(<3 x float> %color, <3 x float> %reference, %struct.DYUniforms addrspace(2)* %uniforms)
|
||||
ret <3 x float> %result
|
||||
}
|
||||
'''
|
||||
return source+'\n'+body+'\n'+segment+'\n'+skin
|
||||
+30
-33
@@ -12,6 +12,8 @@ TEMPLATE=ROOT/'template'
|
||||
SOURCES=TEMPLATE/'sources'
|
||||
PROJECT_UUID='7d468273c013498e9806a0d7bc32fddf'
|
||||
PLUGIN_UUID='1C17B73B-F229-4C09-A434-EAF6DFF5F22A'
|
||||
OUTPUT_VERSION='5.11'
|
||||
OUTPUT_DISPLAY_VERSION='5.4.5'
|
||||
NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
|
||||
STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
|
||||
CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
@@ -20,14 +22,14 @@ CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
def sha(data):return hashlib.sha256(data).hexdigest()
|
||||
|
||||
def model_identity():
|
||||
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','template/tools/dump_model.mm']
|
||||
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm','大鱼调色/Plugin/DYFilmTypes.h','大鱼调色/Plugin/DYFilmMath.h','大鱼调色/Plugin/DYToolState.h','大鱼调色/Plugin/DYToolState.mm','大鱼调色/Plugin/MaskCore/DYMaskOperator.h','大鱼调色/Plugin/MaskCore/DYMask.h']
|
||||
return {name:sha((ROOT/name).read_bytes()) for name in files}
|
||||
|
||||
def refresh_metadata():
|
||||
cache=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/template-model')
|
||||
cache.mkdir(parents=True,exist_ok=True)
|
||||
executable=cache/'dump_model'
|
||||
command=['xcrun','clang++','-std=c++17','-fno-objc-arc','-fblocks','-F','/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks','-F','/Library/Developer/Frameworks','-framework','Foundation','-framework','AppKit','-framework','FxPlug','-Wl,-rpath,/Library/Developer/Frameworks','-I',str(ROOT/'大鱼调色/Plugin'),str(TEMPLATE/'tools/dump_model.mm'),str(ROOT/'大鱼调色/Plugin/DYModel.mm'),'-o',str(executable)]
|
||||
command=['xcrun','clang++','-std=c++17','-fno-objc-arc','-fblocks','-F','/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks','-F','/Library/Developer/Frameworks','-framework','Foundation','-framework','AppKit','-framework','FxPlug','-framework','CoreMedia','-Wl,-rpath,/Library/Developer/Frameworks','-I',str(ROOT/'大鱼调色/Plugin'),str(TEMPLATE/'tools/dump_model.mm'),str(ROOT/'大鱼调色/Plugin/DYModel.mm'),str(ROOT/'大鱼调色/Plugin/DYToolState.mm'),'-o',str(executable)]
|
||||
subprocess.run(command,check=True)
|
||||
result=json.loads(subprocess.check_output([str(executable)],text=True))
|
||||
result['sourceSHA256']=model_identity()
|
||||
@@ -60,21 +62,28 @@ def build(model):
|
||||
scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]')
|
||||
source=scene.find('.//scenenode[@name="效果源"]')
|
||||
if source is None or root.get('version')!='5.13' or root.findtext('displayversion')!='5.6.7':raise ValueError('Unexpected native EffectSource source')
|
||||
# Same EffectSource/FxPlug/custom-archive shape exists in the identity-
|
||||
# recorded native 5.11 / Motion 5.4.5 reference. Drop only later optional
|
||||
# 3D/HDR editor hints; keep factory/node versions and color settings intact.
|
||||
root.set('version',OUTPUT_VERSION);root.find('displayversion').text=OUTPUT_DISPLAY_VERSION
|
||||
for parent in root.iter():
|
||||
for child in list(parent):
|
||||
if child.tag in {'Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'}:parent.remove(child)
|
||||
if source.find('parameter[@id="2"]/parameter[@id="321"]').get('value')!='3':raise ValueError('Expected native EffectSource type 3')
|
||||
native_factories=E.parse(SOURCES/'NativeFactories.xml').getroot()
|
||||
lookup={f.get('uuid'):f for f in native_factories}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5','402246385249454b90e08b2ee1b6bf06':'6','e35c74f01d5042f6b468eb530169bfb7':'7'}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5'}
|
||||
insert_at=list(root).index(root.findall('factory')[-1])+1
|
||||
for uuid,fid in factory_ids.items():
|
||||
factory=copy.deepcopy(lookup[uuid]);factory.set('id',fid);root.insert(insert_at,factory);insert_at+=1
|
||||
filt=E.parse(SOURCES/'NativeFxPlugShell.xml').getroot()
|
||||
filt=E.parse(SOURCES/'NativeFxPlugShell.xml').getroot();filt.set('pluginVersion','0')
|
||||
# Keep the original native host mix/flip/input-point/OSC parameters, replace
|
||||
# the product's entire registered parameter set and custom archives.
|
||||
host=list(filt.findall('parameter'))
|
||||
for node in host:filt.remove(node)
|
||||
for pid,name in [('9000','大鱼调色'),('9001','LUT 文件')]:
|
||||
for pid,name in [('9000','大鱼调色'),('9001','LUT 文件'),('9002','工具与蒙版')]:
|
||||
text,class_name=custom_archive(model['archivesBase64'][pid])
|
||||
expected='DYInspectorToken' if pid=='9000' else 'DYAssetState'
|
||||
expected={'9000':'DYInspectorToken','9001':'DYAssetState','9002':'DYToolDocument'}[pid]
|
||||
if class_name!=expected:raise ValueError('Wrong custom parameter class')
|
||||
flags='12884901888' if pid=='9000' else '12889161776'
|
||||
param=E.SubElement(filt,'parameter',name=name,id=pid,flags=flags)
|
||||
@@ -82,20 +91,17 @@ def build(model):
|
||||
E.SubElement(param,'defaultVal').text=text;E.SubElement(param,'dataValue').text=text
|
||||
for row in model['parameters']:
|
||||
value=format(float(row['default']),'.17g')
|
||||
E.SubElement(filt,'parameter',name=row['title'],id=str(row['pid']),flags='12889161760',default=value,value=value)
|
||||
for node in host:filt.append(node)
|
||||
host_default=format(float(row.get('hostDefault',row['default'])),'.17g')
|
||||
E.SubElement(filt,'parameter',name=row['title'],id=str(row['pid']),flags='12889161776' if row.get('notAnimatable') else '12889161760',default=host_default,value=value)
|
||||
for node in host:
|
||||
if node.get("id")=="10005":node.set("value","1");node.set("default","0");node.set("flags","8589934592")
|
||||
filt.append(node)
|
||||
source.append(filt)
|
||||
copyright=E.parse(SOURCES/'CopyrightRig.xml').getroot()
|
||||
entity_map={'3356608241':'10080','3356608243':'10081','3356608245':'10082'}
|
||||
for node in copyright.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','6' if node.get('factoryID')=='1' else '7')
|
||||
# Native Rig stays directly below scene, after its native project.
|
||||
scene.insert(list(scene).index(project)+1,copyright)
|
||||
# User requested removal of the author's two display-only Rig widgets.
|
||||
# Do not regenerate their nodes, factories or published parameter rows.
|
||||
pub=scene.find('publishSettings')
|
||||
for node in list(pub):
|
||||
if node.tag!='version':pub.remove(node)
|
||||
for object_id,name in [('10081','FCP 版本作者→'),('10082','更多模板浏览器访问→')]:
|
||||
E.SubElement(pub,'target',object=object_id,channel='./2/100',name=name)
|
||||
E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色')
|
||||
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
|
||||
current=scene.find('currentObject')
|
||||
@@ -114,12 +120,15 @@ def build(model):
|
||||
|
||||
def verify(data,model):
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
assert root.get('version')==OUTPUT_VERSION and root.findtext('displayversion')==OUTPUT_DISPLAY_VERSION
|
||||
assert all(not list(root.iter(tag)) for tag in ['Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'])
|
||||
filters=root.findall('.//filter')
|
||||
assert len(filters)==1 and filters[0].get('pluginUUID')==PLUGIN_UUID
|
||||
f=filters[0];params={p.get('id'):p for p in f.findall('parameter')}
|
||||
assert len(params)==len(list(f.findall('parameter')))
|
||||
assert params["10005"].get("value")=="1" and params["10005"].get("flags")=="8589934592" and f.get("pluginVersion")=="0"
|
||||
for row in model['parameters']:
|
||||
p=params[str(row['pid'])];assert float(p.get('default'))==float(row['default'])==float(p.get('value'))
|
||||
p=params[str(row['pid'])];assert float(p.get('default'))==float(row.get('hostDefault',row['default'])) and float(p.get('value'))==float(row['default'])
|
||||
assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL'))
|
||||
assert len(root.findall('.//behavior'))==0 and len(root.findall('.//keypoint'))==0
|
||||
assert scene.find('.//scenenode[@name="效果源"]/parameter[@id="2"]/parameter[@id="321"]').get('value')=='3'
|
||||
@@ -131,24 +140,12 @@ def verify(data,model):
|
||||
if node.tag in CONTENT_TAGS and node is not project and node.find('baseFlags') is not None and int(node.findtext('baseFlags'))&0x10000001:selected.append(node.get('id'))
|
||||
assert not selected and scene.findtext('currentObject')==project.get('id')
|
||||
pub=scene.find('publishSettings').findall('target')
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10081','./2/100','FCP 版本作者→'),('10082','./2/100','更多模板浏览器访问→'),('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
# Compare every native Rig/widget field after reversing entity/factory IDs.
|
||||
rig=scene.find('scenenode[@id="10080"]');assert factories[rig.get('factoryID')]=='402246385249454b90e08b2ee1b6bf06'
|
||||
reverse=copy.deepcopy(rig)
|
||||
entity_map={'10080':'3356608241','10081':'3356608243','10082':'3356608245'}
|
||||
for node in reverse.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','1' if node.get('factoryID')=='6' else '6')
|
||||
def structure(node):return (node.tag,dict(node.attrib),(node.text or '').strip(),[structure(child) for child in node])
|
||||
assert structure(reverse)==structure(E.parse(SOURCES/'CopyrightRig.xml').getroot())
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
assert all(scene.find('.//scenenode[@id="'+identity+'"]') is None for identity in ['10080','10081','10082'])
|
||||
assert all(text.encode() not in data for text in ['FCP 版本作者','更多模板浏览器访问','大鱼先森Media','dayu.media'])
|
||||
assert not any(f.get('uuid')=='dd0036f96c9e4bfdadb82f71fbf5c9d8' for f in root.findall('factory'))
|
||||
for widget_id,title,flags in [('10081','大鱼先森Media','16842768'),('10082','dayu.media','16842769')]:
|
||||
widget=rig.find('scenenode[@id="'+widget_id+'"]');assert factories[widget.get('factoryID')]=='e35c74f01d5042f6b468eb530169bfb7'
|
||||
menu=widget.find('parameter[@id="2"]/parameter[@id="100"]')
|
||||
assert menu.attrib=={'name':'弹出式菜单','id':'100','flags':flags,'default':'2','value':'2'}
|
||||
assert [entry.attrib for entry in menu.findall('entry')]==[{'name':title,'tag':'2'}]
|
||||
assert widget.findtext('affecting')=='2' and widget.findtext('snapshot')=='3'
|
||||
assert len({n.get('id') for n in scene.iter() if n.tag in CONTENT_TAGS})==len([n for n in scene.iter() if n.tag in CONTENT_TAGS])
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':2,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'passed':True,'rig':'10080','author':'10081','site':'10082','unbound':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'removedAtUserRequest':True,'publishedDisplayRows':0,'displayRigAbsent':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create an isolated chart project for browser layout, recent use and reset QA."""
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import xml.etree.ElementTree as ET
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
runpy.run_path(str(root/'tools/create_host_fixture.py'))
|
||||
qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
|
||||
tree=ET.parse(qa/'大鱼调色_正式版验收.fcpxml')
|
||||
tree.find('.//event').set('name','大鱼调色_浏览器与复位验收')
|
||||
tree.find('.//project').set('name','大鱼调色_1.3.1_浏览器与复位')
|
||||
ET.indent(tree)
|
||||
output=qa/'大鱼调色_1.3.1_浏览器与复位.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+ET.tostring(tree.getroot(),encoding='unicode')+'\n')
|
||||
print(output)
|
||||
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Generate the isolated synthetic CST/disclosure acceptance timeline."""
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import xml.etree.ElementTree as ET
|
||||
root = Path(__file__).resolve().parent.parent
|
||||
runpy.run_path(str(root / 'tools/create_host_fixture.py'))
|
||||
qa = Path.home() / 'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
|
||||
tree = ET.parse(qa / '大鱼调色_正式版验收.fcpxml')
|
||||
tree.find('.//event').set('name', '大鱼调色_CST与独立折叠验收')
|
||||
tree.find('.//project').set('name', '大鱼调色_1.2_CST与独立折叠')
|
||||
output = qa / '大鱼调色_1.2_CST与独立折叠.fcpxml'
|
||||
ET.indent(tree)
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n' + ET.tostring(tree.getroot(), encoding='unicode') + '\n')
|
||||
print(output)
|
||||
@@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Isolated synthetic FCP acceptance; never edits a library or user media."""
|
||||
from pathlib import Path
|
||||
import json,uuid,xml.etree.ElementTree as E
|
||||
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
qa=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa')
|
||||
model=json.loads((root/'template/sources/RegisteredParameters.json').read_text())
|
||||
by_key={p['key']:p for p in model['parameters']}
|
||||
movie=qa/'大鱼调色_蒙版合成运动.mov'
|
||||
chart=qa/'大鱼调色验收图.png'
|
||||
assert movie.is_file() and chart.is_file()
|
||||
xml=E.Element('fcpxml',version='1.12');resources=E.SubElement(xml,'resources')
|
||||
E.SubElement(resources,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(resources,'format',id='f2',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(resources,'format',id='f3',width='1920',height='1080',name='FFVideoFormatRateUndefined')
|
||||
for ident,path,fmt,duration in [('a1',movie,'f1','4s'),('a2',chart,'f3','0s')]:
|
||||
asset=E.SubElement(resources,'asset',id=ident,name=path.stem,start='0s',duration=duration,format=fmt,hasVideo='1',videoSources='1')
|
||||
E.SubElement(asset,'media-rep',kind='original-media',src=path.resolve().as_uri())
|
||||
template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef')
|
||||
E.SubElement(resources,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri())
|
||||
event=E.SubElement(E.SubElement(xml,'library'),'event',name='大鱼调色_1.5_胶片与通道验收',uid=str(uuid.uuid4()).upper())
|
||||
settings=[('大鱼调色_1.5_胶片与混合器','a1','f1',dict(mixer01=.2,filmSubtractive=1,filmGammaCyan=1.2,filmHalation=1,filmScatter=5,filmBloom=1,filmSensitivity=25,filmDiffusion=5,filmIntensity=25,filmGrain=1,filmGrainAmount=.25,filmGrainHold=2,filmVignette=1,filmVignetteIntensity=.5,filmVignetteRadius=30)),('大鱼调色_1.5_初始化与叠层','a1','f1',{}),('大鱼调色_1.5_颗粒时间验收','a2','f2',dict(filmGrain=1,filmGrainAmount=.65,filmGrainHold=2))]
|
||||
for name,asset,fmt,values in settings:
|
||||
project=E.SubElement(event,'project',name=name,uid=str(uuid.uuid4()).upper())
|
||||
sequence=E.SubElement(project,'sequence',format=fmt,duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k')
|
||||
spine=E.SubElement(sequence,'spine');clip=E.SubElement(spine,'video' if asset=='a2' else 'asset-clip',ref=asset,name=name,offset='0s',start='0s',duration='4s')
|
||||
effect=E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
# Hidden FxPlug IDs are not invented as Motion/FCPXML parameter paths.
|
||||
# Apply the intended settings through the formal native inspector in host QA.
|
||||
E.indent(xml);output=qa/'film-mixer-1.5.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(xml,encoding='unicode')+'\n')
|
||||
print(output)
|
||||
@@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Synthetic, isolated mask/layer acceptance projects; no user media writes."""
|
||||
from pathlib import Path
|
||||
import subprocess,xml.etree.ElementTree as E
|
||||
out=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa');out.mkdir(parents=True,exist_ok=True)
|
||||
media=out/'大鱼调色_蒙版合成运动.mov'
|
||||
if not media.exists():
|
||||
subprocess.run(['/opt/homebrew/bin/ffmpeg','-v','error','-f','lavfi','-i',"nullsrc=s=1080x640:r=25:d=4,geq=lum='128+70*sin(X/11)*cos(Y/9)+35*sin((X+Y)/4)':cb='128+35*sin(X/17)':cr='128+35*cos(Y/21)',crop=960:540:'40+10*t':'40+5*t'",'-c:v','prores_ks','-profile:v','2','-pix_fmt','yuv422p10le','-color_primaries','bt709','-color_trc','bt709','-colorspace','bt709',str(media)],check=True)
|
||||
root=E.Element('fcpxml',version='1.12');res=E.SubElement(root,'resources');E.SubElement(res,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)');a=E.SubElement(res,'asset',id='a1',name='合成运动纹理',start='0s',duration='4s',format='f1',hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=media.as_uri());template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef');E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri());lib=E.SubElement(root,'library');event=E.SubElement(lib,'event',name='大鱼调色_1.4.1_26_蒙版与工具层验收')
|
||||
for name in ['大鱼调色_1.4.1_26_独立工具与蒙版','大鱼调色_1.4.1_26_逐帧跟踪']:
|
||||
project=E.SubElement(event,'project',name=name);seq=E.SubElement(project,'sequence',format='f1',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k',duration='4s');spine=E.SubElement(seq,'spine');clip=E.SubElement(spine,'asset-clip',ref='a1',name=name,offset='0s',start='0s',duration='4s');E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
E.indent(root);xml=out/'大鱼调色_1.4.1_26_蒙版与工具层.fcpxml';xml.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(root,encoding='unicode')+'\n');print(xml)
|
||||
@@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create isolated print-look host projects using existing synthetic QA media."""
|
||||
from pathlib import Path
|
||||
import uuid
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
QA=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa')
|
||||
CHART=QA/'\u5927\u9c7c\u8c03\u8272\u9a8c\u6536\u56fe.png'
|
||||
MOVIE=QA/'\u5927\u9c7c\u8c03\u8272_\u8499\u7248\u5408\u6210\u8fd0\u52a8.mov'
|
||||
assert CHART.is_file() and MOVIE.is_file()
|
||||
xml=E.Element('fcpxml',version='1.12');r=E.SubElement(xml,'resources')
|
||||
E.SubElement(r,'format',id='f1',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r,'format',id='f2',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r,'format',id='still',width='1920',height='1080',name='FFVideoFormatRateUndefined')
|
||||
for ident,path,fmt,duration in [('chart',CHART,'still','0s'),('movie',MOVIE,'f2','4s')]:
|
||||
a=E.SubElement(r,'asset',id=ident,name=path.stem,start='0s',duration=duration,format=fmt,hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=path.as_uri())
|
||||
E.SubElement(r,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef')
|
||||
event=E.SubElement(E.SubElement(xml,'library'),'event',name='大鱼调色_1.6_八种印片验收',uid=str(uuid.uuid4()).upper())
|
||||
for name,asset,fmt in [('大鱼调色_1.6_八种印片','chart','f1'),('大鱼调色_1.6_黑白印片','chart','f1'),('大鱼调色_1.6_印片叠层与蒙版','movie','f2')]:
|
||||
project=E.SubElement(event,'project',name=name,uid=str(uuid.uuid4()).upper());seq=E.SubElement(project,'sequence',format=fmt,duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k');spine=E.SubElement(seq,'spine')
|
||||
clip=E.SubElement(spine,'video' if asset=='chart' else 'asset-clip',ref=asset,name=name,offset='0s',start='0s',duration='4s');E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
# Apply settings through the installed native inspector, never hidden XML IDs.
|
||||
E.indent(xml);destination=QA/'print-looks-1.6.fcpxml';destination.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(xml,encoding='unicode')+'\n');print(destination)
|
||||
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create an isolated synthetic FCP project for the native spider and wheel."""
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import xml.etree.ElementTree as ET
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
runpy.run_path(str(root/'tools/create_host_fixture.py'))
|
||||
qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa'
|
||||
tree=ET.parse(qa/'大鱼调色_正式版验收.fcpxml')
|
||||
tree.find('.//event').set('name','大鱼调色_蜘蛛盘与白平衡验收')
|
||||
tree.find('.//project').set('name','大鱼调色_1.3_蜘蛛盘与白平衡')
|
||||
ET.indent(tree)
|
||||
output=qa/'大鱼调色_1.3_蜘蛛盘与白平衡.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+ET.tostring(tree.getroot(),encoding='unicode')+'\n')
|
||||
print(output)
|
||||
+32
-9
@@ -19,16 +19,31 @@ def run(*args,log=None):
|
||||
with Path(log).open('w') as f:subprocess.run(args,cwd=ROOT,stdout=f,stderr=subprocess.STDOUT,check=True)
|
||||
return ''
|
||||
return subprocess.check_output(args,cwd=ROOT,text=True,stderr=subprocess.STDOUT).strip()
|
||||
def hosts_closed():
|
||||
lines=run('ps','-axo','pid=,comm=').splitlines()
|
||||
live=[l for l in lines if l.endswith(('/Contents/MacOS/Final Cut Pro','/Contents/MacOS/Motion'))]
|
||||
if live:raise RuntimeError('请先正常退出宿主,再继续交付:'+str(live))
|
||||
def hosts_closed(wait=False):
|
||||
announced=False
|
||||
while True:
|
||||
lines=run('ps','-axo','pid=,comm=').splitlines()
|
||||
live=[l for l in lines if l.endswith(('/Contents/MacOS/Final Cut Pro','/Contents/MacOS/Motion'))]
|
||||
if not live:return
|
||||
if not wait:raise RuntimeError('请先正常退出宿主,再继续交付:'+str(live))
|
||||
if not announced:print('Notarized APP retained; waiting for the host to save and quit normally before replacement.',flush=True);announced=True
|
||||
time.sleep(1)
|
||||
def identity(path,expected):
|
||||
p=plistlib.loads((path/'Contents/Info.plist').read_bytes())
|
||||
if p['CFBundleIdentifier']!=expected:raise RuntimeError('产品身份不匹配: '+str(path))
|
||||
def unregister(path):
|
||||
reg=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
|
||||
if any(l.rstrip().endswith('\t'+str(path)) for l in reg.splitlines()):run('pluginkit','-r',str(path))
|
||||
def self_test(executable,report):
|
||||
result=subprocess.run([str(executable),'--self-test'],cwd=ROOT,text=True,capture_output=True)
|
||||
report.write_text(result.stdout)
|
||||
report.with_suffix('.stderr').write_text(result.stderr)
|
||||
try:parsed=json.loads(result.stdout)
|
||||
except json.JSONDecodeError:raise RuntimeError('原生自检未返回有效结果,诊断已保留:'+str(report))
|
||||
if result.returncode or not parsed.get('pass'):
|
||||
failed=[x.get('name') for x in parsed.get('results',[]) if not x.get('pass',True)]
|
||||
raise RuntimeError('原生自检未通过,正式旧版未替换。诊断:'+str(report)+';失败项:'+str(failed))
|
||||
return parsed
|
||||
def main():
|
||||
hosts_closed();CACHE.mkdir(parents=True,exist_ok=True);LOCK.parent.mkdir(parents=True,exist_ok=True);LOCK.mkdir()
|
||||
(LOCK/'owner.json').write_text(json.dumps(dict(PID=os.getpid(),cwd=str(ROOT),product='大鱼调色',started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
|
||||
@@ -43,13 +58,16 @@ def main():
|
||||
for name in ['large.png','small.png']:
|
||||
if (ROOT/'template'/name).exists():shutil.copy2(ROOT/'template'/name,b.parent/name)
|
||||
identity(APP,'com.dayu.color');plugin=APP/PLUGIN;identity(plugin,'com.dayu.color.XPC')
|
||||
# Xcode registers its build product with Launch Services. Keep the host from
|
||||
# discovering this generated copy while signing/notarization are pending.
|
||||
unregister(plugin);unregister(LOOSE)
|
||||
for name in ['FxPlug','PluginManager']:run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin/'Contents/Frameworks'/(name+'.framework')))
|
||||
run('codesign','--force','--timestamp','--options','runtime','--sign',IDENTITY,str(plugin))
|
||||
run('codesign','--force','--timestamp','--options','runtime','--entitlements',str(ROOT/'大鱼调色/Wrapper Application/SandboxEntitlements.entitlements'),'--sign',IDENTITY,str(APP))
|
||||
run('codesign','--verify','--deep','--strict',str(APP))
|
||||
details=run('codesign','-dvvv',str(APP))
|
||||
if 'TeamIdentifier=B3W25FX5H5' not in details or 'Timestamp=' not in details or 'runtime' not in details:raise RuntimeError('签名身份/时间戳/runtime未通过')
|
||||
preflight=json.loads(run(str(plugin/'Contents/MacOS/大鱼调色 XPC Service'),'--self-test'))
|
||||
preflight=self_test(plugin/'Contents/MacOS/大鱼调色 XPC Service',CACHE/'release-preflight.json')
|
||||
(CACHE/'release-preflight.json').write_text(json.dumps(preflight,ensure_ascii=False,indent=2)+'\n')
|
||||
if not preflight.get('pass'):raise RuntimeError('Release集成自检失败,正式旧版未替换')
|
||||
archive=CACHE/'notarization-submission.zip'
|
||||
@@ -59,14 +77,14 @@ def main():
|
||||
if result.get('status')!='Accepted':
|
||||
if result.get('id'):run('xcrun','notarytool','log',result['id'],'--keychain-profile',PROFILE,'--keychain',KEYCHAIN,str(CACHE/'notary-rejection.json'))
|
||||
raise RuntimeError('Apple未Accepted,正式旧版未替换')
|
||||
run('xcrun','stapler','staple',str(APP));run('xcrun','stapler','validate',str(APP));hosts_closed()
|
||||
run('xcrun','stapler','staple',str(APP));run('xcrun','stapler','validate',str(APP));hosts_closed(wait=True)
|
||||
stage=DEST.parent/('.dayu-color-staging-'+uuid.uuid4().hex+'.app');run('ditto',str(APP),str(stage))
|
||||
if DEST.exists():
|
||||
identity(DEST,'com.dayu.color');old=DEST.parent/('.dayu-color-previous-'+uuid.uuid4().hex+'.app');os.replace(DEST,old)
|
||||
os.replace(stage,DEST);stage=None
|
||||
try:
|
||||
identity(DEST,'com.dayu.color');run('codesign','--verify','--deep','--strict',str(DEST));run('xcrun','stapler','validate',str(DEST));gate=run('spctl','--assess','--type','execute','--verbose=2',str(DEST))
|
||||
installedTest=json.loads(run(str(DEST/PLUGIN/'Contents/MacOS/大鱼调色 XPC Service'),'--self-test'))
|
||||
installedTest=self_test(DEST/PLUGIN/'Contents/MacOS/大鱼调色 XPC Service',CACHE/'installed-self-test.json')
|
||||
if not installedTest.get('pass'):raise RuntimeError('正式安装版原生集成自检失败')
|
||||
(ROOT/'verification/InstalledSelfTest.json').write_text(json.dumps(installedTest,ensure_ascii=False,indent=2)+'\n')
|
||||
run('open',str(DEST))
|
||||
@@ -92,8 +110,13 @@ def main():
|
||||
if old:unregister(old/PLUGIN)
|
||||
archive.unlink();backup=CACHE/'previous-template.moef'
|
||||
if backup.exists():backup.unlink()
|
||||
run('pluginkit','-a',str(DEST/PLUGIN));registry=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
|
||||
entries=[l for l in registry.splitlines() if 'com.dayu.color.XPC(' in l]
|
||||
# Unregistering an old copy can race the host's launch registration. Re-add
|
||||
# only the verified installed path; never repeat signing/notarization/install.
|
||||
for attempt in range(3):
|
||||
run('pluginkit','-a',str(DEST/PLUGIN));registry=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
|
||||
entries=[l for l in registry.splitlines() if 'com.dayu.color.XPC(' in l]
|
||||
if entries:break
|
||||
time.sleep(.5)
|
||||
if len(entries)!=1 or not entries[0].rstrip().endswith('\t'+str(DEST/PLUGIN)):raise RuntimeError('PluginKit发现多份/错误版本: '+registry)
|
||||
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=hashlib.sha256(TEMPLATE.read_bytes()).hexdigest(),shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
|
||||
if old:record['previousInstallBackup']=str(old)
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Import the eight identity-verified local LMT tables into standalone Dayu data.
|
||||
|
||||
Run inspect_colorfinale_print --export first. Independent half decoding must
|
||||
match every float returned by the installed reference's own cubeData property.
|
||||
No vendor executable or shader is copied into the product.
|
||||
"""
|
||||
from pathlib import Path
|
||||
import argparse
|
||||
import array
|
||||
import hashlib
|
||||
import json
|
||||
import math
|
||||
import struct
|
||||
import zlib
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
REFERENCE = Path('/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A')
|
||||
IDENTITY = '32dca93459347e5ad363cb145d0ccf84b933b2045eee2c9535676a01744b84e3'
|
||||
NAMES = ['kodak_2383', 'kodak_2393', 'kodak_2302_bw', 'fuji_3510', 'fuji_3513', 'fuji_3519', 'fuji_3521', 'agfa_cp30']
|
||||
|
||||
|
||||
def digest(data):
|
||||
return hashlib.sha256(data).hexdigest()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--reference-export', required=True, type=Path)
|
||||
args = parser.parse_args()
|
||||
assert digest((REFERENCE / 'RenderingEngine').read_bytes()) == IDENTITY, 'Reference identity changed'
|
||||
output = ROOT / '\u5927\u9c7c\u8c03\u8272/Plugin/Resources/PrintLooks'
|
||||
output.mkdir(parents=True, exist_ok=True)
|
||||
records = []
|
||||
for number, name in enumerate(NAMES, 1):
|
||||
source = (REFERENCE / 'Resources' / (name + '.lmt')).read_bytes()
|
||||
# Observed local resource format: repeated SHA256 mask, RGB binary16,
|
||||
# 65 cubed, red axis fastest. The literal prefix is exactly 23 bytes.
|
||||
mask = hashlib.sha256(b'FT.ColorFinale.LMT.2026' + name.encode()).digest()
|
||||
half = bytes(value ^ mask[index % 32] for index, value in enumerate(source))
|
||||
assert len(half) == 65**3 * 6
|
||||
floats = array.array('f')
|
||||
for pixel in struct.iter_unpack('<eee', half):
|
||||
assert all(math.isfinite(value) for value in pixel)
|
||||
floats.extend((*pixel, 1.0))
|
||||
if struct.pack('=I', 1) != struct.pack('<I', 1):
|
||||
floats.byteswap()
|
||||
raw = floats.tobytes()
|
||||
assert raw == (args.reference_export / (name + '.rgba32f')).read_bytes(), name + ': native cubeData mismatch'
|
||||
blob = struct.pack('<4sII6f', b'DYLT', 65, len(raw), 0, 0, 0, 1, 1, 1) + zlib.compress(raw, 9)
|
||||
destination = output / (name + '.dylut')
|
||||
destination.write_bytes(blob)
|
||||
records.append(dict(index=number, name=name, side=65, sourceSHA256=digest(source), rgba32SHA256=digest(raw),
|
||||
bytes=len(blob), sha256=digest(blob), resource=str(destination.relative_to(ROOT)),
|
||||
nativeCubeDataByteIdentical=True))
|
||||
manifest = dict(referenceVersion='2.16.2 (625)', referenceSHA256=IDENTITY, tables=records,
|
||||
cubeOrder='red fastest; green; blue', interpolation='tetrahedral (six cases)',
|
||||
sourceRole='data only; no reference executable or shader shipped')
|
||||
(ROOT / 'research/PrintLooksResources.json').write_text(json.dumps(manifest, indent=2) + '\n')
|
||||
print(json.dumps(dict(tables=len(records), bytes=sum(item['bytes'] for item in records), nativeCubeDataByteIdentical=True)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,30 @@
|
||||
// Read-only research probe. Loads only the user's installed reference framework.
|
||||
// No reference binary, texture, preset or disassembly is bundled with Dayu.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <objc/runtime.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
NSString *path=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";
|
||||
void *handle=dlopen(path.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL);
|
||||
if(!handle){fprintf(stderr,"%s\n",dlerror());return 1;}
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
for(NSString *name in @[@"FTChannelMixerFilter",@"FTFilmSaturationFilter",@"FTHalationFilter",@"FTBloomFilter",@"FTGrainFilter",@"FTGrainProcessor",@"FTNoiseGeneratorSimple"]){
|
||||
Class cls=NSClassFromString(name);NSMutableDictionary *entry=[NSMutableDictionary dictionary];
|
||||
for(int meta=0;meta<2;meta++){
|
||||
unsigned count=0;Method *methods=class_copyMethodList(meta?object_getClass(cls):cls,&count);NSMutableArray *list=[NSMutableArray array];
|
||||
for(unsigned i=0;i<count;i++)[list addObject:@{@"selector":NSStringFromSelector(method_getName(methods[i])),@"encoding":@(method_getTypeEncoding(methods[i]))}];free(methods);entry[meta?@"class":@"instance"]=list;
|
||||
}
|
||||
if([cls isSubclassOfClass:CIFilter.class]){@try{CIFilter *filter=[[cls alloc]init];[filter setDefaults];entry[@"attributes"]=filter.attributes?:@{};entry[@"inputKeys"]=filter.inputKeys?:@[];
|
||||
NSMutableDictionary *values=[NSMutableDictionary dictionary];
|
||||
for(NSString *key in @[@"gammaAll",@"gammaCyan",@"gammaMagenta",@"gammaYellow",@"density",@"densitySwitch",@"valueSwitch",@"scatter",@"dyeTransmission",@"boost",@"sensitivity",@"blurRadius",@"intensity",@"grainSize",@"filmResponse",@"correlation",@"stdRed",@"stdGreen",@"stdBlue",@"seed"]){@try{id value=[filter valueForKey:key];if([value isKindOfClass:NSNumber.class])values[key]=value;}@catch(NSException *e){}}
|
||||
for(NSString *key in @[@"colorKernel",@"genericKernel"]){@try{id value=[filter valueForKey:key];if(value)values[key]=[value name]?:@"";}@catch(NSException *e){}}
|
||||
entry[@"defaults"]=values;
|
||||
}@catch(NSException *e){entry[@"exception"]=e.reason;}}
|
||||
if([name isEqual:@"FTNoiseGeneratorSimple"]){id object=[[cls alloc]init];entry[@"defaults"]=@{@"radius":[object valueForKey:@"radius"],@"blurSize":[object valueForKey:@"blurSize"]};}
|
||||
out[name]=entry;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];
|
||||
if(!json)return 2;fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,48 @@
|
||||
// Read-only reference metadata probe; never linked into the product.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <objc/runtime.h>
|
||||
#import <objc/message.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
NSString *path=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";
|
||||
if(!dlopen(path.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL)){fprintf(stderr,"%s\n",dlerror());return 1;}
|
||||
NSMutableDictionary *out=[NSMutableDictionary dictionary];
|
||||
if(argc==2&&strcmp(argv[1],"--matrix")==0){
|
||||
Class space=NSClassFromString(@"FTColorSpace");id from=((id(*)(id,SEL))objc_msgSend)((id)space,sel_registerName("Rec709Linear"));id to=((id(*)(id,SEL))objc_msgSend)((id)space,sel_registerName("ACEScg"));
|
||||
CIContext *context=[CIContext contextWithOptions:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}];
|
||||
float input[16]={1,0,0,1,0,1,0,1,0,0,1,1,1,1,1,1};
|
||||
for(int direction=0;direction<2;direction++){
|
||||
CIFilter *f=((id(*)(id,SEL,id,id))objc_msgSend)((id)NSClassFromString(@"FTColorSpaceFilter"),sel_registerName("filterFromColorSpace:toColorSpace:"),direction?to:from,direction?from:to);
|
||||
if(!f)return 5;[f setValue:[CIImage imageWithBitmapData:[NSData dataWithBytes:input length:sizeof(input)] bytesPerRow:sizeof(input) size:CGSizeMake(4,1) format:kCIFormatRGBAf colorSpace:nil]forKey:kCIInputImageKey];float result[16]={};[context render:f.outputImage toBitmap:result rowBytes:sizeof(result) bounds:CGRectMake(0,0,4,1) format:kCIFormatRGBAf colorSpace:nil];
|
||||
NSMutableArray *values=[NSMutableArray array];for(int i=0;i<16;i++)[values addObject:@(result[i])];out[direction?@"AP1-to-709":@"709-to-AP1"]=values;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted error:nil];fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}
|
||||
if(argc==3&&strcmp(argv[1],"--export")==0){
|
||||
NSString *directory=@(argv[2]);[[NSFileManager defaultManager]createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:nil];
|
||||
NSMutableArray *exports=[NSMutableArray array];
|
||||
for(NSString *name in @[@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"]){
|
||||
id filter=((id(*)(id,SEL,id))objc_msgSend)((id)NSClassFromString(@"FTAcesLMTFilter"),sel_registerName("filterWithLMT:"),name);
|
||||
NSData *data=[filter valueForKey:@"cubeData"];if(data.length!=65*65*65*16)return 3;
|
||||
NSString *destination=[directory stringByAppendingPathComponent:[name stringByAppendingString:@".rgba32f"]];
|
||||
if(![data writeToFile:destination atomically:YES])return 4;
|
||||
[exports addObject:@{@"name":name,@"bytes":@(data.length),@"path":destination}];
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:exports options:NSJSONWritingPrettyPrinted error:nil];fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}
|
||||
for(NSString *name in @[@"FTAcesLMTFilter",@"FTLMTCIImageProcessor",@"FTCubeProcessor",@"FTCubeCIImageProcessor",@"FTColorCubeFilter",@"FTAcesTypes",@"FTColorSpace"]){
|
||||
Class cls=NSClassFromString(name);if(!cls)continue;
|
||||
NSMutableDictionary *entry=[NSMutableDictionary dictionary];
|
||||
for(int meta=0;meta<2;meta++){
|
||||
unsigned count=0;Method *methods=class_copyMethodList(meta?object_getClass(cls):cls,&count);NSMutableArray *list=[NSMutableArray array];
|
||||
for(unsigned i=0;i<count;i++)[list addObject:@{@"selector":NSStringFromSelector(method_getName(methods[i])),@"encoding":@(method_getTypeEncoding(methods[i]))}];free(methods);entry[meta?@"class":@"instance"]=list;
|
||||
}
|
||||
unsigned n=0;Ivar *ivars=class_copyIvarList(cls,&n);NSMutableArray *ivs=[NSMutableArray array];
|
||||
for(unsigned i=0;i<n;i++)[ivs addObject:@{@"name":@(ivar_getName(ivars[i])),@"type":@(ivar_getTypeEncoding(ivars[i])),@"offset":@(ivar_getOffset(ivars[i]))}];free(ivars);entry[@"ivars"]=ivs;
|
||||
out[name]=entry;
|
||||
}
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];
|
||||
if(!json)return 2;fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return 0;
|
||||
}}
|
||||
文件差异过大,未显示。
加载差异
文件差异过大,未显示。
加载差异
@@ -0,0 +1,39 @@
|
||||
#import <AppKit/AppKit.h>
|
||||
#import "../大鱼调色/Shared/DYBetaDiagnostics.h"
|
||||
#import "../大鱼调色/Wrapper Application/DYBetaUpdater.h"
|
||||
static NSUInteger checks;
|
||||
static void check(BOOL pass,NSString *name){if(!pass){fprintf(stderr,"FAIL %s\n",name.UTF8String);exit(1);}checks++;}
|
||||
int main(int argc,char **argv){@autoreleasepool{
|
||||
if(argc==2&&!strcmp(argv[1],"--live-update")){
|
||||
DYBetaUpdater *updater=[DYBetaUpdater new];NSMutableArray *phases=[NSMutableArray array];__block BOOL done=NO,passed=NO,started=NO;
|
||||
updater.changed=^(NSDictionary *state){NSString *phase=state[@"phase"];[phases addObject:phase];
|
||||
if([phase isEqual:@"available"]){if(started){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}else{started=YES;dispatch_async(dispatch_get_main_queue(),^{[updater download];});}}
|
||||
if([phase isEqual:@"ready"]){done=YES;passed=YES;}
|
||||
if([phase isEqual:@"failed"]||[phase isEqual:@"latest"]){done=YES;fprintf(stderr,"%s\n",[state description].UTF8String);}
|
||||
};
|
||||
[updater check];NSDate *deadline=[NSDate dateWithTimeIntervalSinceNow:360];
|
||||
while(!done&&deadline.timeIntervalSinceNow>0)[NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:.1]];
|
||||
NSDictionary *result=@{@"passed":@(passed),@"phases":phases,@"source":@"production HTTPS beta endpoint and download",@"installation_performed":@NO};
|
||||
printf("%s\n",[[[NSString alloc]initWithData:[NSJSONSerialization dataWithJSONObject:result options:0 error:nil] encoding:NSUTF8StringEncoding]autorelease].UTF8String);
|
||||
updater.changed=nil;[updater cancel];return passed?0:1;
|
||||
}
|
||||
NSString *base=@"https://dayu.media/wp-content/uploads/dayu-color-beta/updates/";
|
||||
NSMutableDictionary *manifest=[@{@"bundle_id":@"com.dayu.color",@"channel":@"beta",@"version":@"1.7.0",@"build":@45,@"size":@123,
|
||||
@"sha256":[@"a" stringByPaddingToLength:64 withString:@"a" startingAtIndex:0],@"package_type":@"pkg",@"install_mode":@"pkg_installer",@"download_url":[base stringByAppendingString:@"dayu-color-1-7-0-45.pkg"]}mutableCopy];
|
||||
check([DYBetaUpdater validateManifest:manifest error:nil],@"valid manifest");
|
||||
for(NSString *key in manifest.allKeys){for(id bad in @[[NSNull null],@[],@{},@YES,@"",@(-1)]){NSMutableDictionary *changed=[[manifest mutableCopy]autorelease];changed[key]=bad;
|
||||
check(![DYBetaUpdater validateManifest:changed error:nil],[NSString stringWithFormat:@"reject %@ %@",key,bad]);}}
|
||||
check(![DYBetaUpdater validateManifest:(id)@[] error:nil],@"non dictionary manifest");
|
||||
for(NSString *bad in @[@"http://dayu.media/wp-json/dayu-color/v1/update",@"https://dayu.media.evil.test/wp-json/dayu-color/v1/update",@"https://dayu.media:444/wp-json/dayu-color/v1/update",@"https://user@dayu.media/wp-json/dayu-color/v1/update",@"https://dayu.media/wp-json/other/v1/update",@"https://dayu.media/wp-json/dayu-color/v1/../other"])
|
||||
check(!DYBetaAllowedURL([NSURL URLWithString:bad],NO),@"reject foreign URL");
|
||||
NSDictionary *safe=DYBetaSafeFields(@{@"phase":@"end",@"frames":@"/Users/test/secret.mov",@"error_domain":@"token=secret",@"email":@"private@example.invalid",@"duration_ms":@(NAN)});
|
||||
check([safe[@"frames"]isEqual:@"[REDACTED]"]&&[safe[@"error_domain"]isEqual:@"[REDACTED]"]&&!safe[@"email"]&&!safe[@"duration_ms"],@"privacy allowlist and redaction");
|
||||
check(DYBetaSafeFields((id)@[]).count==0,@"bad fields do not crash");
|
||||
if(argc==3){NSData *data=[NSData dataWithContentsOfFile:[NSString stringWithUTF8String:argv[2]]];NSDictionary *real=[NSJSONSerialization JSONObjectWithData:data options:0 error:nil];NSError *error=nil;
|
||||
BOOL verified=[DYBetaUpdater validatePackage:[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]] manifest:real error:&error];
|
||||
if(!verified)fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);check(verified,@"signed notarized full product package");
|
||||
NSMutableDictionary *wrong=[[real mutableCopy]autorelease];wrong[@"sha256"]=[@"0" stringByPaddingToLength:64 withString:@"0" startingAtIndex:0];
|
||||
check(![DYBetaUpdater validatePackage:[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]] manifest:wrong error:nil],@"corrupt checksum refused before install");
|
||||
}
|
||||
printf("{\"passed\":true,\"checks\":%lu}\n",(unsigned long)checks);[manifest release];
|
||||
}return 0;}
|
||||
@@ -0,0 +1,39 @@
|
||||
#import <AppKit/AppKit.h>
|
||||
#import "../大鱼调色/Plugin/DYLUTBrowser.h"
|
||||
#import "../大鱼调色/Plugin/DYLUTLibrary.h"
|
||||
@interface DYLUTBrowser (Probe)
|
||||
- (void)layoutBrowser;
|
||||
- (void)layoutChanged:(id)sender;
|
||||
- (void)rebuildGrid;
|
||||
- (void)folderClicked:(NSButton *)button;
|
||||
- (void)thumbnailClicked:(id)tile;
|
||||
@end
|
||||
static NSMutableArray *checks;
|
||||
static void require(BOOL pass,NSString *name){[checks addObject:@{@"name":name,@"pass":@(pass)}];if(!pass){fprintf(stderr,"FAIL %s\n",name.UTF8String);exit(1);}}
|
||||
static void pump(BOOL(^done)(void)){double end=NSProcessInfo.processInfo.systemUptime+15;while(!done()&&NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];require(done(),@"asynchronous browser task completed");}
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
checks=[NSMutableArray new];require(argc==2,@"report destination supplied");[NSApplication sharedApplication];[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
|
||||
NSURL *root=[NSURL fileURLWithPath:[NSTemporaryDirectory()stringByAppendingPathComponent:[@"dayu-browser-layout-" stringByAppendingString:NSUUID.UUID.UUIDString]]];NSFileManager *fm=NSFileManager.defaultManager;[fm createDirectoryAtURL:root withIntermediateDirectories:YES attributes:nil error:nil];
|
||||
NSString *cube=@"LUT_3D_SIZE 2\n0 0 0\n1 0 0\n0 1 0\n1 1 0\n0 0 1\n1 0 1\n0 1 1\n1 1 1\n";
|
||||
for(NSString *name in @[@"Alpha.cube",@"Middle.cube",@"Zulu.cube"])[cube writeToURL:[root URLByAppendingPathComponent:name] atomically:YES encoding:NSUTF8StringEncoding error:nil];
|
||||
DYLUTLibrary *library=[[[DYLUTLibrary alloc]initWithRootURL:root]autorelease];require([library reload:nil],@"isolated library loaded");NSString *alpha=[library.entries[0]objectForKey:@"path"],*middle=[library.entries[1]objectForKey:@"path"],*zulu=[library.entries[2]objectForKey:@"path"];
|
||||
[library recordUsedPath:alpha];[library recordUsedPath:zulu];[library recordUsedPath:alpha];require([library.recentPaths isEqual:@[alpha,zulu]],@"recent use deduplicates and puts latest first");
|
||||
DYLUTLibrary *reopened=[[[DYLUTLibrary alloc]initWithRootURL:root]autorelease];require([reopened.recentPaths isEqual:library.recentPaths],@"recent history survives a new library instance");
|
||||
__block void(^ack)(NSError *)=nil;DYLUTBrowser *browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:nil selectedPath:nil palette:@{} selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){[ack release];ack=[completion copy];return [NSProgress discreteProgressWithTotalUnitCount:1];}];
|
||||
pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require([[[browser valueForKey:@"folderPaths"]firstObject]isEqual:@"@recent"],@"recent category is first in the sidebar");
|
||||
require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[alpha,zulu]],@"recent category contains only used LUTs in order");
|
||||
NSButton *all=nil;for(NSButton *button in [browser valueForKey:@"folderButtons"])if([button.identifier isEqual:@"*"])all=button;[browser folderClicked:all];
|
||||
require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[alpha,zulu,middle]],@"all LUTs also put recent uses before unused names");
|
||||
id tile=[[browser valueForKey:@"tiles"]objectForKey:middle];[tile setEnabled:YES];[browser thumbnailClicked:tile];require([library.recentPaths isEqual:@[alpha,zulu]],@"loading does not update recent history");ack([NSError errorWithDomain:@"host" code:1 userInfo:nil]);require([library.recentPaths isEqual:@[alpha,zulu]],@"host rejection does not update history");
|
||||
[browser thumbnailClicked:tile];ack(nil);require([library.recentPaths isEqual:@[middle,alpha,zulu]],@"only successful host application records recent use");
|
||||
NSSearchField *search=[browser valueForKey:@"search"];search.stringValue=@"Zulu";[browser rebuildGrid];require([[browser valueForKey:@"visibleEntries"]count]==1,@"search respects recent-first ordering");search.stringValue=@"";[browser rebuildGrid];
|
||||
NSView *view=[browser valueForKey:@"root"];[view setFrameSize:NSMakeSize(1200,760)];[browser layoutBrowser];NSInteger wide=[[browser valueForKey:@"columns"]integerValue];[view setFrameSize:NSMakeSize(720,420)];[browser layoutBrowser];require(wide>[[browser valueForKey:@"columns"]integerValue],@"grid reflows when the browser size changes");
|
||||
NSPopUpButton *layout=[browser valueForKey:@"layoutMenu"];[layout selectItemAtIndex:1];[browser layoutChanged:nil];require([[browser valueForKey:@"columns"]integerValue]==1&&[[browser valueForKey:@"tileHeight"]doubleValue]==70,@"list layout has full-width rows");
|
||||
NSSplitView *split=[browser valueForKey:@"splitView"];[split setPosition:240 ofDividerAtIndex:0];[browser layoutBrowser];NSScrollView *folders=[browser valueForKey:@"folderScroll"],*grid=[browser valueForKey:@"gridScroll"];require(fabs(folders.frame.size.width-240)<2&&NSMaxX(folders.frame)<=NSMinX(grid.frame),@"sidebar divider changes folder width without overlapping previews");
|
||||
[browser close];[browser release];browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:nil selectedPath:nil palette:@{} selection:nil];pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require([(NSPopUpButton*)[browser valueForKey:@"layoutMenu"]indexOfSelectedItem]==1&&fabs([[browser valueForKey:@"sidebarWidth"]doubleValue]-240)<2,@"layout and sidebar width survive reopening");
|
||||
NSPanel *host=[[[NSPanel alloc]initWithContentRect:NSMakeRect(120,160,900,620) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO]autorelease];__block int closes=0;[browser showInRemoteParent:host.contentView close:^{closes++;}];pump(^{return [browser valueForKey:@"presentationWindow"]==host;});require(!host.visible&&browser.visible,@"remote-parent checks never display a test window");
|
||||
NSRect desired=NSMakeRect(190,210,1000,680);[host setFrame:desired display:NO];NSString *frameKey=[@"com.dayu.color.lookLUTPreview.windowFrame|" stringByAppendingString:library.rootURL.path];require(NSEqualRects(NSRectFromString([NSUserDefaults.standardUserDefaults stringForKey:frameKey]),host.frame),@"window position and size are remembered");[browser close];[browser close];require(closes==1,@"remote close callback runs once");[browser release];[ack release];ack=nil;
|
||||
for(int i=0;i<50;i++)[library recordUsedPath:[root.path stringByAppendingPathComponent:[NSString stringWithFormat:@"History-%d.cube",i]]];require(library.recentPaths.count==40&&[library.recentPaths[0]hasSuffix:@"History-49.cube"],@"recent history stays bounded at 40 newest paths");
|
||||
NSArray *keys=NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys;for(NSString *key in keys)if([key containsString:library.rootURL.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key];require([fm removeItemAtURL:root error:nil],@"isolated fixtures and preferences cleaned");
|
||||
NSDictionary *report=@{@"pass":@YES,@"checks":checks,@"scope":@"Real AppKit browser objects, hidden host-owned window fixture, asynchronous acknowledgement and root-scoped history; no visible test app or user LUT changes."};[[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil]writeToFile:[NSString stringWithUTF8String:argv[1]] atomically:YES];printf("PASS %lu browser checks\n",(unsigned long)checks.count);[checks release];return 0;
|
||||
}}
|
||||
@@ -0,0 +1,68 @@
|
||||
// Executes the user's installed Color Finale only as a read-only test oracle.
|
||||
// Product builds and product rendering never load these reference frameworks.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <Metal/Metal.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#include <dlfcn.h>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include "../大鱼调色/Plugin/DYFilmMath.h"
|
||||
using Floats=std::vector<float>;
|
||||
static id<MTLDevice> gpu;
|
||||
static id<MTLCommandQueue> queue;
|
||||
static CIContext *context;
|
||||
static unsigned W=64,H=48;
|
||||
static void require(bool p,NSString *m){if(!p)@throw [NSException exceptionWithName:@"FilmReference" reason:m userInfo:nil];}
|
||||
static float encode(float v){return v<=.0031308f?v*12.92f:1.055f*powf(fmaxf(0,v),1/2.4f)-.055f;}
|
||||
static float decode(float v){return v<=.04045f?v/12.92f:powf(fmaxf(0,(v+.055f)/1.055f),2.4f);}
|
||||
static id<MTLTexture> texture(const Floats& data={}){MTLTextureDescriptor *d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:W height:H mipmapped:NO];d.storageMode=MTLStorageModeShared;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[gpu newTextureWithDescriptor:d];require(t!=nil,@"texture allocation");if(!data.empty())[t replaceRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0 withBytes:data.data() bytesPerRow:W*16];return t;}
|
||||
static Floats read(id<MTLTexture> t){Floats v(W*H*4);[t getBytes:v.data() bytesPerRow:W*16 fromRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0];return v;}
|
||||
static void finish(id<MTLCommandBuffer> c){[c commit];[c waitUntilCompleted];require(c.status==MTLCommandBufferStatusCompleted,c.error.description?:@"GPU command");}
|
||||
static CIImage *image(id<MTLTexture> t){return [CIImage imageWithMTLTexture:t options:@{kCIImageColorSpace:NSNull.null}];}
|
||||
static Floats render(CIImage *ci){require(ci!=nil,@"reference output image");Floats v(W*H*4);[context render:ci toBitmap:v.data() rowBytes:W*16 bounds:CGRectMake(0,0,W,H) format:kCIFormatRGBAf colorSpace:nil];Floats top(v.size());for(unsigned y=0;y<H;y++)memcpy(top.data()+y*W*4,v.data()+(H-1-y)*W*4,W*16);return top;}
|
||||
static id<MTLComputePipelineState> pipeline(id<MTLLibrary> library,NSString *name){NSError *error=nil;id<MTLFunction> f=[library newFunctionWithName:name];require(f!=nil,name);id<MTLComputePipelineState>p=[gpu newComputePipelineStateWithFunction:f error:&error];require(p!=nil,error.description);return p;}
|
||||
static void dispatch(id<MTLComputeCommandEncoder> e){[e dispatchThreads:MTLSizeMake(W,H,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[e endEncoding];}
|
||||
static Floats point(id<MTLLibrary> library,id<MTLTexture> src,id<MTLTexture> aux,DYUniforms u,int operation){id<MTLTexture>out=texture();id<MTLCommandBuffer>c=[queue commandBuffer];id<MTLComputeCommandEncoder>e=[c computeCommandEncoder];[e setComputePipelineState:pipeline(library,@"dyFilmPoint")];[e setTexture:src atIndex:0];[e setTexture:aux?:src atIndex:1];[e setTexture:out atIndex:2];[e setBytes:&u length:sizeof(u) atIndex:0];struct {int operation;float radius;unsigned frame,reserved;}p={operation,0,u.filmFrameKey,0};[e setBytes:&p length:sizeof(p) atIndex:1];dispatch(e);finish(c);return read(out);}
|
||||
static NSDictionary *difference(const Floats&a,const Floats&b){double maximum=0,sum=0;unsigned count=0,nonfinite=0,different=0;for(size_t i=0;i<a.size();i++){if(i%4==3)continue;if(a[(i/4)*4+3]<=0)continue;double d=fabs(a[i]-b[i]);if(!std::isfinite(d))nonfinite++;else{maximum=fmax(maximum,d);sum+=d*d;count++;if(d>1e-5)different++;}}return @{@"maximum":@(maximum),@"rms":@(sqrt(sum/fmax(1,count))),@"nonfinite":@(nonfinite),@"different":@(different)};}
|
||||
int main(int argc,const char **argv){@autoreleasepool{@try{
|
||||
require(argc==2||argc==4,@"Usage: verify_film_reference /absolute/path/default.metallib [width height]");if(argc==4){W=atoi(argv[2]);H=atoi(argv[3]);require(W>0&&H>0&&W<=4096&&H<=4096,@"bounded reference dimensions");}gpu=MTLCreateSystemDefaultDevice();queue=[gpu newCommandQueue];context=[CIContext contextWithMTLDevice:gpu options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}];NSError *error=nil;
|
||||
id<MTLLibrary> dayu=[gpu newLibraryWithURL:[NSURL fileURLWithPath:@(argv[1])] error:&error];require(dayu!=nil,error.description);
|
||||
NSString *framework=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A";
|
||||
require(dlopen([[framework stringByAppendingPathComponent:@"RenderingEngine"]fileSystemRepresentation],RTLD_NOW|RTLD_LOCAL)!=nullptr,@"load installed reference framework");
|
||||
id<MTLLibrary> original=[gpu newLibraryWithURL:[NSURL fileURLWithPath:[framework stringByAppendingPathComponent:@"Resources/metal_kernels.metallib"]] error:&error];require(original!=nil,error.description);
|
||||
Floats linear(W*H*4),encoded(linear.size());for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++){unsigned i=(y*W+x)*4;float a=(x%11==0&&W>1)?0:(x%3==0?.25f:1);for(int k=0;k<3;k++){float c=float((x*17+y*23+k*71)%257)/256;if(x%17==0)c=k==0?1.3f:k==1?-.02f:c;linear[i+k]=float((__fp16)(decode(c)*a));encoded[i+k]=encode(a>0?linear[i+k]/a:0)*a;}linear[i+3]=encoded[i+3]=a;}
|
||||
id<MTLTexture>source=texture(linear),codes=texture(encoded);Floats probe=render(image(source));require([difference(linear,probe)[@"maximum"]doubleValue]==0,@"CI bitmap orientation control");id<MTLTexture>roundtrip=texture();id<MTLCommandBuffer>roundtripCommands=[queue commandBuffer];[context render:image(source) toMTLTexture:roundtrip commandBuffer:roundtripCommands bounds:CGRectMake(0,0,W,H) colorSpace:nil];finish(roundtripCommands);require([difference(linear,read(roundtrip))[@"maximum"]doubleValue]==0,@"CI texture orientation control");NSMutableArray *rows=[NSMutableArray array];bool passed=true;
|
||||
auto check=[&](NSString*name,const Floats&a,const Floats&b,double tolerance){NSDictionary *d=difference(a,b);BOOL ok=[d[@"nonfinite"]intValue]==0&&[d[@"maximum"]doubleValue]<tolerance;NSMutableDictionary *r=[d mutableCopy];r[@"name"]=name;r[@"pass"]=@(ok);r[@"tolerance"]=@(tolerance);[rows addObject:r];passed&=ok;};
|
||||
DYUniforms u={};u.mixerMix=1;u.mixerRed=(DYFloat4){.75,.3,-.05,0};u.mixerGreen=(DYFloat4){.15,.85,0,0};u.mixerBlue=(DYFloat4){.05,-.1,1.05,0};u.film.gammaAll=u.film.gammaCyan=u.film.gammaMagenta=u.film.gammaYellow=1;u.film.valueMode=6;
|
||||
for(int matrixCase=0;matrixCase<3;matrixCase++){
|
||||
if(matrixCase==1)u.mixerRed=u.mixerGreen=u.mixerBlue=(DYFloat4){0,0,0,0};
|
||||
if(matrixCase==2)u.mixerRed=u.mixerGreen=u.mixerBlue=(DYFloat4){1.f/3,1.f/3,1.f/3,0};
|
||||
for(int options=0;options<4;options++){
|
||||
u.mixerPreserveLuma=options&1;u.mixerPreserveSaturation=(options>>1)&1;CIFilter *f=[[NSClassFromString(@"FTChannelMixerFilter")alloc]init];[f setDefaults];[f setValue:image(codes) forKey:kCIInputImageKey];[f setValue:[CIVector vectorWithX:u.mixerRed.x Y:u.mixerRed.y Z:u.mixerRed.z]forKey:@"inputRVector"];[f setValue:[CIVector vectorWithX:u.mixerGreen.x Y:u.mixerGreen.y Z:u.mixerGreen.z]forKey:@"inputGVector"];[f setValue:[CIVector vectorWithX:u.mixerBlue.x Y:u.mixerBlue.y Z:u.mixerBlue.z]forKey:@"inputBVector"];[f setValue:@(u.mixerPreserveLuma>0) forKey:@"inputPreserveLuma"];[f setValue:@(u.mixerPreserveSaturation>0)forKey:@"inputPreserveSaturation"];
|
||||
Floats expected=render(f.outputImage);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-mixer-case-%d-options-%d",matrixCase,options],expected,point(dayu,source,nil,u,0),.00015);
|
||||
}
|
||||
}
|
||||
for(int mode=1;mode<=2;mode++)for(float density:{-.4f,0.f,.65f})for(float gamma:{.75f,1.3f}){
|
||||
u.film.densityMode=mode;u.film.density=density;u.film.gammaAll=gamma;u.film.gammaCyan=1.2;u.film.gammaMagenta=.9;u.film.gammaYellow=1.1;CIFilter *f=[[NSClassFromString(@"FTFilmSaturationFilter")alloc]init];[f setDefaults];[f setValue:image(codes)forKey:kCIInputImageKey];[f setValue:@(gamma)forKey:@"gammaAll"];[f setValue:@1.2 forKey:@"gammaCyan"];[f setValue:@.9 forKey:@"gammaMagenta"];[f setValue:@1.1 forKey:@"gammaYellow"];[f setValue:@(density)forKey:@"density"];[f setValue:@(mode)forKey:@"densitySwitch"];
|
||||
Floats expected=render(f.outputImage);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-subtractive-%d-%.2f-%.2f",mode,density,gamma],expected,point(dayu,source,nil,u,1),.00012);
|
||||
}
|
||||
for(float scatter:{1.f,5.f,20.f}){
|
||||
u.film.scatter=scatter;u.film.boost=1.7;u.film.dyeTransmission=70;CIFilter *f=[[NSClassFromString(@"FTHalationFilter")alloc]init];[f setDefaults];[f setValue:image(source)forKey:kCIInputImageKey];[f setValue:@(scatter)forKey:@"scatter"];[f setValue:@1.7 forKey:@"boost"];[f setValue:@(70.f/500)forKey:@"dyeTransmission"];
|
||||
CIImage *blur=[[[image(source)imageByClampingToExtent]imageByApplyingFilter:@"CIGaussianBlur" withInputParameters:@{kCIInputRadiusKey:@(scatter)}]imageByCroppingToRect:CGRectMake(0,0,W,H)];id<MTLTexture>aux=texture(render(blur));check([NSString stringWithFormat:@"original-halation-radius-%.0f",scatter],render(f.outputImage),point(dayu,source,aux,u,2),.00012);
|
||||
}
|
||||
for(float sensitivity:{20.f,50.f,80.f}){
|
||||
DYFilmSettings settings={};settings.sensitivity=sensitivity;settings.intensity=70;
|
||||
CIFilter *filter=[[NSClassFromString(@"FTBloomFilter")alloc]init];[filter setValue:image(source)forKey:kCIInputImageKey];[filter setValue:@2.5 forKey:@"blurRadius"];[filter setValue:@(sensitivity/100)forKey:@"sensitivity"];[filter setValue:@.7 forKey:@"intensity"];
|
||||
id<MTLTexture>horizontal=texture(),vertical=texture(),edges=texture();id<MTLCommandBuffer>commands=[queue commandBuffer];
|
||||
for(int direction=0;direction<2;direction++){id<MTLComputeCommandEncoder>e=[commands computeCommandEncoder];[e setComputePipelineState:pipeline(dayu,@"dyFilmSparseBlur")];[e setTexture:direction?horizontal:source atIndex:0];[e setTexture:direction?vertical:horizontal atIndex:1];[e setBytes:&direction length:4 atIndex:0];dispatch(e);}
|
||||
id<MTLComputeCommandEncoder>e=[commands computeCommandEncoder];[e setComputePipelineState:pipeline(dayu,@"dyFilmBloomEdges")];[e setTexture:vertical atIndex:0];[e setTexture:source atIndex:1];[e setTexture:edges atIndex:2];[e setBytes:&settings length:sizeof(settings) atIndex:0];dispatch(e);finish(commands);
|
||||
Floats actual=read(edges),expected=render(filter.outputImage);unsigned inside=0,border=0;for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++)if(expected[(y*W+x)*4+3]>0&&fabs(actual[(y*W+x)*4]-expected[(y*W+x)*4])>.01){if(x>=8&&x<W-8&&y>=8&&y<H-8)inside++;else border++;}fprintf(stderr,"bloom %.0f mismatches interior=%u border=%u\n",sensitivity,inside,border);check([NSString stringWithFormat:@"original-bloom-edge-sensitivity-%.0f",sensitivity],expected,actual,.00001);
|
||||
}
|
||||
for(unsigned seed:{0u,1u,7919u,0xffffffffu}){
|
||||
auto noise=[&](id<MTLLibrary>lib,NSString *name){id<MTLTexture>out=texture();id<MTLCommandBuffer>c=[queue commandBuffer];id<MTLComputeCommandEncoder>e=[c computeCommandEncoder];[e setComputePipelineState:pipeline(lib,name)];[e setTexture:out atIndex:0];[e setBytes:&seed length:4 atIndex:0];if([name isEqual:@"dyFilmNoise"]){unsigned bottom=0;[e setBytes:&bottom length:4 atIndex:1];}dispatch(e);finish(c);return out;};
|
||||
id<MTLTexture>ref=noise(original,@"BoxMullerPCG"),ours=noise(dayu,@"dyFilmNoise");check([NSString stringWithFormat:@"original-pcg-box-muller-%u",seed],read(ref),read(ours),.00002);
|
||||
for(float color:{0.f,.35f,1.f}){u.film.grainAmount=.5;u.film.grainSize=1;u.film.grainResponse=.4;u.film.grainColor=color;float corr=1-2*color,other=1-corr,norm=sqrtf(corr*corr+other*other);float params[9]={.4f,.6f,corr/norm,other/norm,corr/norm,other/norm,.025f,.025f,.025f};id<MTLTexture>referenceOutput=texture();id<MTLCommandBuffer>commands=[queue commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:pipeline(original,@"GrainFilter")];[encoder setTexture:codes atIndex:0];[encoder setTexture:ref atIndex:1];[encoder setTexture:referenceOutput atIndex:2];[encoder setBytes:params length:sizeof(params) atIndex:0];dispatch(encoder);finish(commands);Floats expected=read(referenceOutput);for(size_t i=0;i<expected.size()/4;i++)for(int k=0;k<3;k++){float a=expected[i*4+3];expected[i*4+k]=a>0?decode(expected[i*4+k]/a)*a:0;}check([NSString stringWithFormat:@"original-grain-%u-%.2f",seed,color],expected,point(dayu,source,ours,u,4),.0002);}
|
||||
}
|
||||
NSDictionary *result=@{@"pass":@(passed),@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"gpu":gpu.name,@"referenceVersion":@"ColorFinale 2.16.2 (625)",@"scope":@"Independent installed-reference CI/Metal output versus authored production Metal point kernels; source grayscale/color/HDR/negative and fractional-alpha vectors; reference frame seed is explicit.",@"results":rows};NSData *json=[NSJSONSerialization dataWithJSONObject:result options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:nil];fwrite(json.bytes,1,json.length,stdout);puts("");return passed?0:1;
|
||||
}@catch(NSException *e){fprintf(stderr,"%s\n",e.reason.UTF8String);return 2;}}}
|
||||
+1
-1
@@ -93,7 +93,7 @@ static Pixels render(id<MTLRenderPipelineState> pipeline, bool dayu, id<MTLTextu
|
||||
[e setFragmentTexture:source atIndex:0];
|
||||
for (NSUInteger i=0;i<textures.count;++i) [e setFragmentTexture:textures[i] atIndex:i+1];
|
||||
[e setFragmentBytes:&u length:sizeof(u) atIndex:0]; float scene=.73f; [e setFragmentBytes:&scene length:4 atIndex:1];
|
||||
if(dayu) { DYRenderOptions options={}; options.outputPremultiplied=premultiplied; [e setFragmentBytes:&options length:sizeof(options) atIndex:2]; }
|
||||
if(dayu) { DYRenderOptions options={}; options.outputPremultiplied=premultiplied; [e setFragmentBytes:&options length:sizeof(options) atIndex:2];[e setFragmentBytes:&u length:sizeof(u) atIndex:3];float empty[2]={0,0};simd_int2 size={0,0};[e setFragmentBytes:empty length:sizeof(empty) atIndex:4];[e setFragmentBytes:&size length:sizeof(size) atIndex:5]; }
|
||||
else { float disabledWatermark[8]={}; [e setFragmentBytes:disabledWatermark length:sizeof(disabledWatermark) atIndex:2]; }
|
||||
[e drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4]; [e endEncoding]; finish(commands);
|
||||
Pixels output(width*height*4); [destination getBytes:output.data() bytesPerRow:width*8 fromRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0]; return output;
|
||||
|
||||
@@ -101,6 +101,7 @@ int main(int argc,const char *argv[]) {@autoreleasepool {
|
||||
[acknowledgements addObject:[[completion copy]autorelease]];NSProgress *task=[NSProgress discreteProgressWithTotalUnitCount:1];[applyTasks addObject:task];return task;
|
||||
}];
|
||||
pump(^{return [ackBrowser valueForKey:@"libraryTask"]==nil;});
|
||||
[ackBrowser setValue:@"*" forKey:@"folder"];[ackBrowser rebuildGrid]; // This fixture tests two acknowledgements, regardless of saved/default category.
|
||||
NSDictionary *ackTiles=[ackBrowser valueForKey:@"tiles"];NSArray *ackPaths=ackTiles.allKeys;require(ackPaths.count>=2,@"acknowledgement fixture has selectable thumbnails");
|
||||
id firstTile=ackTiles[ackPaths[0]],secondTile=ackTiles[ackPaths[1]];[firstTile setEnabled:YES];[secondTile setEnabled:YES];
|
||||
[ackBrowser thumbnailClicked:firstTile];
|
||||
@@ -125,5 +126,6 @@ int main(int argc,const char *argv[]) {@autoreleasepool {
|
||||
#endif
|
||||
report[@"checks"]=checks;report[@"scope"]=@"Synthetic 24 x 65-cube import with real main-run-loop heartbeat and snapshot reads; headless browser cancellation, latest selection and 3,025-entry virtualization. No user library or visible test app.";
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:&error];require([json writeToFile:[NSString stringWithUTF8String:argv[1]] atomically:YES],@"report written");
|
||||
for(NSString *key in NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys)if([key containsString:destination.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key];
|
||||
require([fm removeItemAtURL:root error:&error],@"isolated fixtures removed");printf("PASS: import %.3fs, main gap %.1fms, %lu ticks\n",duration,maxGap*1000,(unsigned long)ticks);[checks release];return 0;
|
||||
}}
|
||||
@@ -0,0 +1,127 @@
|
||||
// Read-only oracle tool. Neither product builds nor product rendering load
|
||||
// the installed Color Finale framework used here.
|
||||
// Build with clang++ -std=c++17 -fno-objc-arc, Foundation/CoreImage/Metal.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <Metal/Metal.h>
|
||||
#import <objc/message.h>
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
#include <dlfcn.h>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include "../大鱼调色/Plugin/DYUniforms.h"
|
||||
|
||||
using Floats=std::vector<float>;
|
||||
static unsigned W=64,H=48;
|
||||
static id<MTLDevice> gpu;
|
||||
static id<MTLCommandQueue> queue;
|
||||
static CIContext *context;
|
||||
static BOOL bitmapNeedsVerticalFlip=NO;
|
||||
static NSMutableArray *rows;
|
||||
static NSMutableArray *conversionFilters,*conversionCalls;
|
||||
static bool passed=true;
|
||||
static constexpr double tolerance=1e-4;
|
||||
|
||||
static void require(bool condition,NSString *message){
|
||||
if(!condition)@throw [NSException exceptionWithName:@"PrintReference" reason:message?:@"reference requirement failed" userInfo:nil];
|
||||
}
|
||||
static NSString *sha256(NSData *data){
|
||||
require(data!=nil,@"identity file could not be read for SHA-256");
|
||||
unsigned char digest[CC_SHA256_DIGEST_LENGTH];CC_SHA256(data.bytes,(CC_LONG)data.length,digest);
|
||||
NSMutableString *text=[NSMutableString stringWithCapacity:64];for(unsigned char byte:digest)[text appendFormat:@"%02x",byte];return text;
|
||||
}
|
||||
static id finiteValue(float value){return std::isfinite(value)?(id)@(value):(id)@"nonfinite";}
|
||||
static Floats flipped(const Floats& input){
|
||||
Floats output(input.size());for(unsigned y=0;y<H;y++)memcpy(output.data()+y*W*4,input.data()+(H-1-y)*W*4,W*16);return output;
|
||||
}
|
||||
static NSDictionary *difference(const Floats& expected,const Floats& actual,const Floats *alphaSource=nullptr,float selectedAlpha=-1){
|
||||
require(expected.size()==actual.size(),@"comparison dimensions differ");
|
||||
double maximum=0,rgbMaximum=0,alphaMaximum=0,sum=0,straightMaximum=0;size_t count=0,nonfinite=0,worst=0,different=0;
|
||||
for(size_t i=0;i<expected.size();i++){
|
||||
if(alphaSource&&(*alphaSource)[(i/4)*4+3]!=selectedAlpha)continue;
|
||||
double delta=fabs(double(expected[i])-actual[i]);
|
||||
if(!std::isfinite(delta)){nonfinite++;continue;}
|
||||
if(delta>maximum){maximum=delta;worst=i;}
|
||||
if(i%4==3)alphaMaximum=fmax(alphaMaximum,delta);
|
||||
else{rgbMaximum=fmax(rgbMaximum,delta);sum+=delta*delta;count++;if(delta>tolerance)different++;}
|
||||
}
|
||||
for(size_t i=0;i<expected.size()/4;i++){
|
||||
if(alphaSource&&(*alphaSource)[i*4+3]!=selectedAlpha)continue;
|
||||
float ea=expected[i*4+3],aa=actual[i*4+3];if(!(ea>0&&aa>0))continue;
|
||||
for(int c=0;c<3;c++){double delta=fabs(double(expected[i*4+c])/ea-double(actual[i*4+c])/aa);if(std::isfinite(delta))straightMaximum=fmax(straightMaximum,delta);}
|
||||
}
|
||||
return @{@"maximum":@(maximum),@"rgbMaximum":@(rgbMaximum),@"alphaMaximum":@(alphaMaximum),@"rmsRGB":@(sqrt(sum/fmax(1,count))),@"straightRGBMaximum":@(straightMaximum),@"nonfinite":@(nonfinite),@"pixels":@(count/3),@"rgbComponentsOverTolerance":@(different),@"worstPixel":@{@"x":@((worst/4)%W),@"y":@((worst/4)/W),@"channel":@(worst%4),@"expected":finiteValue(expected[worst]),@"actual":finiteValue(actual[worst])}};
|
||||
}
|
||||
static NSArray *differencesByAlpha(const Floats& expected,const Floats& actual,const Floats& source){NSMutableArray *groups=[NSMutableArray array];for(float alpha:{0.f,1.f/65536,1e-4f,.03125f,.25f,1.f}){NSMutableDictionary *group=[NSMutableDictionary dictionaryWithDictionary:difference(expected,actual,&source,alpha)];group[@"sourceAlpha"]=@(alpha);[groups addObject:group];}return groups;}
|
||||
static NSArray *samples(const Floats& source,const Floats& converted,const Floats& lmt,const Floats& decoded,const Floats& actual){NSMutableArray *result=[NSMutableArray array];for(NSUInteger index:{NSUInteger(0),NSUInteger(1),NSUInteger(6),NSUInteger(30),NSUInteger(54),NSUInteger(78),NSUInteger(102),NSUInteger(126)}){if(index>=size_t(W)*H)continue;auto pixel=[&](const Floats& values){NSMutableArray *array=[NSMutableArray array];for(int c=0;c<4;c++)[array addObject:finiteValue(values[index*4+c])];return array;};[result addObject:@{@"x":@(index%W),@"y":@(index/W),@"source":pixel(source),@"convertedToCCT":pixel(converted),@"lmt":pixel(lmt),@"decodedTo709":pixel(decoded),@"production":pixel(actual)}];}return result;}
|
||||
static void record(NSString *name,NSDictionary *metrics,double limit,NSDictionary *extra=nil){
|
||||
BOOL ok=[metrics[@"nonfinite"]unsignedLongLongValue]==0&&[metrics[@"maximum"]doubleValue]<=limit;
|
||||
NSMutableDictionary *row=[NSMutableDictionary dictionaryWithDictionary:metrics];row[@"name"]=name;row[@"pass"]=@(ok);row[@"tolerance"]=@(limit);if(extra)[row addEntriesFromDictionary:extra];[rows addObject:row];passed&=ok;
|
||||
}
|
||||
static id<MTLTexture> texture(const Floats& values={}){
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:W height:H mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
|
||||
id<MTLTexture> result=[gpu newTextureWithDescriptor:desc];require(result!=nil,@"RGBA32Float texture allocation failed");if(!values.empty()){require(values.size()==size_t(W)*H*4,@"source texture byte count");[result replaceRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0 withBytes:values.data() bytesPerRow:W*16];}return [result autorelease];
|
||||
}
|
||||
static id<MTLTexture> cubeTexture(NSData *data){
|
||||
const NSUInteger n=65;require(data.length==n*n*n*16,@"reference cubeData is not 65-cubed RGBA32Float");const float *values=(const float*)data.bytes;for(NSUInteger i=0;i<data.length/4;i++)require(std::isfinite(values[i]),@"reference cubeData contains nonfinite values");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor new];desc.textureType=MTLTextureType3D;desc.pixelFormat=MTLPixelFormatRGBA32Float;desc.width=desc.height=desc.depth=n;desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead;
|
||||
id<MTLTexture> result=[gpu newTextureWithDescriptor:desc];[desc release];require(result!=nil,@"print cube texture allocation failed");[result replaceRegion:MTLRegionMake3D(0,0,0,n,n,n) mipmapLevel:0 slice:0 withBytes:data.bytes bytesPerRow:n*16 bytesPerImage:n*n*16];return [result autorelease];
|
||||
}
|
||||
static Floats read(id<MTLTexture> value){Floats result(size_t(W)*H*4);[value getBytes:result.data() bytesPerRow:W*16 fromRegion:MTLRegionMake2D(0,0,W,H) mipmapLevel:0];return result;}
|
||||
static void finish(id<MTLCommandBuffer> commands){[commands commit];[commands waitUntilCompleted];require(commands.status==MTLCommandBufferStatusCompleted,commands.error.description?:@"Metal command failed");}
|
||||
static CIImage *image(id<MTLTexture> value){CIImage *result=[CIImage imageWithMTLTexture:value options:@{kCIImageColorSpace:NSNull.null}];require(result!=nil,@"CIImage from Metal texture failed");return result;}
|
||||
static Floats bitmapRaw(CIImage *value){require(value!=nil,@"reference output image missing");Floats result(size_t(W)*H*4);[context render:value toBitmap:result.data() rowBytes:W*16 bounds:CGRectMake(0,0,W,H) format:kCIFormatRGBAf colorSpace:nil];return result;}
|
||||
static Floats bitmap(CIImage *value){Floats result=bitmapRaw(value);return bitmapNeedsVerticalFlip?flipped(result):result;}
|
||||
static id colorSpace(NSString *name){
|
||||
Class cls=NSClassFromString(@"FTColorSpace");SEL selector=NSSelectorFromString(name);require(cls&&[(id)cls respondsToSelector:selector],[@"reference color space missing: " stringByAppendingString:name]);id value=((id(*)(id,SEL))objc_msgSend)((id)cls,selector);require(value!=nil,@"reference color space factory failed");return value;
|
||||
}
|
||||
static CIImage *converted(CIImage *input,id from,id to){
|
||||
Class cls=NSClassFromString(@"FTColorSpaceFilter");SEL selector=sel_registerName("filterFromColorSpace:toColorSpace:");require(cls&&[(id)cls respondsToSelector:selector],@"reference color conversion factory missing");CIFilter *filter=((id(*)(id,SEL,id,id))objc_msgSend)((id)cls,selector,from,to);require(filter!=nil,@"reference color conversion factory failed");[conversionFilters addObject:filter];[filter setValue:input forKey:kCIInputImageKey];CIImage *output=filter.outputImage;require(output!=nil,@"reference color conversion returned no image");[conversionCalls addObject:@{@"filter": [NSString stringWithFormat:@"%p",(void*)filter],@"outputImage":[NSString stringWithFormat:@"%p",(void*)output],@"fromSpace":[NSString stringWithFormat:@"%p",(void*)from],@"toSpace":[NSString stringWithFormat:@"%p",(void*)to]}];return output;
|
||||
}
|
||||
static Floats production(id<MTLComputePipelineState> pipeline,id<MTLTexture> source,id<MTLTexture> cube,DYUniforms uniforms){
|
||||
id<MTLTexture> output=texture();id<MTLCommandBuffer> commands=[queue commandBuffer];id<MTLComputeCommandEncoder> encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:pipeline];[encoder setTexture:source atIndex:0];[encoder setTexture:cube atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBytes:&uniforms length:sizeof(uniforms) atIndex:0];[encoder dispatchThreads:MTLSizeMake(W,H,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];finish(commands);return read(output);
|
||||
}
|
||||
static void orientationControls(){
|
||||
Floats probe(size_t(W)*H*4);for(unsigned y=0;y<H;y++)for(unsigned x=0;x<W;x++){size_t i=(size_t(y)*W+x)*4;probe[i]=float(x+1)/(W+1)*.6f;probe[i+1]=float(y+1)/(H+1)*.7f;probe[i+2]=float((x+y*3)%17+1)/19;probe[i+3]=1;}
|
||||
id<MTLTexture> source=texture(probe);CIImage *ci=image(source);Floats raw=bitmapRaw(ci);NSDictionary *direct=difference(probe,raw),*vertical=difference(probe,flipped(raw));double directMaximum=[direct[@"maximum"]doubleValue],verticalMaximum=[vertical[@"maximum"]doubleValue];bitmapNeedsVerticalFlip=verticalMaximum<directMaximum;
|
||||
NSDictionary *selected=bitmapNeedsVerticalFlip?vertical:direct;record(@"ci-bitmap-orientation-control",selected,1e-7,@{@"rawMaximum":@(directMaximum),@"flippedMaximum":@(verticalMaximum),@"bitmapToMetalMemory":bitmapNeedsVerticalFlip?@"vertical-flip":@"identity"});require([selected[@"nonfinite"]unsignedLongLongValue]==0&&[selected[@"maximum"]doubleValue]<=1e-7,@"CI bitmap orientation control failed; comparisons not run");
|
||||
id<MTLTexture> output=texture();id<MTLCommandBuffer> commands=[queue commandBuffer];[context render:ci toMTLTexture:output commandBuffer:commands bounds:CGRectMake(0,0,W,H) colorSpace:nil];finish(commands);NSDictionary *metrics=difference(probe,read(output));record(@"ci-texture-orientation-control",metrics,1e-7);require([metrics[@"nonfinite"]unsignedLongLongValue]==0&&[metrics[@"maximum"]doubleValue]<=1e-7,@"CI texture orientation control failed; comparisons not run");
|
||||
}
|
||||
static Floats sourcePixels(){
|
||||
static const float patches[][3]={{0,0,0},{.001f,.001f,.001f},{.0078125f,.0078125f,.0078125f},{.18f,.18f,.18f},{1,1,1},{4,4,4},{16,16,16},{-.02f,-.02f,-.02f},{1,0,0},{0,1,0},{0,0,1},{1,1,0},{0,1,1},{1,0,1},{4,.1f,.01f},{.01f,.2f,8},{-.05f,.18f,.8f},{.25f,-.125f,.04f},{.01f,4,.5f},{.7f,.3f,.1f},{.035f,.07f,.14f},{2,.6f,-.02f},{-.1f,.04f,1.2f},{.5f,.5f,.5f}};
|
||||
static const float alpha[]={0,1.f/65536,1e-4f,.03125f,.25f,1};Floats result(size_t(W)*H*4);for(size_t i=0;i<size_t(W)*H;i++){size_t patch=i%24;float a=alpha[(i+i/24)%6];for(int c=0;c<3;c++)result[i*4+c]=patches[patch][c]*a;result[i*4+3]=a;}return result;
|
||||
}
|
||||
static void writeJSON(NSDictionary *value){NSError *error=nil;NSData *data=[NSJSONSerialization dataWithJSONObject:value options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];require(data!=nil,error.description?:@"JSON encoding failed");fwrite(data.bytes,1,data.length,stdout);fputc('\n',stdout);}
|
||||
|
||||
int main(int argc,const char **argv){@autoreleasepool{
|
||||
rows=[NSMutableArray array];conversionFilters=[NSMutableArray array];conversionCalls=[NSMutableArray array];NSMutableDictionary *identity=[NSMutableDictionary dictionary];
|
||||
@try{
|
||||
require(argc==2||argc==4,@"Usage: verify_print_reference /absolute/path/default.metallib [width height]");if(argc==4){char *endW=nullptr,*endH=nullptr;long width=strtol(argv[2],&endW,10),height=strtol(argv[3],&endH,10);require(endW&&!*endW&&endH&&!*endH&&width>0&&height>0&&width<=4096&&height<=4096,@"reference dimensions must be integers from 1 through 4096");W=(unsigned)width;H=(unsigned)height;}
|
||||
gpu=MTLCreateSystemDefaultDevice();require(gpu!=nil,@"Metal device unavailable");queue=[gpu newCommandQueue];require(queue!=nil,@"Metal command queue unavailable");context=[CIContext contextWithMTLDevice:gpu options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null,kCIContextWorkingFormat:@(kCIFormatRGBAf),kCIContextCacheIntermediates:@NO}];require(context!=nil,@"RGBAf CIContext unavailable");
|
||||
NSError *error=nil;NSString *libraryPath=@(argv[1]);id<MTLLibrary> dayu=[gpu newLibraryWithURL:[NSURL fileURLWithPath:libraryPath] error:&error];require(dayu!=nil,error.description?:@"product Metal library unavailable");id<MTLFunction> function=[dayu newFunctionWithName:@"dyFilmPrint"];require(function!=nil,@"product dyFilmPrint function missing");id<MTLComputePipelineState> pipeline=[gpu newComputePipelineStateWithFunction:function error:&error];[function release];require(pipeline!=nil,error.description?:@"dyFilmPrint pipeline creation failed");identity[@"productMetallib"]=libraryPath;identity[@"productMetallibSHA256"]=sha256([NSData dataWithContentsOfFile:libraryPath]);
|
||||
NSString *framework=@"/Applications/ColorFinale.app/Contents/PlugIns/ColorFinale.pluginkit/Contents/Frameworks/RenderingEngine.framework/Versions/A/RenderingEngine";require(dlopen(framework.fileSystemRepresentation,RTLD_NOW|RTLD_LOCAL)!=nullptr,@"cannot load installed reference RenderingEngine");NSBundle *reference=[NSBundle bundleWithPath:@"/Applications/ColorFinale.app"];identity[@"referenceVersion"]=[reference objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"unknown";identity[@"referenceBuild"]=[reference objectForInfoDictionaryKey:@"CFBundleVersion"]?:@"unknown";identity[@"referenceFrameworkSHA256"]=sha256([NSData dataWithContentsOfFile:framework]);
|
||||
orientationControls();Floats source=sourcePixels(),opaqueSource=source;for(size_t i=0;i<source.size()/4;i++){float a=source[i*4+3];for(int c=0;c<3;c++)opaqueSource[i*4+c]=a>0?source[i*4+c]/a:0;opaqueSource[i*4+3]=1;}id<MTLTexture> input=texture(source),opaqueInput=texture(opaqueSource);id from=colorSpace(@"Rec709Linear"),to=colorSpace(@"ACEScct");NSArray *names=@[@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"];NSMutableArray *cubes=[NSMutableArray array],*diagnostics=[NSMutableArray array];double rawChainDiscrepancyMaximum=0;
|
||||
for(NSUInteger look=0;look<names.count;look++){@autoreleasepool{
|
||||
NSString *name=names[look];Class cls=NSClassFromString(@"FTAcesLMTFilter");SEL selector=sel_registerName("filterWithLMT:");require(cls&&[(id)cls respondsToSelector:selector],@"reference LMT factory missing");CIFilter *filter=((id(*)(id,SEL,id))objc_msgSend)((id)cls,selector,name);require(filter!=nil,[@"reference LMT factory failed: " stringByAppendingString:name]);NSData *data=[filter valueForKey:@"cubeData"];require([data isKindOfClass:NSData.class],@"reference LMT cubeData unavailable");id<MTLTexture> cube=cubeTexture(data);[cubes addObject:@{@"name":name,@"bytes":@(data.length),@"sha256":sha256(data)}];
|
||||
CIImage *rawConverted=converted(image(input),from,to);[filter setValue:rawConverted forKey:kCIInputImageKey];CIImage *rawLMT=filter.outputImage,*output=converted(rawLMT,to,from);Floats referenceOutput=bitmap(output),convertedValues=bitmap(rawConverted),lmtValues=bitmap(rawLMT);double nativeAlphaMaximum=0;for(size_t i=0;i<source.size()/4;i++)nativeAlphaMaximum=fmax(nativeAlphaMaximum,fabs(double(referenceOutput[i*4+3])-source[i*4+3]));
|
||||
CIFilter *opaqueFilter=((id(*)(id,SEL,id))objc_msgSend)((id)cls,selector,name);CIImage *opaqueConverted=converted(image(opaqueInput),from,to);[opaqueFilter setValue:opaqueConverted forKey:kCIInputImageKey];CIImage *opaqueLMT=opaqueFilter.outputImage;Floats opaqueReference=bitmap(converted(opaqueLMT,to,from)),opaqueConvertedValues=bitmap(opaqueConverted),opaqueLMTValues=bitmap(opaqueLMT);DYUniforms opaqueUniforms={};opaqueUniforms.film.enabled=opaqueUniforms.film.mix=1;opaqueUniforms.filmPrint=(DYFloat4){float(look+1),1,0,0};Floats opaqueActual=production(pipeline,opaqueInput,cube,opaqueUniforms);record([@"opaque-colour-control-" stringByAppendingString:name],difference(opaqueReference,opaqueActual),tolerance);
|
||||
DYUniforms rawUniforms=opaqueUniforms;Floats rawActual=production(pipeline,input,cube,rawUniforms);NSDictionary *rawMetrics=difference(referenceOutput,rawActual);rawChainDiscrepancyMaximum=fmax(rawChainDiscrepancyMaximum,[rawMetrics[@"maximum"]doubleValue]);[diagnostics addObject:@{@"name":name,@"rawPremultipliedChainComparison":rawMetrics,@"rawChainBySourceAlpha":differencesByAlpha(referenceOutput,rawActual,source),@"rawChainSamples":samples(source,convertedValues,lmtValues,referenceOutput,rawActual),@"opaqueChainSamples":samples(opaqueSource,opaqueConvertedValues,opaqueLMTValues,opaqueReference,opaqueActual)}];
|
||||
for(float strength:{1.f,.35f,0.f}){
|
||||
// FTColorSpaceFilter is a straight-colour function, while the original
|
||||
// LMT image processor unpremultiplies its input and premultiplies output.
|
||||
// A raw fractional-alpha concatenation therefore does not implement a
|
||||
// consistent image contract. Keep its measured discrepancy above. The
|
||||
// independent colour oracle uses the original chain at alpha one, then
|
||||
// explicitly restores the host's premultiplied-alpha contract here.
|
||||
DYUniforms uniforms={};uniforms.film.enabled=1;uniforms.film.mix=1;uniforms.filmPrint=(DYFloat4){float(look+1),strength,0,0};Floats expected=source;if(strength>0)for(size_t i=0;i<expected.size()/4;i++){float a=source[i*4+3];if(a>0)for(int c=0;c<3;c++)expected[i*4+c]=source[i*4+c]*(1-strength)+opaqueReference[i*4+c]*a*strength;}
|
||||
Floats actual=production(pipeline,input,cube,uniforms);NSDictionary *metrics=difference(expected,actual);record([NSString stringWithFormat:@"original-print-%@-strength-%.2f",name,strength],metrics,tolerance,@{@"lookID":@(look+1),@"strength":@(strength),@"nativeReferenceAlphaMaximum":@(nativeAlphaMaximum),@"bySourceAlpha":differencesByAlpha(expected,actual,source)});
|
||||
}
|
||||
}}
|
||||
NSMutableSet *factoryPointers=[NSMutableSet set];for(NSDictionary *call in conversionCalls)[factoryPointers addObject:call[@"filter"]];identity[@"conversionFactoryCallCount"]=@(conversionCalls.count);identity[@"distinctLiveConversionFilters"]=@(factoryPointers.count);identity[@"conversionFactorySingletonObserved"]=@(factoryPointers.count!=conversionCalls.count);
|
||||
NSDictionary *result=@{@"pass":@(passed),@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"gpu":gpu.name,@"tolerance":@(tolerance),@"textureFormat":@"RGBA32Float",@"ciWorkingFormat":@"RGBAf",@"referenceChain":@"Original FTColorSpaceFilter Rec709Linear -> ACEScct; FTAcesLMTFilter filterWithLMT: (native defaults); FTColorSpaceFilter ACEScct -> Rec709Linear, evaluated at alpha one, then explicitly premultiplied with the source alpha",@"rawPremultipliedChainEquivalent":@(rawChainDiscrepancyMaximum<=tolerance),@"rawPremultipliedChainDiscrepancyMaximum":@(rawChainDiscrepancyMaximum),@"scope":@"All eight original print tables, strengths 1/0.35/0, premultiplied linear Rec.709 grayscale/color/negative/HDR vectors, alpha {0,1/65536,0.0001,0.03125,0.25,1}. Bitmap orientation is measured against an asymmetric identity control before comparing; texture roundtrip must be identity. The original colour chain is independently checked at alpha one. Its raw fractional-alpha chain is retained as a non-gating diagnostic because FTColorSpaceFilter treats RGB as straight while the LMT processor unpremultiplies/premultiplies. Host alpha restoration is explicit, not claimed as full reference CMS equivalence. All pixels, including alpha zero, are compared. Straight RGB maximum is diagnostic; pass uses absolute premultiplied RGBA error. No half-float quantization or relaxed tolerance is applied.",@"identity":identity,@"referenceCubes":cubes,@"diagnostics":diagnostics,@"conversionFactories":conversionCalls,@"results":rows};writeJSON(result);[pipeline release];[dayu release];return passed?0:1;
|
||||
}@catch(NSException *exception){
|
||||
writeJSON(@{@"pass":@NO,@"checks":@(rows.count),@"width":@(W),@"height":@(H),@"tolerance":@(tolerance),@"identity":identity,@"error":exception.reason?:@"unknown reference failure",@"results":rows});return 2;
|
||||
}
|
||||
}}
|
||||
@@ -0,0 +1,53 @@
|
||||
// Read-only tracker probe for caller-decoded top-first gray8 frames.
|
||||
// Media remains outside the repository. This is independent of host scheduling.
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../大鱼调色/Plugin/MaskCore/DYTracker.hpp"
|
||||
#include "../大鱼调色/Plugin/DYToolFlow.inc.h"
|
||||
#include <fstream>
|
||||
#include <chrono>
|
||||
|
||||
class MeasuredFlow final : public dy::FlowBackend {
|
||||
std::shared_ptr<dy::FlowBackend> base_;
|
||||
public:
|
||||
size_t matches=0;
|
||||
explicit MeasuredFlow(std::shared_ptr<dy::FlowBackend> base):base_(std::move(base)){}
|
||||
bool reset(const dy::GrayFrame& f) override {matches=0;return base_->reset(f);}
|
||||
bool advance(const dy::GrayFrame& f,const std::vector<dy::FlowPoint>& p,
|
||||
std::vector<dy::FlowMatch>& out) override {
|
||||
bool ok=base_->advance(f,p,out);matches=out.size();return ok;
|
||||
}
|
||||
};
|
||||
|
||||
int main(int argc,const char*argv[]) {@autoreleasepool {
|
||||
if(argc!=14){fprintf(stderr,"gray8 width height start end step metallib|- cx cy width height angle output.json\n");return 2;}
|
||||
const int width=atoi(argv[2]),height=atoi(argv[3]),start=atoi(argv[4]),end=atoi(argv[5]),step=atoi(argv[6]);
|
||||
if(width<16||height<16||start<0||end<0||(step!=1&&step!=-1)||(end-start)*step<0)return 2;
|
||||
dy::TrackerROI roi{float(atof(argv[8])),float(atof(argv[9])),float(atof(argv[10])),float(atof(argv[11])),float(atof(argv[12]))};
|
||||
std::ifstream input(argv[1],std::ios::binary);if(!input)return 2;
|
||||
auto read=[&](int index){
|
||||
std::vector<uint8_t> bytes(size_t(width)*height);
|
||||
input.clear();input.seekg(std::streamoff(index)*bytes.size());input.read((char*)bytes.data(),bytes.size());
|
||||
if(input.gcount()!=std::streamsize(bytes.size()))return dy::GrayFrame{};
|
||||
dy::GrayFrame f{width,height,std::vector<float>(bytes.size())};
|
||||
for(size_t i=0;i<bytes.size();++i)f.pixels[i]=bytes[i]/255.f;
|
||||
return f;
|
||||
};
|
||||
dy::Tracker tracker;std::shared_ptr<MeasuredFlow> measured;
|
||||
bool metal=strcmp(argv[7],"-")!=0;
|
||||
if(metal){NSError *error=nil;auto backend=DYToolCreateMetalFlow([NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[7]]],&error);if(!backend){fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);return 2;}measured=std::make_shared<MeasuredFlow>(backend);tracker.setBackend(measured);}
|
||||
tracker.setMask({{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}});
|
||||
NSMutableArray *frames=[NSMutableArray array];bool complete=true;
|
||||
auto beginning=std::chrono::steady_clock::now();
|
||||
for(int index=start;(end-index)*step>=0;index+=step){
|
||||
auto frame=read(index);if(!frame.valid())return 2;
|
||||
bool valid=index==start?tracker.reset(frame,roi):tracker.track(frame).valid;
|
||||
auto r=tracker.result();
|
||||
[frames addObject:@{@"frame":@(index),@"valid":@(valid),@"features":@(r.features),@"flowMatches":@(r.matches),@"inliers":@(r.inliers),@"confidence":@(r.confidence),@"medianResidualPixels":@(r.medianError),@"failure":@((int)r.failure),@"centerX":@(r.cx),@"centerY":@(r.cy),@"scaleX":@(r.scaleX),@"scaleY":@(r.scaleY),@"rotation":@(r.rotation)}];
|
||||
if(!valid){complete=false;break;}
|
||||
}
|
||||
auto milliseconds=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-beginning).count();
|
||||
NSDictionary *report=@{@"complete":@(complete),@"backend":metal?@"Metal":@"CPU",@"width":@(width),@"height":@(height),@"start":@(start),@"end":@(end),@"milliseconds":@(milliseconds),@"frames":frames,@"scope":@"Caller-decoded top-first gray8 frames; no host timing or original-video equivalence claim."};
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil];
|
||||
if(![json writeToFile:[NSString stringWithUTF8String:argv[13]] atomically:YES])return 2;
|
||||
fprintf(stdout,"%s frames=%lu last=%d complete=%d\n",metal?"Metal":"CPU",(unsigned long)frames.count,[frames.lastObject[@"frame"]intValue],complete);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,32 @@
|
||||
// Reused sibling topology/math checks; source recorded in SpiderAndBalanceSources.json.
|
||||
#import <Metal/Metal.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp"
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <random>
|
||||
static int checks=0;
|
||||
static void require(bool value,const char*why){checks++;if(!value){fprintf(stderr,"FAIL %s\n",why);exit(1);}}
|
||||
int main(){@autoreleasepool{
|
||||
static_assert(sizeof(dy::SpiderMesh)==4988,"archive ABI");
|
||||
NSString*source=[NSString stringWithContentsOfFile:@"大鱼调色/Plugin/SpiderCore/DYColorMath.h" encoding:NSUTF8StringEncoding error:nil];
|
||||
source=[source stringByAppendingString:@"\nkernel void meshProbe(device const float4*input[[buffer(0)]],device float4*out[[buffer(1)]],constant int2&size[[buffer(2)]],device const float*samples[[buffer(3)]],uint i[[thread_position_in_grid]]){out[i]=float4(dyVariableSpider(input[i].xyz,size.x,size.y,samples),1);}\n"];
|
||||
NSError*error=nil;id<MTLDevice>device=MTLCreateSystemDefaultDevice();require(device,"Metal device");MTLCompileOptions*options=[MTLCompileOptions new];options.fastMathEnabled=NO;id<MTLLibrary>lib=[device newLibraryWithSource:source options:options error:&error];if(!lib)fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);require(lib,"shared polar implementation compiles for Metal");id<MTLComputePipelineState>pipeline=[device newComputePipelineStateWithFunction:[lib newFunctionWithName:@"meshProbe"] error:&error];require(pipeline,"Metal pipeline");id<MTLCommandQueue>queue=[device newCommandQueue];
|
||||
std::vector<simd_float4>corpus;std::mt19937 rng(571030);std::uniform_real_distribution<float>values(-.2,4);
|
||||
for(int i=0;i<1000;i++){auto rgb=dyHSVRGB(float3{float(i)/1000,float(i%71)/70,1});corpus.push_back(simd_float4{rgb.x,rgb.y,rgb.z,1});corpus.push_back(simd_float4{values(rng),values(rng),values(rng),1});}
|
||||
for(float gray:{0.f,.001f,.5f,1.f,4.f})corpus.push_back(simd_float4{gray,gray,gray,1});
|
||||
id<MTLBuffer>input=[device newBufferWithBytes:corpus.data() length:corpus.size()*sizeof(simd_float4) options:MTLResourceStorageModeShared],output=[device newBufferWithLength:corpus.size()*sizeof(simd_float4) options:MTLResourceStorageModeShared];float maxError=0;int grids=0;
|
||||
for(int hues:{6,8,12,16,24})for(int saturation:{6,8,12,16,24}){
|
||||
auto neutral=dy::neutralMesh(hues,saturation);require(dy::validMesh(neutral),"all 25 supported topologies validate");auto samples=dy::meshSamples(neutral);
|
||||
for(auto c:corpus){auto n=dyVariableSpider(float3{c.x,c.y,c.z},hues,saturation-1,samples.data());require(n.x==c.x&&n.y==c.y&&n.z==c.z,"every neutral grid is exact identity including HDR and gray");}
|
||||
std::bitset<dy::SpiderMeshCapacity>selection;selection[2]=1;auto moved=dy::moveMesh(neutral,selection,-.035,.04);require(moved.pins[2]&&moved.x[0]<neutral.x[0]&&moved.x[saturation-1]==neutral.x[saturation-1],"one anchor moves free spoke points and leaves neighboring hue fixed");require(moved.x[saturation-2]==neutral.x[saturation-2],"outer boundary stays constrained");samples=dy::meshSamples(moved);
|
||||
id<MTLBuffer>buffer=[device newBufferWithBytes:samples.data() length:samples.size()*sizeof(float) options:MTLResourceStorageModeShared];simd_int2 size={hues,saturation-1};id<MTLCommandBuffer>cmd=[queue commandBuffer];id<MTLComputeCommandEncoder>enc=[cmd computeCommandEncoder];[enc setComputePipelineState:pipeline];[enc setBuffer:input offset:0 atIndex:0];[enc setBuffer:output offset:0 atIndex:1];[enc setBytes:&size length:sizeof(size) atIndex:2];[enc setBuffer:buffer offset:0 atIndex:3];[enc dispatchThreads:MTLSizeMake(corpus.size(),1,1) threadsPerThreadgroup:MTLSizeMake(64,1,1)];[enc endEncoding];[cmd commit];[cmd waitUntilCompleted];require(cmd.status==MTLCommandBufferStatusCompleted,"Metal dispatch completed");const auto*gpu=(const simd_float4*)output.contents;int changed=0;
|
||||
for(size_t i=0;i<corpus.size();i++){auto c=corpus[i];auto cpu=dyVariableSpider(float3{c.x,c.y,c.z},hues,saturation-1,samples.data());for(int k=0;k<3;k++){float relative=fabs(cpu[k]-gpu[i][k])/std::max(1.f,fabs(cpu[k]));maxError=std::max(maxError,relative);require(std::isfinite(gpu[i][k])&&relative<5e-5,"CPU Metal parity for each deformed grid");}changed+=fabs(cpu.x-c.x)+fabs(cpu.y-c.y)+fabs(cpu.z-c.z)>.001;}
|
||||
require(changed>0,"grid edit changes visible colors");grids++;
|
||||
// Uniform translation survives resampling between every pair of resolutions.
|
||||
auto translated=neutral;for(int i=0;i<dy::meshCount(translated);i++){translated.x[i]+=.02;translated.y[i]-=.01;}
|
||||
auto other=dy::resampleMesh(translated,saturation,hues);for(int i=0;i<dy::meshCount(other);i++){auto q=dy::meshNeutral(other,i);require(fabs(other.x[i]-q.x-.02)<2e-7&&fabs(other.y[i]-q.y+.01)<2e-7,"resampling preserves displacement including seam center and outer boundary");}
|
||||
}
|
||||
auto legacy=dyDefaultGrade();legacy.spiderX[7]+=.04;auto mesh=dy::legacyMesh(legacy);auto projected=dy::meshLegacyGrade(legacy,mesh);require(!memcmp(&legacy,&projected,sizeof(legacy)),"legacy grid no-op projection preserves every byte");auto invalid=mesh;invalid.hues=7;require(!dy::validMesh(invalid),"invalid resolution rejected");invalid=mesh;invalid.x[0]=NAN;require(!dy::validMesh(invalid),"nonfinite coordinate rejected");invalid=mesh;invalid.pins[4]=0;require(!dy::validMesh(invalid),"missing boundary constraint rejected");
|
||||
printf("PASS spider_mesh: %d assertions, %d topologies, %lu colors/grid, CPU/Metal max relative error %.9g\n",checks,grids,(unsigned long)corpus.size(),maxError);
|
||||
}}
|
||||
@@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Project-scoped 5.11 validation against recorded native FxPlug structure.
|
||||
|
||||
The global skill checker currently admits 5.13+, so its original 5.11 guard
|
||||
result is retained separately; this does not relabel that checker as passed.
|
||||
"""
|
||||
from pathlib import Path
|
||||
import hashlib
|
||||
import json
|
||||
import runpy
|
||||
import xml.etree.ElementTree as E
|
||||
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
module=runpy.run_path(str(ROOT/'tools/build_template.py'),run_name='template_contract')
|
||||
file=ROOT/'template'/'\u5927\u9c7c\u8c03\u8272.moef'
|
||||
data=file.read_bytes();contract=module['verify'](data,module['metadata']())
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
project=[node for node in scene.findall('scenenode') if factories.get(node.get('factoryID'))==module['PROJECT_UUID']][0]
|
||||
assert root.get('version')=='5.11' and root.findtext('displayversion')=='5.4.5'
|
||||
mask=0x10000001;selected=[];checked=0
|
||||
for node in scene.iter():
|
||||
if node.tag in module['CONTENT_TAGS'] and node is not project:
|
||||
if node.find('baseFlags') is not None:
|
||||
checked+=1
|
||||
if int(node.findtext('baseFlags'))&mask:selected.append(node.get('id'))
|
||||
assert not selected and scene.findtext('currentObject')==project.get('id')
|
||||
assert int(project.findtext('baseFlags'))==268435473
|
||||
selection=dict(passed=True,sha256=hashlib.sha256(data).hexdigest(),version='5.11',selectionMask=hex(mask),projectID=project.get('id'),contentObjectsChecked=checked,selectedContent=[],selectedContentCount=0,currentObject=scene.findtext('currentObject'),currentObjectIsProject=True,nativeUIVerified=False,validator='project-scoped native-5.11 field comparison',scope='Saved fields only; no rendering or old-FCP execution')
|
||||
qa=ROOT/'template/verification';(qa/'SavedSelection.json').write_text(json.dumps(selection,indent=2)+'\n')
|
||||
skill=json.loads((qa/'SkillAudit.json').read_text())
|
||||
assert skill['errors']==['Saved selection: Unverified Motion XML version/schema; obtain native evidence first']
|
||||
assert skill['basic']['entity_ids_unique'] and skill['basic']['published_count']==2 and not skill['basic']['unresolved_media']
|
||||
evidence=dict(path='~/Movies/Motion Templates.localized/Effects.localized/Color Finale/ColorFinalePro/ColorFinalePro.moef',sha256='bfab9157b988acaf5c078a0837085843f2021e93a2e411eec9d94120f11ddd69',version='5.11',displayversion='5.4.5',projectBaseFlags=268435473,currentObject='10000',scenenodeVersion='5',widgetBaseFlags=16,layerAndSourceBaseFlags=524304,fxPlugBaseFlags=8589934608,allContentSelectionBits=0)
|
||||
report=dict(passed=True,sha256=selection['sha256'],version='5.11',displayversion='5.4.5',nativeReference=evidence,staticContract=contract,savedSelection=selection,skillCheckerStatus='unsupported-version-guard; original SkillAudit.json retained unchanged',otherSkillStructuralErrors=[],copyrightDisplayRows=0,oldFCPActuallyTested=False,scope='Native-template structure and saved-state comparison only; FCP host acceptance is separate')
|
||||
(qa/'Compatibility.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
|
||||
print(json.dumps(dict(passed=True,version=report['version'],displayversion=report['displayversion'],copyrightDisplayRows=0,contentSelected=0,oldFCPActuallyTested=False)))
|
||||
@@ -0,0 +1,128 @@
|
||||
// Independent generated-image oracles for free-path ROI, subpixel motion,
|
||||
// anisotropic transforms, feature capacity, and loss protection. No host UI.
|
||||
#import <Foundation/Foundation.h>
|
||||
#include "../大鱼调色/Plugin/MaskCore/DYTracker.hpp"
|
||||
#include "../大鱼调色/Plugin/DYToolFlow.inc.h"
|
||||
#include <chrono>
|
||||
|
||||
static float noise(int x,int y,uint32_t seed=0) {
|
||||
uint32_t n=uint32_t(x)*73856093u^uint32_t(y)*19349663u^seed;
|
||||
n^=n>>13;n*=1274126177u;n^=n>>16;
|
||||
return .1f+.8f*float(n&65535)/65535.f;
|
||||
}
|
||||
static float scene(float x,float y,bool extended=false,uint32_t seed=0) {
|
||||
if(extended&&(x<251||x>379||y<77||y>307))return .5f;
|
||||
float gx=x/3.f,gy=y/3.f;int ix=int(std::floor(gx)),iy=int(std::floor(gy));
|
||||
float dx=gx-ix,dy=gy-iy;
|
||||
return (1-dy)*((1-dx)*noise(ix,iy,seed)+dx*noise(ix+1,iy,seed))+
|
||||
dy*((1-dx)*noise(ix,iy+1,seed)+dx*noise(ix+1,iy+1,seed));
|
||||
}
|
||||
static dy::GrayFrame frame(int w,int h,double tx=0,double ty=0,double angle=0,
|
||||
double sx=1,double sy=1,bool extended=false,uint32_t seed=0) {
|
||||
dy::GrayFrame f{w,h,std::vector<float>(size_t(w)*h)};
|
||||
double cx=w*(extended?.35:.5),cy=h*.5,c=cos(angle),s=sin(angle);
|
||||
for(int y=0;y<h;y++)for(int x=0;x<w;x++) {
|
||||
double dx=x-cx-tx,dy=y-cy-ty;
|
||||
float u=float((c*dx+s*dy)/sx+cx),v=float((-s*dx+c*dy)/sy+cy);
|
||||
f.pixels[y*w+x]=scene(u,v,extended,seed);
|
||||
}
|
||||
return f;
|
||||
}
|
||||
|
||||
// Isolate robust fitting and confidence from optical flow: coherent cloth-like
|
||||
// 2.15px residuals plus 10% gross outliers, with a known mean translation.
|
||||
class FitBudgetFlow final : public dy::FlowBackend {
|
||||
public:
|
||||
bool reset(const dy::GrayFrame&)override{return true;}
|
||||
bool advance(const dy::GrayFrame&,const std::vector<dy::FlowPoint>& points,
|
||||
std::vector<dy::FlowMatch>& out)override{
|
||||
for(size_t i=0;i<points.size();i++){
|
||||
float angle=float(i)*2.39996323f;
|
||||
float dx=2.25f+2.15f*cosf(angle),dy=-1.5f+2.15f*sinf(angle);
|
||||
if(i%10==0){dx+=35;dy-=25;}
|
||||
auto p=points[i];out.push_back({p,{p.x+dx,p.y+dy},0});
|
||||
}return true;
|
||||
}
|
||||
};
|
||||
|
||||
int main(int argc,const char*argv[]) {@autoreleasepool {
|
||||
NSMutableArray *checks=[NSMutableArray array];bool all=true;
|
||||
auto record=[&](NSString *name,bool pass,NSDictionary *extra=nil) {
|
||||
NSMutableDictionary *d=[NSMutableDictionary dictionaryWithDictionary:extra?:@{}];
|
||||
d[@"name"]=name;d[@"pass"]=@(pass);[checks addObject:d];all&=pass;
|
||||
};
|
||||
NSURL *library=argc>1?[NSURL fileURLWithPath:[NSString stringWithUTF8String:argv[1]]]:nil;
|
||||
{
|
||||
dy::Tracker tracker;tracker.setBackend(std::make_shared<FitBudgetFlow>());
|
||||
auto image=frame(640,480);bool started=tracker.reset(image,{.5,.5,.85,.85,0});
|
||||
auto result=tracker.track(image);double ex=fabs(result.cx-(.5+2.25/640))*640,ey=fabs(result.cy-(.5-1.5/480))*480;
|
||||
record(@"coherent-residual-fit-budget-with-ten-percent-outliers",started&&result.valid&&ex<.8&&ey<.8&&fabs(result.scaleX-1)<.02&&fabs(result.scaleY-1)<.02,
|
||||
@{@"scope":@"Controlled correspondence unit test; not an optical-flow image oracle",@"inliers":@(result.inliers),@"matches":@(result.matches),@"confidence":@(result.confidence),@"xErrorPixels":@(ex),@"yErrorPixels":@(ey)});
|
||||
}
|
||||
for(int mode=0;mode<(library?2:1);mode++) {
|
||||
NSString *prefix=mode?@"metal":@"cpu";
|
||||
auto setup=[&](dy::Tracker& tracker) {
|
||||
if(!mode)return true;
|
||||
NSError *error=nil;auto backend=DYToolCreateMetalFlow(library,&error);
|
||||
if(!backend){record([prefix stringByAppendingString:@"-backend"],false,@{@"error":error.localizedDescription?:@"unavailable"});return false;}
|
||||
tracker.setBackend(backend);return true;
|
||||
};
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
tracker.setMask({{.8f,-.5f},{1.8f,-.5f},{1.8f,.5f},{.8f,.5f}});
|
||||
auto f=frame(512,384,0,0,0,1,1,true);
|
||||
bool started=tracker.reset(f,{.35f,.5f,.2f,.45f,0});
|
||||
record([prefix stringByAppendingString:@"-pen-texture-outside-creation-box-starts"],started,
|
||||
@{@"features":@(tracker.result().features)});
|
||||
bool passed=started;dy::TrackResult result;
|
||||
for(int i=1;i<=12&&passed;i++) {result=tracker.track(frame(512,384,1.25*i,.5*i,0,1,1,true));passed=result.valid;}
|
||||
double ex=fabs(result.cx-(.35+15./512))*512,ey=fabs(result.cy-(.5+6./384))*384;
|
||||
record([prefix stringByAppendingString:@"-extended-pen-region-subpixel-motion"],passed&&ex<.65&&ey<.65,
|
||||
@{@"xErrorPixels":@(ex),@"yErrorPixels":@(ey)});
|
||||
}
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
auto f=frame(640,480);bool started=tracker.reset(f,{.5,.5,.85,.85,0});
|
||||
record([prefix stringByAppendingString:@"-real-300-feature-capacity"],started&&tracker.result().features==300,
|
||||
@{@"features":@(tracker.result().features)});
|
||||
auto result=tracker.track(frame(640,480,2.25,-1.5,.025,1.025,.98));
|
||||
double ex=fabs(result.cx-(.5+2.25/640))*640,ey=fabs(result.cy-(.5-1.5/480))*480;
|
||||
record([prefix stringByAppendingString:@"-translation-rotation-independent-xy-scale"],
|
||||
started&&result.valid&&ex<.5&&ey<.5&&fabs(result.rotation-.025)<.004&&fabs(result.scaleX-1.025)<.005&&fabs(result.scaleY-.98)<.005,
|
||||
@{@"xErrorPixels":@(ex),@"yErrorPixels":@(ey),@"rotation":@(result.rotation),@"scaleX":@(result.scaleX),@"scaleY":@(result.scaleY)});
|
||||
}
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
auto f=frame(640,480);bool passed=tracker.reset(f,{.5,.5,.65,.65,0});dy::TrackResult result;
|
||||
for(int i=1;i<=6&&passed;i++){result=tracker.track(f);passed=result.valid;}
|
||||
record([prefix stringByAppendingString:@"-subpixel-refinement-and-redetection-remain-stationary"],passed&&fabs(result.cx-.5)*640<.05&&fabs(result.cy-.5)*480<.05);
|
||||
}
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
auto f=frame(640,480);bool started=tracker.reset(f,{.5,.5,.7,.7,0});
|
||||
auto result=tracker.track(frame(640,480,0,0,0,1,1,false,0x3344));
|
||||
record([prefix stringByAppendingString:@"-unrelated-cut-is-not-trusted-motion"],started&&!result.valid&&!tracker.active());
|
||||
dy::GrayFrame flat{640,480,std::vector<float>(640*480,.5f)};
|
||||
record([prefix stringByAppendingString:@"-flat-region-still-refuses-tracking"],!tracker.reset(flat,{.5,.5,.7,.7,0}));
|
||||
}
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
auto t=std::chrono::steady_clock::now();auto f=frame(1920,1080);bool started=tracker.reset(f,{.5,.5,.5,.5,0});
|
||||
auto result=tracker.track(frame(1920,1080,4,2));
|
||||
double ms=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-t).count();
|
||||
record([prefix stringByAppendingString:@"-1080p-complete-frame-motion"],started&&result.valid&&fabs(result.cx-(.5+4./1920))*1920<.5&&fabs(result.cy-(.5+2./1080))*1080<.5,
|
||||
@{@"generatedFramesAndAnalysisMilliseconds":@(ms),@"features":@(result.features)});
|
||||
}
|
||||
{
|
||||
dy::Tracker tracker;if(!setup(tracker))continue;
|
||||
auto t=std::chrono::steady_clock::now();auto f=frame(3840,2160);bool started=tracker.reset(f,{.5,.5,.5,.5,0});
|
||||
auto result=tracker.track(frame(3840,2160,8,4));
|
||||
double ms=std::chrono::duration<double,std::milli>(std::chrono::steady_clock::now()-t).count();
|
||||
record([prefix stringByAppendingString:@"-3840x2160-complete-frame-motion"],started&&result.valid&&fabs(result.cx-(.5+8./3840))*3840<.5&&fabs(result.cy-(.5+4./2160))*2160<.5,
|
||||
@{@"generatedFramesAndAnalysisMilliseconds":@(ms),@"features":@(result.features)});
|
||||
}
|
||||
}
|
||||
NSDictionary *report=@{@"pass":@(all),@"checks":checks,@"scope":@"Independent generated images, CPU tracker and optional real Metal optical flow. No app or GUI host launched.",@"sourceApplicationRuntimeDependency":@NO};
|
||||
NSData *json=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil];
|
||||
fwrite(json.bytes,1,json.length,stdout);fputc('\n',stdout);return all?0:1;
|
||||
}}
|
||||
@@ -0,0 +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",
|
||||
"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"
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"passed": true,
|
||||
"checked_at": "2026-11-02T09:40:25.115993+00:00",
|
||||
"checks": [
|
||||
"update GET",
|
||||
"product isolation",
|
||||
"admin read denied anonymously",
|
||||
"diagnostic stored ACK",
|
||||
"retry same UUID ACK",
|
||||
"foreign upload denied"
|
||||
],
|
||||
"test_event_id": "fe84a41b-84a4-41f8-ba22-afd62655506e",
|
||||
"test_installation_id": "c1f91498-dda9-4219-bb86-decaba573e18",
|
||||
"update": {
|
||||
"bundle_id": "com.dayu.color",
|
||||
"channel": "beta",
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"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",
|
||||
"minimum_system_version": "14.6",
|
||||
"notes": "公测版:接入自动更新与可关闭的云端诊断,记录插件加载耗时及错误摘要。请保存并退出 FCP / Motion 后安装。",
|
||||
"update_available": true,
|
||||
"checked_at": "2026-11-02T09:40:23+00:00"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"passed": true,
|
||||
"checks": 20
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"checkedAt": "2026-11-02T09:38:49.424288+00:00",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"nativeChecks": 395,
|
||||
"inspector": "FCP 12.4 UI shows 1.7.0; exposure changed 0.00 -> 0.35 and restored 0.00; image responds",
|
||||
"diagnosticsToggle": "off disables upload/manual button; on restores; manual summary acknowledged",
|
||||
"cloudEvidence": {
|
||||
"installationID": "113ffef4-5e7e-482b-a451-abd2dc6af83a",
|
||||
"pluginSessionPrefix": "ec3d4c05",
|
||||
"event": "first_render",
|
||||
"durationMS": 111.8215833330396,
|
||||
"status": "passed",
|
||||
"observedInAdmin": true
|
||||
},
|
||||
"limitations": [
|
||||
"Single local FCP run does not establish intermittent hang root cause",
|
||||
"Previous explicit user confirmation applied to build44; build45 host check performed by agent"
|
||||
],
|
||||
"startupCountdown": "AX observed 3-second countdown in build45; process subsequently exited normally with registration-succeeded; plugin XPC remained running in FCP"
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
{"passed":true,"checks":66}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"backup": null,
|
||||
"size": 40898751,
|
||||
"manifest": {
|
||||
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
|
||||
"sha256": "30c92debf91de7ab8215b35dc64a4ddb764e53450c327ae53fb41a4c2f7a26c0",
|
||||
"backup": null,
|
||||
"size": 558
|
||||
},
|
||||
"version": "1.7.0",
|
||||
"build": 45,
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"timestamp": "202611021740"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"passed": true,
|
||||
"source": "production HTTPS beta endpoint and download",
|
||||
"phases": [
|
||||
"checking",
|
||||
"available",
|
||||
"downloading",
|
||||
"validating",
|
||||
"ready"
|
||||
],
|
||||
"installation_performed": false,
|
||||
"bytes": 40898751,
|
||||
"sha256": "a3578ee95aa7333e64d556061173fb73a42be0e45442ae844c94147b421d34bb",
|
||||
"downloadURL": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-7-0-45.pkg",
|
||||
"sameBuildHasNoUpdate": true,
|
||||
"lowerBuildHasUpdate": true
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"roots": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Library/Plug-Ins/FxPlug",
|
||||
"/Applications",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Downloads",
|
||||
"/Users/mac/Desktop"
|
||||
],
|
||||
"candidates": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.3.1",
|
||||
"build": "19"
|
||||
}
|
||||
],
|
||||
"cleanup": "Final Release APP, loose XPC, submission ZIP, old formal backup and package staging removed by delivery/package scripts. Only this task synthetic failure fixture removed; user history and active settings preserved.",
|
||||
"scope": "Only listed roots inspected; historical distribution packages and unrelated products preserved."
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
{
|
||||
"pass" : true,
|
||||
"checks" : [
|
||||
{
|
||||
"name" : "report destination supplied",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "isolated library loaded",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "recent use deduplicates and puts latest first",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "recent history survives a new library instance",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "asynchronous browser task completed",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "recent category is first in the sidebar",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "recent category contains only used LUTs in order",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "all LUTs also put recent uses before unused names",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "loading does not update recent history",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "host rejection does not update history",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "only successful host application records recent use",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "search respects recent-first ordering",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "grid reflows when the browser size changes",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "list layout has full-width rows",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "sidebar divider changes folder width without overlapping previews",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "asynchronous browser task completed",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "layout and sidebar width survive reopening",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "asynchronous browser task completed",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "remote-parent checks never display a test window",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "window position and size are remembered",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "remote close callback runs once",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "recent history stays bounded at 40 newest paths",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "isolated fixtures and preferences cleaned",
|
||||
"pass" : true
|
||||
}
|
||||
],
|
||||
"scope" : "Real AppKit browser objects, hidden host-owned window fixture, asynchronous acknowledgement and root-scoped history; no visible test app or user LUT changes."
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/大鱼调色_1.3.1_浏览器与复位.fcpxml",
|
||||
"status": "pass",
|
||||
"dtd": "/Applications/Final Cut Pro.app/Contents/Frameworks/Interchange.framework/Versions/A/Resources/FCPXMLv1_12.dtd",
|
||||
"errors": [],
|
||||
"warnings": [],
|
||||
"checks": {
|
||||
"dtd": true,
|
||||
"xml": true,
|
||||
"local_media": {
|
||||
"checked": 1,
|
||||
"missing": 0
|
||||
}
|
||||
},
|
||||
"version": "1.12",
|
||||
"summary": {
|
||||
"projects": 1,
|
||||
"assets": 1,
|
||||
"elements": 15
|
||||
},
|
||||
"host_validation": "not_performed_by_this_command"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"sourceCommit": "dbb7ca4a995ef832178a32f35939aed7d3a85012",
|
||||
"restoredFiles": 178,
|
||||
"fsck": "full strict passed",
|
||||
"rebuiltShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2",
|
||||
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/browser-remote-restore-obhflq1b",
|
||||
"cloneCleaned": true,
|
||||
"formalShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2"
|
||||
}
|
||||
@@ -0,0 +1,284 @@
|
||||
{
|
||||
"sourceBytes" : 197731344,
|
||||
"mainHeartbeatMaxGapMS" : 6.234458414837718,
|
||||
"bulkFiles" : 24,
|
||||
"checks" : [
|
||||
{
|
||||
"name" : "isolated source folder created",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "synthetic 65-cube file written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "anchor fixture written",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "preexisting library item imported",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "import completion is on main queue",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "bulk import succeeds",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "all files and previous entry preserved",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "main run loop stays responsive while importing",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cancelled import returns cancellation",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cancel exercised after copy had begun",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cancel rolls back newly copied files only",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cancelled scan reports cancellation",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cancelled scan preserves previous snapshot",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "cold selection prepares off thread and completes on main",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "invalid selection reports failure asynchronously",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "3000 catalog files in independent folders created",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "large directory list creates only visible folder controls",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "large catalog creates only visible thumbnail controls",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "scrolling keeps thumbnail view count bounded",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "search remains usable after catalog loading",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "rapid selection applies only the latest LUT",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "clear selection supersedes pending LUT application",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "scan after browser close completes",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "closing during import cancels without changing existing library",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "background operation completes within timeout",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "acknowledgement fixture has selectable thumbnails",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "thumbnail stays loading until host application acknowledges",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "host rejection preserves previous selection and reports the error",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "new thumbnail click cancels previous application task",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "late older acknowledgement cannot mark a stale LUT selected",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "only acknowledged latest thumbnail becomes selected",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "removal also waits for host acknowledgement",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "acknowledged removal clears selection",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "closing the browser cancels pending host application",
|
||||
"pass" : true
|
||||
},
|
||||
{
|
||||
"name" : "completion after close cannot change the selection",
|
||||
"pass" : true
|
||||
}
|
||||
],
|
||||
"initialLiveThumbnailViews" : 28,
|
||||
"snapshotsReadDuringImport" : 1521,
|
||||
"mainHeartbeatTicks" : 1521,
|
||||
"scope" : "Synthetic 24 x 65-cube import with real main-run-loop heartbeat and snapshot reads; headless browser cancellation, latest selection and 3,025-entry virtualization. No user library or visible test app.",
|
||||
"pass" : true,
|
||||
"largeCatalogEntries" : 3025,
|
||||
"cubeDimension" : 65,
|
||||
"initialLiveFolderViews" : 15,
|
||||
"importSeconds" : 7.5717383332084864
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"tag": "v1.3.1-browser-recents-20261101",
|
||||
"releaseCommit": "281721bda11484c23f294b4f0d9e0b30ef829288",
|
||||
"restoredFiles": 184,
|
||||
"fsck": "full strict passed",
|
||||
"compiledSource": "dbb7ca4a995ef832178a32f35939aed7d3a85012",
|
||||
"compiledSourceRecovery": "verification/BrowserRecovery.json",
|
||||
"cloneCleaned": true
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"pass": true,
|
||||
"productBundleID": "com.dayu.color",
|
||||
"checkedRoots": [
|
||||
"/Volumes/备份/大鱼调色/大鱼调色",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Library/Plug-Ins/FxPlug",
|
||||
"/Applications",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Users/mac/Desktop",
|
||||
"/Users/mac/Downloads"
|
||||
],
|
||||
"outerApps": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.2.0",
|
||||
"build": "17"
|
||||
}
|
||||
],
|
||||
"scope": "Bounded current-product inventory; unrelated products and user archives not deleted.",
|
||||
"deliveryGeneratedCopiesRemoved": true,
|
||||
"recoveryCloneRemoved": true,
|
||||
"formalPackageRetained": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.2.0.pkg"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"pass": true,
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"sourceCommit": "48b00c85799b0226ba32aba3f2e5397aa0e509ed",
|
||||
"restoredFiles": 151,
|
||||
"fsck": "full strict passed",
|
||||
"rebuiltShaderSHA256": "47b7c184e6f243406f0482b1a4a0312f0d0700a0b51196e51ab17a90ef0f29cc",
|
||||
"formalShaderSHA256": "47b7c184e6f243406f0482b1a4a0312f0d0700a0b51196e51ab17a90ef0f29cc",
|
||||
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/cst-remote-restore-0tb5r75b",
|
||||
"cloneCleaned": true
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"pass": true,
|
||||
"tag": "v1.2.0-cst-fold-20261101",
|
||||
"tagCommit": "8074444259fbacc758ec003aa91a6331b6224a85",
|
||||
"restoredFiles": 156,
|
||||
"fsck": "strict full passed",
|
||||
"packageRecordMatches": true,
|
||||
"cloneCleaned": true
|
||||
}
|
||||
+7
-27
@@ -2,35 +2,15 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.1.5",
|
||||
"build": "16",
|
||||
"version": "1.7.0",
|
||||
"build": "45",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "b47b6fe8-b7a9-4112-93b9-de85b03ca598",
|
||||
"notaryID": "777a5c05-4936-4b14-b8e8-0c789c1df05c",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "59b058a3c8b9e5387381574da6bbc05af437527c",
|
||||
"sourceCommit": "a0f37578f73d7f8faa872d9a81009e2d6586a858",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "ebf8b7aa7a6781b9ce611375a838d89997656b0fc01077b2a7e5b1b2a2c373e1",
|
||||
"shaderSHA256": "9d89ed3197cf987a37ad7320911d23b8510b5461ffca2bd16397c8b963e02132",
|
||||
"hostVerification": "verification/HostLUTEncoding.json",
|
||||
"sourceRecoveryVerification": "verification/LUTEncodingRecovery.json",
|
||||
"responsivenessVerification": "verification/LUTEncoding.json",
|
||||
"registry": "com.dayu.color.XPC(1.1)\t78D73EB2-7FCE-41CD-8E6A-6AABC8ACACDB\t2026-11-01 07:39:57 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)",
|
||||
"appInventory": [
|
||||
{
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.1.5",
|
||||
"build": "16"
|
||||
}
|
||||
],
|
||||
"inventoryScope": [
|
||||
"project and fixed product cache",
|
||||
"system FxPlug and Applications",
|
||||
"user FxPlug, Downloads and Desktop"
|
||||
],
|
||||
"packageVerification": "verification/Package.json",
|
||||
"packageStagingCleanup": {
|
||||
"identifier": "com.dayu.color.installer.c8d19ea6-1117-4621-ae47-48a41ea4ca10",
|
||||
"remainingMatchedDirectories": []
|
||||
}
|
||||
"templateSHA256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"hostVerification": "verification/BetaClientQA.json"
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.6.0",
|
||||
"build": "36",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "91224ae2-68d3-4776-a9b7-2fdf8ffaea4f",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "f97320bbee6d469596f2db72a48436b73a41b324",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
|
||||
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
|
||||
"hostVerification": "verification/HostPrintLooks1.6.0.json",
|
||||
"nativeChecks": 393,
|
||||
"printReferenceChecks": 136,
|
||||
"hostAcceptanceCompleted": "2026-11-02T07:09:11.437885+00:00",
|
||||
"completionNote": "Delivery worker stdin ended after formal installation; finalization resumed under the product lock after cold-reopen host acceptance.",
|
||||
"historicalBuild": true,
|
||||
"supersededByBuild": "38"
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.5.0",
|
||||
"build": "34",
|
||||
"bundleID": "com.dayu.color",
|
||||
"scannedRoots": [
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Applications",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug",
|
||||
"/Library/Plug-Ins/FxPlug"
|
||||
],
|
||||
"remainingOuterApps": [
|
||||
"/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"pluginKit": "com.dayu.color.XPC(1.1)\tB407E365-8C67-47E2-9BAD-2A72A2E551AC\t2026-11-02 05:58:09 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)",
|
||||
"removedNow": [
|
||||
"/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData",
|
||||
"/Volumes/备份/大鱼调色-1.5.0.pkg"
|
||||
],
|
||||
"generatedAppCopiesAlreadyRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
],
|
||||
"formalDeliveryCopiesRemovedBy": "tools/deliver.py complete",
|
||||
"historicalInstallersPreserved": true,
|
||||
"userMediaAndPresetsPreserved": true,
|
||||
"finalPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.5.0.pkg",
|
||||
"wholeDiskUniquenessClaimed": false
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"status": "verified-formal-install-and-host",
|
||||
"baseline": "1.4.3 (33)",
|
||||
"nativePass": true,
|
||||
"checks": 349,
|
||||
"referenceComparison": {
|
||||
"passed": true,
|
||||
"checks": 184,
|
||||
"dimensions": [
|
||||
[
|
||||
64,
|
||||
48
|
||||
],
|
||||
[
|
||||
63,
|
||||
47
|
||||
],
|
||||
[
|
||||
1,
|
||||
17
|
||||
],
|
||||
[
|
||||
17,
|
||||
1
|
||||
]
|
||||
]
|
||||
},
|
||||
"formalInstallUnchanged": false,
|
||||
"formalVersion": "1.5.0",
|
||||
"formalBuild": "34",
|
||||
"compiledSource": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"hostVerification": "verification/HostFilmMixer1.5.0.json",
|
||||
"packageVerification": "verification/Package.json",
|
||||
"targetVersion": "1.5.0",
|
||||
"targetBuild": "34"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"commit": "eeeee102cd78b8f99be743be634739286fed8a76",
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"releaseBuild": true,
|
||||
"nativeChecks": 349,
|
||||
"nativePass": true,
|
||||
"sourceHasAllFilmMath": true,
|
||||
"generatedAppsRemoved": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/RecoveryDerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
|
||||
]
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"status": "verified",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"tag": "v1.5.0-film-mixer-20261102",
|
||||
"commit": "85b6590944c4fb64825cf45f61c5280d4ffaa824",
|
||||
"filesByteCompared": 264,
|
||||
"fsck": "full/strict passed",
|
||||
"lfs": false,
|
||||
"submodules": false,
|
||||
"independentReleaseBuildAnd349Checks": "verification/FilmMixerRecovery.json",
|
||||
"recoveryBuildCommit": "eeeee102cd78b8f99be743be634739286fed8a76",
|
||||
"compiledAppCommit": "06d531c443b0bb2f179022a4e64148394f5d0690",
|
||||
"sourceDifference": [
|
||||
"tools/deliver.py"
|
||||
],
|
||||
"appSourceUnchanged": true,
|
||||
"clone": "/Users/mac/Library/Caches/CodexRecovery/dayu-color-film-1.5.0",
|
||||
"cloneRemoved": true,
|
||||
"recoveryDerivedDataRemoved": true,
|
||||
"releaseTagAppSourceMatchesCompiledCommit": true
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"passResult": true,
|
||||
"date": "2026-11-01",
|
||||
"version": "1.3.1",
|
||||
"build": "19",
|
||||
"hostVersion": "12.4",
|
||||
"sourceCommit": "dbb7ca4a995ef832178a32f35939aed7d3a85012",
|
||||
"formalServiceProcesses": [
|
||||
"95818 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
],
|
||||
"checks": [
|
||||
{
|
||||
"name": "sony-new-instance-default",
|
||||
"passResult": true,
|
||||
"observed": "New isolated FCP instance displays Sony S-Log3 and Sony S-Gamut3.Cine; output Gamma 2.4 / Rec.709."
|
||||
},
|
||||
{
|
||||
"name": "visible-primary-reset",
|
||||
"passResult": true,
|
||||
"observed": "Wheel adjusted to 256 degrees / 0.5%; visible 复位 button restored 0 degrees / 0%."
|
||||
},
|
||||
{
|
||||
"name": "host-owned-floating-browser",
|
||||
"passResult": true,
|
||||
"observed": "Browser opens in a separate FCP floating window with system close, zoom and minimize controls; no anchored popover in this host."
|
||||
},
|
||||
{
|
||||
"name": "window-resize-and-reflow",
|
||||
"passResult": true,
|
||||
"observed": "System zoom resized the floating window; grid/footer reflowed. Frame preference observed {{0, 110}, {1449, 916}}. Exact titlebar/border drag was not independently confirmed through automation."
|
||||
},
|
||||
{
|
||||
"name": "recent-first-and-success-acknowledgement",
|
||||
"passResult": true,
|
||||
"observed": "Applied 复古胶片风 then 复古清新干净1 from existing N12 library. 最近使用 is first category and contains exactly the latter followed by the former; newest also first in the folder."
|
||||
},
|
||||
{
|
||||
"name": "list-layout",
|
||||
"passResult": true,
|
||||
"observed": "Selected 列表; each LUT displayed as a full-width row with thumbnail and name."
|
||||
},
|
||||
{
|
||||
"name": "close-reopen-persistence",
|
||||
"passResult": true,
|
||||
"observed": "Done and reopen retained 列表, 最近使用 category, two-item order and current selection."
|
||||
},
|
||||
{
|
||||
"name": "user-live-use-preserved",
|
||||
"passResult": true,
|
||||
"observed": "User began manipulating the browser; their current grid layout, thumbnail size and selection were preserved. Further host restart/reset was stopped."
|
||||
}
|
||||
],
|
||||
"testData": "New isolated synthetic project 大鱼调色_1.3.1_浏览器与复位; existing LUTs read/applied, never imported or deleted.",
|
||||
"limitations": [
|
||||
"Live titlebar/border mouse drag was attempted but exact motion was not confirmed independently; native hidden-window geometry/resize/persistence and real host window zoom were checked separately.",
|
||||
"A full FCP process restart was not repeated after the user began interacting; browser close/reopen and native persisted preference recovery passed. Motion, Intel and older macOS not tested."
|
||||
],
|
||||
"finalState": "User is actively using the formally installed new browser; no preference rollback or test-instance reset performed after user interaction.",
|
||||
"userStateObserved": {
|
||||
"windowFrame": "{{225, 90}, {1469, 936}}",
|
||||
"layout": "grid",
|
||||
"thumbnailSize": 197.9713040865385,
|
||||
"preferencesPreserved": true
|
||||
}
|
||||
}
|
||||
已加载 100/224 个文件。由于本次变更涉及的文件过多,其余文件未显示。
显示更多
在新工单中引用
屏蔽一个用户